fix wipe device (#649)

* fix kk rest * fix kk rest * fix wc v2 * fix eip155 sending * fix wipe device
keepkey · Jun 21, 2023 · 3059410 · 3059410
1 parent b89b86c
commit 3059410
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 27 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/@shapeshiftoss-hdwallet-keepkey-patch-43ddb4e7ff-eca07b59d8.zip b/.yarn/cache/@shapeshiftoss-hdwallet-keepkey-patch-43ddb4e7ff-eca07b59d8.zip
diff --git a/.yarn/cache/@shapeshiftoss-hdwallet-keepkey-patch-f9043bfbbe-a65946166e.zip b/.yarn/cache/@shapeshiftoss-hdwallet-keepkey-patch-f9043bfbbe-a65946166e.zip
diff --git a/.yarn/patches/@shapeshiftoss-hdwallet-keepkey-npm-1.50.3-dc99de3346.patch b/.yarn/patches/@shapeshiftoss-hdwallet-keepkey-npm-1.50.3-dc99de3346.patch
@@ -1,13 +1,13 @@
 diff --git a/dist/ethereum.js b/dist/ethereum.js
-index bdfb2fbb120e3488ebcc0f29c72a99215f549fcf..1f267f467831b34f5d5bc7d9d6903435a08f1521 100644
+index bdfb2fbb120e3488ebcc0f29c72a99215f549fcf..6eb89d78a49fb7e239c39fdafdf769ccf10ed6a6 100644
 --- a/dist/ethereum.js
 +++ b/dist/ethereum.js
 @@ -216,7 +216,7 @@ function ethSignMessage(transport, msg) {
  }
  exports.ethSignMessage = ethSignMessage;
  function ethSignTypedData(transport, msg) {
 -    return __awaiter(this, void 0, void 0, function* () {
-+   return transport.lockDuring(() => __awaiter(this, void 0, void 0, function* () {
++    return transport.lockDuring(() => __awaiter(this, void 0, void 0, function* () {
          /**
           * If the message to be signed is sufficiently small, the KeepKey can calculate the
           * domain separator and message hashes. Otherwise, we need to pre-calculate hashes
@@ -21,7 +21,7 @@ index bdfb2fbb120e3488ebcc0f29c72a99215f549fcf..1f267f467831b34f5d5bc7d9d6903435
  exports.ethSignTypedData = ethSignTypedData;
  function ethVerifyMessage(transport, msg) {
 diff --git a/dist/transport.js b/dist/transport.js
-index 7aeb7af77d31d9d9b3d15386ea02eed672fa496a..0c8373367ec87a0391101de18db06e14bb5fbbb2 100644
+index 7aeb7af77d31d9d9b3d15386ea02eed672fa496a..77bdce7c20895ed8f8204a355ff11fbc6b74be2f 100644
 --- a/dist/transport.js
 +++ b/dist/transport.js
 @@ -1,14 +1,14 @@
@@ -59,14 +59,11 @@ index 7aeb7af77d31d9d9b3d15386ea02eed672fa496a..0c8373367ec87a0391101de18db06e14
                      throw new core.ActionCancelled();
                  }
                  if (response.message_type === core.Events.FAILURE)
-@@ -306,9 +314,7 @@ class Transport extends core.Transport {
-             try {
+@@ -307,6 +315,7 @@ class Transport extends core.Transport {
                  this.callInProgress = { main: undefined, debug: undefined };
                  const cancelMsg = new Messages.Cancel();
--                yield this.call(Messages.MessageType.MESSAGETYPE_CANCEL, cancelMsg, {
--                    noWait: this.userActionRequired,
--                });
-+                yield this.call(Messages.MessageType.MESSAGETYPE_CANCEL, cancelMsg);
-             }
-             catch (e) {
-                 console.error("Cancel Pending Error", e);
+                 yield this.call(Messages.MessageType.MESSAGETYPE_CANCEL, cancelMsg, {
++                    omitLock: this.userActionRequired,
+                     noWait: this.userActionRequired,
+                 });
+             }
diff --git a/yarn.lock b/yarn.lock
@@ -6539,7 +6539,7 @@ __metadata:
 
 "@shapeshiftoss/hdwallet-keepkey@patch:@shapeshiftoss/hdwallet-keepkey@npm%3A1.50.3#./.yarn/patches/@shapeshiftoss-hdwallet-keepkey-npm-1.50.3-dc99de3346.patch::locator=keepkey-monorepo%40workspace%3A.":
   version: 1.50.3
-  resolution: "@shapeshiftoss/hdwallet-keepkey@patch:@shapeshiftoss/hdwallet-keepkey@npm%3A1.50.3#./.yarn/patches/@shapeshiftoss-hdwallet-keepkey-npm-1.50.3-dc99de3346.patch::version=1.50.3&hash=5b3d78&locator=keepkey-monorepo%40workspace%3A."
+  resolution: "@shapeshiftoss/hdwallet-keepkey@patch:@shapeshiftoss/hdwallet-keepkey@npm%3A1.50.3#./.yarn/patches/@shapeshiftoss-hdwallet-keepkey-npm-1.50.3-dc99de3346.patch::version=1.50.3&hash=032a2b&locator=keepkey-monorepo%40workspace%3A."
   dependencies:
     "@ethereumjs/common": ^2.4.0
     "@ethereumjs/tx": ^3.3.0
@@ -6558,7 +6558,7 @@ __metadata:
     p-lazy: ^3.1.0
     semver: ^7.3.8
     tiny-secp256k1: ^1.1.6
-  checksum: a65946166ec4100c705c830c75ee38dbd22005920e13ffbfc7d16c98d27267bb0247b924cf23e05ecb16fba656309ea4e92de4ba36fe3f7cc12357924e1dd283
+  checksum: eca07b59d85138f4392ffda573834a0cb27ac4da3931d5188887cee51ba1e6ee08752af6e90b2e1457143eb756b1f202527067998fb88c3bbb0b99f10132b160
   languageName: node
   linkType: hard