From 5a3b369210b90620e4edfccc0bb68cd204e5a58b Mon Sep 17 00:00:00 2001 From: pastaghost Date: Mon, 4 Mar 2024 15:46:37 -0700 Subject: [PATCH 1/4] chore: update device-protocol dependency --- packages/hdwallet-keepkey/package.json | 2 +- yarn.lock | 40 +++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index aa78f4ed..d6d92aff 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@keepkey/device-protocol": "^7.13.1", + "@keepkey/device-protocol": "^7.13.2", "@keepkey/hdwallet-core": "1.53.10", "@keepkey/proto-tx-builder": "^0.9.0", "@metamask/eth-sig-util": "^7.0.0", diff --git a/yarn.lock b/yarn.lock index 88e43175..7b33b653 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1615,14 +1615,29 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@keepkey/device-protocol@^7.13.1": - version "7.13.1" - resolved "https://registry.yarnpkg.com/@keepkey/device-protocol/-/device-protocol-7.13.1.tgz#e07c80c187a7e99109048038f28e296dfab79a68" - integrity sha512-psoeBzySYbck7kgWfwM3bLtng+sBC/MKLm2HSu3BRI4+GTVGyL0LVvxfy9oqQ8k2F0N2AB9J3z8VQyv3zXsllQ== +"@keepkey/device-protocol@^7.13.2": + version "7.13.2" + resolved "https://registry.yarnpkg.com/@keepkey/device-protocol/-/device-protocol-7.13.2.tgz#09e2bff457403952559484d767a17584ceaebe28" + integrity sha512-x/FjztrWVTzBn9ptxV9Y1fVtYx8mOr9jIbPOB6hFuqi9UdRkrnaabluMiSKXM7/JTRMouSzwmZ/cnDAbmpD31A== dependencies: google-protobuf "^3.7.0-rc.2" pbjs "^0.0.5" +"@keepkey/hdwallet-core@1.53.9": + version "1.53.9" + resolved "https://registry.yarnpkg.com/@keepkey/hdwallet-core/-/hdwallet-core-1.53.9.tgz#cd8bd5fa490f19dfa4daf10c5168717aad78389f" + integrity sha512-zPHxBjf7jrVxEzASO6Qoh/Hfg6akyh8LekTLMI/QnBibYwHO1xJTqqnWSbDs1VausmKZ8zoFkgY77Yw+J1uKiA== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@keepkey/proto-tx-builder" "^0.9.0" + "@types/node" "^20.11.13" + eip-712 "^1.0.0" + eventemitter2 "^5.0.1" + google-protobuf "^3.21.2" + lodash "^4.17.21" + rxjs "^6.4.0" + type-assertions "^1.1.0" + "@keepkey/hdwallet-native@1.53.9": version "1.53.9" resolved "https://registry.yarnpkg.com/@keepkey/hdwallet-native/-/hdwallet-native-1.53.9.tgz#bffee8b25641f161170146f4c5e5aa628eebb8bd" @@ -4141,6 +4156,13 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-15.14.9.tgz#bc43c990c3c9be7281868bbc7b8fdd6e2b57adfa" integrity sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A== +"@types/node@^20.11.13": + version "20.11.24" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792" + integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long== + dependencies: + undici-types "~5.26.4" + "@types/node@^20.5.7": version "20.6.5" resolved "https://registry.yarnpkg.com/@types/node/-/node-20.6.5.tgz#4c6a79adf59a8e8193ac87a0e522605b16587258" @@ -8186,6 +8208,11 @@ google-protobuf@^3.17.0: resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.19.4.tgz#8d32c3e34be9250956f28c0fb90955d13f311888" integrity sha512-OIPNCxsG2lkIvf+P5FNfJ/Km95CsXOBecS9ZcAU6m2Rq3svc0Apl9nB3GMDNKfQ9asNv4KjyAqGwPQFrVle3Yg== +google-protobuf@^3.21.2: + version "3.21.2" + resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.21.2.tgz#4580a2bea8bbb291ee579d1fefb14d6fa3070ea4" + integrity sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA== + gopd@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" @@ -14065,6 +14092,11 @@ unbox-primitive@^1.0.1: has-symbols "^1.0.2" which-boxed-primitive "^1.0.2" +undici-types@~5.26.4: + version "5.26.5" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" + integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== + union-value@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" From d993e5afad82517d6adeff47b71ad2b5f611e6fc Mon Sep 17 00:00:00 2001 From: pastaghost Date: Mon, 4 Mar 2024 15:46:55 -0700 Subject: [PATCH 2/4] fix: remove mayachain denom restriction --- packages/hdwallet-keepkey/src/mayachain.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/hdwallet-keepkey/src/mayachain.ts b/packages/hdwallet-keepkey/src/mayachain.ts index 0f518afd..896f7081 100644 --- a/packages/hdwallet-keepkey/src/mayachain.ts +++ b/packages/hdwallet-keepkey/src/mayachain.ts @@ -75,15 +75,11 @@ export async function mayachainSignTx(transport: Transport, msg: core.MayachainS throw new Error("MAYAChain: Multiple amounts per MsgSend not supported"); } - const denom = m.value.amount[0].denom; - if (denom !== "cacao") { - throw new Error("MAYAChain: Unsupported denomination: " + denom); - } - const send = new MayachainMessages.MayachainMsgSend(); send.setFromAddress(m.value.from_address); send.setToAddress(m.value.to_address); send.setAmount(m.value.amount[0].amount); + send.setDenom(m.value.amount[0].denom); ack = new MayachainMessages.MayachainMsgAck(); ack.setSend(send); From 6cc9ea7aa28fbe125e5bf66c51d8d21d94c9a3e2 Mon Sep 17 00:00:00 2001 From: pastaghost Date: Mon, 4 Mar 2024 16:10:12 -0700 Subject: [PATCH 3/4] chore(release): publish 1.53.11 --- examples/sandbox/package.json | 8 ++++---- integration/package.json | 10 +++++----- lerna.json | 2 +- packages/hdwallet-core/package.json | 2 +- packages/hdwallet-keepkey-chromeusb/package.json | 6 +++--- packages/hdwallet-keepkey-electron/package.json | 4 ++-- packages/hdwallet-keepkey-nodehid/package.json | 4 ++-- packages/hdwallet-keepkey-nodewebusb/package.json | 6 +++--- packages/hdwallet-keepkey-tcp/package.json | 6 +++--- packages/hdwallet-keepkey-webusb/package.json | 6 +++--- packages/hdwallet-keepkey/package.json | 4 ++-- packages/hdwallet-native-vault/package.json | 2 +- packages/hdwallet-native/package.json | 4 ++-- 13 files changed, 32 insertions(+), 32 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 4a8da3a8..dde3beb2 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,9 +1,9 @@ { "browserslist": "> 0.5%, last 2 versions, not dead", "dependencies": { - "@keepkey/hdwallet-core": "1.53.10", - "@keepkey/hdwallet-keepkey-tcp": "1.53.10", - "@keepkey/hdwallet-keepkey-webusb": "1.53.10", + "@keepkey/hdwallet-core": "1.53.11", + "@keepkey/hdwallet-keepkey-tcp": "1.53.11", + "@keepkey/hdwallet-keepkey-webusb": "1.53.11", "@keepkey/hdwallet-native": "1.53.9", "@metamask/eth-sig-util": "^7.0.0", "bip32": "^2.0.4", @@ -31,5 +31,5 @@ "clean": "rm -rf dist node_modules public .parcel-cache", "dev": "yarn parcel index.html" }, - "version": "1.53.10" + "version": "1.53.11" } diff --git a/integration/package.json b/integration/package.json index c2b389ab..ba7c93a8 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,9 +1,9 @@ { "dependencies": { - "@keepkey/hdwallet-core": "1.53.10", - "@keepkey/hdwallet-keepkey": "1.53.10", - "@keepkey/hdwallet-keepkey-nodewebusb": "1.53.10", - "@keepkey/hdwallet-keepkey-tcp": "1.53.10", + "@keepkey/hdwallet-core": "1.53.11", + "@keepkey/hdwallet-keepkey": "1.53.11", + "@keepkey/hdwallet-keepkey-nodewebusb": "1.53.11", + "@keepkey/hdwallet-keepkey-tcp": "1.53.11", "@keepkey/hdwallet-native": "1.53.9", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", @@ -18,5 +18,5 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies", "test": "yarn jest --verbose" }, - "version": "1.53.10" + "version": "1.53.11" } diff --git a/lerna.json b/lerna.json index 39f2d87a..459c86a8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.53.10", + "version": "1.53.11", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json index 9b0e60c6..140e92a0 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@keepkey/hdwallet-core", - "version": "1.53.10", + "version": "1.53.11", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index c4a375ff..025abaf5 100644 --- a/packages/hdwallet-keepkey-chromeusb/package.json +++ b/packages/hdwallet-keepkey-chromeusb/package.json @@ -1,6 +1,6 @@ { "name": "@keepkey/hdwallet-keepkey-chromeusb", - "version": "1.53.10", + "version": "1.53.11", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@keepkey/hdwallet-core": "1.53.10", - "@keepkey/hdwallet-keepkey": "1.53.10" + "@keepkey/hdwallet-core": "1.53.11", + "@keepkey/hdwallet-keepkey": "1.53.11" }, "gitHead": "56ddebbaf88004facedb7bb78e5f4bdb954931d0" } diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index e6886e4b..5e569713 100644 --- a/packages/hdwallet-keepkey-electron/package.json +++ b/packages/hdwallet-keepkey-electron/package.json @@ -1,6 +1,6 @@ { "name": "@keepkey/hdwallet-keepkey-electron", - "version": "1.53.10", + "version": "1.53.11", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@keepkey/hdwallet-keepkey": "1.53.10", + "@keepkey/hdwallet-keepkey": "1.53.11", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index 951f0ef9..51fa3c87 100644 --- a/packages/hdwallet-keepkey-nodehid/package.json +++ b/packages/hdwallet-keepkey-nodehid/package.json @@ -1,6 +1,6 @@ { "name": "@keepkey/hdwallet-keepkey-nodehid", - "version": "1.53.10", + "version": "1.53.11", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@keepkey/hdwallet-keepkey": "1.53.10" + "@keepkey/hdwallet-keepkey": "1.53.11" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index a77101ee..1b303f87 100644 --- a/packages/hdwallet-keepkey-nodewebusb/package.json +++ b/packages/hdwallet-keepkey-nodewebusb/package.json @@ -1,6 +1,6 @@ { "name": "@keepkey/hdwallet-keepkey-nodewebusb", - "version": "1.53.10", + "version": "1.53.11", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@keepkey/hdwallet-core": "1.53.10", - "@keepkey/hdwallet-keepkey": "1.53.10" + "@keepkey/hdwallet-core": "1.53.11", + "@keepkey/hdwallet-keepkey": "1.53.11" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index 130a084e..1d58deb4 100644 --- a/packages/hdwallet-keepkey-tcp/package.json +++ b/packages/hdwallet-keepkey-tcp/package.json @@ -1,6 +1,6 @@ { "name": "@keepkey/hdwallet-keepkey-tcp", - "version": "1.53.10", + "version": "1.53.11", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@keepkey/hdwallet-core": "1.53.10", - "@keepkey/hdwallet-keepkey": "1.53.10", + "@keepkey/hdwallet-core": "1.53.11", + "@keepkey/hdwallet-keepkey": "1.53.11", "axios": "^0.21.1" }, "gitHead": "56ddebbaf88004facedb7bb78e5f4bdb954931d0" diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index 61a8d524..a4d9e741 100644 --- a/packages/hdwallet-keepkey-webusb/package.json +++ b/packages/hdwallet-keepkey-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@keepkey/hdwallet-keepkey-webusb", - "version": "1.53.10", + "version": "1.53.11", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@keepkey/hdwallet-core": "1.53.10", - "@keepkey/hdwallet-keepkey": "1.53.10" + "@keepkey/hdwallet-core": "1.53.11", + "@keepkey/hdwallet-keepkey": "1.53.11" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4" diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index d6d92aff..7897337d 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@keepkey/hdwallet-keepkey", - "version": "1.53.10", + "version": "1.53.11", "license": "MIT", "publishConfig": { "access": "public" @@ -18,7 +18,7 @@ "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", "@keepkey/device-protocol": "^7.13.2", - "@keepkey/hdwallet-core": "1.53.10", + "@keepkey/hdwallet-core": "1.53.11", "@keepkey/proto-tx-builder": "^0.9.0", "@metamask/eth-sig-util": "^7.0.0", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index 3aff0715..30ff9546 100644 --- a/packages/hdwallet-native-vault/package.json +++ b/packages/hdwallet-native-vault/package.json @@ -1,6 +1,6 @@ { "name": "@keepkey/hdwallet-native-vault", - "version": "1.53.10", + "version": "1.53.11", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index d1b6a1cd..05ae3a21 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@keepkey/hdwallet-native", - "version": "1.53.10", + "version": "1.53.11", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@keepkey/hdwallet-core": "1.53.10", + "@keepkey/hdwallet-core": "1.53.11", "@keepkey/proto-tx-builder": "^0.9.0", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", "@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6", From fcf948b13bb72dfe2837933de34b41f2256ca7f7 Mon Sep 17 00:00:00 2001 From: pastaghost Date: Mon, 4 Mar 2024 16:21:45 -0700 Subject: [PATCH 4/4] fix: remove obsolete metamask check --- integration/src/ethereum/ethereum.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/integration/src/ethereum/ethereum.ts b/integration/src/ethereum/ethereum.ts index 701a6a65..af84d7d1 100644 --- a/integration/src/ethereum/ethereum.ts +++ b/integration/src/ethereum/ethereum.ts @@ -161,9 +161,6 @@ export function ethereumTests(get: () => { wallet: core.HDWallet; info: core.HDW return; } - // MetaMask *does* support EIP-1559, though not through offline signing - if (metamask.isMetaMask(wallet)) return; - if (!(await wallet.ethSupportsEIP1559())) { return; }