Added message response for CANCEL request from client during exchange…

… verification. *Added message response for bip44 address error detection in exchange's withdrawal node.
keepkey · Aug 24, 2016 · 8d5bd29 · 8d5bd29
1 parent 38fa0c9
commit 8d5bd29
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/keepkey/local/baremetal/exchange.c b/keepkey/local/baremetal/exchange.c
@@ -320,11 +320,13 @@ bool process_exchange_contract(const CoinType *coin, TxOutputType *tx_out, const
                 {
                     if(!confirm_exchange_output("ShapeShift", amount_from_str, amount_to_str, node_str))
                     {
+                        set_exchange_error(ERROR_EXCHANGE_CANCEL);
                         goto process_exchange_contract_exit;
                     }
                 }
                 else
                 {
+                    set_exchange_error(ERROR_EXCHANGE_WITHDRAWAL_ADDRESS);
                     goto process_exchange_contract_exit;
                 }
             }

diff --git a/keepkey/local/baremetal/signing.c b/keepkey/local/baremetal/signing.c
@@ -109,6 +109,11 @@ static void send_fsm_co_error_message(int co_error)
         {
             switch(get_exchange_error())
             {
+                case ERROR_EXCHANGE_CANCEL:
+                {
+                    fsm_sendFailure(FailureType_Failure_Other, "Exchange cancelled");
+                    break;
+                }
                 case ERROR_EXCHANGE_SIGNATURE:
                 {
                     fsm_sendFailure(FailureType_Failure_Other, "Exchange signature error");

diff --git a/keepkey/public/exchange.h b/keepkey/public/exchange.h
@@ -31,7 +31,8 @@ typedef enum
     ERROR_EXCHANGE_WITHDRAWAL_ADDRESS,
     ERROR_EXCHANGE_RETURN_COINTYPE,
     ERROR_EXCHANGE_RETURN_ADDRESS,
-    ERROR_EXCHANGE_API_KEY
+    ERROR_EXCHANGE_API_KEY,
+    ERROR_EXCHANGE_CANCEL
 }ExchangeError;
 
 /* === Functions =========================================================== */