[#10277] [keycard] Fix tx signing for derived accounts

status-im · Apr 17, 2020 · c9308af · c9308af
1 parent 4f120d9
commit c9308af
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/externs.js b/externs.js
@@ -490,6 +490,7 @@ var TopLevel = {
   "showActionSheetWithOptions" : function () {},
   "showPicker" : function () {},
   "sign" : function () {},
+  "signWithPath" : function () {},
   "signGroupMembership" : function () {},
   "signMessage" : function () {},
   "signPinless" : function () {},

diff --git a/src/status_im/hardwallet/real_keycard.cljs b/src/status_im/hardwallet/real_keycard.cljs
@@ -177,12 +177,17 @@
         (catch on-failure))))
 
 (defn sign
-  [{:keys [pairing pin hash on-success on-failure]}]
+  [{:keys [pairing pin path hash on-success on-failure]}]
   (when (and pairing pin hash)
-    (.. status-keycard
-        (sign pairing pin hash)
-        (then on-success)
-        (catch on-failure))))
+    (if path
+      (.. status-keycard
+          (signWithPath pairing pin path hash)
+          (then on-success)
+          (catch on-failure))
+      (.. status-keycard
+          (sign pairing pin hash)
+          (then on-success)
+          (catch on-failure)))))
 
 (defn sign-typed-data
   [{:keys [hash on-success on-failure]}]

diff --git a/src/status_im/hardwallet/sign.cljs b/src/status_im/hardwallet/sign.cljs
@@ -13,21 +13,30 @@
 (fx/defn sign
   {:events [:hardwallet/sign]}
   [{:keys [db] :as cofx}]
-  (let [card-connected?                   (get-in db [:hardwallet :card-connected?])
-        pairing                           (common/get-pairing db)
-        multiaccount-keycard-instance-uid (get-in db [:multiaccount :keycard-instance-uid])
-        instance-uid                      (get-in db [:hardwallet :application-info :instance-uid])
-        keycard-match?                    (= multiaccount-keycard-instance-uid instance-uid)
-        hash                              (get-in db [:hardwallet :hash])
-        pin                               (common/vector->string (get-in db [:hardwallet :pin :sign]))]
+  (log/debug "FOOOOO sign keke" (:signing/tx db))
+  (let [card-connected?      (get-in db [:hardwallet :card-connected?])
+        pairing              (common/get-pairing db)
+        keycard-instance-uid (get-in db [:multiaccount :keycard-instance-uid])
+        instance-uid         (get-in db [:hardwallet :application-info :instance-uid])
+        keycard-match?       (= keycard-instance-uid instance-uid)
+        hash                 (get-in db [:hardwallet :hash])
+        pin                  (common/vector->string (get-in db [:hardwallet :pin :sign]))
+        from                 (get-in db [:signing/tx :from :address])
+        path                 (reduce
+                              (fn [_ {:keys [address path]}]
+                                (when (= from address)
+                                  (reduced path)))
+                              nil
+                              (:multiaccount/accounts db))]
     (if (and card-connected?
              keycard-match?)
       {:db              (-> db
                             (assoc-in [:hardwallet :card-read-in-progress?] true)
                             (assoc-in [:hardwallet :pin :status] :verifying))
        :hardwallet/sign {:hash    (ethereum/naked-address hash)
                          :pairing pairing
-                         :pin     pin}}
+                         :pin     pin
+                         :path    path}}
       (fx/merge cofx
                 {:db (assoc-in db [:signing/sign :keycard-step] :signing)}
                 (common/set-on-card-connected :hardwallet/sign)