From 86b9f3907111a9f5b88bd3c696fca49d3dfdf19f Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Fri, 29 Sep 2023 16:41:46 +0200 Subject: [PATCH 001/108] feat: ledger BCH Cash address format --- packages/hdwallet-ledger/src/bitcoin.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/bitcoin.ts b/packages/hdwallet-ledger/src/bitcoin.ts index 28bc0a245..73263259d 100644 --- a/packages/hdwallet-ledger/src/bitcoin.ts +++ b/packages/hdwallet-ledger/src/bitcoin.ts @@ -45,7 +45,8 @@ export async function btcGetAddress(transport: LedgerTransport, msg: core.BTCGet const res = await transport.call("Btc", "getWalletPublicKey", bip32path, opts); handleError(res, transport, "Unable to obtain BTC address from device"); - return res.payload.bitcoinAddress; + const address = res.payload.bitcoinAddress; + return msg.coin.toLowerCase() === "bitcoincash" ? bchAddr.toCashAddress(address) : address; } // Adapted from https://github.com/LedgerHQ/ledger-wallet-webtool From e2cdde73f3717888b7449a8427c86672ba23753b Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 22:09:09 +0200 Subject: [PATCH 002/108] chore(release): publish 1.52.2 --- examples/sandbox/package.json | 32 +++++++++---------- integration/package.json | 20 ++++++------ lerna.json | 2 +- packages/hdwallet-coinbase/package.json | 4 +-- packages/hdwallet-core/package.json | 2 +- .../hdwallet-keepkey-chromeusb/package.json | 6 ++-- .../hdwallet-keepkey-electron/package.json | 4 +-- .../hdwallet-keepkey-nodehid/package.json | 4 +-- .../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-keplr/package.json | 4 +-- packages/hdwallet-ledger-webhid/package.json | 6 ++-- packages/hdwallet-ledger-webusb/package.json | 6 ++-- packages/hdwallet-ledger/package.json | 4 +-- .../package.json | 4 +-- packages/hdwallet-metamask/package.json | 4 +-- packages/hdwallet-native-vault/package.json | 4 +-- packages/hdwallet-native/package.json | 4 +-- packages/hdwallet-portis/package.json | 4 +-- packages/hdwallet-tallyho/package.json | 4 +-- packages/hdwallet-trezor-connect/package.json | 6 ++-- packages/hdwallet-trezor/package.json | 4 +-- packages/hdwallet-walletconnect/package.json | 4 +-- .../hdwallet-walletconnectV2/package.json | 4 +-- packages/hdwallet-xdefi/package.json | 4 +-- 27 files changed, 81 insertions(+), 81 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index efc972aa4..851be8376 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.1", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.1", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.1", - "@shapeshiftoss/hdwallet-keplr": "1.52.1", - "@shapeshiftoss/hdwallet-ledger": "1.52.1", - "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.1", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.1", - "@shapeshiftoss/hdwallet-metamask": "1.52.1", - "@shapeshiftoss/hdwallet-native": "1.52.1", - "@shapeshiftoss/hdwallet-portis": "1.52.1", - "@shapeshiftoss/hdwallet-tallyho": "1.52.1", - "@shapeshiftoss/hdwallet-trezor": "1.52.1", - "@shapeshiftoss/hdwallet-trezor-connect": "1.52.1", - "@shapeshiftoss/hdwallet-walletconnect": "1.52.1", - "@shapeshiftoss/hdwallet-xdefi": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.2", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.2", + "@shapeshiftoss/hdwallet-keplr": "1.52.2", + "@shapeshiftoss/hdwallet-ledger": "1.52.2", + "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.2", + "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.2", + "@shapeshiftoss/hdwallet-metamask": "1.52.2", + "@shapeshiftoss/hdwallet-native": "1.52.2", + "@shapeshiftoss/hdwallet-portis": "1.52.2", + "@shapeshiftoss/hdwallet-tallyho": "1.52.2", + "@shapeshiftoss/hdwallet-trezor": "1.52.2", + "@shapeshiftoss/hdwallet-trezor-connect": "1.52.2", + "@shapeshiftoss/hdwallet-walletconnect": "1.52.2", + "@shapeshiftoss/hdwallet-xdefi": "1.52.2", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index 493ffed04..eca70978d 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.1", + "version": "1.52.2", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.1", - "@shapeshiftoss/hdwallet-keepkey": "1.52.1", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.1", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.1", - "@shapeshiftoss/hdwallet-ledger": "1.52.1", - "@shapeshiftoss/hdwallet-native": "1.52.1", - "@shapeshiftoss/hdwallet-portis": "1.52.1", - "@shapeshiftoss/hdwallet-trezor": "1.52.1", - "@shapeshiftoss/hdwallet-xdefi": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-keepkey": "1.52.2", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.2", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.2", + "@shapeshiftoss/hdwallet-ledger": "1.52.2", + "@shapeshiftoss/hdwallet-native": "1.52.2", + "@shapeshiftoss/hdwallet-portis": "1.52.2", + "@shapeshiftoss/hdwallet-trezor": "1.52.2", + "@shapeshiftoss/hdwallet-xdefi": "1.52.2", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index 6a0595517..bf0d360cc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.1", + "version": "1.52.2", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index 6426139d3..c423007ee 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json index 914d9f238..b8cdddd4a 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index 00d5b9756..e2d2fbe30 100644 --- a/packages/hdwallet-keepkey-chromeusb/package.json +++ b/packages/hdwallet-keepkey-chromeusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-chromeusb", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.1", - "@shapeshiftoss/hdwallet-keepkey": "1.52.1" + "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-keepkey": "1.52.2" } } diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index 2a477ff7c..7096678eb 100644 --- a/packages/hdwallet-keepkey-electron/package.json +++ b/packages/hdwallet-keepkey-electron/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-electron", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.1", + "@shapeshiftoss/hdwallet-keepkey": "1.52.2", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index d6231761f..552dfa281 100644 --- a/packages/hdwallet-keepkey-nodehid/package.json +++ b/packages/hdwallet-keepkey-nodehid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodehid", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.1" + "@shapeshiftoss/hdwallet-keepkey": "1.52.2" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index 4dad3d42b..f286b37d5 100644 --- a/packages/hdwallet-keepkey-nodewebusb/package.json +++ b/packages/hdwallet-keepkey-nodewebusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.1", - "@shapeshiftoss/hdwallet-keepkey": "1.52.1" + "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-keepkey": "1.52.2" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index 9a2b13dbe..586b21e4d 100644 --- a/packages/hdwallet-keepkey-tcp/package.json +++ b/packages/hdwallet-keepkey-tcp/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-tcp", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.1", - "@shapeshiftoss/hdwallet-keepkey": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-keepkey": "1.52.2", "axios": "^0.21.1" } } diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index 772fe9b4a..8cec4c177 100644 --- a/packages/hdwallet-keepkey-webusb/package.json +++ b/packages/hdwallet-keepkey-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-webusb", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.1", - "@shapeshiftoss/hdwallet-keepkey": "1.52.1" + "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-keepkey": "1.52.2" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4" diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index b397f8981..de940cd53 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^3.3.0", "@keepkey/device-protocol": "^7.12.2", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "bignumber.js": "^9.0.1", "bnb-javascript-sdk-nobroadcast": "^2.16.14", diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json index ac6443272..8e1f436c1 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/caip": "8.15.0", - "@shapeshiftoss/hdwallet-core": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@shapeshiftoss/types": "3.1.3", "base64-js": "^1.5.1", diff --git a/packages/hdwallet-ledger-webhid/package.json b/packages/hdwallet-ledger-webhid/package.json index d10f8198e..086931b23 100644 --- a/packages/hdwallet-ledger-webhid/package.json +++ b/packages/hdwallet-ledger-webhid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webhid", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -19,8 +19,8 @@ "@ledgerhq/hw-transport": "^6.7.0", "@ledgerhq/hw-transport-webhid": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", - "@shapeshiftoss/hdwallet-core": "1.52.1", - "@shapeshiftoss/hdwallet-ledger": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-ledger": "1.52.2", "@types/w3c-web-hid": "^1.0.2" }, "devDependencies": { diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index 64bafa17b..727b132ec 100644 --- a/packages/hdwallet-ledger-webusb/package.json +++ b/packages/hdwallet-ledger-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webusb", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -20,8 +20,8 @@ "@ledgerhq/hw-transport-webusb": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", "@ledgerhq/logs": "^6.10.1", - "@shapeshiftoss/hdwallet-core": "1.52.1", - "@shapeshiftoss/hdwallet-ledger": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-ledger": "1.52.2", "@types/w3c-web-usb": "^1.0.4", "p-queue": "^7.4.1" }, diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index a11c5de49..2444e6bde 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -18,7 +18,7 @@ "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", "bitcoinjs-message": "^2.0.0", diff --git a/packages/hdwallet-metamask-shapeshift-multichain/package.json b/packages/hdwallet-metamask-shapeshift-multichain/package.json index 9b0b367cb..dc6e85bba 100644 --- a/packages/hdwallet-metamask-shapeshift-multichain/package.json +++ b/packages/hdwallet-metamask-shapeshift-multichain/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-shapeshift-multichain", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", "@shapeshiftoss/common-api": "^9.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", "@shapeshiftoss/metamask-snaps-adapter": "^1.0.8", "@shapeshiftoss/metamask-snaps-types": "^1.0.8", "eth-rpc-errors": "^4.0.3", diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index 87789bb81..b087e3171 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", - "@shapeshiftoss/hdwallet-core": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index 9165a82f8..98683aee4 100644 --- a/packages/hdwallet-native-vault/package.json +++ b/packages/hdwallet-native-vault/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native-vault", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-native": "1.52.1", + "@shapeshiftoss/hdwallet-native": "1.52.2", "bip39": "^3.0.4", "hash-wasm": "^4.9.0", "idb-keyval": "^6.0.3", diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index 992b47a60..f0afad1a6 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", "@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6", - "@shapeshiftoss/hdwallet-core": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index 4d35c5551..a05b5b7b4 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@portis/web3": "3.0.10", - "@shapeshiftoss/hdwallet-core": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index f937737bf..87b9784b6 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-tallyho", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", "lodash": "^4.17.21", "tallyho-onboarding": "^1.0.2" }, diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index 503f47c65..a1e5713a5 100644 --- a/packages/hdwallet-trezor-connect/package.json +++ b/packages/hdwallet-trezor-connect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor-connect", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.1", - "@shapeshiftoss/hdwallet-trezor": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-trezor": "1.52.2", "@trezor/rollout": "^1.2.0", "trezor-connect": "^8.2.1" } diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index 35f051c4c..21a948eef 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", "base64-js": "^1.5.1", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index c573c6bc3..fc1e114f6 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", "@walletconnect/qrcode-modal": "^1.7.8", "@walletconnect/web3-provider": "^1.7.8", "ethers": "^5.6.5" diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index bcdac34f1..f1b1097ec 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", "@walletconnect/ethereum-provider": "^2.10.1", "@walletconnect/modal": "^2.6.2", "ethers": "^5.6.5" diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index 39e3e4ef3..f4a6f6b75 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-xdefi", - "version": "1.52.1", + "version": "1.52.2", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.1", + "@shapeshiftoss/hdwallet-core": "1.52.2", "lodash": "^4.17.21" }, "devDependencies": { From a81ccf29fc4813c5f677ab1cf56ae7b1eabc5f1f Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 4 Oct 2023 08:37:14 +0100 Subject: [PATCH 003/108] feat: add missing scriptTypes in sandbox --- examples/sandbox/index.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/sandbox/index.ts b/examples/sandbox/index.ts index 9c0901f34..0ca96ac76 100644 --- a/examples/sandbox/index.ts +++ b/examples/sandbox/index.ts @@ -635,12 +635,14 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Bitcoin", + scriptType: core.BTCInputScriptType.SpendAddress, }, { addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 1], curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Bitcoin", + scriptType: core.BTCInputScriptType.SpendWitness, }, { addressNList: [0x80000000 + 49, 0x80000000 + 0, 0x80000000 + 0], @@ -656,6 +658,7 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Bitcoin Cash", + scriptType: core.BTCInputScriptType.SpendAddress, }, ]; const ltcGetPublicKeysInput = [ From 17d94ace8e97f3c50b6f33f7176c02568a3b429d Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 5 Oct 2023 00:56:09 +0200 Subject: [PATCH 004/108] fix: ledger sandbox xpubs --- examples/sandbox/index.ts | 30 +++++++-------- packages/hdwallet-ledger/src/bitcoin.ts | 9 +++-- packages/hdwallet-ledger/src/utxoUtils.ts | 47 ++++++++++++++++++----- 3 files changed, 57 insertions(+), 29 deletions(-) diff --git a/examples/sandbox/index.ts b/examples/sandbox/index.ts index 0ca96ac76..e19c78df9 100644 --- a/examples/sandbox/index.ts +++ b/examples/sandbox/index.ts @@ -631,33 +631,30 @@ $getXpubs.each(function () { const btcGetPublicKeysInput = [ { - addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 0], - curve: "secp256k1", - showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Bitcoin", - scriptType: core.BTCInputScriptType.SpendAddress, - }, - { - addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 1], + addressNList: [2147483732, 2147483648, 2147483648], curve: "secp256k1", - showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it - coin: "Bitcoin", scriptType: core.BTCInputScriptType.SpendWitness, }, { - addressNList: [0x80000000 + 49, 0x80000000 + 0, 0x80000000 + 0], - curve: "secp256k1", - showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Bitcoin", + addressNList: [2147483697, 2147483648, 2147483648], + curve: "secp256k1", scriptType: core.BTCInputScriptType.SpendP2SHWitness, }, + { + coin: "Bitcoin", + addressNList: [2147483692, 2147483648, 2147483648], + curve: "secp256k1", + scriptType: core.BTCInputScriptType.SpendAddress, + }, ]; const bchGetPublicKeysInput = [ { addressNList: [0x80000000 + 44, 0x80000000 + 145, 0x80000000 + 0], curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it - coin: "Bitcoin Cash", + coin: "BitcoinCash", scriptType: core.BTCInputScriptType.SpendAddress, }, ]; @@ -668,7 +665,7 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Litecoin", - scriptType: "p2wpkh", + scriptType: core.BTCInputScriptType.SpendWitness, }, // SegwitP2sh { @@ -676,7 +673,7 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Litecoin", - scriptType: "p2sh-p2wpkh", + scriptType: core.BTCInputScriptType.SpendP2SHWitness, }, // P2Pksh { @@ -684,7 +681,7 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Litecoin", - scriptType: "p2pkh", + scriptType: core.BTCInputScriptType.SpendAddress, }, ]; const dogeGetPublicKeysInput = [ @@ -693,6 +690,7 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Dogecoin", + scriptType: core.BTCInputScriptType.SpendAddress, }, ]; const hardenedPathGetPublicKeysInput = [ diff --git a/packages/hdwallet-ledger/src/bitcoin.ts b/packages/hdwallet-ledger/src/bitcoin.ts index 73263259d..624e0a48a 100644 --- a/packages/hdwallet-ledger/src/bitcoin.ts +++ b/packages/hdwallet-ledger/src/bitcoin.ts @@ -72,9 +72,12 @@ export async function btcGetPublicKeys( const { payload: _xpub } = getWalletXpubResponse; - // Ledger returns LTC pubkeys in Ltub format for all scriptTypes. It *is* the correct account, but not in the format we want. - // We need to convert SegWit pubkeys to Mtubs, and SegWit native to zpubs. - const xpub = convertXpubVersion(_xpub, scriptTypeToAccountType[getPublicKey.scriptType]); + // Ledger returns + // - LTC pubkeys in Ltub format for all scriptTypes. + // - BTC pubkeys in xpub format for all scriptTypes + // They *are* the correct accounts, but not in the format we want. + // We need to convert SegWit pubkeys to Mtubs/xpubs, and SegWit native to zpubs. + const xpub = convertXpubVersion(_xpub, scriptTypeToAccountType[getPublicKey.scriptType], getPublicKey.coin); xpubs.push({ xpub, diff --git a/packages/hdwallet-ledger/src/utxoUtils.ts b/packages/hdwallet-ledger/src/utxoUtils.ts index f46e0430a..23689f632 100644 --- a/packages/hdwallet-ledger/src/utxoUtils.ts +++ b/packages/hdwallet-ledger/src/utxoUtils.ts @@ -172,14 +172,38 @@ enum PublicKeyType { Mtub = "01b26ef6", } -const accountTypeToVersion = { - [UtxoAccountType.P2pkh]: Buffer.from(PublicKeyType.Ltub, "hex"), // no-op - [UtxoAccountType.SegwitP2sh]: Buffer.from(PublicKeyType.Mtub, "hex"), // LTub to Mtub - [UtxoAccountType.SegwitNative]: Buffer.from(PublicKeyType.zpub, "hex"), // Ltub to zpub -}; +const accountTypeToVersion = (() => { + const Litecoin = { + [UtxoAccountType.P2pkh]: Buffer.from(PublicKeyType.Ltub, "hex"), + [UtxoAccountType.SegwitP2sh]: Buffer.from(PublicKeyType.Mtub, "hex"), + [UtxoAccountType.SegwitNative]: Buffer.from(PublicKeyType.zpub, "hex"), + }; + + const Dogecoin = { + [UtxoAccountType.P2pkh]: Buffer.from(PublicKeyType.dgub, "hex"), + }; + const Bitcoin = { + [UtxoAccountType.P2pkh]: Buffer.from(PublicKeyType.xpub, "hex"), + [UtxoAccountType.SegwitP2sh]: Buffer.from(PublicKeyType.ypub, "hex"), + [UtxoAccountType.SegwitNative]: Buffer.from(PublicKeyType.zpub, "hex"), + }; -// We already get accounts in the format we want from Ledger - except LiteCoin SegWit/Native -const convertVersions = ["Ltub"]; + return (coin: string, type: UtxoAccountType) => { + switch (coin) { + case "Litecoin": + return Litecoin[type]; + case "Bitcoin": + return Bitcoin[type]; + case "Dogecoin": + if (type !== UtxoAccountType.P2pkh) throw new Error("Unsupported account type"); + return Dogecoin[type]; + default: + return Bitcoin[type]; // xpub, ypub, zpub + } + }; +})(); +// Legacy accounts should be left as-is +const convertVersions = ["Ltub", "xpub", "dgub"]; /** * Convert any public key into an xpub, ypub, or zpub based on account type @@ -190,8 +214,9 @@ const convertVersions = ["Ltub"]; * USE SPARINGLY - there aren't many cases where we should convert version bytes * @param {string} xpub - the public key provided by the wallet * @param {UtxoAccountType} accountType - The desired account type to be encoded into the public key + * @param {string} coin - The coin type, which will determine what version we derive */ -export function convertXpubVersion(xpub: string, accountType: UtxoAccountType | undefined) { +export function convertXpubVersion(xpub: string, accountType: UtxoAccountType | undefined, coin: string) { if (!accountType) return xpub; if (!convertVersions.includes(xpub.substring(0, 4))) { return xpub; @@ -199,10 +224,12 @@ export function convertXpubVersion(xpub: string, accountType: UtxoAccountType | const payload = decode(xpub); const version = payload.slice(0, 4); - if (version.compare(accountTypeToVersion[accountType]) !== 0) { + const desiredVersion = accountTypeToVersion(coin, accountType); + // eslint-disable-next-line no-console + if (version.compare(desiredVersion) !== 0) { // Get the key without the version code at the front const key = payload.slice(4); - return encode(Buffer.concat([accountTypeToVersion[accountType], key])); + return encode(Buffer.concat([desiredVersion, key])); } return xpub; } From dff23ed7c70db53f78b9e2939442923db9f5b54d Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 5 Oct 2023 00:59:15 +0200 Subject: [PATCH 005/108] feat: improve commentary --- packages/hdwallet-ledger/src/bitcoin.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/bitcoin.ts b/packages/hdwallet-ledger/src/bitcoin.ts index 624e0a48a..a71841a1c 100644 --- a/packages/hdwallet-ledger/src/bitcoin.ts +++ b/packages/hdwallet-ledger/src/bitcoin.ts @@ -75,8 +75,9 @@ export async function btcGetPublicKeys( // Ledger returns // - LTC pubkeys in Ltub format for all scriptTypes. // - BTC pubkeys in xpub format for all scriptTypes + // - Doge pubkeys in xpub format instead of dgub // They *are* the correct accounts, but not in the format we want. - // We need to convert SegWit pubkeys to Mtubs/xpubs, and SegWit native to zpubs. + // We need to convert SegWit pubkeys to Mtubs/ypubs, and SegWit native to zpubs, and Doge xpubs to dgubs. const xpub = convertXpubVersion(_xpub, scriptTypeToAccountType[getPublicKey.scriptType], getPublicKey.coin); xpubs.push({ From ab8821765578d8328bcacafad970dfff3297e660 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 5 Oct 2023 00:59:49 +0200 Subject: [PATCH 006/108] feat: cleanup --- packages/hdwallet-ledger/src/utxoUtils.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/utxoUtils.ts b/packages/hdwallet-ledger/src/utxoUtils.ts index 23689f632..c6fa7063f 100644 --- a/packages/hdwallet-ledger/src/utxoUtils.ts +++ b/packages/hdwallet-ledger/src/utxoUtils.ts @@ -225,7 +225,6 @@ export function convertXpubVersion(xpub: string, accountType: UtxoAccountType | const payload = decode(xpub); const version = payload.slice(0, 4); const desiredVersion = accountTypeToVersion(coin, accountType); - // eslint-disable-next-line no-console if (version.compare(desiredVersion) !== 0) { // Get the key without the version code at the front const key = payload.slice(4); From a16243f0fc5630e274491403215122db87191b8d Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 22:10:12 +0200 Subject: [PATCH 007/108] chore(release): publish 1.52.3 --- examples/sandbox/package.json | 32 +++++++++---------- integration/package.json | 20 ++++++------ lerna.json | 2 +- packages/hdwallet-coinbase/package.json | 4 +-- packages/hdwallet-core/package.json | 2 +- .../hdwallet-keepkey-chromeusb/package.json | 6 ++-- .../hdwallet-keepkey-electron/package.json | 4 +-- .../hdwallet-keepkey-nodehid/package.json | 4 +-- .../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-keplr/package.json | 4 +-- packages/hdwallet-ledger-webhid/package.json | 6 ++-- packages/hdwallet-ledger-webusb/package.json | 6 ++-- packages/hdwallet-ledger/package.json | 4 +-- .../package.json | 4 +-- packages/hdwallet-metamask/package.json | 4 +-- packages/hdwallet-native-vault/package.json | 4 +-- packages/hdwallet-native/package.json | 4 +-- packages/hdwallet-portis/package.json | 4 +-- packages/hdwallet-tallyho/package.json | 4 +-- packages/hdwallet-trezor-connect/package.json | 6 ++-- packages/hdwallet-trezor/package.json | 4 +-- packages/hdwallet-walletconnect/package.json | 4 +-- .../hdwallet-walletconnectV2/package.json | 4 +-- packages/hdwallet-xdefi/package.json | 4 +-- 27 files changed, 81 insertions(+), 81 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 851be8376..1eaf137f9 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.2", - "@shapeshiftoss/hdwallet-keplr": "1.52.2", - "@shapeshiftoss/hdwallet-ledger": "1.52.2", - "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.2", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.2", - "@shapeshiftoss/hdwallet-metamask": "1.52.2", - "@shapeshiftoss/hdwallet-native": "1.52.2", - "@shapeshiftoss/hdwallet-portis": "1.52.2", - "@shapeshiftoss/hdwallet-tallyho": "1.52.2", - "@shapeshiftoss/hdwallet-trezor": "1.52.2", - "@shapeshiftoss/hdwallet-trezor-connect": "1.52.2", - "@shapeshiftoss/hdwallet-walletconnect": "1.52.2", - "@shapeshiftoss/hdwallet-xdefi": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.3", + "@shapeshiftoss/hdwallet-keplr": "1.52.3", + "@shapeshiftoss/hdwallet-ledger": "1.52.3", + "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.3", + "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.3", + "@shapeshiftoss/hdwallet-metamask": "1.52.3", + "@shapeshiftoss/hdwallet-native": "1.52.3", + "@shapeshiftoss/hdwallet-portis": "1.52.3", + "@shapeshiftoss/hdwallet-tallyho": "1.52.3", + "@shapeshiftoss/hdwallet-trezor": "1.52.3", + "@shapeshiftoss/hdwallet-trezor-connect": "1.52.3", + "@shapeshiftoss/hdwallet-walletconnect": "1.52.3", + "@shapeshiftoss/hdwallet-xdefi": "1.52.3", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index eca70978d..485ea2048 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.2", + "version": "1.52.3", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.2", - "@shapeshiftoss/hdwallet-ledger": "1.52.2", - "@shapeshiftoss/hdwallet-native": "1.52.2", - "@shapeshiftoss/hdwallet-portis": "1.52.2", - "@shapeshiftoss/hdwallet-trezor": "1.52.2", - "@shapeshiftoss/hdwallet-xdefi": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.3", + "@shapeshiftoss/hdwallet-ledger": "1.52.3", + "@shapeshiftoss/hdwallet-native": "1.52.3", + "@shapeshiftoss/hdwallet-portis": "1.52.3", + "@shapeshiftoss/hdwallet-trezor": "1.52.3", + "@shapeshiftoss/hdwallet-xdefi": "1.52.3", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index bf0d360cc..9f9579f0c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.2", + "version": "1.52.3", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index c423007ee..b8f1dafd4 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json index b8cdddd4a..9bbed2772 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index e2d2fbe30..f2fdc6b02 100644 --- a/packages/hdwallet-keepkey-chromeusb/package.json +++ b/packages/hdwallet-keepkey-chromeusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-chromeusb", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey": "1.52.2" + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3" } } diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index 7096678eb..b63489f80 100644 --- a/packages/hdwallet-keepkey-electron/package.json +++ b/packages/hdwallet-keepkey-electron/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-electron", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.2", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index 552dfa281..da40891f1 100644 --- a/packages/hdwallet-keepkey-nodehid/package.json +++ b/packages/hdwallet-keepkey-nodehid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodehid", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.2" + "@shapeshiftoss/hdwallet-keepkey": "1.52.3" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index f286b37d5..6bf556d75 100644 --- a/packages/hdwallet-keepkey-nodewebusb/package.json +++ b/packages/hdwallet-keepkey-nodewebusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey": "1.52.2" + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index 586b21e4d..d4be0a5d8 100644 --- a/packages/hdwallet-keepkey-tcp/package.json +++ b/packages/hdwallet-keepkey-tcp/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-tcp", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3", "axios": "^0.21.1" } } diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index 8cec4c177..c75d5a98b 100644 --- a/packages/hdwallet-keepkey-webusb/package.json +++ b/packages/hdwallet-keepkey-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-webusb", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey": "1.52.2" + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4" diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index de940cd53..e0d71737c 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^3.3.0", "@keepkey/device-protocol": "^7.12.2", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "bignumber.js": "^9.0.1", "bnb-javascript-sdk-nobroadcast": "^2.16.14", diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json index 8e1f436c1..906c72fe8 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/caip": "8.15.0", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@shapeshiftoss/types": "3.1.3", "base64-js": "^1.5.1", diff --git a/packages/hdwallet-ledger-webhid/package.json b/packages/hdwallet-ledger-webhid/package.json index 086931b23..5c4e08268 100644 --- a/packages/hdwallet-ledger-webhid/package.json +++ b/packages/hdwallet-ledger-webhid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webhid", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -19,8 +19,8 @@ "@ledgerhq/hw-transport": "^6.7.0", "@ledgerhq/hw-transport-webhid": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-ledger": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-ledger": "1.52.3", "@types/w3c-web-hid": "^1.0.2" }, "devDependencies": { diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index 727b132ec..d2dc648bf 100644 --- a/packages/hdwallet-ledger-webusb/package.json +++ b/packages/hdwallet-ledger-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webusb", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -20,8 +20,8 @@ "@ledgerhq/hw-transport-webusb": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", "@ledgerhq/logs": "^6.10.1", - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-ledger": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-ledger": "1.52.3", "@types/w3c-web-usb": "^1.0.4", "p-queue": "^7.4.1" }, diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index 2444e6bde..bdce74b92 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -18,7 +18,7 @@ "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", "bitcoinjs-message": "^2.0.0", diff --git a/packages/hdwallet-metamask-shapeshift-multichain/package.json b/packages/hdwallet-metamask-shapeshift-multichain/package.json index dc6e85bba..e70d62c8f 100644 --- a/packages/hdwallet-metamask-shapeshift-multichain/package.json +++ b/packages/hdwallet-metamask-shapeshift-multichain/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-shapeshift-multichain", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", "@shapeshiftoss/common-api": "^9.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@shapeshiftoss/metamask-snaps-adapter": "^1.0.8", "@shapeshiftoss/metamask-snaps-types": "^1.0.8", "eth-rpc-errors": "^4.0.3", diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index b087e3171..a3c4c81b6 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index 98683aee4..e4c9f5314 100644 --- a/packages/hdwallet-native-vault/package.json +++ b/packages/hdwallet-native-vault/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native-vault", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-native": "1.52.2", + "@shapeshiftoss/hdwallet-native": "1.52.3", "bip39": "^3.0.4", "hash-wasm": "^4.9.0", "idb-keyval": "^6.0.3", diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index f0afad1a6..44655010b 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", "@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index a05b5b7b4..6d55d31ca 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@portis/web3": "3.0.10", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index 87b9784b6..e688dc75b 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-tallyho", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "lodash": "^4.17.21", "tallyho-onboarding": "^1.0.2" }, diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index a1e5713a5..8196d257c 100644 --- a/packages/hdwallet-trezor-connect/package.json +++ b/packages/hdwallet-trezor-connect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor-connect", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-trezor": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-trezor": "1.52.3", "@trezor/rollout": "^1.2.0", "trezor-connect": "^8.2.1" } diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index 21a948eef..795a537a5 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "base64-js": "^1.5.1", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index fc1e114f6..8101de3f3 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@walletconnect/qrcode-modal": "^1.7.8", "@walletconnect/web3-provider": "^1.7.8", "ethers": "^5.6.5" diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index f1b1097ec..ff4681cca 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@walletconnect/ethereum-provider": "^2.10.1", "@walletconnect/modal": "^2.6.2", "ethers": "^5.6.5" diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index f4a6f6b75..1d2c43eb9 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-xdefi", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "lodash": "^4.17.21" }, "devDependencies": { From 8cfdfa367096c362b8a3be52c636afe4b2736379 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:08:31 +0200 Subject: [PATCH 008/108] feat: ledger thorchain support --- .../hdwallet-ledger-webusb/src/transport.ts | 7 + packages/hdwallet-ledger/package.json | 4 +- packages/hdwallet-ledger/src/index.ts | 1 + packages/hdwallet-ledger/src/ledger.ts | 6 + .../hdwallet-ledger/src/thorchain/common.ts | 113 ++++++ .../hdwallet-ledger/src/thorchain/helpers.ts | 68 ++++ .../src/thorchain/hw-app-thor.ts | 331 ++++++++++++++++++ .../hdwallet-ledger/src/thorchain/index.ts | 26 ++ packages/hdwallet-ledger/src/transport.ts | 2 +- yarn.lock | 7 + 10 files changed, 563 insertions(+), 2 deletions(-) create mode 100644 packages/hdwallet-ledger/src/thorchain/common.ts create mode 100644 packages/hdwallet-ledger/src/thorchain/helpers.ts create mode 100644 packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts create mode 100644 packages/hdwallet-ledger/src/thorchain/index.ts diff --git a/packages/hdwallet-ledger-webusb/src/transport.ts b/packages/hdwallet-ledger-webusb/src/transport.ts index 52623993a..d41e8cb34 100644 --- a/packages/hdwallet-ledger-webusb/src/transport.ts +++ b/packages/hdwallet-ledger-webusb/src/transport.ts @@ -79,6 +79,13 @@ export async function translateCoinAndMethod> { switch (coin) { + case "Rune": { + const thor = new ledger.THORChainApp({ transport }); + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore TODO(gomes): fixme + const methodInstance = thor[method as LedgerTransportMethodName<"Rune">].bind(thor); + return methodInstance as LedgerTransportMethod; + } case "Btc": { const btc = new Btc({ transport }); const methodInstance = btc[method as LedgerTransportMethodName<"Btc">].bind(btc); diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index bdce74b92..e93a9c5cb 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -25,7 +25,9 @@ "bs58check": "2.1.2", "ethereumjs-tx": "1.3.7", "ethereumjs-util": "^6.1.0", - "lodash": "^4.17.21" + "lodash": "^4.17.21", + "ripemd160": "^2.0.2", + "@types/ripemd160": "^2.0.1" }, "devDependencies": { "@ledgerhq/hw-app-btc": "^10.0.8", diff --git a/packages/hdwallet-ledger/src/index.ts b/packages/hdwallet-ledger/src/index.ts index c73f59c8c..063c34f8e 100644 --- a/packages/hdwallet-ledger/src/index.ts +++ b/packages/hdwallet-ledger/src/index.ts @@ -1,5 +1,6 @@ export * from "./bitcoin"; export * from "./ethereum"; +export * from "./thorchain"; export * from "./ledger"; export * from "./transport"; export * from "./utils"; diff --git a/packages/hdwallet-ledger/src/ledger.ts b/packages/hdwallet-ledger/src/ledger.ts index 5a79bd54c..de357b002 100644 --- a/packages/hdwallet-ledger/src/ledger.ts +++ b/packages/hdwallet-ledger/src/ledger.ts @@ -3,6 +3,7 @@ import _ from "lodash"; import * as btc from "./bitcoin"; import * as eth from "./ethereum"; +import * as thorchain from "./thorchain"; import { LedgerTransport } from "./transport"; import { coinToLedgerAppName, handleError } from "./utils"; @@ -302,6 +303,8 @@ export class LedgerHDWallet implements core.HDWallet, core.BTCWallet, core.ETHWa readonly _supportsPolygon = true; readonly _supportsGnosis = true; readonly _supportsArbitrum = true; + readonly _supportsThorchainInfo = true; + readonly _supportsThorchain = true; _isLedger = true; @@ -509,6 +512,9 @@ export class LedgerHDWallet implements core.HDWallet, core.BTCWallet, core.ETHWa await this.validateCurrentApp(msg.coin); return btc.btcGetAddress(this.transport, msg); } + public thorchainGetAddress(msg: core.ThorchainGetAddress): Promise { + return thorchain.thorchainGetAddress(this.transport, msg); + } public async btcSignTx(msg: core.BTCSignTxLedger): Promise { await this.validateCurrentApp(msg.coin); diff --git a/packages/hdwallet-ledger/src/thorchain/common.ts b/packages/hdwallet-ledger/src/thorchain/common.ts new file mode 100644 index 000000000..0f6cb4f5a --- /dev/null +++ b/packages/hdwallet-ledger/src/thorchain/common.ts @@ -0,0 +1,113 @@ +export enum ErrorCode { + NoError = 0x9000, +} + +export const CLA = 0x55; +export const CHUNK_SIZE = 250; +export const APP_KEY = "CSM"; + +export const INS = { + GET_VERSION: 0x00, + INS_PUBLIC_KEY_SECP256K1: 0x01, // Obsolete + SIGN_SECP256K1: 0x02, + GET_ADDR_SECP256K1: 0x04, +}; + +export const PAYLOAD_TYPE = { + INIT: 0x00, + ADD: 0x01, + LAST: 0x02, +}; + +export const P1_VALUES = { + ONLY_RETRIEVE: 0x00, + SHOW_ADDRESS_IN_DEVICE: 0x01, +}; + +const ERROR_DESCRIPTION = { + 1: "U2F: Unknown", + 2: "U2F: Bad request", + 3: "U2F: Configuration unsupported", + 4: "U2F: Device Ineligible", + 5: "U2F: Timeout", + 14: "Timeout", + 0x9000: "No errors", + 0x9001: "Device is busy", + 0x6802: "Error deriving keys", + 0x6400: "Execution Error", + 0x6700: "Wrong Length", + 0x6982: "Empty Buffer", + 0x6983: "Output buffer too small", + 0x6984: "Data is invalid", + 0x6985: "Conditions not satisfied", + 0x6986: "Transaction rejected", + 0x6a80: "Bad key handle", + 0x6b00: "Invalid P1/P2", + 0x6d00: "Instruction not supported", + 0x6e00: "App does not seem to be open", + 0x6f00: "Unknown error", + 0x6f01: "Sign/verify error", +}; + +export function errorCodeToString(statusCode: any) { + if (statusCode in ERROR_DESCRIPTION) return ERROR_DESCRIPTION[statusCode as 1]; + return `Unknown Status Code: ${statusCode}`; +} + +export function processErrorResponse(response: any) { + if (response) { + if ( + typeof response === "object" && + response !== null && + !(response instanceof Array) && + !(response instanceof Date) + ) { + if (Object.prototype.hasOwnProperty.call(response, "statusCode")) { + return { + return_code: response.statusCode, + error_message: errorCodeToString(response.statusCode), + }; + } + + if ( + Object.prototype.hasOwnProperty.call(response, "return_code") && + Object.prototype.hasOwnProperty.call(response, "error_message") + ) { + return response; + } + } + return { + return_code: 0xffff, + error_message: response.toString(), + }; + } + + return { + return_code: 0xffff, + error_message: response.toString(), + }; +} + +export async function getVersion(transport: any) { + return transport.send(CLA, INS.GET_VERSION, 0, 0).then((response: any) => { + const errorCodeData = response.slice(-2); + const returnCode = errorCodeData[0] * 256 + errorCodeData[1]; + + let targetId = 0; + if (response.length >= 9) { + targetId = (response[5] << 24) + (response[6] << 16) + (response[7] << 8) + (response[8] << 0); + } + + return { + return_code: returnCode, + error_message: errorCodeToString(returnCode), + // /// + test_mode: response[0] !== 0, + major: response[1], + minor: response[2], + patch: response[3], + device_locked: response[4] === 1, + target_id: targetId.toString(16), + }; + }, processErrorResponse); +} diff --git a/packages/hdwallet-ledger/src/thorchain/helpers.ts b/packages/hdwallet-ledger/src/thorchain/helpers.ts new file mode 100644 index 000000000..81dca3828 --- /dev/null +++ b/packages/hdwallet-ledger/src/thorchain/helpers.ts @@ -0,0 +1,68 @@ +import { CLA, ErrorCode, errorCodeToString, INS, PAYLOAD_TYPE, processErrorResponse } from "./common"; + +const signSendChunkv1 = async (app: any, chunkIdx: any, chunkNum: any, chunk: any) => { + return app.transport + .send(CLA, INS.SIGN_SECP256K1, chunkIdx, chunkNum, chunk, [ErrorCode.NoError, 0x6984, 0x6a80]) + .then((response: any) => { + const errorCodeData = response.slice(-2); + const returnCode = errorCodeData[0] * 256 + errorCodeData[1]; + let errorMessage = errorCodeToString(returnCode); + + if (returnCode === 0x6a80 || returnCode === 0x6984) { + errorMessage = `${errorMessage} : ${response.slice(0, response.length - 2).toString("ascii")}`; + } + + let signature = null; + if (response.length > 2) { + signature = response.slice(0, response.length - 2); + } + + return { + signature, + return_code: returnCode, + error_message: errorMessage, + }; + }, processErrorResponse); +}; + +export const serializePathv2 = (path: any) => { + if (!path || path.length !== 5) { + throw new Error("Invalid path."); + } + + const buf = Buffer.alloc(20); + buf.writeUInt32LE(0x80000000 + path[0], 0); + buf.writeUInt32LE(0x80000000 + path[1], 4); + buf.writeUInt32LE(0x80000000 + path[2], 8); + buf.writeUInt32LE(path[3], 12); + buf.writeUInt32LE(path[4], 16); + + return buf; +}; + +export const signSendChunkv2 = async (app: any, chunkIdx: any, chunkNum: any, chunk: any) => { + let payloadType = PAYLOAD_TYPE.ADD; + if (chunkIdx === 1) { + payloadType = PAYLOAD_TYPE.INIT; + } + if (chunkIdx === chunkNum) { + payloadType = PAYLOAD_TYPE.LAST; + } + + return signSendChunkv1(app, payloadType, 0, chunk); +}; + +export const publicKeyv2 = async (app: any, data: any) => { + return app.transport.send(CLA, INS.GET_ADDR_SECP256K1, 0, 0, data, [ErrorCode.NoError]).then((response: any) => { + const errorCodeData = response.slice(-2); + const returnCode = errorCodeData[0] * 256 + errorCodeData[1]; + const compressedPk = Buffer.from(response.slice(0, 33)); + + return { + pk: "OBSOLETE PROPERTY", + compressed_pk: compressedPk, + return_code: returnCode, + error_message: errorCodeToString(returnCode), + }; + }, processErrorResponse); +}; diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts new file mode 100644 index 000000000..18b20982b --- /dev/null +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -0,0 +1,331 @@ +/** ****************************************************************************** + * (c) 2019 ZondaX GmbH + * (c) 2016-2017 Ledger + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ******************************************************************************* */ +import { bech32 } from "@scure/base"; +import crypto from "crypto"; +import Ripemd160 from "ripemd160"; + +import { + APP_KEY, + CHUNK_SIZE, + CLA, + ErrorCode, + errorCodeToString, + getVersion, + INS, + P1_VALUES, + processErrorResponse, +} from "./common"; +import { publicKeyv2, serializePathv2, signSendChunkv2 } from "./helpers"; + +class THORChainApp { + transport: any; + versionResponse: any; + + constructor(transport: any, scrambleKey = APP_KEY) { + if (!transport) { + throw new Error("Transport has not been defined"); + } + + this.transport = transport as any; + transport.decorateAppAPIMethods( + this, + ["getVersion", "sign", "getAddressAndPubKey", "appInfo", "deviceInfo", "getBech32FromPK"], + scrambleKey + ); + } + + static serializeHRP(hrp: any) { + if (hrp == null || hrp.length < 3 || hrp.length > 83) { + throw new Error("Invalid HRP"); + } + const buf = Buffer.alloc(1 + hrp.length); + buf.writeUInt8(hrp.length, 0); + buf.write(hrp, 1); + return buf; + } + + static getBech32FromPK(hrp: any, pk: any) { + if (pk.length !== 33) { + throw new Error("expected compressed public key [31 bytes]"); + } + const hashSha256 = crypto.createHash("sha256").update(pk).digest(); + const hashRip = new Ripemd160().update(hashSha256).digest(); + // ts is drunk and doesn't like bech32.bech32 here + const encode = bech32.encode || (bech32 as any).bech32?.encode; + // ts is drunk and doesn't like bech32.bech32 here + const toWords = bech32.toWords || (bech32 as any).bech32?.toWords; + + return encode(hrp, toWords(hashRip)); + } + + async serializePath(path: string) { + this.versionResponse = await getVersion(this.transport); + + if (this.versionResponse.return_code !== ErrorCode.NoError) { + throw this.versionResponse; + } + + switch (this.versionResponse.major) { + case 2: + return serializePathv2(path); + default: + return { + return_code: 0x6400, + error_message: "App Version is not supported", + }; + } + } + + async signGetChunks(path: string, message: any) { + const serializedPath = await this.serializePath(path); + + const chunks = []; + chunks.push(serializedPath); + const buffer = Buffer.from(message); + + for (let i = 0; i < buffer.length; i += CHUNK_SIZE) { + let end = i + CHUNK_SIZE; + if (i > buffer.length) { + end = buffer.length; + } + chunks.push(buffer.slice(i, end)); + } + + return chunks; + } + + async getVersion() { + try { + this.versionResponse = await getVersion(this.transport); + return this.versionResponse; + } catch (e) { + return processErrorResponse(e); + } + } + + async appInfo() { + return this.transport.send(0xb0, 0x01, 0, 0).then((response: any) => { + const errorCodeData = response.slice(-2); + const returnCode = errorCodeData[0] * 256 + errorCodeData[1]; + + const result = {} as any; + + let appName = "err"; + let appVersion = "err"; + let flagLen = 0; + let flagsValue = 0; + + if (response[0] !== 1) { + // Ledger responds with format ID 1. There is no spec for any format != 1 + result.error_message = "response format ID not recognized"; + result.return_code = 0x9001; + } else { + const appNameLen = response[1]; + appName = response.slice(2, 2 + appNameLen).toString("ascii"); + let idx = 2 + appNameLen; + const appVersionLen = response[idx]; + idx += 1; + appVersion = response.slice(idx, idx + appVersionLen).toString("ascii"); + idx += appVersionLen; + const appFlagsLen = response[idx]; + idx += 1; + flagLen = appFlagsLen; + flagsValue = response[idx]; + } + + return { + return_code: returnCode, + error_message: errorCodeToString(returnCode), + // // + appName, + appVersion, + flagLen, + flagsValue, + + flag_recovery: (flagsValue & 1) !== 0, + + flag_signed_mcu_code: (flagsValue & 2) !== 0, + + flag_onboarded: (flagsValue & 4) !== 0, + + flag_pin_validated: (flagsValue & 128) !== 0, + }; + }, processErrorResponse); + } + + async deviceInfo() { + return this.transport.send(0xe0, 0x01, 0, 0, Buffer.from([]), [ErrorCode.NoError, 0x6e00]).then((response: any) => { + const errorCodeData = response.slice(-2); + const returnCode = errorCodeData[0] * 256 + errorCodeData[1]; + + if (returnCode === 0x6e00) { + return { + return_code: returnCode, + error_message: "This command is only available in the Dashboard", + }; + } + + const targetId = response.slice(0, 4).toString("hex"); + + let pos = 4; + const secureElementVersionLen = response[pos]; + pos += 1; + const seVersion = response.slice(pos, pos + secureElementVersionLen).toString(); + pos += secureElementVersionLen; + + const flagsLen = response[pos]; + pos += 1; + const flag = response.slice(pos, pos + flagsLen).toString("hex"); + pos += flagsLen; + + const mcuVersionLen = response[pos]; + pos += 1; + // Patch issue in mcu version + let tmp = response.slice(pos, pos + mcuVersionLen); + if (tmp[mcuVersionLen - 1] === 0) { + tmp = response.slice(pos, pos + mcuVersionLen - 1); + } + const mcuVersion = tmp.toString(); + + return { + return_code: returnCode, + error_message: errorCodeToString(returnCode), + // // + targetId, + seVersion, + flag, + mcuVersion, + }; + }, processErrorResponse); + } + + async publicKey(path: string) { + try { + const serializedPath = await this.serializePath(path); + + switch (this.versionResponse.major) { + case 2: { + const data = Buffer.concat([THORChainApp.serializeHRP("thor"), serializedPath as any]); + return await publicKeyv2(this, data); + } + default: + return { + return_code: 0x6400, + error_message: "App Version is not supported", + }; + } + } catch (e) { + return processErrorResponse(e); + } + } + + async getAddressAndPubKey(path: string, hrp: any) { + try { + return await this.serializePath(path) + .then((serializedPath) => { + const data = Buffer.concat([THORChainApp.serializeHRP(hrp), serializedPath as any]); + return this.transport + .send(CLA, INS.GET_ADDR_SECP256K1, P1_VALUES.ONLY_RETRIEVE, 0, data, [ErrorCode.NoError]) + .then((response: any) => { + const errorCodeData = response.slice(-2); + const returnCode = errorCodeData[0] * 256 + errorCodeData[1]; + + const compressedPk = Buffer.from(response.slice(0, 33)); + const bech32Address = Buffer.from(response.slice(33, -2)).toString(); + + return { + bech32_address: bech32Address, + compressed_pk: compressedPk, + return_code: returnCode, + error_message: errorCodeToString(returnCode), + }; + }, processErrorResponse); + }) + .catch((err) => processErrorResponse(err)); + } catch (e) { + return processErrorResponse(e); + } + } + + async showAddressAndPubKey(path: string, hrp: any) { + try { + return await this.serializePath(path) + .then((serializedPath) => { + const data = Buffer.concat([THORChainApp.serializeHRP(hrp), serializedPath as any]); + return this.transport + .send(CLA, INS.GET_ADDR_SECP256K1, P1_VALUES.SHOW_ADDRESS_IN_DEVICE, 0, data, [ErrorCode.NoError]) + .then((response: any) => { + const errorCodeData = response.slice(-2); + const returnCode = errorCodeData[0] * 256 + errorCodeData[1]; + + const compressedPk = Buffer.from(response.slice(0, 33)); + const bech32Address = Buffer.from(response.slice(33, -2)).toString(); + + return { + bech32_address: bech32Address, + compressed_pk: compressedPk, + return_code: returnCode, + error_message: errorCodeToString(returnCode), + }; + }, processErrorResponse); + }) + .catch((err) => processErrorResponse(err)); + } catch (e) { + return processErrorResponse(e); + } + } + + async signSendChunk(chunkIdx: number, chunkNum: number, chunk: any) { + switch (this.versionResponse.major) { + case 2: + return signSendChunkv2(this, chunkIdx, chunkNum, chunk); + default: + return { + return_code: 0x6400, + error_message: "App Version is not supported", + }; + } + } + + async sign(path: string, message: any) { + return this.signGetChunks(path, message).then((chunks) => { + return this.signSendChunk(1, chunks.length, chunks[0]).then(async (response) => { + let result = { + return_code: response.return_code, + error_message: response.error_message, + signature: null, + }; + + for (let i = 1; i < chunks.length; i += 1) { + result = await this.signSendChunk(1 + i, chunks.length, chunks[i]); + if (result.return_code !== ErrorCode.NoError) { + break; + } + } + + return { + return_code: result.return_code, + error_message: result.error_message, + // /// + signature: result.signature, + }; + }, processErrorResponse); + }, processErrorResponse); + } +} + +export { THORChainApp }; diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts new file mode 100644 index 000000000..87e9941e4 --- /dev/null +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -0,0 +1,26 @@ +import * as core from "@shapeshiftoss/hdwallet-core"; + +import { LedgerTransport } from ".."; +export * from "./common"; +export * from "./helpers"; +export * from "./hw-app-thor"; + +// TODO(gomes): move all below to ./thorchain + +export const thorchainGetAddress = async ( + transport: LedgerTransport, + msg: core.ThorchainGetAddress +): Promise => { + const addressAndPubkey = await transport.call( + "Rune", + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore TODO(gomes): fixme + "getAddressAndPubKey", + core.addressNListToBIP32(msg.addressNList), + "thor" + ); + + // eslint-disable-next-line no-console + console.log({ addressAndPubkey }); + return "TODO"; +}; diff --git a/packages/hdwallet-ledger/src/transport.ts b/packages/hdwallet-ledger/src/transport.ts index 70178159d..fe6889ba7 100644 --- a/packages/hdwallet-ledger/src/transport.ts +++ b/packages/hdwallet-ledger/src/transport.ts @@ -12,7 +12,7 @@ type MethodsOnly = { type UnwrapPromise = T extends Promise ? R : T; type DefinitelyCallable = T extends (...args: any) => any ? T : never; -export type LedgerTransportCoinType = null | "Btc" | "Eth"; +export type LedgerTransportCoinType = null | "Btc" | "Eth" | "Rune"; type CurriedWithTransport any> = T extends ( transport: Transport, ...args: infer R diff --git a/yarn.lock b/yarn.lock index 2dcfd0cfa..f29842390 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6431,6 +6431,13 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== +"@types/ripemd160@^2.0.1": + version "2.0.1" + resolved "http://localhost:4873/@types/ripemd160/-/ripemd160-2.0.1.tgz#e9ea7a26adf0e2541917fc2b1ecb497e8ced4b7e" + integrity sha512-l3pt9f8vK1tU2qBXY1aL7HofNnJKbpNa+2DznrD7j0lhaS4587e3iwgSMRDJFlidsrNjrrjIl8G+EeXFMjcGXg== + dependencies: + "@types/node" "*" + "@types/secp256k1@^4.0.1": version "4.0.3" resolved "https://registry.yarnpkg.com/@types/secp256k1/-/secp256k1-4.0.3.tgz#1b8e55d8e00f08ee7220b4d59a6abe89c37a901c" From 3054236ce1620edce006e635deb82270d99c4c86 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:17:10 +0200 Subject: [PATCH 009/108] feat: bumpy --- examples/sandbox/package.json | 32 ++++++++++++++++---------------- integration/package.json | 20 ++++++++++---------- lerna.json | 9 +++++++-- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 1eaf137f9..39c486a00 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3", + "version": "1.51.2-thorchain.1", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.3", - "@shapeshiftoss/hdwallet-keplr": "1.52.3", - "@shapeshiftoss/hdwallet-ledger": "1.52.3", - "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.3", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.3", - "@shapeshiftoss/hdwallet-metamask": "1.52.3", - "@shapeshiftoss/hdwallet-native": "1.52.3", - "@shapeshiftoss/hdwallet-portis": "1.52.3", - "@shapeshiftoss/hdwallet-tallyho": "1.52.3", - "@shapeshiftoss/hdwallet-trezor": "1.52.3", - "@shapeshiftoss/hdwallet-trezor-connect": "1.52.3", - "@shapeshiftoss/hdwallet-walletconnect": "1.52.3", - "@shapeshiftoss/hdwallet-xdefi": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.51.2", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.51.2", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.51.2", + "@shapeshiftoss/hdwallet-keplr": "1.51.2", + "@shapeshiftoss/hdwallet-ledger": "^1.51.2-thorchain.1", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.51.2-thorchain.1", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.51.2-thorchain.1", + "@shapeshiftoss/hdwallet-metamask": "1.51.2", + "@shapeshiftoss/hdwallet-native": "1.51.2", + "@shapeshiftoss/hdwallet-portis": "1.51.2", + "@shapeshiftoss/hdwallet-tallyho": "1.51.2", + "@shapeshiftoss/hdwallet-trezor": "1.51.2", + "@shapeshiftoss/hdwallet-trezor-connect": "1.51.2", + "@shapeshiftoss/hdwallet-walletconnect": "1.51.2", + "@shapeshiftoss/hdwallet-xdefi": "1.51.2", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index 485ea2048..49a23a78d 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3", + "version": "1.51.2-thorchain.1", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.3", - "@shapeshiftoss/hdwallet-ledger": "1.52.3", - "@shapeshiftoss/hdwallet-native": "1.52.3", - "@shapeshiftoss/hdwallet-portis": "1.52.3", - "@shapeshiftoss/hdwallet-trezor": "1.52.3", - "@shapeshiftoss/hdwallet-xdefi": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.51.2", + "@shapeshiftoss/hdwallet-keepkey": "1.51.2", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.51.2", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.51.2", + "@shapeshiftoss/hdwallet-ledger": "^1.51.2-thorchain.1", + "@shapeshiftoss/hdwallet-native": "1.51.2", + "@shapeshiftoss/hdwallet-portis": "1.51.2", + "@shapeshiftoss/hdwallet-trezor": "1.51.2", + "@shapeshiftoss/hdwallet-xdefi": "1.51.2", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index 9f9579f0c..ae744f5d3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3", + "version": "1.51.2-thorchain.1", "npmClient": "yarn", "useWorkspaces": true, "command": { @@ -8,5 +8,10 @@ "message": "chore(release): publish %v" } }, - "ignoreChanges": ["**/__fixtures__/**", "**/__tests__/**", "**/*.md", "**/.env"] + "ignoreChanges": [ + "**/__fixtures__/**", + "**/__tests__/**", + "**/*.md", + "**/.env" + ] } From 93a78267e78d22792d743b89f9fb220d7a06e6d5 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:25:27 +0200 Subject: [PATCH 010/108] feat: this --- examples/sandbox/package.json | 32 +++++++++---------- integration/package.json | 20 ++++++------ lerna.json | 2 +- .../src/thorchain/hw-app-thor.ts | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 39c486a00..a9496c59e 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.51.2-thorchain.1", + "version": "1.51.2-thorchain.2", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.51.2", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.51.2", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.51.2", - "@shapeshiftoss/hdwallet-keplr": "1.51.2", - "@shapeshiftoss/hdwallet-ledger": "^1.51.2-thorchain.1", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.51.2-thorchain.1", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.51.2-thorchain.1", - "@shapeshiftoss/hdwallet-metamask": "1.51.2", - "@shapeshiftoss/hdwallet-native": "1.51.2", - "@shapeshiftoss/hdwallet-portis": "1.51.2", - "@shapeshiftoss/hdwallet-tallyho": "1.51.2", - "@shapeshiftoss/hdwallet-trezor": "1.51.2", - "@shapeshiftoss/hdwallet-trezor-connect": "1.51.2", - "@shapeshiftoss/hdwallet-walletconnect": "1.51.2", - "@shapeshiftoss/hdwallet-xdefi": "1.51.2", + "@shapeshiftoss/hdwallet-core": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-keplr": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-ledger": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-metamask": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-native": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-portis": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-tallyho": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-trezor": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-walletconnect": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-xdefi": "^1.51.2-thorchain.2", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index 49a23a78d..86d7dafb6 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.51.2-thorchain.1", + "version": "1.51.2-thorchain.2", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.51.2", - "@shapeshiftoss/hdwallet-keepkey": "1.51.2", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.51.2", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.51.2", - "@shapeshiftoss/hdwallet-ledger": "^1.51.2-thorchain.1", - "@shapeshiftoss/hdwallet-native": "1.51.2", - "@shapeshiftoss/hdwallet-portis": "1.51.2", - "@shapeshiftoss/hdwallet-trezor": "1.51.2", - "@shapeshiftoss/hdwallet-xdefi": "1.51.2", + "@shapeshiftoss/hdwallet-core": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-keepkey": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-ledger": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-native": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-portis": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-trezor": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-xdefi": "^1.51.2-thorchain.2", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index ae744f5d3..c1ea00a0f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.51.2-thorchain.1", + "version": "1.51.2-thorchain.2", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index 18b20982b..97993b21f 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -41,7 +41,7 @@ class THORChainApp { } this.transport = transport as any; - transport.decorateAppAPIMethods( + transport.decorateAppAPIMethods.bind(transport)( this, ["getVersion", "sign", "getAddressAndPubKey", "appInfo", "deviceInfo", "getBech32FromPK"], scrambleKey From 7cbf5a39a29cac6ae6e53aea89074d23d502009e Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 22:47:22 +0200 Subject: [PATCH 011/108] feat: bump --- examples/sandbox/package.json | 32 ++++++++++++++++---------------- integration/package.json | 20 ++++++++++---------- lerna.json | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index a9496c59e..fb41793cb 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.51.2-thorchain.2", + "version": "1.51.2-thorchain.3", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-keplr": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-ledger": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-metamask": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-native": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-portis": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-tallyho": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-trezor": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-walletconnect": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-xdefi": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-core": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-keplr": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-ledger": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-metamask": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-native": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-portis": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-tallyho": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-trezor": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-walletconnect": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-xdefi": "^1.51.2-thorchain.3", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index 86d7dafb6..084acbd73 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.51.2-thorchain.2", + "version": "1.51.2-thorchain.3", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-keepkey": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-ledger": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-native": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-portis": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-trezor": "^1.51.2-thorchain.2", - "@shapeshiftoss/hdwallet-xdefi": "^1.51.2-thorchain.2", + "@shapeshiftoss/hdwallet-core": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-keepkey": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-ledger": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-native": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-portis": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-trezor": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-xdefi": "^1.51.2-thorchain.3", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index c1ea00a0f..00187685f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.51.2-thorchain.2", + "version": "1.51.2-thorchain.3", "npmClient": "yarn", "useWorkspaces": true, "command": { From 6aea4fd1f549a5385126629ffe7f8c67e73371c6 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 22:50:06 +0200 Subject: [PATCH 012/108] feat: bump --- examples/sandbox/package.json | 32 ++++++++++++++++---------------- integration/package.json | 20 ++++++++++---------- lerna.json | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index fb41793cb..be9da17eb 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.51.2-thorchain.3", + "version": "1.52.3-thorchain.4", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-keplr": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-ledger": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-metamask": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-native": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-portis": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-tallyho": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-trezor": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-walletconnect": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-xdefi": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.4", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index 084acbd73..6fa4c9641 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.51.2-thorchain.3", + "version": "1.52.3-thorchain.4", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-keepkey": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-ledger": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-native": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-portis": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-trezor": "^1.51.2-thorchain.3", - "@shapeshiftoss/hdwallet-xdefi": "^1.51.2-thorchain.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.4", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index 00187685f..9097b05f8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.51.2-thorchain.3", + "version": "1.52.3-thorchain.4", "npmClient": "yarn", "useWorkspaces": true, "command": { From 3aed88ca71e4547e8306a5036331857323da7750 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 23:01:40 +0200 Subject: [PATCH 013/108] fix: derp --- packages/hdwallet-ledger-webusb/src/transport.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger-webusb/src/transport.ts b/packages/hdwallet-ledger-webusb/src/transport.ts index d41e8cb34..214a2519d 100644 --- a/packages/hdwallet-ledger-webusb/src/transport.ts +++ b/packages/hdwallet-ledger-webusb/src/transport.ts @@ -80,7 +80,7 @@ export async function translateCoinAndMethod> { switch (coin) { case "Rune": { - const thor = new ledger.THORChainApp({ transport }); + const thor = new ledger.THORChainApp(transport); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore TODO(gomes): fixme const methodInstance = thor[method as LedgerTransportMethodName<"Rune">].bind(thor); From c1430a156f007244ff4c068b4d8d4aa6063c7027 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 23:30:43 +0200 Subject: [PATCH 014/108] feat: bump --- examples/sandbox/package.json | 32 ++++++++++++++++---------------- integration/package.json | 20 ++++++++++---------- lerna.json | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index be9da17eb..94c7f074f 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-thorchain.4", + "version": "1.52.3-thorchain.5", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.5", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index 6fa4c9641..c7f139a01 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-thorchain.4", + "version": "1.52.3-thorchain.5", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.4", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.4", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.5", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index 9097b05f8..0374df468 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-thorchain.4", + "version": "1.52.3-thorchain.5", "npmClient": "yarn", "useWorkspaces": true, "command": { From d0f1f795ee4bb9a0ada44a2b758d34a5d20b2ac6 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 23:30:55 +0200 Subject: [PATCH 015/108] feat: thor bip32 path array buffer --- packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index 97993b21f..a18d6f78f 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -233,8 +233,14 @@ class THORChainApp { } } - async getAddressAndPubKey(path: string, hrp: any) { + async getAddressAndPubKey(_path: string, hrp: any) { try { + // TODO(gomes): this is obviously temporary, find a better way to do this and pass our bip32 path in and make it work here + // eslint-disable-next-line no-console + console.log({ _path }); + const path = [44, 931, 0, 0, 0]; + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore TODO(gomes): fixme swapkit types are turbo derp return await this.serializePath(path) .then((serializedPath) => { const data = Buffer.concat([THORChainApp.serializeHRP(hrp), serializedPath as any]); From 7cb9bd665c2d72f3965e8c9159633a6caf274c8f Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 23:43:13 +0200 Subject: [PATCH 016/108] feat: boimp --- examples/sandbox/package.json | 32 ++++++++++++++++---------------- integration/package.json | 20 ++++++++++---------- lerna.json | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 94c7f074f..78db37277 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-thorchain.5", + "version": "1.52.3-thorchain.6", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.6", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index c7f139a01..b19f87224 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-thorchain.5", + "version": "1.52.3-thorchain.6", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.6", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index 0374df468..17ca3f683 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-thorchain.5", + "version": "1.52.3-thorchain.6", "npmClient": "yarn", "useWorkspaces": true, "command": { From c6b03dfad77433393aa61e8869fb982ed4bf1373 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 23:43:18 +0200 Subject: [PATCH 017/108] feat: look mom thor address --- packages/hdwallet-ledger/src/thorchain/index.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index 87e9941e4..b1b9ae272 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -20,7 +20,8 @@ export const thorchainGetAddress = async ( "thor" ); - // eslint-disable-next-line no-console - console.log({ addressAndPubkey }); - return "TODO"; + const maybeAddress = (addressAndPubkey.payload as any)?.bech32_address as string | undefined; + if (!maybeAddress) return null; + + return maybeAddress; }; From 1ca288a8403f3da83302806363bd60cb49ca5d73 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 09:31:20 +0200 Subject: [PATCH 018/108] feat: boimp --- examples/sandbox/package.json | 32 ++++++++++++++++---------------- integration/package.json | 20 ++++++++++---------- lerna.json | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 78db37277..cf37f0485 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-thorchain.6", + "version": "1.52.3-thorchain.7", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.7", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index b19f87224..d9814e597 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-thorchain.6", + "version": "1.52.3-thorchain.7", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.7", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index 17ca3f683..f94e16205 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-thorchain.6", + "version": "1.52.3-thorchain.7", "npmClient": "yarn", "useWorkspaces": true, "command": { From cad570b2862753c272de8fe93abe3c171f1bcb07 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 16:46:35 +0200 Subject: [PATCH 019/108] feat: prototype sign method --- packages/hdwallet-ledger/src/ledger.ts | 4 ++ .../src/thorchain/hw-app-thor.ts | 45 ++++++++++++++++++- .../hdwallet-ledger/src/thorchain/index.ts | 21 +++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/packages/hdwallet-ledger/src/ledger.ts b/packages/hdwallet-ledger/src/ledger.ts index de357b002..7078a3b88 100644 --- a/packages/hdwallet-ledger/src/ledger.ts +++ b/packages/hdwallet-ledger/src/ledger.ts @@ -516,6 +516,10 @@ export class LedgerHDWallet implements core.HDWallet, core.BTCWallet, core.ETHWa return thorchain.thorchainGetAddress(this.transport, msg); } + public thorchainSignTx(msg: core.ThorchainSignTx): Promise { + return thorchain.thorchainSignTx(this.transport, msg); + } + public async btcSignTx(msg: core.BTCSignTxLedger): Promise { await this.validateCurrentApp(msg.coin); return btc.btcSignTx(this, this.transport, msg); diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index a18d6f78f..ad965178f 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -15,6 +15,7 @@ * limitations under the License. ******************************************************************************* */ import { bech32 } from "@scure/base"; +import * as core from "@shapeshiftoss/hdwallet-core"; import crypto from "crypto"; import Ripemd160 from "ripemd160"; @@ -31,6 +32,30 @@ import { } from "./common"; import { publicKeyv2, serializePathv2, signSendChunkv2 } from "./helpers"; +const THOR_CHAIN = "thorchain-mainnet-v1"; +const THORCHAIN_SEND_GAS_FEE = "500000000"; + +const recursivelyOrderKeys = (unordered: any) => { + // If it's an array - recursively order any + // dictionary items within the array + if (Array.isArray(unordered)) { + unordered.forEach((item, index) => { + unordered[index] = recursivelyOrderKeys(item); + }); + return unordered; + } + + // If it's an object - let's order the keys + if (typeof unordered !== "object") return unordered; + const ordered: any = {}; + Object.keys(unordered) + .sort() + .forEach((key) => (ordered[key] = recursivelyOrderKeys(unordered[key]))); + return ordered; +}; + +const stringifyKeysInOrder = (data: any) => JSON.stringify(recursivelyOrderKeys(data)); + class THORChainApp { transport: any; versionResponse: any; @@ -307,8 +332,24 @@ class THORChainApp { } } - async sign(path: string, message: any) { - return this.signGetChunks(path, message).then((chunks) => { + async sign(_path: string, message: core.ThorchainSignTx) { + // eslint-disable-next-line no-console + console.log({ _path, message }); + const path = [44, 931, 0, 0, 0]; + + const fee = { amount: [], gas: THORCHAIN_SEND_GAS_FEE }; + // TODO(gomes): this only handles sends for now - do we want to support deposit messages as well? + const rawTx = stringifyKeysInOrder({ + account_number: message.account_number, + chain_id: THOR_CHAIN, + fee, + memo: message.tx.memo, + msgs: message.tx.msg, + sequence: message.sequence, + }); + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore TODO(gomes): fixme swapkit types are turbo derp + return this.signGetChunks(path, rawTx).then((chunks) => { return this.signSendChunk(1, chunks.length, chunks[0]).then(async (response) => { let result = { return_code: response.return_code, diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index b1b9ae272..56e521b63 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -25,3 +25,24 @@ export const thorchainGetAddress = async ( return maybeAddress; }; + +export const thorchainSignTx = async ( + transport: LedgerTransport, + msg: core.ThorchainSignTx +): Promise => { + const signed = await transport.call( + "Rune", + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore TODO(gomes): fixme + "sign", + msg + ); + + // eslint-disable-next-line no-console + console.log({ signed }); + + const maybeSigned = signed; + if (!maybeSigned) throw new Error("TODO error handling"); + + return maybeSigned as unknown as core.ThorchainSignedTx; +}; From a775be7e5a5f6ff5194ae242091a79df8738fc42 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 22:40:19 +0200 Subject: [PATCH 020/108] feat: boimp --- examples/sandbox/package.json | 32 ++++++++++++++++---------------- integration/package.json | 20 ++++++++++---------- lerna.json | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index cf37f0485..661ca1e89 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-thorchain.7", + "version": "1.52.3-thorchain.8", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.8", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index d9814e597..eb4b38ea5 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-thorchain.7", + "version": "1.52.3-thorchain.8", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.8", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index f94e16205..e8af3c5f0 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-thorchain.7", + "version": "1.52.3-thorchain.8", "npmClient": "yarn", "useWorkspaces": true, "command": { From 6c39f52babe95c9dae3ec5386be9b9686260b06c Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 22:45:03 +0200 Subject: [PATCH 021/108] fix: derp --- packages/hdwallet-ledger/src/thorchain/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index 56e521b63..8ae148977 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -35,6 +35,7 @@ export const thorchainSignTx = async ( // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore TODO(gomes): fixme "sign", + core.addressNListToBIP32(msg.addressNList), msg ); From 637669139edb1e00e46f74dc9d4d7def3e18e610 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 22:45:37 +0200 Subject: [PATCH 022/108] chore(release): publish 1.52.3-thorchain.9 --- examples/sandbox/package.json | 32 +++++++++---------- integration/package.json | 20 ++++++------ lerna.json | 9 ++---- packages/hdwallet-coinbase/package.json | 4 +-- packages/hdwallet-core/package.json | 2 +- .../hdwallet-keepkey-chromeusb/package.json | 6 ++-- .../hdwallet-keepkey-electron/package.json | 4 +-- .../hdwallet-keepkey-nodehid/package.json | 4 +-- .../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-keplr/package.json | 4 +-- packages/hdwallet-ledger-webhid/package.json | 6 ++-- packages/hdwallet-ledger-webusb/package.json | 6 ++-- packages/hdwallet-ledger/package.json | 8 ++--- .../package.json | 4 +-- packages/hdwallet-metamask/package.json | 4 +-- packages/hdwallet-native-vault/package.json | 4 +-- packages/hdwallet-native/package.json | 4 +-- packages/hdwallet-portis/package.json | 4 +-- packages/hdwallet-tallyho/package.json | 4 +-- packages/hdwallet-trezor-connect/package.json | 6 ++-- packages/hdwallet-trezor/package.json | 4 +-- packages/hdwallet-walletconnect/package.json | 4 +-- .../hdwallet-walletconnectV2/package.json | 4 +-- packages/hdwallet-xdefi/package.json | 4 +-- 27 files changed, 84 insertions(+), 89 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 661ca1e89..f7dc07762 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-thorchain.8", + "version": "1.52.3-thorchain.9", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.9", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index eb4b38ea5..5e09bad78 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-thorchain.8", + "version": "1.52.3-thorchain.9", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.9", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index e8af3c5f0..b826cff40 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-thorchain.8", + "version": "1.52.3-thorchain.9", "npmClient": "yarn", "useWorkspaces": true, "command": { @@ -8,10 +8,5 @@ "message": "chore(release): publish %v" } }, - "ignoreChanges": [ - "**/__fixtures__/**", - "**/__tests__/**", - "**/*.md", - "**/.env" - ] + "ignoreChanges": ["**/__fixtures__/**", "**/__tests__/**", "**/*.md", "**/.env"] } diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index b8f1dafd4..323077b70 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json index 9bbed2772..d06b1e2d0 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index f2fdc6b02..6f611c078 100644 --- a/packages/hdwallet-keepkey-chromeusb/package.json +++ b/packages/hdwallet-keepkey-chromeusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-chromeusb", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey": "1.52.3" + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9" } } diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index b63489f80..2f4fd5fb1 100644 --- a/packages/hdwallet-keepkey-electron/package.json +++ b/packages/hdwallet-keepkey-electron/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-electron", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index da40891f1..a81810ef1 100644 --- a/packages/hdwallet-keepkey-nodehid/package.json +++ b/packages/hdwallet-keepkey-nodehid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodehid", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.3" + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index 6bf556d75..bff6b6eec 100644 --- a/packages/hdwallet-keepkey-nodewebusb/package.json +++ b/packages/hdwallet-keepkey-nodewebusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey": "1.52.3" + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index d4be0a5d8..139d574e4 100644 --- a/packages/hdwallet-keepkey-tcp/package.json +++ b/packages/hdwallet-keepkey-tcp/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-tcp", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9", "axios": "^0.21.1" } } diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index c75d5a98b..a820a4f17 100644 --- a/packages/hdwallet-keepkey-webusb/package.json +++ b/packages/hdwallet-keepkey-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-webusb", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey": "1.52.3" + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4" diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index e0d71737c..9e91ba8f9 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^3.3.0", "@keepkey/device-protocol": "^7.12.2", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "bignumber.js": "^9.0.1", "bnb-javascript-sdk-nobroadcast": "^2.16.14", diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json index 906c72fe8..7ebbc27bf 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/caip": "8.15.0", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@shapeshiftoss/types": "3.1.3", "base64-js": "^1.5.1", diff --git a/packages/hdwallet-ledger-webhid/package.json b/packages/hdwallet-ledger-webhid/package.json index 5c4e08268..8d7a69523 100644 --- a/packages/hdwallet-ledger-webhid/package.json +++ b/packages/hdwallet-ledger-webhid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webhid", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -19,8 +19,8 @@ "@ledgerhq/hw-transport": "^6.7.0", "@ledgerhq/hw-transport-webhid": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-ledger": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.9", "@types/w3c-web-hid": "^1.0.2" }, "devDependencies": { diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index d2dc648bf..ce0ddb44d 100644 --- a/packages/hdwallet-ledger-webusb/package.json +++ b/packages/hdwallet-ledger-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webusb", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -20,8 +20,8 @@ "@ledgerhq/hw-transport-webusb": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", "@ledgerhq/logs": "^6.10.1", - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-ledger": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.9", "@types/w3c-web-usb": "^1.0.4", "p-queue": "^7.4.1" }, diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index e93a9c5cb..63194b01e 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -18,7 +18,8 @@ "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@types/ripemd160": "^2.0.1", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", "bitcoinjs-message": "^2.0.0", @@ -26,8 +27,7 @@ "ethereumjs-tx": "1.3.7", "ethereumjs-util": "^6.1.0", "lodash": "^4.17.21", - "ripemd160": "^2.0.2", - "@types/ripemd160": "^2.0.1" + "ripemd160": "^2.0.2" }, "devDependencies": { "@ledgerhq/hw-app-btc": "^10.0.8", diff --git a/packages/hdwallet-metamask-shapeshift-multichain/package.json b/packages/hdwallet-metamask-shapeshift-multichain/package.json index e70d62c8f..6db2f8410 100644 --- a/packages/hdwallet-metamask-shapeshift-multichain/package.json +++ b/packages/hdwallet-metamask-shapeshift-multichain/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-shapeshift-multichain", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", "@shapeshiftoss/common-api": "^9.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "@shapeshiftoss/metamask-snaps-adapter": "^1.0.8", "@shapeshiftoss/metamask-snaps-types": "^1.0.8", "eth-rpc-errors": "^4.0.3", diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index a3c4c81b6..66ed05f88 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index e4c9f5314..5467c74b8 100644 --- a/packages/hdwallet-native-vault/package.json +++ b/packages/hdwallet-native-vault/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native-vault", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-native": "1.52.3", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.9", "bip39": "^3.0.4", "hash-wasm": "^4.9.0", "idb-keyval": "^6.0.3", diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index 44655010b..27584449e 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", "@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index 6d55d31ca..5a0618ec9 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@portis/web3": "3.0.10", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index e688dc75b..dca77399d 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-tallyho", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "lodash": "^4.17.21", "tallyho-onboarding": "^1.0.2" }, diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index 8196d257c..f56286fc9 100644 --- a/packages/hdwallet-trezor-connect/package.json +++ b/packages/hdwallet-trezor-connect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor-connect", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-trezor": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.9", "@trezor/rollout": "^1.2.0", "trezor-connect": "^8.2.1" } diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index 795a537a5..61de4d50f 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "base64-js": "^1.5.1", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index 8101de3f3..b6b4582d9 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "@walletconnect/qrcode-modal": "^1.7.8", "@walletconnect/web3-provider": "^1.7.8", "ethers": "^5.6.5" diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index ff4681cca..5ba91f0c0 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "@walletconnect/ethereum-provider": "^2.10.1", "@walletconnect/modal": "^2.6.2", "ethers": "^5.6.5" diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index 1d2c43eb9..f2ed60438 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-xdefi", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "lodash": "^4.17.21" }, "devDependencies": { From 459f7687742edcef4a993fde499e217198ca1680 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 23:03:56 +0200 Subject: [PATCH 023/108] fix: ThorchainSignedTx compliant ish --- packages/hdwallet-ledger/src/thorchain/index.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index 8ae148977..6e25ed23f 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -20,6 +20,7 @@ export const thorchainGetAddress = async ( "thor" ); + // TODO(gomes): find a way to type payload for hw-app-thor const maybeAddress = (addressAndPubkey.payload as any)?.bech32_address as string | undefined; if (!maybeAddress) return null; @@ -30,7 +31,7 @@ export const thorchainSignTx = async ( transport: LedgerTransport, msg: core.ThorchainSignTx ): Promise => { - const signed = await transport.call( + const maybeSigned = await transport.call( "Rune", // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore TODO(gomes): fixme @@ -39,11 +40,13 @@ export const thorchainSignTx = async ( msg ); - // eslint-disable-next-line no-console - console.log({ signed }); - - const maybeSigned = signed; if (!maybeSigned) throw new Error("TODO error handling"); - return maybeSigned as unknown as core.ThorchainSignedTx; + // TODO(gomes): find a way to type payload for hw-app-thor + const signed = (maybeSigned.payload as any)?.signature as Uint8Array | undefined; + + if (!signed) throw new Error("TODO error handling"); + + // TODO(gomes): be fully compliant to ThorchainSignedTx type + return { serialized: Buffer.from(signed).toString("hex") } as unknown as core.ThorchainSignedTx; }; From fb8c5ee4b52b561c338b848d5eccbcbc7030f0a0 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 23:05:15 +0200 Subject: [PATCH 024/108] feat: boimp boimp --- examples/sandbox/package.json | 32 ++++++++++++++++---------------- integration/package.json | 20 ++++++++++---------- lerna.json | 9 +++++++-- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index f7dc07762..284ffd188 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.10", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.10", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index 5e09bad78..c0b218fb8 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.10", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.10", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index b826cff40..a0a19c8bd 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.10", "npmClient": "yarn", "useWorkspaces": true, "command": { @@ -8,5 +8,10 @@ "message": "chore(release): publish %v" } }, - "ignoreChanges": ["**/__fixtures__/**", "**/__tests__/**", "**/*.md", "**/.env"] + "ignoreChanges": [ + "**/__fixtures__/**", + "**/__tests__/**", + "**/*.md", + "**/.env" + ] } From 04f139f387be9ec4375121f79258d01e9773a197 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 23:15:08 +0200 Subject: [PATCH 025/108] fix: toString base64 --- packages/hdwallet-ledger/src/thorchain/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index 6e25ed23f..4e9be175f 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -48,5 +48,5 @@ export const thorchainSignTx = async ( if (!signed) throw new Error("TODO error handling"); // TODO(gomes): be fully compliant to ThorchainSignedTx type - return { serialized: Buffer.from(signed).toString("hex") } as unknown as core.ThorchainSignedTx; + return { serialized: Buffer.from(signed).toString("base64") } as unknown as core.ThorchainSignedTx; }; From ae133cd42a9e1e760027bd0de3ad797a66dff66c Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 23:16:14 +0200 Subject: [PATCH 026/108] feat: boimp boimp --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 284ffd188..cf4ac2f8f 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-thorchain.10", + "version": "1.52.3-thorchain.11", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index c0b218fb8..af2dc8ee9 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-thorchain.10", + "version": "1.52.3-thorchain.11", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index a0a19c8bd..6621e66d4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-thorchain.10", + "version": "1.52.3-thorchain.11", "npmClient": "yarn", "useWorkspaces": true, "command": { From 8d301767df6e3940b6137b357718cf0d54582ec2 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 15:05:07 +0200 Subject: [PATCH 027/108] feat: bump yarn.lock --- yarn.lock | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 265 insertions(+) diff --git a/yarn.lock b/yarn.lock index f29842390..96c430e36 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5557,6 +5557,30 @@ web-encoding "^1.1.0" wif "^2.0.6" +"@shapeshiftoss/hdwallet-core@1.52.1", "@shapeshiftoss/hdwallet-core@^1.50.4": + version "1.52.1" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.1.tgz#5165e6ecfef3ffa2a3c1ed1aafe6de268224f920" + integrity sha512-ON0kGiYhVUZm2sPp6EbgIwACJAvULIeklddWPZDCv6mvByIsY8D6BTVQtXVavHBB+/Pf6bVc1uMfCO3X5zPaHg== + dependencies: + "@shapeshiftoss/proto-tx-builder" "^0.8.0" + eip-712 "^1.0.0" + eventemitter2 "^5.0.1" + lodash "^4.17.21" + rxjs "^6.4.0" + type-assertions "^1.1.0" + +"@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.11": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.3-thorchain.11.tgz#1d24db71eae513a5f8ca79721e76f244974ef3dc" + integrity sha512-FxVzYJJ7ZqqaWzEBgxN2bsUUxk3y38QIRd48C2cRQjgPDQbd1DRRaWoxD0/f4zFGDyAYTQgF7mOUGUH9JLV7Zw== + dependencies: + "@shapeshiftoss/proto-tx-builder" "^0.8.0" + eip-712 "^1.0.0" + eventemitter2 "^5.0.1" + lodash "^4.17.21" + rxjs "^6.4.0" + type-assertions "^1.1.0" + "@shapeshiftoss/hdwallet-core@latest": version "1.18.4" resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.18.4.tgz#7272baa4b43de0fbb5e651d47cdeb9554f4ddd33" @@ -5567,6 +5591,247 @@ rxjs "^6.4.0" type-assertions "^1.1.0" +"@shapeshiftoss/hdwallet-keepkey-nodewebusb@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-nodewebusb/-/hdwallet-keepkey-nodewebusb-1.52.3-thorchain.11.tgz#2bdcf3bf1a7599ffea9f5ebd5e2e4c3acf3dcc35" + integrity sha512-Ek94hVGSzsZWVdrev2UOlUrYZtnpUwVJh0Zf8osTu36JzPjrEKgQDA72mRQzIAXKRacqtdCL/uec3SI+kWomPA== + dependencies: + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" + +"@shapeshiftoss/hdwallet-keepkey-tcp@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-tcp/-/hdwallet-keepkey-tcp-1.52.3-thorchain.11.tgz#bdfde504aac915f3d6763082c2e49c0980ed59ad" + integrity sha512-K2pEq35XAHpTR45m8WwdVBRvx5lIj8+G3tONsqr0d/9KluGEn//FPil5P9Rxz/CvXam/uwWH7NvJMibWmKlcQA== + dependencies: + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" + axios "^0.21.1" + +"@shapeshiftoss/hdwallet-keepkey-webusb@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-webusb/-/hdwallet-keepkey-webusb-1.52.3-thorchain.11.tgz#75ecc2d3d2e2f26db1f86f50fd95eefaccf8bf15" + integrity sha512-pO1susjpLW0YKENcWrjI81moONOeTbjf6mcc2Mq8yfLbxiNYM4guEEtnesU5OfKjv78bOsyOgcNjzpKL8PiygQ== + dependencies: + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" + +"@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.11": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey/-/hdwallet-keepkey-1.52.3-thorchain.11.tgz#83b412314ca7087e5d2245615fbae46686492996" + integrity sha512-U08jLpycWtfu1hSYnYCx+5e4/tokP/Z8eCQrUlYTdKSAZmXPBTFlz7uKjWcsj0zuoC+xod3yc5VSXbyvGsnupg== + dependencies: + "@ethereumjs/common" "^2.4.0" + "@ethereumjs/tx" "^3.3.0" + "@keepkey/device-protocol" "^7.12.2" + "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/proto-tx-builder" "^0.8.0" + bignumber.js "^9.0.1" + bnb-javascript-sdk-nobroadcast "^2.16.14" + crypto-js "^4.0.0" + eip-712 "^1.0.0" + eip55 "^2.1.0" + google-protobuf "^3.15.8" + icepick "^2.4.0" + lodash "^4.17.21" + p-lazy "^3.1.0" + semver "^7.3.8" + tiny-secp256k1 "^1.1.6" + +"@shapeshiftoss/hdwallet-keplr@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keplr/-/hdwallet-keplr-1.52.3-thorchain.11.tgz#d4d68722353f496f754d2cb0062dc2612430cd64" + integrity sha512-vNOsjerVGDfFDUcoX45yQthDVvcss7YKvbcS9feMC9yVSHgb9raYVdUJsJ7JIqXNYkkJ/aMardMb2ldCTmH+IQ== + dependencies: + "@shapeshiftoss/caip" "8.15.0" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/proto-tx-builder" "^0.8.0" + "@shapeshiftoss/types" "3.1.3" + base64-js "^1.5.1" + lodash "^4.17.21" + +"@shapeshiftoss/hdwallet-ledger-webhid@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger-webhid/-/hdwallet-ledger-webhid-1.52.3-thorchain.11.tgz#48e49b81c14a65e6e2ab868b17a40e1bd6e98eb2" + integrity sha512-lFBiBXjaSKnsPKKUNDhIcHjZuKfwrJ/lzc2ckepR+SPgS13LMsXnHcFy87DVb53e6CP4p4Kv6I2zR1rJsv+SeQ== + dependencies: + "@ledgerhq/hw-app-btc" "^10.0.8" + "@ledgerhq/hw-app-eth" "^6.9.0" + "@ledgerhq/hw-transport" "^6.7.0" + "@ledgerhq/hw-transport-webhid" "^6.7.0" + "@ledgerhq/live-common" "^21.8.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-ledger" "^1.52.3-thorchain.11" + "@types/w3c-web-hid" "^1.0.2" + +"@shapeshiftoss/hdwallet-ledger-webusb@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger-webusb/-/hdwallet-ledger-webusb-1.52.3-thorchain.11.tgz#3adb61c57fccd50627438c559f80b9ea6628a561" + integrity sha512-D3XRt+0+Z8YJMTBoTDO2oDjmg0LQtvURd1p8tqGRVxxpoXQxPQg5LI0zq7bjFPF7FyaBaINF8lu8uaHrU+Aygw== + dependencies: + "@ledgerhq/hw-app-btc" "^10.0.8" + "@ledgerhq/hw-app-eth" "^6.9.0" + "@ledgerhq/hw-transport" "^6.7.0" + "@ledgerhq/hw-transport-webusb" "^6.7.0" + "@ledgerhq/live-common" "^21.8.2" + "@ledgerhq/logs" "^6.10.1" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-ledger" "^1.52.3-thorchain.11" + "@types/w3c-web-usb" "^1.0.4" + p-queue "^7.4.1" + +"@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.11": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger/-/hdwallet-ledger-1.52.3-thorchain.11.tgz#7a03688868f922c033a315fa9409ccfb9aecab40" + integrity sha512-KujW49hBSzM05g6nnJ7Oheiiro0R9f8+l5faj1pqZYs2bpZFgoqlKLGe1zkItp2YCuVIEeMtXHMmqGBJaMQmjw== + dependencies: + "@ethereumjs/common" "^2.4.0" + "@ethereumjs/tx" "^3.3.0" + "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@types/ripemd160" "^2.0.1" + base64-js "^1.5.1" + bchaddrjs "^0.4.4" + bitcoinjs-message "^2.0.0" + bs58check "2.1.2" + ethereumjs-tx "1.3.7" + ethereumjs-util "^6.1.0" + lodash "^4.17.21" + ripemd160 "^2.0.2" + +"@shapeshiftoss/hdwallet-metamask@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-metamask/-/hdwallet-metamask-1.52.3-thorchain.11.tgz#3bc519ebbe0285ba3d0076ae03dda7a71e096d47" + integrity sha512-FeS94nlj2oklOFGX0X1AykL2+bosVi8+3NvBkl+v8zjWluHkcEvXfXmj7Dao/AjAL00auOIJrsFLdKOZ7O2RaQ== + dependencies: + "@metamask/detect-provider" "^1.2.0" + "@metamask/onboarding" "^1.0.1" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + eth-rpc-errors "^4.0.3" + lodash "^4.17.21" + +"@shapeshiftoss/hdwallet-native@^1.50.4": + version "1.52.1" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.1.tgz#9a8144302f20069d145079154d3d9c56086178b4" + integrity sha512-TUemR4q0ISgPRvLkZQaK0iQ9t8ObhbGwGtOBmKzbSyJR10vVXbGxt5eIi+Gc19fSz7uyAQM2N3pIMFMsBasciw== + dependencies: + "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" + "@shapeshiftoss/fiosdk" "1.2.1-shapeshift.6" + "@shapeshiftoss/hdwallet-core" "1.52.1" + "@shapeshiftoss/proto-tx-builder" "^0.8.0" + "@zxing/text-encoding" "^0.9.0" + bchaddrjs "^0.4.9" + bech32 "^1.1.4" + bignumber.js "^9.0.1" + bip32 "^2.0.5" + bip39 "^3.0.2" + bnb-javascript-sdk-nobroadcast "^2.16.14" + crypto-js "^4.0.0" + eip-712 "^1.0.0" + ethers "5.7.2" + eventemitter2 "^5.0.1" + funtypes "^3.0.1" + lodash "^4.17.21" + node-fetch "^2.6.1" + p-lazy "^3.1.0" + scrypt-js "^3.0.1" + tendermint-tx-builder "^1.0.9" + tiny-secp256k1 "^1.1.6" + web-encoding "^1.1.0" + +"@shapeshiftoss/hdwallet-native@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.3-thorchain.11.tgz#e57ef8355715ab701a7c059d460f917d011af999" + integrity sha512-6BfKW9qCGyvTVBdVB6i+pMR00I8TcKRhobAqB6zcuX0jWIj25TYltvuDk2EB3YedH38d0ly9ZEEuteKL4WY6Cw== + dependencies: + "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" + "@shapeshiftoss/fiosdk" "1.2.1-shapeshift.6" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/proto-tx-builder" "^0.8.0" + "@zxing/text-encoding" "^0.9.0" + bchaddrjs "^0.4.9" + bech32 "^1.1.4" + bignumber.js "^9.0.1" + bip32 "^2.0.5" + bip39 "^3.0.2" + bnb-javascript-sdk-nobroadcast "^2.16.14" + crypto-js "^4.0.0" + eip-712 "^1.0.0" + ethers "5.7.2" + eventemitter2 "^5.0.1" + funtypes "^3.0.1" + lodash "^4.17.21" + node-fetch "^2.6.1" + p-lazy "^3.1.0" + scrypt-js "^3.0.1" + tendermint-tx-builder "^1.0.9" + tiny-secp256k1 "^1.1.6" + web-encoding "^1.1.0" + +"@shapeshiftoss/hdwallet-portis@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-portis/-/hdwallet-portis-1.52.3-thorchain.11.tgz#35b734a9fecb7121e4808c6f99e9a86862d13533" + integrity sha512-9LVYv6uZX6bgKED3YYF29YF+UTL4XhgI83SeveW/PknvYMrbvF0eSQjQDqydrYLNUaQ5bmjKoXi5Cl3o4XQTaQ== + dependencies: + "@portis/web3" "3.0.10" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + base64-js "^1.5.1" + bip32 "^2.0.4" + bitcoinjs-lib "^5.1.6" + bitcoinjs-message "^2.1.0" + lodash "^4.17.15" + p-lazy "^3.1.0" + web3 "^1.5.1" + +"@shapeshiftoss/hdwallet-tallyho@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-tallyho/-/hdwallet-tallyho-1.52.3-thorchain.11.tgz#faa3e2a7c6a81a9c8e0e3fa998d41fef58bdea9b" + integrity sha512-VgIDzgSxk8tRn7DSlSP/lUn7p074WjMrFfSsEj5jtuVh1rpLhCBH6sDgv34rUPHQ8m3VrXYjg3qUsDoau+Rltg== + dependencies: + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + lodash "^4.17.21" + tallyho-onboarding "^1.0.2" + +"@shapeshiftoss/hdwallet-trezor-connect@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-trezor-connect/-/hdwallet-trezor-connect-1.52.3-thorchain.11.tgz#5d4ceb32201136dadc03b8320917d7a6aa488aca" + integrity sha512-fc3Ui4AFgHF6OdUynKsh4qg/sb8m9AnWz9VuY0qPseYtJhQCSt5WneluWXPWjTVNlDFkn7GqthyQAfTl0LLbYQ== + dependencies: + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-trezor" "^1.52.3-thorchain.11" + "@trezor/rollout" "^1.2.0" + trezor-connect "^8.2.1" + +"@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.11": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-trezor/-/hdwallet-trezor-1.52.3-thorchain.11.tgz#87c17c63552e18c0299d75c20b6fe5e98a9b9083" + integrity sha512-7I4WWRc3hYCBUySll7Pokk0jnm8u/1yJaFhNabTYphnGPTI1fa4hj7dth22GAqvFYoSX+HlsqB1TJolmIAwv0g== + dependencies: + "@ethereumjs/common" "^2.4.0" + "@ethereumjs/tx" "^3.3.0" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + base64-js "^1.5.1" + lodash "^4.17.21" + +"@shapeshiftoss/hdwallet-walletconnect@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-walletconnect/-/hdwallet-walletconnect-1.52.3-thorchain.11.tgz#b75eee0e4ded2f3ead7bf7c8dc4805f143a0c087" + integrity sha512-//GZ3npcC4RsSiqgQ03jSNL7adKrlF8aBQ9UT3HWItw1+bNN3jB2npiQV7d6KIYqtt3zr1YWxCXp0yAkeBbPdw== + dependencies: + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@walletconnect/qrcode-modal" "^1.7.8" + "@walletconnect/web3-provider" "^1.7.8" + ethers "^5.6.5" + +"@shapeshiftoss/hdwallet-xdefi@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-xdefi/-/hdwallet-xdefi-1.52.3-thorchain.11.tgz#9571a7747e21e6321add7815d8d147edb8b06cfc" + integrity sha512-ocbVY3TFfrgr35Kqa9UlhvOJhZ6YLnJmKJLIqOkF+GLs+eOxwagqDBIDxYgXNAbx36q2MVF4GS51URrn6LG0BA== + dependencies: + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + lodash "^4.17.21" + "@shapeshiftoss/logger@^1.1.2", "@shapeshiftoss/logger@^1.1.3": version "1.1.3" resolved "https://registry.yarnpkg.com/@shapeshiftoss/logger/-/logger-1.1.3.tgz#ff05765775351c8adc99cf747f14b5619311e023" From 7d6e0bebcfc8174672bb96c40eff5f83fcabd979 Mon Sep 17 00:00:00 2001 From: kaladinlight <35275952+kaladinlight@users.noreply.github.com> Date: Wed, 11 Oct 2023 11:38:47 -0600 Subject: [PATCH 028/108] sign tx fix (hopefully) --- .../src/thorchain/hw-app-thor.ts | 48 +- .../hdwallet-ledger/src/thorchain/index.ts | 85 ++- .../hdwallet-ledger/src/thorchain/utils.ts | 64 ++ packages/hdwallet-ledger/src/transport.ts | 4 + yarn.lock | 709 ++++++++++++++---- 5 files changed, 740 insertions(+), 170 deletions(-) create mode 100644 packages/hdwallet-ledger/src/thorchain/utils.ts diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index ad965178f..76df17160 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -33,7 +33,19 @@ import { import { publicKeyv2, serializePathv2, signSendChunkv2 } from "./helpers"; const THOR_CHAIN = "thorchain-mainnet-v1"; -const THORCHAIN_SEND_GAS_FEE = "500000000"; + +export type GetAddressAndPubKeyResponse = { + bech32_address: string; + compressed_pk: any; + error_message: string; + return_code: number; +}; + +export type SignResponse = { + signature: any; + error_message: string; + return_code: number; +}; const recursivelyOrderKeys = (unordered: any) => { // If it's an array - recursively order any @@ -258,15 +270,9 @@ class THORChainApp { } } - async getAddressAndPubKey(_path: string, hrp: any) { + async getAddressAndPubKey(path: number[], hrp: any): Promise { try { - // TODO(gomes): this is obviously temporary, find a better way to do this and pass our bip32 path in and make it work here - // eslint-disable-next-line no-console - console.log({ _path }); - const path = [44, 931, 0, 0, 0]; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore TODO(gomes): fixme swapkit types are turbo derp - return await this.serializePath(path) + return await this.serializePath(path as any) .then((serializedPath) => { const data = Buffer.concat([THORChainApp.serializeHRP(hrp), serializedPath as any]); return this.transport @@ -332,24 +338,17 @@ class THORChainApp { } } - async sign(_path: string, message: core.ThorchainSignTx) { - // eslint-disable-next-line no-console - console.log({ _path, message }); - const path = [44, 931, 0, 0, 0]; - - const fee = { amount: [], gas: THORCHAIN_SEND_GAS_FEE }; - // TODO(gomes): this only handles sends for now - do we want to support deposit messages as well? + async sign(msg: core.ThorchainSignTx): Promise { const rawTx = stringifyKeysInOrder({ - account_number: message.account_number, + account_number: msg.account_number, chain_id: THOR_CHAIN, - fee, - memo: message.tx.memo, - msgs: message.tx.msg, - sequence: message.sequence, + fee: { amount: [msg.fee], gas: msg.tx.fee.gas}, + memo: msg.tx.memo, + msgs: msg.tx.msg, + sequence: msg.sequence, }); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore TODO(gomes): fixme swapkit types are turbo derp - return this.signGetChunks(path, rawTx).then((chunks) => { + + return this.signGetChunks(msg.addressNList as any, rawTx).then((chunks) => { return this.signSendChunk(1, chunks.length, chunks[0]).then(async (response) => { let result = { return_code: response.return_code, @@ -367,7 +366,6 @@ class THORChainApp { return { return_code: result.return_code, error_message: result.error_message, - // /// signature: result.signature, }; }, processErrorResponse); diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index 4e9be175f..60ae2c0b4 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -1,52 +1,103 @@ +import type { AccountData, AminoSignResponse, OfflineAminoSigner, StdSignDoc, StdTx } from "@cosmjs/amino"; +import { fromByteArray } from "base64-js"; +import { fromBase64 } from '@cosmjs/encoding'; +import type { SignerData } from "@cosmjs/stargate"; import * as core from "@shapeshiftoss/hdwallet-core"; +import PLazy from "p-lazy"; import { LedgerTransport } from ".."; +import { getSignature } from "./utils"; export * from "./common"; export * from "./helpers"; export * from "./hw-app-thor"; // TODO(gomes): move all below to ./thorchain +const protoTxBuilder = PLazy.from(() => import("@shapeshiftoss/proto-tx-builder")); + export const thorchainGetAddress = async ( transport: LedgerTransport, msg: core.ThorchainGetAddress ): Promise => { const addressAndPubkey = await transport.call( "Rune", - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore TODO(gomes): fixme "getAddressAndPubKey", - core.addressNListToBIP32(msg.addressNList), + msg.addressNList, "thor" ); - // TODO(gomes): find a way to type payload for hw-app-thor - const maybeAddress = (addressAndPubkey.payload as any)?.bech32_address as string | undefined; - if (!maybeAddress) return null; + if ('error' in addressAndPubkey.payload) { + throw new Error(addressAndPubkey.payload.error) + } - return maybeAddress; + return addressAndPubkey.payload.bech32_address }; export const thorchainSignTx = async ( transport: LedgerTransport, msg: core.ThorchainSignTx ): Promise => { - const maybeSigned = await transport.call( + + const addressAndPubkey = await transport.call( + "Rune", + "getAddressAndPubKey", + msg.addressNList, + "thor" + ); + + if ('error' in addressAndPubkey.payload) { + throw new Error(addressAndPubkey.payload.error) + } + + const address = addressAndPubkey.payload.bech32_address; + const pubkey = addressAndPubkey.payload.compressed_pk; + + const signResponse = await transport.call( "Rune", - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore TODO(gomes): fixme "sign", - core.addressNListToBIP32(msg.addressNList), msg ); - if (!maybeSigned) throw new Error("TODO error handling"); + if ('error' in signResponse.payload) { + throw new Error(signResponse.payload.error) + } + + console.log({ signResponse: signResponse.payload }) + + const signature = signResponse.payload.signature; + + const offlineSigner: OfflineAminoSigner = { + async getAccounts(): Promise { + return [ + { + address, + algo: "secp256k1", + pubkey, + }, + ]; + }, + + async signAmino(signerAddress: string, signDoc: StdSignDoc): Promise { + if (signerAddress !== address) throw new Error("expected signerAddress to match address"); - // TODO(gomes): find a way to type payload for hw-app-thor - const signed = (maybeSigned.payload as any)?.signature as Uint8Array | undefined; + return { + signed: signDoc, + signature: { + pub_key: { + type: "tendermint/PubKeySecp256k1", + value: fromByteArray(pubkey), + }, + signature: fromBase64(getSignature(signature)).toString(), + }, + }; + }, + }; - if (!signed) throw new Error("TODO error handling"); + const signerData: SignerData = { + sequence: Number(msg.sequence), + accountNumber: Number(msg.account_number), + chainId: msg.chain_id, + }; - // TODO(gomes): be fully compliant to ThorchainSignedTx type - return { serialized: Buffer.from(signed).toString("base64") } as unknown as core.ThorchainSignedTx; + return (await protoTxBuilder).sign(address, msg.tx as StdTx, offlineSigner, signerData, "thor"); }; diff --git a/packages/hdwallet-ledger/src/thorchain/utils.ts b/packages/hdwallet-ledger/src/thorchain/utils.ts new file mode 100644 index 000000000..6359e86ca --- /dev/null +++ b/packages/hdwallet-ledger/src/thorchain/utils.ts @@ -0,0 +1,64 @@ +import { fromByteArray } from "base64-js"; + +export const getSignature = (signatureArray: any) => { + // Check Type Length Value encoding + if (signatureArray.length < 64) { + throw new Error("Invalid Signature: Too short"); + } + if (signatureArray[0] !== 0x30) { + throw new Error("Invalid Ledger Signature TLV encoding: expected first byte 0x30"); + } + if (signatureArray[1] + 2 !== signatureArray.length) { + throw new Error("Invalid Signature: signature length does not match TLV"); + } + if (signatureArray[2] !== 0x02) { + throw new Error("Invalid Ledger Signature TLV encoding: expected length type 0x02"); + } + + // r signature + const rLength = signatureArray[3]; + let rSignature = signatureArray.slice(4, rLength + 4); + + // Drop leading zero on some 'r' signatures that are 33 bytes. + if (rSignature.length === 33 && rSignature[0] === 0) { + rSignature = rSignature.slice(1, 33); + } else if (rSignature.length === 33) { + throw new Error('Invalid signature: "r" too long'); + } + + // add leading zero's to pad to 32 bytes + while (rSignature.length < 32) { + rSignature.unshift(0); + } + + // s signature + if (signatureArray[rLength + 4] !== 0x02) { + throw new Error("Invalid Ledger Signature TLV encoding: expected length type 0x02"); + } + + const sLength = signatureArray[rLength + 5]; + + if (4 + rLength + 2 + sLength !== signatureArray.length) { + throw new Error("Invalid Ledger Signature: TLV byte lengths do not match message length"); + } + + let sSignature = signatureArray.slice(rLength + 6, signatureArray.length); + + // Drop leading zero on 's' signatures that are 33 bytes. This shouldn't occur since ledger signs using "Small s" math. But just to be sure... + if (sSignature.length === 33 && sSignature[0] === 0) { + sSignature = sSignature.slice(1, 33); + } else if (sSignature.length === 33) { + throw new Error('Invalid signature: "s" too long'); + } + + // add leading zero's to pad to 32 bytes + while (sSignature.length < 32) { + sSignature.unshift(0); + } + + if (rSignature.length !== 32 || sSignature.length !== 32) { + throw new Error("Invalid signatures: must be 32 bytes each"); + } + + return fromByteArray(Buffer.concat([rSignature, sSignature])); +}; diff --git a/packages/hdwallet-ledger/src/transport.ts b/packages/hdwallet-ledger/src/transport.ts index fe6889ba7..f45cc14f8 100644 --- a/packages/hdwallet-ledger/src/transport.ts +++ b/packages/hdwallet-ledger/src/transport.ts @@ -6,6 +6,8 @@ import type getDeviceInfo from "@ledgerhq/live-common/lib/hw/getDeviceInfo"; import type openApp from "@ledgerhq/live-common/lib/hw/openApp"; import * as core from "@shapeshiftoss/hdwallet-core"; +import { THORChainApp } from "./thorchain"; + type MethodsOnly = { [k in keyof T as T[k] extends (...args: any) => any ? k : never]: T[k]; }; @@ -33,6 +35,8 @@ type LedgerTransportMethodMap = T extends nul ? MethodsOnly : T extends "Eth" ? MethodsOnly + : T extends "Rune" + ? MethodsOnly : never; export type LedgerTransportMethodName = LedgerTransportMethodMap extends never ? never diff --git a/yarn.lock b/yarn.lock index 96c430e36..00fe1f15d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -878,7 +878,7 @@ long "^4.0.0" protobufjs "~6.10.2" -"@cosmjs/proto-signing@0.28.13", "@cosmjs/proto-signing@^0.28.13": +"@cosmjs/proto-signing@0.28.13", "@cosmjs/proto-signing@^0.28.0", "@cosmjs/proto-signing@^0.28.13": version "0.28.13" resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.28.13.tgz#95ac12f0da0f0814f348f5ae996c3e96d015df61" integrity sha512-nSl/2ZLsUJYz3Ad0RY3ihZUgRHIow2OnYqKsESMu+3RA/jTi9bDYhiBu8mNMHI0xrEJry918B2CyI56pOUHdPQ== @@ -990,7 +990,7 @@ protobufjs "~6.11.3" xstream "^11.14.0" -"@cosmjs/stargate@^0.28.13": +"@cosmjs/stargate@^0.28.0", "@cosmjs/stargate@^0.28.13": version "0.28.13" resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.28.13.tgz#a73d837a46ee8944e6eafe162f2ff6943c14350e" integrity sha512-dVBMazDz8/eActHsRcZjDHHptOBMqvibj5CFgEtZBp22gP6ASzoAUXTlkSVk5FBf4sfuUHoff6st134/+PGMAg== @@ -1062,7 +1062,7 @@ readonly-date "^1.0.0" xstream "^11.14.0" -"@cosmjs/tendermint-rpc@0.28.13": +"@cosmjs/tendermint-rpc@0.28.13", "@cosmjs/tendermint-rpc@^0.28.0": version "0.28.13" resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.28.13.tgz#0bf587ae66fa3f88319edbd258492d28e73f9f29" integrity sha512-GB+ZmfuJIGQm0hsRtLYjeR3lOxF7Z6XyCBR0cX5AAYOZzSEBJjevPgUHD6tLn8zIhvzxaW3/VKnMB+WmlxdH4w== @@ -1295,6 +1295,21 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/strings" "^5.4.0" +"@ethersproject/abi@5.6.1": + version "5.6.1" + resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.1.tgz#f7de888edeb56b0a657b672bdd1b3a1135cd14f7" + integrity sha512-0cqssYh6FXjlwKWBmLm3+zH2BNARoS5u/hxbz+LpQmcDB3w0W553h2btWui1/uZp2GBM/SI3KniTuMcYyHpA5w== + dependencies: + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/hash" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/abi@5.6.4", "@ethersproject/abi@^5.6.3": version "5.6.4" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.4.tgz#f6e01b6ed391a505932698ecc0d9e7a99ee60362" @@ -1310,7 +1325,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" -"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.7.0": +"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.6.0", "@ethersproject/abi@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.7.0.tgz#b3f3e045bbbeed1af3947335c247ad625a44e449" integrity sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA== @@ -1353,6 +1368,19 @@ "@ethersproject/transactions" "^5.4.0" "@ethersproject/web" "^5.4.0" +"@ethersproject/abstract-provider@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.6.0.tgz#0c4ac7054650dbd9c476cf5907f588bbb6ef3061" + integrity sha512-oPMFlKLN+g+y7a79cLK3WiLcjWFnZQtXWgnLAbHZcN3s7L4v90UHpTOrLk+m3yr0gt+/h9STTM6zrr7PM8uoRw== + dependencies: + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/networks" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/transactions" "^5.6.0" + "@ethersproject/web" "^5.6.0" + "@ethersproject/abstract-provider@5.6.1", "@ethersproject/abstract-provider@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.6.1.tgz#02ddce150785caf0c77fe036a0ebfcee61878c59" @@ -1366,7 +1394,7 @@ "@ethersproject/transactions" "^5.6.2" "@ethersproject/web" "^5.6.1" -"@ethersproject/abstract-provider@5.7.0", "@ethersproject/abstract-provider@^5.7.0": +"@ethersproject/abstract-provider@5.7.0", "@ethersproject/abstract-provider@^5.6.0", "@ethersproject/abstract-provider@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz#b0a8550f88b6bf9d51f90e4795d48294630cb9ef" integrity sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw== @@ -1403,6 +1431,17 @@ "@ethersproject/logger" "^5.4.0" "@ethersproject/properties" "^5.4.0" +"@ethersproject/abstract-signer@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.6.0.tgz#9cd7ae9211c2b123a3b29bf47aab17d4d016e3e7" + integrity sha512-WOqnG0NJKtI8n0wWZPReHtaLkDByPL67tn4nBaDAhmVq8sjHTPbCdz4DRhVu/cfTOvfy9w3iq5QZ7BX7zw56BQ== + dependencies: + "@ethersproject/abstract-provider" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/abstract-signer@5.6.2", "@ethersproject/abstract-signer@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.6.2.tgz#491f07fc2cbd5da258f46ec539664713950b0b33" @@ -1414,7 +1453,7 @@ "@ethersproject/logger" "^5.6.0" "@ethersproject/properties" "^5.6.0" -"@ethersproject/abstract-signer@5.7.0", "@ethersproject/abstract-signer@^5.7.0": +"@ethersproject/abstract-signer@5.7.0", "@ethersproject/abstract-signer@^5.6.0", "@ethersproject/abstract-signer@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz#13f4f32117868452191a4649723cb086d2b596b2" integrity sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ== @@ -1458,6 +1497,17 @@ "@ethersproject/logger" "^5.4.0" "@ethersproject/rlp" "^5.4.0" +"@ethersproject/address@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.6.0.tgz#13c49836d73e7885fc148ad633afad729da25012" + integrity sha512-6nvhYXjbXsHPS+30sHZ+U4VMagFC/9zAk6Gd/h3S21YW4+yfb0WfRtaAIZ4kfM4rrVwqiy284LP0GtL5HXGLxQ== + dependencies: + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/rlp" "^5.6.0" + "@ethersproject/address@5.6.1", "@ethersproject/address@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.6.1.tgz#ab57818d9aefee919c5721d28cd31fd95eff413d" @@ -1469,7 +1519,7 @@ "@ethersproject/logger" "^5.6.0" "@ethersproject/rlp" "^5.6.1" -"@ethersproject/address@5.7.0", "@ethersproject/address@^5.7.0": +"@ethersproject/address@5.7.0", "@ethersproject/address@^5.6.0", "@ethersproject/address@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.7.0.tgz#19b56c4d74a3b0a46bfdbb6cfcc0a153fc697f37" integrity sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA== @@ -1498,6 +1548,13 @@ dependencies: "@ethersproject/bytes" "^5.4.0" +"@ethersproject/base64@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.6.0.tgz#a12c4da2a6fb86d88563216b0282308fc15907c9" + integrity sha512-2Neq8wxJ9xHxCF9TUgmKeSh9BXJ6OAxWfeGWvbauPh8FuHEjamgHilllx8KkSd5ErxyHIX7Xv3Fkcud2kY9ezw== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/base64@5.6.1", "@ethersproject/base64@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.6.1.tgz#2c40d8a0310c9d1606c2c37ae3092634b41d87cb" @@ -1505,7 +1562,7 @@ dependencies: "@ethersproject/bytes" "^5.6.1" -"@ethersproject/base64@5.7.0", "@ethersproject/base64@^5.7.0": +"@ethersproject/base64@5.7.0", "@ethersproject/base64@^5.6.0", "@ethersproject/base64@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.7.0.tgz#ac4ee92aa36c1628173e221d0d01f53692059e1c" integrity sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ== @@ -1520,6 +1577,14 @@ "@ethersproject/bytes" "^5.4.0" "@ethersproject/properties" "^5.4.0" +"@ethersproject/basex@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.6.0.tgz#9ea7209bf0a1c3ddc2a90f180c3a7f0d7d2e8a69" + integrity sha512-qN4T+hQd/Md32MoJpc69rOwLYRUXwjTlhHDIeUkUmiN/JyWkkLLMoG0TqvSQKNqZOMgN5stbUYN6ILC+eD7MEQ== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/basex@5.6.1", "@ethersproject/basex@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.6.1.tgz#badbb2f1d4a6f52ce41c9064f01eab19cc4c5305" @@ -1528,7 +1593,7 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/properties" "^5.6.0" -"@ethersproject/basex@5.7.0", "@ethersproject/basex@^5.7.0": +"@ethersproject/basex@5.7.0", "@ethersproject/basex@^5.6.0", "@ethersproject/basex@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.7.0.tgz#97034dc7e8938a8ca943ab20f8a5e492ece4020b" integrity sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw== @@ -1545,6 +1610,15 @@ "@ethersproject/logger" "^5.4.0" bn.js "^4.11.9" +"@ethersproject/bignumber@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.6.0.tgz#116c81b075c57fa765a8f3822648cf718a8a0e26" + integrity sha512-VziMaXIUHQlHJmkv1dlcd6GY2PmT0khtAqaMctCIDogxkrarMzA9L94KN1NeXqqOfFD6r0sJT3vCTOFSmZ07DA== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + bn.js "^4.11.9" + "@ethersproject/bignumber@5.6.2", "@ethersproject/bignumber@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.6.2.tgz#72a0717d6163fab44c47bcc82e0c550ac0315d66" @@ -1554,7 +1628,7 @@ "@ethersproject/logger" "^5.6.0" bn.js "^5.2.1" -"@ethersproject/bignumber@5.7.0", "@ethersproject/bignumber@^5.7.0": +"@ethersproject/bignumber@5.7.0", "@ethersproject/bignumber@^5.6.0", "@ethersproject/bignumber@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.7.0.tgz#e2f03837f268ba655ffba03a57853e18a18dc9c2" integrity sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw== @@ -1595,7 +1669,7 @@ dependencies: "@ethersproject/logger" "^5.6.0" -"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.7.0": +"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.6.0", "@ethersproject/bytes@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.7.0.tgz#a00f6ea8d7e7534d6d87f47188af1148d71f155d" integrity sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A== @@ -1616,6 +1690,13 @@ dependencies: "@ethersproject/bignumber" "^5.4.0" +"@ethersproject/constants@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.6.0.tgz#55e3eb0918584d3acc0688e9958b0cedef297088" + integrity sha512-SrdaJx2bK0WQl23nSpV/b1aq293Lh0sUaZT/yYKPDKn4tlAbkH96SPJwIhwSwTsoQQZxuh1jnqsKwyymoiBdWA== + dependencies: + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/constants@5.6.1", "@ethersproject/constants@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.6.1.tgz#e2e974cac160dd101cf79fdf879d7d18e8cb1370" @@ -1623,7 +1704,7 @@ dependencies: "@ethersproject/bignumber" "^5.6.2" -"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.7.0": +"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.6.0", "@ethersproject/constants@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.7.0.tgz#df80a9705a7e08984161f09014ea012d1c75295e" integrity sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA== @@ -1653,6 +1734,22 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/transactions" "^5.4.0" +"@ethersproject/contracts@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.6.0.tgz#60f2cfc7addd99a865c6c8cfbbcec76297386067" + integrity sha512-74Ge7iqTDom0NX+mux8KbRUeJgu1eHZ3iv6utv++sLJG80FVuU9HnHeKVPfjd9s3woFhaFoQGf3B3iH/FrQmgw== + dependencies: + "@ethersproject/abi" "^5.6.0" + "@ethersproject/abstract-provider" "^5.6.0" + "@ethersproject/abstract-signer" "^5.6.0" + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/transactions" "^5.6.0" + "@ethersproject/contracts@5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.6.2.tgz#20b52e69ebc1b74274ff8e3d4e508de971c287bc" @@ -1699,6 +1796,20 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/strings" "^5.4.0" +"@ethersproject/hash@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.6.0.tgz#d24446a5263e02492f9808baa99b6e2b4c3429a2" + integrity sha512-fFd+k9gtczqlr0/BruWLAu7UAOas1uRRJvOR84uDf4lNZ+bTkGl366qvniUZHKtlqxBRU65MkOobkmvmpHU+jA== + dependencies: + "@ethersproject/abstract-signer" "^5.6.0" + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/hash@5.6.1", "@ethersproject/hash@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.6.1.tgz#224572ea4de257f05b4abf8ae58b03a67e99b0f4" @@ -1713,7 +1824,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" -"@ethersproject/hash@5.7.0", "@ethersproject/hash@^5.7.0": +"@ethersproject/hash@5.7.0", "@ethersproject/hash@^5.6.0", "@ethersproject/hash@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.7.0.tgz#eb7aca84a588508369562e16e514b539ba5240a7" integrity sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g== @@ -1760,6 +1871,24 @@ "@ethersproject/transactions" "^5.4.0" "@ethersproject/wordlists" "^5.4.0" +"@ethersproject/hdnode@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.6.0.tgz#9dcbe8d629bbbcf144f2cae476337fe92d320998" + integrity sha512-61g3Jp3nwDqJcL/p4nugSyLrpl/+ChXIOtCEM8UDmWeB3JCAt5FoLdOMXQc3WWkc0oM2C0aAn6GFqqMcS/mHTw== + dependencies: + "@ethersproject/abstract-signer" "^5.6.0" + "@ethersproject/basex" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/pbkdf2" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/sha2" "^5.6.0" + "@ethersproject/signing-key" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/transactions" "^5.6.0" + "@ethersproject/wordlists" "^5.6.0" + "@ethersproject/hdnode@5.6.2", "@ethersproject/hdnode@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.6.2.tgz#26f3c83a3e8f1b7985c15d1db50dc2903418b2d2" @@ -1778,7 +1907,7 @@ "@ethersproject/transactions" "^5.6.2" "@ethersproject/wordlists" "^5.6.1" -"@ethersproject/hdnode@5.7.0", "@ethersproject/hdnode@^5.7.0": +"@ethersproject/hdnode@5.7.0", "@ethersproject/hdnode@^5.6.0", "@ethersproject/hdnode@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.7.0.tgz#e627ddc6b466bc77aebf1a6b9e47405ca5aef9cf" integrity sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg== @@ -1815,6 +1944,25 @@ aes-js "3.0.0" scrypt-js "3.0.1" +"@ethersproject/json-wallets@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.6.0.tgz#4c2fc27f17e36c583e7a252fb938bc46f98891e5" + integrity sha512-fmh86jViB9r0ibWXTQipxpAGMiuxoqUf78oqJDlCAJXgnJF024hOOX7qVgqsjtbeoxmcLwpPsXNU0WEe/16qPQ== + dependencies: + "@ethersproject/abstract-signer" "^5.6.0" + "@ethersproject/address" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/hdnode" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/pbkdf2" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/random" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/transactions" "^5.6.0" + aes-js "3.0.0" + scrypt-js "3.0.1" + "@ethersproject/json-wallets@5.6.1", "@ethersproject/json-wallets@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.6.1.tgz#3f06ba555c9c0d7da46756a12ac53483fe18dd91" @@ -1834,7 +1982,7 @@ aes-js "3.0.0" scrypt-js "3.0.1" -"@ethersproject/json-wallets@5.7.0", "@ethersproject/json-wallets@^5.7.0": +"@ethersproject/json-wallets@5.7.0", "@ethersproject/json-wallets@^5.6.0", "@ethersproject/json-wallets@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.7.0.tgz#5e3355287b548c32b368d91014919ebebddd5360" integrity sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g== @@ -1861,6 +2009,14 @@ "@ethersproject/bytes" "^5.4.0" js-sha3 "0.5.7" +"@ethersproject/keccak256@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.6.0.tgz#fea4bb47dbf8f131c2e1774a1cecbfeb9d606459" + integrity sha512-tk56BJ96mdj/ksi7HWZVWGjCq0WVl/QvfhFQNeL8fxhBlGoP+L80uDCiQcpJPd+2XxkivS3lwRm3E0CXTfol0w== + dependencies: + "@ethersproject/bytes" "^5.6.0" + js-sha3 "0.8.0" + "@ethersproject/keccak256@5.6.1", "@ethersproject/keccak256@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.6.1.tgz#b867167c9b50ba1b1a92bccdd4f2d6bd168a91cc" @@ -1869,7 +2025,7 @@ "@ethersproject/bytes" "^5.6.1" js-sha3 "0.8.0" -"@ethersproject/keccak256@5.7.0", "@ethersproject/keccak256@^5.7.0": +"@ethersproject/keccak256@5.7.0", "@ethersproject/keccak256@^5.6.0", "@ethersproject/keccak256@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.7.0.tgz#3186350c6e1cd6aba7940384ec7d6d9db01f335a" integrity sha512-2UcPboeL/iW+pSg6vZ6ydF8tCnv3Iu/8tUmLLzWWGzxWKFFqOBQFLo6uLUv6BDrLgCDfN28RJ/wtByx+jZ4KBg== @@ -1917,6 +2073,13 @@ dependencies: "@ethersproject/logger" "^5.4.0" +"@ethersproject/networks@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.2.tgz#2bacda62102c0b1fcee408315f2bed4f6fbdf336" + integrity sha512-9uEzaJY7j5wpYGTojGp8U89mSsgQLc40PCMJLMCnFXTs7nhBveZ0t7dbqWUNrepWTszDbFkYD6WlL8DKx5huHA== + dependencies: + "@ethersproject/logger" "^5.6.0" + "@ethersproject/networks@5.6.4", "@ethersproject/networks@^5.6.3": version "5.6.4" resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.4.tgz#51296d8fec59e9627554f5a8a9c7791248c8dc07" @@ -1924,7 +2087,7 @@ dependencies: "@ethersproject/logger" "^5.6.0" -"@ethersproject/networks@5.7.1", "@ethersproject/networks@^5.7.0": +"@ethersproject/networks@5.7.1", "@ethersproject/networks@^5.6.0", "@ethersproject/networks@^5.7.0": version "5.7.1" resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.7.1.tgz#118e1a981d757d45ccea6bb58d9fd3d9db14ead6" integrity sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ== @@ -1946,6 +2109,14 @@ "@ethersproject/bytes" "^5.4.0" "@ethersproject/sha2" "^5.4.0" +"@ethersproject/pbkdf2@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.6.0.tgz#04fcc2d7c6bff88393f5b4237d906a192426685a" + integrity sha512-Wu1AxTgJo3T3H6MIu/eejLFok9TYoSdgwRr5oGY1LTLfmGesDoSx05pemsbrPT2gG4cQME+baTSCp5sEo2erZQ== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/sha2" "^5.6.0" + "@ethersproject/pbkdf2@5.6.1", "@ethersproject/pbkdf2@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.6.1.tgz#f462fe320b22c0d6b1d72a9920a3963b09eb82d1" @@ -1954,7 +2125,7 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/sha2" "^5.6.1" -"@ethersproject/pbkdf2@5.7.0", "@ethersproject/pbkdf2@^5.7.0": +"@ethersproject/pbkdf2@5.7.0", "@ethersproject/pbkdf2@^5.6.0", "@ethersproject/pbkdf2@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.7.0.tgz#d2267d0a1f6e123f3771007338c47cccd83d3102" integrity sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw== @@ -2022,6 +2193,31 @@ bech32 "1.1.4" ws "7.4.6" +"@ethersproject/providers@5.6.5": + version "5.6.5" + resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.6.5.tgz#aefecf78459817a323452e05a16d56afcf807e27" + integrity sha512-TRS+c2Ud+cMpWodmGAc9xbnYRPWzRNYt2zkCSnj58nJoamBQ6x4cUbBeo0lTC3y+6RDVIBeJv18OqsDbSktLVg== + dependencies: + "@ethersproject/abstract-provider" "^5.6.0" + "@ethersproject/abstract-signer" "^5.6.0" + "@ethersproject/address" "^5.6.0" + "@ethersproject/basex" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/hash" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/networks" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/random" "^5.6.0" + "@ethersproject/rlp" "^5.6.0" + "@ethersproject/sha2" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/transactions" "^5.6.0" + "@ethersproject/web" "^5.6.0" + bech32 "1.1.4" + ws "7.4.6" + "@ethersproject/providers@5.6.8": version "5.6.8" resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.6.8.tgz#22e6c57be215ba5545d3a46cf759d265bb4e879d" @@ -2082,6 +2278,14 @@ "@ethersproject/bytes" "^5.4.0" "@ethersproject/logger" "^5.4.0" +"@ethersproject/random@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.6.0.tgz#1505d1ab6a250e0ee92f436850fa3314b2cb5ae6" + integrity sha512-si0PLcLjq+NG/XHSZz90asNf+YfKEqJGVdxoEkSukzbnBgC8rydbgbUgBbBGLeHN4kAJwUFEKsu3sCXT93YMsw== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/random@5.6.1", "@ethersproject/random@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.6.1.tgz#66915943981bcd3e11bbd43733f5c3ba5a790255" @@ -2090,7 +2294,7 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/logger" "^5.6.0" -"@ethersproject/random@5.7.0", "@ethersproject/random@^5.7.0": +"@ethersproject/random@5.7.0", "@ethersproject/random@^5.6.0", "@ethersproject/random@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.7.0.tgz#af19dcbc2484aae078bb03656ec05df66253280c" integrity sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ== @@ -2106,6 +2310,14 @@ "@ethersproject/bytes" "^5.4.0" "@ethersproject/logger" "^5.4.0" +"@ethersproject/rlp@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.6.0.tgz#55a7be01c6f5e64d6e6e7edb6061aa120962a717" + integrity sha512-dz9WR1xpcTL+9DtOT/aDO+YyxSSdO8YIS0jyZwHHSlAmnxA6cKU3TrTd4Xc/bHayctxTgGLYNuVVoiXE4tTq1g== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/rlp@5.6.1", "@ethersproject/rlp@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.6.1.tgz#df8311e6f9f24dcb03d59a2bac457a28a4fe2bd8" @@ -2114,7 +2326,7 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/logger" "^5.6.0" -"@ethersproject/rlp@5.7.0", "@ethersproject/rlp@^5.7.0": +"@ethersproject/rlp@5.7.0", "@ethersproject/rlp@^5.6.0", "@ethersproject/rlp@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.7.0.tgz#de39e4d5918b9d74d46de93af80b7685a9c21304" integrity sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w== @@ -2139,6 +2351,15 @@ "@ethersproject/logger" "^5.4.0" hash.js "1.1.7" +"@ethersproject/sha2@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.0.tgz#364c4c11cc753bda36f31f001628706ebadb64d9" + integrity sha512-1tNWCPFLu1n3JM9t4/kytz35DkuF9MxqkGGEHNauEbaARdm2fafnOyw1s0tIQDPKF/7bkP1u3dbrmjpn5CelyA== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + hash.js "1.1.7" + "@ethersproject/sha2@5.6.1", "@ethersproject/sha2@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.1.tgz#211f14d3f5da5301c8972a8827770b6fd3e51656" @@ -2148,7 +2369,7 @@ "@ethersproject/logger" "^5.6.0" hash.js "1.1.7" -"@ethersproject/sha2@5.7.0", "@ethersproject/sha2@^5.7.0": +"@ethersproject/sha2@5.7.0", "@ethersproject/sha2@^5.6.0", "@ethersproject/sha2@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.7.0.tgz#9a5f7a7824ef784f7f7680984e593a800480c9fb" integrity sha512-gKlH42riwb3KYp0reLsFTokByAKoJdgFCwI+CCiX/k+Jm2mbNs6oOaCjYQSlI1+XBVejwH2KrmCbMAT/GnRDQw== @@ -2169,6 +2390,18 @@ elliptic "6.5.4" hash.js "1.1.7" +"@ethersproject/signing-key@5.6.1": + version "5.6.1" + resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.6.1.tgz#31b0a531520616254eb0465b9443e49515c4d457" + integrity sha512-XvqQ20DH0D+bS3qlrrgh+axRMth5kD1xuvqUQUTeezxUTXBOeR6hWz2/C6FBEu39FRytyybIWrYf7YLSAKr1LQ== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + bn.js "^4.11.9" + elliptic "6.5.4" + hash.js "1.1.7" + "@ethersproject/signing-key@5.6.2", "@ethersproject/signing-key@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.6.2.tgz#8a51b111e4d62e5a62aee1da1e088d12de0614a3" @@ -2181,7 +2414,7 @@ elliptic "6.5.4" hash.js "1.1.7" -"@ethersproject/signing-key@5.7.0", "@ethersproject/signing-key@^5.7.0": +"@ethersproject/signing-key@5.7.0", "@ethersproject/signing-key@^5.6.0", "@ethersproject/signing-key@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.7.0.tgz#06b2df39411b00bc57c7c09b01d1e41cf1b16ab3" integrity sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q== @@ -2216,6 +2449,18 @@ "@ethersproject/sha2" "^5.4.0" "@ethersproject/strings" "^5.4.0" +"@ethersproject/solidity@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.6.0.tgz#64657362a596bf7f5630bdc921c07dd78df06dc3" + integrity sha512-YwF52vTNd50kjDzqKaoNNbC/r9kMDPq3YzDWmsjFTRBcIF1y4JCQJ8gB30wsTfHbaxgxelI5BfxQSxD/PbJOww== + dependencies: + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/sha2" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/solidity@5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.6.1.tgz#5845e71182c66d32e6ec5eefd041fca091a473e2" @@ -2249,6 +2494,15 @@ "@ethersproject/constants" "^5.4.0" "@ethersproject/logger" "^5.4.0" +"@ethersproject/strings@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.6.0.tgz#9891b26709153d996bf1303d39a7f4bc047878fd" + integrity sha512-uv10vTtLTZqrJuqBZR862ZQjTIa724wGPWQqZrofaPI/kUsf53TBG0I0D+hQ1qyNtllbNzaW+PDPHHUI6/65Mg== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/strings@5.6.1", "@ethersproject/strings@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.6.1.tgz#dbc1b7f901db822b5cafd4ebf01ca93c373f8952" @@ -2258,7 +2512,7 @@ "@ethersproject/constants" "^5.6.1" "@ethersproject/logger" "^5.6.0" -"@ethersproject/strings@5.7.0", "@ethersproject/strings@^5.7.0": +"@ethersproject/strings@5.7.0", "@ethersproject/strings@^5.6.0", "@ethersproject/strings@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.7.0.tgz#54c9d2a7c57ae8f1205c88a9d3a56471e14d5ed2" integrity sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg== @@ -2291,6 +2545,21 @@ "@ethersproject/rlp" "^5.4.0" "@ethersproject/signing-key" "^5.4.0" +"@ethersproject/transactions@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.6.0.tgz#4b594d73a868ef6e1529a2f8f94a785e6791ae4e" + integrity sha512-4HX+VOhNjXHZyGzER6E/LVI2i6lf9ejYeWD6l4g50AdmimyuStKc39kvKf1bXWQMg7QNVh+uC7dYwtaZ02IXeg== + dependencies: + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/rlp" "^5.6.0" + "@ethersproject/signing-key" "^5.6.0" + "@ethersproject/transactions@5.6.2", "@ethersproject/transactions@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.6.2.tgz#793a774c01ced9fe7073985bb95a4b4e57a6370b" @@ -2306,7 +2575,7 @@ "@ethersproject/rlp" "^5.6.1" "@ethersproject/signing-key" "^5.6.2" -"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.7.0": +"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.6.0", "@ethersproject/transactions@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.7.0.tgz#91318fc24063e057885a6af13fdb703e1f993d3b" integrity sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ== @@ -2345,6 +2614,15 @@ "@ethersproject/constants" "^5.4.0" "@ethersproject/logger" "^5.4.0" +"@ethersproject/units@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.6.0.tgz#e5cbb1906988f5740254a21b9ded6bd51e826d9c" + integrity sha512-tig9x0Qmh8qbo1w8/6tmtyrm/QQRviBh389EQ+d8fP4wDsBrJBf08oZfoiz1/uenKK9M78yAP4PoR7SsVoTjsw== + dependencies: + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/units@5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.6.1.tgz#ecc590d16d37c8f9ef4e89e2005bda7ddc6a4e6f" @@ -2384,6 +2662,27 @@ "@ethersproject/transactions" "^5.4.0" "@ethersproject/wordlists" "^5.4.0" +"@ethersproject/wallet@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.6.0.tgz#33d11a806d783864208f348709a5a3badac8e22a" + integrity sha512-qMlSdOSTyp0MBeE+r7SUhr1jjDlC1zAXB8VD84hCnpijPQiSNbxr6GdiLXxpUs8UKzkDiNYYC5DRI3MZr+n+tg== + dependencies: + "@ethersproject/abstract-provider" "^5.6.0" + "@ethersproject/abstract-signer" "^5.6.0" + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/hash" "^5.6.0" + "@ethersproject/hdnode" "^5.6.0" + "@ethersproject/json-wallets" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/random" "^5.6.0" + "@ethersproject/signing-key" "^5.6.0" + "@ethersproject/transactions" "^5.6.0" + "@ethersproject/wordlists" "^5.6.0" + "@ethersproject/wallet@5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.6.2.tgz#cd61429d1e934681e413f4bc847a5f2f87e3a03c" @@ -2437,6 +2736,17 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/strings" "^5.4.0" +"@ethersproject/web@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.6.0.tgz#4bf8b3cbc17055027e1a5dd3c357e37474eaaeb8" + integrity sha512-G/XHj0hV1FxI2teHRfCGvfBUHFmU+YOSbCxlAMqJklxSa7QMiHFQfAxvwY2PFqgvdkxEKwRNr/eCjfAPEm2Ctg== + dependencies: + "@ethersproject/base64" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/web@5.6.1", "@ethersproject/web@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.6.1.tgz#6e2bd3ebadd033e6fe57d072db2b69ad2c9bdf5d" @@ -2448,7 +2758,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" -"@ethersproject/web@5.7.1", "@ethersproject/web@^5.7.0": +"@ethersproject/web@5.7.1", "@ethersproject/web@^5.6.0", "@ethersproject/web@^5.7.0": version "5.7.1" resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.7.1.tgz#de1f285b373149bee5928f4eb7bcb87ee5fbb4ae" integrity sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w== @@ -2470,6 +2780,17 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/strings" "^5.4.0" +"@ethersproject/wordlists@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.6.0.tgz#79e62c5276e091d8575f6930ba01a29218ded032" + integrity sha512-q0bxNBfIX3fUuAo9OmjlEYxP40IB8ABgb7HjEZCL5IKubzV3j30CWi2rqQbjTS2HfoyQbfINoKcTVWP4ejwR7Q== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/hash" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/wordlists@5.6.1", "@ethersproject/wordlists@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.6.1.tgz#1e78e2740a8a21e9e99947e47979d72e130aeda1" @@ -2481,7 +2802,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" -"@ethersproject/wordlists@5.7.0", "@ethersproject/wordlists@^5.7.0": +"@ethersproject/wordlists@5.7.0", "@ethersproject/wordlists@^5.6.0", "@ethersproject/wordlists@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.7.0.tgz#8fb2c07185d68c3e09eb3bfd6e779ba2774627f5" integrity sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA== @@ -2859,7 +3180,7 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@keepkey/device-protocol@^7.12.2": +"@keepkey/device-protocol@^7.12.2", "@keepkey/device-protocol@^7.8.1": version "7.12.2" resolved "https://registry.yarnpkg.com/@keepkey/device-protocol/-/device-protocol-7.12.2.tgz#9ff4b322af99264b83bbf68cc1cd349f53b32070" integrity sha512-U2wGgynZx9euKx9sshLzCeMJ/36+2NH8M/YhnUoCrS1xsjPp5xTCXquLFCFzfEL379yL4g03yu2kT41LKI5Dog== @@ -2969,6 +3290,23 @@ tiny-secp256k1 "1.1.6" varuint-bitcoin "1.1.2" +"@ledgerhq/hw-app-btc@^6.7.0": + version "6.27.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-6.27.1.tgz#5f7258f8a61532e14d6720678a80133320fc5666" + integrity sha512-2XOH5jtso4QsPYjXldwdcXw6amb8kCyiHtXw1NySA1QP/xBjxN8JLEXEPFsaK6l2zz55I8kKUtVoEGz7bpg0lg== + dependencies: + "@ledgerhq/hw-transport" "^6.27.1" + "@ledgerhq/logs" "^6.10.0" + bip32-path "^0.4.2" + bitcoinjs-lib "^5.2.0" + bs58 "^4.0.1" + invariant "^2.2.4" + ripemd160 "2" + semver "^7.3.5" + sha.js "2" + tiny-secp256k1 "1.1.6" + varuint-bitcoin "1.1.2" + "@ledgerhq/hw-app-cosmos@6.7.0": version "6.7.0" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-cosmos/-/hw-app-cosmos-6.7.0.tgz#d2e79213378a06b647aa4ce58c0ea89452425d0d" @@ -3087,7 +3425,7 @@ "@ledgerhq/hw-transport" "^6.7.0" "@ledgerhq/logs" "^6.2.0" -"@ledgerhq/hw-transport@6.7.0", "@ledgerhq/hw-transport@^5.19.1", "@ledgerhq/hw-transport@^5.51.1", "@ledgerhq/hw-transport@^6.20.0", "@ledgerhq/hw-transport@^6.28.8", "@ledgerhq/hw-transport@^6.7.0": +"@ledgerhq/hw-transport@6.7.0", "@ledgerhq/hw-transport@^5.19.1", "@ledgerhq/hw-transport@^5.51.1", "@ledgerhq/hw-transport@^6.20.0", "@ledgerhq/hw-transport@^6.27.1", "@ledgerhq/hw-transport@^6.28.8", "@ledgerhq/hw-transport@^6.7.0": version "6.7.0" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.7.0.tgz#d1f0d70e21b91e6457a32d4c3cec0764e97461ff" integrity sha512-w+PhW6Y4KXYdoCykkE1zt0VL6Ryf72RP8sZP8OH1O90hX/R/q9BMYKl8VNqTbqlrOrORgATlKkbmIJBjbngZew== @@ -5557,10 +5895,50 @@ web-encoding "^1.1.0" wif "^2.0.6" -"@shapeshiftoss/hdwallet-core@1.52.1", "@shapeshiftoss/hdwallet-core@^1.50.4": - version "1.52.1" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.1.tgz#5165e6ecfef3ffa2a3c1ed1aafe6de268224f920" - integrity sha512-ON0kGiYhVUZm2sPp6EbgIwACJAvULIeklddWPZDCv6mvByIsY8D6BTVQtXVavHBB+/Pf6bVc1uMfCO3X5zPaHg== +"@shapeshiftoss/hdwallet-core@1.21.1": + version "1.21.1" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.21.1.tgz#a382f305a9cb502ea1677c34bcd4d603024128dc" + integrity sha512-paDSgf5AhJkC7N6nsQLzyrQVxFZxyJoGwEwiVAwMPJg8ublLorJTiHZAKG23FM89GqGWEyYiXrIgdY8fL1BoIQ== + dependencies: + eventemitter2 "^5.0.1" + lodash "^4.17.21" + rxjs "^6.4.0" + type-assertions "^1.1.0" + +"@shapeshiftoss/hdwallet-core@1.21.2", "@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.10": + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.21.2.tgz#88fe49d79a79c8429b714e6244a4068c82e2afb5" + integrity sha512-s1J95MIwu/Qfaeijz6J6qdVxe8gMbVQjEWPCfuhGvBIxF94o+7cpoUXIrU4KIIuDbrdxJ3P4sf7xo89s4Y3wNQ== + dependencies: + eventemitter2 "^5.0.1" + lodash "^4.17.21" + rxjs "^6.4.0" + type-assertions "^1.1.0" + +"@shapeshiftoss/hdwallet-core@1.22.0": + version "1.22.0" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.22.0.tgz#f16d3d2842c5e704ec8e829573b1152dd2070001" + integrity sha512-xCfmWN0FyJH8lVRhAKPQ7UHfWY1aMGbnGyalS+X4saz9P8o4qaHQ/vBpARrKhL+dDsDSKt8Ol2Wo90nv6C/7Ag== + dependencies: + eventemitter2 "^5.0.1" + lodash "^4.17.21" + rxjs "^6.4.0" + type-assertions "^1.1.0" + +"@shapeshiftoss/hdwallet-core@1.23.0": + version "1.23.0" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.23.0.tgz#8e7552b684d9c4600381cf3131c9d304df4b169a" + integrity sha512-CP0ysBeyRMtjx1OTSj+EmuhYWeh3YGxrbobj7HZDYYl8kHyUseJTTQ3s42ezS1AfXkDf/YidKDxa7p6+v7/0sw== + dependencies: + eventemitter2 "^5.0.1" + lodash "^4.17.21" + rxjs "^6.4.0" + type-assertions "^1.1.0" + +"@shapeshiftoss/hdwallet-core@1.52.0": + version "1.52.0" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.0.tgz#6dadd6fb8c8bd95a6e2b067d590b6d07ecc6a729" + integrity sha512-0SyKTbPphmHxno09enid8CdBjnLInfWJkmBO7vJvh2LBGSKw3fZo+7+tjfJe0Z2lS7To6SsJCfBMt1plLTfd1A== dependencies: "@shapeshiftoss/proto-tx-builder" "^0.8.0" eip-712 "^1.0.0" @@ -5569,10 +5947,10 @@ rxjs "^6.4.0" type-assertions "^1.1.0" -"@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.11": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.3-thorchain.11.tgz#1d24db71eae513a5f8ca79721e76f244974ef3dc" - integrity sha512-FxVzYJJ7ZqqaWzEBgxN2bsUUxk3y38QIRd48C2cRQjgPDQbd1DRRaWoxD0/f4zFGDyAYTQgF7mOUGUH9JLV7Zw== +"@shapeshiftoss/hdwallet-core@1.52.1", "@shapeshiftoss/hdwallet-core@^1.50.4": + version "1.52.1" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.1.tgz#5165e6ecfef3ffa2a3c1ed1aafe6de268224f920" + integrity sha512-ON0kGiYhVUZm2sPp6EbgIwACJAvULIeklddWPZDCv6mvByIsY8D6BTVQtXVavHBB+/Pf6bVc1uMfCO3X5zPaHg== dependencies: "@shapeshiftoss/proto-tx-builder" "^0.8.0" eip-712 "^1.0.0" @@ -5592,128 +5970,146 @@ type-assertions "^1.1.0" "@shapeshiftoss/hdwallet-keepkey-nodewebusb@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-nodewebusb/-/hdwallet-keepkey-nodewebusb-1.52.3-thorchain.11.tgz#2bdcf3bf1a7599ffea9f5ebd5e2e4c3acf3dcc35" - integrity sha512-Ek94hVGSzsZWVdrev2UOlUrYZtnpUwVJh0Zf8osTu36JzPjrEKgQDA72mRQzIAXKRacqtdCL/uec3SI+kWomPA== + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey-nodewebusb/-/hdwallet-keepkey-nodewebusb-1.21.2.tgz#69f37ae29077ec3a11fea9ee319f869b712f8198" + integrity sha512-7ImVY9DQLv+QLZFT/JWuzecP/CSDb8VeaQghLICgOqG/xPMRMiSOBJxcFzPJiK/uM7E+UmMBgHgLM/zhHUz68g== dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-keepkey" "1.21.2" "@shapeshiftoss/hdwallet-keepkey-tcp@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-tcp/-/hdwallet-keepkey-tcp-1.52.3-thorchain.11.tgz#bdfde504aac915f3d6763082c2e49c0980ed59ad" - integrity sha512-K2pEq35XAHpTR45m8WwdVBRvx5lIj8+G3tONsqr0d/9KluGEn//FPil5P9Rxz/CvXam/uwWH7NvJMibWmKlcQA== + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey-tcp/-/hdwallet-keepkey-tcp-1.21.2.tgz#fcb34a45cd84caf627f35fba37aa1d81191c12ca" + integrity sha512-/bQcRaic5dd1J9wuMr4ywjLRfA9piczfQiyNdXr7z3iSX/3RmI9QBgjTHQWoAij/ufFGmZPOYyh1VJAsIAhCCA== dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-keepkey" "1.21.2" axios "^0.21.1" "@shapeshiftoss/hdwallet-keepkey-webusb@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-webusb/-/hdwallet-keepkey-webusb-1.52.3-thorchain.11.tgz#75ecc2d3d2e2f26db1f86f50fd95eefaccf8bf15" - integrity sha512-pO1susjpLW0YKENcWrjI81moONOeTbjf6mcc2Mq8yfLbxiNYM4guEEtnesU5OfKjv78bOsyOgcNjzpKL8PiygQ== + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey-webusb/-/hdwallet-keepkey-webusb-1.21.2.tgz#35c8b40e7d9eef0c3b6e32b376123839c540db17" + integrity sha512-svcoyT0mnAsxOiFQGSD7dgwiRMSM2Orh7YMqe6Rh/QRT/IlXWbknVUf4dBvZFS4ZKIVZRIREaYc2zKo3bRebNQ== dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-keepkey" "1.21.2" -"@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.11": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey/-/hdwallet-keepkey-1.52.3-thorchain.11.tgz#83b412314ca7087e5d2245615fbae46686492996" - integrity sha512-U08jLpycWtfu1hSYnYCx+5e4/tokP/Z8eCQrUlYTdKSAZmXPBTFlz7uKjWcsj0zuoC+xod3yc5VSXbyvGsnupg== +"@shapeshiftoss/hdwallet-keepkey@1.21.2": + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey/-/hdwallet-keepkey-1.21.2.tgz#969a9331c2bad4b46ab88dd4d7dfd98df87be67d" + integrity sha512-5hwjZWmdED/No3Fbr6L1dhCIAAl2zj76OOFDEMgKoTtbtL4GIiKH43W1g9H+SbtLWSpa/VSQxz26NMyMigNh1w== dependencies: "@ethereumjs/common" "^2.4.0" "@ethereumjs/tx" "^3.3.0" - "@keepkey/device-protocol" "^7.12.2" + "@keepkey/device-protocol" "^7.8.1" "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/proto-tx-builder" "^0.8.0" + "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/proto-tx-builder" "^0.2.1" bignumber.js "^9.0.1" bnb-javascript-sdk-nobroadcast "^2.16.14" crypto-js "^4.0.0" - eip-712 "^1.0.0" eip55 "^2.1.0" google-protobuf "^3.15.8" icepick "^2.4.0" lodash "^4.17.21" p-lazy "^3.1.0" - semver "^7.3.8" + semver "^6.3.0" + tiny-secp256k1 "^1.1.6" + +"@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.10": + version "1.22.0" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey/-/hdwallet-keepkey-1.22.0.tgz#3dfd550ccb0e07fff96db99136c909a346af4fca" + integrity sha512-4D+lVQaff1E2kO7lImp4gyI+7/tIiwoU6ns/PgmfmuDXpxmSvG0Z50hA2eee6e6eqmPXpwz/1GhlkIvv3p99yA== + dependencies: + "@ethereumjs/common" "^2.4.0" + "@ethereumjs/tx" "^3.3.0" + "@keepkey/device-protocol" "^7.8.1" + "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" + "@shapeshiftoss/hdwallet-core" "1.22.0" + "@shapeshiftoss/proto-tx-builder" "^0.2.1" + bignumber.js "^9.0.1" + bnb-javascript-sdk-nobroadcast "^2.16.14" + crypto-js "^4.0.0" + eip55 "^2.1.0" + google-protobuf "^3.15.8" + icepick "^2.4.0" + lodash "^4.17.21" + p-lazy "^3.1.0" + semver "^6.3.0" tiny-secp256k1 "^1.1.6" "@shapeshiftoss/hdwallet-keplr@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keplr/-/hdwallet-keplr-1.52.3-thorchain.11.tgz#d4d68722353f496f754d2cb0062dc2612430cd64" - integrity sha512-vNOsjerVGDfFDUcoX45yQthDVvcss7YKvbcS9feMC9yVSHgb9raYVdUJsJ7JIqXNYkkJ/aMardMb2ldCTmH+IQ== + version "1.52.0" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keplr/-/hdwallet-keplr-1.52.0.tgz#0348e2599d993958c58945e47a3add446dee9556" + integrity sha512-SU3AQyBkO6xALSzMmOSMbmO50eC/JOc85yM6VUQYPjmyIJ1pf9/YKgjn05xehwv8UsNU858Ep5GBIo8NPQop5g== dependencies: "@shapeshiftoss/caip" "8.15.0" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.52.0" "@shapeshiftoss/proto-tx-builder" "^0.8.0" "@shapeshiftoss/types" "3.1.3" base64-js "^1.5.1" lodash "^4.17.21" "@shapeshiftoss/hdwallet-ledger-webhid@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger-webhid/-/hdwallet-ledger-webhid-1.52.3-thorchain.11.tgz#48e49b81c14a65e6e2ab868b17a40e1bd6e98eb2" - integrity sha512-lFBiBXjaSKnsPKKUNDhIcHjZuKfwrJ/lzc2ckepR+SPgS13LMsXnHcFy87DVb53e6CP4p4Kv6I2zR1rJsv+SeQ== + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-ledger-webhid/-/hdwallet-ledger-webhid-1.21.2.tgz#ad31acd213547df29c3ee2257b18f4a0c640f28b" + integrity sha512-NahU0xVaSocycrSjlK9eR/vsyn8XOWwqAZ+H0OyT0pfrFJD2PFh6/FAuOBhz9rbCvS5TUNkSMIZVj7WvUQ3OXQ== dependencies: - "@ledgerhq/hw-app-btc" "^10.0.8" + "@ledgerhq/hw-app-btc" "^6.7.0" "@ledgerhq/hw-app-eth" "^6.9.0" "@ledgerhq/hw-transport" "^6.7.0" "@ledgerhq/hw-transport-webhid" "^6.7.0" "@ledgerhq/live-common" "^21.8.2" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-ledger" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-ledger" "1.21.2" "@types/w3c-web-hid" "^1.0.2" + typescript "^4.3.2" "@shapeshiftoss/hdwallet-ledger-webusb@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger-webusb/-/hdwallet-ledger-webusb-1.52.3-thorchain.11.tgz#3adb61c57fccd50627438c559f80b9ea6628a561" - integrity sha512-D3XRt+0+Z8YJMTBoTDO2oDjmg0LQtvURd1p8tqGRVxxpoXQxPQg5LI0zq7bjFPF7FyaBaINF8lu8uaHrU+Aygw== + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-ledger-webusb/-/hdwallet-ledger-webusb-1.21.2.tgz#00629563b25ec3dd94a7268e52780a718448347b" + integrity sha512-SX40IZEFo8jCx4/U7I7UogDa7L1RECdK+Xp+yuyhqxU3rITrpLrdJH9H1vOy4FS+TxRN2BkMMAG5mXMCCencag== dependencies: - "@ledgerhq/hw-app-btc" "^10.0.8" + "@ledgerhq/hw-app-btc" "^6.7.0" "@ledgerhq/hw-app-eth" "^6.9.0" "@ledgerhq/hw-transport" "^6.7.0" "@ledgerhq/hw-transport-webusb" "^6.7.0" "@ledgerhq/live-common" "^21.8.2" - "@ledgerhq/logs" "^6.10.1" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-ledger" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-ledger" "1.21.2" "@types/w3c-web-usb" "^1.0.4" - p-queue "^7.4.1" + typescript "^4.3.2" -"@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.11": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger/-/hdwallet-ledger-1.52.3-thorchain.11.tgz#7a03688868f922c033a315fa9409ccfb9aecab40" - integrity sha512-KujW49hBSzM05g6nnJ7Oheiiro0R9f8+l5faj1pqZYs2bpZFgoqlKLGe1zkItp2YCuVIEeMtXHMmqGBJaMQmjw== +"@shapeshiftoss/hdwallet-ledger@1.21.2", "@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.10": + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-ledger/-/hdwallet-ledger-1.21.2.tgz#f506a357b291440bf4fc141bc35f880709c13a6b" + integrity sha512-2NRIHYZGieHjumKLBFgQqzlrZzE6nd5osgqVjwDXDU7NWnAhRz9LBS8T09diYXSvLNNY2Yhld14CPiktDYbGig== dependencies: "@ethereumjs/common" "^2.4.0" "@ethereumjs/tx" "^3.3.0" - "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@types/ripemd160" "^2.0.1" + "@shapeshiftoss/hdwallet-core" "1.21.2" base64-js "^1.5.1" bchaddrjs "^0.4.4" + bitcoinjs-lib "^5.1.6" bitcoinjs-message "^2.0.0" bs58check "2.1.2" ethereumjs-tx "1.3.7" ethereumjs-util "^6.1.0" lodash "^4.17.21" - ripemd160 "^2.0.2" "@shapeshiftoss/hdwallet-metamask@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-metamask/-/hdwallet-metamask-1.52.3-thorchain.11.tgz#3bc519ebbe0285ba3d0076ae03dda7a71e096d47" - integrity sha512-FeS94nlj2oklOFGX0X1AykL2+bosVi8+3NvBkl+v8zjWluHkcEvXfXmj7Dao/AjAL00auOIJrsFLdKOZ7O2RaQ== + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-metamask/-/hdwallet-metamask-1.21.2.tgz#2a73bab57a45984bc7ddca5c08c765e1a17c929b" + integrity sha512-JCWH3YRuIpB8h+RLWF+arU5w4VsHJoMz7MUF+DUmiivziwWprrn8r4PYtzo7QSMffwwKudzB1B8nHVm0ygDzdg== dependencies: "@metamask/detect-provider" "^1.2.0" "@metamask/onboarding" "^1.0.1" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - eth-rpc-errors "^4.0.3" + "@shapeshiftoss/hdwallet-core" "1.21.2" lodash "^4.17.21" "@shapeshiftoss/hdwallet-native@^1.50.4": version "1.52.1" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.1.tgz#9a8144302f20069d145079154d3d9c56086178b4" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.1.tgz#9a8144302f20069d145079154d3d9c56086178b4" integrity sha512-TUemR4q0ISgPRvLkZQaK0iQ9t8ObhbGwGtOBmKzbSyJR10vVXbGxt5eIi+Gc19fSz7uyAQM2N3pIMFMsBasciw== dependencies: "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" @@ -5741,24 +6137,22 @@ web-encoding "^1.1.0" "@shapeshiftoss/hdwallet-native@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.3-thorchain.11.tgz#e57ef8355715ab701a7c059d460f917d011af999" - integrity sha512-6BfKW9qCGyvTVBdVB6i+pMR00I8TcKRhobAqB6zcuX0jWIj25TYltvuDk2EB3YedH38d0ly9ZEEuteKL4WY6Cw== + version "1.23.0" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.23.0.tgz#a035d1f1baa6c5a1da47bb2d12aad8e76d0b46d2" + integrity sha512-UYCrUD8Ful1lNArpzLhvTBnuNjgSz9Ytl3/MPeOPi+WTrD3PIYh/QEOmx6JqBL0PoxoQof1O6GqYBq44It1tsg== dependencies: "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" "@shapeshiftoss/fiosdk" "1.2.1-shapeshift.6" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/proto-tx-builder" "^0.8.0" + "@shapeshiftoss/hdwallet-core" "1.23.0" + "@shapeshiftoss/proto-tx-builder" "^0.2.1" "@zxing/text-encoding" "^0.9.0" bchaddrjs "^0.4.9" - bech32 "^1.1.4" bignumber.js "^9.0.1" bip32 "^2.0.5" bip39 "^3.0.2" bnb-javascript-sdk-nobroadcast "^2.16.14" crypto-js "^4.0.0" - eip-712 "^1.0.0" - ethers "5.7.2" + ethers "5.6.5" eventemitter2 "^5.0.1" funtypes "^3.0.1" lodash "^4.17.21" @@ -5770,12 +6164,12 @@ web-encoding "^1.1.0" "@shapeshiftoss/hdwallet-portis@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-portis/-/hdwallet-portis-1.52.3-thorchain.11.tgz#35b734a9fecb7121e4808c6f99e9a86862d13533" - integrity sha512-9LVYv6uZX6bgKED3YYF29YF+UTL4XhgI83SeveW/PknvYMrbvF0eSQjQDqydrYLNUaQ5bmjKoXi5Cl3o4XQTaQ== + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-portis/-/hdwallet-portis-1.21.2.tgz#f87c325e24add9d3281f3bb490d1714219307886" + integrity sha512-0l6dSzcWlD/KcIZw/eDA71V/DsNcs4myTX9qdnhmW4bJVRvpRiAEnt7hIo0v76OGCBkvBsiwXTRxfmM34HC6NQ== dependencies: "@portis/web3" "3.0.10" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.2" base64-js "^1.5.1" bip32 "^2.0.4" bitcoinjs-lib "^5.1.6" @@ -5785,51 +6179,62 @@ web3 "^1.5.1" "@shapeshiftoss/hdwallet-tallyho@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-tallyho/-/hdwallet-tallyho-1.52.3-thorchain.11.tgz#faa3e2a7c6a81a9c8e0e3fa998d41fef58bdea9b" - integrity sha512-VgIDzgSxk8tRn7DSlSP/lUn7p074WjMrFfSsEj5jtuVh1rpLhCBH6sDgv34rUPHQ8m3VrXYjg3qUsDoau+Rltg== + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-tallyho/-/hdwallet-tallyho-1.21.2.tgz#509c276f3051d70b8de3020a5f49f7d69c2c7c31" + integrity sha512-d3IvLvVEZY1t7XgONbtRYuq9k6V4f8L+64vOvTR6eP5oE6VBJAWxRkRSJLMvqdWM+elxWuOPqtXvPAY/Eohukw== dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.2" lodash "^4.17.21" tallyho-onboarding "^1.0.2" "@shapeshiftoss/hdwallet-trezor-connect@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-trezor-connect/-/hdwallet-trezor-connect-1.52.3-thorchain.11.tgz#5d4ceb32201136dadc03b8320917d7a6aa488aca" - integrity sha512-fc3Ui4AFgHF6OdUynKsh4qg/sb8m9AnWz9VuY0qPseYtJhQCSt5WneluWXPWjTVNlDFkn7GqthyQAfTl0LLbYQ== + version "1.21.1" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-trezor-connect/-/hdwallet-trezor-connect-1.21.1.tgz#c5172c1e4ec92a31969b0c743289a819a025f5f0" + integrity sha512-0kW4rPQjsAmnXK053xnEUv1BnM0rXIDzQnCTuy8kSADKw8lmz9NPXqftIiVCEYSkOxq5r+E909TVmIJkdbpZNA== dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-trezor" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.1" + "@shapeshiftoss/hdwallet-trezor" "1.21.1" "@trezor/rollout" "^1.2.0" trezor-connect "^8.2.1" -"@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.11": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-trezor/-/hdwallet-trezor-1.52.3-thorchain.11.tgz#87c17c63552e18c0299d75c20b6fe5e98a9b9083" - integrity sha512-7I4WWRc3hYCBUySll7Pokk0jnm8u/1yJaFhNabTYphnGPTI1fa4hj7dth22GAqvFYoSX+HlsqB1TJolmIAwv0g== +"@shapeshiftoss/hdwallet-trezor@1.21.1": + version "1.21.1" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-trezor/-/hdwallet-trezor-1.21.1.tgz#9d3ac2462b6d2f0725a36e2cd79e2a0f67c1d9fb" + integrity sha512-VlcFEbs0HT9XxOHS52sz6UF4EKziuFssGzIke/yfDVVHSYoWuOZJMu3zMtqNoc8EZCuwnUgsmuyPHpFXfV6jJw== dependencies: "@ethereumjs/common" "^2.4.0" "@ethereumjs/tx" "^3.3.0" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.1" + base64-js "^1.5.1" + lodash "^4.17.21" + +"@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.10": + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-trezor/-/hdwallet-trezor-1.21.2.tgz#dde1f0293a8365f4791bba80ea5041efa4ed0e6f" + integrity sha512-1IP/Kb9MqzcwASwW8jg+mWgCbPUvK6LBoCCW1w7keibimdXlsMu2LEWvgUxIFzQQlX9QtcZ+vAoKuZ1yO1tJ+A== + dependencies: + "@ethereumjs/common" "^2.4.0" + "@ethereumjs/tx" "^3.3.0" + "@shapeshiftoss/hdwallet-core" "1.21.2" base64-js "^1.5.1" lodash "^4.17.21" "@shapeshiftoss/hdwallet-walletconnect@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-walletconnect/-/hdwallet-walletconnect-1.52.3-thorchain.11.tgz#b75eee0e4ded2f3ead7bf7c8dc4805f143a0c087" - integrity sha512-//GZ3npcC4RsSiqgQ03jSNL7adKrlF8aBQ9UT3HWItw1+bNN3jB2npiQV7d6KIYqtt3zr1YWxCXp0yAkeBbPdw== + version "1.52.1" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-walletconnect/-/hdwallet-walletconnect-1.52.1.tgz#ec889e5363f53542a6adec9848559d7d157e7d60" + integrity sha512-S9LP0VYBYnUVvG7CW4pWsiY2yRnhy5plwPMNO+gnup3oMzRZUAxN1mkP5aSL8v4cwT+L/THjZ4VNqqEuMZShNA== dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.52.1" "@walletconnect/qrcode-modal" "^1.7.8" "@walletconnect/web3-provider" "^1.7.8" ethers "^5.6.5" "@shapeshiftoss/hdwallet-xdefi@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-xdefi/-/hdwallet-xdefi-1.52.3-thorchain.11.tgz#9571a7747e21e6321add7815d8d147edb8b06cfc" - integrity sha512-ocbVY3TFfrgr35Kqa9UlhvOJhZ6YLnJmKJLIqOkF+GLs+eOxwagqDBIDxYgXNAbx36q2MVF4GS51URrn6LG0BA== + version "1.21.1" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-xdefi/-/hdwallet-xdefi-1.21.1.tgz#11935751ebc1a764fbeb9a70c17e6c4eeaccd8d5" + integrity sha512-sfl7O5LDp9sLuL3XFBckap3v6vBLhGl8XsgGV9sPsRGWwaLOhDnXE9YObnCxpLjJKtF6ZyzLH203ba4XB68Tpg== dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.1" lodash "^4.17.21" "@shapeshiftoss/logger@^1.1.2", "@shapeshiftoss/logger@^1.1.3": @@ -5881,6 +6286,18 @@ eth-rpc-errors "^4.0.3" patch-package "^6.2.2" +"@shapeshiftoss/proto-tx-builder@^0.2.1": + version "0.2.1" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/proto-tx-builder/-/proto-tx-builder-0.2.1.tgz#82106d45adcec0d5d215a6098b52d16ef3db3dc8" + integrity sha512-LNUFjKRmq8aC08Uq9/umUCF2F9Fhfg9yH6xFhEdZkNTNFC4WW7XuAxKrzM6yFCaYWkIN265v7T3sHleZ9MTz3g== + dependencies: + "@cosmjs/proto-signing" "^0.28.0" + "@cosmjs/stargate" "^0.28.0" + "@cosmjs/tendermint-rpc" "^0.28.0" + cosmjs-types "^0.4.1" + google-protobuf "^3.17.0" + long "^4.0.0" + "@shapeshiftoss/proto-tx-builder@^0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@shapeshiftoss/proto-tx-builder/-/proto-tx-builder-0.8.0.tgz#12523e76e6ae2c794e8ad5439dedf65d30c78185" @@ -6698,7 +7115,7 @@ "@types/ripemd160@^2.0.1": version "2.0.1" - resolved "http://localhost:4873/@types/ripemd160/-/ripemd160-2.0.1.tgz#e9ea7a26adf0e2541917fc2b1ecb497e8ced4b7e" + resolved "https://registry.yarnpkg.com/@types/ripemd160/-/ripemd160-2.0.1.tgz#e9ea7a26adf0e2541917fc2b1ecb497e8ced4b7e" integrity sha512-l3pt9f8vK1tU2qBXY1aL7HofNnJKbpNa+2DznrD7j0lhaS4587e3iwgSMRDJFlidsrNjrrjIl8G+EeXFMjcGXg== dependencies: "@types/node" "*" @@ -11449,6 +11866,42 @@ ethereumjs-vm@^2.3.4: rustbn.js "~0.2.0" safe-buffer "^5.1.1" +ethers@5.6.5: + version "5.6.5" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.6.5.tgz#3185ac7815dc640993408adf6f133ffabfbcbb63" + integrity sha512-9CTmplO9bv0s/aPw3HB3txGzKz3tUSI2EfO4dJo0W2WvaEq1ArgsEX6obV+bj5X3yY+Zgb1kAux8TDtJKe1FaA== + dependencies: + "@ethersproject/abi" "5.6.1" + "@ethersproject/abstract-provider" "5.6.0" + "@ethersproject/abstract-signer" "5.6.0" + "@ethersproject/address" "5.6.0" + "@ethersproject/base64" "5.6.0" + "@ethersproject/basex" "5.6.0" + "@ethersproject/bignumber" "5.6.0" + "@ethersproject/bytes" "5.6.1" + "@ethersproject/constants" "5.6.0" + "@ethersproject/contracts" "5.6.0" + "@ethersproject/hash" "5.6.0" + "@ethersproject/hdnode" "5.6.0" + "@ethersproject/json-wallets" "5.6.0" + "@ethersproject/keccak256" "5.6.0" + "@ethersproject/logger" "5.6.0" + "@ethersproject/networks" "5.6.2" + "@ethersproject/pbkdf2" "5.6.0" + "@ethersproject/properties" "5.6.0" + "@ethersproject/providers" "5.6.5" + "@ethersproject/random" "5.6.0" + "@ethersproject/rlp" "5.6.0" + "@ethersproject/sha2" "5.6.0" + "@ethersproject/signing-key" "5.6.1" + "@ethersproject/solidity" "5.6.0" + "@ethersproject/strings" "5.6.0" + "@ethersproject/transactions" "5.6.0" + "@ethersproject/units" "5.6.0" + "@ethersproject/wallet" "5.6.0" + "@ethersproject/web" "5.6.0" + "@ethersproject/wordlists" "5.6.0" + ethers@5.7.2, ethers@^5.5.3: version "5.7.2" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" @@ -20008,7 +20461,7 @@ typescript@<4.8.0: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== -"typescript@^3 || ^4": +"typescript@^3 || ^4", typescript@^4.3.2: version "4.9.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== From 8d8b654c475fa4446b0e5822a4e84d7b39449fd9 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 19:41:12 +0200 Subject: [PATCH 029/108] feat: regen yarn.lock --- yarn.lock | 709 ++++++++++-------------------------------------------- 1 file changed, 128 insertions(+), 581 deletions(-) diff --git a/yarn.lock b/yarn.lock index 00fe1f15d..96c430e36 100644 --- a/yarn.lock +++ b/yarn.lock @@ -878,7 +878,7 @@ long "^4.0.0" protobufjs "~6.10.2" -"@cosmjs/proto-signing@0.28.13", "@cosmjs/proto-signing@^0.28.0", "@cosmjs/proto-signing@^0.28.13": +"@cosmjs/proto-signing@0.28.13", "@cosmjs/proto-signing@^0.28.13": version "0.28.13" resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.28.13.tgz#95ac12f0da0f0814f348f5ae996c3e96d015df61" integrity sha512-nSl/2ZLsUJYz3Ad0RY3ihZUgRHIow2OnYqKsESMu+3RA/jTi9bDYhiBu8mNMHI0xrEJry918B2CyI56pOUHdPQ== @@ -990,7 +990,7 @@ protobufjs "~6.11.3" xstream "^11.14.0" -"@cosmjs/stargate@^0.28.0", "@cosmjs/stargate@^0.28.13": +"@cosmjs/stargate@^0.28.13": version "0.28.13" resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.28.13.tgz#a73d837a46ee8944e6eafe162f2ff6943c14350e" integrity sha512-dVBMazDz8/eActHsRcZjDHHptOBMqvibj5CFgEtZBp22gP6ASzoAUXTlkSVk5FBf4sfuUHoff6st134/+PGMAg== @@ -1062,7 +1062,7 @@ readonly-date "^1.0.0" xstream "^11.14.0" -"@cosmjs/tendermint-rpc@0.28.13", "@cosmjs/tendermint-rpc@^0.28.0": +"@cosmjs/tendermint-rpc@0.28.13": version "0.28.13" resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.28.13.tgz#0bf587ae66fa3f88319edbd258492d28e73f9f29" integrity sha512-GB+ZmfuJIGQm0hsRtLYjeR3lOxF7Z6XyCBR0cX5AAYOZzSEBJjevPgUHD6tLn8zIhvzxaW3/VKnMB+WmlxdH4w== @@ -1295,21 +1295,6 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/strings" "^5.4.0" -"@ethersproject/abi@5.6.1": - version "5.6.1" - resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.1.tgz#f7de888edeb56b0a657b672bdd1b3a1135cd14f7" - integrity sha512-0cqssYh6FXjlwKWBmLm3+zH2BNARoS5u/hxbz+LpQmcDB3w0W553h2btWui1/uZp2GBM/SI3KniTuMcYyHpA5w== - dependencies: - "@ethersproject/address" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/hash" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/abi@5.6.4", "@ethersproject/abi@^5.6.3": version "5.6.4" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.4.tgz#f6e01b6ed391a505932698ecc0d9e7a99ee60362" @@ -1325,7 +1310,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" -"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.6.0", "@ethersproject/abi@^5.7.0": +"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.7.0.tgz#b3f3e045bbbeed1af3947335c247ad625a44e449" integrity sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA== @@ -1368,19 +1353,6 @@ "@ethersproject/transactions" "^5.4.0" "@ethersproject/web" "^5.4.0" -"@ethersproject/abstract-provider@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.6.0.tgz#0c4ac7054650dbd9c476cf5907f588bbb6ef3061" - integrity sha512-oPMFlKLN+g+y7a79cLK3WiLcjWFnZQtXWgnLAbHZcN3s7L4v90UHpTOrLk+m3yr0gt+/h9STTM6zrr7PM8uoRw== - dependencies: - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/networks" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - "@ethersproject/web" "^5.6.0" - "@ethersproject/abstract-provider@5.6.1", "@ethersproject/abstract-provider@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.6.1.tgz#02ddce150785caf0c77fe036a0ebfcee61878c59" @@ -1394,7 +1366,7 @@ "@ethersproject/transactions" "^5.6.2" "@ethersproject/web" "^5.6.1" -"@ethersproject/abstract-provider@5.7.0", "@ethersproject/abstract-provider@^5.6.0", "@ethersproject/abstract-provider@^5.7.0": +"@ethersproject/abstract-provider@5.7.0", "@ethersproject/abstract-provider@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz#b0a8550f88b6bf9d51f90e4795d48294630cb9ef" integrity sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw== @@ -1431,17 +1403,6 @@ "@ethersproject/logger" "^5.4.0" "@ethersproject/properties" "^5.4.0" -"@ethersproject/abstract-signer@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.6.0.tgz#9cd7ae9211c2b123a3b29bf47aab17d4d016e3e7" - integrity sha512-WOqnG0NJKtI8n0wWZPReHtaLkDByPL67tn4nBaDAhmVq8sjHTPbCdz4DRhVu/cfTOvfy9w3iq5QZ7BX7zw56BQ== - dependencies: - "@ethersproject/abstract-provider" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/abstract-signer@5.6.2", "@ethersproject/abstract-signer@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.6.2.tgz#491f07fc2cbd5da258f46ec539664713950b0b33" @@ -1453,7 +1414,7 @@ "@ethersproject/logger" "^5.6.0" "@ethersproject/properties" "^5.6.0" -"@ethersproject/abstract-signer@5.7.0", "@ethersproject/abstract-signer@^5.6.0", "@ethersproject/abstract-signer@^5.7.0": +"@ethersproject/abstract-signer@5.7.0", "@ethersproject/abstract-signer@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz#13f4f32117868452191a4649723cb086d2b596b2" integrity sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ== @@ -1497,17 +1458,6 @@ "@ethersproject/logger" "^5.4.0" "@ethersproject/rlp" "^5.4.0" -"@ethersproject/address@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.6.0.tgz#13c49836d73e7885fc148ad633afad729da25012" - integrity sha512-6nvhYXjbXsHPS+30sHZ+U4VMagFC/9zAk6Gd/h3S21YW4+yfb0WfRtaAIZ4kfM4rrVwqiy284LP0GtL5HXGLxQ== - dependencies: - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/rlp" "^5.6.0" - "@ethersproject/address@5.6.1", "@ethersproject/address@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.6.1.tgz#ab57818d9aefee919c5721d28cd31fd95eff413d" @@ -1519,7 +1469,7 @@ "@ethersproject/logger" "^5.6.0" "@ethersproject/rlp" "^5.6.1" -"@ethersproject/address@5.7.0", "@ethersproject/address@^5.6.0", "@ethersproject/address@^5.7.0": +"@ethersproject/address@5.7.0", "@ethersproject/address@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.7.0.tgz#19b56c4d74a3b0a46bfdbb6cfcc0a153fc697f37" integrity sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA== @@ -1548,13 +1498,6 @@ dependencies: "@ethersproject/bytes" "^5.4.0" -"@ethersproject/base64@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.6.0.tgz#a12c4da2a6fb86d88563216b0282308fc15907c9" - integrity sha512-2Neq8wxJ9xHxCF9TUgmKeSh9BXJ6OAxWfeGWvbauPh8FuHEjamgHilllx8KkSd5ErxyHIX7Xv3Fkcud2kY9ezw== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/base64@5.6.1", "@ethersproject/base64@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.6.1.tgz#2c40d8a0310c9d1606c2c37ae3092634b41d87cb" @@ -1562,7 +1505,7 @@ dependencies: "@ethersproject/bytes" "^5.6.1" -"@ethersproject/base64@5.7.0", "@ethersproject/base64@^5.6.0", "@ethersproject/base64@^5.7.0": +"@ethersproject/base64@5.7.0", "@ethersproject/base64@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.7.0.tgz#ac4ee92aa36c1628173e221d0d01f53692059e1c" integrity sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ== @@ -1577,14 +1520,6 @@ "@ethersproject/bytes" "^5.4.0" "@ethersproject/properties" "^5.4.0" -"@ethersproject/basex@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.6.0.tgz#9ea7209bf0a1c3ddc2a90f180c3a7f0d7d2e8a69" - integrity sha512-qN4T+hQd/Md32MoJpc69rOwLYRUXwjTlhHDIeUkUmiN/JyWkkLLMoG0TqvSQKNqZOMgN5stbUYN6ILC+eD7MEQ== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/basex@5.6.1", "@ethersproject/basex@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.6.1.tgz#badbb2f1d4a6f52ce41c9064f01eab19cc4c5305" @@ -1593,7 +1528,7 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/properties" "^5.6.0" -"@ethersproject/basex@5.7.0", "@ethersproject/basex@^5.6.0", "@ethersproject/basex@^5.7.0": +"@ethersproject/basex@5.7.0", "@ethersproject/basex@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.7.0.tgz#97034dc7e8938a8ca943ab20f8a5e492ece4020b" integrity sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw== @@ -1610,15 +1545,6 @@ "@ethersproject/logger" "^5.4.0" bn.js "^4.11.9" -"@ethersproject/bignumber@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.6.0.tgz#116c81b075c57fa765a8f3822648cf718a8a0e26" - integrity sha512-VziMaXIUHQlHJmkv1dlcd6GY2PmT0khtAqaMctCIDogxkrarMzA9L94KN1NeXqqOfFD6r0sJT3vCTOFSmZ07DA== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - bn.js "^4.11.9" - "@ethersproject/bignumber@5.6.2", "@ethersproject/bignumber@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.6.2.tgz#72a0717d6163fab44c47bcc82e0c550ac0315d66" @@ -1628,7 +1554,7 @@ "@ethersproject/logger" "^5.6.0" bn.js "^5.2.1" -"@ethersproject/bignumber@5.7.0", "@ethersproject/bignumber@^5.6.0", "@ethersproject/bignumber@^5.7.0": +"@ethersproject/bignumber@5.7.0", "@ethersproject/bignumber@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.7.0.tgz#e2f03837f268ba655ffba03a57853e18a18dc9c2" integrity sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw== @@ -1669,7 +1595,7 @@ dependencies: "@ethersproject/logger" "^5.6.0" -"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.6.0", "@ethersproject/bytes@^5.7.0": +"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.7.0.tgz#a00f6ea8d7e7534d6d87f47188af1148d71f155d" integrity sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A== @@ -1690,13 +1616,6 @@ dependencies: "@ethersproject/bignumber" "^5.4.0" -"@ethersproject/constants@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.6.0.tgz#55e3eb0918584d3acc0688e9958b0cedef297088" - integrity sha512-SrdaJx2bK0WQl23nSpV/b1aq293Lh0sUaZT/yYKPDKn4tlAbkH96SPJwIhwSwTsoQQZxuh1jnqsKwyymoiBdWA== - dependencies: - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/constants@5.6.1", "@ethersproject/constants@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.6.1.tgz#e2e974cac160dd101cf79fdf879d7d18e8cb1370" @@ -1704,7 +1623,7 @@ dependencies: "@ethersproject/bignumber" "^5.6.2" -"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.6.0", "@ethersproject/constants@^5.7.0": +"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.7.0.tgz#df80a9705a7e08984161f09014ea012d1c75295e" integrity sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA== @@ -1734,22 +1653,6 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/transactions" "^5.4.0" -"@ethersproject/contracts@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.6.0.tgz#60f2cfc7addd99a865c6c8cfbbcec76297386067" - integrity sha512-74Ge7iqTDom0NX+mux8KbRUeJgu1eHZ3iv6utv++sLJG80FVuU9HnHeKVPfjd9s3woFhaFoQGf3B3iH/FrQmgw== - dependencies: - "@ethersproject/abi" "^5.6.0" - "@ethersproject/abstract-provider" "^5.6.0" - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/address" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - "@ethersproject/contracts@5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.6.2.tgz#20b52e69ebc1b74274ff8e3d4e508de971c287bc" @@ -1796,20 +1699,6 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/strings" "^5.4.0" -"@ethersproject/hash@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.6.0.tgz#d24446a5263e02492f9808baa99b6e2b4c3429a2" - integrity sha512-fFd+k9gtczqlr0/BruWLAu7UAOas1uRRJvOR84uDf4lNZ+bTkGl366qvniUZHKtlqxBRU65MkOobkmvmpHU+jA== - dependencies: - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/address" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/hash@5.6.1", "@ethersproject/hash@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.6.1.tgz#224572ea4de257f05b4abf8ae58b03a67e99b0f4" @@ -1824,7 +1713,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" -"@ethersproject/hash@5.7.0", "@ethersproject/hash@^5.6.0", "@ethersproject/hash@^5.7.0": +"@ethersproject/hash@5.7.0", "@ethersproject/hash@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.7.0.tgz#eb7aca84a588508369562e16e514b539ba5240a7" integrity sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g== @@ -1871,24 +1760,6 @@ "@ethersproject/transactions" "^5.4.0" "@ethersproject/wordlists" "^5.4.0" -"@ethersproject/hdnode@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.6.0.tgz#9dcbe8d629bbbcf144f2cae476337fe92d320998" - integrity sha512-61g3Jp3nwDqJcL/p4nugSyLrpl/+ChXIOtCEM8UDmWeB3JCAt5FoLdOMXQc3WWkc0oM2C0aAn6GFqqMcS/mHTw== - dependencies: - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/basex" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/pbkdf2" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/sha2" "^5.6.0" - "@ethersproject/signing-key" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - "@ethersproject/wordlists" "^5.6.0" - "@ethersproject/hdnode@5.6.2", "@ethersproject/hdnode@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.6.2.tgz#26f3c83a3e8f1b7985c15d1db50dc2903418b2d2" @@ -1907,7 +1778,7 @@ "@ethersproject/transactions" "^5.6.2" "@ethersproject/wordlists" "^5.6.1" -"@ethersproject/hdnode@5.7.0", "@ethersproject/hdnode@^5.6.0", "@ethersproject/hdnode@^5.7.0": +"@ethersproject/hdnode@5.7.0", "@ethersproject/hdnode@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.7.0.tgz#e627ddc6b466bc77aebf1a6b9e47405ca5aef9cf" integrity sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg== @@ -1944,25 +1815,6 @@ aes-js "3.0.0" scrypt-js "3.0.1" -"@ethersproject/json-wallets@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.6.0.tgz#4c2fc27f17e36c583e7a252fb938bc46f98891e5" - integrity sha512-fmh86jViB9r0ibWXTQipxpAGMiuxoqUf78oqJDlCAJXgnJF024hOOX7qVgqsjtbeoxmcLwpPsXNU0WEe/16qPQ== - dependencies: - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/address" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/hdnode" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/pbkdf2" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/random" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - aes-js "3.0.0" - scrypt-js "3.0.1" - "@ethersproject/json-wallets@5.6.1", "@ethersproject/json-wallets@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.6.1.tgz#3f06ba555c9c0d7da46756a12ac53483fe18dd91" @@ -1982,7 +1834,7 @@ aes-js "3.0.0" scrypt-js "3.0.1" -"@ethersproject/json-wallets@5.7.0", "@ethersproject/json-wallets@^5.6.0", "@ethersproject/json-wallets@^5.7.0": +"@ethersproject/json-wallets@5.7.0", "@ethersproject/json-wallets@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.7.0.tgz#5e3355287b548c32b368d91014919ebebddd5360" integrity sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g== @@ -2009,14 +1861,6 @@ "@ethersproject/bytes" "^5.4.0" js-sha3 "0.5.7" -"@ethersproject/keccak256@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.6.0.tgz#fea4bb47dbf8f131c2e1774a1cecbfeb9d606459" - integrity sha512-tk56BJ96mdj/ksi7HWZVWGjCq0WVl/QvfhFQNeL8fxhBlGoP+L80uDCiQcpJPd+2XxkivS3lwRm3E0CXTfol0w== - dependencies: - "@ethersproject/bytes" "^5.6.0" - js-sha3 "0.8.0" - "@ethersproject/keccak256@5.6.1", "@ethersproject/keccak256@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.6.1.tgz#b867167c9b50ba1b1a92bccdd4f2d6bd168a91cc" @@ -2025,7 +1869,7 @@ "@ethersproject/bytes" "^5.6.1" js-sha3 "0.8.0" -"@ethersproject/keccak256@5.7.0", "@ethersproject/keccak256@^5.6.0", "@ethersproject/keccak256@^5.7.0": +"@ethersproject/keccak256@5.7.0", "@ethersproject/keccak256@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.7.0.tgz#3186350c6e1cd6aba7940384ec7d6d9db01f335a" integrity sha512-2UcPboeL/iW+pSg6vZ6ydF8tCnv3Iu/8tUmLLzWWGzxWKFFqOBQFLo6uLUv6BDrLgCDfN28RJ/wtByx+jZ4KBg== @@ -2073,13 +1917,6 @@ dependencies: "@ethersproject/logger" "^5.4.0" -"@ethersproject/networks@5.6.2": - version "5.6.2" - resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.2.tgz#2bacda62102c0b1fcee408315f2bed4f6fbdf336" - integrity sha512-9uEzaJY7j5wpYGTojGp8U89mSsgQLc40PCMJLMCnFXTs7nhBveZ0t7dbqWUNrepWTszDbFkYD6WlL8DKx5huHA== - dependencies: - "@ethersproject/logger" "^5.6.0" - "@ethersproject/networks@5.6.4", "@ethersproject/networks@^5.6.3": version "5.6.4" resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.4.tgz#51296d8fec59e9627554f5a8a9c7791248c8dc07" @@ -2087,7 +1924,7 @@ dependencies: "@ethersproject/logger" "^5.6.0" -"@ethersproject/networks@5.7.1", "@ethersproject/networks@^5.6.0", "@ethersproject/networks@^5.7.0": +"@ethersproject/networks@5.7.1", "@ethersproject/networks@^5.7.0": version "5.7.1" resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.7.1.tgz#118e1a981d757d45ccea6bb58d9fd3d9db14ead6" integrity sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ== @@ -2109,14 +1946,6 @@ "@ethersproject/bytes" "^5.4.0" "@ethersproject/sha2" "^5.4.0" -"@ethersproject/pbkdf2@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.6.0.tgz#04fcc2d7c6bff88393f5b4237d906a192426685a" - integrity sha512-Wu1AxTgJo3T3H6MIu/eejLFok9TYoSdgwRr5oGY1LTLfmGesDoSx05pemsbrPT2gG4cQME+baTSCp5sEo2erZQ== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/sha2" "^5.6.0" - "@ethersproject/pbkdf2@5.6.1", "@ethersproject/pbkdf2@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.6.1.tgz#f462fe320b22c0d6b1d72a9920a3963b09eb82d1" @@ -2125,7 +1954,7 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/sha2" "^5.6.1" -"@ethersproject/pbkdf2@5.7.0", "@ethersproject/pbkdf2@^5.6.0", "@ethersproject/pbkdf2@^5.7.0": +"@ethersproject/pbkdf2@5.7.0", "@ethersproject/pbkdf2@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.7.0.tgz#d2267d0a1f6e123f3771007338c47cccd83d3102" integrity sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw== @@ -2193,31 +2022,6 @@ bech32 "1.1.4" ws "7.4.6" -"@ethersproject/providers@5.6.5": - version "5.6.5" - resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.6.5.tgz#aefecf78459817a323452e05a16d56afcf807e27" - integrity sha512-TRS+c2Ud+cMpWodmGAc9xbnYRPWzRNYt2zkCSnj58nJoamBQ6x4cUbBeo0lTC3y+6RDVIBeJv18OqsDbSktLVg== - dependencies: - "@ethersproject/abstract-provider" "^5.6.0" - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/address" "^5.6.0" - "@ethersproject/basex" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/hash" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/networks" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/random" "^5.6.0" - "@ethersproject/rlp" "^5.6.0" - "@ethersproject/sha2" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - "@ethersproject/web" "^5.6.0" - bech32 "1.1.4" - ws "7.4.6" - "@ethersproject/providers@5.6.8": version "5.6.8" resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.6.8.tgz#22e6c57be215ba5545d3a46cf759d265bb4e879d" @@ -2278,14 +2082,6 @@ "@ethersproject/bytes" "^5.4.0" "@ethersproject/logger" "^5.4.0" -"@ethersproject/random@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.6.0.tgz#1505d1ab6a250e0ee92f436850fa3314b2cb5ae6" - integrity sha512-si0PLcLjq+NG/XHSZz90asNf+YfKEqJGVdxoEkSukzbnBgC8rydbgbUgBbBGLeHN4kAJwUFEKsu3sCXT93YMsw== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/random@5.6.1", "@ethersproject/random@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.6.1.tgz#66915943981bcd3e11bbd43733f5c3ba5a790255" @@ -2294,7 +2090,7 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/logger" "^5.6.0" -"@ethersproject/random@5.7.0", "@ethersproject/random@^5.6.0", "@ethersproject/random@^5.7.0": +"@ethersproject/random@5.7.0", "@ethersproject/random@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.7.0.tgz#af19dcbc2484aae078bb03656ec05df66253280c" integrity sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ== @@ -2310,14 +2106,6 @@ "@ethersproject/bytes" "^5.4.0" "@ethersproject/logger" "^5.4.0" -"@ethersproject/rlp@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.6.0.tgz#55a7be01c6f5e64d6e6e7edb6061aa120962a717" - integrity sha512-dz9WR1xpcTL+9DtOT/aDO+YyxSSdO8YIS0jyZwHHSlAmnxA6cKU3TrTd4Xc/bHayctxTgGLYNuVVoiXE4tTq1g== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/rlp@5.6.1", "@ethersproject/rlp@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.6.1.tgz#df8311e6f9f24dcb03d59a2bac457a28a4fe2bd8" @@ -2326,7 +2114,7 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/logger" "^5.6.0" -"@ethersproject/rlp@5.7.0", "@ethersproject/rlp@^5.6.0", "@ethersproject/rlp@^5.7.0": +"@ethersproject/rlp@5.7.0", "@ethersproject/rlp@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.7.0.tgz#de39e4d5918b9d74d46de93af80b7685a9c21304" integrity sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w== @@ -2351,15 +2139,6 @@ "@ethersproject/logger" "^5.4.0" hash.js "1.1.7" -"@ethersproject/sha2@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.0.tgz#364c4c11cc753bda36f31f001628706ebadb64d9" - integrity sha512-1tNWCPFLu1n3JM9t4/kytz35DkuF9MxqkGGEHNauEbaARdm2fafnOyw1s0tIQDPKF/7bkP1u3dbrmjpn5CelyA== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - hash.js "1.1.7" - "@ethersproject/sha2@5.6.1", "@ethersproject/sha2@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.1.tgz#211f14d3f5da5301c8972a8827770b6fd3e51656" @@ -2369,7 +2148,7 @@ "@ethersproject/logger" "^5.6.0" hash.js "1.1.7" -"@ethersproject/sha2@5.7.0", "@ethersproject/sha2@^5.6.0", "@ethersproject/sha2@^5.7.0": +"@ethersproject/sha2@5.7.0", "@ethersproject/sha2@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.7.0.tgz#9a5f7a7824ef784f7f7680984e593a800480c9fb" integrity sha512-gKlH42riwb3KYp0reLsFTokByAKoJdgFCwI+CCiX/k+Jm2mbNs6oOaCjYQSlI1+XBVejwH2KrmCbMAT/GnRDQw== @@ -2390,18 +2169,6 @@ elliptic "6.5.4" hash.js "1.1.7" -"@ethersproject/signing-key@5.6.1": - version "5.6.1" - resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.6.1.tgz#31b0a531520616254eb0465b9443e49515c4d457" - integrity sha512-XvqQ20DH0D+bS3qlrrgh+axRMth5kD1xuvqUQUTeezxUTXBOeR6hWz2/C6FBEu39FRytyybIWrYf7YLSAKr1LQ== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - bn.js "^4.11.9" - elliptic "6.5.4" - hash.js "1.1.7" - "@ethersproject/signing-key@5.6.2", "@ethersproject/signing-key@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.6.2.tgz#8a51b111e4d62e5a62aee1da1e088d12de0614a3" @@ -2414,7 +2181,7 @@ elliptic "6.5.4" hash.js "1.1.7" -"@ethersproject/signing-key@5.7.0", "@ethersproject/signing-key@^5.6.0", "@ethersproject/signing-key@^5.7.0": +"@ethersproject/signing-key@5.7.0", "@ethersproject/signing-key@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.7.0.tgz#06b2df39411b00bc57c7c09b01d1e41cf1b16ab3" integrity sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q== @@ -2449,18 +2216,6 @@ "@ethersproject/sha2" "^5.4.0" "@ethersproject/strings" "^5.4.0" -"@ethersproject/solidity@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.6.0.tgz#64657362a596bf7f5630bdc921c07dd78df06dc3" - integrity sha512-YwF52vTNd50kjDzqKaoNNbC/r9kMDPq3YzDWmsjFTRBcIF1y4JCQJ8gB30wsTfHbaxgxelI5BfxQSxD/PbJOww== - dependencies: - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/sha2" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/solidity@5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.6.1.tgz#5845e71182c66d32e6ec5eefd041fca091a473e2" @@ -2494,15 +2249,6 @@ "@ethersproject/constants" "^5.4.0" "@ethersproject/logger" "^5.4.0" -"@ethersproject/strings@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.6.0.tgz#9891b26709153d996bf1303d39a7f4bc047878fd" - integrity sha512-uv10vTtLTZqrJuqBZR862ZQjTIa724wGPWQqZrofaPI/kUsf53TBG0I0D+hQ1qyNtllbNzaW+PDPHHUI6/65Mg== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/strings@5.6.1", "@ethersproject/strings@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.6.1.tgz#dbc1b7f901db822b5cafd4ebf01ca93c373f8952" @@ -2512,7 +2258,7 @@ "@ethersproject/constants" "^5.6.1" "@ethersproject/logger" "^5.6.0" -"@ethersproject/strings@5.7.0", "@ethersproject/strings@^5.6.0", "@ethersproject/strings@^5.7.0": +"@ethersproject/strings@5.7.0", "@ethersproject/strings@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.7.0.tgz#54c9d2a7c57ae8f1205c88a9d3a56471e14d5ed2" integrity sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg== @@ -2545,21 +2291,6 @@ "@ethersproject/rlp" "^5.4.0" "@ethersproject/signing-key" "^5.4.0" -"@ethersproject/transactions@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.6.0.tgz#4b594d73a868ef6e1529a2f8f94a785e6791ae4e" - integrity sha512-4HX+VOhNjXHZyGzER6E/LVI2i6lf9ejYeWD6l4g50AdmimyuStKc39kvKf1bXWQMg7QNVh+uC7dYwtaZ02IXeg== - dependencies: - "@ethersproject/address" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/rlp" "^5.6.0" - "@ethersproject/signing-key" "^5.6.0" - "@ethersproject/transactions@5.6.2", "@ethersproject/transactions@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.6.2.tgz#793a774c01ced9fe7073985bb95a4b4e57a6370b" @@ -2575,7 +2306,7 @@ "@ethersproject/rlp" "^5.6.1" "@ethersproject/signing-key" "^5.6.2" -"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.6.0", "@ethersproject/transactions@^5.7.0": +"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.7.0.tgz#91318fc24063e057885a6af13fdb703e1f993d3b" integrity sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ== @@ -2614,15 +2345,6 @@ "@ethersproject/constants" "^5.4.0" "@ethersproject/logger" "^5.4.0" -"@ethersproject/units@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.6.0.tgz#e5cbb1906988f5740254a21b9ded6bd51e826d9c" - integrity sha512-tig9x0Qmh8qbo1w8/6tmtyrm/QQRviBh389EQ+d8fP4wDsBrJBf08oZfoiz1/uenKK9M78yAP4PoR7SsVoTjsw== - dependencies: - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/units@5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.6.1.tgz#ecc590d16d37c8f9ef4e89e2005bda7ddc6a4e6f" @@ -2662,27 +2384,6 @@ "@ethersproject/transactions" "^5.4.0" "@ethersproject/wordlists" "^5.4.0" -"@ethersproject/wallet@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.6.0.tgz#33d11a806d783864208f348709a5a3badac8e22a" - integrity sha512-qMlSdOSTyp0MBeE+r7SUhr1jjDlC1zAXB8VD84hCnpijPQiSNbxr6GdiLXxpUs8UKzkDiNYYC5DRI3MZr+n+tg== - dependencies: - "@ethersproject/abstract-provider" "^5.6.0" - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/address" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/hash" "^5.6.0" - "@ethersproject/hdnode" "^5.6.0" - "@ethersproject/json-wallets" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/random" "^5.6.0" - "@ethersproject/signing-key" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - "@ethersproject/wordlists" "^5.6.0" - "@ethersproject/wallet@5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.6.2.tgz#cd61429d1e934681e413f4bc847a5f2f87e3a03c" @@ -2736,17 +2437,6 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/strings" "^5.4.0" -"@ethersproject/web@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.6.0.tgz#4bf8b3cbc17055027e1a5dd3c357e37474eaaeb8" - integrity sha512-G/XHj0hV1FxI2teHRfCGvfBUHFmU+YOSbCxlAMqJklxSa7QMiHFQfAxvwY2PFqgvdkxEKwRNr/eCjfAPEm2Ctg== - dependencies: - "@ethersproject/base64" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/web@5.6.1", "@ethersproject/web@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.6.1.tgz#6e2bd3ebadd033e6fe57d072db2b69ad2c9bdf5d" @@ -2758,7 +2448,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" -"@ethersproject/web@5.7.1", "@ethersproject/web@^5.6.0", "@ethersproject/web@^5.7.0": +"@ethersproject/web@5.7.1", "@ethersproject/web@^5.7.0": version "5.7.1" resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.7.1.tgz#de1f285b373149bee5928f4eb7bcb87ee5fbb4ae" integrity sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w== @@ -2780,17 +2470,6 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/strings" "^5.4.0" -"@ethersproject/wordlists@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.6.0.tgz#79e62c5276e091d8575f6930ba01a29218ded032" - integrity sha512-q0bxNBfIX3fUuAo9OmjlEYxP40IB8ABgb7HjEZCL5IKubzV3j30CWi2rqQbjTS2HfoyQbfINoKcTVWP4ejwR7Q== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/hash" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/wordlists@5.6.1", "@ethersproject/wordlists@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.6.1.tgz#1e78e2740a8a21e9e99947e47979d72e130aeda1" @@ -2802,7 +2481,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" -"@ethersproject/wordlists@5.7.0", "@ethersproject/wordlists@^5.6.0", "@ethersproject/wordlists@^5.7.0": +"@ethersproject/wordlists@5.7.0", "@ethersproject/wordlists@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.7.0.tgz#8fb2c07185d68c3e09eb3bfd6e779ba2774627f5" integrity sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA== @@ -3180,7 +2859,7 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@keepkey/device-protocol@^7.12.2", "@keepkey/device-protocol@^7.8.1": +"@keepkey/device-protocol@^7.12.2": version "7.12.2" resolved "https://registry.yarnpkg.com/@keepkey/device-protocol/-/device-protocol-7.12.2.tgz#9ff4b322af99264b83bbf68cc1cd349f53b32070" integrity sha512-U2wGgynZx9euKx9sshLzCeMJ/36+2NH8M/YhnUoCrS1xsjPp5xTCXquLFCFzfEL379yL4g03yu2kT41LKI5Dog== @@ -3290,23 +2969,6 @@ tiny-secp256k1 "1.1.6" varuint-bitcoin "1.1.2" -"@ledgerhq/hw-app-btc@^6.7.0": - version "6.27.1" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-6.27.1.tgz#5f7258f8a61532e14d6720678a80133320fc5666" - integrity sha512-2XOH5jtso4QsPYjXldwdcXw6amb8kCyiHtXw1NySA1QP/xBjxN8JLEXEPFsaK6l2zz55I8kKUtVoEGz7bpg0lg== - dependencies: - "@ledgerhq/hw-transport" "^6.27.1" - "@ledgerhq/logs" "^6.10.0" - bip32-path "^0.4.2" - bitcoinjs-lib "^5.2.0" - bs58 "^4.0.1" - invariant "^2.2.4" - ripemd160 "2" - semver "^7.3.5" - sha.js "2" - tiny-secp256k1 "1.1.6" - varuint-bitcoin "1.1.2" - "@ledgerhq/hw-app-cosmos@6.7.0": version "6.7.0" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-cosmos/-/hw-app-cosmos-6.7.0.tgz#d2e79213378a06b647aa4ce58c0ea89452425d0d" @@ -3425,7 +3087,7 @@ "@ledgerhq/hw-transport" "^6.7.0" "@ledgerhq/logs" "^6.2.0" -"@ledgerhq/hw-transport@6.7.0", "@ledgerhq/hw-transport@^5.19.1", "@ledgerhq/hw-transport@^5.51.1", "@ledgerhq/hw-transport@^6.20.0", "@ledgerhq/hw-transport@^6.27.1", "@ledgerhq/hw-transport@^6.28.8", "@ledgerhq/hw-transport@^6.7.0": +"@ledgerhq/hw-transport@6.7.0", "@ledgerhq/hw-transport@^5.19.1", "@ledgerhq/hw-transport@^5.51.1", "@ledgerhq/hw-transport@^6.20.0", "@ledgerhq/hw-transport@^6.28.8", "@ledgerhq/hw-transport@^6.7.0": version "6.7.0" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.7.0.tgz#d1f0d70e21b91e6457a32d4c3cec0764e97461ff" integrity sha512-w+PhW6Y4KXYdoCykkE1zt0VL6Ryf72RP8sZP8OH1O90hX/R/q9BMYKl8VNqTbqlrOrORgATlKkbmIJBjbngZew== @@ -5895,50 +5557,10 @@ web-encoding "^1.1.0" wif "^2.0.6" -"@shapeshiftoss/hdwallet-core@1.21.1": - version "1.21.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.21.1.tgz#a382f305a9cb502ea1677c34bcd4d603024128dc" - integrity sha512-paDSgf5AhJkC7N6nsQLzyrQVxFZxyJoGwEwiVAwMPJg8ublLorJTiHZAKG23FM89GqGWEyYiXrIgdY8fL1BoIQ== - dependencies: - eventemitter2 "^5.0.1" - lodash "^4.17.21" - rxjs "^6.4.0" - type-assertions "^1.1.0" - -"@shapeshiftoss/hdwallet-core@1.21.2", "@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.21.2.tgz#88fe49d79a79c8429b714e6244a4068c82e2afb5" - integrity sha512-s1J95MIwu/Qfaeijz6J6qdVxe8gMbVQjEWPCfuhGvBIxF94o+7cpoUXIrU4KIIuDbrdxJ3P4sf7xo89s4Y3wNQ== - dependencies: - eventemitter2 "^5.0.1" - lodash "^4.17.21" - rxjs "^6.4.0" - type-assertions "^1.1.0" - -"@shapeshiftoss/hdwallet-core@1.22.0": - version "1.22.0" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.22.0.tgz#f16d3d2842c5e704ec8e829573b1152dd2070001" - integrity sha512-xCfmWN0FyJH8lVRhAKPQ7UHfWY1aMGbnGyalS+X4saz9P8o4qaHQ/vBpARrKhL+dDsDSKt8Ol2Wo90nv6C/7Ag== - dependencies: - eventemitter2 "^5.0.1" - lodash "^4.17.21" - rxjs "^6.4.0" - type-assertions "^1.1.0" - -"@shapeshiftoss/hdwallet-core@1.23.0": - version "1.23.0" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.23.0.tgz#8e7552b684d9c4600381cf3131c9d304df4b169a" - integrity sha512-CP0ysBeyRMtjx1OTSj+EmuhYWeh3YGxrbobj7HZDYYl8kHyUseJTTQ3s42ezS1AfXkDf/YidKDxa7p6+v7/0sw== - dependencies: - eventemitter2 "^5.0.1" - lodash "^4.17.21" - rxjs "^6.4.0" - type-assertions "^1.1.0" - -"@shapeshiftoss/hdwallet-core@1.52.0": - version "1.52.0" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.0.tgz#6dadd6fb8c8bd95a6e2b067d590b6d07ecc6a729" - integrity sha512-0SyKTbPphmHxno09enid8CdBjnLInfWJkmBO7vJvh2LBGSKw3fZo+7+tjfJe0Z2lS7To6SsJCfBMt1plLTfd1A== +"@shapeshiftoss/hdwallet-core@1.52.1", "@shapeshiftoss/hdwallet-core@^1.50.4": + version "1.52.1" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.1.tgz#5165e6ecfef3ffa2a3c1ed1aafe6de268224f920" + integrity sha512-ON0kGiYhVUZm2sPp6EbgIwACJAvULIeklddWPZDCv6mvByIsY8D6BTVQtXVavHBB+/Pf6bVc1uMfCO3X5zPaHg== dependencies: "@shapeshiftoss/proto-tx-builder" "^0.8.0" eip-712 "^1.0.0" @@ -5947,10 +5569,10 @@ rxjs "^6.4.0" type-assertions "^1.1.0" -"@shapeshiftoss/hdwallet-core@1.52.1", "@shapeshiftoss/hdwallet-core@^1.50.4": - version "1.52.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.1.tgz#5165e6ecfef3ffa2a3c1ed1aafe6de268224f920" - integrity sha512-ON0kGiYhVUZm2sPp6EbgIwACJAvULIeklddWPZDCv6mvByIsY8D6BTVQtXVavHBB+/Pf6bVc1uMfCO3X5zPaHg== +"@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.11": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.3-thorchain.11.tgz#1d24db71eae513a5f8ca79721e76f244974ef3dc" + integrity sha512-FxVzYJJ7ZqqaWzEBgxN2bsUUxk3y38QIRd48C2cRQjgPDQbd1DRRaWoxD0/f4zFGDyAYTQgF7mOUGUH9JLV7Zw== dependencies: "@shapeshiftoss/proto-tx-builder" "^0.8.0" eip-712 "^1.0.0" @@ -5970,146 +5592,128 @@ type-assertions "^1.1.0" "@shapeshiftoss/hdwallet-keepkey-nodewebusb@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey-nodewebusb/-/hdwallet-keepkey-nodewebusb-1.21.2.tgz#69f37ae29077ec3a11fea9ee319f869b712f8198" - integrity sha512-7ImVY9DQLv+QLZFT/JWuzecP/CSDb8VeaQghLICgOqG/xPMRMiSOBJxcFzPJiK/uM7E+UmMBgHgLM/zhHUz68g== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-nodewebusb/-/hdwallet-keepkey-nodewebusb-1.52.3-thorchain.11.tgz#2bdcf3bf1a7599ffea9f5ebd5e2e4c3acf3dcc35" + integrity sha512-Ek94hVGSzsZWVdrev2UOlUrYZtnpUwVJh0Zf8osTu36JzPjrEKgQDA72mRQzIAXKRacqtdCL/uec3SI+kWomPA== dependencies: - "@shapeshiftoss/hdwallet-core" "1.21.2" - "@shapeshiftoss/hdwallet-keepkey" "1.21.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" "@shapeshiftoss/hdwallet-keepkey-tcp@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey-tcp/-/hdwallet-keepkey-tcp-1.21.2.tgz#fcb34a45cd84caf627f35fba37aa1d81191c12ca" - integrity sha512-/bQcRaic5dd1J9wuMr4ywjLRfA9piczfQiyNdXr7z3iSX/3RmI9QBgjTHQWoAij/ufFGmZPOYyh1VJAsIAhCCA== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-tcp/-/hdwallet-keepkey-tcp-1.52.3-thorchain.11.tgz#bdfde504aac915f3d6763082c2e49c0980ed59ad" + integrity sha512-K2pEq35XAHpTR45m8WwdVBRvx5lIj8+G3tONsqr0d/9KluGEn//FPil5P9Rxz/CvXam/uwWH7NvJMibWmKlcQA== dependencies: - "@shapeshiftoss/hdwallet-core" "1.21.2" - "@shapeshiftoss/hdwallet-keepkey" "1.21.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" axios "^0.21.1" "@shapeshiftoss/hdwallet-keepkey-webusb@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey-webusb/-/hdwallet-keepkey-webusb-1.21.2.tgz#35c8b40e7d9eef0c3b6e32b376123839c540db17" - integrity sha512-svcoyT0mnAsxOiFQGSD7dgwiRMSM2Orh7YMqe6Rh/QRT/IlXWbknVUf4dBvZFS4ZKIVZRIREaYc2zKo3bRebNQ== - dependencies: - "@shapeshiftoss/hdwallet-core" "1.21.2" - "@shapeshiftoss/hdwallet-keepkey" "1.21.2" - -"@shapeshiftoss/hdwallet-keepkey@1.21.2": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey/-/hdwallet-keepkey-1.21.2.tgz#969a9331c2bad4b46ab88dd4d7dfd98df87be67d" - integrity sha512-5hwjZWmdED/No3Fbr6L1dhCIAAl2zj76OOFDEMgKoTtbtL4GIiKH43W1g9H+SbtLWSpa/VSQxz26NMyMigNh1w== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-webusb/-/hdwallet-keepkey-webusb-1.52.3-thorchain.11.tgz#75ecc2d3d2e2f26db1f86f50fd95eefaccf8bf15" + integrity sha512-pO1susjpLW0YKENcWrjI81moONOeTbjf6mcc2Mq8yfLbxiNYM4guEEtnesU5OfKjv78bOsyOgcNjzpKL8PiygQ== dependencies: - "@ethereumjs/common" "^2.4.0" - "@ethereumjs/tx" "^3.3.0" - "@keepkey/device-protocol" "^7.8.1" - "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" - "@shapeshiftoss/hdwallet-core" "1.21.2" - "@shapeshiftoss/proto-tx-builder" "^0.2.1" - bignumber.js "^9.0.1" - bnb-javascript-sdk-nobroadcast "^2.16.14" - crypto-js "^4.0.0" - eip55 "^2.1.0" - google-protobuf "^3.15.8" - icepick "^2.4.0" - lodash "^4.17.21" - p-lazy "^3.1.0" - semver "^6.3.0" - tiny-secp256k1 "^1.1.6" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" -"@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.10": - version "1.22.0" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey/-/hdwallet-keepkey-1.22.0.tgz#3dfd550ccb0e07fff96db99136c909a346af4fca" - integrity sha512-4D+lVQaff1E2kO7lImp4gyI+7/tIiwoU6ns/PgmfmuDXpxmSvG0Z50hA2eee6e6eqmPXpwz/1GhlkIvv3p99yA== +"@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.11": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey/-/hdwallet-keepkey-1.52.3-thorchain.11.tgz#83b412314ca7087e5d2245615fbae46686492996" + integrity sha512-U08jLpycWtfu1hSYnYCx+5e4/tokP/Z8eCQrUlYTdKSAZmXPBTFlz7uKjWcsj0zuoC+xod3yc5VSXbyvGsnupg== dependencies: "@ethereumjs/common" "^2.4.0" "@ethereumjs/tx" "^3.3.0" - "@keepkey/device-protocol" "^7.8.1" + "@keepkey/device-protocol" "^7.12.2" "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" - "@shapeshiftoss/hdwallet-core" "1.22.0" - "@shapeshiftoss/proto-tx-builder" "^0.2.1" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/proto-tx-builder" "^0.8.0" bignumber.js "^9.0.1" bnb-javascript-sdk-nobroadcast "^2.16.14" crypto-js "^4.0.0" + eip-712 "^1.0.0" eip55 "^2.1.0" google-protobuf "^3.15.8" icepick "^2.4.0" lodash "^4.17.21" p-lazy "^3.1.0" - semver "^6.3.0" + semver "^7.3.8" tiny-secp256k1 "^1.1.6" "@shapeshiftoss/hdwallet-keplr@^1.52.3-thorchain.10": - version "1.52.0" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keplr/-/hdwallet-keplr-1.52.0.tgz#0348e2599d993958c58945e47a3add446dee9556" - integrity sha512-SU3AQyBkO6xALSzMmOSMbmO50eC/JOc85yM6VUQYPjmyIJ1pf9/YKgjn05xehwv8UsNU858Ep5GBIo8NPQop5g== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keplr/-/hdwallet-keplr-1.52.3-thorchain.11.tgz#d4d68722353f496f754d2cb0062dc2612430cd64" + integrity sha512-vNOsjerVGDfFDUcoX45yQthDVvcss7YKvbcS9feMC9yVSHgb9raYVdUJsJ7JIqXNYkkJ/aMardMb2ldCTmH+IQ== dependencies: "@shapeshiftoss/caip" "8.15.0" - "@shapeshiftoss/hdwallet-core" "1.52.0" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" "@shapeshiftoss/proto-tx-builder" "^0.8.0" "@shapeshiftoss/types" "3.1.3" base64-js "^1.5.1" lodash "^4.17.21" "@shapeshiftoss/hdwallet-ledger-webhid@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-ledger-webhid/-/hdwallet-ledger-webhid-1.21.2.tgz#ad31acd213547df29c3ee2257b18f4a0c640f28b" - integrity sha512-NahU0xVaSocycrSjlK9eR/vsyn8XOWwqAZ+H0OyT0pfrFJD2PFh6/FAuOBhz9rbCvS5TUNkSMIZVj7WvUQ3OXQ== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger-webhid/-/hdwallet-ledger-webhid-1.52.3-thorchain.11.tgz#48e49b81c14a65e6e2ab868b17a40e1bd6e98eb2" + integrity sha512-lFBiBXjaSKnsPKKUNDhIcHjZuKfwrJ/lzc2ckepR+SPgS13LMsXnHcFy87DVb53e6CP4p4Kv6I2zR1rJsv+SeQ== dependencies: - "@ledgerhq/hw-app-btc" "^6.7.0" + "@ledgerhq/hw-app-btc" "^10.0.8" "@ledgerhq/hw-app-eth" "^6.9.0" "@ledgerhq/hw-transport" "^6.7.0" "@ledgerhq/hw-transport-webhid" "^6.7.0" "@ledgerhq/live-common" "^21.8.2" - "@shapeshiftoss/hdwallet-core" "1.21.2" - "@shapeshiftoss/hdwallet-ledger" "1.21.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-ledger" "^1.52.3-thorchain.11" "@types/w3c-web-hid" "^1.0.2" - typescript "^4.3.2" "@shapeshiftoss/hdwallet-ledger-webusb@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-ledger-webusb/-/hdwallet-ledger-webusb-1.21.2.tgz#00629563b25ec3dd94a7268e52780a718448347b" - integrity sha512-SX40IZEFo8jCx4/U7I7UogDa7L1RECdK+Xp+yuyhqxU3rITrpLrdJH9H1vOy4FS+TxRN2BkMMAG5mXMCCencag== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger-webusb/-/hdwallet-ledger-webusb-1.52.3-thorchain.11.tgz#3adb61c57fccd50627438c559f80b9ea6628a561" + integrity sha512-D3XRt+0+Z8YJMTBoTDO2oDjmg0LQtvURd1p8tqGRVxxpoXQxPQg5LI0zq7bjFPF7FyaBaINF8lu8uaHrU+Aygw== dependencies: - "@ledgerhq/hw-app-btc" "^6.7.0" + "@ledgerhq/hw-app-btc" "^10.0.8" "@ledgerhq/hw-app-eth" "^6.9.0" "@ledgerhq/hw-transport" "^6.7.0" "@ledgerhq/hw-transport-webusb" "^6.7.0" "@ledgerhq/live-common" "^21.8.2" - "@shapeshiftoss/hdwallet-core" "1.21.2" - "@shapeshiftoss/hdwallet-ledger" "1.21.2" + "@ledgerhq/logs" "^6.10.1" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-ledger" "^1.52.3-thorchain.11" "@types/w3c-web-usb" "^1.0.4" - typescript "^4.3.2" + p-queue "^7.4.1" -"@shapeshiftoss/hdwallet-ledger@1.21.2", "@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-ledger/-/hdwallet-ledger-1.21.2.tgz#f506a357b291440bf4fc141bc35f880709c13a6b" - integrity sha512-2NRIHYZGieHjumKLBFgQqzlrZzE6nd5osgqVjwDXDU7NWnAhRz9LBS8T09diYXSvLNNY2Yhld14CPiktDYbGig== +"@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.11": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger/-/hdwallet-ledger-1.52.3-thorchain.11.tgz#7a03688868f922c033a315fa9409ccfb9aecab40" + integrity sha512-KujW49hBSzM05g6nnJ7Oheiiro0R9f8+l5faj1pqZYs2bpZFgoqlKLGe1zkItp2YCuVIEeMtXHMmqGBJaMQmjw== dependencies: "@ethereumjs/common" "^2.4.0" "@ethereumjs/tx" "^3.3.0" - "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@types/ripemd160" "^2.0.1" base64-js "^1.5.1" bchaddrjs "^0.4.4" - bitcoinjs-lib "^5.1.6" bitcoinjs-message "^2.0.0" bs58check "2.1.2" ethereumjs-tx "1.3.7" ethereumjs-util "^6.1.0" lodash "^4.17.21" + ripemd160 "^2.0.2" "@shapeshiftoss/hdwallet-metamask@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-metamask/-/hdwallet-metamask-1.21.2.tgz#2a73bab57a45984bc7ddca5c08c765e1a17c929b" - integrity sha512-JCWH3YRuIpB8h+RLWF+arU5w4VsHJoMz7MUF+DUmiivziwWprrn8r4PYtzo7QSMffwwKudzB1B8nHVm0ygDzdg== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-metamask/-/hdwallet-metamask-1.52.3-thorchain.11.tgz#3bc519ebbe0285ba3d0076ae03dda7a71e096d47" + integrity sha512-FeS94nlj2oklOFGX0X1AykL2+bosVi8+3NvBkl+v8zjWluHkcEvXfXmj7Dao/AjAL00auOIJrsFLdKOZ7O2RaQ== dependencies: "@metamask/detect-provider" "^1.2.0" "@metamask/onboarding" "^1.0.1" - "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + eth-rpc-errors "^4.0.3" lodash "^4.17.21" "@shapeshiftoss/hdwallet-native@^1.50.4": version "1.52.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.1.tgz#9a8144302f20069d145079154d3d9c56086178b4" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.1.tgz#9a8144302f20069d145079154d3d9c56086178b4" integrity sha512-TUemR4q0ISgPRvLkZQaK0iQ9t8ObhbGwGtOBmKzbSyJR10vVXbGxt5eIi+Gc19fSz7uyAQM2N3pIMFMsBasciw== dependencies: "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" @@ -6137,22 +5741,24 @@ web-encoding "^1.1.0" "@shapeshiftoss/hdwallet-native@^1.52.3-thorchain.10": - version "1.23.0" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.23.0.tgz#a035d1f1baa6c5a1da47bb2d12aad8e76d0b46d2" - integrity sha512-UYCrUD8Ful1lNArpzLhvTBnuNjgSz9Ytl3/MPeOPi+WTrD3PIYh/QEOmx6JqBL0PoxoQof1O6GqYBq44It1tsg== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.3-thorchain.11.tgz#e57ef8355715ab701a7c059d460f917d011af999" + integrity sha512-6BfKW9qCGyvTVBdVB6i+pMR00I8TcKRhobAqB6zcuX0jWIj25TYltvuDk2EB3YedH38d0ly9ZEEuteKL4WY6Cw== dependencies: "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" "@shapeshiftoss/fiosdk" "1.2.1-shapeshift.6" - "@shapeshiftoss/hdwallet-core" "1.23.0" - "@shapeshiftoss/proto-tx-builder" "^0.2.1" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/proto-tx-builder" "^0.8.0" "@zxing/text-encoding" "^0.9.0" bchaddrjs "^0.4.9" + bech32 "^1.1.4" bignumber.js "^9.0.1" bip32 "^2.0.5" bip39 "^3.0.2" bnb-javascript-sdk-nobroadcast "^2.16.14" crypto-js "^4.0.0" - ethers "5.6.5" + eip-712 "^1.0.0" + ethers "5.7.2" eventemitter2 "^5.0.1" funtypes "^3.0.1" lodash "^4.17.21" @@ -6164,12 +5770,12 @@ web-encoding "^1.1.0" "@shapeshiftoss/hdwallet-portis@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-portis/-/hdwallet-portis-1.21.2.tgz#f87c325e24add9d3281f3bb490d1714219307886" - integrity sha512-0l6dSzcWlD/KcIZw/eDA71V/DsNcs4myTX9qdnhmW4bJVRvpRiAEnt7hIo0v76OGCBkvBsiwXTRxfmM34HC6NQ== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-portis/-/hdwallet-portis-1.52.3-thorchain.11.tgz#35b734a9fecb7121e4808c6f99e9a86862d13533" + integrity sha512-9LVYv6uZX6bgKED3YYF29YF+UTL4XhgI83SeveW/PknvYMrbvF0eSQjQDqydrYLNUaQ5bmjKoXi5Cl3o4XQTaQ== dependencies: "@portis/web3" "3.0.10" - "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" base64-js "^1.5.1" bip32 "^2.0.4" bitcoinjs-lib "^5.1.6" @@ -6179,62 +5785,51 @@ web3 "^1.5.1" "@shapeshiftoss/hdwallet-tallyho@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-tallyho/-/hdwallet-tallyho-1.21.2.tgz#509c276f3051d70b8de3020a5f49f7d69c2c7c31" - integrity sha512-d3IvLvVEZY1t7XgONbtRYuq9k6V4f8L+64vOvTR6eP5oE6VBJAWxRkRSJLMvqdWM+elxWuOPqtXvPAY/Eohukw== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-tallyho/-/hdwallet-tallyho-1.52.3-thorchain.11.tgz#faa3e2a7c6a81a9c8e0e3fa998d41fef58bdea9b" + integrity sha512-VgIDzgSxk8tRn7DSlSP/lUn7p074WjMrFfSsEj5jtuVh1rpLhCBH6sDgv34rUPHQ8m3VrXYjg3qUsDoau+Rltg== dependencies: - "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" lodash "^4.17.21" tallyho-onboarding "^1.0.2" "@shapeshiftoss/hdwallet-trezor-connect@^1.52.3-thorchain.10": - version "1.21.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-trezor-connect/-/hdwallet-trezor-connect-1.21.1.tgz#c5172c1e4ec92a31969b0c743289a819a025f5f0" - integrity sha512-0kW4rPQjsAmnXK053xnEUv1BnM0rXIDzQnCTuy8kSADKw8lmz9NPXqftIiVCEYSkOxq5r+E909TVmIJkdbpZNA== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-trezor-connect/-/hdwallet-trezor-connect-1.52.3-thorchain.11.tgz#5d4ceb32201136dadc03b8320917d7a6aa488aca" + integrity sha512-fc3Ui4AFgHF6OdUynKsh4qg/sb8m9AnWz9VuY0qPseYtJhQCSt5WneluWXPWjTVNlDFkn7GqthyQAfTl0LLbYQ== dependencies: - "@shapeshiftoss/hdwallet-core" "1.21.1" - "@shapeshiftoss/hdwallet-trezor" "1.21.1" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-trezor" "^1.52.3-thorchain.11" "@trezor/rollout" "^1.2.0" trezor-connect "^8.2.1" -"@shapeshiftoss/hdwallet-trezor@1.21.1": - version "1.21.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-trezor/-/hdwallet-trezor-1.21.1.tgz#9d3ac2462b6d2f0725a36e2cd79e2a0f67c1d9fb" - integrity sha512-VlcFEbs0HT9XxOHS52sz6UF4EKziuFssGzIke/yfDVVHSYoWuOZJMu3zMtqNoc8EZCuwnUgsmuyPHpFXfV6jJw== +"@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.11": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-trezor/-/hdwallet-trezor-1.52.3-thorchain.11.tgz#87c17c63552e18c0299d75c20b6fe5e98a9b9083" + integrity sha512-7I4WWRc3hYCBUySll7Pokk0jnm8u/1yJaFhNabTYphnGPTI1fa4hj7dth22GAqvFYoSX+HlsqB1TJolmIAwv0g== dependencies: "@ethereumjs/common" "^2.4.0" "@ethereumjs/tx" "^3.3.0" - "@shapeshiftoss/hdwallet-core" "1.21.1" - base64-js "^1.5.1" - lodash "^4.17.21" - -"@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-trezor/-/hdwallet-trezor-1.21.2.tgz#dde1f0293a8365f4791bba80ea5041efa4ed0e6f" - integrity sha512-1IP/Kb9MqzcwASwW8jg+mWgCbPUvK6LBoCCW1w7keibimdXlsMu2LEWvgUxIFzQQlX9QtcZ+vAoKuZ1yO1tJ+A== - dependencies: - "@ethereumjs/common" "^2.4.0" - "@ethereumjs/tx" "^3.3.0" - "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" base64-js "^1.5.1" lodash "^4.17.21" "@shapeshiftoss/hdwallet-walletconnect@^1.52.3-thorchain.10": - version "1.52.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-walletconnect/-/hdwallet-walletconnect-1.52.1.tgz#ec889e5363f53542a6adec9848559d7d157e7d60" - integrity sha512-S9LP0VYBYnUVvG7CW4pWsiY2yRnhy5plwPMNO+gnup3oMzRZUAxN1mkP5aSL8v4cwT+L/THjZ4VNqqEuMZShNA== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-walletconnect/-/hdwallet-walletconnect-1.52.3-thorchain.11.tgz#b75eee0e4ded2f3ead7bf7c8dc4805f143a0c087" + integrity sha512-//GZ3npcC4RsSiqgQ03jSNL7adKrlF8aBQ9UT3HWItw1+bNN3jB2npiQV7d6KIYqtt3zr1YWxCXp0yAkeBbPdw== dependencies: - "@shapeshiftoss/hdwallet-core" "1.52.1" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" "@walletconnect/qrcode-modal" "^1.7.8" "@walletconnect/web3-provider" "^1.7.8" ethers "^5.6.5" "@shapeshiftoss/hdwallet-xdefi@^1.52.3-thorchain.10": - version "1.21.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-xdefi/-/hdwallet-xdefi-1.21.1.tgz#11935751ebc1a764fbeb9a70c17e6c4eeaccd8d5" - integrity sha512-sfl7O5LDp9sLuL3XFBckap3v6vBLhGl8XsgGV9sPsRGWwaLOhDnXE9YObnCxpLjJKtF6ZyzLH203ba4XB68Tpg== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-xdefi/-/hdwallet-xdefi-1.52.3-thorchain.11.tgz#9571a7747e21e6321add7815d8d147edb8b06cfc" + integrity sha512-ocbVY3TFfrgr35Kqa9UlhvOJhZ6YLnJmKJLIqOkF+GLs+eOxwagqDBIDxYgXNAbx36q2MVF4GS51URrn6LG0BA== dependencies: - "@shapeshiftoss/hdwallet-core" "1.21.1" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" lodash "^4.17.21" "@shapeshiftoss/logger@^1.1.2", "@shapeshiftoss/logger@^1.1.3": @@ -6286,18 +5881,6 @@ eth-rpc-errors "^4.0.3" patch-package "^6.2.2" -"@shapeshiftoss/proto-tx-builder@^0.2.1": - version "0.2.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/proto-tx-builder/-/proto-tx-builder-0.2.1.tgz#82106d45adcec0d5d215a6098b52d16ef3db3dc8" - integrity sha512-LNUFjKRmq8aC08Uq9/umUCF2F9Fhfg9yH6xFhEdZkNTNFC4WW7XuAxKrzM6yFCaYWkIN265v7T3sHleZ9MTz3g== - dependencies: - "@cosmjs/proto-signing" "^0.28.0" - "@cosmjs/stargate" "^0.28.0" - "@cosmjs/tendermint-rpc" "^0.28.0" - cosmjs-types "^0.4.1" - google-protobuf "^3.17.0" - long "^4.0.0" - "@shapeshiftoss/proto-tx-builder@^0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@shapeshiftoss/proto-tx-builder/-/proto-tx-builder-0.8.0.tgz#12523e76e6ae2c794e8ad5439dedf65d30c78185" @@ -7115,7 +6698,7 @@ "@types/ripemd160@^2.0.1": version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/ripemd160/-/ripemd160-2.0.1.tgz#e9ea7a26adf0e2541917fc2b1ecb497e8ced4b7e" + resolved "http://localhost:4873/@types/ripemd160/-/ripemd160-2.0.1.tgz#e9ea7a26adf0e2541917fc2b1ecb497e8ced4b7e" integrity sha512-l3pt9f8vK1tU2qBXY1aL7HofNnJKbpNa+2DznrD7j0lhaS4587e3iwgSMRDJFlidsrNjrrjIl8G+EeXFMjcGXg== dependencies: "@types/node" "*" @@ -11866,42 +11449,6 @@ ethereumjs-vm@^2.3.4: rustbn.js "~0.2.0" safe-buffer "^5.1.1" -ethers@5.6.5: - version "5.6.5" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.6.5.tgz#3185ac7815dc640993408adf6f133ffabfbcbb63" - integrity sha512-9CTmplO9bv0s/aPw3HB3txGzKz3tUSI2EfO4dJo0W2WvaEq1ArgsEX6obV+bj5X3yY+Zgb1kAux8TDtJKe1FaA== - dependencies: - "@ethersproject/abi" "5.6.1" - "@ethersproject/abstract-provider" "5.6.0" - "@ethersproject/abstract-signer" "5.6.0" - "@ethersproject/address" "5.6.0" - "@ethersproject/base64" "5.6.0" - "@ethersproject/basex" "5.6.0" - "@ethersproject/bignumber" "5.6.0" - "@ethersproject/bytes" "5.6.1" - "@ethersproject/constants" "5.6.0" - "@ethersproject/contracts" "5.6.0" - "@ethersproject/hash" "5.6.0" - "@ethersproject/hdnode" "5.6.0" - "@ethersproject/json-wallets" "5.6.0" - "@ethersproject/keccak256" "5.6.0" - "@ethersproject/logger" "5.6.0" - "@ethersproject/networks" "5.6.2" - "@ethersproject/pbkdf2" "5.6.0" - "@ethersproject/properties" "5.6.0" - "@ethersproject/providers" "5.6.5" - "@ethersproject/random" "5.6.0" - "@ethersproject/rlp" "5.6.0" - "@ethersproject/sha2" "5.6.0" - "@ethersproject/signing-key" "5.6.1" - "@ethersproject/solidity" "5.6.0" - "@ethersproject/strings" "5.6.0" - "@ethersproject/transactions" "5.6.0" - "@ethersproject/units" "5.6.0" - "@ethersproject/wallet" "5.6.0" - "@ethersproject/web" "5.6.0" - "@ethersproject/wordlists" "5.6.0" - ethers@5.7.2, ethers@^5.5.3: version "5.7.2" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" @@ -20461,7 +20008,7 @@ typescript@<4.8.0: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== -"typescript@^3 || ^4", typescript@^4.3.2: +"typescript@^3 || ^4": version "4.9.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== From 0d72dc070970827de83a88aa9aae28b4e654f00a Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 19:59:06 +0200 Subject: [PATCH 030/108] feat: boimp --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index cf4ac2f8f..55bb24052 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-thorchain.11", + "version": "1.52.3-thorchain.12", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index af2dc8ee9..3c0d1738d 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-thorchain.11", + "version": "1.52.3-thorchain.12", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index 6621e66d4..c72fbebe2 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-thorchain.11", + "version": "1.52.3-thorchain.12", "npmClient": "yarn", "useWorkspaces": true, "command": { From d5fd4902ad0889645bc777d4e58839d9c0b00e88 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 19:59:10 +0200 Subject: [PATCH 031/108] feat: bring back hardcoded path --- packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index 76df17160..350792641 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -270,7 +270,11 @@ class THORChainApp { } } - async getAddressAndPubKey(path: number[], hrp: any): Promise { + async getAddressAndPubKey(_path: number[], hrp: any): Promise { + // TODO(gomes): this is obviously temporary, find a better way to do this and pass our bip32 path in and make it work here + // eslint-disable-next-line no-console + console.log({ _path }); + const path = [44, 931, 0, 0, 0]; try { return await this.serializePath(path as any) .then((serializedPath) => { @@ -342,7 +346,7 @@ class THORChainApp { const rawTx = stringifyKeysInOrder({ account_number: msg.account_number, chain_id: THOR_CHAIN, - fee: { amount: [msg.fee], gas: msg.tx.fee.gas}, + fee: { amount: [msg.fee], gas: msg.tx.fee.gas }, memo: msg.tx.memo, msgs: msg.tx.msg, sequence: msg.sequence, From 9ec1233c1f5834bc9d1f5e9a6ea48b491b3e29bf Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:03:34 +0200 Subject: [PATCH 032/108] feat: boimp --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 55bb24052..5476482f1 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-thorchain.12", + "version": "1.52.3-thorchain.13", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 3c0d1738d..10be60c1e 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-thorchain.12", + "version": "1.52.3-thorchain.13", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index c72fbebe2..9aec9447c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-thorchain.12", + "version": "1.52.3-thorchain.13", "npmClient": "yarn", "useWorkspaces": true, "command": { From abaad81ffe362a81952407833f36ed28abe14f05 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:03:38 +0200 Subject: [PATCH 033/108] feat: sign method hardcode path too --- packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index 350792641..1e885ced6 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -352,7 +352,11 @@ class THORChainApp { sequence: msg.sequence, }); - return this.signGetChunks(msg.addressNList as any, rawTx).then((chunks) => { + const path = [44, 931, 0, 0, 0]; + + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore swapkit types are drunk + return this.signGetChunks(path, rawTx).then((chunks) => { return this.signSendChunk(1, chunks.length, chunks[0]).then(async (response) => { let result = { return_code: response.return_code, From 4deac1a8cd48dde98dd841f267d0c613652b8ca1 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:05:09 +0200 Subject: [PATCH 034/108] feat: boimp --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 5476482f1..dd9189c0c 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-thorchain.13", + "version": "1.52.3-thorchain.14", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 10be60c1e..3ae7ac17d 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-thorchain.13", + "version": "1.52.3-thorchain.14", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index 9aec9447c..1d439c428 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-thorchain.13", + "version": "1.52.3-thorchain.14", "npmClient": "yarn", "useWorkspaces": true, "command": { From d35c1cebc513eed07a88e01c397c84508ae2234b Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:13:14 +0200 Subject: [PATCH 035/108] feat: don't fromBase64 --- .../hdwallet-ledger/src/thorchain/index.ts | 45 +++++++------------ 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index 60ae2c0b4..af0cff80d 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -1,8 +1,8 @@ import type { AccountData, AminoSignResponse, OfflineAminoSigner, StdSignDoc, StdTx } from "@cosmjs/amino"; -import { fromByteArray } from "base64-js"; -import { fromBase64 } from '@cosmjs/encoding'; +import { fromBase64 } from "@cosmjs/encoding"; import type { SignerData } from "@cosmjs/stargate"; import * as core from "@shapeshiftoss/hdwallet-core"; +import { fromByteArray } from "base64-js"; import PLazy from "p-lazy"; import { LedgerTransport } from ".."; @@ -19,50 +19,35 @@ export const thorchainGetAddress = async ( transport: LedgerTransport, msg: core.ThorchainGetAddress ): Promise => { - const addressAndPubkey = await transport.call( - "Rune", - "getAddressAndPubKey", - msg.addressNList, - "thor" - ); - - if ('error' in addressAndPubkey.payload) { - throw new Error(addressAndPubkey.payload.error) + const addressAndPubkey = await transport.call("Rune", "getAddressAndPubKey", msg.addressNList, "thor"); + + if ("error" in addressAndPubkey.payload) { + throw new Error(addressAndPubkey.payload.error); } - return addressAndPubkey.payload.bech32_address + return addressAndPubkey.payload.bech32_address; }; export const thorchainSignTx = async ( transport: LedgerTransport, msg: core.ThorchainSignTx ): Promise => { + const addressAndPubkey = await transport.call("Rune", "getAddressAndPubKey", msg.addressNList, "thor"); - const addressAndPubkey = await transport.call( - "Rune", - "getAddressAndPubKey", - msg.addressNList, - "thor" - ); - - if ('error' in addressAndPubkey.payload) { - throw new Error(addressAndPubkey.payload.error) + if ("error" in addressAndPubkey.payload) { + throw new Error(addressAndPubkey.payload.error); } const address = addressAndPubkey.payload.bech32_address; const pubkey = addressAndPubkey.payload.compressed_pk; - const signResponse = await transport.call( - "Rune", - "sign", - msg - ); + const signResponse = await transport.call("Rune", "sign", msg); - if ('error' in signResponse.payload) { - throw new Error(signResponse.payload.error) + if ("error" in signResponse.payload) { + throw new Error(signResponse.payload.error); } - console.log({ signResponse: signResponse.payload }) + console.log({ signResponse: signResponse.payload }); const signature = signResponse.payload.signature; @@ -87,7 +72,7 @@ export const thorchainSignTx = async ( type: "tendermint/PubKeySecp256k1", value: fromByteArray(pubkey), }, - signature: fromBase64(getSignature(signature)).toString(), + signature: getSignature(signature), }, }; }, From a036291b92f58971027754aaa491330d2f56d077 Mon Sep 17 00:00:00 2001 From: kaladinlight <35275952+kaladinlight@users.noreply.github.com> Date: Wed, 11 Oct 2023 13:44:07 -0600 Subject: [PATCH 036/108] handle addressNList --- .../hdwallet-ledger/src/thorchain/helpers.ts | 8 +-- .../src/thorchain/hw-app-thor.ts | 14 ++--- .../hdwallet-ledger/src/thorchain/index.ts | 58 ++++++------------- 3 files changed, 28 insertions(+), 52 deletions(-) diff --git a/packages/hdwallet-ledger/src/thorchain/helpers.ts b/packages/hdwallet-ledger/src/thorchain/helpers.ts index 81dca3828..14a8893df 100644 --- a/packages/hdwallet-ledger/src/thorchain/helpers.ts +++ b/packages/hdwallet-ledger/src/thorchain/helpers.ts @@ -25,15 +25,15 @@ const signSendChunkv1 = async (app: any, chunkIdx: any, chunkNum: any, chunk: an }, processErrorResponse); }; -export const serializePathv2 = (path: any) => { +export const serializePathv2 = (path: Array) => { if (!path || path.length !== 5) { throw new Error("Invalid path."); } const buf = Buffer.alloc(20); - buf.writeUInt32LE(0x80000000 + path[0], 0); - buf.writeUInt32LE(0x80000000 + path[1], 4); - buf.writeUInt32LE(0x80000000 + path[2], 8); + buf.writeUInt32LE(path[0], 0); + buf.writeUInt32LE(path[1], 4); + buf.writeUInt32LE(path[2], 8); buf.writeUInt32LE(path[3], 12); buf.writeUInt32LE(path[4], 16); diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index 76df17160..e56610c07 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -109,7 +109,7 @@ class THORChainApp { return encode(hrp, toWords(hashRip)); } - async serializePath(path: string) { + async serializePath(path: Array) { this.versionResponse = await getVersion(this.transport); if (this.versionResponse.return_code !== ErrorCode.NoError) { @@ -127,7 +127,7 @@ class THORChainApp { } } - async signGetChunks(path: string, message: any) { + async signGetChunks(path: Array, message: any) { const serializedPath = await this.serializePath(path); const chunks = []; @@ -250,7 +250,7 @@ class THORChainApp { }, processErrorResponse); } - async publicKey(path: string) { + async publicKey(path: Array) { try { const serializedPath = await this.serializePath(path); @@ -270,9 +270,9 @@ class THORChainApp { } } - async getAddressAndPubKey(path: number[], hrp: any): Promise { + async getAddressAndPubKey(path: Array, hrp: any): Promise { try { - return await this.serializePath(path as any) + return await this.serializePath(path) .then((serializedPath) => { const data = Buffer.concat([THORChainApp.serializeHRP(hrp), serializedPath as any]); return this.transport @@ -298,7 +298,7 @@ class THORChainApp { } } - async showAddressAndPubKey(path: string, hrp: any) { + async showAddressAndPubKey(path: Array, hrp: any) { try { return await this.serializePath(path) .then((serializedPath) => { @@ -348,7 +348,7 @@ class THORChainApp { sequence: msg.sequence, }); - return this.signGetChunks(msg.addressNList as any, rawTx).then((chunks) => { + return this.signGetChunks(msg.addressNList, rawTx).then((chunks) => { return this.signSendChunk(1, chunks.length, chunks[0]).then(async (response) => { let result = { return_code: response.return_code, diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index 60ae2c0b4..dca503438 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -1,11 +1,10 @@ import type { AccountData, AminoSignResponse, OfflineAminoSigner, StdSignDoc, StdTx } from "@cosmjs/amino"; -import { fromByteArray } from "base64-js"; -import { fromBase64 } from '@cosmjs/encoding'; import type { SignerData } from "@cosmjs/stargate"; import * as core from "@shapeshiftoss/hdwallet-core"; +import { fromByteArray } from "base64-js"; import PLazy from "p-lazy"; -import { LedgerTransport } from ".."; +import { handleError, LedgerTransport } from ".."; import { getSignature } from "./utils"; export * from "./common"; export * from "./helpers"; @@ -18,51 +17,28 @@ const protoTxBuilder = PLazy.from(() => import("@shapeshiftoss/proto-tx-builder" export const thorchainGetAddress = async ( transport: LedgerTransport, msg: core.ThorchainGetAddress -): Promise => { - const addressAndPubkey = await transport.call( - "Rune", - "getAddressAndPubKey", - msg.addressNList, - "thor" - ); - - if ('error' in addressAndPubkey.payload) { - throw new Error(addressAndPubkey.payload.error) - } - - return addressAndPubkey.payload.bech32_address +): Promise => { + const addressAndPubkey = await transport.call("Rune", "getAddressAndPubKey", msg.addressNList, "thor"); + + handleError(addressAndPubkey, transport, "Unable to obtain address and public key from device."); + + return addressAndPubkey.payload.bech32_address; }; export const thorchainSignTx = async ( transport: LedgerTransport, msg: core.ThorchainSignTx ): Promise => { + const addressAndPubkey = await transport.call("Rune", "getAddressAndPubKey", msg.addressNList, "thor"); - const addressAndPubkey = await transport.call( - "Rune", - "getAddressAndPubKey", - msg.addressNList, - "thor" - ); - - if ('error' in addressAndPubkey.payload) { - throw new Error(addressAndPubkey.payload.error) - } - - const address = addressAndPubkey.payload.bech32_address; - const pubkey = addressAndPubkey.payload.compressed_pk; + handleError(addressAndPubkey, transport, "Unable to obtain address and public key from device."); - const signResponse = await transport.call( - "Rune", - "sign", - msg - ); + const { bech32_address: address, compressed_pk } = addressAndPubkey.payload; + const pubkey = fromByteArray(compressed_pk); - if ('error' in signResponse.payload) { - throw new Error(signResponse.payload.error) - } + const signResponse = await transport.call("Rune", "sign", msg); - console.log({ signResponse: signResponse.payload }) + handleError(signResponse, transport, "Unable to obtain signature from device."); const signature = signResponse.payload.signature; @@ -72,7 +48,7 @@ export const thorchainSignTx = async ( { address, algo: "secp256k1", - pubkey, + pubkey: compressed_pk, }, ]; }, @@ -85,9 +61,9 @@ export const thorchainSignTx = async ( signature: { pub_key: { type: "tendermint/PubKeySecp256k1", - value: fromByteArray(pubkey), + value: pubkey, }, - signature: fromBase64(getSignature(signature)).toString(), + signature: getSignature(signature), }, }; }, From 836724276c3265b715d0521f2561bf840c41a748 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 12 Oct 2023 09:20:05 +0200 Subject: [PATCH 037/108] feat: bump --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index dd9189c0c..eb7e91fcd 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-thorchain.14", + "version": "1.52.3-thorchain.15", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 3ae7ac17d..06470413b 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-thorchain.14", + "version": "1.52.3-thorchain.15", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index 1d439c428..7cd2f9ce5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-thorchain.14", + "version": "1.52.3-thorchain.15", "npmClient": "yarn", "useWorkspaces": true, "command": { From 11d902f8ad32cd8a3b211512b81e43c1f0f91564 Mon Sep 17 00:00:00 2001 From: kaladinlight <35275952+kaladinlight@users.noreply.github.com> Date: Wed, 11 Oct 2023 13:44:07 -0600 Subject: [PATCH 038/108] handle addressNList --- .../hdwallet-ledger/src/thorchain/helpers.ts | 8 +++--- .../src/thorchain/hw-app-thor.ts | 22 +++++---------- .../hdwallet-ledger/src/thorchain/index.ts | 27 +++++++------------ 3 files changed, 20 insertions(+), 37 deletions(-) diff --git a/packages/hdwallet-ledger/src/thorchain/helpers.ts b/packages/hdwallet-ledger/src/thorchain/helpers.ts index 81dca3828..14a8893df 100644 --- a/packages/hdwallet-ledger/src/thorchain/helpers.ts +++ b/packages/hdwallet-ledger/src/thorchain/helpers.ts @@ -25,15 +25,15 @@ const signSendChunkv1 = async (app: any, chunkIdx: any, chunkNum: any, chunk: an }, processErrorResponse); }; -export const serializePathv2 = (path: any) => { +export const serializePathv2 = (path: Array) => { if (!path || path.length !== 5) { throw new Error("Invalid path."); } const buf = Buffer.alloc(20); - buf.writeUInt32LE(0x80000000 + path[0], 0); - buf.writeUInt32LE(0x80000000 + path[1], 4); - buf.writeUInt32LE(0x80000000 + path[2], 8); + buf.writeUInt32LE(path[0], 0); + buf.writeUInt32LE(path[1], 4); + buf.writeUInt32LE(path[2], 8); buf.writeUInt32LE(path[3], 12); buf.writeUInt32LE(path[4], 16); diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index 1e885ced6..ab3f5f5b4 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -109,7 +109,7 @@ class THORChainApp { return encode(hrp, toWords(hashRip)); } - async serializePath(path: string) { + async serializePath(path: Array) { this.versionResponse = await getVersion(this.transport); if (this.versionResponse.return_code !== ErrorCode.NoError) { @@ -127,7 +127,7 @@ class THORChainApp { } } - async signGetChunks(path: string, message: any) { + async signGetChunks(path: Array, message: any) { const serializedPath = await this.serializePath(path); const chunks = []; @@ -250,7 +250,7 @@ class THORChainApp { }, processErrorResponse); } - async publicKey(path: string) { + async publicKey(path: Array) { try { const serializedPath = await this.serializePath(path); @@ -270,13 +270,9 @@ class THORChainApp { } } - async getAddressAndPubKey(_path: number[], hrp: any): Promise { - // TODO(gomes): this is obviously temporary, find a better way to do this and pass our bip32 path in and make it work here - // eslint-disable-next-line no-console - console.log({ _path }); - const path = [44, 931, 0, 0, 0]; + async getAddressAndPubKey(path: Array, hrp: any): Promise { try { - return await this.serializePath(path as any) + return await this.serializePath(path) .then((serializedPath) => { const data = Buffer.concat([THORChainApp.serializeHRP(hrp), serializedPath as any]); return this.transport @@ -302,7 +298,7 @@ class THORChainApp { } } - async showAddressAndPubKey(path: string, hrp: any) { + async showAddressAndPubKey(path: Array, hrp: any) { try { return await this.serializePath(path) .then((serializedPath) => { @@ -352,11 +348,7 @@ class THORChainApp { sequence: msg.sequence, }); - const path = [44, 931, 0, 0, 0]; - - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore swapkit types are drunk - return this.signGetChunks(path, rawTx).then((chunks) => { + return this.signGetChunks(msg.addressNList, rawTx).then((chunks) => { return this.signSendChunk(1, chunks.length, chunks[0]).then(async (response) => { let result = { return_code: response.return_code, diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index af0cff80d..dca503438 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -1,11 +1,10 @@ import type { AccountData, AminoSignResponse, OfflineAminoSigner, StdSignDoc, StdTx } from "@cosmjs/amino"; -import { fromBase64 } from "@cosmjs/encoding"; import type { SignerData } from "@cosmjs/stargate"; import * as core from "@shapeshiftoss/hdwallet-core"; import { fromByteArray } from "base64-js"; import PLazy from "p-lazy"; -import { LedgerTransport } from ".."; +import { handleError, LedgerTransport } from ".."; import { getSignature } from "./utils"; export * from "./common"; export * from "./helpers"; @@ -18,12 +17,10 @@ const protoTxBuilder = PLazy.from(() => import("@shapeshiftoss/proto-tx-builder" export const thorchainGetAddress = async ( transport: LedgerTransport, msg: core.ThorchainGetAddress -): Promise => { +): Promise => { const addressAndPubkey = await transport.call("Rune", "getAddressAndPubKey", msg.addressNList, "thor"); - if ("error" in addressAndPubkey.payload) { - throw new Error(addressAndPubkey.payload.error); - } + handleError(addressAndPubkey, transport, "Unable to obtain address and public key from device."); return addressAndPubkey.payload.bech32_address; }; @@ -34,20 +31,14 @@ export const thorchainSignTx = async ( ): Promise => { const addressAndPubkey = await transport.call("Rune", "getAddressAndPubKey", msg.addressNList, "thor"); - if ("error" in addressAndPubkey.payload) { - throw new Error(addressAndPubkey.payload.error); - } + handleError(addressAndPubkey, transport, "Unable to obtain address and public key from device."); - const address = addressAndPubkey.payload.bech32_address; - const pubkey = addressAndPubkey.payload.compressed_pk; + const { bech32_address: address, compressed_pk } = addressAndPubkey.payload; + const pubkey = fromByteArray(compressed_pk); const signResponse = await transport.call("Rune", "sign", msg); - if ("error" in signResponse.payload) { - throw new Error(signResponse.payload.error); - } - - console.log({ signResponse: signResponse.payload }); + handleError(signResponse, transport, "Unable to obtain signature from device."); const signature = signResponse.payload.signature; @@ -57,7 +48,7 @@ export const thorchainSignTx = async ( { address, algo: "secp256k1", - pubkey, + pubkey: compressed_pk, }, ]; }, @@ -70,7 +61,7 @@ export const thorchainSignTx = async ( signature: { pub_key: { type: "tendermint/PubKeySecp256k1", - value: fromByteArray(pubkey), + value: pubkey, }, signature: getSignature(signature), }, From a7faff57a8f29c2abb693477238343b2e74d1744 Mon Sep 17 00:00:00 2001 From: kaladinlight <35275952+kaladinlight@users.noreply.github.com> Date: Thu, 12 Oct 2023 14:01:08 -0600 Subject: [PATCH 039/108] bump --- examples/sandbox/package.json | 30 +-- integration/package.json | 18 +- packages/hdwallet-coinbase/package.json | 4 +- packages/hdwallet-core/package.json | 2 +- .../hdwallet-keepkey-chromeusb/package.json | 6 +- .../hdwallet-keepkey-electron/package.json | 4 +- .../hdwallet-keepkey-nodehid/package.json | 4 +- .../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-keplr/package.json | 4 +- packages/hdwallet-ledger-webhid/package.json | 6 +- packages/hdwallet-ledger-webusb/package.json | 6 +- packages/hdwallet-ledger/package.json | 4 +- packages/hdwallet-ledger/src/ledger.ts | 2 +- .../hdwallet-ledger/src/thorchain/index.ts | 2 +- .../package.json | 4 +- packages/hdwallet-metamask/package.json | 4 +- packages/hdwallet-native-vault/package.json | 4 +- packages/hdwallet-native/package.json | 4 +- packages/hdwallet-portis/package.json | 4 +- packages/hdwallet-tallyho/package.json | 4 +- packages/hdwallet-trezor-connect/package.json | 6 +- packages/hdwallet-trezor/package.json | 4 +- packages/hdwallet-walletconnect/package.json | 4 +- .../hdwallet-walletconnectV2/package.json | 4 +- packages/hdwallet-xdefi/package.json | 4 +- yarn.lock | 230 +----------------- 29 files changed, 83 insertions(+), 307 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index eb7e91fcd..3c825978e 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.15", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index 06470413b..e46c61dc4 100644 --- a/integration/package.json +++ b/integration/package.json @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.15", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index 323077b70..2a123f04d 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json index d06b1e2d0..2ff176e62 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index 6f611c078..bd8a1a588 100644 --- a/packages/hdwallet-keepkey-chromeusb/package.json +++ b/packages/hdwallet-keepkey-chromeusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-chromeusb", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9" + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15" } } diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index 2f4fd5fb1..472b74d9c 100644 --- a/packages/hdwallet-keepkey-electron/package.json +++ b/packages/hdwallet-keepkey-electron/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-electron", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index a81810ef1..e55adbe79 100644 --- a/packages/hdwallet-keepkey-nodehid/package.json +++ b/packages/hdwallet-keepkey-nodehid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodehid", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9" + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index bff6b6eec..572ee1226 100644 --- a/packages/hdwallet-keepkey-nodewebusb/package.json +++ b/packages/hdwallet-keepkey-nodewebusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9" + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index 139d574e4..bf283d0c9 100644 --- a/packages/hdwallet-keepkey-tcp/package.json +++ b/packages/hdwallet-keepkey-tcp/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-tcp", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15", "axios": "^0.21.1" } } diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index a820a4f17..2f5b37e74 100644 --- a/packages/hdwallet-keepkey-webusb/package.json +++ b/packages/hdwallet-keepkey-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-webusb", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9" + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4" diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index 9e91ba8f9..73911f3a9 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^3.3.0", "@keepkey/device-protocol": "^7.12.2", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "bignumber.js": "^9.0.1", "bnb-javascript-sdk-nobroadcast": "^2.16.14", diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json index 7ebbc27bf..d5a67a6cc 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/caip": "8.15.0", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@shapeshiftoss/types": "3.1.3", "base64-js": "^1.5.1", diff --git a/packages/hdwallet-ledger-webhid/package.json b/packages/hdwallet-ledger-webhid/package.json index 8d7a69523..ee1d6bf03 100644 --- a/packages/hdwallet-ledger-webhid/package.json +++ b/packages/hdwallet-ledger-webhid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webhid", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -19,8 +19,8 @@ "@ledgerhq/hw-transport": "^6.7.0", "@ledgerhq/hw-transport-webhid": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.15", "@types/w3c-web-hid": "^1.0.2" }, "devDependencies": { diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index ce0ddb44d..86bbeddf4 100644 --- a/packages/hdwallet-ledger-webusb/package.json +++ b/packages/hdwallet-ledger-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webusb", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -20,8 +20,8 @@ "@ledgerhq/hw-transport-webusb": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", "@ledgerhq/logs": "^6.10.1", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.15", "@types/w3c-web-usb": "^1.0.4", "p-queue": "^7.4.1" }, diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index 63194b01e..0432af277 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -18,7 +18,7 @@ "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@types/ripemd160": "^2.0.1", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", diff --git a/packages/hdwallet-ledger/src/ledger.ts b/packages/hdwallet-ledger/src/ledger.ts index 7078a3b88..bceae89b7 100644 --- a/packages/hdwallet-ledger/src/ledger.ts +++ b/packages/hdwallet-ledger/src/ledger.ts @@ -512,7 +512,7 @@ export class LedgerHDWallet implements core.HDWallet, core.BTCWallet, core.ETHWa await this.validateCurrentApp(msg.coin); return btc.btcGetAddress(this.transport, msg); } - public thorchainGetAddress(msg: core.ThorchainGetAddress): Promise { + public thorchainGetAddress(msg: core.ThorchainGetAddress): Promise { return thorchain.thorchainGetAddress(this.transport, msg); } diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index dca503438..d4a7f6727 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -17,7 +17,7 @@ const protoTxBuilder = PLazy.from(() => import("@shapeshiftoss/proto-tx-builder" export const thorchainGetAddress = async ( transport: LedgerTransport, msg: core.ThorchainGetAddress -): Promise => { +): Promise => { const addressAndPubkey = await transport.call("Rune", "getAddressAndPubKey", msg.addressNList, "thor"); handleError(addressAndPubkey, transport, "Unable to obtain address and public key from device."); diff --git a/packages/hdwallet-metamask-shapeshift-multichain/package.json b/packages/hdwallet-metamask-shapeshift-multichain/package.json index 6db2f8410..d2a4834a4 100644 --- a/packages/hdwallet-metamask-shapeshift-multichain/package.json +++ b/packages/hdwallet-metamask-shapeshift-multichain/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-shapeshift-multichain", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", "@shapeshiftoss/common-api": "^9.3.0", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/metamask-snaps-adapter": "^1.0.8", "@shapeshiftoss/metamask-snaps-types": "^1.0.8", "eth-rpc-errors": "^4.0.3", diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index 66ed05f88..e18a6bacb 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index 5467c74b8..17223f8ff 100644 --- a/packages/hdwallet-native-vault/package.json +++ b/packages/hdwallet-native-vault/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native-vault", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.15", "bip39": "^3.0.4", "hash-wasm": "^4.9.0", "idb-keyval": "^6.0.3", diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index 27584449e..45890099b 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", "@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index 5a0618ec9..1edb44e56 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@portis/web3": "3.0.10", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index dca77399d..f10f3bd21 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-tallyho", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "lodash": "^4.17.21", "tallyho-onboarding": "^1.0.2" }, diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index f56286fc9..58fd5d663 100644 --- a/packages/hdwallet-trezor-connect/package.json +++ b/packages/hdwallet-trezor-connect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor-connect", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.15", "@trezor/rollout": "^1.2.0", "trezor-connect": "^8.2.1" } diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index 61de4d50f..5a0a3b0dd 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "base64-js": "^1.5.1", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index b6b4582d9..0ca5e8985 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@walletconnect/qrcode-modal": "^1.7.8", "@walletconnect/web3-provider": "^1.7.8", "ethers": "^5.6.5" diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index 5ba91f0c0..94af29d97 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@walletconnect/ethereum-provider": "^2.10.1", "@walletconnect/modal": "^2.6.2", "ethers": "^5.6.5" diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index f2ed60438..590e7b16b 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-xdefi", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "lodash": "^4.17.21" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 96c430e36..5f61c4e7d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5559,7 +5559,7 @@ "@shapeshiftoss/hdwallet-core@1.52.1", "@shapeshiftoss/hdwallet-core@^1.50.4": version "1.52.1" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.1.tgz#5165e6ecfef3ffa2a3c1ed1aafe6de268224f920" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.1.tgz#5165e6ecfef3ffa2a3c1ed1aafe6de268224f920" integrity sha512-ON0kGiYhVUZm2sPp6EbgIwACJAvULIeklddWPZDCv6mvByIsY8D6BTVQtXVavHBB+/Pf6bVc1uMfCO3X5zPaHg== dependencies: "@shapeshiftoss/proto-tx-builder" "^0.8.0" @@ -5569,18 +5569,6 @@ rxjs "^6.4.0" type-assertions "^1.1.0" -"@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.11": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.3-thorchain.11.tgz#1d24db71eae513a5f8ca79721e76f244974ef3dc" - integrity sha512-FxVzYJJ7ZqqaWzEBgxN2bsUUxk3y38QIRd48C2cRQjgPDQbd1DRRaWoxD0/f4zFGDyAYTQgF7mOUGUH9JLV7Zw== - dependencies: - "@shapeshiftoss/proto-tx-builder" "^0.8.0" - eip-712 "^1.0.0" - eventemitter2 "^5.0.1" - lodash "^4.17.21" - rxjs "^6.4.0" - type-assertions "^1.1.0" - "@shapeshiftoss/hdwallet-core@latest": version "1.18.4" resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.18.4.tgz#7272baa4b43de0fbb5e651d47cdeb9554f4ddd33" @@ -5591,129 +5579,9 @@ rxjs "^6.4.0" type-assertions "^1.1.0" -"@shapeshiftoss/hdwallet-keepkey-nodewebusb@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-nodewebusb/-/hdwallet-keepkey-nodewebusb-1.52.3-thorchain.11.tgz#2bdcf3bf1a7599ffea9f5ebd5e2e4c3acf3dcc35" - integrity sha512-Ek94hVGSzsZWVdrev2UOlUrYZtnpUwVJh0Zf8osTu36JzPjrEKgQDA72mRQzIAXKRacqtdCL/uec3SI+kWomPA== - dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" - -"@shapeshiftoss/hdwallet-keepkey-tcp@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-tcp/-/hdwallet-keepkey-tcp-1.52.3-thorchain.11.tgz#bdfde504aac915f3d6763082c2e49c0980ed59ad" - integrity sha512-K2pEq35XAHpTR45m8WwdVBRvx5lIj8+G3tONsqr0d/9KluGEn//FPil5P9Rxz/CvXam/uwWH7NvJMibWmKlcQA== - dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" - axios "^0.21.1" - -"@shapeshiftoss/hdwallet-keepkey-webusb@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-webusb/-/hdwallet-keepkey-webusb-1.52.3-thorchain.11.tgz#75ecc2d3d2e2f26db1f86f50fd95eefaccf8bf15" - integrity sha512-pO1susjpLW0YKENcWrjI81moONOeTbjf6mcc2Mq8yfLbxiNYM4guEEtnesU5OfKjv78bOsyOgcNjzpKL8PiygQ== - dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" - -"@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.11": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey/-/hdwallet-keepkey-1.52.3-thorchain.11.tgz#83b412314ca7087e5d2245615fbae46686492996" - integrity sha512-U08jLpycWtfu1hSYnYCx+5e4/tokP/Z8eCQrUlYTdKSAZmXPBTFlz7uKjWcsj0zuoC+xod3yc5VSXbyvGsnupg== - dependencies: - "@ethereumjs/common" "^2.4.0" - "@ethereumjs/tx" "^3.3.0" - "@keepkey/device-protocol" "^7.12.2" - "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/proto-tx-builder" "^0.8.0" - bignumber.js "^9.0.1" - bnb-javascript-sdk-nobroadcast "^2.16.14" - crypto-js "^4.0.0" - eip-712 "^1.0.0" - eip55 "^2.1.0" - google-protobuf "^3.15.8" - icepick "^2.4.0" - lodash "^4.17.21" - p-lazy "^3.1.0" - semver "^7.3.8" - tiny-secp256k1 "^1.1.6" - -"@shapeshiftoss/hdwallet-keplr@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keplr/-/hdwallet-keplr-1.52.3-thorchain.11.tgz#d4d68722353f496f754d2cb0062dc2612430cd64" - integrity sha512-vNOsjerVGDfFDUcoX45yQthDVvcss7YKvbcS9feMC9yVSHgb9raYVdUJsJ7JIqXNYkkJ/aMardMb2ldCTmH+IQ== - dependencies: - "@shapeshiftoss/caip" "8.15.0" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/proto-tx-builder" "^0.8.0" - "@shapeshiftoss/types" "3.1.3" - base64-js "^1.5.1" - lodash "^4.17.21" - -"@shapeshiftoss/hdwallet-ledger-webhid@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger-webhid/-/hdwallet-ledger-webhid-1.52.3-thorchain.11.tgz#48e49b81c14a65e6e2ab868b17a40e1bd6e98eb2" - integrity sha512-lFBiBXjaSKnsPKKUNDhIcHjZuKfwrJ/lzc2ckepR+SPgS13LMsXnHcFy87DVb53e6CP4p4Kv6I2zR1rJsv+SeQ== - dependencies: - "@ledgerhq/hw-app-btc" "^10.0.8" - "@ledgerhq/hw-app-eth" "^6.9.0" - "@ledgerhq/hw-transport" "^6.7.0" - "@ledgerhq/hw-transport-webhid" "^6.7.0" - "@ledgerhq/live-common" "^21.8.2" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-ledger" "^1.52.3-thorchain.11" - "@types/w3c-web-hid" "^1.0.2" - -"@shapeshiftoss/hdwallet-ledger-webusb@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger-webusb/-/hdwallet-ledger-webusb-1.52.3-thorchain.11.tgz#3adb61c57fccd50627438c559f80b9ea6628a561" - integrity sha512-D3XRt+0+Z8YJMTBoTDO2oDjmg0LQtvURd1p8tqGRVxxpoXQxPQg5LI0zq7bjFPF7FyaBaINF8lu8uaHrU+Aygw== - dependencies: - "@ledgerhq/hw-app-btc" "^10.0.8" - "@ledgerhq/hw-app-eth" "^6.9.0" - "@ledgerhq/hw-transport" "^6.7.0" - "@ledgerhq/hw-transport-webusb" "^6.7.0" - "@ledgerhq/live-common" "^21.8.2" - "@ledgerhq/logs" "^6.10.1" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-ledger" "^1.52.3-thorchain.11" - "@types/w3c-web-usb" "^1.0.4" - p-queue "^7.4.1" - -"@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.11": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger/-/hdwallet-ledger-1.52.3-thorchain.11.tgz#7a03688868f922c033a315fa9409ccfb9aecab40" - integrity sha512-KujW49hBSzM05g6nnJ7Oheiiro0R9f8+l5faj1pqZYs2bpZFgoqlKLGe1zkItp2YCuVIEeMtXHMmqGBJaMQmjw== - dependencies: - "@ethereumjs/common" "^2.4.0" - "@ethereumjs/tx" "^3.3.0" - "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@types/ripemd160" "^2.0.1" - base64-js "^1.5.1" - bchaddrjs "^0.4.4" - bitcoinjs-message "^2.0.0" - bs58check "2.1.2" - ethereumjs-tx "1.3.7" - ethereumjs-util "^6.1.0" - lodash "^4.17.21" - ripemd160 "^2.0.2" - -"@shapeshiftoss/hdwallet-metamask@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-metamask/-/hdwallet-metamask-1.52.3-thorchain.11.tgz#3bc519ebbe0285ba3d0076ae03dda7a71e096d47" - integrity sha512-FeS94nlj2oklOFGX0X1AykL2+bosVi8+3NvBkl+v8zjWluHkcEvXfXmj7Dao/AjAL00auOIJrsFLdKOZ7O2RaQ== - dependencies: - "@metamask/detect-provider" "^1.2.0" - "@metamask/onboarding" "^1.0.1" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - eth-rpc-errors "^4.0.3" - lodash "^4.17.21" - "@shapeshiftoss/hdwallet-native@^1.50.4": version "1.52.1" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.1.tgz#9a8144302f20069d145079154d3d9c56086178b4" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.1.tgz#9a8144302f20069d145079154d3d9c56086178b4" integrity sha512-TUemR4q0ISgPRvLkZQaK0iQ9t8ObhbGwGtOBmKzbSyJR10vVXbGxt5eIi+Gc19fSz7uyAQM2N3pIMFMsBasciw== dependencies: "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" @@ -5740,98 +5608,6 @@ tiny-secp256k1 "^1.1.6" web-encoding "^1.1.0" -"@shapeshiftoss/hdwallet-native@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.3-thorchain.11.tgz#e57ef8355715ab701a7c059d460f917d011af999" - integrity sha512-6BfKW9qCGyvTVBdVB6i+pMR00I8TcKRhobAqB6zcuX0jWIj25TYltvuDk2EB3YedH38d0ly9ZEEuteKL4WY6Cw== - dependencies: - "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" - "@shapeshiftoss/fiosdk" "1.2.1-shapeshift.6" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/proto-tx-builder" "^0.8.0" - "@zxing/text-encoding" "^0.9.0" - bchaddrjs "^0.4.9" - bech32 "^1.1.4" - bignumber.js "^9.0.1" - bip32 "^2.0.5" - bip39 "^3.0.2" - bnb-javascript-sdk-nobroadcast "^2.16.14" - crypto-js "^4.0.0" - eip-712 "^1.0.0" - ethers "5.7.2" - eventemitter2 "^5.0.1" - funtypes "^3.0.1" - lodash "^4.17.21" - node-fetch "^2.6.1" - p-lazy "^3.1.0" - scrypt-js "^3.0.1" - tendermint-tx-builder "^1.0.9" - tiny-secp256k1 "^1.1.6" - web-encoding "^1.1.0" - -"@shapeshiftoss/hdwallet-portis@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-portis/-/hdwallet-portis-1.52.3-thorchain.11.tgz#35b734a9fecb7121e4808c6f99e9a86862d13533" - integrity sha512-9LVYv6uZX6bgKED3YYF29YF+UTL4XhgI83SeveW/PknvYMrbvF0eSQjQDqydrYLNUaQ5bmjKoXi5Cl3o4XQTaQ== - dependencies: - "@portis/web3" "3.0.10" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - base64-js "^1.5.1" - bip32 "^2.0.4" - bitcoinjs-lib "^5.1.6" - bitcoinjs-message "^2.1.0" - lodash "^4.17.15" - p-lazy "^3.1.0" - web3 "^1.5.1" - -"@shapeshiftoss/hdwallet-tallyho@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-tallyho/-/hdwallet-tallyho-1.52.3-thorchain.11.tgz#faa3e2a7c6a81a9c8e0e3fa998d41fef58bdea9b" - integrity sha512-VgIDzgSxk8tRn7DSlSP/lUn7p074WjMrFfSsEj5jtuVh1rpLhCBH6sDgv34rUPHQ8m3VrXYjg3qUsDoau+Rltg== - dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - lodash "^4.17.21" - tallyho-onboarding "^1.0.2" - -"@shapeshiftoss/hdwallet-trezor-connect@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-trezor-connect/-/hdwallet-trezor-connect-1.52.3-thorchain.11.tgz#5d4ceb32201136dadc03b8320917d7a6aa488aca" - integrity sha512-fc3Ui4AFgHF6OdUynKsh4qg/sb8m9AnWz9VuY0qPseYtJhQCSt5WneluWXPWjTVNlDFkn7GqthyQAfTl0LLbYQ== - dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-trezor" "^1.52.3-thorchain.11" - "@trezor/rollout" "^1.2.0" - trezor-connect "^8.2.1" - -"@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.11": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-trezor/-/hdwallet-trezor-1.52.3-thorchain.11.tgz#87c17c63552e18c0299d75c20b6fe5e98a9b9083" - integrity sha512-7I4WWRc3hYCBUySll7Pokk0jnm8u/1yJaFhNabTYphnGPTI1fa4hj7dth22GAqvFYoSX+HlsqB1TJolmIAwv0g== - dependencies: - "@ethereumjs/common" "^2.4.0" - "@ethereumjs/tx" "^3.3.0" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - base64-js "^1.5.1" - lodash "^4.17.21" - -"@shapeshiftoss/hdwallet-walletconnect@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-walletconnect/-/hdwallet-walletconnect-1.52.3-thorchain.11.tgz#b75eee0e4ded2f3ead7bf7c8dc4805f143a0c087" - integrity sha512-//GZ3npcC4RsSiqgQ03jSNL7adKrlF8aBQ9UT3HWItw1+bNN3jB2npiQV7d6KIYqtt3zr1YWxCXp0yAkeBbPdw== - dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@walletconnect/qrcode-modal" "^1.7.8" - "@walletconnect/web3-provider" "^1.7.8" - ethers "^5.6.5" - -"@shapeshiftoss/hdwallet-xdefi@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-xdefi/-/hdwallet-xdefi-1.52.3-thorchain.11.tgz#9571a7747e21e6321add7815d8d147edb8b06cfc" - integrity sha512-ocbVY3TFfrgr35Kqa9UlhvOJhZ6YLnJmKJLIqOkF+GLs+eOxwagqDBIDxYgXNAbx36q2MVF4GS51URrn6LG0BA== - dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - lodash "^4.17.21" - "@shapeshiftoss/logger@^1.1.2", "@shapeshiftoss/logger@^1.1.3": version "1.1.3" resolved "https://registry.yarnpkg.com/@shapeshiftoss/logger/-/logger-1.1.3.tgz#ff05765775351c8adc99cf747f14b5619311e023" @@ -6698,7 +6474,7 @@ "@types/ripemd160@^2.0.1": version "2.0.1" - resolved "http://localhost:4873/@types/ripemd160/-/ripemd160-2.0.1.tgz#e9ea7a26adf0e2541917fc2b1ecb497e8ced4b7e" + resolved "https://registry.yarnpkg.com/@types/ripemd160/-/ripemd160-2.0.1.tgz#e9ea7a26adf0e2541917fc2b1ecb497e8ced4b7e" integrity sha512-l3pt9f8vK1tU2qBXY1aL7HofNnJKbpNa+2DznrD7j0lhaS4587e3iwgSMRDJFlidsrNjrrjIl8G+EeXFMjcGXg== dependencies: "@types/node" "*" From 2370153bf638f90646f404491fdb82e46b561de8 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 4 Oct 2023 08:37:14 +0100 Subject: [PATCH 040/108] feat: add missing scriptTypes in sandbox --- examples/sandbox/index.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/sandbox/index.ts b/examples/sandbox/index.ts index 9c0901f34..0ca96ac76 100644 --- a/examples/sandbox/index.ts +++ b/examples/sandbox/index.ts @@ -635,12 +635,14 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Bitcoin", + scriptType: core.BTCInputScriptType.SpendAddress, }, { addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 1], curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Bitcoin", + scriptType: core.BTCInputScriptType.SpendWitness, }, { addressNList: [0x80000000 + 49, 0x80000000 + 0, 0x80000000 + 0], @@ -656,6 +658,7 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Bitcoin Cash", + scriptType: core.BTCInputScriptType.SpendAddress, }, ]; const ltcGetPublicKeysInput = [ From da505f1ebddb3511e7533655147fd05816190628 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 5 Oct 2023 00:56:09 +0200 Subject: [PATCH 041/108] fix: ledger sandbox xpubs --- examples/sandbox/index.ts | 30 +++++++-------- packages/hdwallet-ledger/src/bitcoin.ts | 9 +++-- packages/hdwallet-ledger/src/utxoUtils.ts | 47 ++++++++++++++++++----- 3 files changed, 57 insertions(+), 29 deletions(-) diff --git a/examples/sandbox/index.ts b/examples/sandbox/index.ts index 0ca96ac76..e19c78df9 100644 --- a/examples/sandbox/index.ts +++ b/examples/sandbox/index.ts @@ -631,33 +631,30 @@ $getXpubs.each(function () { const btcGetPublicKeysInput = [ { - addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 0], - curve: "secp256k1", - showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Bitcoin", - scriptType: core.BTCInputScriptType.SpendAddress, - }, - { - addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 1], + addressNList: [2147483732, 2147483648, 2147483648], curve: "secp256k1", - showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it - coin: "Bitcoin", scriptType: core.BTCInputScriptType.SpendWitness, }, { - addressNList: [0x80000000 + 49, 0x80000000 + 0, 0x80000000 + 0], - curve: "secp256k1", - showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Bitcoin", + addressNList: [2147483697, 2147483648, 2147483648], + curve: "secp256k1", scriptType: core.BTCInputScriptType.SpendP2SHWitness, }, + { + coin: "Bitcoin", + addressNList: [2147483692, 2147483648, 2147483648], + curve: "secp256k1", + scriptType: core.BTCInputScriptType.SpendAddress, + }, ]; const bchGetPublicKeysInput = [ { addressNList: [0x80000000 + 44, 0x80000000 + 145, 0x80000000 + 0], curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it - coin: "Bitcoin Cash", + coin: "BitcoinCash", scriptType: core.BTCInputScriptType.SpendAddress, }, ]; @@ -668,7 +665,7 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Litecoin", - scriptType: "p2wpkh", + scriptType: core.BTCInputScriptType.SpendWitness, }, // SegwitP2sh { @@ -676,7 +673,7 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Litecoin", - scriptType: "p2sh-p2wpkh", + scriptType: core.BTCInputScriptType.SpendP2SHWitness, }, // P2Pksh { @@ -684,7 +681,7 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Litecoin", - scriptType: "p2pkh", + scriptType: core.BTCInputScriptType.SpendAddress, }, ]; const dogeGetPublicKeysInput = [ @@ -693,6 +690,7 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Dogecoin", + scriptType: core.BTCInputScriptType.SpendAddress, }, ]; const hardenedPathGetPublicKeysInput = [ diff --git a/packages/hdwallet-ledger/src/bitcoin.ts b/packages/hdwallet-ledger/src/bitcoin.ts index 73263259d..624e0a48a 100644 --- a/packages/hdwallet-ledger/src/bitcoin.ts +++ b/packages/hdwallet-ledger/src/bitcoin.ts @@ -72,9 +72,12 @@ export async function btcGetPublicKeys( const { payload: _xpub } = getWalletXpubResponse; - // Ledger returns LTC pubkeys in Ltub format for all scriptTypes. It *is* the correct account, but not in the format we want. - // We need to convert SegWit pubkeys to Mtubs, and SegWit native to zpubs. - const xpub = convertXpubVersion(_xpub, scriptTypeToAccountType[getPublicKey.scriptType]); + // Ledger returns + // - LTC pubkeys in Ltub format for all scriptTypes. + // - BTC pubkeys in xpub format for all scriptTypes + // They *are* the correct accounts, but not in the format we want. + // We need to convert SegWit pubkeys to Mtubs/xpubs, and SegWit native to zpubs. + const xpub = convertXpubVersion(_xpub, scriptTypeToAccountType[getPublicKey.scriptType], getPublicKey.coin); xpubs.push({ xpub, diff --git a/packages/hdwallet-ledger/src/utxoUtils.ts b/packages/hdwallet-ledger/src/utxoUtils.ts index f46e0430a..23689f632 100644 --- a/packages/hdwallet-ledger/src/utxoUtils.ts +++ b/packages/hdwallet-ledger/src/utxoUtils.ts @@ -172,14 +172,38 @@ enum PublicKeyType { Mtub = "01b26ef6", } -const accountTypeToVersion = { - [UtxoAccountType.P2pkh]: Buffer.from(PublicKeyType.Ltub, "hex"), // no-op - [UtxoAccountType.SegwitP2sh]: Buffer.from(PublicKeyType.Mtub, "hex"), // LTub to Mtub - [UtxoAccountType.SegwitNative]: Buffer.from(PublicKeyType.zpub, "hex"), // Ltub to zpub -}; +const accountTypeToVersion = (() => { + const Litecoin = { + [UtxoAccountType.P2pkh]: Buffer.from(PublicKeyType.Ltub, "hex"), + [UtxoAccountType.SegwitP2sh]: Buffer.from(PublicKeyType.Mtub, "hex"), + [UtxoAccountType.SegwitNative]: Buffer.from(PublicKeyType.zpub, "hex"), + }; + + const Dogecoin = { + [UtxoAccountType.P2pkh]: Buffer.from(PublicKeyType.dgub, "hex"), + }; + const Bitcoin = { + [UtxoAccountType.P2pkh]: Buffer.from(PublicKeyType.xpub, "hex"), + [UtxoAccountType.SegwitP2sh]: Buffer.from(PublicKeyType.ypub, "hex"), + [UtxoAccountType.SegwitNative]: Buffer.from(PublicKeyType.zpub, "hex"), + }; -// We already get accounts in the format we want from Ledger - except LiteCoin SegWit/Native -const convertVersions = ["Ltub"]; + return (coin: string, type: UtxoAccountType) => { + switch (coin) { + case "Litecoin": + return Litecoin[type]; + case "Bitcoin": + return Bitcoin[type]; + case "Dogecoin": + if (type !== UtxoAccountType.P2pkh) throw new Error("Unsupported account type"); + return Dogecoin[type]; + default: + return Bitcoin[type]; // xpub, ypub, zpub + } + }; +})(); +// Legacy accounts should be left as-is +const convertVersions = ["Ltub", "xpub", "dgub"]; /** * Convert any public key into an xpub, ypub, or zpub based on account type @@ -190,8 +214,9 @@ const convertVersions = ["Ltub"]; * USE SPARINGLY - there aren't many cases where we should convert version bytes * @param {string} xpub - the public key provided by the wallet * @param {UtxoAccountType} accountType - The desired account type to be encoded into the public key + * @param {string} coin - The coin type, which will determine what version we derive */ -export function convertXpubVersion(xpub: string, accountType: UtxoAccountType | undefined) { +export function convertXpubVersion(xpub: string, accountType: UtxoAccountType | undefined, coin: string) { if (!accountType) return xpub; if (!convertVersions.includes(xpub.substring(0, 4))) { return xpub; @@ -199,10 +224,12 @@ export function convertXpubVersion(xpub: string, accountType: UtxoAccountType | const payload = decode(xpub); const version = payload.slice(0, 4); - if (version.compare(accountTypeToVersion[accountType]) !== 0) { + const desiredVersion = accountTypeToVersion(coin, accountType); + // eslint-disable-next-line no-console + if (version.compare(desiredVersion) !== 0) { // Get the key without the version code at the front const key = payload.slice(4); - return encode(Buffer.concat([accountTypeToVersion[accountType], key])); + return encode(Buffer.concat([desiredVersion, key])); } return xpub; } From 9542696a6d024ccc7bf1c49311e4ee5eceb544c1 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 5 Oct 2023 00:59:15 +0200 Subject: [PATCH 042/108] feat: improve commentary --- packages/hdwallet-ledger/src/bitcoin.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/bitcoin.ts b/packages/hdwallet-ledger/src/bitcoin.ts index 624e0a48a..a71841a1c 100644 --- a/packages/hdwallet-ledger/src/bitcoin.ts +++ b/packages/hdwallet-ledger/src/bitcoin.ts @@ -75,8 +75,9 @@ export async function btcGetPublicKeys( // Ledger returns // - LTC pubkeys in Ltub format for all scriptTypes. // - BTC pubkeys in xpub format for all scriptTypes + // - Doge pubkeys in xpub format instead of dgub // They *are* the correct accounts, but not in the format we want. - // We need to convert SegWit pubkeys to Mtubs/xpubs, and SegWit native to zpubs. + // We need to convert SegWit pubkeys to Mtubs/ypubs, and SegWit native to zpubs, and Doge xpubs to dgubs. const xpub = convertXpubVersion(_xpub, scriptTypeToAccountType[getPublicKey.scriptType], getPublicKey.coin); xpubs.push({ From d3d89fc73fe0ee5aa467024782bfb98070f82a3a Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Fri, 29 Sep 2023 16:41:46 +0200 Subject: [PATCH 043/108] feat: ledger BCH Cash address format --- packages/hdwallet-ledger/src/bitcoin.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/bitcoin.ts b/packages/hdwallet-ledger/src/bitcoin.ts index 28bc0a245..73263259d 100644 --- a/packages/hdwallet-ledger/src/bitcoin.ts +++ b/packages/hdwallet-ledger/src/bitcoin.ts @@ -45,7 +45,8 @@ export async function btcGetAddress(transport: LedgerTransport, msg: core.BTCGet const res = await transport.call("Btc", "getWalletPublicKey", bip32path, opts); handleError(res, transport, "Unable to obtain BTC address from device"); - return res.payload.bitcoinAddress; + const address = res.payload.bitcoinAddress; + return msg.coin.toLowerCase() === "bitcoincash" ? bchAddr.toCashAddress(address) : address; } // Adapted from https://github.com/LedgerHQ/ledger-wallet-webtool From d407ded5c2a54869797071157dc9d54660c805bc Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 5 Oct 2023 00:59:49 +0200 Subject: [PATCH 044/108] feat: cleanup --- packages/hdwallet-ledger/src/utxoUtils.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/utxoUtils.ts b/packages/hdwallet-ledger/src/utxoUtils.ts index 23689f632..c6fa7063f 100644 --- a/packages/hdwallet-ledger/src/utxoUtils.ts +++ b/packages/hdwallet-ledger/src/utxoUtils.ts @@ -225,7 +225,6 @@ export function convertXpubVersion(xpub: string, accountType: UtxoAccountType | const payload = decode(xpub); const version = payload.slice(0, 4); const desiredVersion = accountTypeToVersion(coin, accountType); - // eslint-disable-next-line no-console if (version.compare(desiredVersion) !== 0) { // Get the key without the version code at the front const key = payload.slice(4); From 15bfadfa4dfc267996a63b45bac19398fd9ff232 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 22:10:12 +0200 Subject: [PATCH 045/108] chore(release): publish 1.52.3 --- examples/sandbox/package.json | 32 +++++++++---------- integration/package.json | 20 ++++++------ lerna.json | 2 +- packages/hdwallet-coinbase/package.json | 4 +-- packages/hdwallet-core/package.json | 2 +- .../hdwallet-keepkey-chromeusb/package.json | 6 ++-- .../hdwallet-keepkey-electron/package.json | 4 +-- .../hdwallet-keepkey-nodehid/package.json | 4 +-- .../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-keplr/package.json | 4 +-- packages/hdwallet-ledger-webhid/package.json | 6 ++-- packages/hdwallet-ledger-webusb/package.json | 6 ++-- packages/hdwallet-ledger/package.json | 4 +-- .../package.json | 4 +-- packages/hdwallet-metamask/package.json | 4 +-- packages/hdwallet-native-vault/package.json | 4 +-- packages/hdwallet-native/package.json | 4 +-- packages/hdwallet-portis/package.json | 4 +-- packages/hdwallet-tallyho/package.json | 4 +-- packages/hdwallet-trezor-connect/package.json | 6 ++-- packages/hdwallet-trezor/package.json | 4 +-- packages/hdwallet-walletconnect/package.json | 4 +-- .../hdwallet-walletconnectV2/package.json | 4 +-- packages/hdwallet-xdefi/package.json | 4 +-- 27 files changed, 81 insertions(+), 81 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 851be8376..1eaf137f9 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.2", - "@shapeshiftoss/hdwallet-keplr": "1.52.2", - "@shapeshiftoss/hdwallet-ledger": "1.52.2", - "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.2", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.2", - "@shapeshiftoss/hdwallet-metamask": "1.52.2", - "@shapeshiftoss/hdwallet-native": "1.52.2", - "@shapeshiftoss/hdwallet-portis": "1.52.2", - "@shapeshiftoss/hdwallet-tallyho": "1.52.2", - "@shapeshiftoss/hdwallet-trezor": "1.52.2", - "@shapeshiftoss/hdwallet-trezor-connect": "1.52.2", - "@shapeshiftoss/hdwallet-walletconnect": "1.52.2", - "@shapeshiftoss/hdwallet-xdefi": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.3", + "@shapeshiftoss/hdwallet-keplr": "1.52.3", + "@shapeshiftoss/hdwallet-ledger": "1.52.3", + "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.3", + "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.3", + "@shapeshiftoss/hdwallet-metamask": "1.52.3", + "@shapeshiftoss/hdwallet-native": "1.52.3", + "@shapeshiftoss/hdwallet-portis": "1.52.3", + "@shapeshiftoss/hdwallet-tallyho": "1.52.3", + "@shapeshiftoss/hdwallet-trezor": "1.52.3", + "@shapeshiftoss/hdwallet-trezor-connect": "1.52.3", + "@shapeshiftoss/hdwallet-walletconnect": "1.52.3", + "@shapeshiftoss/hdwallet-xdefi": "1.52.3", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index eca70978d..485ea2048 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.2", + "version": "1.52.3", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.2", - "@shapeshiftoss/hdwallet-ledger": "1.52.2", - "@shapeshiftoss/hdwallet-native": "1.52.2", - "@shapeshiftoss/hdwallet-portis": "1.52.2", - "@shapeshiftoss/hdwallet-trezor": "1.52.2", - "@shapeshiftoss/hdwallet-xdefi": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.3", + "@shapeshiftoss/hdwallet-ledger": "1.52.3", + "@shapeshiftoss/hdwallet-native": "1.52.3", + "@shapeshiftoss/hdwallet-portis": "1.52.3", + "@shapeshiftoss/hdwallet-trezor": "1.52.3", + "@shapeshiftoss/hdwallet-xdefi": "1.52.3", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index bf0d360cc..9f9579f0c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.2", + "version": "1.52.3", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index c423007ee..b8f1dafd4 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json index b8cdddd4a..9bbed2772 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index e2d2fbe30..f2fdc6b02 100644 --- a/packages/hdwallet-keepkey-chromeusb/package.json +++ b/packages/hdwallet-keepkey-chromeusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-chromeusb", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey": "1.52.2" + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3" } } diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index 7096678eb..b63489f80 100644 --- a/packages/hdwallet-keepkey-electron/package.json +++ b/packages/hdwallet-keepkey-electron/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-electron", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.2", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index 552dfa281..da40891f1 100644 --- a/packages/hdwallet-keepkey-nodehid/package.json +++ b/packages/hdwallet-keepkey-nodehid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodehid", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.2" + "@shapeshiftoss/hdwallet-keepkey": "1.52.3" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index f286b37d5..6bf556d75 100644 --- a/packages/hdwallet-keepkey-nodewebusb/package.json +++ b/packages/hdwallet-keepkey-nodewebusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey": "1.52.2" + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index 586b21e4d..d4be0a5d8 100644 --- a/packages/hdwallet-keepkey-tcp/package.json +++ b/packages/hdwallet-keepkey-tcp/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-tcp", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3", "axios": "^0.21.1" } } diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index 8cec4c177..c75d5a98b 100644 --- a/packages/hdwallet-keepkey-webusb/package.json +++ b/packages/hdwallet-keepkey-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-webusb", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey": "1.52.2" + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4" diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index de940cd53..e0d71737c 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^3.3.0", "@keepkey/device-protocol": "^7.12.2", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "bignumber.js": "^9.0.1", "bnb-javascript-sdk-nobroadcast": "^2.16.14", diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json index 8e1f436c1..906c72fe8 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/caip": "8.15.0", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@shapeshiftoss/types": "3.1.3", "base64-js": "^1.5.1", diff --git a/packages/hdwallet-ledger-webhid/package.json b/packages/hdwallet-ledger-webhid/package.json index 086931b23..5c4e08268 100644 --- a/packages/hdwallet-ledger-webhid/package.json +++ b/packages/hdwallet-ledger-webhid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webhid", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -19,8 +19,8 @@ "@ledgerhq/hw-transport": "^6.7.0", "@ledgerhq/hw-transport-webhid": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-ledger": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-ledger": "1.52.3", "@types/w3c-web-hid": "^1.0.2" }, "devDependencies": { diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index 727b132ec..d2dc648bf 100644 --- a/packages/hdwallet-ledger-webusb/package.json +++ b/packages/hdwallet-ledger-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webusb", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -20,8 +20,8 @@ "@ledgerhq/hw-transport-webusb": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", "@ledgerhq/logs": "^6.10.1", - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-ledger": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-ledger": "1.52.3", "@types/w3c-web-usb": "^1.0.4", "p-queue": "^7.4.1" }, diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index 2444e6bde..bdce74b92 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -18,7 +18,7 @@ "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", "bitcoinjs-message": "^2.0.0", diff --git a/packages/hdwallet-metamask-shapeshift-multichain/package.json b/packages/hdwallet-metamask-shapeshift-multichain/package.json index dc6e85bba..e70d62c8f 100644 --- a/packages/hdwallet-metamask-shapeshift-multichain/package.json +++ b/packages/hdwallet-metamask-shapeshift-multichain/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-shapeshift-multichain", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", "@shapeshiftoss/common-api": "^9.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@shapeshiftoss/metamask-snaps-adapter": "^1.0.8", "@shapeshiftoss/metamask-snaps-types": "^1.0.8", "eth-rpc-errors": "^4.0.3", diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index b087e3171..a3c4c81b6 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index 98683aee4..e4c9f5314 100644 --- a/packages/hdwallet-native-vault/package.json +++ b/packages/hdwallet-native-vault/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native-vault", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-native": "1.52.2", + "@shapeshiftoss/hdwallet-native": "1.52.3", "bip39": "^3.0.4", "hash-wasm": "^4.9.0", "idb-keyval": "^6.0.3", diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index f0afad1a6..44655010b 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", "@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index a05b5b7b4..6d55d31ca 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@portis/web3": "3.0.10", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index 87b9784b6..e688dc75b 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-tallyho", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "lodash": "^4.17.21", "tallyho-onboarding": "^1.0.2" }, diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index a1e5713a5..8196d257c 100644 --- a/packages/hdwallet-trezor-connect/package.json +++ b/packages/hdwallet-trezor-connect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor-connect", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-trezor": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-trezor": "1.52.3", "@trezor/rollout": "^1.2.0", "trezor-connect": "^8.2.1" } diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index 21a948eef..795a537a5 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "base64-js": "^1.5.1", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index fc1e114f6..8101de3f3 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@walletconnect/qrcode-modal": "^1.7.8", "@walletconnect/web3-provider": "^1.7.8", "ethers": "^5.6.5" diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index f1b1097ec..ff4681cca 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@walletconnect/ethereum-provider": "^2.10.1", "@walletconnect/modal": "^2.6.2", "ethers": "^5.6.5" diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index f4a6f6b75..1d2c43eb9 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-xdefi", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "lodash": "^4.17.21" }, "devDependencies": { From a5f1ecdf9b016f950edc2ee5c1a9b9fbbca262b0 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 13:07:29 +0200 Subject: [PATCH 046/108] feat: pass null resolution to ledger eth.signTransaction --- packages/hdwallet-ledger/src/ethereum.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/ethereum.ts b/packages/hdwallet-ledger/src/ethereum.ts index 5d2dc0045..7bedded40 100644 --- a/packages/hdwallet-ledger/src/ethereum.ts +++ b/packages/hdwallet-ledger/src/ethereum.ts @@ -96,7 +96,10 @@ export async function ethSignTx(transport: LedgerTransport, msg: core.ETHSignTx) const utx = new EthereumTx(txParams); - const res = await transport.call("Eth", "signTransaction", bip32path, utx.serialize().toString("hex")); + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore transport.call is drunk, there *is* a third argument to eth.signTransaction + // see https://github.com/LedgerHQ/ledgerjs/blob/master/packages/hw-app-eth/README.md#parameters-2 + const res = await transport.call("Eth", "signTransaction", bip32path, utx.serialize().toString("hex"), null); handleError(res, transport, "Could not sign ETH tx with Ledger"); const { v, r, s } = res.payload; From 3f74948a511e57b979869d10c357db128ca4abd7 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 13:09:45 +0200 Subject: [PATCH 047/108] feat: bump --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 1eaf137f9..9d8eef96b 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3", + "version": "1.52.3-ledger-improvements.1", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 485ea2048..8666e5e31 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3", + "version": "1.52.3-ledger-improvements.1", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index 9f9579f0c..fd89ebd3e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3", + "version": "1.52.3-ledger-improvements.1", "npmClient": "yarn", "useWorkspaces": true, "command": { From b9a07c67c13c91352ce4d61faa0c09f407295cc5 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 13:19:30 +0200 Subject: [PATCH 048/108] feat: reboimp --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 9d8eef96b..940cbeee3 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-ledger-improvements.1", + "version": "1.52.3-ledger-improvements.2", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 8666e5e31..245faf344 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-ledger-improvements.1", + "version": "1.52.3-ledger-improvements.2", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index fd89ebd3e..7347e0927 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-ledger-improvements.1", + "version": "1.52.3-ledger-improvements.2", "npmClient": "yarn", "useWorkspaces": true, "command": { From 6794e40064de4877dbfbb7fee15d1da632b8c259 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 12 Oct 2023 10:23:39 +0200 Subject: [PATCH 049/108] fix: ethSignMessage strip 0x prefix --- packages/hdwallet-ledger/src/ethereum.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/ethereum.ts b/packages/hdwallet-ledger/src/ethereum.ts index 7bedded40..314c02bfa 100644 --- a/packages/hdwallet-ledger/src/ethereum.ts +++ b/packages/hdwallet-ledger/src/ethereum.ts @@ -160,7 +160,12 @@ export async function ethSignMessage( const bip32path = core.addressNListToBIP32(msg.addressNList); if (!isHexString(msg.message)) throw new Error("data is not an hex string"); - const res = await transport.call("Eth", "signPersonalMessage", bip32path, msg.message); + + // Ledger's inner implementation does a Buffer.from(messageHex, "hex").length on our message + // However, Buffer.from method with the "hex" encoding expects a valid hexadecimal string without the 0x prefix + // so we need to strip it in case it's present + const sanitizedMessageHex = msg.message.startsWith("0x") ? msg.message.slice(2) : msg.message; + const res = await transport.call("Eth", "signPersonalMessage", bip32path, sanitizedMessageHex); handleError(res, transport, "Could not sign ETH message with Ledger"); let { v } = res.payload; From 0ec69043a9fe01aece341d8334a19cca19fa3904 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 12 Oct 2023 10:54:21 +0200 Subject: [PATCH 050/108] feat: boimp --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 940cbeee3..9c8cf11eb 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-ledger-improvements.2", + "version": "1.53.3-ledger-improvements.3", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 245faf344..7f0156a98 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-ledger-improvements.2", + "version": "1.53.3-ledger-improvements.3", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index 7347e0927..e8ca7dba7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-ledger-improvements.2", + "version": "1.53.3-ledger-improvements.3", "npmClient": "yarn", "useWorkspaces": true, "command": { From 30553d941fee0e9c59bcb2262d0edfd50851e798 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 12 Oct 2023 10:59:08 +0200 Subject: [PATCH 051/108] feat: boimp --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 9c8cf11eb..86ab83d07 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.53.3-ledger-improvements.3", + "version": "1.53.3-ledger-improvements.4", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 7f0156a98..b2b4ae4e5 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.53.3-ledger-improvements.3", + "version": "1.53.3-ledger-improvements.4", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index e8ca7dba7..0e71a7243 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.53.3-ledger-improvements.3", + "version": "1.53.3-ledger-improvements.4", "npmClient": "yarn", "useWorkspaces": true, "command": { From fc26ce4b910a7eeb2a03093557786e4d71536111 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:08:31 +0200 Subject: [PATCH 052/108] feat: ledger thorchain support --- .../hdwallet-ledger-webusb/src/transport.ts | 7 + packages/hdwallet-ledger/package.json | 4 +- packages/hdwallet-ledger/src/index.ts | 1 + packages/hdwallet-ledger/src/ledger.ts | 6 + .../hdwallet-ledger/src/thorchain/common.ts | 113 ++++++ .../hdwallet-ledger/src/thorchain/helpers.ts | 68 ++++ .../src/thorchain/hw-app-thor.ts | 331 ++++++++++++++++++ .../hdwallet-ledger/src/thorchain/index.ts | 26 ++ packages/hdwallet-ledger/src/transport.ts | 2 +- yarn.lock | 7 + 10 files changed, 563 insertions(+), 2 deletions(-) create mode 100644 packages/hdwallet-ledger/src/thorchain/common.ts create mode 100644 packages/hdwallet-ledger/src/thorchain/helpers.ts create mode 100644 packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts create mode 100644 packages/hdwallet-ledger/src/thorchain/index.ts diff --git a/packages/hdwallet-ledger-webusb/src/transport.ts b/packages/hdwallet-ledger-webusb/src/transport.ts index 52623993a..d41e8cb34 100644 --- a/packages/hdwallet-ledger-webusb/src/transport.ts +++ b/packages/hdwallet-ledger-webusb/src/transport.ts @@ -79,6 +79,13 @@ export async function translateCoinAndMethod> { switch (coin) { + case "Rune": { + const thor = new ledger.THORChainApp({ transport }); + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore TODO(gomes): fixme + const methodInstance = thor[method as LedgerTransportMethodName<"Rune">].bind(thor); + return methodInstance as LedgerTransportMethod; + } case "Btc": { const btc = new Btc({ transport }); const methodInstance = btc[method as LedgerTransportMethodName<"Btc">].bind(btc); diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index bdce74b92..e93a9c5cb 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -25,7 +25,9 @@ "bs58check": "2.1.2", "ethereumjs-tx": "1.3.7", "ethereumjs-util": "^6.1.0", - "lodash": "^4.17.21" + "lodash": "^4.17.21", + "ripemd160": "^2.0.2", + "@types/ripemd160": "^2.0.1" }, "devDependencies": { "@ledgerhq/hw-app-btc": "^10.0.8", diff --git a/packages/hdwallet-ledger/src/index.ts b/packages/hdwallet-ledger/src/index.ts index c73f59c8c..063c34f8e 100644 --- a/packages/hdwallet-ledger/src/index.ts +++ b/packages/hdwallet-ledger/src/index.ts @@ -1,5 +1,6 @@ export * from "./bitcoin"; export * from "./ethereum"; +export * from "./thorchain"; export * from "./ledger"; export * from "./transport"; export * from "./utils"; diff --git a/packages/hdwallet-ledger/src/ledger.ts b/packages/hdwallet-ledger/src/ledger.ts index 5a79bd54c..de357b002 100644 --- a/packages/hdwallet-ledger/src/ledger.ts +++ b/packages/hdwallet-ledger/src/ledger.ts @@ -3,6 +3,7 @@ import _ from "lodash"; import * as btc from "./bitcoin"; import * as eth from "./ethereum"; +import * as thorchain from "./thorchain"; import { LedgerTransport } from "./transport"; import { coinToLedgerAppName, handleError } from "./utils"; @@ -302,6 +303,8 @@ export class LedgerHDWallet implements core.HDWallet, core.BTCWallet, core.ETHWa readonly _supportsPolygon = true; readonly _supportsGnosis = true; readonly _supportsArbitrum = true; + readonly _supportsThorchainInfo = true; + readonly _supportsThorchain = true; _isLedger = true; @@ -509,6 +512,9 @@ export class LedgerHDWallet implements core.HDWallet, core.BTCWallet, core.ETHWa await this.validateCurrentApp(msg.coin); return btc.btcGetAddress(this.transport, msg); } + public thorchainGetAddress(msg: core.ThorchainGetAddress): Promise { + return thorchain.thorchainGetAddress(this.transport, msg); + } public async btcSignTx(msg: core.BTCSignTxLedger): Promise { await this.validateCurrentApp(msg.coin); diff --git a/packages/hdwallet-ledger/src/thorchain/common.ts b/packages/hdwallet-ledger/src/thorchain/common.ts new file mode 100644 index 000000000..0f6cb4f5a --- /dev/null +++ b/packages/hdwallet-ledger/src/thorchain/common.ts @@ -0,0 +1,113 @@ +export enum ErrorCode { + NoError = 0x9000, +} + +export const CLA = 0x55; +export const CHUNK_SIZE = 250; +export const APP_KEY = "CSM"; + +export const INS = { + GET_VERSION: 0x00, + INS_PUBLIC_KEY_SECP256K1: 0x01, // Obsolete + SIGN_SECP256K1: 0x02, + GET_ADDR_SECP256K1: 0x04, +}; + +export const PAYLOAD_TYPE = { + INIT: 0x00, + ADD: 0x01, + LAST: 0x02, +}; + +export const P1_VALUES = { + ONLY_RETRIEVE: 0x00, + SHOW_ADDRESS_IN_DEVICE: 0x01, +}; + +const ERROR_DESCRIPTION = { + 1: "U2F: Unknown", + 2: "U2F: Bad request", + 3: "U2F: Configuration unsupported", + 4: "U2F: Device Ineligible", + 5: "U2F: Timeout", + 14: "Timeout", + 0x9000: "No errors", + 0x9001: "Device is busy", + 0x6802: "Error deriving keys", + 0x6400: "Execution Error", + 0x6700: "Wrong Length", + 0x6982: "Empty Buffer", + 0x6983: "Output buffer too small", + 0x6984: "Data is invalid", + 0x6985: "Conditions not satisfied", + 0x6986: "Transaction rejected", + 0x6a80: "Bad key handle", + 0x6b00: "Invalid P1/P2", + 0x6d00: "Instruction not supported", + 0x6e00: "App does not seem to be open", + 0x6f00: "Unknown error", + 0x6f01: "Sign/verify error", +}; + +export function errorCodeToString(statusCode: any) { + if (statusCode in ERROR_DESCRIPTION) return ERROR_DESCRIPTION[statusCode as 1]; + return `Unknown Status Code: ${statusCode}`; +} + +export function processErrorResponse(response: any) { + if (response) { + if ( + typeof response === "object" && + response !== null && + !(response instanceof Array) && + !(response instanceof Date) + ) { + if (Object.prototype.hasOwnProperty.call(response, "statusCode")) { + return { + return_code: response.statusCode, + error_message: errorCodeToString(response.statusCode), + }; + } + + if ( + Object.prototype.hasOwnProperty.call(response, "return_code") && + Object.prototype.hasOwnProperty.call(response, "error_message") + ) { + return response; + } + } + return { + return_code: 0xffff, + error_message: response.toString(), + }; + } + + return { + return_code: 0xffff, + error_message: response.toString(), + }; +} + +export async function getVersion(transport: any) { + return transport.send(CLA, INS.GET_VERSION, 0, 0).then((response: any) => { + const errorCodeData = response.slice(-2); + const returnCode = errorCodeData[0] * 256 + errorCodeData[1]; + + let targetId = 0; + if (response.length >= 9) { + targetId = (response[5] << 24) + (response[6] << 16) + (response[7] << 8) + (response[8] << 0); + } + + return { + return_code: returnCode, + error_message: errorCodeToString(returnCode), + // /// + test_mode: response[0] !== 0, + major: response[1], + minor: response[2], + patch: response[3], + device_locked: response[4] === 1, + target_id: targetId.toString(16), + }; + }, processErrorResponse); +} diff --git a/packages/hdwallet-ledger/src/thorchain/helpers.ts b/packages/hdwallet-ledger/src/thorchain/helpers.ts new file mode 100644 index 000000000..81dca3828 --- /dev/null +++ b/packages/hdwallet-ledger/src/thorchain/helpers.ts @@ -0,0 +1,68 @@ +import { CLA, ErrorCode, errorCodeToString, INS, PAYLOAD_TYPE, processErrorResponse } from "./common"; + +const signSendChunkv1 = async (app: any, chunkIdx: any, chunkNum: any, chunk: any) => { + return app.transport + .send(CLA, INS.SIGN_SECP256K1, chunkIdx, chunkNum, chunk, [ErrorCode.NoError, 0x6984, 0x6a80]) + .then((response: any) => { + const errorCodeData = response.slice(-2); + const returnCode = errorCodeData[0] * 256 + errorCodeData[1]; + let errorMessage = errorCodeToString(returnCode); + + if (returnCode === 0x6a80 || returnCode === 0x6984) { + errorMessage = `${errorMessage} : ${response.slice(0, response.length - 2).toString("ascii")}`; + } + + let signature = null; + if (response.length > 2) { + signature = response.slice(0, response.length - 2); + } + + return { + signature, + return_code: returnCode, + error_message: errorMessage, + }; + }, processErrorResponse); +}; + +export const serializePathv2 = (path: any) => { + if (!path || path.length !== 5) { + throw new Error("Invalid path."); + } + + const buf = Buffer.alloc(20); + buf.writeUInt32LE(0x80000000 + path[0], 0); + buf.writeUInt32LE(0x80000000 + path[1], 4); + buf.writeUInt32LE(0x80000000 + path[2], 8); + buf.writeUInt32LE(path[3], 12); + buf.writeUInt32LE(path[4], 16); + + return buf; +}; + +export const signSendChunkv2 = async (app: any, chunkIdx: any, chunkNum: any, chunk: any) => { + let payloadType = PAYLOAD_TYPE.ADD; + if (chunkIdx === 1) { + payloadType = PAYLOAD_TYPE.INIT; + } + if (chunkIdx === chunkNum) { + payloadType = PAYLOAD_TYPE.LAST; + } + + return signSendChunkv1(app, payloadType, 0, chunk); +}; + +export const publicKeyv2 = async (app: any, data: any) => { + return app.transport.send(CLA, INS.GET_ADDR_SECP256K1, 0, 0, data, [ErrorCode.NoError]).then((response: any) => { + const errorCodeData = response.slice(-2); + const returnCode = errorCodeData[0] * 256 + errorCodeData[1]; + const compressedPk = Buffer.from(response.slice(0, 33)); + + return { + pk: "OBSOLETE PROPERTY", + compressed_pk: compressedPk, + return_code: returnCode, + error_message: errorCodeToString(returnCode), + }; + }, processErrorResponse); +}; diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts new file mode 100644 index 000000000..18b20982b --- /dev/null +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -0,0 +1,331 @@ +/** ****************************************************************************** + * (c) 2019 ZondaX GmbH + * (c) 2016-2017 Ledger + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ******************************************************************************* */ +import { bech32 } from "@scure/base"; +import crypto from "crypto"; +import Ripemd160 from "ripemd160"; + +import { + APP_KEY, + CHUNK_SIZE, + CLA, + ErrorCode, + errorCodeToString, + getVersion, + INS, + P1_VALUES, + processErrorResponse, +} from "./common"; +import { publicKeyv2, serializePathv2, signSendChunkv2 } from "./helpers"; + +class THORChainApp { + transport: any; + versionResponse: any; + + constructor(transport: any, scrambleKey = APP_KEY) { + if (!transport) { + throw new Error("Transport has not been defined"); + } + + this.transport = transport as any; + transport.decorateAppAPIMethods( + this, + ["getVersion", "sign", "getAddressAndPubKey", "appInfo", "deviceInfo", "getBech32FromPK"], + scrambleKey + ); + } + + static serializeHRP(hrp: any) { + if (hrp == null || hrp.length < 3 || hrp.length > 83) { + throw new Error("Invalid HRP"); + } + const buf = Buffer.alloc(1 + hrp.length); + buf.writeUInt8(hrp.length, 0); + buf.write(hrp, 1); + return buf; + } + + static getBech32FromPK(hrp: any, pk: any) { + if (pk.length !== 33) { + throw new Error("expected compressed public key [31 bytes]"); + } + const hashSha256 = crypto.createHash("sha256").update(pk).digest(); + const hashRip = new Ripemd160().update(hashSha256).digest(); + // ts is drunk and doesn't like bech32.bech32 here + const encode = bech32.encode || (bech32 as any).bech32?.encode; + // ts is drunk and doesn't like bech32.bech32 here + const toWords = bech32.toWords || (bech32 as any).bech32?.toWords; + + return encode(hrp, toWords(hashRip)); + } + + async serializePath(path: string) { + this.versionResponse = await getVersion(this.transport); + + if (this.versionResponse.return_code !== ErrorCode.NoError) { + throw this.versionResponse; + } + + switch (this.versionResponse.major) { + case 2: + return serializePathv2(path); + default: + return { + return_code: 0x6400, + error_message: "App Version is not supported", + }; + } + } + + async signGetChunks(path: string, message: any) { + const serializedPath = await this.serializePath(path); + + const chunks = []; + chunks.push(serializedPath); + const buffer = Buffer.from(message); + + for (let i = 0; i < buffer.length; i += CHUNK_SIZE) { + let end = i + CHUNK_SIZE; + if (i > buffer.length) { + end = buffer.length; + } + chunks.push(buffer.slice(i, end)); + } + + return chunks; + } + + async getVersion() { + try { + this.versionResponse = await getVersion(this.transport); + return this.versionResponse; + } catch (e) { + return processErrorResponse(e); + } + } + + async appInfo() { + return this.transport.send(0xb0, 0x01, 0, 0).then((response: any) => { + const errorCodeData = response.slice(-2); + const returnCode = errorCodeData[0] * 256 + errorCodeData[1]; + + const result = {} as any; + + let appName = "err"; + let appVersion = "err"; + let flagLen = 0; + let flagsValue = 0; + + if (response[0] !== 1) { + // Ledger responds with format ID 1. There is no spec for any format != 1 + result.error_message = "response format ID not recognized"; + result.return_code = 0x9001; + } else { + const appNameLen = response[1]; + appName = response.slice(2, 2 + appNameLen).toString("ascii"); + let idx = 2 + appNameLen; + const appVersionLen = response[idx]; + idx += 1; + appVersion = response.slice(idx, idx + appVersionLen).toString("ascii"); + idx += appVersionLen; + const appFlagsLen = response[idx]; + idx += 1; + flagLen = appFlagsLen; + flagsValue = response[idx]; + } + + return { + return_code: returnCode, + error_message: errorCodeToString(returnCode), + // // + appName, + appVersion, + flagLen, + flagsValue, + + flag_recovery: (flagsValue & 1) !== 0, + + flag_signed_mcu_code: (flagsValue & 2) !== 0, + + flag_onboarded: (flagsValue & 4) !== 0, + + flag_pin_validated: (flagsValue & 128) !== 0, + }; + }, processErrorResponse); + } + + async deviceInfo() { + return this.transport.send(0xe0, 0x01, 0, 0, Buffer.from([]), [ErrorCode.NoError, 0x6e00]).then((response: any) => { + const errorCodeData = response.slice(-2); + const returnCode = errorCodeData[0] * 256 + errorCodeData[1]; + + if (returnCode === 0x6e00) { + return { + return_code: returnCode, + error_message: "This command is only available in the Dashboard", + }; + } + + const targetId = response.slice(0, 4).toString("hex"); + + let pos = 4; + const secureElementVersionLen = response[pos]; + pos += 1; + const seVersion = response.slice(pos, pos + secureElementVersionLen).toString(); + pos += secureElementVersionLen; + + const flagsLen = response[pos]; + pos += 1; + const flag = response.slice(pos, pos + flagsLen).toString("hex"); + pos += flagsLen; + + const mcuVersionLen = response[pos]; + pos += 1; + // Patch issue in mcu version + let tmp = response.slice(pos, pos + mcuVersionLen); + if (tmp[mcuVersionLen - 1] === 0) { + tmp = response.slice(pos, pos + mcuVersionLen - 1); + } + const mcuVersion = tmp.toString(); + + return { + return_code: returnCode, + error_message: errorCodeToString(returnCode), + // // + targetId, + seVersion, + flag, + mcuVersion, + }; + }, processErrorResponse); + } + + async publicKey(path: string) { + try { + const serializedPath = await this.serializePath(path); + + switch (this.versionResponse.major) { + case 2: { + const data = Buffer.concat([THORChainApp.serializeHRP("thor"), serializedPath as any]); + return await publicKeyv2(this, data); + } + default: + return { + return_code: 0x6400, + error_message: "App Version is not supported", + }; + } + } catch (e) { + return processErrorResponse(e); + } + } + + async getAddressAndPubKey(path: string, hrp: any) { + try { + return await this.serializePath(path) + .then((serializedPath) => { + const data = Buffer.concat([THORChainApp.serializeHRP(hrp), serializedPath as any]); + return this.transport + .send(CLA, INS.GET_ADDR_SECP256K1, P1_VALUES.ONLY_RETRIEVE, 0, data, [ErrorCode.NoError]) + .then((response: any) => { + const errorCodeData = response.slice(-2); + const returnCode = errorCodeData[0] * 256 + errorCodeData[1]; + + const compressedPk = Buffer.from(response.slice(0, 33)); + const bech32Address = Buffer.from(response.slice(33, -2)).toString(); + + return { + bech32_address: bech32Address, + compressed_pk: compressedPk, + return_code: returnCode, + error_message: errorCodeToString(returnCode), + }; + }, processErrorResponse); + }) + .catch((err) => processErrorResponse(err)); + } catch (e) { + return processErrorResponse(e); + } + } + + async showAddressAndPubKey(path: string, hrp: any) { + try { + return await this.serializePath(path) + .then((serializedPath) => { + const data = Buffer.concat([THORChainApp.serializeHRP(hrp), serializedPath as any]); + return this.transport + .send(CLA, INS.GET_ADDR_SECP256K1, P1_VALUES.SHOW_ADDRESS_IN_DEVICE, 0, data, [ErrorCode.NoError]) + .then((response: any) => { + const errorCodeData = response.slice(-2); + const returnCode = errorCodeData[0] * 256 + errorCodeData[1]; + + const compressedPk = Buffer.from(response.slice(0, 33)); + const bech32Address = Buffer.from(response.slice(33, -2)).toString(); + + return { + bech32_address: bech32Address, + compressed_pk: compressedPk, + return_code: returnCode, + error_message: errorCodeToString(returnCode), + }; + }, processErrorResponse); + }) + .catch((err) => processErrorResponse(err)); + } catch (e) { + return processErrorResponse(e); + } + } + + async signSendChunk(chunkIdx: number, chunkNum: number, chunk: any) { + switch (this.versionResponse.major) { + case 2: + return signSendChunkv2(this, chunkIdx, chunkNum, chunk); + default: + return { + return_code: 0x6400, + error_message: "App Version is not supported", + }; + } + } + + async sign(path: string, message: any) { + return this.signGetChunks(path, message).then((chunks) => { + return this.signSendChunk(1, chunks.length, chunks[0]).then(async (response) => { + let result = { + return_code: response.return_code, + error_message: response.error_message, + signature: null, + }; + + for (let i = 1; i < chunks.length; i += 1) { + result = await this.signSendChunk(1 + i, chunks.length, chunks[i]); + if (result.return_code !== ErrorCode.NoError) { + break; + } + } + + return { + return_code: result.return_code, + error_message: result.error_message, + // /// + signature: result.signature, + }; + }, processErrorResponse); + }, processErrorResponse); + } +} + +export { THORChainApp }; diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts new file mode 100644 index 000000000..87e9941e4 --- /dev/null +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -0,0 +1,26 @@ +import * as core from "@shapeshiftoss/hdwallet-core"; + +import { LedgerTransport } from ".."; +export * from "./common"; +export * from "./helpers"; +export * from "./hw-app-thor"; + +// TODO(gomes): move all below to ./thorchain + +export const thorchainGetAddress = async ( + transport: LedgerTransport, + msg: core.ThorchainGetAddress +): Promise => { + const addressAndPubkey = await transport.call( + "Rune", + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore TODO(gomes): fixme + "getAddressAndPubKey", + core.addressNListToBIP32(msg.addressNList), + "thor" + ); + + // eslint-disable-next-line no-console + console.log({ addressAndPubkey }); + return "TODO"; +}; diff --git a/packages/hdwallet-ledger/src/transport.ts b/packages/hdwallet-ledger/src/transport.ts index 70178159d..fe6889ba7 100644 --- a/packages/hdwallet-ledger/src/transport.ts +++ b/packages/hdwallet-ledger/src/transport.ts @@ -12,7 +12,7 @@ type MethodsOnly = { type UnwrapPromise = T extends Promise ? R : T; type DefinitelyCallable = T extends (...args: any) => any ? T : never; -export type LedgerTransportCoinType = null | "Btc" | "Eth"; +export type LedgerTransportCoinType = null | "Btc" | "Eth" | "Rune"; type CurriedWithTransport any> = T extends ( transport: Transport, ...args: infer R diff --git a/yarn.lock b/yarn.lock index 2dcfd0cfa..f29842390 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6431,6 +6431,13 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== +"@types/ripemd160@^2.0.1": + version "2.0.1" + resolved "http://localhost:4873/@types/ripemd160/-/ripemd160-2.0.1.tgz#e9ea7a26adf0e2541917fc2b1ecb497e8ced4b7e" + integrity sha512-l3pt9f8vK1tU2qBXY1aL7HofNnJKbpNa+2DznrD7j0lhaS4587e3iwgSMRDJFlidsrNjrrjIl8G+EeXFMjcGXg== + dependencies: + "@types/node" "*" + "@types/secp256k1@^4.0.1": version "4.0.3" resolved "https://registry.yarnpkg.com/@types/secp256k1/-/secp256k1-4.0.3.tgz#1b8e55d8e00f08ee7220b4d59a6abe89c37a901c" From ffc5ba304e6c56c1d9de5b10c41ab2118ca8bcfc Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:17:10 +0200 Subject: [PATCH 053/108] feat: bumpy --- examples/sandbox/package.json | 32 ++++++++++++++++---------------- integration/package.json | 20 ++++++++++---------- lerna.json | 9 +++++++-- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 86ab83d07..3c825978e 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.53.3-ledger-improvements.4", + "version": "1.52.3-thorchain.15", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.3", - "@shapeshiftoss/hdwallet-keplr": "1.52.3", - "@shapeshiftoss/hdwallet-ledger": "1.52.3", - "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.3", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.3", - "@shapeshiftoss/hdwallet-metamask": "1.52.3", - "@shapeshiftoss/hdwallet-native": "1.52.3", - "@shapeshiftoss/hdwallet-portis": "1.52.3", - "@shapeshiftoss/hdwallet-tallyho": "1.52.3", - "@shapeshiftoss/hdwallet-trezor": "1.52.3", - "@shapeshiftoss/hdwallet-trezor-connect": "1.52.3", - "@shapeshiftoss/hdwallet-walletconnect": "1.52.3", - "@shapeshiftoss/hdwallet-xdefi": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.15", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index b2b4ae4e5..e46c61dc4 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.53.3-ledger-improvements.4", + "version": "1.52.3-thorchain.15", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.3", - "@shapeshiftoss/hdwallet-ledger": "1.52.3", - "@shapeshiftoss/hdwallet-native": "1.52.3", - "@shapeshiftoss/hdwallet-portis": "1.52.3", - "@shapeshiftoss/hdwallet-trezor": "1.52.3", - "@shapeshiftoss/hdwallet-xdefi": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.15", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index 0e71a7243..7cd2f9ce5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.53.3-ledger-improvements.4", + "version": "1.52.3-thorchain.15", "npmClient": "yarn", "useWorkspaces": true, "command": { @@ -8,5 +8,10 @@ "message": "chore(release): publish %v" } }, - "ignoreChanges": ["**/__fixtures__/**", "**/__tests__/**", "**/*.md", "**/.env"] + "ignoreChanges": [ + "**/__fixtures__/**", + "**/__tests__/**", + "**/*.md", + "**/.env" + ] } From 0564b2c045926abe53b64c041cc6a0cc057bdbf4 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:25:27 +0200 Subject: [PATCH 054/108] feat: this --- packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index 18b20982b..97993b21f 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -41,7 +41,7 @@ class THORChainApp { } this.transport = transport as any; - transport.decorateAppAPIMethods( + transport.decorateAppAPIMethods.bind(transport)( this, ["getVersion", "sign", "getAddressAndPubKey", "appInfo", "deviceInfo", "getBech32FromPK"], scrambleKey From 306a122bfd8aaf558f2331187172c5efdb9d006c Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 23:01:40 +0200 Subject: [PATCH 055/108] fix: derp --- packages/hdwallet-ledger-webusb/src/transport.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger-webusb/src/transport.ts b/packages/hdwallet-ledger-webusb/src/transport.ts index d41e8cb34..214a2519d 100644 --- a/packages/hdwallet-ledger-webusb/src/transport.ts +++ b/packages/hdwallet-ledger-webusb/src/transport.ts @@ -80,7 +80,7 @@ export async function translateCoinAndMethod> { switch (coin) { case "Rune": { - const thor = new ledger.THORChainApp({ transport }); + const thor = new ledger.THORChainApp(transport); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore TODO(gomes): fixme const methodInstance = thor[method as LedgerTransportMethodName<"Rune">].bind(thor); From dd831efdd7e9de77829aa988bb22ba3cc97864c5 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 23:30:43 +0200 Subject: [PATCH 056/108] feat: bump --- examples/sandbox/package.json | 22 ++++++++++++++++++++++ integration/package.json | 16 ++++++++++++++++ lerna.json | 4 ++++ 3 files changed, 42 insertions(+) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 3c825978e..697786e16 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,10 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", +<<<<<<< HEAD "version": "1.52.3-thorchain.15", +======= + "version": "1.52.3-thorchain.5", +>>>>>>> c1430a15 (feat: bump) "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,6 +14,7 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { +<<<<<<< HEAD "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.15", @@ -25,6 +30,23 @@ "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.15", +======= + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.5", +>>>>>>> c1430a15 (feat: bump) "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index e46c61dc4..d52dd025b 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,10 @@ { "name": "@shapeshiftoss/integration", +<<<<<<< HEAD "version": "1.52.3-thorchain.15", +======= + "version": "1.52.3-thorchain.5", +>>>>>>> c1430a15 (feat: bump) "main": "index.js", "license": "MIT", "private": true, @@ -10,6 +14,7 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { +<<<<<<< HEAD "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.15", @@ -19,6 +24,17 @@ "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.15", +======= + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.5", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.5", +>>>>>>> c1430a15 (feat: bump) "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index 7cd2f9ce5..a31425e37 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,10 @@ { "lerna": "5.2.0", +<<<<<<< HEAD "version": "1.52.3-thorchain.15", +======= + "version": "1.52.3-thorchain.5", +>>>>>>> c1430a15 (feat: bump) "npmClient": "yarn", "useWorkspaces": true, "command": { From e691e82c5935692c07340ed87e52072a14ecd9ce Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 23:30:55 +0200 Subject: [PATCH 057/108] feat: thor bip32 path array buffer --- packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index 97993b21f..a18d6f78f 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -233,8 +233,14 @@ class THORChainApp { } } - async getAddressAndPubKey(path: string, hrp: any) { + async getAddressAndPubKey(_path: string, hrp: any) { try { + // TODO(gomes): this is obviously temporary, find a better way to do this and pass our bip32 path in and make it work here + // eslint-disable-next-line no-console + console.log({ _path }); + const path = [44, 931, 0, 0, 0]; + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore TODO(gomes): fixme swapkit types are turbo derp return await this.serializePath(path) .then((serializedPath) => { const data = Buffer.concat([THORChainApp.serializeHRP(hrp), serializedPath as any]); From 1336abb88ea348054e18939e7c6560b727033a5f Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 23:43:13 +0200 Subject: [PATCH 058/108] feat: boimp --- examples/sandbox/package.json | 22 ++++++++++++++++++++++ integration/package.json | 16 ++++++++++++++++ lerna.json | 4 ++++ 3 files changed, 42 insertions(+) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 697786e16..1156d55bf 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,10 +1,14 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= "version": "1.52.3-thorchain.5", >>>>>>> c1430a15 (feat: bump) +======= + "version": "1.52.3-thorchain.6", +>>>>>>> 7cb9bd66 (feat: boimp) "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -14,6 +18,7 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { +<<<<<<< HEAD <<<<<<< HEAD "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.15", @@ -47,6 +52,23 @@ "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.5", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.5", >>>>>>> c1430a15 (feat: bump) +======= + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.6", +>>>>>>> 7cb9bd66 (feat: boimp) "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index d52dd025b..58ca82cd5 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,10 +1,14 @@ { "name": "@shapeshiftoss/integration", +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= "version": "1.52.3-thorchain.5", >>>>>>> c1430a15 (feat: bump) +======= + "version": "1.52.3-thorchain.6", +>>>>>>> 7cb9bd66 (feat: boimp) "main": "index.js", "license": "MIT", "private": true, @@ -14,6 +18,7 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { +<<<<<<< HEAD <<<<<<< HEAD "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15", @@ -35,6 +40,17 @@ "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.5", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.5", >>>>>>> c1430a15 (feat: bump) +======= + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.6", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.6", +>>>>>>> 7cb9bd66 (feat: boimp) "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index a31425e37..620ac8835 100644 --- a/lerna.json +++ b/lerna.json @@ -1,10 +1,14 @@ { "lerna": "5.2.0", +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= "version": "1.52.3-thorchain.5", >>>>>>> c1430a15 (feat: bump) +======= + "version": "1.52.3-thorchain.6", +>>>>>>> 7cb9bd66 (feat: boimp) "npmClient": "yarn", "useWorkspaces": true, "command": { From 510d3ae30af7d05198bb33f19f7f886b964a19fa Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 9 Oct 2023 23:43:18 +0200 Subject: [PATCH 059/108] feat: look mom thor address --- packages/hdwallet-ledger/src/thorchain/index.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index 87e9941e4..b1b9ae272 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -20,7 +20,8 @@ export const thorchainGetAddress = async ( "thor" ); - // eslint-disable-next-line no-console - console.log({ addressAndPubkey }); - return "TODO"; + const maybeAddress = (addressAndPubkey.payload as any)?.bech32_address as string | undefined; + if (!maybeAddress) return null; + + return maybeAddress; }; From fca27b564c308eaf4cc33521b2bf820de7b58c51 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 09:31:20 +0200 Subject: [PATCH 060/108] feat: boimp --- examples/sandbox/package.json | 22 ++++++++++++++++++++++ integration/package.json | 16 ++++++++++++++++ lerna.json | 4 ++++ 3 files changed, 42 insertions(+) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 1156d55bf..080d27648 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,7 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -9,6 +10,9 @@ ======= "version": "1.52.3-thorchain.6", >>>>>>> 7cb9bd66 (feat: boimp) +======= + "version": "1.52.3-thorchain.7", +>>>>>>> 1ca288a8 (feat: boimp) "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -19,6 +23,7 @@ }, "dependencies": { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.15", @@ -69,6 +74,23 @@ "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.6", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.6", >>>>>>> 7cb9bd66 (feat: boimp) +======= + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.7", +>>>>>>> 1ca288a8 (feat: boimp) "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index 58ca82cd5..fa40d9201 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,7 @@ { "name": "@shapeshiftoss/integration", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -9,6 +10,9 @@ ======= "version": "1.52.3-thorchain.6", >>>>>>> 7cb9bd66 (feat: boimp) +======= + "version": "1.52.3-thorchain.7", +>>>>>>> 1ca288a8 (feat: boimp) "main": "index.js", "license": "MIT", "private": true, @@ -19,6 +23,7 @@ }, "dependencies": { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15", @@ -51,6 +56,17 @@ "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.6", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.6", >>>>>>> 7cb9bd66 (feat: boimp) +======= + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.7", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.7", +>>>>>>> 1ca288a8 (feat: boimp) "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index 620ac8835..b33b7bb4f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,7 @@ { "lerna": "5.2.0", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -9,6 +10,9 @@ ======= "version": "1.52.3-thorchain.6", >>>>>>> 7cb9bd66 (feat: boimp) +======= + "version": "1.52.3-thorchain.7", +>>>>>>> 1ca288a8 (feat: boimp) "npmClient": "yarn", "useWorkspaces": true, "command": { From 7d2f37785536f22ef8c6df0631eabf49950ba470 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 16:46:35 +0200 Subject: [PATCH 061/108] feat: prototype sign method --- packages/hdwallet-ledger/src/ledger.ts | 4 ++ .../src/thorchain/hw-app-thor.ts | 45 ++++++++++++++++++- .../hdwallet-ledger/src/thorchain/index.ts | 21 +++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/packages/hdwallet-ledger/src/ledger.ts b/packages/hdwallet-ledger/src/ledger.ts index de357b002..7078a3b88 100644 --- a/packages/hdwallet-ledger/src/ledger.ts +++ b/packages/hdwallet-ledger/src/ledger.ts @@ -516,6 +516,10 @@ export class LedgerHDWallet implements core.HDWallet, core.BTCWallet, core.ETHWa return thorchain.thorchainGetAddress(this.transport, msg); } + public thorchainSignTx(msg: core.ThorchainSignTx): Promise { + return thorchain.thorchainSignTx(this.transport, msg); + } + public async btcSignTx(msg: core.BTCSignTxLedger): Promise { await this.validateCurrentApp(msg.coin); return btc.btcSignTx(this, this.transport, msg); diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index a18d6f78f..ad965178f 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -15,6 +15,7 @@ * limitations under the License. ******************************************************************************* */ import { bech32 } from "@scure/base"; +import * as core from "@shapeshiftoss/hdwallet-core"; import crypto from "crypto"; import Ripemd160 from "ripemd160"; @@ -31,6 +32,30 @@ import { } from "./common"; import { publicKeyv2, serializePathv2, signSendChunkv2 } from "./helpers"; +const THOR_CHAIN = "thorchain-mainnet-v1"; +const THORCHAIN_SEND_GAS_FEE = "500000000"; + +const recursivelyOrderKeys = (unordered: any) => { + // If it's an array - recursively order any + // dictionary items within the array + if (Array.isArray(unordered)) { + unordered.forEach((item, index) => { + unordered[index] = recursivelyOrderKeys(item); + }); + return unordered; + } + + // If it's an object - let's order the keys + if (typeof unordered !== "object") return unordered; + const ordered: any = {}; + Object.keys(unordered) + .sort() + .forEach((key) => (ordered[key] = recursivelyOrderKeys(unordered[key]))); + return ordered; +}; + +const stringifyKeysInOrder = (data: any) => JSON.stringify(recursivelyOrderKeys(data)); + class THORChainApp { transport: any; versionResponse: any; @@ -307,8 +332,24 @@ class THORChainApp { } } - async sign(path: string, message: any) { - return this.signGetChunks(path, message).then((chunks) => { + async sign(_path: string, message: core.ThorchainSignTx) { + // eslint-disable-next-line no-console + console.log({ _path, message }); + const path = [44, 931, 0, 0, 0]; + + const fee = { amount: [], gas: THORCHAIN_SEND_GAS_FEE }; + // TODO(gomes): this only handles sends for now - do we want to support deposit messages as well? + const rawTx = stringifyKeysInOrder({ + account_number: message.account_number, + chain_id: THOR_CHAIN, + fee, + memo: message.tx.memo, + msgs: message.tx.msg, + sequence: message.sequence, + }); + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore TODO(gomes): fixme swapkit types are turbo derp + return this.signGetChunks(path, rawTx).then((chunks) => { return this.signSendChunk(1, chunks.length, chunks[0]).then(async (response) => { let result = { return_code: response.return_code, diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index b1b9ae272..56e521b63 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -25,3 +25,24 @@ export const thorchainGetAddress = async ( return maybeAddress; }; + +export const thorchainSignTx = async ( + transport: LedgerTransport, + msg: core.ThorchainSignTx +): Promise => { + const signed = await transport.call( + "Rune", + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore TODO(gomes): fixme + "sign", + msg + ); + + // eslint-disable-next-line no-console + console.log({ signed }); + + const maybeSigned = signed; + if (!maybeSigned) throw new Error("TODO error handling"); + + return maybeSigned as unknown as core.ThorchainSignedTx; +}; From 7abe35c7ecc363ce733b002443ce56aff678b82d Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 22:40:19 +0200 Subject: [PATCH 062/108] feat: boimp --- examples/sandbox/package.json | 22 ++++++++++++++++++++++ integration/package.json | 16 ++++++++++++++++ lerna.json | 4 ++++ 3 files changed, 42 insertions(+) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 080d27648..4dce1faae 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -2,6 +2,7 @@ "name": "@shapeshiftoss/hdwallet-sandbox", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -13,6 +14,9 @@ ======= "version": "1.52.3-thorchain.7", >>>>>>> 1ca288a8 (feat: boimp) +======= + "version": "1.52.3-thorchain.8", +>>>>>>> a775be7e (feat: boimp) "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -24,6 +28,7 @@ "dependencies": { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.15", @@ -91,6 +96,23 @@ "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.7", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.7", >>>>>>> 1ca288a8 (feat: boimp) +======= + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.8", +>>>>>>> a775be7e (feat: boimp) "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index fa40d9201..2e728a730 100644 --- a/integration/package.json +++ b/integration/package.json @@ -2,6 +2,7 @@ "name": "@shapeshiftoss/integration", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -13,6 +14,9 @@ ======= "version": "1.52.3-thorchain.7", >>>>>>> 1ca288a8 (feat: boimp) +======= + "version": "1.52.3-thorchain.8", +>>>>>>> a775be7e (feat: boimp) "main": "index.js", "license": "MIT", "private": true, @@ -24,6 +28,7 @@ "dependencies": { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15", @@ -67,6 +72,17 @@ "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.7", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.7", >>>>>>> 1ca288a8 (feat: boimp) +======= + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.8", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.8", +>>>>>>> a775be7e (feat: boimp) "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index b33b7bb4f..7c30cbf18 100644 --- a/lerna.json +++ b/lerna.json @@ -2,6 +2,7 @@ "lerna": "5.2.0", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -13,6 +14,9 @@ ======= "version": "1.52.3-thorchain.7", >>>>>>> 1ca288a8 (feat: boimp) +======= + "version": "1.52.3-thorchain.8", +>>>>>>> a775be7e (feat: boimp) "npmClient": "yarn", "useWorkspaces": true, "command": { From cca03582ad9fb6615f83b6c565bdf40103656ffe Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 22:45:03 +0200 Subject: [PATCH 063/108] fix: derp --- packages/hdwallet-ledger/src/thorchain/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index 56e521b63..8ae148977 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -35,6 +35,7 @@ export const thorchainSignTx = async ( // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore TODO(gomes): fixme "sign", + core.addressNListToBIP32(msg.addressNList), msg ); From b1e0c499c49c88c6af49b4b36932cbc8112db0a7 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 22:45:37 +0200 Subject: [PATCH 064/108] chore(release): publish 1.52.3-thorchain.9 --- examples/sandbox/package.json | 22 +++++++++++++++++++ integration/package.json | 16 ++++++++++++++ lerna.json | 11 +++++----- packages/hdwallet-coinbase/package.json | 4 ++-- packages/hdwallet-core/package.json | 2 +- .../hdwallet-keepkey-chromeusb/package.json | 6 ++--- .../hdwallet-keepkey-electron/package.json | 4 ++-- .../hdwallet-keepkey-nodehid/package.json | 4 ++-- .../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-keplr/package.json | 4 ++-- packages/hdwallet-ledger-webhid/package.json | 6 ++--- packages/hdwallet-ledger-webusb/package.json | 6 ++--- packages/hdwallet-ledger/package.json | 8 +++---- .../package.json | 4 ++-- packages/hdwallet-metamask/package.json | 4 ++-- packages/hdwallet-native-vault/package.json | 4 ++-- packages/hdwallet-native/package.json | 4 ++-- packages/hdwallet-portis/package.json | 4 ++-- packages/hdwallet-tallyho/package.json | 4 ++-- packages/hdwallet-trezor-connect/package.json | 6 ++--- packages/hdwallet-trezor/package.json | 4 ++-- packages/hdwallet-walletconnect/package.json | 4 ++-- .../hdwallet-walletconnectV2/package.json | 4 ++-- packages/hdwallet-xdefi/package.json | 4 ++-- 27 files changed, 99 insertions(+), 62 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 4dce1faae..6d06219e3 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -3,6 +3,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -17,6 +18,9 @@ ======= "version": "1.52.3-thorchain.8", >>>>>>> a775be7e (feat: boimp) +======= + "version": "1.52.3-thorchain.9", +>>>>>>> 63766913 (chore(release): publish 1.52.3-thorchain.9) "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -29,6 +33,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.15", @@ -113,6 +118,23 @@ "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.8", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.8", >>>>>>> a775be7e (feat: boimp) +======= + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.9", +>>>>>>> 63766913 (chore(release): publish 1.52.3-thorchain.9) "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index 2e728a730..bdc528444 100644 --- a/integration/package.json +++ b/integration/package.json @@ -3,6 +3,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -17,6 +18,9 @@ ======= "version": "1.52.3-thorchain.8", >>>>>>> a775be7e (feat: boimp) +======= + "version": "1.52.3-thorchain.9", +>>>>>>> 63766913 (chore(release): publish 1.52.3-thorchain.9) "main": "index.js", "license": "MIT", "private": true, @@ -29,6 +33,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15", @@ -83,6 +88,17 @@ "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.8", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.8", >>>>>>> a775be7e (feat: boimp) +======= + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.9", +>>>>>>> 63766913 (chore(release): publish 1.52.3-thorchain.9) "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index 7c30cbf18..2a45dbde4 100644 --- a/lerna.json +++ b/lerna.json @@ -3,6 +3,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -17,6 +18,9 @@ ======= "version": "1.52.3-thorchain.8", >>>>>>> a775be7e (feat: boimp) +======= + "version": "1.52.3-thorchain.9", +>>>>>>> 63766913 (chore(release): publish 1.52.3-thorchain.9) "npmClient": "yarn", "useWorkspaces": true, "command": { @@ -24,10 +28,5 @@ "message": "chore(release): publish %v" } }, - "ignoreChanges": [ - "**/__fixtures__/**", - "**/__tests__/**", - "**/*.md", - "**/.env" - ] + "ignoreChanges": ["**/__fixtures__/**", "**/__tests__/**", "**/*.md", "**/.env"] } diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index b8f1dafd4..323077b70 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json index 9bbed2772..d06b1e2d0 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index f2fdc6b02..6f611c078 100644 --- a/packages/hdwallet-keepkey-chromeusb/package.json +++ b/packages/hdwallet-keepkey-chromeusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-chromeusb", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey": "1.52.3" + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9" } } diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index b63489f80..2f4fd5fb1 100644 --- a/packages/hdwallet-keepkey-electron/package.json +++ b/packages/hdwallet-keepkey-electron/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-electron", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index da40891f1..a81810ef1 100644 --- a/packages/hdwallet-keepkey-nodehid/package.json +++ b/packages/hdwallet-keepkey-nodehid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodehid", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.3" + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index 6bf556d75..bff6b6eec 100644 --- a/packages/hdwallet-keepkey-nodewebusb/package.json +++ b/packages/hdwallet-keepkey-nodewebusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey": "1.52.3" + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index d4be0a5d8..139d574e4 100644 --- a/packages/hdwallet-keepkey-tcp/package.json +++ b/packages/hdwallet-keepkey-tcp/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-tcp", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9", "axios": "^0.21.1" } } diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index c75d5a98b..a820a4f17 100644 --- a/packages/hdwallet-keepkey-webusb/package.json +++ b/packages/hdwallet-keepkey-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-webusb", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey": "1.52.3" + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4" diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index e0d71737c..9e91ba8f9 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^3.3.0", "@keepkey/device-protocol": "^7.12.2", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "bignumber.js": "^9.0.1", "bnb-javascript-sdk-nobroadcast": "^2.16.14", diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json index 906c72fe8..7ebbc27bf 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/caip": "8.15.0", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@shapeshiftoss/types": "3.1.3", "base64-js": "^1.5.1", diff --git a/packages/hdwallet-ledger-webhid/package.json b/packages/hdwallet-ledger-webhid/package.json index 5c4e08268..8d7a69523 100644 --- a/packages/hdwallet-ledger-webhid/package.json +++ b/packages/hdwallet-ledger-webhid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webhid", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -19,8 +19,8 @@ "@ledgerhq/hw-transport": "^6.7.0", "@ledgerhq/hw-transport-webhid": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-ledger": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.9", "@types/w3c-web-hid": "^1.0.2" }, "devDependencies": { diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index d2dc648bf..ce0ddb44d 100644 --- a/packages/hdwallet-ledger-webusb/package.json +++ b/packages/hdwallet-ledger-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webusb", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -20,8 +20,8 @@ "@ledgerhq/hw-transport-webusb": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", "@ledgerhq/logs": "^6.10.1", - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-ledger": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.9", "@types/w3c-web-usb": "^1.0.4", "p-queue": "^7.4.1" }, diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index e93a9c5cb..63194b01e 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -18,7 +18,8 @@ "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@types/ripemd160": "^2.0.1", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", "bitcoinjs-message": "^2.0.0", @@ -26,8 +27,7 @@ "ethereumjs-tx": "1.3.7", "ethereumjs-util": "^6.1.0", "lodash": "^4.17.21", - "ripemd160": "^2.0.2", - "@types/ripemd160": "^2.0.1" + "ripemd160": "^2.0.2" }, "devDependencies": { "@ledgerhq/hw-app-btc": "^10.0.8", diff --git a/packages/hdwallet-metamask-shapeshift-multichain/package.json b/packages/hdwallet-metamask-shapeshift-multichain/package.json index e70d62c8f..6db2f8410 100644 --- a/packages/hdwallet-metamask-shapeshift-multichain/package.json +++ b/packages/hdwallet-metamask-shapeshift-multichain/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-shapeshift-multichain", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", "@shapeshiftoss/common-api": "^9.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "@shapeshiftoss/metamask-snaps-adapter": "^1.0.8", "@shapeshiftoss/metamask-snaps-types": "^1.0.8", "eth-rpc-errors": "^4.0.3", diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index a3c4c81b6..66ed05f88 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index e4c9f5314..5467c74b8 100644 --- a/packages/hdwallet-native-vault/package.json +++ b/packages/hdwallet-native-vault/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native-vault", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-native": "1.52.3", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.9", "bip39": "^3.0.4", "hash-wasm": "^4.9.0", "idb-keyval": "^6.0.3", diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index 44655010b..27584449e 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", "@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index 6d55d31ca..5a0618ec9 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@portis/web3": "3.0.10", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index e688dc75b..dca77399d 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-tallyho", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "lodash": "^4.17.21", "tallyho-onboarding": "^1.0.2" }, diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index 8196d257c..f56286fc9 100644 --- a/packages/hdwallet-trezor-connect/package.json +++ b/packages/hdwallet-trezor-connect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor-connect", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-trezor": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.9", "@trezor/rollout": "^1.2.0", "trezor-connect": "^8.2.1" } diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index 795a537a5..61de4d50f 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "base64-js": "^1.5.1", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index 8101de3f3..b6b4582d9 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "@walletconnect/qrcode-modal": "^1.7.8", "@walletconnect/web3-provider": "^1.7.8", "ethers": "^5.6.5" diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index ff4681cca..5ba91f0c0 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "@walletconnect/ethereum-provider": "^2.10.1", "@walletconnect/modal": "^2.6.2", "ethers": "^5.6.5" diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index 1d2c43eb9..f2ed60438 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-xdefi", - "version": "1.52.3", + "version": "1.52.3-thorchain.9", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", "lodash": "^4.17.21" }, "devDependencies": { From 646ce36b9b807eb8938c902e2b80b7b176e658b3 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 23:03:56 +0200 Subject: [PATCH 065/108] fix: ThorchainSignedTx compliant ish --- packages/hdwallet-ledger/src/thorchain/index.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index 8ae148977..6e25ed23f 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -20,6 +20,7 @@ export const thorchainGetAddress = async ( "thor" ); + // TODO(gomes): find a way to type payload for hw-app-thor const maybeAddress = (addressAndPubkey.payload as any)?.bech32_address as string | undefined; if (!maybeAddress) return null; @@ -30,7 +31,7 @@ export const thorchainSignTx = async ( transport: LedgerTransport, msg: core.ThorchainSignTx ): Promise => { - const signed = await transport.call( + const maybeSigned = await transport.call( "Rune", // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore TODO(gomes): fixme @@ -39,11 +40,13 @@ export const thorchainSignTx = async ( msg ); - // eslint-disable-next-line no-console - console.log({ signed }); - - const maybeSigned = signed; if (!maybeSigned) throw new Error("TODO error handling"); - return maybeSigned as unknown as core.ThorchainSignedTx; + // TODO(gomes): find a way to type payload for hw-app-thor + const signed = (maybeSigned.payload as any)?.signature as Uint8Array | undefined; + + if (!signed) throw new Error("TODO error handling"); + + // TODO(gomes): be fully compliant to ThorchainSignedTx type + return { serialized: Buffer.from(signed).toString("hex") } as unknown as core.ThorchainSignedTx; }; From cd5a81c88221bb8ae46cfcc69ce703f386c34698 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 23:05:15 +0200 Subject: [PATCH 066/108] feat: boimp boimp --- examples/sandbox/package.json | 22 ++++++++++++++++++++++ integration/package.json | 16 ++++++++++++++++ lerna.json | 11 ++++++++++- 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 6d06219e3..2ab7e9067 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -21,6 +22,9 @@ ======= "version": "1.52.3-thorchain.9", >>>>>>> 63766913 (chore(release): publish 1.52.3-thorchain.9) +======= + "version": "1.52.3-thorchain.10", +>>>>>>> fb8c5ee4 (feat: boimp boimp) "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -34,6 +38,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.15", @@ -135,6 +140,23 @@ "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.9", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.9", >>>>>>> 63766913 (chore(release): publish 1.52.3-thorchain.9) +======= + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.10", +>>>>>>> fb8c5ee4 (feat: boimp boimp) "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index bdc528444..13a85553b 100644 --- a/integration/package.json +++ b/integration/package.json @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -21,6 +22,9 @@ ======= "version": "1.52.3-thorchain.9", >>>>>>> 63766913 (chore(release): publish 1.52.3-thorchain.9) +======= + "version": "1.52.3-thorchain.10", +>>>>>>> fb8c5ee4 (feat: boimp boimp) "main": "index.js", "license": "MIT", "private": true, @@ -34,6 +38,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15", @@ -99,6 +104,17 @@ "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.9", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.9", >>>>>>> 63766913 (chore(release): publish 1.52.3-thorchain.9) +======= + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.10", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.10", +>>>>>>> fb8c5ee4 (feat: boimp boimp) "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index 2a45dbde4..e72837ef4 100644 --- a/lerna.json +++ b/lerna.json @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -21,6 +22,9 @@ ======= "version": "1.52.3-thorchain.9", >>>>>>> 63766913 (chore(release): publish 1.52.3-thorchain.9) +======= + "version": "1.52.3-thorchain.10", +>>>>>>> fb8c5ee4 (feat: boimp boimp) "npmClient": "yarn", "useWorkspaces": true, "command": { @@ -28,5 +32,10 @@ "message": "chore(release): publish %v" } }, - "ignoreChanges": ["**/__fixtures__/**", "**/__tests__/**", "**/*.md", "**/.env"] + "ignoreChanges": [ + "**/__fixtures__/**", + "**/__tests__/**", + "**/*.md", + "**/.env" + ] } From 24e6498ce0000433d9a6554dcb3001614f021536 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 23:15:08 +0200 Subject: [PATCH 067/108] fix: toString base64 --- packages/hdwallet-ledger/src/thorchain/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index 6e25ed23f..4e9be175f 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -48,5 +48,5 @@ export const thorchainSignTx = async ( if (!signed) throw new Error("TODO error handling"); // TODO(gomes): be fully compliant to ThorchainSignedTx type - return { serialized: Buffer.from(signed).toString("hex") } as unknown as core.ThorchainSignedTx; + return { serialized: Buffer.from(signed).toString("base64") } as unknown as core.ThorchainSignedTx; }; From 0e549ced08e3c195ab414f52780bb4e38920dba5 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 10 Oct 2023 23:16:14 +0200 Subject: [PATCH 068/108] feat: boimp boimp --- examples/sandbox/package.json | 4 ++++ integration/package.json | 4 ++++ lerna.json | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 2ab7e9067..6869e75e7 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -25,6 +26,9 @@ ======= "version": "1.52.3-thorchain.10", >>>>>>> fb8c5ee4 (feat: boimp boimp) +======= + "version": "1.52.3-thorchain.11", +>>>>>>> ae133cd4 (feat: boimp boimp) "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 13a85553b..f73c8accb 100644 --- a/integration/package.json +++ b/integration/package.json @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -25,6 +26,9 @@ ======= "version": "1.52.3-thorchain.10", >>>>>>> fb8c5ee4 (feat: boimp boimp) +======= + "version": "1.52.3-thorchain.11", +>>>>>>> ae133cd4 (feat: boimp boimp) "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index e72837ef4..1f872f7f4 100644 --- a/lerna.json +++ b/lerna.json @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -25,6 +26,9 @@ ======= "version": "1.52.3-thorchain.10", >>>>>>> fb8c5ee4 (feat: boimp boimp) +======= + "version": "1.52.3-thorchain.11", +>>>>>>> ae133cd4 (feat: boimp boimp) "npmClient": "yarn", "useWorkspaces": true, "command": { From 49ec39514ef479c4d6397c5f9f196671d95b5e3a Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 15:05:07 +0200 Subject: [PATCH 069/108] feat: bump yarn.lock --- yarn.lock | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 265 insertions(+) diff --git a/yarn.lock b/yarn.lock index f29842390..96c430e36 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5557,6 +5557,30 @@ web-encoding "^1.1.0" wif "^2.0.6" +"@shapeshiftoss/hdwallet-core@1.52.1", "@shapeshiftoss/hdwallet-core@^1.50.4": + version "1.52.1" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.1.tgz#5165e6ecfef3ffa2a3c1ed1aafe6de268224f920" + integrity sha512-ON0kGiYhVUZm2sPp6EbgIwACJAvULIeklddWPZDCv6mvByIsY8D6BTVQtXVavHBB+/Pf6bVc1uMfCO3X5zPaHg== + dependencies: + "@shapeshiftoss/proto-tx-builder" "^0.8.0" + eip-712 "^1.0.0" + eventemitter2 "^5.0.1" + lodash "^4.17.21" + rxjs "^6.4.0" + type-assertions "^1.1.0" + +"@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.11": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.3-thorchain.11.tgz#1d24db71eae513a5f8ca79721e76f244974ef3dc" + integrity sha512-FxVzYJJ7ZqqaWzEBgxN2bsUUxk3y38QIRd48C2cRQjgPDQbd1DRRaWoxD0/f4zFGDyAYTQgF7mOUGUH9JLV7Zw== + dependencies: + "@shapeshiftoss/proto-tx-builder" "^0.8.0" + eip-712 "^1.0.0" + eventemitter2 "^5.0.1" + lodash "^4.17.21" + rxjs "^6.4.0" + type-assertions "^1.1.0" + "@shapeshiftoss/hdwallet-core@latest": version "1.18.4" resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.18.4.tgz#7272baa4b43de0fbb5e651d47cdeb9554f4ddd33" @@ -5567,6 +5591,247 @@ rxjs "^6.4.0" type-assertions "^1.1.0" +"@shapeshiftoss/hdwallet-keepkey-nodewebusb@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-nodewebusb/-/hdwallet-keepkey-nodewebusb-1.52.3-thorchain.11.tgz#2bdcf3bf1a7599ffea9f5ebd5e2e4c3acf3dcc35" + integrity sha512-Ek94hVGSzsZWVdrev2UOlUrYZtnpUwVJh0Zf8osTu36JzPjrEKgQDA72mRQzIAXKRacqtdCL/uec3SI+kWomPA== + dependencies: + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" + +"@shapeshiftoss/hdwallet-keepkey-tcp@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-tcp/-/hdwallet-keepkey-tcp-1.52.3-thorchain.11.tgz#bdfde504aac915f3d6763082c2e49c0980ed59ad" + integrity sha512-K2pEq35XAHpTR45m8WwdVBRvx5lIj8+G3tONsqr0d/9KluGEn//FPil5P9Rxz/CvXam/uwWH7NvJMibWmKlcQA== + dependencies: + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" + axios "^0.21.1" + +"@shapeshiftoss/hdwallet-keepkey-webusb@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-webusb/-/hdwallet-keepkey-webusb-1.52.3-thorchain.11.tgz#75ecc2d3d2e2f26db1f86f50fd95eefaccf8bf15" + integrity sha512-pO1susjpLW0YKENcWrjI81moONOeTbjf6mcc2Mq8yfLbxiNYM4guEEtnesU5OfKjv78bOsyOgcNjzpKL8PiygQ== + dependencies: + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" + +"@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.11": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey/-/hdwallet-keepkey-1.52.3-thorchain.11.tgz#83b412314ca7087e5d2245615fbae46686492996" + integrity sha512-U08jLpycWtfu1hSYnYCx+5e4/tokP/Z8eCQrUlYTdKSAZmXPBTFlz7uKjWcsj0zuoC+xod3yc5VSXbyvGsnupg== + dependencies: + "@ethereumjs/common" "^2.4.0" + "@ethereumjs/tx" "^3.3.0" + "@keepkey/device-protocol" "^7.12.2" + "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/proto-tx-builder" "^0.8.0" + bignumber.js "^9.0.1" + bnb-javascript-sdk-nobroadcast "^2.16.14" + crypto-js "^4.0.0" + eip-712 "^1.0.0" + eip55 "^2.1.0" + google-protobuf "^3.15.8" + icepick "^2.4.0" + lodash "^4.17.21" + p-lazy "^3.1.0" + semver "^7.3.8" + tiny-secp256k1 "^1.1.6" + +"@shapeshiftoss/hdwallet-keplr@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keplr/-/hdwallet-keplr-1.52.3-thorchain.11.tgz#d4d68722353f496f754d2cb0062dc2612430cd64" + integrity sha512-vNOsjerVGDfFDUcoX45yQthDVvcss7YKvbcS9feMC9yVSHgb9raYVdUJsJ7JIqXNYkkJ/aMardMb2ldCTmH+IQ== + dependencies: + "@shapeshiftoss/caip" "8.15.0" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/proto-tx-builder" "^0.8.0" + "@shapeshiftoss/types" "3.1.3" + base64-js "^1.5.1" + lodash "^4.17.21" + +"@shapeshiftoss/hdwallet-ledger-webhid@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger-webhid/-/hdwallet-ledger-webhid-1.52.3-thorchain.11.tgz#48e49b81c14a65e6e2ab868b17a40e1bd6e98eb2" + integrity sha512-lFBiBXjaSKnsPKKUNDhIcHjZuKfwrJ/lzc2ckepR+SPgS13LMsXnHcFy87DVb53e6CP4p4Kv6I2zR1rJsv+SeQ== + dependencies: + "@ledgerhq/hw-app-btc" "^10.0.8" + "@ledgerhq/hw-app-eth" "^6.9.0" + "@ledgerhq/hw-transport" "^6.7.0" + "@ledgerhq/hw-transport-webhid" "^6.7.0" + "@ledgerhq/live-common" "^21.8.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-ledger" "^1.52.3-thorchain.11" + "@types/w3c-web-hid" "^1.0.2" + +"@shapeshiftoss/hdwallet-ledger-webusb@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger-webusb/-/hdwallet-ledger-webusb-1.52.3-thorchain.11.tgz#3adb61c57fccd50627438c559f80b9ea6628a561" + integrity sha512-D3XRt+0+Z8YJMTBoTDO2oDjmg0LQtvURd1p8tqGRVxxpoXQxPQg5LI0zq7bjFPF7FyaBaINF8lu8uaHrU+Aygw== + dependencies: + "@ledgerhq/hw-app-btc" "^10.0.8" + "@ledgerhq/hw-app-eth" "^6.9.0" + "@ledgerhq/hw-transport" "^6.7.0" + "@ledgerhq/hw-transport-webusb" "^6.7.0" + "@ledgerhq/live-common" "^21.8.2" + "@ledgerhq/logs" "^6.10.1" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-ledger" "^1.52.3-thorchain.11" + "@types/w3c-web-usb" "^1.0.4" + p-queue "^7.4.1" + +"@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.11": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger/-/hdwallet-ledger-1.52.3-thorchain.11.tgz#7a03688868f922c033a315fa9409ccfb9aecab40" + integrity sha512-KujW49hBSzM05g6nnJ7Oheiiro0R9f8+l5faj1pqZYs2bpZFgoqlKLGe1zkItp2YCuVIEeMtXHMmqGBJaMQmjw== + dependencies: + "@ethereumjs/common" "^2.4.0" + "@ethereumjs/tx" "^3.3.0" + "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@types/ripemd160" "^2.0.1" + base64-js "^1.5.1" + bchaddrjs "^0.4.4" + bitcoinjs-message "^2.0.0" + bs58check "2.1.2" + ethereumjs-tx "1.3.7" + ethereumjs-util "^6.1.0" + lodash "^4.17.21" + ripemd160 "^2.0.2" + +"@shapeshiftoss/hdwallet-metamask@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-metamask/-/hdwallet-metamask-1.52.3-thorchain.11.tgz#3bc519ebbe0285ba3d0076ae03dda7a71e096d47" + integrity sha512-FeS94nlj2oklOFGX0X1AykL2+bosVi8+3NvBkl+v8zjWluHkcEvXfXmj7Dao/AjAL00auOIJrsFLdKOZ7O2RaQ== + dependencies: + "@metamask/detect-provider" "^1.2.0" + "@metamask/onboarding" "^1.0.1" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + eth-rpc-errors "^4.0.3" + lodash "^4.17.21" + +"@shapeshiftoss/hdwallet-native@^1.50.4": + version "1.52.1" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.1.tgz#9a8144302f20069d145079154d3d9c56086178b4" + integrity sha512-TUemR4q0ISgPRvLkZQaK0iQ9t8ObhbGwGtOBmKzbSyJR10vVXbGxt5eIi+Gc19fSz7uyAQM2N3pIMFMsBasciw== + dependencies: + "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" + "@shapeshiftoss/fiosdk" "1.2.1-shapeshift.6" + "@shapeshiftoss/hdwallet-core" "1.52.1" + "@shapeshiftoss/proto-tx-builder" "^0.8.0" + "@zxing/text-encoding" "^0.9.0" + bchaddrjs "^0.4.9" + bech32 "^1.1.4" + bignumber.js "^9.0.1" + bip32 "^2.0.5" + bip39 "^3.0.2" + bnb-javascript-sdk-nobroadcast "^2.16.14" + crypto-js "^4.0.0" + eip-712 "^1.0.0" + ethers "5.7.2" + eventemitter2 "^5.0.1" + funtypes "^3.0.1" + lodash "^4.17.21" + node-fetch "^2.6.1" + p-lazy "^3.1.0" + scrypt-js "^3.0.1" + tendermint-tx-builder "^1.0.9" + tiny-secp256k1 "^1.1.6" + web-encoding "^1.1.0" + +"@shapeshiftoss/hdwallet-native@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.3-thorchain.11.tgz#e57ef8355715ab701a7c059d460f917d011af999" + integrity sha512-6BfKW9qCGyvTVBdVB6i+pMR00I8TcKRhobAqB6zcuX0jWIj25TYltvuDk2EB3YedH38d0ly9ZEEuteKL4WY6Cw== + dependencies: + "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" + "@shapeshiftoss/fiosdk" "1.2.1-shapeshift.6" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/proto-tx-builder" "^0.8.0" + "@zxing/text-encoding" "^0.9.0" + bchaddrjs "^0.4.9" + bech32 "^1.1.4" + bignumber.js "^9.0.1" + bip32 "^2.0.5" + bip39 "^3.0.2" + bnb-javascript-sdk-nobroadcast "^2.16.14" + crypto-js "^4.0.0" + eip-712 "^1.0.0" + ethers "5.7.2" + eventemitter2 "^5.0.1" + funtypes "^3.0.1" + lodash "^4.17.21" + node-fetch "^2.6.1" + p-lazy "^3.1.0" + scrypt-js "^3.0.1" + tendermint-tx-builder "^1.0.9" + tiny-secp256k1 "^1.1.6" + web-encoding "^1.1.0" + +"@shapeshiftoss/hdwallet-portis@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-portis/-/hdwallet-portis-1.52.3-thorchain.11.tgz#35b734a9fecb7121e4808c6f99e9a86862d13533" + integrity sha512-9LVYv6uZX6bgKED3YYF29YF+UTL4XhgI83SeveW/PknvYMrbvF0eSQjQDqydrYLNUaQ5bmjKoXi5Cl3o4XQTaQ== + dependencies: + "@portis/web3" "3.0.10" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + base64-js "^1.5.1" + bip32 "^2.0.4" + bitcoinjs-lib "^5.1.6" + bitcoinjs-message "^2.1.0" + lodash "^4.17.15" + p-lazy "^3.1.0" + web3 "^1.5.1" + +"@shapeshiftoss/hdwallet-tallyho@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-tallyho/-/hdwallet-tallyho-1.52.3-thorchain.11.tgz#faa3e2a7c6a81a9c8e0e3fa998d41fef58bdea9b" + integrity sha512-VgIDzgSxk8tRn7DSlSP/lUn7p074WjMrFfSsEj5jtuVh1rpLhCBH6sDgv34rUPHQ8m3VrXYjg3qUsDoau+Rltg== + dependencies: + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + lodash "^4.17.21" + tallyho-onboarding "^1.0.2" + +"@shapeshiftoss/hdwallet-trezor-connect@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-trezor-connect/-/hdwallet-trezor-connect-1.52.3-thorchain.11.tgz#5d4ceb32201136dadc03b8320917d7a6aa488aca" + integrity sha512-fc3Ui4AFgHF6OdUynKsh4qg/sb8m9AnWz9VuY0qPseYtJhQCSt5WneluWXPWjTVNlDFkn7GqthyQAfTl0LLbYQ== + dependencies: + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-trezor" "^1.52.3-thorchain.11" + "@trezor/rollout" "^1.2.0" + trezor-connect "^8.2.1" + +"@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.11": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-trezor/-/hdwallet-trezor-1.52.3-thorchain.11.tgz#87c17c63552e18c0299d75c20b6fe5e98a9b9083" + integrity sha512-7I4WWRc3hYCBUySll7Pokk0jnm8u/1yJaFhNabTYphnGPTI1fa4hj7dth22GAqvFYoSX+HlsqB1TJolmIAwv0g== + dependencies: + "@ethereumjs/common" "^2.4.0" + "@ethereumjs/tx" "^3.3.0" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + base64-js "^1.5.1" + lodash "^4.17.21" + +"@shapeshiftoss/hdwallet-walletconnect@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-walletconnect/-/hdwallet-walletconnect-1.52.3-thorchain.11.tgz#b75eee0e4ded2f3ead7bf7c8dc4805f143a0c087" + integrity sha512-//GZ3npcC4RsSiqgQ03jSNL7adKrlF8aBQ9UT3HWItw1+bNN3jB2npiQV7d6KIYqtt3zr1YWxCXp0yAkeBbPdw== + dependencies: + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@walletconnect/qrcode-modal" "^1.7.8" + "@walletconnect/web3-provider" "^1.7.8" + ethers "^5.6.5" + +"@shapeshiftoss/hdwallet-xdefi@^1.52.3-thorchain.10": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-xdefi/-/hdwallet-xdefi-1.52.3-thorchain.11.tgz#9571a7747e21e6321add7815d8d147edb8b06cfc" + integrity sha512-ocbVY3TFfrgr35Kqa9UlhvOJhZ6YLnJmKJLIqOkF+GLs+eOxwagqDBIDxYgXNAbx36q2MVF4GS51URrn6LG0BA== + dependencies: + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + lodash "^4.17.21" + "@shapeshiftoss/logger@^1.1.2", "@shapeshiftoss/logger@^1.1.3": version "1.1.3" resolved "https://registry.yarnpkg.com/@shapeshiftoss/logger/-/logger-1.1.3.tgz#ff05765775351c8adc99cf747f14b5619311e023" From a973a9ca74efafd9271c02c3afa80a57423a0f82 Mon Sep 17 00:00:00 2001 From: kaladinlight <35275952+kaladinlight@users.noreply.github.com> Date: Wed, 11 Oct 2023 11:38:47 -0600 Subject: [PATCH 070/108] sign tx fix (hopefully) --- .../src/thorchain/hw-app-thor.ts | 48 +- .../hdwallet-ledger/src/thorchain/index.ts | 85 ++- .../hdwallet-ledger/src/thorchain/utils.ts | 64 ++ packages/hdwallet-ledger/src/transport.ts | 4 + yarn.lock | 709 ++++++++++++++---- 5 files changed, 740 insertions(+), 170 deletions(-) create mode 100644 packages/hdwallet-ledger/src/thorchain/utils.ts diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index ad965178f..76df17160 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -33,7 +33,19 @@ import { import { publicKeyv2, serializePathv2, signSendChunkv2 } from "./helpers"; const THOR_CHAIN = "thorchain-mainnet-v1"; -const THORCHAIN_SEND_GAS_FEE = "500000000"; + +export type GetAddressAndPubKeyResponse = { + bech32_address: string; + compressed_pk: any; + error_message: string; + return_code: number; +}; + +export type SignResponse = { + signature: any; + error_message: string; + return_code: number; +}; const recursivelyOrderKeys = (unordered: any) => { // If it's an array - recursively order any @@ -258,15 +270,9 @@ class THORChainApp { } } - async getAddressAndPubKey(_path: string, hrp: any) { + async getAddressAndPubKey(path: number[], hrp: any): Promise { try { - // TODO(gomes): this is obviously temporary, find a better way to do this and pass our bip32 path in and make it work here - // eslint-disable-next-line no-console - console.log({ _path }); - const path = [44, 931, 0, 0, 0]; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore TODO(gomes): fixme swapkit types are turbo derp - return await this.serializePath(path) + return await this.serializePath(path as any) .then((serializedPath) => { const data = Buffer.concat([THORChainApp.serializeHRP(hrp), serializedPath as any]); return this.transport @@ -332,24 +338,17 @@ class THORChainApp { } } - async sign(_path: string, message: core.ThorchainSignTx) { - // eslint-disable-next-line no-console - console.log({ _path, message }); - const path = [44, 931, 0, 0, 0]; - - const fee = { amount: [], gas: THORCHAIN_SEND_GAS_FEE }; - // TODO(gomes): this only handles sends for now - do we want to support deposit messages as well? + async sign(msg: core.ThorchainSignTx): Promise { const rawTx = stringifyKeysInOrder({ - account_number: message.account_number, + account_number: msg.account_number, chain_id: THOR_CHAIN, - fee, - memo: message.tx.memo, - msgs: message.tx.msg, - sequence: message.sequence, + fee: { amount: [msg.fee], gas: msg.tx.fee.gas}, + memo: msg.tx.memo, + msgs: msg.tx.msg, + sequence: msg.sequence, }); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore TODO(gomes): fixme swapkit types are turbo derp - return this.signGetChunks(path, rawTx).then((chunks) => { + + return this.signGetChunks(msg.addressNList as any, rawTx).then((chunks) => { return this.signSendChunk(1, chunks.length, chunks[0]).then(async (response) => { let result = { return_code: response.return_code, @@ -367,7 +366,6 @@ class THORChainApp { return { return_code: result.return_code, error_message: result.error_message, - // /// signature: result.signature, }; }, processErrorResponse); diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index 4e9be175f..60ae2c0b4 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -1,52 +1,103 @@ +import type { AccountData, AminoSignResponse, OfflineAminoSigner, StdSignDoc, StdTx } from "@cosmjs/amino"; +import { fromByteArray } from "base64-js"; +import { fromBase64 } from '@cosmjs/encoding'; +import type { SignerData } from "@cosmjs/stargate"; import * as core from "@shapeshiftoss/hdwallet-core"; +import PLazy from "p-lazy"; import { LedgerTransport } from ".."; +import { getSignature } from "./utils"; export * from "./common"; export * from "./helpers"; export * from "./hw-app-thor"; // TODO(gomes): move all below to ./thorchain +const protoTxBuilder = PLazy.from(() => import("@shapeshiftoss/proto-tx-builder")); + export const thorchainGetAddress = async ( transport: LedgerTransport, msg: core.ThorchainGetAddress ): Promise => { const addressAndPubkey = await transport.call( "Rune", - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore TODO(gomes): fixme "getAddressAndPubKey", - core.addressNListToBIP32(msg.addressNList), + msg.addressNList, "thor" ); - // TODO(gomes): find a way to type payload for hw-app-thor - const maybeAddress = (addressAndPubkey.payload as any)?.bech32_address as string | undefined; - if (!maybeAddress) return null; + if ('error' in addressAndPubkey.payload) { + throw new Error(addressAndPubkey.payload.error) + } - return maybeAddress; + return addressAndPubkey.payload.bech32_address }; export const thorchainSignTx = async ( transport: LedgerTransport, msg: core.ThorchainSignTx ): Promise => { - const maybeSigned = await transport.call( + + const addressAndPubkey = await transport.call( + "Rune", + "getAddressAndPubKey", + msg.addressNList, + "thor" + ); + + if ('error' in addressAndPubkey.payload) { + throw new Error(addressAndPubkey.payload.error) + } + + const address = addressAndPubkey.payload.bech32_address; + const pubkey = addressAndPubkey.payload.compressed_pk; + + const signResponse = await transport.call( "Rune", - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore TODO(gomes): fixme "sign", - core.addressNListToBIP32(msg.addressNList), msg ); - if (!maybeSigned) throw new Error("TODO error handling"); + if ('error' in signResponse.payload) { + throw new Error(signResponse.payload.error) + } + + console.log({ signResponse: signResponse.payload }) + + const signature = signResponse.payload.signature; + + const offlineSigner: OfflineAminoSigner = { + async getAccounts(): Promise { + return [ + { + address, + algo: "secp256k1", + pubkey, + }, + ]; + }, + + async signAmino(signerAddress: string, signDoc: StdSignDoc): Promise { + if (signerAddress !== address) throw new Error("expected signerAddress to match address"); - // TODO(gomes): find a way to type payload for hw-app-thor - const signed = (maybeSigned.payload as any)?.signature as Uint8Array | undefined; + return { + signed: signDoc, + signature: { + pub_key: { + type: "tendermint/PubKeySecp256k1", + value: fromByteArray(pubkey), + }, + signature: fromBase64(getSignature(signature)).toString(), + }, + }; + }, + }; - if (!signed) throw new Error("TODO error handling"); + const signerData: SignerData = { + sequence: Number(msg.sequence), + accountNumber: Number(msg.account_number), + chainId: msg.chain_id, + }; - // TODO(gomes): be fully compliant to ThorchainSignedTx type - return { serialized: Buffer.from(signed).toString("base64") } as unknown as core.ThorchainSignedTx; + return (await protoTxBuilder).sign(address, msg.tx as StdTx, offlineSigner, signerData, "thor"); }; diff --git a/packages/hdwallet-ledger/src/thorchain/utils.ts b/packages/hdwallet-ledger/src/thorchain/utils.ts new file mode 100644 index 000000000..6359e86ca --- /dev/null +++ b/packages/hdwallet-ledger/src/thorchain/utils.ts @@ -0,0 +1,64 @@ +import { fromByteArray } from "base64-js"; + +export const getSignature = (signatureArray: any) => { + // Check Type Length Value encoding + if (signatureArray.length < 64) { + throw new Error("Invalid Signature: Too short"); + } + if (signatureArray[0] !== 0x30) { + throw new Error("Invalid Ledger Signature TLV encoding: expected first byte 0x30"); + } + if (signatureArray[1] + 2 !== signatureArray.length) { + throw new Error("Invalid Signature: signature length does not match TLV"); + } + if (signatureArray[2] !== 0x02) { + throw new Error("Invalid Ledger Signature TLV encoding: expected length type 0x02"); + } + + // r signature + const rLength = signatureArray[3]; + let rSignature = signatureArray.slice(4, rLength + 4); + + // Drop leading zero on some 'r' signatures that are 33 bytes. + if (rSignature.length === 33 && rSignature[0] === 0) { + rSignature = rSignature.slice(1, 33); + } else if (rSignature.length === 33) { + throw new Error('Invalid signature: "r" too long'); + } + + // add leading zero's to pad to 32 bytes + while (rSignature.length < 32) { + rSignature.unshift(0); + } + + // s signature + if (signatureArray[rLength + 4] !== 0x02) { + throw new Error("Invalid Ledger Signature TLV encoding: expected length type 0x02"); + } + + const sLength = signatureArray[rLength + 5]; + + if (4 + rLength + 2 + sLength !== signatureArray.length) { + throw new Error("Invalid Ledger Signature: TLV byte lengths do not match message length"); + } + + let sSignature = signatureArray.slice(rLength + 6, signatureArray.length); + + // Drop leading zero on 's' signatures that are 33 bytes. This shouldn't occur since ledger signs using "Small s" math. But just to be sure... + if (sSignature.length === 33 && sSignature[0] === 0) { + sSignature = sSignature.slice(1, 33); + } else if (sSignature.length === 33) { + throw new Error('Invalid signature: "s" too long'); + } + + // add leading zero's to pad to 32 bytes + while (sSignature.length < 32) { + sSignature.unshift(0); + } + + if (rSignature.length !== 32 || sSignature.length !== 32) { + throw new Error("Invalid signatures: must be 32 bytes each"); + } + + return fromByteArray(Buffer.concat([rSignature, sSignature])); +}; diff --git a/packages/hdwallet-ledger/src/transport.ts b/packages/hdwallet-ledger/src/transport.ts index fe6889ba7..f45cc14f8 100644 --- a/packages/hdwallet-ledger/src/transport.ts +++ b/packages/hdwallet-ledger/src/transport.ts @@ -6,6 +6,8 @@ import type getDeviceInfo from "@ledgerhq/live-common/lib/hw/getDeviceInfo"; import type openApp from "@ledgerhq/live-common/lib/hw/openApp"; import * as core from "@shapeshiftoss/hdwallet-core"; +import { THORChainApp } from "./thorchain"; + type MethodsOnly = { [k in keyof T as T[k] extends (...args: any) => any ? k : never]: T[k]; }; @@ -33,6 +35,8 @@ type LedgerTransportMethodMap = T extends nul ? MethodsOnly : T extends "Eth" ? MethodsOnly + : T extends "Rune" + ? MethodsOnly : never; export type LedgerTransportMethodName = LedgerTransportMethodMap extends never ? never diff --git a/yarn.lock b/yarn.lock index 96c430e36..00fe1f15d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -878,7 +878,7 @@ long "^4.0.0" protobufjs "~6.10.2" -"@cosmjs/proto-signing@0.28.13", "@cosmjs/proto-signing@^0.28.13": +"@cosmjs/proto-signing@0.28.13", "@cosmjs/proto-signing@^0.28.0", "@cosmjs/proto-signing@^0.28.13": version "0.28.13" resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.28.13.tgz#95ac12f0da0f0814f348f5ae996c3e96d015df61" integrity sha512-nSl/2ZLsUJYz3Ad0RY3ihZUgRHIow2OnYqKsESMu+3RA/jTi9bDYhiBu8mNMHI0xrEJry918B2CyI56pOUHdPQ== @@ -990,7 +990,7 @@ protobufjs "~6.11.3" xstream "^11.14.0" -"@cosmjs/stargate@^0.28.13": +"@cosmjs/stargate@^0.28.0", "@cosmjs/stargate@^0.28.13": version "0.28.13" resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.28.13.tgz#a73d837a46ee8944e6eafe162f2ff6943c14350e" integrity sha512-dVBMazDz8/eActHsRcZjDHHptOBMqvibj5CFgEtZBp22gP6ASzoAUXTlkSVk5FBf4sfuUHoff6st134/+PGMAg== @@ -1062,7 +1062,7 @@ readonly-date "^1.0.0" xstream "^11.14.0" -"@cosmjs/tendermint-rpc@0.28.13": +"@cosmjs/tendermint-rpc@0.28.13", "@cosmjs/tendermint-rpc@^0.28.0": version "0.28.13" resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.28.13.tgz#0bf587ae66fa3f88319edbd258492d28e73f9f29" integrity sha512-GB+ZmfuJIGQm0hsRtLYjeR3lOxF7Z6XyCBR0cX5AAYOZzSEBJjevPgUHD6tLn8zIhvzxaW3/VKnMB+WmlxdH4w== @@ -1295,6 +1295,21 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/strings" "^5.4.0" +"@ethersproject/abi@5.6.1": + version "5.6.1" + resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.1.tgz#f7de888edeb56b0a657b672bdd1b3a1135cd14f7" + integrity sha512-0cqssYh6FXjlwKWBmLm3+zH2BNARoS5u/hxbz+LpQmcDB3w0W553h2btWui1/uZp2GBM/SI3KniTuMcYyHpA5w== + dependencies: + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/hash" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/abi@5.6.4", "@ethersproject/abi@^5.6.3": version "5.6.4" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.4.tgz#f6e01b6ed391a505932698ecc0d9e7a99ee60362" @@ -1310,7 +1325,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" -"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.7.0": +"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.6.0", "@ethersproject/abi@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.7.0.tgz#b3f3e045bbbeed1af3947335c247ad625a44e449" integrity sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA== @@ -1353,6 +1368,19 @@ "@ethersproject/transactions" "^5.4.0" "@ethersproject/web" "^5.4.0" +"@ethersproject/abstract-provider@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.6.0.tgz#0c4ac7054650dbd9c476cf5907f588bbb6ef3061" + integrity sha512-oPMFlKLN+g+y7a79cLK3WiLcjWFnZQtXWgnLAbHZcN3s7L4v90UHpTOrLk+m3yr0gt+/h9STTM6zrr7PM8uoRw== + dependencies: + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/networks" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/transactions" "^5.6.0" + "@ethersproject/web" "^5.6.0" + "@ethersproject/abstract-provider@5.6.1", "@ethersproject/abstract-provider@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.6.1.tgz#02ddce150785caf0c77fe036a0ebfcee61878c59" @@ -1366,7 +1394,7 @@ "@ethersproject/transactions" "^5.6.2" "@ethersproject/web" "^5.6.1" -"@ethersproject/abstract-provider@5.7.0", "@ethersproject/abstract-provider@^5.7.0": +"@ethersproject/abstract-provider@5.7.0", "@ethersproject/abstract-provider@^5.6.0", "@ethersproject/abstract-provider@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz#b0a8550f88b6bf9d51f90e4795d48294630cb9ef" integrity sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw== @@ -1403,6 +1431,17 @@ "@ethersproject/logger" "^5.4.0" "@ethersproject/properties" "^5.4.0" +"@ethersproject/abstract-signer@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.6.0.tgz#9cd7ae9211c2b123a3b29bf47aab17d4d016e3e7" + integrity sha512-WOqnG0NJKtI8n0wWZPReHtaLkDByPL67tn4nBaDAhmVq8sjHTPbCdz4DRhVu/cfTOvfy9w3iq5QZ7BX7zw56BQ== + dependencies: + "@ethersproject/abstract-provider" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/abstract-signer@5.6.2", "@ethersproject/abstract-signer@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.6.2.tgz#491f07fc2cbd5da258f46ec539664713950b0b33" @@ -1414,7 +1453,7 @@ "@ethersproject/logger" "^5.6.0" "@ethersproject/properties" "^5.6.0" -"@ethersproject/abstract-signer@5.7.0", "@ethersproject/abstract-signer@^5.7.0": +"@ethersproject/abstract-signer@5.7.0", "@ethersproject/abstract-signer@^5.6.0", "@ethersproject/abstract-signer@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz#13f4f32117868452191a4649723cb086d2b596b2" integrity sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ== @@ -1458,6 +1497,17 @@ "@ethersproject/logger" "^5.4.0" "@ethersproject/rlp" "^5.4.0" +"@ethersproject/address@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.6.0.tgz#13c49836d73e7885fc148ad633afad729da25012" + integrity sha512-6nvhYXjbXsHPS+30sHZ+U4VMagFC/9zAk6Gd/h3S21YW4+yfb0WfRtaAIZ4kfM4rrVwqiy284LP0GtL5HXGLxQ== + dependencies: + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/rlp" "^5.6.0" + "@ethersproject/address@5.6.1", "@ethersproject/address@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.6.1.tgz#ab57818d9aefee919c5721d28cd31fd95eff413d" @@ -1469,7 +1519,7 @@ "@ethersproject/logger" "^5.6.0" "@ethersproject/rlp" "^5.6.1" -"@ethersproject/address@5.7.0", "@ethersproject/address@^5.7.0": +"@ethersproject/address@5.7.0", "@ethersproject/address@^5.6.0", "@ethersproject/address@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.7.0.tgz#19b56c4d74a3b0a46bfdbb6cfcc0a153fc697f37" integrity sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA== @@ -1498,6 +1548,13 @@ dependencies: "@ethersproject/bytes" "^5.4.0" +"@ethersproject/base64@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.6.0.tgz#a12c4da2a6fb86d88563216b0282308fc15907c9" + integrity sha512-2Neq8wxJ9xHxCF9TUgmKeSh9BXJ6OAxWfeGWvbauPh8FuHEjamgHilllx8KkSd5ErxyHIX7Xv3Fkcud2kY9ezw== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/base64@5.6.1", "@ethersproject/base64@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.6.1.tgz#2c40d8a0310c9d1606c2c37ae3092634b41d87cb" @@ -1505,7 +1562,7 @@ dependencies: "@ethersproject/bytes" "^5.6.1" -"@ethersproject/base64@5.7.0", "@ethersproject/base64@^5.7.0": +"@ethersproject/base64@5.7.0", "@ethersproject/base64@^5.6.0", "@ethersproject/base64@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.7.0.tgz#ac4ee92aa36c1628173e221d0d01f53692059e1c" integrity sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ== @@ -1520,6 +1577,14 @@ "@ethersproject/bytes" "^5.4.0" "@ethersproject/properties" "^5.4.0" +"@ethersproject/basex@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.6.0.tgz#9ea7209bf0a1c3ddc2a90f180c3a7f0d7d2e8a69" + integrity sha512-qN4T+hQd/Md32MoJpc69rOwLYRUXwjTlhHDIeUkUmiN/JyWkkLLMoG0TqvSQKNqZOMgN5stbUYN6ILC+eD7MEQ== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/basex@5.6.1", "@ethersproject/basex@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.6.1.tgz#badbb2f1d4a6f52ce41c9064f01eab19cc4c5305" @@ -1528,7 +1593,7 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/properties" "^5.6.0" -"@ethersproject/basex@5.7.0", "@ethersproject/basex@^5.7.0": +"@ethersproject/basex@5.7.0", "@ethersproject/basex@^5.6.0", "@ethersproject/basex@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.7.0.tgz#97034dc7e8938a8ca943ab20f8a5e492ece4020b" integrity sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw== @@ -1545,6 +1610,15 @@ "@ethersproject/logger" "^5.4.0" bn.js "^4.11.9" +"@ethersproject/bignumber@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.6.0.tgz#116c81b075c57fa765a8f3822648cf718a8a0e26" + integrity sha512-VziMaXIUHQlHJmkv1dlcd6GY2PmT0khtAqaMctCIDogxkrarMzA9L94KN1NeXqqOfFD6r0sJT3vCTOFSmZ07DA== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + bn.js "^4.11.9" + "@ethersproject/bignumber@5.6.2", "@ethersproject/bignumber@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.6.2.tgz#72a0717d6163fab44c47bcc82e0c550ac0315d66" @@ -1554,7 +1628,7 @@ "@ethersproject/logger" "^5.6.0" bn.js "^5.2.1" -"@ethersproject/bignumber@5.7.0", "@ethersproject/bignumber@^5.7.0": +"@ethersproject/bignumber@5.7.0", "@ethersproject/bignumber@^5.6.0", "@ethersproject/bignumber@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.7.0.tgz#e2f03837f268ba655ffba03a57853e18a18dc9c2" integrity sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw== @@ -1595,7 +1669,7 @@ dependencies: "@ethersproject/logger" "^5.6.0" -"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.7.0": +"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.6.0", "@ethersproject/bytes@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.7.0.tgz#a00f6ea8d7e7534d6d87f47188af1148d71f155d" integrity sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A== @@ -1616,6 +1690,13 @@ dependencies: "@ethersproject/bignumber" "^5.4.0" +"@ethersproject/constants@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.6.0.tgz#55e3eb0918584d3acc0688e9958b0cedef297088" + integrity sha512-SrdaJx2bK0WQl23nSpV/b1aq293Lh0sUaZT/yYKPDKn4tlAbkH96SPJwIhwSwTsoQQZxuh1jnqsKwyymoiBdWA== + dependencies: + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/constants@5.6.1", "@ethersproject/constants@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.6.1.tgz#e2e974cac160dd101cf79fdf879d7d18e8cb1370" @@ -1623,7 +1704,7 @@ dependencies: "@ethersproject/bignumber" "^5.6.2" -"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.7.0": +"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.6.0", "@ethersproject/constants@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.7.0.tgz#df80a9705a7e08984161f09014ea012d1c75295e" integrity sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA== @@ -1653,6 +1734,22 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/transactions" "^5.4.0" +"@ethersproject/contracts@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.6.0.tgz#60f2cfc7addd99a865c6c8cfbbcec76297386067" + integrity sha512-74Ge7iqTDom0NX+mux8KbRUeJgu1eHZ3iv6utv++sLJG80FVuU9HnHeKVPfjd9s3woFhaFoQGf3B3iH/FrQmgw== + dependencies: + "@ethersproject/abi" "^5.6.0" + "@ethersproject/abstract-provider" "^5.6.0" + "@ethersproject/abstract-signer" "^5.6.0" + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/transactions" "^5.6.0" + "@ethersproject/contracts@5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.6.2.tgz#20b52e69ebc1b74274ff8e3d4e508de971c287bc" @@ -1699,6 +1796,20 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/strings" "^5.4.0" +"@ethersproject/hash@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.6.0.tgz#d24446a5263e02492f9808baa99b6e2b4c3429a2" + integrity sha512-fFd+k9gtczqlr0/BruWLAu7UAOas1uRRJvOR84uDf4lNZ+bTkGl366qvniUZHKtlqxBRU65MkOobkmvmpHU+jA== + dependencies: + "@ethersproject/abstract-signer" "^5.6.0" + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/hash@5.6.1", "@ethersproject/hash@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.6.1.tgz#224572ea4de257f05b4abf8ae58b03a67e99b0f4" @@ -1713,7 +1824,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" -"@ethersproject/hash@5.7.0", "@ethersproject/hash@^5.7.0": +"@ethersproject/hash@5.7.0", "@ethersproject/hash@^5.6.0", "@ethersproject/hash@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.7.0.tgz#eb7aca84a588508369562e16e514b539ba5240a7" integrity sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g== @@ -1760,6 +1871,24 @@ "@ethersproject/transactions" "^5.4.0" "@ethersproject/wordlists" "^5.4.0" +"@ethersproject/hdnode@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.6.0.tgz#9dcbe8d629bbbcf144f2cae476337fe92d320998" + integrity sha512-61g3Jp3nwDqJcL/p4nugSyLrpl/+ChXIOtCEM8UDmWeB3JCAt5FoLdOMXQc3WWkc0oM2C0aAn6GFqqMcS/mHTw== + dependencies: + "@ethersproject/abstract-signer" "^5.6.0" + "@ethersproject/basex" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/pbkdf2" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/sha2" "^5.6.0" + "@ethersproject/signing-key" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/transactions" "^5.6.0" + "@ethersproject/wordlists" "^5.6.0" + "@ethersproject/hdnode@5.6.2", "@ethersproject/hdnode@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.6.2.tgz#26f3c83a3e8f1b7985c15d1db50dc2903418b2d2" @@ -1778,7 +1907,7 @@ "@ethersproject/transactions" "^5.6.2" "@ethersproject/wordlists" "^5.6.1" -"@ethersproject/hdnode@5.7.0", "@ethersproject/hdnode@^5.7.0": +"@ethersproject/hdnode@5.7.0", "@ethersproject/hdnode@^5.6.0", "@ethersproject/hdnode@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.7.0.tgz#e627ddc6b466bc77aebf1a6b9e47405ca5aef9cf" integrity sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg== @@ -1815,6 +1944,25 @@ aes-js "3.0.0" scrypt-js "3.0.1" +"@ethersproject/json-wallets@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.6.0.tgz#4c2fc27f17e36c583e7a252fb938bc46f98891e5" + integrity sha512-fmh86jViB9r0ibWXTQipxpAGMiuxoqUf78oqJDlCAJXgnJF024hOOX7qVgqsjtbeoxmcLwpPsXNU0WEe/16qPQ== + dependencies: + "@ethersproject/abstract-signer" "^5.6.0" + "@ethersproject/address" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/hdnode" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/pbkdf2" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/random" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/transactions" "^5.6.0" + aes-js "3.0.0" + scrypt-js "3.0.1" + "@ethersproject/json-wallets@5.6.1", "@ethersproject/json-wallets@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.6.1.tgz#3f06ba555c9c0d7da46756a12ac53483fe18dd91" @@ -1834,7 +1982,7 @@ aes-js "3.0.0" scrypt-js "3.0.1" -"@ethersproject/json-wallets@5.7.0", "@ethersproject/json-wallets@^5.7.0": +"@ethersproject/json-wallets@5.7.0", "@ethersproject/json-wallets@^5.6.0", "@ethersproject/json-wallets@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.7.0.tgz#5e3355287b548c32b368d91014919ebebddd5360" integrity sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g== @@ -1861,6 +2009,14 @@ "@ethersproject/bytes" "^5.4.0" js-sha3 "0.5.7" +"@ethersproject/keccak256@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.6.0.tgz#fea4bb47dbf8f131c2e1774a1cecbfeb9d606459" + integrity sha512-tk56BJ96mdj/ksi7HWZVWGjCq0WVl/QvfhFQNeL8fxhBlGoP+L80uDCiQcpJPd+2XxkivS3lwRm3E0CXTfol0w== + dependencies: + "@ethersproject/bytes" "^5.6.0" + js-sha3 "0.8.0" + "@ethersproject/keccak256@5.6.1", "@ethersproject/keccak256@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.6.1.tgz#b867167c9b50ba1b1a92bccdd4f2d6bd168a91cc" @@ -1869,7 +2025,7 @@ "@ethersproject/bytes" "^5.6.1" js-sha3 "0.8.0" -"@ethersproject/keccak256@5.7.0", "@ethersproject/keccak256@^5.7.0": +"@ethersproject/keccak256@5.7.0", "@ethersproject/keccak256@^5.6.0", "@ethersproject/keccak256@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.7.0.tgz#3186350c6e1cd6aba7940384ec7d6d9db01f335a" integrity sha512-2UcPboeL/iW+pSg6vZ6ydF8tCnv3Iu/8tUmLLzWWGzxWKFFqOBQFLo6uLUv6BDrLgCDfN28RJ/wtByx+jZ4KBg== @@ -1917,6 +2073,13 @@ dependencies: "@ethersproject/logger" "^5.4.0" +"@ethersproject/networks@5.6.2": + version "5.6.2" + resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.2.tgz#2bacda62102c0b1fcee408315f2bed4f6fbdf336" + integrity sha512-9uEzaJY7j5wpYGTojGp8U89mSsgQLc40PCMJLMCnFXTs7nhBveZ0t7dbqWUNrepWTszDbFkYD6WlL8DKx5huHA== + dependencies: + "@ethersproject/logger" "^5.6.0" + "@ethersproject/networks@5.6.4", "@ethersproject/networks@^5.6.3": version "5.6.4" resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.4.tgz#51296d8fec59e9627554f5a8a9c7791248c8dc07" @@ -1924,7 +2087,7 @@ dependencies: "@ethersproject/logger" "^5.6.0" -"@ethersproject/networks@5.7.1", "@ethersproject/networks@^5.7.0": +"@ethersproject/networks@5.7.1", "@ethersproject/networks@^5.6.0", "@ethersproject/networks@^5.7.0": version "5.7.1" resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.7.1.tgz#118e1a981d757d45ccea6bb58d9fd3d9db14ead6" integrity sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ== @@ -1946,6 +2109,14 @@ "@ethersproject/bytes" "^5.4.0" "@ethersproject/sha2" "^5.4.0" +"@ethersproject/pbkdf2@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.6.0.tgz#04fcc2d7c6bff88393f5b4237d906a192426685a" + integrity sha512-Wu1AxTgJo3T3H6MIu/eejLFok9TYoSdgwRr5oGY1LTLfmGesDoSx05pemsbrPT2gG4cQME+baTSCp5sEo2erZQ== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/sha2" "^5.6.0" + "@ethersproject/pbkdf2@5.6.1", "@ethersproject/pbkdf2@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.6.1.tgz#f462fe320b22c0d6b1d72a9920a3963b09eb82d1" @@ -1954,7 +2125,7 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/sha2" "^5.6.1" -"@ethersproject/pbkdf2@5.7.0", "@ethersproject/pbkdf2@^5.7.0": +"@ethersproject/pbkdf2@5.7.0", "@ethersproject/pbkdf2@^5.6.0", "@ethersproject/pbkdf2@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.7.0.tgz#d2267d0a1f6e123f3771007338c47cccd83d3102" integrity sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw== @@ -2022,6 +2193,31 @@ bech32 "1.1.4" ws "7.4.6" +"@ethersproject/providers@5.6.5": + version "5.6.5" + resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.6.5.tgz#aefecf78459817a323452e05a16d56afcf807e27" + integrity sha512-TRS+c2Ud+cMpWodmGAc9xbnYRPWzRNYt2zkCSnj58nJoamBQ6x4cUbBeo0lTC3y+6RDVIBeJv18OqsDbSktLVg== + dependencies: + "@ethersproject/abstract-provider" "^5.6.0" + "@ethersproject/abstract-signer" "^5.6.0" + "@ethersproject/address" "^5.6.0" + "@ethersproject/basex" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/hash" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/networks" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/random" "^5.6.0" + "@ethersproject/rlp" "^5.6.0" + "@ethersproject/sha2" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/transactions" "^5.6.0" + "@ethersproject/web" "^5.6.0" + bech32 "1.1.4" + ws "7.4.6" + "@ethersproject/providers@5.6.8": version "5.6.8" resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.6.8.tgz#22e6c57be215ba5545d3a46cf759d265bb4e879d" @@ -2082,6 +2278,14 @@ "@ethersproject/bytes" "^5.4.0" "@ethersproject/logger" "^5.4.0" +"@ethersproject/random@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.6.0.tgz#1505d1ab6a250e0ee92f436850fa3314b2cb5ae6" + integrity sha512-si0PLcLjq+NG/XHSZz90asNf+YfKEqJGVdxoEkSukzbnBgC8rydbgbUgBbBGLeHN4kAJwUFEKsu3sCXT93YMsw== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/random@5.6.1", "@ethersproject/random@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.6.1.tgz#66915943981bcd3e11bbd43733f5c3ba5a790255" @@ -2090,7 +2294,7 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/logger" "^5.6.0" -"@ethersproject/random@5.7.0", "@ethersproject/random@^5.7.0": +"@ethersproject/random@5.7.0", "@ethersproject/random@^5.6.0", "@ethersproject/random@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.7.0.tgz#af19dcbc2484aae078bb03656ec05df66253280c" integrity sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ== @@ -2106,6 +2310,14 @@ "@ethersproject/bytes" "^5.4.0" "@ethersproject/logger" "^5.4.0" +"@ethersproject/rlp@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.6.0.tgz#55a7be01c6f5e64d6e6e7edb6061aa120962a717" + integrity sha512-dz9WR1xpcTL+9DtOT/aDO+YyxSSdO8YIS0jyZwHHSlAmnxA6cKU3TrTd4Xc/bHayctxTgGLYNuVVoiXE4tTq1g== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/rlp@5.6.1", "@ethersproject/rlp@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.6.1.tgz#df8311e6f9f24dcb03d59a2bac457a28a4fe2bd8" @@ -2114,7 +2326,7 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/logger" "^5.6.0" -"@ethersproject/rlp@5.7.0", "@ethersproject/rlp@^5.7.0": +"@ethersproject/rlp@5.7.0", "@ethersproject/rlp@^5.6.0", "@ethersproject/rlp@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.7.0.tgz#de39e4d5918b9d74d46de93af80b7685a9c21304" integrity sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w== @@ -2139,6 +2351,15 @@ "@ethersproject/logger" "^5.4.0" hash.js "1.1.7" +"@ethersproject/sha2@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.0.tgz#364c4c11cc753bda36f31f001628706ebadb64d9" + integrity sha512-1tNWCPFLu1n3JM9t4/kytz35DkuF9MxqkGGEHNauEbaARdm2fafnOyw1s0tIQDPKF/7bkP1u3dbrmjpn5CelyA== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + hash.js "1.1.7" + "@ethersproject/sha2@5.6.1", "@ethersproject/sha2@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.1.tgz#211f14d3f5da5301c8972a8827770b6fd3e51656" @@ -2148,7 +2369,7 @@ "@ethersproject/logger" "^5.6.0" hash.js "1.1.7" -"@ethersproject/sha2@5.7.0", "@ethersproject/sha2@^5.7.0": +"@ethersproject/sha2@5.7.0", "@ethersproject/sha2@^5.6.0", "@ethersproject/sha2@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.7.0.tgz#9a5f7a7824ef784f7f7680984e593a800480c9fb" integrity sha512-gKlH42riwb3KYp0reLsFTokByAKoJdgFCwI+CCiX/k+Jm2mbNs6oOaCjYQSlI1+XBVejwH2KrmCbMAT/GnRDQw== @@ -2169,6 +2390,18 @@ elliptic "6.5.4" hash.js "1.1.7" +"@ethersproject/signing-key@5.6.1": + version "5.6.1" + resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.6.1.tgz#31b0a531520616254eb0465b9443e49515c4d457" + integrity sha512-XvqQ20DH0D+bS3qlrrgh+axRMth5kD1xuvqUQUTeezxUTXBOeR6hWz2/C6FBEu39FRytyybIWrYf7YLSAKr1LQ== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + bn.js "^4.11.9" + elliptic "6.5.4" + hash.js "1.1.7" + "@ethersproject/signing-key@5.6.2", "@ethersproject/signing-key@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.6.2.tgz#8a51b111e4d62e5a62aee1da1e088d12de0614a3" @@ -2181,7 +2414,7 @@ elliptic "6.5.4" hash.js "1.1.7" -"@ethersproject/signing-key@5.7.0", "@ethersproject/signing-key@^5.7.0": +"@ethersproject/signing-key@5.7.0", "@ethersproject/signing-key@^5.6.0", "@ethersproject/signing-key@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.7.0.tgz#06b2df39411b00bc57c7c09b01d1e41cf1b16ab3" integrity sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q== @@ -2216,6 +2449,18 @@ "@ethersproject/sha2" "^5.4.0" "@ethersproject/strings" "^5.4.0" +"@ethersproject/solidity@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.6.0.tgz#64657362a596bf7f5630bdc921c07dd78df06dc3" + integrity sha512-YwF52vTNd50kjDzqKaoNNbC/r9kMDPq3YzDWmsjFTRBcIF1y4JCQJ8gB30wsTfHbaxgxelI5BfxQSxD/PbJOww== + dependencies: + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/sha2" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/solidity@5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.6.1.tgz#5845e71182c66d32e6ec5eefd041fca091a473e2" @@ -2249,6 +2494,15 @@ "@ethersproject/constants" "^5.4.0" "@ethersproject/logger" "^5.4.0" +"@ethersproject/strings@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.6.0.tgz#9891b26709153d996bf1303d39a7f4bc047878fd" + integrity sha512-uv10vTtLTZqrJuqBZR862ZQjTIa724wGPWQqZrofaPI/kUsf53TBG0I0D+hQ1qyNtllbNzaW+PDPHHUI6/65Mg== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/strings@5.6.1", "@ethersproject/strings@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.6.1.tgz#dbc1b7f901db822b5cafd4ebf01ca93c373f8952" @@ -2258,7 +2512,7 @@ "@ethersproject/constants" "^5.6.1" "@ethersproject/logger" "^5.6.0" -"@ethersproject/strings@5.7.0", "@ethersproject/strings@^5.7.0": +"@ethersproject/strings@5.7.0", "@ethersproject/strings@^5.6.0", "@ethersproject/strings@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.7.0.tgz#54c9d2a7c57ae8f1205c88a9d3a56471e14d5ed2" integrity sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg== @@ -2291,6 +2545,21 @@ "@ethersproject/rlp" "^5.4.0" "@ethersproject/signing-key" "^5.4.0" +"@ethersproject/transactions@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.6.0.tgz#4b594d73a868ef6e1529a2f8f94a785e6791ae4e" + integrity sha512-4HX+VOhNjXHZyGzER6E/LVI2i6lf9ejYeWD6l4g50AdmimyuStKc39kvKf1bXWQMg7QNVh+uC7dYwtaZ02IXeg== + dependencies: + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/rlp" "^5.6.0" + "@ethersproject/signing-key" "^5.6.0" + "@ethersproject/transactions@5.6.2", "@ethersproject/transactions@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.6.2.tgz#793a774c01ced9fe7073985bb95a4b4e57a6370b" @@ -2306,7 +2575,7 @@ "@ethersproject/rlp" "^5.6.1" "@ethersproject/signing-key" "^5.6.2" -"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.7.0": +"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.6.0", "@ethersproject/transactions@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.7.0.tgz#91318fc24063e057885a6af13fdb703e1f993d3b" integrity sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ== @@ -2345,6 +2614,15 @@ "@ethersproject/constants" "^5.4.0" "@ethersproject/logger" "^5.4.0" +"@ethersproject/units@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.6.0.tgz#e5cbb1906988f5740254a21b9ded6bd51e826d9c" + integrity sha512-tig9x0Qmh8qbo1w8/6tmtyrm/QQRviBh389EQ+d8fP4wDsBrJBf08oZfoiz1/uenKK9M78yAP4PoR7SsVoTjsw== + dependencies: + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/units@5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.6.1.tgz#ecc590d16d37c8f9ef4e89e2005bda7ddc6a4e6f" @@ -2384,6 +2662,27 @@ "@ethersproject/transactions" "^5.4.0" "@ethersproject/wordlists" "^5.4.0" +"@ethersproject/wallet@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.6.0.tgz#33d11a806d783864208f348709a5a3badac8e22a" + integrity sha512-qMlSdOSTyp0MBeE+r7SUhr1jjDlC1zAXB8VD84hCnpijPQiSNbxr6GdiLXxpUs8UKzkDiNYYC5DRI3MZr+n+tg== + dependencies: + "@ethersproject/abstract-provider" "^5.6.0" + "@ethersproject/abstract-signer" "^5.6.0" + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/hash" "^5.6.0" + "@ethersproject/hdnode" "^5.6.0" + "@ethersproject/json-wallets" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/random" "^5.6.0" + "@ethersproject/signing-key" "^5.6.0" + "@ethersproject/transactions" "^5.6.0" + "@ethersproject/wordlists" "^5.6.0" + "@ethersproject/wallet@5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.6.2.tgz#cd61429d1e934681e413f4bc847a5f2f87e3a03c" @@ -2437,6 +2736,17 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/strings" "^5.4.0" +"@ethersproject/web@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.6.0.tgz#4bf8b3cbc17055027e1a5dd3c357e37474eaaeb8" + integrity sha512-G/XHj0hV1FxI2teHRfCGvfBUHFmU+YOSbCxlAMqJklxSa7QMiHFQfAxvwY2PFqgvdkxEKwRNr/eCjfAPEm2Ctg== + dependencies: + "@ethersproject/base64" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/web@5.6.1", "@ethersproject/web@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.6.1.tgz#6e2bd3ebadd033e6fe57d072db2b69ad2c9bdf5d" @@ -2448,7 +2758,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" -"@ethersproject/web@5.7.1", "@ethersproject/web@^5.7.0": +"@ethersproject/web@5.7.1", "@ethersproject/web@^5.6.0", "@ethersproject/web@^5.7.0": version "5.7.1" resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.7.1.tgz#de1f285b373149bee5928f4eb7bcb87ee5fbb4ae" integrity sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w== @@ -2470,6 +2780,17 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/strings" "^5.4.0" +"@ethersproject/wordlists@5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.6.0.tgz#79e62c5276e091d8575f6930ba01a29218ded032" + integrity sha512-q0bxNBfIX3fUuAo9OmjlEYxP40IB8ABgb7HjEZCL5IKubzV3j30CWi2rqQbjTS2HfoyQbfINoKcTVWP4ejwR7Q== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/hash" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/wordlists@5.6.1", "@ethersproject/wordlists@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.6.1.tgz#1e78e2740a8a21e9e99947e47979d72e130aeda1" @@ -2481,7 +2802,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" -"@ethersproject/wordlists@5.7.0", "@ethersproject/wordlists@^5.7.0": +"@ethersproject/wordlists@5.7.0", "@ethersproject/wordlists@^5.6.0", "@ethersproject/wordlists@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.7.0.tgz#8fb2c07185d68c3e09eb3bfd6e779ba2774627f5" integrity sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA== @@ -2859,7 +3180,7 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@keepkey/device-protocol@^7.12.2": +"@keepkey/device-protocol@^7.12.2", "@keepkey/device-protocol@^7.8.1": version "7.12.2" resolved "https://registry.yarnpkg.com/@keepkey/device-protocol/-/device-protocol-7.12.2.tgz#9ff4b322af99264b83bbf68cc1cd349f53b32070" integrity sha512-U2wGgynZx9euKx9sshLzCeMJ/36+2NH8M/YhnUoCrS1xsjPp5xTCXquLFCFzfEL379yL4g03yu2kT41LKI5Dog== @@ -2969,6 +3290,23 @@ tiny-secp256k1 "1.1.6" varuint-bitcoin "1.1.2" +"@ledgerhq/hw-app-btc@^6.7.0": + version "6.27.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-6.27.1.tgz#5f7258f8a61532e14d6720678a80133320fc5666" + integrity sha512-2XOH5jtso4QsPYjXldwdcXw6amb8kCyiHtXw1NySA1QP/xBjxN8JLEXEPFsaK6l2zz55I8kKUtVoEGz7bpg0lg== + dependencies: + "@ledgerhq/hw-transport" "^6.27.1" + "@ledgerhq/logs" "^6.10.0" + bip32-path "^0.4.2" + bitcoinjs-lib "^5.2.0" + bs58 "^4.0.1" + invariant "^2.2.4" + ripemd160 "2" + semver "^7.3.5" + sha.js "2" + tiny-secp256k1 "1.1.6" + varuint-bitcoin "1.1.2" + "@ledgerhq/hw-app-cosmos@6.7.0": version "6.7.0" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-cosmos/-/hw-app-cosmos-6.7.0.tgz#d2e79213378a06b647aa4ce58c0ea89452425d0d" @@ -3087,7 +3425,7 @@ "@ledgerhq/hw-transport" "^6.7.0" "@ledgerhq/logs" "^6.2.0" -"@ledgerhq/hw-transport@6.7.0", "@ledgerhq/hw-transport@^5.19.1", "@ledgerhq/hw-transport@^5.51.1", "@ledgerhq/hw-transport@^6.20.0", "@ledgerhq/hw-transport@^6.28.8", "@ledgerhq/hw-transport@^6.7.0": +"@ledgerhq/hw-transport@6.7.0", "@ledgerhq/hw-transport@^5.19.1", "@ledgerhq/hw-transport@^5.51.1", "@ledgerhq/hw-transport@^6.20.0", "@ledgerhq/hw-transport@^6.27.1", "@ledgerhq/hw-transport@^6.28.8", "@ledgerhq/hw-transport@^6.7.0": version "6.7.0" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.7.0.tgz#d1f0d70e21b91e6457a32d4c3cec0764e97461ff" integrity sha512-w+PhW6Y4KXYdoCykkE1zt0VL6Ryf72RP8sZP8OH1O90hX/R/q9BMYKl8VNqTbqlrOrORgATlKkbmIJBjbngZew== @@ -5557,10 +5895,50 @@ web-encoding "^1.1.0" wif "^2.0.6" -"@shapeshiftoss/hdwallet-core@1.52.1", "@shapeshiftoss/hdwallet-core@^1.50.4": - version "1.52.1" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.1.tgz#5165e6ecfef3ffa2a3c1ed1aafe6de268224f920" - integrity sha512-ON0kGiYhVUZm2sPp6EbgIwACJAvULIeklddWPZDCv6mvByIsY8D6BTVQtXVavHBB+/Pf6bVc1uMfCO3X5zPaHg== +"@shapeshiftoss/hdwallet-core@1.21.1": + version "1.21.1" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.21.1.tgz#a382f305a9cb502ea1677c34bcd4d603024128dc" + integrity sha512-paDSgf5AhJkC7N6nsQLzyrQVxFZxyJoGwEwiVAwMPJg8ublLorJTiHZAKG23FM89GqGWEyYiXrIgdY8fL1BoIQ== + dependencies: + eventemitter2 "^5.0.1" + lodash "^4.17.21" + rxjs "^6.4.0" + type-assertions "^1.1.0" + +"@shapeshiftoss/hdwallet-core@1.21.2", "@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.10": + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.21.2.tgz#88fe49d79a79c8429b714e6244a4068c82e2afb5" + integrity sha512-s1J95MIwu/Qfaeijz6J6qdVxe8gMbVQjEWPCfuhGvBIxF94o+7cpoUXIrU4KIIuDbrdxJ3P4sf7xo89s4Y3wNQ== + dependencies: + eventemitter2 "^5.0.1" + lodash "^4.17.21" + rxjs "^6.4.0" + type-assertions "^1.1.0" + +"@shapeshiftoss/hdwallet-core@1.22.0": + version "1.22.0" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.22.0.tgz#f16d3d2842c5e704ec8e829573b1152dd2070001" + integrity sha512-xCfmWN0FyJH8lVRhAKPQ7UHfWY1aMGbnGyalS+X4saz9P8o4qaHQ/vBpARrKhL+dDsDSKt8Ol2Wo90nv6C/7Ag== + dependencies: + eventemitter2 "^5.0.1" + lodash "^4.17.21" + rxjs "^6.4.0" + type-assertions "^1.1.0" + +"@shapeshiftoss/hdwallet-core@1.23.0": + version "1.23.0" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.23.0.tgz#8e7552b684d9c4600381cf3131c9d304df4b169a" + integrity sha512-CP0ysBeyRMtjx1OTSj+EmuhYWeh3YGxrbobj7HZDYYl8kHyUseJTTQ3s42ezS1AfXkDf/YidKDxa7p6+v7/0sw== + dependencies: + eventemitter2 "^5.0.1" + lodash "^4.17.21" + rxjs "^6.4.0" + type-assertions "^1.1.0" + +"@shapeshiftoss/hdwallet-core@1.52.0": + version "1.52.0" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.0.tgz#6dadd6fb8c8bd95a6e2b067d590b6d07ecc6a729" + integrity sha512-0SyKTbPphmHxno09enid8CdBjnLInfWJkmBO7vJvh2LBGSKw3fZo+7+tjfJe0Z2lS7To6SsJCfBMt1plLTfd1A== dependencies: "@shapeshiftoss/proto-tx-builder" "^0.8.0" eip-712 "^1.0.0" @@ -5569,10 +5947,10 @@ rxjs "^6.4.0" type-assertions "^1.1.0" -"@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.11": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.3-thorchain.11.tgz#1d24db71eae513a5f8ca79721e76f244974ef3dc" - integrity sha512-FxVzYJJ7ZqqaWzEBgxN2bsUUxk3y38QIRd48C2cRQjgPDQbd1DRRaWoxD0/f4zFGDyAYTQgF7mOUGUH9JLV7Zw== +"@shapeshiftoss/hdwallet-core@1.52.1", "@shapeshiftoss/hdwallet-core@^1.50.4": + version "1.52.1" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.1.tgz#5165e6ecfef3ffa2a3c1ed1aafe6de268224f920" + integrity sha512-ON0kGiYhVUZm2sPp6EbgIwACJAvULIeklddWPZDCv6mvByIsY8D6BTVQtXVavHBB+/Pf6bVc1uMfCO3X5zPaHg== dependencies: "@shapeshiftoss/proto-tx-builder" "^0.8.0" eip-712 "^1.0.0" @@ -5592,128 +5970,146 @@ type-assertions "^1.1.0" "@shapeshiftoss/hdwallet-keepkey-nodewebusb@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-nodewebusb/-/hdwallet-keepkey-nodewebusb-1.52.3-thorchain.11.tgz#2bdcf3bf1a7599ffea9f5ebd5e2e4c3acf3dcc35" - integrity sha512-Ek94hVGSzsZWVdrev2UOlUrYZtnpUwVJh0Zf8osTu36JzPjrEKgQDA72mRQzIAXKRacqtdCL/uec3SI+kWomPA== + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey-nodewebusb/-/hdwallet-keepkey-nodewebusb-1.21.2.tgz#69f37ae29077ec3a11fea9ee319f869b712f8198" + integrity sha512-7ImVY9DQLv+QLZFT/JWuzecP/CSDb8VeaQghLICgOqG/xPMRMiSOBJxcFzPJiK/uM7E+UmMBgHgLM/zhHUz68g== dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-keepkey" "1.21.2" "@shapeshiftoss/hdwallet-keepkey-tcp@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-tcp/-/hdwallet-keepkey-tcp-1.52.3-thorchain.11.tgz#bdfde504aac915f3d6763082c2e49c0980ed59ad" - integrity sha512-K2pEq35XAHpTR45m8WwdVBRvx5lIj8+G3tONsqr0d/9KluGEn//FPil5P9Rxz/CvXam/uwWH7NvJMibWmKlcQA== + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey-tcp/-/hdwallet-keepkey-tcp-1.21.2.tgz#fcb34a45cd84caf627f35fba37aa1d81191c12ca" + integrity sha512-/bQcRaic5dd1J9wuMr4ywjLRfA9piczfQiyNdXr7z3iSX/3RmI9QBgjTHQWoAij/ufFGmZPOYyh1VJAsIAhCCA== dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-keepkey" "1.21.2" axios "^0.21.1" "@shapeshiftoss/hdwallet-keepkey-webusb@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-webusb/-/hdwallet-keepkey-webusb-1.52.3-thorchain.11.tgz#75ecc2d3d2e2f26db1f86f50fd95eefaccf8bf15" - integrity sha512-pO1susjpLW0YKENcWrjI81moONOeTbjf6mcc2Mq8yfLbxiNYM4guEEtnesU5OfKjv78bOsyOgcNjzpKL8PiygQ== + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey-webusb/-/hdwallet-keepkey-webusb-1.21.2.tgz#35c8b40e7d9eef0c3b6e32b376123839c540db17" + integrity sha512-svcoyT0mnAsxOiFQGSD7dgwiRMSM2Orh7YMqe6Rh/QRT/IlXWbknVUf4dBvZFS4ZKIVZRIREaYc2zKo3bRebNQ== dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-keepkey" "1.21.2" -"@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.11": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey/-/hdwallet-keepkey-1.52.3-thorchain.11.tgz#83b412314ca7087e5d2245615fbae46686492996" - integrity sha512-U08jLpycWtfu1hSYnYCx+5e4/tokP/Z8eCQrUlYTdKSAZmXPBTFlz7uKjWcsj0zuoC+xod3yc5VSXbyvGsnupg== +"@shapeshiftoss/hdwallet-keepkey@1.21.2": + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey/-/hdwallet-keepkey-1.21.2.tgz#969a9331c2bad4b46ab88dd4d7dfd98df87be67d" + integrity sha512-5hwjZWmdED/No3Fbr6L1dhCIAAl2zj76OOFDEMgKoTtbtL4GIiKH43W1g9H+SbtLWSpa/VSQxz26NMyMigNh1w== dependencies: "@ethereumjs/common" "^2.4.0" "@ethereumjs/tx" "^3.3.0" - "@keepkey/device-protocol" "^7.12.2" + "@keepkey/device-protocol" "^7.8.1" "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/proto-tx-builder" "^0.8.0" + "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/proto-tx-builder" "^0.2.1" bignumber.js "^9.0.1" bnb-javascript-sdk-nobroadcast "^2.16.14" crypto-js "^4.0.0" - eip-712 "^1.0.0" eip55 "^2.1.0" google-protobuf "^3.15.8" icepick "^2.4.0" lodash "^4.17.21" p-lazy "^3.1.0" - semver "^7.3.8" + semver "^6.3.0" + tiny-secp256k1 "^1.1.6" + +"@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.10": + version "1.22.0" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey/-/hdwallet-keepkey-1.22.0.tgz#3dfd550ccb0e07fff96db99136c909a346af4fca" + integrity sha512-4D+lVQaff1E2kO7lImp4gyI+7/tIiwoU6ns/PgmfmuDXpxmSvG0Z50hA2eee6e6eqmPXpwz/1GhlkIvv3p99yA== + dependencies: + "@ethereumjs/common" "^2.4.0" + "@ethereumjs/tx" "^3.3.0" + "@keepkey/device-protocol" "^7.8.1" + "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" + "@shapeshiftoss/hdwallet-core" "1.22.0" + "@shapeshiftoss/proto-tx-builder" "^0.2.1" + bignumber.js "^9.0.1" + bnb-javascript-sdk-nobroadcast "^2.16.14" + crypto-js "^4.0.0" + eip55 "^2.1.0" + google-protobuf "^3.15.8" + icepick "^2.4.0" + lodash "^4.17.21" + p-lazy "^3.1.0" + semver "^6.3.0" tiny-secp256k1 "^1.1.6" "@shapeshiftoss/hdwallet-keplr@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keplr/-/hdwallet-keplr-1.52.3-thorchain.11.tgz#d4d68722353f496f754d2cb0062dc2612430cd64" - integrity sha512-vNOsjerVGDfFDUcoX45yQthDVvcss7YKvbcS9feMC9yVSHgb9raYVdUJsJ7JIqXNYkkJ/aMardMb2ldCTmH+IQ== + version "1.52.0" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keplr/-/hdwallet-keplr-1.52.0.tgz#0348e2599d993958c58945e47a3add446dee9556" + integrity sha512-SU3AQyBkO6xALSzMmOSMbmO50eC/JOc85yM6VUQYPjmyIJ1pf9/YKgjn05xehwv8UsNU858Ep5GBIo8NPQop5g== dependencies: "@shapeshiftoss/caip" "8.15.0" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.52.0" "@shapeshiftoss/proto-tx-builder" "^0.8.0" "@shapeshiftoss/types" "3.1.3" base64-js "^1.5.1" lodash "^4.17.21" "@shapeshiftoss/hdwallet-ledger-webhid@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger-webhid/-/hdwallet-ledger-webhid-1.52.3-thorchain.11.tgz#48e49b81c14a65e6e2ab868b17a40e1bd6e98eb2" - integrity sha512-lFBiBXjaSKnsPKKUNDhIcHjZuKfwrJ/lzc2ckepR+SPgS13LMsXnHcFy87DVb53e6CP4p4Kv6I2zR1rJsv+SeQ== + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-ledger-webhid/-/hdwallet-ledger-webhid-1.21.2.tgz#ad31acd213547df29c3ee2257b18f4a0c640f28b" + integrity sha512-NahU0xVaSocycrSjlK9eR/vsyn8XOWwqAZ+H0OyT0pfrFJD2PFh6/FAuOBhz9rbCvS5TUNkSMIZVj7WvUQ3OXQ== dependencies: - "@ledgerhq/hw-app-btc" "^10.0.8" + "@ledgerhq/hw-app-btc" "^6.7.0" "@ledgerhq/hw-app-eth" "^6.9.0" "@ledgerhq/hw-transport" "^6.7.0" "@ledgerhq/hw-transport-webhid" "^6.7.0" "@ledgerhq/live-common" "^21.8.2" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-ledger" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-ledger" "1.21.2" "@types/w3c-web-hid" "^1.0.2" + typescript "^4.3.2" "@shapeshiftoss/hdwallet-ledger-webusb@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger-webusb/-/hdwallet-ledger-webusb-1.52.3-thorchain.11.tgz#3adb61c57fccd50627438c559f80b9ea6628a561" - integrity sha512-D3XRt+0+Z8YJMTBoTDO2oDjmg0LQtvURd1p8tqGRVxxpoXQxPQg5LI0zq7bjFPF7FyaBaINF8lu8uaHrU+Aygw== + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-ledger-webusb/-/hdwallet-ledger-webusb-1.21.2.tgz#00629563b25ec3dd94a7268e52780a718448347b" + integrity sha512-SX40IZEFo8jCx4/U7I7UogDa7L1RECdK+Xp+yuyhqxU3rITrpLrdJH9H1vOy4FS+TxRN2BkMMAG5mXMCCencag== dependencies: - "@ledgerhq/hw-app-btc" "^10.0.8" + "@ledgerhq/hw-app-btc" "^6.7.0" "@ledgerhq/hw-app-eth" "^6.9.0" "@ledgerhq/hw-transport" "^6.7.0" "@ledgerhq/hw-transport-webusb" "^6.7.0" "@ledgerhq/live-common" "^21.8.2" - "@ledgerhq/logs" "^6.10.1" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-ledger" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-ledger" "1.21.2" "@types/w3c-web-usb" "^1.0.4" - p-queue "^7.4.1" + typescript "^4.3.2" -"@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.11": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger/-/hdwallet-ledger-1.52.3-thorchain.11.tgz#7a03688868f922c033a315fa9409ccfb9aecab40" - integrity sha512-KujW49hBSzM05g6nnJ7Oheiiro0R9f8+l5faj1pqZYs2bpZFgoqlKLGe1zkItp2YCuVIEeMtXHMmqGBJaMQmjw== +"@shapeshiftoss/hdwallet-ledger@1.21.2", "@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.10": + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-ledger/-/hdwallet-ledger-1.21.2.tgz#f506a357b291440bf4fc141bc35f880709c13a6b" + integrity sha512-2NRIHYZGieHjumKLBFgQqzlrZzE6nd5osgqVjwDXDU7NWnAhRz9LBS8T09diYXSvLNNY2Yhld14CPiktDYbGig== dependencies: "@ethereumjs/common" "^2.4.0" "@ethereumjs/tx" "^3.3.0" - "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@types/ripemd160" "^2.0.1" + "@shapeshiftoss/hdwallet-core" "1.21.2" base64-js "^1.5.1" bchaddrjs "^0.4.4" + bitcoinjs-lib "^5.1.6" bitcoinjs-message "^2.0.0" bs58check "2.1.2" ethereumjs-tx "1.3.7" ethereumjs-util "^6.1.0" lodash "^4.17.21" - ripemd160 "^2.0.2" "@shapeshiftoss/hdwallet-metamask@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-metamask/-/hdwallet-metamask-1.52.3-thorchain.11.tgz#3bc519ebbe0285ba3d0076ae03dda7a71e096d47" - integrity sha512-FeS94nlj2oklOFGX0X1AykL2+bosVi8+3NvBkl+v8zjWluHkcEvXfXmj7Dao/AjAL00auOIJrsFLdKOZ7O2RaQ== + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-metamask/-/hdwallet-metamask-1.21.2.tgz#2a73bab57a45984bc7ddca5c08c765e1a17c929b" + integrity sha512-JCWH3YRuIpB8h+RLWF+arU5w4VsHJoMz7MUF+DUmiivziwWprrn8r4PYtzo7QSMffwwKudzB1B8nHVm0ygDzdg== dependencies: "@metamask/detect-provider" "^1.2.0" "@metamask/onboarding" "^1.0.1" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - eth-rpc-errors "^4.0.3" + "@shapeshiftoss/hdwallet-core" "1.21.2" lodash "^4.17.21" "@shapeshiftoss/hdwallet-native@^1.50.4": version "1.52.1" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.1.tgz#9a8144302f20069d145079154d3d9c56086178b4" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.1.tgz#9a8144302f20069d145079154d3d9c56086178b4" integrity sha512-TUemR4q0ISgPRvLkZQaK0iQ9t8ObhbGwGtOBmKzbSyJR10vVXbGxt5eIi+Gc19fSz7uyAQM2N3pIMFMsBasciw== dependencies: "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" @@ -5741,24 +6137,22 @@ web-encoding "^1.1.0" "@shapeshiftoss/hdwallet-native@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.3-thorchain.11.tgz#e57ef8355715ab701a7c059d460f917d011af999" - integrity sha512-6BfKW9qCGyvTVBdVB6i+pMR00I8TcKRhobAqB6zcuX0jWIj25TYltvuDk2EB3YedH38d0ly9ZEEuteKL4WY6Cw== + version "1.23.0" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.23.0.tgz#a035d1f1baa6c5a1da47bb2d12aad8e76d0b46d2" + integrity sha512-UYCrUD8Ful1lNArpzLhvTBnuNjgSz9Ytl3/MPeOPi+WTrD3PIYh/QEOmx6JqBL0PoxoQof1O6GqYBq44It1tsg== dependencies: "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" "@shapeshiftoss/fiosdk" "1.2.1-shapeshift.6" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/proto-tx-builder" "^0.8.0" + "@shapeshiftoss/hdwallet-core" "1.23.0" + "@shapeshiftoss/proto-tx-builder" "^0.2.1" "@zxing/text-encoding" "^0.9.0" bchaddrjs "^0.4.9" - bech32 "^1.1.4" bignumber.js "^9.0.1" bip32 "^2.0.5" bip39 "^3.0.2" bnb-javascript-sdk-nobroadcast "^2.16.14" crypto-js "^4.0.0" - eip-712 "^1.0.0" - ethers "5.7.2" + ethers "5.6.5" eventemitter2 "^5.0.1" funtypes "^3.0.1" lodash "^4.17.21" @@ -5770,12 +6164,12 @@ web-encoding "^1.1.0" "@shapeshiftoss/hdwallet-portis@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-portis/-/hdwallet-portis-1.52.3-thorchain.11.tgz#35b734a9fecb7121e4808c6f99e9a86862d13533" - integrity sha512-9LVYv6uZX6bgKED3YYF29YF+UTL4XhgI83SeveW/PknvYMrbvF0eSQjQDqydrYLNUaQ5bmjKoXi5Cl3o4XQTaQ== + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-portis/-/hdwallet-portis-1.21.2.tgz#f87c325e24add9d3281f3bb490d1714219307886" + integrity sha512-0l6dSzcWlD/KcIZw/eDA71V/DsNcs4myTX9qdnhmW4bJVRvpRiAEnt7hIo0v76OGCBkvBsiwXTRxfmM34HC6NQ== dependencies: "@portis/web3" "3.0.10" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.2" base64-js "^1.5.1" bip32 "^2.0.4" bitcoinjs-lib "^5.1.6" @@ -5785,51 +6179,62 @@ web3 "^1.5.1" "@shapeshiftoss/hdwallet-tallyho@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-tallyho/-/hdwallet-tallyho-1.52.3-thorchain.11.tgz#faa3e2a7c6a81a9c8e0e3fa998d41fef58bdea9b" - integrity sha512-VgIDzgSxk8tRn7DSlSP/lUn7p074WjMrFfSsEj5jtuVh1rpLhCBH6sDgv34rUPHQ8m3VrXYjg3qUsDoau+Rltg== + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-tallyho/-/hdwallet-tallyho-1.21.2.tgz#509c276f3051d70b8de3020a5f49f7d69c2c7c31" + integrity sha512-d3IvLvVEZY1t7XgONbtRYuq9k6V4f8L+64vOvTR6eP5oE6VBJAWxRkRSJLMvqdWM+elxWuOPqtXvPAY/Eohukw== dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.2" lodash "^4.17.21" tallyho-onboarding "^1.0.2" "@shapeshiftoss/hdwallet-trezor-connect@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-trezor-connect/-/hdwallet-trezor-connect-1.52.3-thorchain.11.tgz#5d4ceb32201136dadc03b8320917d7a6aa488aca" - integrity sha512-fc3Ui4AFgHF6OdUynKsh4qg/sb8m9AnWz9VuY0qPseYtJhQCSt5WneluWXPWjTVNlDFkn7GqthyQAfTl0LLbYQ== + version "1.21.1" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-trezor-connect/-/hdwallet-trezor-connect-1.21.1.tgz#c5172c1e4ec92a31969b0c743289a819a025f5f0" + integrity sha512-0kW4rPQjsAmnXK053xnEUv1BnM0rXIDzQnCTuy8kSADKw8lmz9NPXqftIiVCEYSkOxq5r+E909TVmIJkdbpZNA== dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-trezor" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.1" + "@shapeshiftoss/hdwallet-trezor" "1.21.1" "@trezor/rollout" "^1.2.0" trezor-connect "^8.2.1" -"@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.11": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-trezor/-/hdwallet-trezor-1.52.3-thorchain.11.tgz#87c17c63552e18c0299d75c20b6fe5e98a9b9083" - integrity sha512-7I4WWRc3hYCBUySll7Pokk0jnm8u/1yJaFhNabTYphnGPTI1fa4hj7dth22GAqvFYoSX+HlsqB1TJolmIAwv0g== +"@shapeshiftoss/hdwallet-trezor@1.21.1": + version "1.21.1" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-trezor/-/hdwallet-trezor-1.21.1.tgz#9d3ac2462b6d2f0725a36e2cd79e2a0f67c1d9fb" + integrity sha512-VlcFEbs0HT9XxOHS52sz6UF4EKziuFssGzIke/yfDVVHSYoWuOZJMu3zMtqNoc8EZCuwnUgsmuyPHpFXfV6jJw== dependencies: "@ethereumjs/common" "^2.4.0" "@ethereumjs/tx" "^3.3.0" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.1" + base64-js "^1.5.1" + lodash "^4.17.21" + +"@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.10": + version "1.21.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-trezor/-/hdwallet-trezor-1.21.2.tgz#dde1f0293a8365f4791bba80ea5041efa4ed0e6f" + integrity sha512-1IP/Kb9MqzcwASwW8jg+mWgCbPUvK6LBoCCW1w7keibimdXlsMu2LEWvgUxIFzQQlX9QtcZ+vAoKuZ1yO1tJ+A== + dependencies: + "@ethereumjs/common" "^2.4.0" + "@ethereumjs/tx" "^3.3.0" + "@shapeshiftoss/hdwallet-core" "1.21.2" base64-js "^1.5.1" lodash "^4.17.21" "@shapeshiftoss/hdwallet-walletconnect@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-walletconnect/-/hdwallet-walletconnect-1.52.3-thorchain.11.tgz#b75eee0e4ded2f3ead7bf7c8dc4805f143a0c087" - integrity sha512-//GZ3npcC4RsSiqgQ03jSNL7adKrlF8aBQ9UT3HWItw1+bNN3jB2npiQV7d6KIYqtt3zr1YWxCXp0yAkeBbPdw== + version "1.52.1" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-walletconnect/-/hdwallet-walletconnect-1.52.1.tgz#ec889e5363f53542a6adec9848559d7d157e7d60" + integrity sha512-S9LP0VYBYnUVvG7CW4pWsiY2yRnhy5plwPMNO+gnup3oMzRZUAxN1mkP5aSL8v4cwT+L/THjZ4VNqqEuMZShNA== dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.52.1" "@walletconnect/qrcode-modal" "^1.7.8" "@walletconnect/web3-provider" "^1.7.8" ethers "^5.6.5" "@shapeshiftoss/hdwallet-xdefi@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-xdefi/-/hdwallet-xdefi-1.52.3-thorchain.11.tgz#9571a7747e21e6321add7815d8d147edb8b06cfc" - integrity sha512-ocbVY3TFfrgr35Kqa9UlhvOJhZ6YLnJmKJLIqOkF+GLs+eOxwagqDBIDxYgXNAbx36q2MVF4GS51URrn6LG0BA== + version "1.21.1" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-xdefi/-/hdwallet-xdefi-1.21.1.tgz#11935751ebc1a764fbeb9a70c17e6c4eeaccd8d5" + integrity sha512-sfl7O5LDp9sLuL3XFBckap3v6vBLhGl8XsgGV9sPsRGWwaLOhDnXE9YObnCxpLjJKtF6ZyzLH203ba4XB68Tpg== dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-core" "1.21.1" lodash "^4.17.21" "@shapeshiftoss/logger@^1.1.2", "@shapeshiftoss/logger@^1.1.3": @@ -5881,6 +6286,18 @@ eth-rpc-errors "^4.0.3" patch-package "^6.2.2" +"@shapeshiftoss/proto-tx-builder@^0.2.1": + version "0.2.1" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/proto-tx-builder/-/proto-tx-builder-0.2.1.tgz#82106d45adcec0d5d215a6098b52d16ef3db3dc8" + integrity sha512-LNUFjKRmq8aC08Uq9/umUCF2F9Fhfg9yH6xFhEdZkNTNFC4WW7XuAxKrzM6yFCaYWkIN265v7T3sHleZ9MTz3g== + dependencies: + "@cosmjs/proto-signing" "^0.28.0" + "@cosmjs/stargate" "^0.28.0" + "@cosmjs/tendermint-rpc" "^0.28.0" + cosmjs-types "^0.4.1" + google-protobuf "^3.17.0" + long "^4.0.0" + "@shapeshiftoss/proto-tx-builder@^0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@shapeshiftoss/proto-tx-builder/-/proto-tx-builder-0.8.0.tgz#12523e76e6ae2c794e8ad5439dedf65d30c78185" @@ -6698,7 +7115,7 @@ "@types/ripemd160@^2.0.1": version "2.0.1" - resolved "http://localhost:4873/@types/ripemd160/-/ripemd160-2.0.1.tgz#e9ea7a26adf0e2541917fc2b1ecb497e8ced4b7e" + resolved "https://registry.yarnpkg.com/@types/ripemd160/-/ripemd160-2.0.1.tgz#e9ea7a26adf0e2541917fc2b1ecb497e8ced4b7e" integrity sha512-l3pt9f8vK1tU2qBXY1aL7HofNnJKbpNa+2DznrD7j0lhaS4587e3iwgSMRDJFlidsrNjrrjIl8G+EeXFMjcGXg== dependencies: "@types/node" "*" @@ -11449,6 +11866,42 @@ ethereumjs-vm@^2.3.4: rustbn.js "~0.2.0" safe-buffer "^5.1.1" +ethers@5.6.5: + version "5.6.5" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.6.5.tgz#3185ac7815dc640993408adf6f133ffabfbcbb63" + integrity sha512-9CTmplO9bv0s/aPw3HB3txGzKz3tUSI2EfO4dJo0W2WvaEq1ArgsEX6obV+bj5X3yY+Zgb1kAux8TDtJKe1FaA== + dependencies: + "@ethersproject/abi" "5.6.1" + "@ethersproject/abstract-provider" "5.6.0" + "@ethersproject/abstract-signer" "5.6.0" + "@ethersproject/address" "5.6.0" + "@ethersproject/base64" "5.6.0" + "@ethersproject/basex" "5.6.0" + "@ethersproject/bignumber" "5.6.0" + "@ethersproject/bytes" "5.6.1" + "@ethersproject/constants" "5.6.0" + "@ethersproject/contracts" "5.6.0" + "@ethersproject/hash" "5.6.0" + "@ethersproject/hdnode" "5.6.0" + "@ethersproject/json-wallets" "5.6.0" + "@ethersproject/keccak256" "5.6.0" + "@ethersproject/logger" "5.6.0" + "@ethersproject/networks" "5.6.2" + "@ethersproject/pbkdf2" "5.6.0" + "@ethersproject/properties" "5.6.0" + "@ethersproject/providers" "5.6.5" + "@ethersproject/random" "5.6.0" + "@ethersproject/rlp" "5.6.0" + "@ethersproject/sha2" "5.6.0" + "@ethersproject/signing-key" "5.6.1" + "@ethersproject/solidity" "5.6.0" + "@ethersproject/strings" "5.6.0" + "@ethersproject/transactions" "5.6.0" + "@ethersproject/units" "5.6.0" + "@ethersproject/wallet" "5.6.0" + "@ethersproject/web" "5.6.0" + "@ethersproject/wordlists" "5.6.0" + ethers@5.7.2, ethers@^5.5.3: version "5.7.2" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" @@ -20008,7 +20461,7 @@ typescript@<4.8.0: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== -"typescript@^3 || ^4": +"typescript@^3 || ^4", typescript@^4.3.2: version "4.9.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== From 6754b14371684c3de710b63a5f03cda7724e28e7 Mon Sep 17 00:00:00 2001 From: kaladinlight <35275952+kaladinlight@users.noreply.github.com> Date: Wed, 11 Oct 2023 13:44:07 -0600 Subject: [PATCH 071/108] handle addressNList --- .../hdwallet-ledger/src/thorchain/helpers.ts | 8 +-- .../src/thorchain/hw-app-thor.ts | 14 ++--- .../hdwallet-ledger/src/thorchain/index.ts | 58 ++++++------------- 3 files changed, 28 insertions(+), 52 deletions(-) diff --git a/packages/hdwallet-ledger/src/thorchain/helpers.ts b/packages/hdwallet-ledger/src/thorchain/helpers.ts index 81dca3828..14a8893df 100644 --- a/packages/hdwallet-ledger/src/thorchain/helpers.ts +++ b/packages/hdwallet-ledger/src/thorchain/helpers.ts @@ -25,15 +25,15 @@ const signSendChunkv1 = async (app: any, chunkIdx: any, chunkNum: any, chunk: an }, processErrorResponse); }; -export const serializePathv2 = (path: any) => { +export const serializePathv2 = (path: Array) => { if (!path || path.length !== 5) { throw new Error("Invalid path."); } const buf = Buffer.alloc(20); - buf.writeUInt32LE(0x80000000 + path[0], 0); - buf.writeUInt32LE(0x80000000 + path[1], 4); - buf.writeUInt32LE(0x80000000 + path[2], 8); + buf.writeUInt32LE(path[0], 0); + buf.writeUInt32LE(path[1], 4); + buf.writeUInt32LE(path[2], 8); buf.writeUInt32LE(path[3], 12); buf.writeUInt32LE(path[4], 16); diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index 76df17160..e56610c07 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -109,7 +109,7 @@ class THORChainApp { return encode(hrp, toWords(hashRip)); } - async serializePath(path: string) { + async serializePath(path: Array) { this.versionResponse = await getVersion(this.transport); if (this.versionResponse.return_code !== ErrorCode.NoError) { @@ -127,7 +127,7 @@ class THORChainApp { } } - async signGetChunks(path: string, message: any) { + async signGetChunks(path: Array, message: any) { const serializedPath = await this.serializePath(path); const chunks = []; @@ -250,7 +250,7 @@ class THORChainApp { }, processErrorResponse); } - async publicKey(path: string) { + async publicKey(path: Array) { try { const serializedPath = await this.serializePath(path); @@ -270,9 +270,9 @@ class THORChainApp { } } - async getAddressAndPubKey(path: number[], hrp: any): Promise { + async getAddressAndPubKey(path: Array, hrp: any): Promise { try { - return await this.serializePath(path as any) + return await this.serializePath(path) .then((serializedPath) => { const data = Buffer.concat([THORChainApp.serializeHRP(hrp), serializedPath as any]); return this.transport @@ -298,7 +298,7 @@ class THORChainApp { } } - async showAddressAndPubKey(path: string, hrp: any) { + async showAddressAndPubKey(path: Array, hrp: any) { try { return await this.serializePath(path) .then((serializedPath) => { @@ -348,7 +348,7 @@ class THORChainApp { sequence: msg.sequence, }); - return this.signGetChunks(msg.addressNList as any, rawTx).then((chunks) => { + return this.signGetChunks(msg.addressNList, rawTx).then((chunks) => { return this.signSendChunk(1, chunks.length, chunks[0]).then(async (response) => { let result = { return_code: response.return_code, diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index 60ae2c0b4..dca503438 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -1,11 +1,10 @@ import type { AccountData, AminoSignResponse, OfflineAminoSigner, StdSignDoc, StdTx } from "@cosmjs/amino"; -import { fromByteArray } from "base64-js"; -import { fromBase64 } from '@cosmjs/encoding'; import type { SignerData } from "@cosmjs/stargate"; import * as core from "@shapeshiftoss/hdwallet-core"; +import { fromByteArray } from "base64-js"; import PLazy from "p-lazy"; -import { LedgerTransport } from ".."; +import { handleError, LedgerTransport } from ".."; import { getSignature } from "./utils"; export * from "./common"; export * from "./helpers"; @@ -18,51 +17,28 @@ const protoTxBuilder = PLazy.from(() => import("@shapeshiftoss/proto-tx-builder" export const thorchainGetAddress = async ( transport: LedgerTransport, msg: core.ThorchainGetAddress -): Promise => { - const addressAndPubkey = await transport.call( - "Rune", - "getAddressAndPubKey", - msg.addressNList, - "thor" - ); - - if ('error' in addressAndPubkey.payload) { - throw new Error(addressAndPubkey.payload.error) - } - - return addressAndPubkey.payload.bech32_address +): Promise => { + const addressAndPubkey = await transport.call("Rune", "getAddressAndPubKey", msg.addressNList, "thor"); + + handleError(addressAndPubkey, transport, "Unable to obtain address and public key from device."); + + return addressAndPubkey.payload.bech32_address; }; export const thorchainSignTx = async ( transport: LedgerTransport, msg: core.ThorchainSignTx ): Promise => { + const addressAndPubkey = await transport.call("Rune", "getAddressAndPubKey", msg.addressNList, "thor"); - const addressAndPubkey = await transport.call( - "Rune", - "getAddressAndPubKey", - msg.addressNList, - "thor" - ); - - if ('error' in addressAndPubkey.payload) { - throw new Error(addressAndPubkey.payload.error) - } - - const address = addressAndPubkey.payload.bech32_address; - const pubkey = addressAndPubkey.payload.compressed_pk; + handleError(addressAndPubkey, transport, "Unable to obtain address and public key from device."); - const signResponse = await transport.call( - "Rune", - "sign", - msg - ); + const { bech32_address: address, compressed_pk } = addressAndPubkey.payload; + const pubkey = fromByteArray(compressed_pk); - if ('error' in signResponse.payload) { - throw new Error(signResponse.payload.error) - } + const signResponse = await transport.call("Rune", "sign", msg); - console.log({ signResponse: signResponse.payload }) + handleError(signResponse, transport, "Unable to obtain signature from device."); const signature = signResponse.payload.signature; @@ -72,7 +48,7 @@ export const thorchainSignTx = async ( { address, algo: "secp256k1", - pubkey, + pubkey: compressed_pk, }, ]; }, @@ -85,9 +61,9 @@ export const thorchainSignTx = async ( signature: { pub_key: { type: "tendermint/PubKeySecp256k1", - value: fromByteArray(pubkey), + value: pubkey, }, - signature: fromBase64(getSignature(signature)).toString(), + signature: getSignature(signature), }, }; }, From d5f06be9d255a7b76b6390d8dbe1436626b16069 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 19:41:12 +0200 Subject: [PATCH 072/108] feat: regen yarn.lock --- yarn.lock | 709 ++++++++++-------------------------------------------- 1 file changed, 128 insertions(+), 581 deletions(-) diff --git a/yarn.lock b/yarn.lock index 00fe1f15d..96c430e36 100644 --- a/yarn.lock +++ b/yarn.lock @@ -878,7 +878,7 @@ long "^4.0.0" protobufjs "~6.10.2" -"@cosmjs/proto-signing@0.28.13", "@cosmjs/proto-signing@^0.28.0", "@cosmjs/proto-signing@^0.28.13": +"@cosmjs/proto-signing@0.28.13", "@cosmjs/proto-signing@^0.28.13": version "0.28.13" resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.28.13.tgz#95ac12f0da0f0814f348f5ae996c3e96d015df61" integrity sha512-nSl/2ZLsUJYz3Ad0RY3ihZUgRHIow2OnYqKsESMu+3RA/jTi9bDYhiBu8mNMHI0xrEJry918B2CyI56pOUHdPQ== @@ -990,7 +990,7 @@ protobufjs "~6.11.3" xstream "^11.14.0" -"@cosmjs/stargate@^0.28.0", "@cosmjs/stargate@^0.28.13": +"@cosmjs/stargate@^0.28.13": version "0.28.13" resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.28.13.tgz#a73d837a46ee8944e6eafe162f2ff6943c14350e" integrity sha512-dVBMazDz8/eActHsRcZjDHHptOBMqvibj5CFgEtZBp22gP6ASzoAUXTlkSVk5FBf4sfuUHoff6st134/+PGMAg== @@ -1062,7 +1062,7 @@ readonly-date "^1.0.0" xstream "^11.14.0" -"@cosmjs/tendermint-rpc@0.28.13", "@cosmjs/tendermint-rpc@^0.28.0": +"@cosmjs/tendermint-rpc@0.28.13": version "0.28.13" resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.28.13.tgz#0bf587ae66fa3f88319edbd258492d28e73f9f29" integrity sha512-GB+ZmfuJIGQm0hsRtLYjeR3lOxF7Z6XyCBR0cX5AAYOZzSEBJjevPgUHD6tLn8zIhvzxaW3/VKnMB+WmlxdH4w== @@ -1295,21 +1295,6 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/strings" "^5.4.0" -"@ethersproject/abi@5.6.1": - version "5.6.1" - resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.1.tgz#f7de888edeb56b0a657b672bdd1b3a1135cd14f7" - integrity sha512-0cqssYh6FXjlwKWBmLm3+zH2BNARoS5u/hxbz+LpQmcDB3w0W553h2btWui1/uZp2GBM/SI3KniTuMcYyHpA5w== - dependencies: - "@ethersproject/address" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/hash" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/abi@5.6.4", "@ethersproject/abi@^5.6.3": version "5.6.4" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.4.tgz#f6e01b6ed391a505932698ecc0d9e7a99ee60362" @@ -1325,7 +1310,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" -"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.6.0", "@ethersproject/abi@^5.7.0": +"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.7.0.tgz#b3f3e045bbbeed1af3947335c247ad625a44e449" integrity sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA== @@ -1368,19 +1353,6 @@ "@ethersproject/transactions" "^5.4.0" "@ethersproject/web" "^5.4.0" -"@ethersproject/abstract-provider@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.6.0.tgz#0c4ac7054650dbd9c476cf5907f588bbb6ef3061" - integrity sha512-oPMFlKLN+g+y7a79cLK3WiLcjWFnZQtXWgnLAbHZcN3s7L4v90UHpTOrLk+m3yr0gt+/h9STTM6zrr7PM8uoRw== - dependencies: - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/networks" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - "@ethersproject/web" "^5.6.0" - "@ethersproject/abstract-provider@5.6.1", "@ethersproject/abstract-provider@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.6.1.tgz#02ddce150785caf0c77fe036a0ebfcee61878c59" @@ -1394,7 +1366,7 @@ "@ethersproject/transactions" "^5.6.2" "@ethersproject/web" "^5.6.1" -"@ethersproject/abstract-provider@5.7.0", "@ethersproject/abstract-provider@^5.6.0", "@ethersproject/abstract-provider@^5.7.0": +"@ethersproject/abstract-provider@5.7.0", "@ethersproject/abstract-provider@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz#b0a8550f88b6bf9d51f90e4795d48294630cb9ef" integrity sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw== @@ -1431,17 +1403,6 @@ "@ethersproject/logger" "^5.4.0" "@ethersproject/properties" "^5.4.0" -"@ethersproject/abstract-signer@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.6.0.tgz#9cd7ae9211c2b123a3b29bf47aab17d4d016e3e7" - integrity sha512-WOqnG0NJKtI8n0wWZPReHtaLkDByPL67tn4nBaDAhmVq8sjHTPbCdz4DRhVu/cfTOvfy9w3iq5QZ7BX7zw56BQ== - dependencies: - "@ethersproject/abstract-provider" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/abstract-signer@5.6.2", "@ethersproject/abstract-signer@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.6.2.tgz#491f07fc2cbd5da258f46ec539664713950b0b33" @@ -1453,7 +1414,7 @@ "@ethersproject/logger" "^5.6.0" "@ethersproject/properties" "^5.6.0" -"@ethersproject/abstract-signer@5.7.0", "@ethersproject/abstract-signer@^5.6.0", "@ethersproject/abstract-signer@^5.7.0": +"@ethersproject/abstract-signer@5.7.0", "@ethersproject/abstract-signer@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz#13f4f32117868452191a4649723cb086d2b596b2" integrity sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ== @@ -1497,17 +1458,6 @@ "@ethersproject/logger" "^5.4.0" "@ethersproject/rlp" "^5.4.0" -"@ethersproject/address@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.6.0.tgz#13c49836d73e7885fc148ad633afad729da25012" - integrity sha512-6nvhYXjbXsHPS+30sHZ+U4VMagFC/9zAk6Gd/h3S21YW4+yfb0WfRtaAIZ4kfM4rrVwqiy284LP0GtL5HXGLxQ== - dependencies: - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/rlp" "^5.6.0" - "@ethersproject/address@5.6.1", "@ethersproject/address@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.6.1.tgz#ab57818d9aefee919c5721d28cd31fd95eff413d" @@ -1519,7 +1469,7 @@ "@ethersproject/logger" "^5.6.0" "@ethersproject/rlp" "^5.6.1" -"@ethersproject/address@5.7.0", "@ethersproject/address@^5.6.0", "@ethersproject/address@^5.7.0": +"@ethersproject/address@5.7.0", "@ethersproject/address@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.7.0.tgz#19b56c4d74a3b0a46bfdbb6cfcc0a153fc697f37" integrity sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA== @@ -1548,13 +1498,6 @@ dependencies: "@ethersproject/bytes" "^5.4.0" -"@ethersproject/base64@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.6.0.tgz#a12c4da2a6fb86d88563216b0282308fc15907c9" - integrity sha512-2Neq8wxJ9xHxCF9TUgmKeSh9BXJ6OAxWfeGWvbauPh8FuHEjamgHilllx8KkSd5ErxyHIX7Xv3Fkcud2kY9ezw== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/base64@5.6.1", "@ethersproject/base64@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.6.1.tgz#2c40d8a0310c9d1606c2c37ae3092634b41d87cb" @@ -1562,7 +1505,7 @@ dependencies: "@ethersproject/bytes" "^5.6.1" -"@ethersproject/base64@5.7.0", "@ethersproject/base64@^5.6.0", "@ethersproject/base64@^5.7.0": +"@ethersproject/base64@5.7.0", "@ethersproject/base64@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.7.0.tgz#ac4ee92aa36c1628173e221d0d01f53692059e1c" integrity sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ== @@ -1577,14 +1520,6 @@ "@ethersproject/bytes" "^5.4.0" "@ethersproject/properties" "^5.4.0" -"@ethersproject/basex@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.6.0.tgz#9ea7209bf0a1c3ddc2a90f180c3a7f0d7d2e8a69" - integrity sha512-qN4T+hQd/Md32MoJpc69rOwLYRUXwjTlhHDIeUkUmiN/JyWkkLLMoG0TqvSQKNqZOMgN5stbUYN6ILC+eD7MEQ== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/basex@5.6.1", "@ethersproject/basex@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.6.1.tgz#badbb2f1d4a6f52ce41c9064f01eab19cc4c5305" @@ -1593,7 +1528,7 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/properties" "^5.6.0" -"@ethersproject/basex@5.7.0", "@ethersproject/basex@^5.6.0", "@ethersproject/basex@^5.7.0": +"@ethersproject/basex@5.7.0", "@ethersproject/basex@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.7.0.tgz#97034dc7e8938a8ca943ab20f8a5e492ece4020b" integrity sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw== @@ -1610,15 +1545,6 @@ "@ethersproject/logger" "^5.4.0" bn.js "^4.11.9" -"@ethersproject/bignumber@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.6.0.tgz#116c81b075c57fa765a8f3822648cf718a8a0e26" - integrity sha512-VziMaXIUHQlHJmkv1dlcd6GY2PmT0khtAqaMctCIDogxkrarMzA9L94KN1NeXqqOfFD6r0sJT3vCTOFSmZ07DA== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - bn.js "^4.11.9" - "@ethersproject/bignumber@5.6.2", "@ethersproject/bignumber@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.6.2.tgz#72a0717d6163fab44c47bcc82e0c550ac0315d66" @@ -1628,7 +1554,7 @@ "@ethersproject/logger" "^5.6.0" bn.js "^5.2.1" -"@ethersproject/bignumber@5.7.0", "@ethersproject/bignumber@^5.6.0", "@ethersproject/bignumber@^5.7.0": +"@ethersproject/bignumber@5.7.0", "@ethersproject/bignumber@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.7.0.tgz#e2f03837f268ba655ffba03a57853e18a18dc9c2" integrity sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw== @@ -1669,7 +1595,7 @@ dependencies: "@ethersproject/logger" "^5.6.0" -"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.6.0", "@ethersproject/bytes@^5.7.0": +"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.7.0.tgz#a00f6ea8d7e7534d6d87f47188af1148d71f155d" integrity sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A== @@ -1690,13 +1616,6 @@ dependencies: "@ethersproject/bignumber" "^5.4.0" -"@ethersproject/constants@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.6.0.tgz#55e3eb0918584d3acc0688e9958b0cedef297088" - integrity sha512-SrdaJx2bK0WQl23nSpV/b1aq293Lh0sUaZT/yYKPDKn4tlAbkH96SPJwIhwSwTsoQQZxuh1jnqsKwyymoiBdWA== - dependencies: - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/constants@5.6.1", "@ethersproject/constants@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.6.1.tgz#e2e974cac160dd101cf79fdf879d7d18e8cb1370" @@ -1704,7 +1623,7 @@ dependencies: "@ethersproject/bignumber" "^5.6.2" -"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.6.0", "@ethersproject/constants@^5.7.0": +"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.7.0.tgz#df80a9705a7e08984161f09014ea012d1c75295e" integrity sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA== @@ -1734,22 +1653,6 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/transactions" "^5.4.0" -"@ethersproject/contracts@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.6.0.tgz#60f2cfc7addd99a865c6c8cfbbcec76297386067" - integrity sha512-74Ge7iqTDom0NX+mux8KbRUeJgu1eHZ3iv6utv++sLJG80FVuU9HnHeKVPfjd9s3woFhaFoQGf3B3iH/FrQmgw== - dependencies: - "@ethersproject/abi" "^5.6.0" - "@ethersproject/abstract-provider" "^5.6.0" - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/address" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - "@ethersproject/contracts@5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.6.2.tgz#20b52e69ebc1b74274ff8e3d4e508de971c287bc" @@ -1796,20 +1699,6 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/strings" "^5.4.0" -"@ethersproject/hash@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.6.0.tgz#d24446a5263e02492f9808baa99b6e2b4c3429a2" - integrity sha512-fFd+k9gtczqlr0/BruWLAu7UAOas1uRRJvOR84uDf4lNZ+bTkGl366qvniUZHKtlqxBRU65MkOobkmvmpHU+jA== - dependencies: - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/address" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/hash@5.6.1", "@ethersproject/hash@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.6.1.tgz#224572ea4de257f05b4abf8ae58b03a67e99b0f4" @@ -1824,7 +1713,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" -"@ethersproject/hash@5.7.0", "@ethersproject/hash@^5.6.0", "@ethersproject/hash@^5.7.0": +"@ethersproject/hash@5.7.0", "@ethersproject/hash@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.7.0.tgz#eb7aca84a588508369562e16e514b539ba5240a7" integrity sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g== @@ -1871,24 +1760,6 @@ "@ethersproject/transactions" "^5.4.0" "@ethersproject/wordlists" "^5.4.0" -"@ethersproject/hdnode@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.6.0.tgz#9dcbe8d629bbbcf144f2cae476337fe92d320998" - integrity sha512-61g3Jp3nwDqJcL/p4nugSyLrpl/+ChXIOtCEM8UDmWeB3JCAt5FoLdOMXQc3WWkc0oM2C0aAn6GFqqMcS/mHTw== - dependencies: - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/basex" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/pbkdf2" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/sha2" "^5.6.0" - "@ethersproject/signing-key" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - "@ethersproject/wordlists" "^5.6.0" - "@ethersproject/hdnode@5.6.2", "@ethersproject/hdnode@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.6.2.tgz#26f3c83a3e8f1b7985c15d1db50dc2903418b2d2" @@ -1907,7 +1778,7 @@ "@ethersproject/transactions" "^5.6.2" "@ethersproject/wordlists" "^5.6.1" -"@ethersproject/hdnode@5.7.0", "@ethersproject/hdnode@^5.6.0", "@ethersproject/hdnode@^5.7.0": +"@ethersproject/hdnode@5.7.0", "@ethersproject/hdnode@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.7.0.tgz#e627ddc6b466bc77aebf1a6b9e47405ca5aef9cf" integrity sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg== @@ -1944,25 +1815,6 @@ aes-js "3.0.0" scrypt-js "3.0.1" -"@ethersproject/json-wallets@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.6.0.tgz#4c2fc27f17e36c583e7a252fb938bc46f98891e5" - integrity sha512-fmh86jViB9r0ibWXTQipxpAGMiuxoqUf78oqJDlCAJXgnJF024hOOX7qVgqsjtbeoxmcLwpPsXNU0WEe/16qPQ== - dependencies: - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/address" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/hdnode" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/pbkdf2" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/random" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - aes-js "3.0.0" - scrypt-js "3.0.1" - "@ethersproject/json-wallets@5.6.1", "@ethersproject/json-wallets@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.6.1.tgz#3f06ba555c9c0d7da46756a12ac53483fe18dd91" @@ -1982,7 +1834,7 @@ aes-js "3.0.0" scrypt-js "3.0.1" -"@ethersproject/json-wallets@5.7.0", "@ethersproject/json-wallets@^5.6.0", "@ethersproject/json-wallets@^5.7.0": +"@ethersproject/json-wallets@5.7.0", "@ethersproject/json-wallets@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.7.0.tgz#5e3355287b548c32b368d91014919ebebddd5360" integrity sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g== @@ -2009,14 +1861,6 @@ "@ethersproject/bytes" "^5.4.0" js-sha3 "0.5.7" -"@ethersproject/keccak256@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.6.0.tgz#fea4bb47dbf8f131c2e1774a1cecbfeb9d606459" - integrity sha512-tk56BJ96mdj/ksi7HWZVWGjCq0WVl/QvfhFQNeL8fxhBlGoP+L80uDCiQcpJPd+2XxkivS3lwRm3E0CXTfol0w== - dependencies: - "@ethersproject/bytes" "^5.6.0" - js-sha3 "0.8.0" - "@ethersproject/keccak256@5.6.1", "@ethersproject/keccak256@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.6.1.tgz#b867167c9b50ba1b1a92bccdd4f2d6bd168a91cc" @@ -2025,7 +1869,7 @@ "@ethersproject/bytes" "^5.6.1" js-sha3 "0.8.0" -"@ethersproject/keccak256@5.7.0", "@ethersproject/keccak256@^5.6.0", "@ethersproject/keccak256@^5.7.0": +"@ethersproject/keccak256@5.7.0", "@ethersproject/keccak256@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.7.0.tgz#3186350c6e1cd6aba7940384ec7d6d9db01f335a" integrity sha512-2UcPboeL/iW+pSg6vZ6ydF8tCnv3Iu/8tUmLLzWWGzxWKFFqOBQFLo6uLUv6BDrLgCDfN28RJ/wtByx+jZ4KBg== @@ -2073,13 +1917,6 @@ dependencies: "@ethersproject/logger" "^5.4.0" -"@ethersproject/networks@5.6.2": - version "5.6.2" - resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.2.tgz#2bacda62102c0b1fcee408315f2bed4f6fbdf336" - integrity sha512-9uEzaJY7j5wpYGTojGp8U89mSsgQLc40PCMJLMCnFXTs7nhBveZ0t7dbqWUNrepWTszDbFkYD6WlL8DKx5huHA== - dependencies: - "@ethersproject/logger" "^5.6.0" - "@ethersproject/networks@5.6.4", "@ethersproject/networks@^5.6.3": version "5.6.4" resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.4.tgz#51296d8fec59e9627554f5a8a9c7791248c8dc07" @@ -2087,7 +1924,7 @@ dependencies: "@ethersproject/logger" "^5.6.0" -"@ethersproject/networks@5.7.1", "@ethersproject/networks@^5.6.0", "@ethersproject/networks@^5.7.0": +"@ethersproject/networks@5.7.1", "@ethersproject/networks@^5.7.0": version "5.7.1" resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.7.1.tgz#118e1a981d757d45ccea6bb58d9fd3d9db14ead6" integrity sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ== @@ -2109,14 +1946,6 @@ "@ethersproject/bytes" "^5.4.0" "@ethersproject/sha2" "^5.4.0" -"@ethersproject/pbkdf2@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.6.0.tgz#04fcc2d7c6bff88393f5b4237d906a192426685a" - integrity sha512-Wu1AxTgJo3T3H6MIu/eejLFok9TYoSdgwRr5oGY1LTLfmGesDoSx05pemsbrPT2gG4cQME+baTSCp5sEo2erZQ== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/sha2" "^5.6.0" - "@ethersproject/pbkdf2@5.6.1", "@ethersproject/pbkdf2@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.6.1.tgz#f462fe320b22c0d6b1d72a9920a3963b09eb82d1" @@ -2125,7 +1954,7 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/sha2" "^5.6.1" -"@ethersproject/pbkdf2@5.7.0", "@ethersproject/pbkdf2@^5.6.0", "@ethersproject/pbkdf2@^5.7.0": +"@ethersproject/pbkdf2@5.7.0", "@ethersproject/pbkdf2@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.7.0.tgz#d2267d0a1f6e123f3771007338c47cccd83d3102" integrity sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw== @@ -2193,31 +2022,6 @@ bech32 "1.1.4" ws "7.4.6" -"@ethersproject/providers@5.6.5": - version "5.6.5" - resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.6.5.tgz#aefecf78459817a323452e05a16d56afcf807e27" - integrity sha512-TRS+c2Ud+cMpWodmGAc9xbnYRPWzRNYt2zkCSnj58nJoamBQ6x4cUbBeo0lTC3y+6RDVIBeJv18OqsDbSktLVg== - dependencies: - "@ethersproject/abstract-provider" "^5.6.0" - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/address" "^5.6.0" - "@ethersproject/basex" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/hash" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/networks" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/random" "^5.6.0" - "@ethersproject/rlp" "^5.6.0" - "@ethersproject/sha2" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - "@ethersproject/web" "^5.6.0" - bech32 "1.1.4" - ws "7.4.6" - "@ethersproject/providers@5.6.8": version "5.6.8" resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.6.8.tgz#22e6c57be215ba5545d3a46cf759d265bb4e879d" @@ -2278,14 +2082,6 @@ "@ethersproject/bytes" "^5.4.0" "@ethersproject/logger" "^5.4.0" -"@ethersproject/random@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.6.0.tgz#1505d1ab6a250e0ee92f436850fa3314b2cb5ae6" - integrity sha512-si0PLcLjq+NG/XHSZz90asNf+YfKEqJGVdxoEkSukzbnBgC8rydbgbUgBbBGLeHN4kAJwUFEKsu3sCXT93YMsw== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/random@5.6.1", "@ethersproject/random@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.6.1.tgz#66915943981bcd3e11bbd43733f5c3ba5a790255" @@ -2294,7 +2090,7 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/logger" "^5.6.0" -"@ethersproject/random@5.7.0", "@ethersproject/random@^5.6.0", "@ethersproject/random@^5.7.0": +"@ethersproject/random@5.7.0", "@ethersproject/random@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.7.0.tgz#af19dcbc2484aae078bb03656ec05df66253280c" integrity sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ== @@ -2310,14 +2106,6 @@ "@ethersproject/bytes" "^5.4.0" "@ethersproject/logger" "^5.4.0" -"@ethersproject/rlp@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.6.0.tgz#55a7be01c6f5e64d6e6e7edb6061aa120962a717" - integrity sha512-dz9WR1xpcTL+9DtOT/aDO+YyxSSdO8YIS0jyZwHHSlAmnxA6cKU3TrTd4Xc/bHayctxTgGLYNuVVoiXE4tTq1g== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/rlp@5.6.1", "@ethersproject/rlp@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.6.1.tgz#df8311e6f9f24dcb03d59a2bac457a28a4fe2bd8" @@ -2326,7 +2114,7 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/logger" "^5.6.0" -"@ethersproject/rlp@5.7.0", "@ethersproject/rlp@^5.6.0", "@ethersproject/rlp@^5.7.0": +"@ethersproject/rlp@5.7.0", "@ethersproject/rlp@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.7.0.tgz#de39e4d5918b9d74d46de93af80b7685a9c21304" integrity sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w== @@ -2351,15 +2139,6 @@ "@ethersproject/logger" "^5.4.0" hash.js "1.1.7" -"@ethersproject/sha2@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.0.tgz#364c4c11cc753bda36f31f001628706ebadb64d9" - integrity sha512-1tNWCPFLu1n3JM9t4/kytz35DkuF9MxqkGGEHNauEbaARdm2fafnOyw1s0tIQDPKF/7bkP1u3dbrmjpn5CelyA== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - hash.js "1.1.7" - "@ethersproject/sha2@5.6.1", "@ethersproject/sha2@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.1.tgz#211f14d3f5da5301c8972a8827770b6fd3e51656" @@ -2369,7 +2148,7 @@ "@ethersproject/logger" "^5.6.0" hash.js "1.1.7" -"@ethersproject/sha2@5.7.0", "@ethersproject/sha2@^5.6.0", "@ethersproject/sha2@^5.7.0": +"@ethersproject/sha2@5.7.0", "@ethersproject/sha2@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.7.0.tgz#9a5f7a7824ef784f7f7680984e593a800480c9fb" integrity sha512-gKlH42riwb3KYp0reLsFTokByAKoJdgFCwI+CCiX/k+Jm2mbNs6oOaCjYQSlI1+XBVejwH2KrmCbMAT/GnRDQw== @@ -2390,18 +2169,6 @@ elliptic "6.5.4" hash.js "1.1.7" -"@ethersproject/signing-key@5.6.1": - version "5.6.1" - resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.6.1.tgz#31b0a531520616254eb0465b9443e49515c4d457" - integrity sha512-XvqQ20DH0D+bS3qlrrgh+axRMth5kD1xuvqUQUTeezxUTXBOeR6hWz2/C6FBEu39FRytyybIWrYf7YLSAKr1LQ== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - bn.js "^4.11.9" - elliptic "6.5.4" - hash.js "1.1.7" - "@ethersproject/signing-key@5.6.2", "@ethersproject/signing-key@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.6.2.tgz#8a51b111e4d62e5a62aee1da1e088d12de0614a3" @@ -2414,7 +2181,7 @@ elliptic "6.5.4" hash.js "1.1.7" -"@ethersproject/signing-key@5.7.0", "@ethersproject/signing-key@^5.6.0", "@ethersproject/signing-key@^5.7.0": +"@ethersproject/signing-key@5.7.0", "@ethersproject/signing-key@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.7.0.tgz#06b2df39411b00bc57c7c09b01d1e41cf1b16ab3" integrity sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q== @@ -2449,18 +2216,6 @@ "@ethersproject/sha2" "^5.4.0" "@ethersproject/strings" "^5.4.0" -"@ethersproject/solidity@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.6.0.tgz#64657362a596bf7f5630bdc921c07dd78df06dc3" - integrity sha512-YwF52vTNd50kjDzqKaoNNbC/r9kMDPq3YzDWmsjFTRBcIF1y4JCQJ8gB30wsTfHbaxgxelI5BfxQSxD/PbJOww== - dependencies: - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/sha2" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/solidity@5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.6.1.tgz#5845e71182c66d32e6ec5eefd041fca091a473e2" @@ -2494,15 +2249,6 @@ "@ethersproject/constants" "^5.4.0" "@ethersproject/logger" "^5.4.0" -"@ethersproject/strings@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.6.0.tgz#9891b26709153d996bf1303d39a7f4bc047878fd" - integrity sha512-uv10vTtLTZqrJuqBZR862ZQjTIa724wGPWQqZrofaPI/kUsf53TBG0I0D+hQ1qyNtllbNzaW+PDPHHUI6/65Mg== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/strings@5.6.1", "@ethersproject/strings@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.6.1.tgz#dbc1b7f901db822b5cafd4ebf01ca93c373f8952" @@ -2512,7 +2258,7 @@ "@ethersproject/constants" "^5.6.1" "@ethersproject/logger" "^5.6.0" -"@ethersproject/strings@5.7.0", "@ethersproject/strings@^5.6.0", "@ethersproject/strings@^5.7.0": +"@ethersproject/strings@5.7.0", "@ethersproject/strings@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.7.0.tgz#54c9d2a7c57ae8f1205c88a9d3a56471e14d5ed2" integrity sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg== @@ -2545,21 +2291,6 @@ "@ethersproject/rlp" "^5.4.0" "@ethersproject/signing-key" "^5.4.0" -"@ethersproject/transactions@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.6.0.tgz#4b594d73a868ef6e1529a2f8f94a785e6791ae4e" - integrity sha512-4HX+VOhNjXHZyGzER6E/LVI2i6lf9ejYeWD6l4g50AdmimyuStKc39kvKf1bXWQMg7QNVh+uC7dYwtaZ02IXeg== - dependencies: - "@ethersproject/address" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/rlp" "^5.6.0" - "@ethersproject/signing-key" "^5.6.0" - "@ethersproject/transactions@5.6.2", "@ethersproject/transactions@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.6.2.tgz#793a774c01ced9fe7073985bb95a4b4e57a6370b" @@ -2575,7 +2306,7 @@ "@ethersproject/rlp" "^5.6.1" "@ethersproject/signing-key" "^5.6.2" -"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.6.0", "@ethersproject/transactions@^5.7.0": +"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.7.0.tgz#91318fc24063e057885a6af13fdb703e1f993d3b" integrity sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ== @@ -2614,15 +2345,6 @@ "@ethersproject/constants" "^5.4.0" "@ethersproject/logger" "^5.4.0" -"@ethersproject/units@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.6.0.tgz#e5cbb1906988f5740254a21b9ded6bd51e826d9c" - integrity sha512-tig9x0Qmh8qbo1w8/6tmtyrm/QQRviBh389EQ+d8fP4wDsBrJBf08oZfoiz1/uenKK9M78yAP4PoR7SsVoTjsw== - dependencies: - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/units@5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.6.1.tgz#ecc590d16d37c8f9ef4e89e2005bda7ddc6a4e6f" @@ -2662,27 +2384,6 @@ "@ethersproject/transactions" "^5.4.0" "@ethersproject/wordlists" "^5.4.0" -"@ethersproject/wallet@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.6.0.tgz#33d11a806d783864208f348709a5a3badac8e22a" - integrity sha512-qMlSdOSTyp0MBeE+r7SUhr1jjDlC1zAXB8VD84hCnpijPQiSNbxr6GdiLXxpUs8UKzkDiNYYC5DRI3MZr+n+tg== - dependencies: - "@ethersproject/abstract-provider" "^5.6.0" - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/address" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/hash" "^5.6.0" - "@ethersproject/hdnode" "^5.6.0" - "@ethersproject/json-wallets" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/random" "^5.6.0" - "@ethersproject/signing-key" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - "@ethersproject/wordlists" "^5.6.0" - "@ethersproject/wallet@5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.6.2.tgz#cd61429d1e934681e413f4bc847a5f2f87e3a03c" @@ -2736,17 +2437,6 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/strings" "^5.4.0" -"@ethersproject/web@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.6.0.tgz#4bf8b3cbc17055027e1a5dd3c357e37474eaaeb8" - integrity sha512-G/XHj0hV1FxI2teHRfCGvfBUHFmU+YOSbCxlAMqJklxSa7QMiHFQfAxvwY2PFqgvdkxEKwRNr/eCjfAPEm2Ctg== - dependencies: - "@ethersproject/base64" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/web@5.6.1", "@ethersproject/web@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.6.1.tgz#6e2bd3ebadd033e6fe57d072db2b69ad2c9bdf5d" @@ -2758,7 +2448,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" -"@ethersproject/web@5.7.1", "@ethersproject/web@^5.6.0", "@ethersproject/web@^5.7.0": +"@ethersproject/web@5.7.1", "@ethersproject/web@^5.7.0": version "5.7.1" resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.7.1.tgz#de1f285b373149bee5928f4eb7bcb87ee5fbb4ae" integrity sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w== @@ -2780,17 +2470,6 @@ "@ethersproject/properties" "^5.4.0" "@ethersproject/strings" "^5.4.0" -"@ethersproject/wordlists@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.6.0.tgz#79e62c5276e091d8575f6930ba01a29218ded032" - integrity sha512-q0bxNBfIX3fUuAo9OmjlEYxP40IB8ABgb7HjEZCL5IKubzV3j30CWi2rqQbjTS2HfoyQbfINoKcTVWP4ejwR7Q== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/hash" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/wordlists@5.6.1", "@ethersproject/wordlists@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.6.1.tgz#1e78e2740a8a21e9e99947e47979d72e130aeda1" @@ -2802,7 +2481,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" -"@ethersproject/wordlists@5.7.0", "@ethersproject/wordlists@^5.6.0", "@ethersproject/wordlists@^5.7.0": +"@ethersproject/wordlists@5.7.0", "@ethersproject/wordlists@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.7.0.tgz#8fb2c07185d68c3e09eb3bfd6e779ba2774627f5" integrity sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA== @@ -3180,7 +2859,7 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@keepkey/device-protocol@^7.12.2", "@keepkey/device-protocol@^7.8.1": +"@keepkey/device-protocol@^7.12.2": version "7.12.2" resolved "https://registry.yarnpkg.com/@keepkey/device-protocol/-/device-protocol-7.12.2.tgz#9ff4b322af99264b83bbf68cc1cd349f53b32070" integrity sha512-U2wGgynZx9euKx9sshLzCeMJ/36+2NH8M/YhnUoCrS1xsjPp5xTCXquLFCFzfEL379yL4g03yu2kT41LKI5Dog== @@ -3290,23 +2969,6 @@ tiny-secp256k1 "1.1.6" varuint-bitcoin "1.1.2" -"@ledgerhq/hw-app-btc@^6.7.0": - version "6.27.1" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-6.27.1.tgz#5f7258f8a61532e14d6720678a80133320fc5666" - integrity sha512-2XOH5jtso4QsPYjXldwdcXw6amb8kCyiHtXw1NySA1QP/xBjxN8JLEXEPFsaK6l2zz55I8kKUtVoEGz7bpg0lg== - dependencies: - "@ledgerhq/hw-transport" "^6.27.1" - "@ledgerhq/logs" "^6.10.0" - bip32-path "^0.4.2" - bitcoinjs-lib "^5.2.0" - bs58 "^4.0.1" - invariant "^2.2.4" - ripemd160 "2" - semver "^7.3.5" - sha.js "2" - tiny-secp256k1 "1.1.6" - varuint-bitcoin "1.1.2" - "@ledgerhq/hw-app-cosmos@6.7.0": version "6.7.0" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-cosmos/-/hw-app-cosmos-6.7.0.tgz#d2e79213378a06b647aa4ce58c0ea89452425d0d" @@ -3425,7 +3087,7 @@ "@ledgerhq/hw-transport" "^6.7.0" "@ledgerhq/logs" "^6.2.0" -"@ledgerhq/hw-transport@6.7.0", "@ledgerhq/hw-transport@^5.19.1", "@ledgerhq/hw-transport@^5.51.1", "@ledgerhq/hw-transport@^6.20.0", "@ledgerhq/hw-transport@^6.27.1", "@ledgerhq/hw-transport@^6.28.8", "@ledgerhq/hw-transport@^6.7.0": +"@ledgerhq/hw-transport@6.7.0", "@ledgerhq/hw-transport@^5.19.1", "@ledgerhq/hw-transport@^5.51.1", "@ledgerhq/hw-transport@^6.20.0", "@ledgerhq/hw-transport@^6.28.8", "@ledgerhq/hw-transport@^6.7.0": version "6.7.0" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.7.0.tgz#d1f0d70e21b91e6457a32d4c3cec0764e97461ff" integrity sha512-w+PhW6Y4KXYdoCykkE1zt0VL6Ryf72RP8sZP8OH1O90hX/R/q9BMYKl8VNqTbqlrOrORgATlKkbmIJBjbngZew== @@ -5895,50 +5557,10 @@ web-encoding "^1.1.0" wif "^2.0.6" -"@shapeshiftoss/hdwallet-core@1.21.1": - version "1.21.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.21.1.tgz#a382f305a9cb502ea1677c34bcd4d603024128dc" - integrity sha512-paDSgf5AhJkC7N6nsQLzyrQVxFZxyJoGwEwiVAwMPJg8ublLorJTiHZAKG23FM89GqGWEyYiXrIgdY8fL1BoIQ== - dependencies: - eventemitter2 "^5.0.1" - lodash "^4.17.21" - rxjs "^6.4.0" - type-assertions "^1.1.0" - -"@shapeshiftoss/hdwallet-core@1.21.2", "@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.21.2.tgz#88fe49d79a79c8429b714e6244a4068c82e2afb5" - integrity sha512-s1J95MIwu/Qfaeijz6J6qdVxe8gMbVQjEWPCfuhGvBIxF94o+7cpoUXIrU4KIIuDbrdxJ3P4sf7xo89s4Y3wNQ== - dependencies: - eventemitter2 "^5.0.1" - lodash "^4.17.21" - rxjs "^6.4.0" - type-assertions "^1.1.0" - -"@shapeshiftoss/hdwallet-core@1.22.0": - version "1.22.0" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.22.0.tgz#f16d3d2842c5e704ec8e829573b1152dd2070001" - integrity sha512-xCfmWN0FyJH8lVRhAKPQ7UHfWY1aMGbnGyalS+X4saz9P8o4qaHQ/vBpARrKhL+dDsDSKt8Ol2Wo90nv6C/7Ag== - dependencies: - eventemitter2 "^5.0.1" - lodash "^4.17.21" - rxjs "^6.4.0" - type-assertions "^1.1.0" - -"@shapeshiftoss/hdwallet-core@1.23.0": - version "1.23.0" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.23.0.tgz#8e7552b684d9c4600381cf3131c9d304df4b169a" - integrity sha512-CP0ysBeyRMtjx1OTSj+EmuhYWeh3YGxrbobj7HZDYYl8kHyUseJTTQ3s42ezS1AfXkDf/YidKDxa7p6+v7/0sw== - dependencies: - eventemitter2 "^5.0.1" - lodash "^4.17.21" - rxjs "^6.4.0" - type-assertions "^1.1.0" - -"@shapeshiftoss/hdwallet-core@1.52.0": - version "1.52.0" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.0.tgz#6dadd6fb8c8bd95a6e2b067d590b6d07ecc6a729" - integrity sha512-0SyKTbPphmHxno09enid8CdBjnLInfWJkmBO7vJvh2LBGSKw3fZo+7+tjfJe0Z2lS7To6SsJCfBMt1plLTfd1A== +"@shapeshiftoss/hdwallet-core@1.52.1", "@shapeshiftoss/hdwallet-core@^1.50.4": + version "1.52.1" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.1.tgz#5165e6ecfef3ffa2a3c1ed1aafe6de268224f920" + integrity sha512-ON0kGiYhVUZm2sPp6EbgIwACJAvULIeklddWPZDCv6mvByIsY8D6BTVQtXVavHBB+/Pf6bVc1uMfCO3X5zPaHg== dependencies: "@shapeshiftoss/proto-tx-builder" "^0.8.0" eip-712 "^1.0.0" @@ -5947,10 +5569,10 @@ rxjs "^6.4.0" type-assertions "^1.1.0" -"@shapeshiftoss/hdwallet-core@1.52.1", "@shapeshiftoss/hdwallet-core@^1.50.4": - version "1.52.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.1.tgz#5165e6ecfef3ffa2a3c1ed1aafe6de268224f920" - integrity sha512-ON0kGiYhVUZm2sPp6EbgIwACJAvULIeklddWPZDCv6mvByIsY8D6BTVQtXVavHBB+/Pf6bVc1uMfCO3X5zPaHg== +"@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.11": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.3-thorchain.11.tgz#1d24db71eae513a5f8ca79721e76f244974ef3dc" + integrity sha512-FxVzYJJ7ZqqaWzEBgxN2bsUUxk3y38QIRd48C2cRQjgPDQbd1DRRaWoxD0/f4zFGDyAYTQgF7mOUGUH9JLV7Zw== dependencies: "@shapeshiftoss/proto-tx-builder" "^0.8.0" eip-712 "^1.0.0" @@ -5970,146 +5592,128 @@ type-assertions "^1.1.0" "@shapeshiftoss/hdwallet-keepkey-nodewebusb@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey-nodewebusb/-/hdwallet-keepkey-nodewebusb-1.21.2.tgz#69f37ae29077ec3a11fea9ee319f869b712f8198" - integrity sha512-7ImVY9DQLv+QLZFT/JWuzecP/CSDb8VeaQghLICgOqG/xPMRMiSOBJxcFzPJiK/uM7E+UmMBgHgLM/zhHUz68g== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-nodewebusb/-/hdwallet-keepkey-nodewebusb-1.52.3-thorchain.11.tgz#2bdcf3bf1a7599ffea9f5ebd5e2e4c3acf3dcc35" + integrity sha512-Ek94hVGSzsZWVdrev2UOlUrYZtnpUwVJh0Zf8osTu36JzPjrEKgQDA72mRQzIAXKRacqtdCL/uec3SI+kWomPA== dependencies: - "@shapeshiftoss/hdwallet-core" "1.21.2" - "@shapeshiftoss/hdwallet-keepkey" "1.21.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" "@shapeshiftoss/hdwallet-keepkey-tcp@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey-tcp/-/hdwallet-keepkey-tcp-1.21.2.tgz#fcb34a45cd84caf627f35fba37aa1d81191c12ca" - integrity sha512-/bQcRaic5dd1J9wuMr4ywjLRfA9piczfQiyNdXr7z3iSX/3RmI9QBgjTHQWoAij/ufFGmZPOYyh1VJAsIAhCCA== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-tcp/-/hdwallet-keepkey-tcp-1.52.3-thorchain.11.tgz#bdfde504aac915f3d6763082c2e49c0980ed59ad" + integrity sha512-K2pEq35XAHpTR45m8WwdVBRvx5lIj8+G3tONsqr0d/9KluGEn//FPil5P9Rxz/CvXam/uwWH7NvJMibWmKlcQA== dependencies: - "@shapeshiftoss/hdwallet-core" "1.21.2" - "@shapeshiftoss/hdwallet-keepkey" "1.21.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" axios "^0.21.1" "@shapeshiftoss/hdwallet-keepkey-webusb@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey-webusb/-/hdwallet-keepkey-webusb-1.21.2.tgz#35c8b40e7d9eef0c3b6e32b376123839c540db17" - integrity sha512-svcoyT0mnAsxOiFQGSD7dgwiRMSM2Orh7YMqe6Rh/QRT/IlXWbknVUf4dBvZFS4ZKIVZRIREaYc2zKo3bRebNQ== - dependencies: - "@shapeshiftoss/hdwallet-core" "1.21.2" - "@shapeshiftoss/hdwallet-keepkey" "1.21.2" - -"@shapeshiftoss/hdwallet-keepkey@1.21.2": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey/-/hdwallet-keepkey-1.21.2.tgz#969a9331c2bad4b46ab88dd4d7dfd98df87be67d" - integrity sha512-5hwjZWmdED/No3Fbr6L1dhCIAAl2zj76OOFDEMgKoTtbtL4GIiKH43W1g9H+SbtLWSpa/VSQxz26NMyMigNh1w== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-webusb/-/hdwallet-keepkey-webusb-1.52.3-thorchain.11.tgz#75ecc2d3d2e2f26db1f86f50fd95eefaccf8bf15" + integrity sha512-pO1susjpLW0YKENcWrjI81moONOeTbjf6mcc2Mq8yfLbxiNYM4guEEtnesU5OfKjv78bOsyOgcNjzpKL8PiygQ== dependencies: - "@ethereumjs/common" "^2.4.0" - "@ethereumjs/tx" "^3.3.0" - "@keepkey/device-protocol" "^7.8.1" - "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" - "@shapeshiftoss/hdwallet-core" "1.21.2" - "@shapeshiftoss/proto-tx-builder" "^0.2.1" - bignumber.js "^9.0.1" - bnb-javascript-sdk-nobroadcast "^2.16.14" - crypto-js "^4.0.0" - eip55 "^2.1.0" - google-protobuf "^3.15.8" - icepick "^2.4.0" - lodash "^4.17.21" - p-lazy "^3.1.0" - semver "^6.3.0" - tiny-secp256k1 "^1.1.6" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" -"@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.10": - version "1.22.0" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keepkey/-/hdwallet-keepkey-1.22.0.tgz#3dfd550ccb0e07fff96db99136c909a346af4fca" - integrity sha512-4D+lVQaff1E2kO7lImp4gyI+7/tIiwoU6ns/PgmfmuDXpxmSvG0Z50hA2eee6e6eqmPXpwz/1GhlkIvv3p99yA== +"@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.11": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey/-/hdwallet-keepkey-1.52.3-thorchain.11.tgz#83b412314ca7087e5d2245615fbae46686492996" + integrity sha512-U08jLpycWtfu1hSYnYCx+5e4/tokP/Z8eCQrUlYTdKSAZmXPBTFlz7uKjWcsj0zuoC+xod3yc5VSXbyvGsnupg== dependencies: "@ethereumjs/common" "^2.4.0" "@ethereumjs/tx" "^3.3.0" - "@keepkey/device-protocol" "^7.8.1" + "@keepkey/device-protocol" "^7.12.2" "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" - "@shapeshiftoss/hdwallet-core" "1.22.0" - "@shapeshiftoss/proto-tx-builder" "^0.2.1" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/proto-tx-builder" "^0.8.0" bignumber.js "^9.0.1" bnb-javascript-sdk-nobroadcast "^2.16.14" crypto-js "^4.0.0" + eip-712 "^1.0.0" eip55 "^2.1.0" google-protobuf "^3.15.8" icepick "^2.4.0" lodash "^4.17.21" p-lazy "^3.1.0" - semver "^6.3.0" + semver "^7.3.8" tiny-secp256k1 "^1.1.6" "@shapeshiftoss/hdwallet-keplr@^1.52.3-thorchain.10": - version "1.52.0" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-keplr/-/hdwallet-keplr-1.52.0.tgz#0348e2599d993958c58945e47a3add446dee9556" - integrity sha512-SU3AQyBkO6xALSzMmOSMbmO50eC/JOc85yM6VUQYPjmyIJ1pf9/YKgjn05xehwv8UsNU858Ep5GBIo8NPQop5g== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keplr/-/hdwallet-keplr-1.52.3-thorchain.11.tgz#d4d68722353f496f754d2cb0062dc2612430cd64" + integrity sha512-vNOsjerVGDfFDUcoX45yQthDVvcss7YKvbcS9feMC9yVSHgb9raYVdUJsJ7JIqXNYkkJ/aMardMb2ldCTmH+IQ== dependencies: "@shapeshiftoss/caip" "8.15.0" - "@shapeshiftoss/hdwallet-core" "1.52.0" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" "@shapeshiftoss/proto-tx-builder" "^0.8.0" "@shapeshiftoss/types" "3.1.3" base64-js "^1.5.1" lodash "^4.17.21" "@shapeshiftoss/hdwallet-ledger-webhid@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-ledger-webhid/-/hdwallet-ledger-webhid-1.21.2.tgz#ad31acd213547df29c3ee2257b18f4a0c640f28b" - integrity sha512-NahU0xVaSocycrSjlK9eR/vsyn8XOWwqAZ+H0OyT0pfrFJD2PFh6/FAuOBhz9rbCvS5TUNkSMIZVj7WvUQ3OXQ== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger-webhid/-/hdwallet-ledger-webhid-1.52.3-thorchain.11.tgz#48e49b81c14a65e6e2ab868b17a40e1bd6e98eb2" + integrity sha512-lFBiBXjaSKnsPKKUNDhIcHjZuKfwrJ/lzc2ckepR+SPgS13LMsXnHcFy87DVb53e6CP4p4Kv6I2zR1rJsv+SeQ== dependencies: - "@ledgerhq/hw-app-btc" "^6.7.0" + "@ledgerhq/hw-app-btc" "^10.0.8" "@ledgerhq/hw-app-eth" "^6.9.0" "@ledgerhq/hw-transport" "^6.7.0" "@ledgerhq/hw-transport-webhid" "^6.7.0" "@ledgerhq/live-common" "^21.8.2" - "@shapeshiftoss/hdwallet-core" "1.21.2" - "@shapeshiftoss/hdwallet-ledger" "1.21.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-ledger" "^1.52.3-thorchain.11" "@types/w3c-web-hid" "^1.0.2" - typescript "^4.3.2" "@shapeshiftoss/hdwallet-ledger-webusb@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-ledger-webusb/-/hdwallet-ledger-webusb-1.21.2.tgz#00629563b25ec3dd94a7268e52780a718448347b" - integrity sha512-SX40IZEFo8jCx4/U7I7UogDa7L1RECdK+Xp+yuyhqxU3rITrpLrdJH9H1vOy4FS+TxRN2BkMMAG5mXMCCencag== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger-webusb/-/hdwallet-ledger-webusb-1.52.3-thorchain.11.tgz#3adb61c57fccd50627438c559f80b9ea6628a561" + integrity sha512-D3XRt+0+Z8YJMTBoTDO2oDjmg0LQtvURd1p8tqGRVxxpoXQxPQg5LI0zq7bjFPF7FyaBaINF8lu8uaHrU+Aygw== dependencies: - "@ledgerhq/hw-app-btc" "^6.7.0" + "@ledgerhq/hw-app-btc" "^10.0.8" "@ledgerhq/hw-app-eth" "^6.9.0" "@ledgerhq/hw-transport" "^6.7.0" "@ledgerhq/hw-transport-webusb" "^6.7.0" "@ledgerhq/live-common" "^21.8.2" - "@shapeshiftoss/hdwallet-core" "1.21.2" - "@shapeshiftoss/hdwallet-ledger" "1.21.2" + "@ledgerhq/logs" "^6.10.1" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-ledger" "^1.52.3-thorchain.11" "@types/w3c-web-usb" "^1.0.4" - typescript "^4.3.2" + p-queue "^7.4.1" -"@shapeshiftoss/hdwallet-ledger@1.21.2", "@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-ledger/-/hdwallet-ledger-1.21.2.tgz#f506a357b291440bf4fc141bc35f880709c13a6b" - integrity sha512-2NRIHYZGieHjumKLBFgQqzlrZzE6nd5osgqVjwDXDU7NWnAhRz9LBS8T09diYXSvLNNY2Yhld14CPiktDYbGig== +"@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.11": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger/-/hdwallet-ledger-1.52.3-thorchain.11.tgz#7a03688868f922c033a315fa9409ccfb9aecab40" + integrity sha512-KujW49hBSzM05g6nnJ7Oheiiro0R9f8+l5faj1pqZYs2bpZFgoqlKLGe1zkItp2YCuVIEeMtXHMmqGBJaMQmjw== dependencies: "@ethereumjs/common" "^2.4.0" "@ethereumjs/tx" "^3.3.0" - "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@types/ripemd160" "^2.0.1" base64-js "^1.5.1" bchaddrjs "^0.4.4" - bitcoinjs-lib "^5.1.6" bitcoinjs-message "^2.0.0" bs58check "2.1.2" ethereumjs-tx "1.3.7" ethereumjs-util "^6.1.0" lodash "^4.17.21" + ripemd160 "^2.0.2" "@shapeshiftoss/hdwallet-metamask@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-metamask/-/hdwallet-metamask-1.21.2.tgz#2a73bab57a45984bc7ddca5c08c765e1a17c929b" - integrity sha512-JCWH3YRuIpB8h+RLWF+arU5w4VsHJoMz7MUF+DUmiivziwWprrn8r4PYtzo7QSMffwwKudzB1B8nHVm0ygDzdg== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-metamask/-/hdwallet-metamask-1.52.3-thorchain.11.tgz#3bc519ebbe0285ba3d0076ae03dda7a71e096d47" + integrity sha512-FeS94nlj2oklOFGX0X1AykL2+bosVi8+3NvBkl+v8zjWluHkcEvXfXmj7Dao/AjAL00auOIJrsFLdKOZ7O2RaQ== dependencies: "@metamask/detect-provider" "^1.2.0" "@metamask/onboarding" "^1.0.1" - "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + eth-rpc-errors "^4.0.3" lodash "^4.17.21" "@shapeshiftoss/hdwallet-native@^1.50.4": version "1.52.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.1.tgz#9a8144302f20069d145079154d3d9c56086178b4" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.1.tgz#9a8144302f20069d145079154d3d9c56086178b4" integrity sha512-TUemR4q0ISgPRvLkZQaK0iQ9t8ObhbGwGtOBmKzbSyJR10vVXbGxt5eIi+Gc19fSz7uyAQM2N3pIMFMsBasciw== dependencies: "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" @@ -6137,22 +5741,24 @@ web-encoding "^1.1.0" "@shapeshiftoss/hdwallet-native@^1.52.3-thorchain.10": - version "1.23.0" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.23.0.tgz#a035d1f1baa6c5a1da47bb2d12aad8e76d0b46d2" - integrity sha512-UYCrUD8Ful1lNArpzLhvTBnuNjgSz9Ytl3/MPeOPi+WTrD3PIYh/QEOmx6JqBL0PoxoQof1O6GqYBq44It1tsg== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.3-thorchain.11.tgz#e57ef8355715ab701a7c059d460f917d011af999" + integrity sha512-6BfKW9qCGyvTVBdVB6i+pMR00I8TcKRhobAqB6zcuX0jWIj25TYltvuDk2EB3YedH38d0ly9ZEEuteKL4WY6Cw== dependencies: "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" "@shapeshiftoss/fiosdk" "1.2.1-shapeshift.6" - "@shapeshiftoss/hdwallet-core" "1.23.0" - "@shapeshiftoss/proto-tx-builder" "^0.2.1" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/proto-tx-builder" "^0.8.0" "@zxing/text-encoding" "^0.9.0" bchaddrjs "^0.4.9" + bech32 "^1.1.4" bignumber.js "^9.0.1" bip32 "^2.0.5" bip39 "^3.0.2" bnb-javascript-sdk-nobroadcast "^2.16.14" crypto-js "^4.0.0" - ethers "5.6.5" + eip-712 "^1.0.0" + ethers "5.7.2" eventemitter2 "^5.0.1" funtypes "^3.0.1" lodash "^4.17.21" @@ -6164,12 +5770,12 @@ web-encoding "^1.1.0" "@shapeshiftoss/hdwallet-portis@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-portis/-/hdwallet-portis-1.21.2.tgz#f87c325e24add9d3281f3bb490d1714219307886" - integrity sha512-0l6dSzcWlD/KcIZw/eDA71V/DsNcs4myTX9qdnhmW4bJVRvpRiAEnt7hIo0v76OGCBkvBsiwXTRxfmM34HC6NQ== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-portis/-/hdwallet-portis-1.52.3-thorchain.11.tgz#35b734a9fecb7121e4808c6f99e9a86862d13533" + integrity sha512-9LVYv6uZX6bgKED3YYF29YF+UTL4XhgI83SeveW/PknvYMrbvF0eSQjQDqydrYLNUaQ5bmjKoXi5Cl3o4XQTaQ== dependencies: "@portis/web3" "3.0.10" - "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" base64-js "^1.5.1" bip32 "^2.0.4" bitcoinjs-lib "^5.1.6" @@ -6179,62 +5785,51 @@ web3 "^1.5.1" "@shapeshiftoss/hdwallet-tallyho@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-tallyho/-/hdwallet-tallyho-1.21.2.tgz#509c276f3051d70b8de3020a5f49f7d69c2c7c31" - integrity sha512-d3IvLvVEZY1t7XgONbtRYuq9k6V4f8L+64vOvTR6eP5oE6VBJAWxRkRSJLMvqdWM+elxWuOPqtXvPAY/Eohukw== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-tallyho/-/hdwallet-tallyho-1.52.3-thorchain.11.tgz#faa3e2a7c6a81a9c8e0e3fa998d41fef58bdea9b" + integrity sha512-VgIDzgSxk8tRn7DSlSP/lUn7p074WjMrFfSsEj5jtuVh1rpLhCBH6sDgv34rUPHQ8m3VrXYjg3qUsDoau+Rltg== dependencies: - "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" lodash "^4.17.21" tallyho-onboarding "^1.0.2" "@shapeshiftoss/hdwallet-trezor-connect@^1.52.3-thorchain.10": - version "1.21.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-trezor-connect/-/hdwallet-trezor-connect-1.21.1.tgz#c5172c1e4ec92a31969b0c743289a819a025f5f0" - integrity sha512-0kW4rPQjsAmnXK053xnEUv1BnM0rXIDzQnCTuy8kSADKw8lmz9NPXqftIiVCEYSkOxq5r+E909TVmIJkdbpZNA== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-trezor-connect/-/hdwallet-trezor-connect-1.52.3-thorchain.11.tgz#5d4ceb32201136dadc03b8320917d7a6aa488aca" + integrity sha512-fc3Ui4AFgHF6OdUynKsh4qg/sb8m9AnWz9VuY0qPseYtJhQCSt5WneluWXPWjTVNlDFkn7GqthyQAfTl0LLbYQ== dependencies: - "@shapeshiftoss/hdwallet-core" "1.21.1" - "@shapeshiftoss/hdwallet-trezor" "1.21.1" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" + "@shapeshiftoss/hdwallet-trezor" "^1.52.3-thorchain.11" "@trezor/rollout" "^1.2.0" trezor-connect "^8.2.1" -"@shapeshiftoss/hdwallet-trezor@1.21.1": - version "1.21.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-trezor/-/hdwallet-trezor-1.21.1.tgz#9d3ac2462b6d2f0725a36e2cd79e2a0f67c1d9fb" - integrity sha512-VlcFEbs0HT9XxOHS52sz6UF4EKziuFssGzIke/yfDVVHSYoWuOZJMu3zMtqNoc8EZCuwnUgsmuyPHpFXfV6jJw== +"@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.11": + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-trezor/-/hdwallet-trezor-1.52.3-thorchain.11.tgz#87c17c63552e18c0299d75c20b6fe5e98a9b9083" + integrity sha512-7I4WWRc3hYCBUySll7Pokk0jnm8u/1yJaFhNabTYphnGPTI1fa4hj7dth22GAqvFYoSX+HlsqB1TJolmIAwv0g== dependencies: "@ethereumjs/common" "^2.4.0" "@ethereumjs/tx" "^3.3.0" - "@shapeshiftoss/hdwallet-core" "1.21.1" - base64-js "^1.5.1" - lodash "^4.17.21" - -"@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.10": - version "1.21.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-trezor/-/hdwallet-trezor-1.21.2.tgz#dde1f0293a8365f4791bba80ea5041efa4ed0e6f" - integrity sha512-1IP/Kb9MqzcwASwW8jg+mWgCbPUvK6LBoCCW1w7keibimdXlsMu2LEWvgUxIFzQQlX9QtcZ+vAoKuZ1yO1tJ+A== - dependencies: - "@ethereumjs/common" "^2.4.0" - "@ethereumjs/tx" "^3.3.0" - "@shapeshiftoss/hdwallet-core" "1.21.2" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" base64-js "^1.5.1" lodash "^4.17.21" "@shapeshiftoss/hdwallet-walletconnect@^1.52.3-thorchain.10": - version "1.52.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-walletconnect/-/hdwallet-walletconnect-1.52.1.tgz#ec889e5363f53542a6adec9848559d7d157e7d60" - integrity sha512-S9LP0VYBYnUVvG7CW4pWsiY2yRnhy5plwPMNO+gnup3oMzRZUAxN1mkP5aSL8v4cwT+L/THjZ4VNqqEuMZShNA== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-walletconnect/-/hdwallet-walletconnect-1.52.3-thorchain.11.tgz#b75eee0e4ded2f3ead7bf7c8dc4805f143a0c087" + integrity sha512-//GZ3npcC4RsSiqgQ03jSNL7adKrlF8aBQ9UT3HWItw1+bNN3jB2npiQV7d6KIYqtt3zr1YWxCXp0yAkeBbPdw== dependencies: - "@shapeshiftoss/hdwallet-core" "1.52.1" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" "@walletconnect/qrcode-modal" "^1.7.8" "@walletconnect/web3-provider" "^1.7.8" ethers "^5.6.5" "@shapeshiftoss/hdwallet-xdefi@^1.52.3-thorchain.10": - version "1.21.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-xdefi/-/hdwallet-xdefi-1.21.1.tgz#11935751ebc1a764fbeb9a70c17e6c4eeaccd8d5" - integrity sha512-sfl7O5LDp9sLuL3XFBckap3v6vBLhGl8XsgGV9sPsRGWwaLOhDnXE9YObnCxpLjJKtF6ZyzLH203ba4XB68Tpg== + version "1.52.3-thorchain.11" + resolved "http://localhost:4873/@shapeshiftoss/hdwallet-xdefi/-/hdwallet-xdefi-1.52.3-thorchain.11.tgz#9571a7747e21e6321add7815d8d147edb8b06cfc" + integrity sha512-ocbVY3TFfrgr35Kqa9UlhvOJhZ6YLnJmKJLIqOkF+GLs+eOxwagqDBIDxYgXNAbx36q2MVF4GS51URrn6LG0BA== dependencies: - "@shapeshiftoss/hdwallet-core" "1.21.1" + "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" lodash "^4.17.21" "@shapeshiftoss/logger@^1.1.2", "@shapeshiftoss/logger@^1.1.3": @@ -6286,18 +5881,6 @@ eth-rpc-errors "^4.0.3" patch-package "^6.2.2" -"@shapeshiftoss/proto-tx-builder@^0.2.1": - version "0.2.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/proto-tx-builder/-/proto-tx-builder-0.2.1.tgz#82106d45adcec0d5d215a6098b52d16ef3db3dc8" - integrity sha512-LNUFjKRmq8aC08Uq9/umUCF2F9Fhfg9yH6xFhEdZkNTNFC4WW7XuAxKrzM6yFCaYWkIN265v7T3sHleZ9MTz3g== - dependencies: - "@cosmjs/proto-signing" "^0.28.0" - "@cosmjs/stargate" "^0.28.0" - "@cosmjs/tendermint-rpc" "^0.28.0" - cosmjs-types "^0.4.1" - google-protobuf "^3.17.0" - long "^4.0.0" - "@shapeshiftoss/proto-tx-builder@^0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@shapeshiftoss/proto-tx-builder/-/proto-tx-builder-0.8.0.tgz#12523e76e6ae2c794e8ad5439dedf65d30c78185" @@ -7115,7 +6698,7 @@ "@types/ripemd160@^2.0.1": version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/ripemd160/-/ripemd160-2.0.1.tgz#e9ea7a26adf0e2541917fc2b1ecb497e8ced4b7e" + resolved "http://localhost:4873/@types/ripemd160/-/ripemd160-2.0.1.tgz#e9ea7a26adf0e2541917fc2b1ecb497e8ced4b7e" integrity sha512-l3pt9f8vK1tU2qBXY1aL7HofNnJKbpNa+2DznrD7j0lhaS4587e3iwgSMRDJFlidsrNjrrjIl8G+EeXFMjcGXg== dependencies: "@types/node" "*" @@ -11866,42 +11449,6 @@ ethereumjs-vm@^2.3.4: rustbn.js "~0.2.0" safe-buffer "^5.1.1" -ethers@5.6.5: - version "5.6.5" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.6.5.tgz#3185ac7815dc640993408adf6f133ffabfbcbb63" - integrity sha512-9CTmplO9bv0s/aPw3HB3txGzKz3tUSI2EfO4dJo0W2WvaEq1ArgsEX6obV+bj5X3yY+Zgb1kAux8TDtJKe1FaA== - dependencies: - "@ethersproject/abi" "5.6.1" - "@ethersproject/abstract-provider" "5.6.0" - "@ethersproject/abstract-signer" "5.6.0" - "@ethersproject/address" "5.6.0" - "@ethersproject/base64" "5.6.0" - "@ethersproject/basex" "5.6.0" - "@ethersproject/bignumber" "5.6.0" - "@ethersproject/bytes" "5.6.1" - "@ethersproject/constants" "5.6.0" - "@ethersproject/contracts" "5.6.0" - "@ethersproject/hash" "5.6.0" - "@ethersproject/hdnode" "5.6.0" - "@ethersproject/json-wallets" "5.6.0" - "@ethersproject/keccak256" "5.6.0" - "@ethersproject/logger" "5.6.0" - "@ethersproject/networks" "5.6.2" - "@ethersproject/pbkdf2" "5.6.0" - "@ethersproject/properties" "5.6.0" - "@ethersproject/providers" "5.6.5" - "@ethersproject/random" "5.6.0" - "@ethersproject/rlp" "5.6.0" - "@ethersproject/sha2" "5.6.0" - "@ethersproject/signing-key" "5.6.1" - "@ethersproject/solidity" "5.6.0" - "@ethersproject/strings" "5.6.0" - "@ethersproject/transactions" "5.6.0" - "@ethersproject/units" "5.6.0" - "@ethersproject/wallet" "5.6.0" - "@ethersproject/web" "5.6.0" - "@ethersproject/wordlists" "5.6.0" - ethers@5.7.2, ethers@^5.5.3: version "5.7.2" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" @@ -20461,7 +20008,7 @@ typescript@<4.8.0: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== -"typescript@^3 || ^4", typescript@^4.3.2: +"typescript@^3 || ^4": version "4.9.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== From 23c8cde955b7a163b99925f93c23e49a15d304fb Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 19:59:06 +0200 Subject: [PATCH 073/108] feat: boimp --- examples/sandbox/package.json | 4 ++++ integration/package.json | 4 ++++ lerna.json | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 6869e75e7..72d586ab8 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -6,6 +6,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -29,6 +30,9 @@ ======= "version": "1.52.3-thorchain.11", >>>>>>> ae133cd4 (feat: boimp boimp) +======= + "version": "1.52.3-thorchain.12", +>>>>>>> 0d72dc07 (feat: boimp) "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index f73c8accb..c8d2dc3cc 100644 --- a/integration/package.json +++ b/integration/package.json @@ -6,6 +6,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -29,6 +30,9 @@ ======= "version": "1.52.3-thorchain.11", >>>>>>> ae133cd4 (feat: boimp boimp) +======= + "version": "1.52.3-thorchain.12", +>>>>>>> 0d72dc07 (feat: boimp) "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index 1f872f7f4..1f4ff0a8d 100644 --- a/lerna.json +++ b/lerna.json @@ -6,6 +6,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -29,6 +30,9 @@ ======= "version": "1.52.3-thorchain.11", >>>>>>> ae133cd4 (feat: boimp boimp) +======= + "version": "1.52.3-thorchain.12", +>>>>>>> 0d72dc07 (feat: boimp) "npmClient": "yarn", "useWorkspaces": true, "command": { From 879dcf957a6428ec2a376718dc88dcfdece1c647 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 19:59:10 +0200 Subject: [PATCH 074/108] feat: bring back hardcoded path --- packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index e56610c07..bf67c1f7f 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -270,7 +270,15 @@ class THORChainApp { } } +<<<<<<< HEAD async getAddressAndPubKey(path: Array, hrp: any): Promise { +======= + async getAddressAndPubKey(_path: number[], hrp: any): Promise { + // TODO(gomes): this is obviously temporary, find a better way to do this and pass our bip32 path in and make it work here + // eslint-disable-next-line no-console + console.log({ _path }); + const path = [44, 931, 0, 0, 0]; +>>>>>>> d5fd4902 (feat: bring back hardcoded path) try { return await this.serializePath(path) .then((serializedPath) => { @@ -342,7 +350,7 @@ class THORChainApp { const rawTx = stringifyKeysInOrder({ account_number: msg.account_number, chain_id: THOR_CHAIN, - fee: { amount: [msg.fee], gas: msg.tx.fee.gas}, + fee: { amount: [msg.fee], gas: msg.tx.fee.gas }, memo: msg.tx.memo, msgs: msg.tx.msg, sequence: msg.sequence, From c47c0a01ea97c86a75c511bca932f2e754937699 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:03:34 +0200 Subject: [PATCH 075/108] feat: boimp --- examples/sandbox/package.json | 4 ++++ integration/package.json | 4 ++++ lerna.json | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 72d586ab8..75d26ce6e 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -7,6 +7,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -33,6 +34,9 @@ ======= "version": "1.52.3-thorchain.12", >>>>>>> 0d72dc07 (feat: boimp) +======= + "version": "1.52.3-thorchain.13", +>>>>>>> 9ec1233c (feat: boimp) "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index c8d2dc3cc..b6468360c 100644 --- a/integration/package.json +++ b/integration/package.json @@ -7,6 +7,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -33,6 +34,9 @@ ======= "version": "1.52.3-thorchain.12", >>>>>>> 0d72dc07 (feat: boimp) +======= + "version": "1.52.3-thorchain.13", +>>>>>>> 9ec1233c (feat: boimp) "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index 1f4ff0a8d..dcb07da50 100644 --- a/lerna.json +++ b/lerna.json @@ -7,6 +7,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -33,6 +34,9 @@ ======= "version": "1.52.3-thorchain.12", >>>>>>> 0d72dc07 (feat: boimp) +======= + "version": "1.52.3-thorchain.13", +>>>>>>> 9ec1233c (feat: boimp) "npmClient": "yarn", "useWorkspaces": true, "command": { From a56300f9c4c02be1ad6de756c18dabc8d73a7f45 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:03:38 +0200 Subject: [PATCH 076/108] feat: sign method hardcode path too --- packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index bf67c1f7f..ab3f5f5b4 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -270,15 +270,7 @@ class THORChainApp { } } -<<<<<<< HEAD async getAddressAndPubKey(path: Array, hrp: any): Promise { -======= - async getAddressAndPubKey(_path: number[], hrp: any): Promise { - // TODO(gomes): this is obviously temporary, find a better way to do this and pass our bip32 path in and make it work here - // eslint-disable-next-line no-console - console.log({ _path }); - const path = [44, 931, 0, 0, 0]; ->>>>>>> d5fd4902 (feat: bring back hardcoded path) try { return await this.serializePath(path) .then((serializedPath) => { From c8fbeead8e9ff48cc2d96ccfa94122e5a2f85cdd Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:05:09 +0200 Subject: [PATCH 077/108] feat: boimp --- examples/sandbox/package.json | 4 ++++ integration/package.json | 4 ++++ lerna.json | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 75d26ce6e..332dac8be 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -8,6 +8,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -37,6 +38,9 @@ ======= "version": "1.52.3-thorchain.13", >>>>>>> 9ec1233c (feat: boimp) +======= + "version": "1.52.3-thorchain.14", +>>>>>>> 4deac1a8 (feat: boimp) "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index b6468360c..9d6bd80fb 100644 --- a/integration/package.json +++ b/integration/package.json @@ -8,6 +8,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -37,6 +38,9 @@ ======= "version": "1.52.3-thorchain.13", >>>>>>> 9ec1233c (feat: boimp) +======= + "version": "1.52.3-thorchain.14", +>>>>>>> 4deac1a8 (feat: boimp) "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index dcb07da50..e3347da42 100644 --- a/lerna.json +++ b/lerna.json @@ -8,6 +8,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -37,6 +38,9 @@ ======= "version": "1.52.3-thorchain.13", >>>>>>> 9ec1233c (feat: boimp) +======= + "version": "1.52.3-thorchain.14", +>>>>>>> 4deac1a8 (feat: boimp) "npmClient": "yarn", "useWorkspaces": true, "command": { From 4724ae1329175fbaab28bd70d911f32c76654d37 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 12 Oct 2023 09:20:05 +0200 Subject: [PATCH 078/108] feat: bump --- examples/sandbox/package.json | 4 ++++ integration/package.json | 4 ++++ lerna.json | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 332dac8be..25146da71 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -9,6 +9,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -41,6 +42,9 @@ ======= "version": "1.52.3-thorchain.14", >>>>>>> 4deac1a8 (feat: boimp) +======= + "version": "1.52.3-thorchain.15", +>>>>>>> 83672427 (feat: bump) "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 9d6bd80fb..fe5bbae31 100644 --- a/integration/package.json +++ b/integration/package.json @@ -9,6 +9,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -41,6 +42,9 @@ ======= "version": "1.52.3-thorchain.14", >>>>>>> 4deac1a8 (feat: boimp) +======= + "version": "1.52.3-thorchain.15", +>>>>>>> 83672427 (feat: bump) "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index e3347da42..e658d874f 100644 --- a/lerna.json +++ b/lerna.json @@ -9,6 +9,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.52.3-thorchain.15", ======= @@ -41,6 +42,9 @@ ======= "version": "1.52.3-thorchain.14", >>>>>>> 4deac1a8 (feat: boimp) +======= + "version": "1.52.3-thorchain.15", +>>>>>>> 83672427 (feat: bump) "npmClient": "yarn", "useWorkspaces": true, "command": { From bd49de6b065a60552923b5afa99073167dd3d2c5 Mon Sep 17 00:00:00 2001 From: kaladinlight <35275952+kaladinlight@users.noreply.github.com> Date: Thu, 12 Oct 2023 14:01:08 -0600 Subject: [PATCH 079/108] bump --- examples/sandbox/package.json | 6 + integration/package.json | 6 + packages/hdwallet-coinbase/package.json | 4 +- packages/hdwallet-core/package.json | 2 +- .../hdwallet-keepkey-chromeusb/package.json | 6 +- .../hdwallet-keepkey-electron/package.json | 4 +- .../hdwallet-keepkey-nodehid/package.json | 4 +- .../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-keplr/package.json | 4 +- packages/hdwallet-ledger-webhid/package.json | 6 +- packages/hdwallet-ledger-webusb/package.json | 6 +- packages/hdwallet-ledger/package.json | 4 +- packages/hdwallet-ledger/src/ledger.ts | 2 +- .../hdwallet-ledger/src/thorchain/index.ts | 2 +- .../package.json | 4 +- packages/hdwallet-metamask/package.json | 4 +- packages/hdwallet-native-vault/package.json | 4 +- packages/hdwallet-native/package.json | 4 +- packages/hdwallet-portis/package.json | 4 +- packages/hdwallet-tallyho/package.json | 4 +- packages/hdwallet-trezor-connect/package.json | 6 +- packages/hdwallet-trezor/package.json | 4 +- packages/hdwallet-walletconnect/package.json | 4 +- .../hdwallet-walletconnectV2/package.json | 4 +- packages/hdwallet-xdefi/package.json | 4 +- yarn.lock | 230 +----------------- 29 files changed, 71 insertions(+), 283 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 25146da71..1af4b18ac 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -60,6 +60,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> a7faff57 (bump) "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.15", @@ -75,6 +78,7 @@ "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.15", +<<<<<<< HEAD ======= "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.5", "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.5", @@ -177,6 +181,8 @@ "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.10", >>>>>>> fb8c5ee4 (feat: boimp boimp) +======= +>>>>>>> a7faff57 (bump) "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index fe5bbae31..103849a49 100644 --- a/integration/package.json +++ b/integration/package.json @@ -60,6 +60,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> a7faff57 (bump) "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.15", @@ -69,6 +72,7 @@ "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.15", +<<<<<<< HEAD ======= "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.5", "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.5", @@ -135,6 +139,8 @@ "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.10", >>>>>>> fb8c5ee4 (feat: boimp boimp) +======= +>>>>>>> a7faff57 (bump) "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index 323077b70..2a123f04d 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json index d06b1e2d0..2ff176e62 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index 6f611c078..bd8a1a588 100644 --- a/packages/hdwallet-keepkey-chromeusb/package.json +++ b/packages/hdwallet-keepkey-chromeusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-chromeusb", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9" + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15" } } diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index 2f4fd5fb1..472b74d9c 100644 --- a/packages/hdwallet-keepkey-electron/package.json +++ b/packages/hdwallet-keepkey-electron/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-electron", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index a81810ef1..e55adbe79 100644 --- a/packages/hdwallet-keepkey-nodehid/package.json +++ b/packages/hdwallet-keepkey-nodehid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodehid", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9" + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index bff6b6eec..572ee1226 100644 --- a/packages/hdwallet-keepkey-nodewebusb/package.json +++ b/packages/hdwallet-keepkey-nodewebusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9" + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index 139d574e4..bf283d0c9 100644 --- a/packages/hdwallet-keepkey-tcp/package.json +++ b/packages/hdwallet-keepkey-tcp/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-tcp", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15", "axios": "^0.21.1" } } diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index a820a4f17..2f5b37e74 100644 --- a/packages/hdwallet-keepkey-webusb/package.json +++ b/packages/hdwallet-keepkey-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-webusb", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9" + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4" diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index 9e91ba8f9..73911f3a9 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^3.3.0", "@keepkey/device-protocol": "^7.12.2", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "bignumber.js": "^9.0.1", "bnb-javascript-sdk-nobroadcast": "^2.16.14", diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json index 7ebbc27bf..d5a67a6cc 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/caip": "8.15.0", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@shapeshiftoss/types": "3.1.3", "base64-js": "^1.5.1", diff --git a/packages/hdwallet-ledger-webhid/package.json b/packages/hdwallet-ledger-webhid/package.json index 8d7a69523..ee1d6bf03 100644 --- a/packages/hdwallet-ledger-webhid/package.json +++ b/packages/hdwallet-ledger-webhid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webhid", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -19,8 +19,8 @@ "@ledgerhq/hw-transport": "^6.7.0", "@ledgerhq/hw-transport-webhid": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.15", "@types/w3c-web-hid": "^1.0.2" }, "devDependencies": { diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index ce0ddb44d..86bbeddf4 100644 --- a/packages/hdwallet-ledger-webusb/package.json +++ b/packages/hdwallet-ledger-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webusb", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -20,8 +20,8 @@ "@ledgerhq/hw-transport-webusb": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", "@ledgerhq/logs": "^6.10.1", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.15", "@types/w3c-web-usb": "^1.0.4", "p-queue": "^7.4.1" }, diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index 63194b01e..0432af277 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -18,7 +18,7 @@ "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@types/ripemd160": "^2.0.1", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", diff --git a/packages/hdwallet-ledger/src/ledger.ts b/packages/hdwallet-ledger/src/ledger.ts index 7078a3b88..bceae89b7 100644 --- a/packages/hdwallet-ledger/src/ledger.ts +++ b/packages/hdwallet-ledger/src/ledger.ts @@ -512,7 +512,7 @@ export class LedgerHDWallet implements core.HDWallet, core.BTCWallet, core.ETHWa await this.validateCurrentApp(msg.coin); return btc.btcGetAddress(this.transport, msg); } - public thorchainGetAddress(msg: core.ThorchainGetAddress): Promise { + public thorchainGetAddress(msg: core.ThorchainGetAddress): Promise { return thorchain.thorchainGetAddress(this.transport, msg); } diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index dca503438..d4a7f6727 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -17,7 +17,7 @@ const protoTxBuilder = PLazy.from(() => import("@shapeshiftoss/proto-tx-builder" export const thorchainGetAddress = async ( transport: LedgerTransport, msg: core.ThorchainGetAddress -): Promise => { +): Promise => { const addressAndPubkey = await transport.call("Rune", "getAddressAndPubKey", msg.addressNList, "thor"); handleError(addressAndPubkey, transport, "Unable to obtain address and public key from device."); diff --git a/packages/hdwallet-metamask-shapeshift-multichain/package.json b/packages/hdwallet-metamask-shapeshift-multichain/package.json index 6db2f8410..d2a4834a4 100644 --- a/packages/hdwallet-metamask-shapeshift-multichain/package.json +++ b/packages/hdwallet-metamask-shapeshift-multichain/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-shapeshift-multichain", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", "@shapeshiftoss/common-api": "^9.3.0", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/metamask-snaps-adapter": "^1.0.8", "@shapeshiftoss/metamask-snaps-types": "^1.0.8", "eth-rpc-errors": "^4.0.3", diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index 66ed05f88..e18a6bacb 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index 5467c74b8..17223f8ff 100644 --- a/packages/hdwallet-native-vault/package.json +++ b/packages/hdwallet-native-vault/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native-vault", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.15", "bip39": "^3.0.4", "hash-wasm": "^4.9.0", "idb-keyval": "^6.0.3", diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index 27584449e..45890099b 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", "@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index 5a0618ec9..1edb44e56 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@portis/web3": "3.0.10", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index dca77399d..f10f3bd21 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-tallyho", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "lodash": "^4.17.21", "tallyho-onboarding": "^1.0.2" }, diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index f56286fc9..58fd5d663 100644 --- a/packages/hdwallet-trezor-connect/package.json +++ b/packages/hdwallet-trezor-connect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor-connect", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.15", "@trezor/rollout": "^1.2.0", "trezor-connect": "^8.2.1" } diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index 61de4d50f..5a0a3b0dd 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "base64-js": "^1.5.1", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index b6b4582d9..0ca5e8985 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@walletconnect/qrcode-modal": "^1.7.8", "@walletconnect/web3-provider": "^1.7.8", "ethers": "^5.6.5" diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index 5ba91f0c0..94af29d97 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@walletconnect/ethereum-provider": "^2.10.1", "@walletconnect/modal": "^2.6.2", "ethers": "^5.6.5" diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index f2ed60438..590e7b16b 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-xdefi", - "version": "1.52.3-thorchain.9", + "version": "1.52.3-thorchain.15", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "lodash": "^4.17.21" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 96c430e36..5f61c4e7d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5559,7 +5559,7 @@ "@shapeshiftoss/hdwallet-core@1.52.1", "@shapeshiftoss/hdwallet-core@^1.50.4": version "1.52.1" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.1.tgz#5165e6ecfef3ffa2a3c1ed1aafe6de268224f920" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.1.tgz#5165e6ecfef3ffa2a3c1ed1aafe6de268224f920" integrity sha512-ON0kGiYhVUZm2sPp6EbgIwACJAvULIeklddWPZDCv6mvByIsY8D6BTVQtXVavHBB+/Pf6bVc1uMfCO3X5zPaHg== dependencies: "@shapeshiftoss/proto-tx-builder" "^0.8.0" @@ -5569,18 +5569,6 @@ rxjs "^6.4.0" type-assertions "^1.1.0" -"@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-core@^1.52.3-thorchain.11": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.3-thorchain.11.tgz#1d24db71eae513a5f8ca79721e76f244974ef3dc" - integrity sha512-FxVzYJJ7ZqqaWzEBgxN2bsUUxk3y38QIRd48C2cRQjgPDQbd1DRRaWoxD0/f4zFGDyAYTQgF7mOUGUH9JLV7Zw== - dependencies: - "@shapeshiftoss/proto-tx-builder" "^0.8.0" - eip-712 "^1.0.0" - eventemitter2 "^5.0.1" - lodash "^4.17.21" - rxjs "^6.4.0" - type-assertions "^1.1.0" - "@shapeshiftoss/hdwallet-core@latest": version "1.18.4" resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.18.4.tgz#7272baa4b43de0fbb5e651d47cdeb9554f4ddd33" @@ -5591,129 +5579,9 @@ rxjs "^6.4.0" type-assertions "^1.1.0" -"@shapeshiftoss/hdwallet-keepkey-nodewebusb@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-nodewebusb/-/hdwallet-keepkey-nodewebusb-1.52.3-thorchain.11.tgz#2bdcf3bf1a7599ffea9f5ebd5e2e4c3acf3dcc35" - integrity sha512-Ek94hVGSzsZWVdrev2UOlUrYZtnpUwVJh0Zf8osTu36JzPjrEKgQDA72mRQzIAXKRacqtdCL/uec3SI+kWomPA== - dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" - -"@shapeshiftoss/hdwallet-keepkey-tcp@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-tcp/-/hdwallet-keepkey-tcp-1.52.3-thorchain.11.tgz#bdfde504aac915f3d6763082c2e49c0980ed59ad" - integrity sha512-K2pEq35XAHpTR45m8WwdVBRvx5lIj8+G3tONsqr0d/9KluGEn//FPil5P9Rxz/CvXam/uwWH7NvJMibWmKlcQA== - dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" - axios "^0.21.1" - -"@shapeshiftoss/hdwallet-keepkey-webusb@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey-webusb/-/hdwallet-keepkey-webusb-1.52.3-thorchain.11.tgz#75ecc2d3d2e2f26db1f86f50fd95eefaccf8bf15" - integrity sha512-pO1susjpLW0YKENcWrjI81moONOeTbjf6mcc2Mq8yfLbxiNYM4guEEtnesU5OfKjv78bOsyOgcNjzpKL8PiygQ== - dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-keepkey" "^1.52.3-thorchain.11" - -"@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-keepkey@^1.52.3-thorchain.11": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keepkey/-/hdwallet-keepkey-1.52.3-thorchain.11.tgz#83b412314ca7087e5d2245615fbae46686492996" - integrity sha512-U08jLpycWtfu1hSYnYCx+5e4/tokP/Z8eCQrUlYTdKSAZmXPBTFlz7uKjWcsj0zuoC+xod3yc5VSXbyvGsnupg== - dependencies: - "@ethereumjs/common" "^2.4.0" - "@ethereumjs/tx" "^3.3.0" - "@keepkey/device-protocol" "^7.12.2" - "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/proto-tx-builder" "^0.8.0" - bignumber.js "^9.0.1" - bnb-javascript-sdk-nobroadcast "^2.16.14" - crypto-js "^4.0.0" - eip-712 "^1.0.0" - eip55 "^2.1.0" - google-protobuf "^3.15.8" - icepick "^2.4.0" - lodash "^4.17.21" - p-lazy "^3.1.0" - semver "^7.3.8" - tiny-secp256k1 "^1.1.6" - -"@shapeshiftoss/hdwallet-keplr@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-keplr/-/hdwallet-keplr-1.52.3-thorchain.11.tgz#d4d68722353f496f754d2cb0062dc2612430cd64" - integrity sha512-vNOsjerVGDfFDUcoX45yQthDVvcss7YKvbcS9feMC9yVSHgb9raYVdUJsJ7JIqXNYkkJ/aMardMb2ldCTmH+IQ== - dependencies: - "@shapeshiftoss/caip" "8.15.0" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/proto-tx-builder" "^0.8.0" - "@shapeshiftoss/types" "3.1.3" - base64-js "^1.5.1" - lodash "^4.17.21" - -"@shapeshiftoss/hdwallet-ledger-webhid@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger-webhid/-/hdwallet-ledger-webhid-1.52.3-thorchain.11.tgz#48e49b81c14a65e6e2ab868b17a40e1bd6e98eb2" - integrity sha512-lFBiBXjaSKnsPKKUNDhIcHjZuKfwrJ/lzc2ckepR+SPgS13LMsXnHcFy87DVb53e6CP4p4Kv6I2zR1rJsv+SeQ== - dependencies: - "@ledgerhq/hw-app-btc" "^10.0.8" - "@ledgerhq/hw-app-eth" "^6.9.0" - "@ledgerhq/hw-transport" "^6.7.0" - "@ledgerhq/hw-transport-webhid" "^6.7.0" - "@ledgerhq/live-common" "^21.8.2" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-ledger" "^1.52.3-thorchain.11" - "@types/w3c-web-hid" "^1.0.2" - -"@shapeshiftoss/hdwallet-ledger-webusb@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger-webusb/-/hdwallet-ledger-webusb-1.52.3-thorchain.11.tgz#3adb61c57fccd50627438c559f80b9ea6628a561" - integrity sha512-D3XRt+0+Z8YJMTBoTDO2oDjmg0LQtvURd1p8tqGRVxxpoXQxPQg5LI0zq7bjFPF7FyaBaINF8lu8uaHrU+Aygw== - dependencies: - "@ledgerhq/hw-app-btc" "^10.0.8" - "@ledgerhq/hw-app-eth" "^6.9.0" - "@ledgerhq/hw-transport" "^6.7.0" - "@ledgerhq/hw-transport-webusb" "^6.7.0" - "@ledgerhq/live-common" "^21.8.2" - "@ledgerhq/logs" "^6.10.1" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-ledger" "^1.52.3-thorchain.11" - "@types/w3c-web-usb" "^1.0.4" - p-queue "^7.4.1" - -"@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-ledger@^1.52.3-thorchain.11": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-ledger/-/hdwallet-ledger-1.52.3-thorchain.11.tgz#7a03688868f922c033a315fa9409ccfb9aecab40" - integrity sha512-KujW49hBSzM05g6nnJ7Oheiiro0R9f8+l5faj1pqZYs2bpZFgoqlKLGe1zkItp2YCuVIEeMtXHMmqGBJaMQmjw== - dependencies: - "@ethereumjs/common" "^2.4.0" - "@ethereumjs/tx" "^3.3.0" - "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@types/ripemd160" "^2.0.1" - base64-js "^1.5.1" - bchaddrjs "^0.4.4" - bitcoinjs-message "^2.0.0" - bs58check "2.1.2" - ethereumjs-tx "1.3.7" - ethereumjs-util "^6.1.0" - lodash "^4.17.21" - ripemd160 "^2.0.2" - -"@shapeshiftoss/hdwallet-metamask@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-metamask/-/hdwallet-metamask-1.52.3-thorchain.11.tgz#3bc519ebbe0285ba3d0076ae03dda7a71e096d47" - integrity sha512-FeS94nlj2oklOFGX0X1AykL2+bosVi8+3NvBkl+v8zjWluHkcEvXfXmj7Dao/AjAL00auOIJrsFLdKOZ7O2RaQ== - dependencies: - "@metamask/detect-provider" "^1.2.0" - "@metamask/onboarding" "^1.0.1" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - eth-rpc-errors "^4.0.3" - lodash "^4.17.21" - "@shapeshiftoss/hdwallet-native@^1.50.4": version "1.52.1" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.1.tgz#9a8144302f20069d145079154d3d9c56086178b4" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.1.tgz#9a8144302f20069d145079154d3d9c56086178b4" integrity sha512-TUemR4q0ISgPRvLkZQaK0iQ9t8ObhbGwGtOBmKzbSyJR10vVXbGxt5eIi+Gc19fSz7uyAQM2N3pIMFMsBasciw== dependencies: "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" @@ -5740,98 +5608,6 @@ tiny-secp256k1 "^1.1.6" web-encoding "^1.1.0" -"@shapeshiftoss/hdwallet-native@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.3-thorchain.11.tgz#e57ef8355715ab701a7c059d460f917d011af999" - integrity sha512-6BfKW9qCGyvTVBdVB6i+pMR00I8TcKRhobAqB6zcuX0jWIj25TYltvuDk2EB3YedH38d0ly9ZEEuteKL4WY6Cw== - dependencies: - "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" - "@shapeshiftoss/fiosdk" "1.2.1-shapeshift.6" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/proto-tx-builder" "^0.8.0" - "@zxing/text-encoding" "^0.9.0" - bchaddrjs "^0.4.9" - bech32 "^1.1.4" - bignumber.js "^9.0.1" - bip32 "^2.0.5" - bip39 "^3.0.2" - bnb-javascript-sdk-nobroadcast "^2.16.14" - crypto-js "^4.0.0" - eip-712 "^1.0.0" - ethers "5.7.2" - eventemitter2 "^5.0.1" - funtypes "^3.0.1" - lodash "^4.17.21" - node-fetch "^2.6.1" - p-lazy "^3.1.0" - scrypt-js "^3.0.1" - tendermint-tx-builder "^1.0.9" - tiny-secp256k1 "^1.1.6" - web-encoding "^1.1.0" - -"@shapeshiftoss/hdwallet-portis@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-portis/-/hdwallet-portis-1.52.3-thorchain.11.tgz#35b734a9fecb7121e4808c6f99e9a86862d13533" - integrity sha512-9LVYv6uZX6bgKED3YYF29YF+UTL4XhgI83SeveW/PknvYMrbvF0eSQjQDqydrYLNUaQ5bmjKoXi5Cl3o4XQTaQ== - dependencies: - "@portis/web3" "3.0.10" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - base64-js "^1.5.1" - bip32 "^2.0.4" - bitcoinjs-lib "^5.1.6" - bitcoinjs-message "^2.1.0" - lodash "^4.17.15" - p-lazy "^3.1.0" - web3 "^1.5.1" - -"@shapeshiftoss/hdwallet-tallyho@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-tallyho/-/hdwallet-tallyho-1.52.3-thorchain.11.tgz#faa3e2a7c6a81a9c8e0e3fa998d41fef58bdea9b" - integrity sha512-VgIDzgSxk8tRn7DSlSP/lUn7p074WjMrFfSsEj5jtuVh1rpLhCBH6sDgv34rUPHQ8m3VrXYjg3qUsDoau+Rltg== - dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - lodash "^4.17.21" - tallyho-onboarding "^1.0.2" - -"@shapeshiftoss/hdwallet-trezor-connect@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-trezor-connect/-/hdwallet-trezor-connect-1.52.3-thorchain.11.tgz#5d4ceb32201136dadc03b8320917d7a6aa488aca" - integrity sha512-fc3Ui4AFgHF6OdUynKsh4qg/sb8m9AnWz9VuY0qPseYtJhQCSt5WneluWXPWjTVNlDFkn7GqthyQAfTl0LLbYQ== - dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@shapeshiftoss/hdwallet-trezor" "^1.52.3-thorchain.11" - "@trezor/rollout" "^1.2.0" - trezor-connect "^8.2.1" - -"@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.10", "@shapeshiftoss/hdwallet-trezor@^1.52.3-thorchain.11": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-trezor/-/hdwallet-trezor-1.52.3-thorchain.11.tgz#87c17c63552e18c0299d75c20b6fe5e98a9b9083" - integrity sha512-7I4WWRc3hYCBUySll7Pokk0jnm8u/1yJaFhNabTYphnGPTI1fa4hj7dth22GAqvFYoSX+HlsqB1TJolmIAwv0g== - dependencies: - "@ethereumjs/common" "^2.4.0" - "@ethereumjs/tx" "^3.3.0" - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - base64-js "^1.5.1" - lodash "^4.17.21" - -"@shapeshiftoss/hdwallet-walletconnect@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-walletconnect/-/hdwallet-walletconnect-1.52.3-thorchain.11.tgz#b75eee0e4ded2f3ead7bf7c8dc4805f143a0c087" - integrity sha512-//GZ3npcC4RsSiqgQ03jSNL7adKrlF8aBQ9UT3HWItw1+bNN3jB2npiQV7d6KIYqtt3zr1YWxCXp0yAkeBbPdw== - dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - "@walletconnect/qrcode-modal" "^1.7.8" - "@walletconnect/web3-provider" "^1.7.8" - ethers "^5.6.5" - -"@shapeshiftoss/hdwallet-xdefi@^1.52.3-thorchain.10": - version "1.52.3-thorchain.11" - resolved "http://localhost:4873/@shapeshiftoss/hdwallet-xdefi/-/hdwallet-xdefi-1.52.3-thorchain.11.tgz#9571a7747e21e6321add7815d8d147edb8b06cfc" - integrity sha512-ocbVY3TFfrgr35Kqa9UlhvOJhZ6YLnJmKJLIqOkF+GLs+eOxwagqDBIDxYgXNAbx36q2MVF4GS51URrn6LG0BA== - dependencies: - "@shapeshiftoss/hdwallet-core" "^1.52.3-thorchain.11" - lodash "^4.17.21" - "@shapeshiftoss/logger@^1.1.2", "@shapeshiftoss/logger@^1.1.3": version "1.1.3" resolved "https://registry.yarnpkg.com/@shapeshiftoss/logger/-/logger-1.1.3.tgz#ff05765775351c8adc99cf747f14b5619311e023" @@ -6698,7 +6474,7 @@ "@types/ripemd160@^2.0.1": version "2.0.1" - resolved "http://localhost:4873/@types/ripemd160/-/ripemd160-2.0.1.tgz#e9ea7a26adf0e2541917fc2b1ecb497e8ced4b7e" + resolved "https://registry.yarnpkg.com/@types/ripemd160/-/ripemd160-2.0.1.tgz#e9ea7a26adf0e2541917fc2b1ecb497e8ced4b7e" integrity sha512-l3pt9f8vK1tU2qBXY1aL7HofNnJKbpNa+2DznrD7j0lhaS4587e3iwgSMRDJFlidsrNjrrjIl8G+EeXFMjcGXg== dependencies: "@types/node" "*" From 710569c183f25f248b0f2710e3815327c08a8220 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 17 Oct 2023 00:31:06 +0200 Subject: [PATCH 080/108] fix: merge --- examples/sandbox/package.json | 158 ---------------------------------- integration/package.json | 122 -------------------------- lerna.json | 44 ---------- 3 files changed, 324 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 1af4b18ac..3c825978e 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,50 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "version": "1.52.3-thorchain.15", -======= - "version": "1.52.3-thorchain.5", ->>>>>>> c1430a15 (feat: bump) -======= - "version": "1.52.3-thorchain.6", ->>>>>>> 7cb9bd66 (feat: boimp) -======= - "version": "1.52.3-thorchain.7", ->>>>>>> 1ca288a8 (feat: boimp) -======= - "version": "1.52.3-thorchain.8", ->>>>>>> a775be7e (feat: boimp) -======= - "version": "1.52.3-thorchain.9", ->>>>>>> 63766913 (chore(release): publish 1.52.3-thorchain.9) -======= - "version": "1.52.3-thorchain.10", ->>>>>>> fb8c5ee4 (feat: boimp boimp) -======= - "version": "1.52.3-thorchain.11", ->>>>>>> ae133cd4 (feat: boimp boimp) -======= - "version": "1.52.3-thorchain.12", ->>>>>>> 0d72dc07 (feat: boimp) -======= - "version": "1.52.3-thorchain.13", ->>>>>>> 9ec1233c (feat: boimp) -======= - "version": "1.52.3-thorchain.14", ->>>>>>> 4deac1a8 (feat: boimp) -======= - "version": "1.52.3-thorchain.15", ->>>>>>> 83672427 (feat: bump) "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -54,15 +10,6 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> a7faff57 (bump) "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.15", @@ -78,111 +25,6 @@ "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.15", -<<<<<<< HEAD -======= - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.5", ->>>>>>> c1430a15 (feat: bump) -======= - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.6", ->>>>>>> 7cb9bd66 (feat: boimp) -======= - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.7", ->>>>>>> 1ca288a8 (feat: boimp) -======= - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.8", ->>>>>>> a775be7e (feat: boimp) -======= - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.9", ->>>>>>> 63766913 (chore(release): publish 1.52.3-thorchain.9) -======= - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.10", ->>>>>>> fb8c5ee4 (feat: boimp boimp) -======= ->>>>>>> a7faff57 (bump) "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index 103849a49..e46c61dc4 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,50 +1,6 @@ { "name": "@shapeshiftoss/integration", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "version": "1.52.3-thorchain.15", -======= - "version": "1.52.3-thorchain.5", ->>>>>>> c1430a15 (feat: bump) -======= - "version": "1.52.3-thorchain.6", ->>>>>>> 7cb9bd66 (feat: boimp) -======= - "version": "1.52.3-thorchain.7", ->>>>>>> 1ca288a8 (feat: boimp) -======= - "version": "1.52.3-thorchain.8", ->>>>>>> a775be7e (feat: boimp) -======= - "version": "1.52.3-thorchain.9", ->>>>>>> 63766913 (chore(release): publish 1.52.3-thorchain.9) -======= - "version": "1.52.3-thorchain.10", ->>>>>>> fb8c5ee4 (feat: boimp boimp) -======= - "version": "1.52.3-thorchain.11", ->>>>>>> ae133cd4 (feat: boimp boimp) -======= - "version": "1.52.3-thorchain.12", ->>>>>>> 0d72dc07 (feat: boimp) -======= - "version": "1.52.3-thorchain.13", ->>>>>>> 9ec1233c (feat: boimp) -======= - "version": "1.52.3-thorchain.14", ->>>>>>> 4deac1a8 (feat: boimp) -======= - "version": "1.52.3-thorchain.15", ->>>>>>> 83672427 (feat: bump) "main": "index.js", "license": "MIT", "private": true, @@ -54,15 +10,6 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> a7faff57 (bump) "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.15", @@ -72,75 +19,6 @@ "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.15", "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.15", -<<<<<<< HEAD -======= - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.5", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.5", ->>>>>>> c1430a15 (feat: bump) -======= - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.6", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.6", ->>>>>>> 7cb9bd66 (feat: boimp) -======= - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.7", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.7", ->>>>>>> 1ca288a8 (feat: boimp) -======= - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.8", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.8", ->>>>>>> a775be7e (feat: boimp) -======= - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.9", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.9", ->>>>>>> 63766913 (chore(release): publish 1.52.3-thorchain.9) -======= - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.10", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.10", ->>>>>>> fb8c5ee4 (feat: boimp boimp) -======= ->>>>>>> a7faff57 (bump) "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index e658d874f..7cd2f9ce5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,50 +1,6 @@ { "lerna": "5.2.0", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "version": "1.52.3-thorchain.15", -======= - "version": "1.52.3-thorchain.5", ->>>>>>> c1430a15 (feat: bump) -======= - "version": "1.52.3-thorchain.6", ->>>>>>> 7cb9bd66 (feat: boimp) -======= - "version": "1.52.3-thorchain.7", ->>>>>>> 1ca288a8 (feat: boimp) -======= - "version": "1.52.3-thorchain.8", ->>>>>>> a775be7e (feat: boimp) -======= - "version": "1.52.3-thorchain.9", ->>>>>>> 63766913 (chore(release): publish 1.52.3-thorchain.9) -======= - "version": "1.52.3-thorchain.10", ->>>>>>> fb8c5ee4 (feat: boimp boimp) -======= - "version": "1.52.3-thorchain.11", ->>>>>>> ae133cd4 (feat: boimp boimp) -======= - "version": "1.52.3-thorchain.12", ->>>>>>> 0d72dc07 (feat: boimp) -======= - "version": "1.52.3-thorchain.13", ->>>>>>> 9ec1233c (feat: boimp) -======= - "version": "1.52.3-thorchain.14", ->>>>>>> 4deac1a8 (feat: boimp) -======= - "version": "1.52.3-thorchain.15", ->>>>>>> 83672427 (feat: bump) "npmClient": "yarn", "useWorkspaces": true, "command": { From ae79b883e4f5ac8893101a5cd3445faca3ee236b Mon Sep 17 00:00:00 2001 From: kaladinlight <35275952+kaladinlight@users.noreply.github.com> Date: Wed, 18 Oct 2023 09:50:56 -0600 Subject: [PATCH 081/108] regen yarn lock and fix fees param --- .../hdwallet-ledger/src/thorchain/hw-app-thor.ts | 2 +- yarn.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index ab3f5f5b4..75e243635 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -342,7 +342,7 @@ class THORChainApp { const rawTx = stringifyKeysInOrder({ account_number: msg.account_number, chain_id: THOR_CHAIN, - fee: { amount: [msg.fee], gas: msg.tx.fee.gas }, + fee: { amount: msg.tx.fee.amount, gas: msg.tx.fee.gas }, memo: msg.tx.memo, msgs: msg.tx.msg, sequence: msg.sequence, diff --git a/yarn.lock b/yarn.lock index 5f61c4e7d..5ad44e847 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5557,10 +5557,10 @@ web-encoding "^1.1.0" wif "^2.0.6" -"@shapeshiftoss/hdwallet-core@1.52.1", "@shapeshiftoss/hdwallet-core@^1.50.4": - version "1.52.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.1.tgz#5165e6ecfef3ffa2a3c1ed1aafe6de268224f920" - integrity sha512-ON0kGiYhVUZm2sPp6EbgIwACJAvULIeklddWPZDCv6mvByIsY8D6BTVQtXVavHBB+/Pf6bVc1uMfCO3X5zPaHg== +"@shapeshiftoss/hdwallet-core@1.52.2", "@shapeshiftoss/hdwallet-core@^1.50.4": + version "1.52.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.2.tgz#2d6c28ae62a062dea6825403d4a5b65227426a2b" + integrity sha512-ztCQJkcU/g+1ZG+X2HQFRW1pJma8zRm1A3hl1rmk4lG+zkT88YxDQbzzLCoaGDp6P18vP3ou/oQwhee1O+sNVQ== dependencies: "@shapeshiftoss/proto-tx-builder" "^0.8.0" eip-712 "^1.0.0" @@ -5580,13 +5580,13 @@ type-assertions "^1.1.0" "@shapeshiftoss/hdwallet-native@^1.50.4": - version "1.52.1" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.1.tgz#9a8144302f20069d145079154d3d9c56086178b4" - integrity sha512-TUemR4q0ISgPRvLkZQaK0iQ9t8ObhbGwGtOBmKzbSyJR10vVXbGxt5eIi+Gc19fSz7uyAQM2N3pIMFMsBasciw== + version "1.52.2" + resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.2.tgz#b69201d7c96b67a47ffb4588ea284aeab8d4bc31" + integrity sha512-cfPZg4WJhaMktwlPdGZHsuCsJKiDQcSgbjKDMjsojk680b/tgPaJ+nzTuihTo7Flp6lITxpcXTXM1Da3e/GdSQ== dependencies: "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" "@shapeshiftoss/fiosdk" "1.2.1-shapeshift.6" - "@shapeshiftoss/hdwallet-core" "1.52.1" + "@shapeshiftoss/hdwallet-core" "1.52.2" "@shapeshiftoss/proto-tx-builder" "^0.8.0" "@zxing/text-encoding" "^0.9.0" bchaddrjs "^0.4.9" From f91b84bd6a70db57c19a0b9323920b209143811f Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 18 Oct 2023 19:10:55 +0200 Subject: [PATCH 082/108] feat: boimp --- examples/sandbox/package.json | 32 ++++++++++++++++---------------- integration/package.json | 20 ++++++++++---------- lerna.json | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 3c825978e..b7b493286 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-thorchain.15", + "version": "1.52.3-thorchain.17", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-keplr": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-metamask": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-tallyho": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-walletconnect": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.17", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index e46c61dc4..94f25b4e9 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-thorchain.15", + "version": "1.52.3-thorchain.17", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.15", - "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.15", + "@shapeshiftoss/hdwallet-core": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-keepkey": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-ledger": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-native": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-portis": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-trezor": "^1.52.3-thorchain.17", + "@shapeshiftoss/hdwallet-xdefi": "^1.52.3-thorchain.17", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index 7cd2f9ce5..e989c6e6b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-thorchain.15", + "version": "1.52.3-thorchain.17", "npmClient": "yarn", "useWorkspaces": true, "command": { From 257aa682725c43c2a8ed09e57a408a89652ac2cc Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 18 Oct 2023 19:50:52 +0200 Subject: [PATCH 083/108] chore(release): publish 1.52.3 --- examples/sandbox/package.json | 32 +++++++++---------- integration/package.json | 20 ++++++------ lerna.json | 2 +- packages/hdwallet-coinbase/package.json | 4 +-- packages/hdwallet-core/package.json | 2 +- .../hdwallet-keepkey-chromeusb/package.json | 6 ++-- .../hdwallet-keepkey-electron/package.json | 4 +-- .../hdwallet-keepkey-nodehid/package.json | 4 +-- .../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-keplr/package.json | 4 +-- packages/hdwallet-ledger-webhid/package.json | 6 ++-- packages/hdwallet-ledger-webusb/package.json | 6 ++-- packages/hdwallet-ledger/package.json | 4 +-- .../package.json | 4 +-- packages/hdwallet-metamask/package.json | 4 +-- packages/hdwallet-native-vault/package.json | 4 +-- packages/hdwallet-native/package.json | 4 +-- packages/hdwallet-portis/package.json | 4 +-- packages/hdwallet-tallyho/package.json | 4 +-- packages/hdwallet-trezor-connect/package.json | 6 ++-- packages/hdwallet-trezor/package.json | 4 +-- packages/hdwallet-walletconnect/package.json | 4 +-- .../hdwallet-walletconnectV2/package.json | 4 +-- packages/hdwallet-xdefi/package.json | 4 +-- 27 files changed, 81 insertions(+), 81 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 851be8376..1eaf137f9 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.2", - "@shapeshiftoss/hdwallet-keplr": "1.52.2", - "@shapeshiftoss/hdwallet-ledger": "1.52.2", - "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.2", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.2", - "@shapeshiftoss/hdwallet-metamask": "1.52.2", - "@shapeshiftoss/hdwallet-native": "1.52.2", - "@shapeshiftoss/hdwallet-portis": "1.52.2", - "@shapeshiftoss/hdwallet-tallyho": "1.52.2", - "@shapeshiftoss/hdwallet-trezor": "1.52.2", - "@shapeshiftoss/hdwallet-trezor-connect": "1.52.2", - "@shapeshiftoss/hdwallet-walletconnect": "1.52.2", - "@shapeshiftoss/hdwallet-xdefi": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.3", + "@shapeshiftoss/hdwallet-keplr": "1.52.3", + "@shapeshiftoss/hdwallet-ledger": "1.52.3", + "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.3", + "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.3", + "@shapeshiftoss/hdwallet-metamask": "1.52.3", + "@shapeshiftoss/hdwallet-native": "1.52.3", + "@shapeshiftoss/hdwallet-portis": "1.52.3", + "@shapeshiftoss/hdwallet-tallyho": "1.52.3", + "@shapeshiftoss/hdwallet-trezor": "1.52.3", + "@shapeshiftoss/hdwallet-trezor-connect": "1.52.3", + "@shapeshiftoss/hdwallet-walletconnect": "1.52.3", + "@shapeshiftoss/hdwallet-xdefi": "1.52.3", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index eca70978d..485ea2048 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.2", + "version": "1.52.3", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.2", - "@shapeshiftoss/hdwallet-ledger": "1.52.2", - "@shapeshiftoss/hdwallet-native": "1.52.2", - "@shapeshiftoss/hdwallet-portis": "1.52.2", - "@shapeshiftoss/hdwallet-trezor": "1.52.2", - "@shapeshiftoss/hdwallet-xdefi": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.3", + "@shapeshiftoss/hdwallet-ledger": "1.52.3", + "@shapeshiftoss/hdwallet-native": "1.52.3", + "@shapeshiftoss/hdwallet-portis": "1.52.3", + "@shapeshiftoss/hdwallet-trezor": "1.52.3", + "@shapeshiftoss/hdwallet-xdefi": "1.52.3", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index bf0d360cc..9f9579f0c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.2", + "version": "1.52.3", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index c423007ee..b8f1dafd4 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json index b8cdddd4a..9bbed2772 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index e2d2fbe30..f2fdc6b02 100644 --- a/packages/hdwallet-keepkey-chromeusb/package.json +++ b/packages/hdwallet-keepkey-chromeusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-chromeusb", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey": "1.52.2" + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3" } } diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index 7096678eb..b63489f80 100644 --- a/packages/hdwallet-keepkey-electron/package.json +++ b/packages/hdwallet-keepkey-electron/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-electron", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.2", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index 552dfa281..da40891f1 100644 --- a/packages/hdwallet-keepkey-nodehid/package.json +++ b/packages/hdwallet-keepkey-nodehid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodehid", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.2" + "@shapeshiftoss/hdwallet-keepkey": "1.52.3" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index f286b37d5..6bf556d75 100644 --- a/packages/hdwallet-keepkey-nodewebusb/package.json +++ b/packages/hdwallet-keepkey-nodewebusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey": "1.52.2" + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index 586b21e4d..d4be0a5d8 100644 --- a/packages/hdwallet-keepkey-tcp/package.json +++ b/packages/hdwallet-keepkey-tcp/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-tcp", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3", "axios": "^0.21.1" } } diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index 8cec4c177..c75d5a98b 100644 --- a/packages/hdwallet-keepkey-webusb/package.json +++ b/packages/hdwallet-keepkey-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-webusb", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-keepkey": "1.52.2" + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "1.52.3" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4" diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index de940cd53..e0d71737c 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^3.3.0", "@keepkey/device-protocol": "^7.12.2", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "bignumber.js": "^9.0.1", "bnb-javascript-sdk-nobroadcast": "^2.16.14", diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json index 8e1f436c1..906c72fe8 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/caip": "8.15.0", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@shapeshiftoss/types": "3.1.3", "base64-js": "^1.5.1", diff --git a/packages/hdwallet-ledger-webhid/package.json b/packages/hdwallet-ledger-webhid/package.json index 086931b23..5c4e08268 100644 --- a/packages/hdwallet-ledger-webhid/package.json +++ b/packages/hdwallet-ledger-webhid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webhid", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -19,8 +19,8 @@ "@ledgerhq/hw-transport": "^6.7.0", "@ledgerhq/hw-transport-webhid": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-ledger": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-ledger": "1.52.3", "@types/w3c-web-hid": "^1.0.2" }, "devDependencies": { diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index 727b132ec..d2dc648bf 100644 --- a/packages/hdwallet-ledger-webusb/package.json +++ b/packages/hdwallet-ledger-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webusb", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -20,8 +20,8 @@ "@ledgerhq/hw-transport-webusb": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", "@ledgerhq/logs": "^6.10.1", - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-ledger": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-ledger": "1.52.3", "@types/w3c-web-usb": "^1.0.4", "p-queue": "^7.4.1" }, diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index 2444e6bde..bdce74b92 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -18,7 +18,7 @@ "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", "bitcoinjs-message": "^2.0.0", diff --git a/packages/hdwallet-metamask-shapeshift-multichain/package.json b/packages/hdwallet-metamask-shapeshift-multichain/package.json index dc6e85bba..e70d62c8f 100644 --- a/packages/hdwallet-metamask-shapeshift-multichain/package.json +++ b/packages/hdwallet-metamask-shapeshift-multichain/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-shapeshift-multichain", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", "@shapeshiftoss/common-api": "^9.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@shapeshiftoss/metamask-snaps-adapter": "^1.0.8", "@shapeshiftoss/metamask-snaps-types": "^1.0.8", "eth-rpc-errors": "^4.0.3", diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index b087e3171..a3c4c81b6 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index 98683aee4..e4c9f5314 100644 --- a/packages/hdwallet-native-vault/package.json +++ b/packages/hdwallet-native-vault/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native-vault", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-native": "1.52.2", + "@shapeshiftoss/hdwallet-native": "1.52.3", "bip39": "^3.0.4", "hash-wasm": "^4.9.0", "idb-keyval": "^6.0.3", diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index f0afad1a6..44655010b 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", "@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index a05b5b7b4..6d55d31ca 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@portis/web3": "3.0.10", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index 87b9784b6..e688dc75b 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-tallyho", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "lodash": "^4.17.21", "tallyho-onboarding": "^1.0.2" }, diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index a1e5713a5..8196d257c 100644 --- a/packages/hdwallet-trezor-connect/package.json +++ b/packages/hdwallet-trezor-connect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor-connect", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", - "@shapeshiftoss/hdwallet-trezor": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-trezor": "1.52.3", "@trezor/rollout": "^1.2.0", "trezor-connect": "^8.2.1" } diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index 21a948eef..795a537a5 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "base64-js": "^1.5.1", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index fc1e114f6..8101de3f3 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@walletconnect/qrcode-modal": "^1.7.8", "@walletconnect/web3-provider": "^1.7.8", "ethers": "^5.6.5" diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index f1b1097ec..ff4681cca 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "@walletconnect/ethereum-provider": "^2.10.1", "@walletconnect/modal": "^2.6.2", "ethers": "^5.6.5" diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index f4a6f6b75..1d2c43eb9 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-xdefi", - "version": "1.52.2", + "version": "1.52.3", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.2", + "@shapeshiftoss/hdwallet-core": "1.52.3", "lodash": "^4.17.21" }, "devDependencies": { From 86e58b07aca755f2f4316b4048dae459257c1409 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 13:07:29 +0200 Subject: [PATCH 084/108] feat: pass null resolution to ledger eth.signTransaction --- packages/hdwallet-ledger/src/ethereum.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/ethereum.ts b/packages/hdwallet-ledger/src/ethereum.ts index 5d2dc0045..7bedded40 100644 --- a/packages/hdwallet-ledger/src/ethereum.ts +++ b/packages/hdwallet-ledger/src/ethereum.ts @@ -96,7 +96,10 @@ export async function ethSignTx(transport: LedgerTransport, msg: core.ETHSignTx) const utx = new EthereumTx(txParams); - const res = await transport.call("Eth", "signTransaction", bip32path, utx.serialize().toString("hex")); + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore transport.call is drunk, there *is* a third argument to eth.signTransaction + // see https://github.com/LedgerHQ/ledgerjs/blob/master/packages/hw-app-eth/README.md#parameters-2 + const res = await transport.call("Eth", "signTransaction", bip32path, utx.serialize().toString("hex"), null); handleError(res, transport, "Could not sign ETH tx with Ledger"); const { v, r, s } = res.payload; From ca460c0b4e7bb1f50a554132f1605fbb0d650fc7 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 13:09:45 +0200 Subject: [PATCH 085/108] feat: bump --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 1eaf137f9..9d8eef96b 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3", + "version": "1.52.3-ledger-improvements.1", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 485ea2048..8666e5e31 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3", + "version": "1.52.3-ledger-improvements.1", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index 9f9579f0c..fd89ebd3e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3", + "version": "1.52.3-ledger-improvements.1", "npmClient": "yarn", "useWorkspaces": true, "command": { From f065028edddf557741ab32c6ba5724509f092f64 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 13:19:30 +0200 Subject: [PATCH 086/108] feat: reboimp --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 9d8eef96b..940cbeee3 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-ledger-improvements.1", + "version": "1.52.3-ledger-improvements.2", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 8666e5e31..245faf344 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-ledger-improvements.1", + "version": "1.52.3-ledger-improvements.2", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index fd89ebd3e..7347e0927 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-ledger-improvements.1", + "version": "1.52.3-ledger-improvements.2", "npmClient": "yarn", "useWorkspaces": true, "command": { From ac22bde27be1c821f8eb16b9faddbf4edc190cea Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 12 Oct 2023 10:23:39 +0200 Subject: [PATCH 087/108] fix: ethSignMessage strip 0x prefix --- packages/hdwallet-ledger/src/ethereum.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/ethereum.ts b/packages/hdwallet-ledger/src/ethereum.ts index 7bedded40..314c02bfa 100644 --- a/packages/hdwallet-ledger/src/ethereum.ts +++ b/packages/hdwallet-ledger/src/ethereum.ts @@ -160,7 +160,12 @@ export async function ethSignMessage( const bip32path = core.addressNListToBIP32(msg.addressNList); if (!isHexString(msg.message)) throw new Error("data is not an hex string"); - const res = await transport.call("Eth", "signPersonalMessage", bip32path, msg.message); + + // Ledger's inner implementation does a Buffer.from(messageHex, "hex").length on our message + // However, Buffer.from method with the "hex" encoding expects a valid hexadecimal string without the 0x prefix + // so we need to strip it in case it's present + const sanitizedMessageHex = msg.message.startsWith("0x") ? msg.message.slice(2) : msg.message; + const res = await transport.call("Eth", "signPersonalMessage", bip32path, sanitizedMessageHex); handleError(res, transport, "Could not sign ETH message with Ledger"); let { v } = res.payload; From c2f972ea7910c4ed8aa1a06b1ca9cc78e6ac8e95 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 12 Oct 2023 10:54:21 +0200 Subject: [PATCH 088/108] feat: boimp --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 940cbeee3..9c8cf11eb 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-ledger-improvements.2", + "version": "1.53.3-ledger-improvements.3", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 245faf344..7f0156a98 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-ledger-improvements.2", + "version": "1.53.3-ledger-improvements.3", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index 7347e0927..e8ca7dba7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-ledger-improvements.2", + "version": "1.53.3-ledger-improvements.3", "npmClient": "yarn", "useWorkspaces": true, "command": { From bca6886b7bc33b94aeb0c46e39cca7ab2bd06a52 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 12 Oct 2023 10:59:08 +0200 Subject: [PATCH 089/108] feat: boimp --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 9c8cf11eb..86ab83d07 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.53.3-ledger-improvements.3", + "version": "1.53.3-ledger-improvements.4", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 7f0156a98..b2b4ae4e5 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.53.3-ledger-improvements.3", + "version": "1.53.3-ledger-improvements.4", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index e8ca7dba7..0e71a7243 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.53.3-ledger-improvements.3", + "version": "1.53.3-ledger-improvements.4", "npmClient": "yarn", "useWorkspaces": true, "command": { From d62d448ea28b42ed395f4d98d1b3249a92d1793d Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 4 Oct 2023 08:37:14 +0100 Subject: [PATCH 090/108] feat: add missing scriptTypes in sandbox --- examples/sandbox/index.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/sandbox/index.ts b/examples/sandbox/index.ts index 9c0901f34..0ca96ac76 100644 --- a/examples/sandbox/index.ts +++ b/examples/sandbox/index.ts @@ -635,12 +635,14 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Bitcoin", + scriptType: core.BTCInputScriptType.SpendAddress, }, { addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 1], curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Bitcoin", + scriptType: core.BTCInputScriptType.SpendWitness, }, { addressNList: [0x80000000 + 49, 0x80000000 + 0, 0x80000000 + 0], @@ -656,6 +658,7 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Bitcoin Cash", + scriptType: core.BTCInputScriptType.SpendAddress, }, ]; const ltcGetPublicKeysInput = [ From 8271f65775166e0d7632adcb3b005a74cf5b99fc Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 5 Oct 2023 00:56:09 +0200 Subject: [PATCH 091/108] fix: ledger sandbox xpubs --- examples/sandbox/index.ts | 30 +++++++-------- packages/hdwallet-ledger/src/bitcoin.ts | 9 +++-- packages/hdwallet-ledger/src/utxoUtils.ts | 47 ++++++++++++++++++----- 3 files changed, 57 insertions(+), 29 deletions(-) diff --git a/examples/sandbox/index.ts b/examples/sandbox/index.ts index 0ca96ac76..e19c78df9 100644 --- a/examples/sandbox/index.ts +++ b/examples/sandbox/index.ts @@ -631,33 +631,30 @@ $getXpubs.each(function () { const btcGetPublicKeysInput = [ { - addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 0], - curve: "secp256k1", - showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Bitcoin", - scriptType: core.BTCInputScriptType.SpendAddress, - }, - { - addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 1], + addressNList: [2147483732, 2147483648, 2147483648], curve: "secp256k1", - showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it - coin: "Bitcoin", scriptType: core.BTCInputScriptType.SpendWitness, }, { - addressNList: [0x80000000 + 49, 0x80000000 + 0, 0x80000000 + 0], - curve: "secp256k1", - showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Bitcoin", + addressNList: [2147483697, 2147483648, 2147483648], + curve: "secp256k1", scriptType: core.BTCInputScriptType.SpendP2SHWitness, }, + { + coin: "Bitcoin", + addressNList: [2147483692, 2147483648, 2147483648], + curve: "secp256k1", + scriptType: core.BTCInputScriptType.SpendAddress, + }, ]; const bchGetPublicKeysInput = [ { addressNList: [0x80000000 + 44, 0x80000000 + 145, 0x80000000 + 0], curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it - coin: "Bitcoin Cash", + coin: "BitcoinCash", scriptType: core.BTCInputScriptType.SpendAddress, }, ]; @@ -668,7 +665,7 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Litecoin", - scriptType: "p2wpkh", + scriptType: core.BTCInputScriptType.SpendWitness, }, // SegwitP2sh { @@ -676,7 +673,7 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Litecoin", - scriptType: "p2sh-p2wpkh", + scriptType: core.BTCInputScriptType.SpendP2SHWitness, }, // P2Pksh { @@ -684,7 +681,7 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Litecoin", - scriptType: "p2pkh", + scriptType: core.BTCInputScriptType.SpendAddress, }, ]; const dogeGetPublicKeysInput = [ @@ -693,6 +690,7 @@ $getXpubs.each(function () { curve: "secp256k1", showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it coin: "Dogecoin", + scriptType: core.BTCInputScriptType.SpendAddress, }, ]; const hardenedPathGetPublicKeysInput = [ diff --git a/packages/hdwallet-ledger/src/bitcoin.ts b/packages/hdwallet-ledger/src/bitcoin.ts index 73263259d..624e0a48a 100644 --- a/packages/hdwallet-ledger/src/bitcoin.ts +++ b/packages/hdwallet-ledger/src/bitcoin.ts @@ -72,9 +72,12 @@ export async function btcGetPublicKeys( const { payload: _xpub } = getWalletXpubResponse; - // Ledger returns LTC pubkeys in Ltub format for all scriptTypes. It *is* the correct account, but not in the format we want. - // We need to convert SegWit pubkeys to Mtubs, and SegWit native to zpubs. - const xpub = convertXpubVersion(_xpub, scriptTypeToAccountType[getPublicKey.scriptType]); + // Ledger returns + // - LTC pubkeys in Ltub format for all scriptTypes. + // - BTC pubkeys in xpub format for all scriptTypes + // They *are* the correct accounts, but not in the format we want. + // We need to convert SegWit pubkeys to Mtubs/xpubs, and SegWit native to zpubs. + const xpub = convertXpubVersion(_xpub, scriptTypeToAccountType[getPublicKey.scriptType], getPublicKey.coin); xpubs.push({ xpub, diff --git a/packages/hdwallet-ledger/src/utxoUtils.ts b/packages/hdwallet-ledger/src/utxoUtils.ts index f46e0430a..23689f632 100644 --- a/packages/hdwallet-ledger/src/utxoUtils.ts +++ b/packages/hdwallet-ledger/src/utxoUtils.ts @@ -172,14 +172,38 @@ enum PublicKeyType { Mtub = "01b26ef6", } -const accountTypeToVersion = { - [UtxoAccountType.P2pkh]: Buffer.from(PublicKeyType.Ltub, "hex"), // no-op - [UtxoAccountType.SegwitP2sh]: Buffer.from(PublicKeyType.Mtub, "hex"), // LTub to Mtub - [UtxoAccountType.SegwitNative]: Buffer.from(PublicKeyType.zpub, "hex"), // Ltub to zpub -}; +const accountTypeToVersion = (() => { + const Litecoin = { + [UtxoAccountType.P2pkh]: Buffer.from(PublicKeyType.Ltub, "hex"), + [UtxoAccountType.SegwitP2sh]: Buffer.from(PublicKeyType.Mtub, "hex"), + [UtxoAccountType.SegwitNative]: Buffer.from(PublicKeyType.zpub, "hex"), + }; + + const Dogecoin = { + [UtxoAccountType.P2pkh]: Buffer.from(PublicKeyType.dgub, "hex"), + }; + const Bitcoin = { + [UtxoAccountType.P2pkh]: Buffer.from(PublicKeyType.xpub, "hex"), + [UtxoAccountType.SegwitP2sh]: Buffer.from(PublicKeyType.ypub, "hex"), + [UtxoAccountType.SegwitNative]: Buffer.from(PublicKeyType.zpub, "hex"), + }; -// We already get accounts in the format we want from Ledger - except LiteCoin SegWit/Native -const convertVersions = ["Ltub"]; + return (coin: string, type: UtxoAccountType) => { + switch (coin) { + case "Litecoin": + return Litecoin[type]; + case "Bitcoin": + return Bitcoin[type]; + case "Dogecoin": + if (type !== UtxoAccountType.P2pkh) throw new Error("Unsupported account type"); + return Dogecoin[type]; + default: + return Bitcoin[type]; // xpub, ypub, zpub + } + }; +})(); +// Legacy accounts should be left as-is +const convertVersions = ["Ltub", "xpub", "dgub"]; /** * Convert any public key into an xpub, ypub, or zpub based on account type @@ -190,8 +214,9 @@ const convertVersions = ["Ltub"]; * USE SPARINGLY - there aren't many cases where we should convert version bytes * @param {string} xpub - the public key provided by the wallet * @param {UtxoAccountType} accountType - The desired account type to be encoded into the public key + * @param {string} coin - The coin type, which will determine what version we derive */ -export function convertXpubVersion(xpub: string, accountType: UtxoAccountType | undefined) { +export function convertXpubVersion(xpub: string, accountType: UtxoAccountType | undefined, coin: string) { if (!accountType) return xpub; if (!convertVersions.includes(xpub.substring(0, 4))) { return xpub; @@ -199,10 +224,12 @@ export function convertXpubVersion(xpub: string, accountType: UtxoAccountType | const payload = decode(xpub); const version = payload.slice(0, 4); - if (version.compare(accountTypeToVersion[accountType]) !== 0) { + const desiredVersion = accountTypeToVersion(coin, accountType); + // eslint-disable-next-line no-console + if (version.compare(desiredVersion) !== 0) { // Get the key without the version code at the front const key = payload.slice(4); - return encode(Buffer.concat([accountTypeToVersion[accountType], key])); + return encode(Buffer.concat([desiredVersion, key])); } return xpub; } From 855bdc1607c19f06f358743fa81119f8164c24e5 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 5 Oct 2023 00:59:15 +0200 Subject: [PATCH 092/108] feat: improve commentary --- packages/hdwallet-ledger/src/bitcoin.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/bitcoin.ts b/packages/hdwallet-ledger/src/bitcoin.ts index 624e0a48a..a71841a1c 100644 --- a/packages/hdwallet-ledger/src/bitcoin.ts +++ b/packages/hdwallet-ledger/src/bitcoin.ts @@ -75,8 +75,9 @@ export async function btcGetPublicKeys( // Ledger returns // - LTC pubkeys in Ltub format for all scriptTypes. // - BTC pubkeys in xpub format for all scriptTypes + // - Doge pubkeys in xpub format instead of dgub // They *are* the correct accounts, but not in the format we want. - // We need to convert SegWit pubkeys to Mtubs/xpubs, and SegWit native to zpubs. + // We need to convert SegWit pubkeys to Mtubs/ypubs, and SegWit native to zpubs, and Doge xpubs to dgubs. const xpub = convertXpubVersion(_xpub, scriptTypeToAccountType[getPublicKey.scriptType], getPublicKey.coin); xpubs.push({ From 777cd36711252da9e7fb6f1d058f4e411c33c6e9 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 5 Oct 2023 00:59:49 +0200 Subject: [PATCH 093/108] feat: cleanup --- packages/hdwallet-ledger/src/utxoUtils.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/utxoUtils.ts b/packages/hdwallet-ledger/src/utxoUtils.ts index 23689f632..c6fa7063f 100644 --- a/packages/hdwallet-ledger/src/utxoUtils.ts +++ b/packages/hdwallet-ledger/src/utxoUtils.ts @@ -225,7 +225,6 @@ export function convertXpubVersion(xpub: string, accountType: UtxoAccountType | const payload = decode(xpub); const version = payload.slice(0, 4); const desiredVersion = accountTypeToVersion(coin, accountType); - // eslint-disable-next-line no-console if (version.compare(desiredVersion) !== 0) { // Get the key without the version code at the front const key = payload.slice(4); From eaeaed1f29638d61058285a5d4a80776480517c6 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 13:07:29 +0200 Subject: [PATCH 094/108] feat: pass null resolution to ledger eth.signTransaction --- packages/hdwallet-ledger/src/ethereum.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/ethereum.ts b/packages/hdwallet-ledger/src/ethereum.ts index 5d2dc0045..7bedded40 100644 --- a/packages/hdwallet-ledger/src/ethereum.ts +++ b/packages/hdwallet-ledger/src/ethereum.ts @@ -96,7 +96,10 @@ export async function ethSignTx(transport: LedgerTransport, msg: core.ETHSignTx) const utx = new EthereumTx(txParams); - const res = await transport.call("Eth", "signTransaction", bip32path, utx.serialize().toString("hex")); + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore transport.call is drunk, there *is* a third argument to eth.signTransaction + // see https://github.com/LedgerHQ/ledgerjs/blob/master/packages/hw-app-eth/README.md#parameters-2 + const res = await transport.call("Eth", "signTransaction", bip32path, utx.serialize().toString("hex"), null); handleError(res, transport, "Could not sign ETH tx with Ledger"); const { v, r, s } = res.payload; From 6f4e76dd9db54003be1657d62eaafcfa42377f09 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 13:09:45 +0200 Subject: [PATCH 095/108] feat: bump --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 1eaf137f9..9d8eef96b 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3", + "version": "1.52.3-ledger-improvements.1", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 485ea2048..8666e5e31 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3", + "version": "1.52.3-ledger-improvements.1", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index 9f9579f0c..fd89ebd3e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3", + "version": "1.52.3-ledger-improvements.1", "npmClient": "yarn", "useWorkspaces": true, "command": { From 68d6d6d2dc9f0e287bb03a2628e160beaf27c910 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 11 Oct 2023 13:19:30 +0200 Subject: [PATCH 096/108] feat: reboimp --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 9d8eef96b..940cbeee3 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-ledger-improvements.1", + "version": "1.52.3-ledger-improvements.2", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 8666e5e31..245faf344 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-ledger-improvements.1", + "version": "1.52.3-ledger-improvements.2", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index fd89ebd3e..7347e0927 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-ledger-improvements.1", + "version": "1.52.3-ledger-improvements.2", "npmClient": "yarn", "useWorkspaces": true, "command": { From cb93b88b93f542d3f8800761918415cfdb1f0478 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 12 Oct 2023 10:23:39 +0200 Subject: [PATCH 097/108] fix: ethSignMessage strip 0x prefix --- packages/hdwallet-ledger/src/ethereum.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/hdwallet-ledger/src/ethereum.ts b/packages/hdwallet-ledger/src/ethereum.ts index 7bedded40..314c02bfa 100644 --- a/packages/hdwallet-ledger/src/ethereum.ts +++ b/packages/hdwallet-ledger/src/ethereum.ts @@ -160,7 +160,12 @@ export async function ethSignMessage( const bip32path = core.addressNListToBIP32(msg.addressNList); if (!isHexString(msg.message)) throw new Error("data is not an hex string"); - const res = await transport.call("Eth", "signPersonalMessage", bip32path, msg.message); + + // Ledger's inner implementation does a Buffer.from(messageHex, "hex").length on our message + // However, Buffer.from method with the "hex" encoding expects a valid hexadecimal string without the 0x prefix + // so we need to strip it in case it's present + const sanitizedMessageHex = msg.message.startsWith("0x") ? msg.message.slice(2) : msg.message; + const res = await transport.call("Eth", "signPersonalMessage", bip32path, sanitizedMessageHex); handleError(res, transport, "Could not sign ETH message with Ledger"); let { v } = res.payload; From 098f7d15878f1c4e8f231dcc0579059f4cd0356d Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 12 Oct 2023 10:54:21 +0200 Subject: [PATCH 098/108] feat: boimp --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 940cbeee3..9c8cf11eb 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3-ledger-improvements.2", + "version": "1.53.3-ledger-improvements.3", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 245faf344..7f0156a98 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3-ledger-improvements.2", + "version": "1.53.3-ledger-improvements.3", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index 7347e0927..e8ca7dba7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3-ledger-improvements.2", + "version": "1.53.3-ledger-improvements.3", "npmClient": "yarn", "useWorkspaces": true, "command": { From 84e08af0ad940c641d27cbc0ca5eb8aa8460fdf9 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 12 Oct 2023 10:59:08 +0200 Subject: [PATCH 099/108] feat: boimp --- examples/sandbox/package.json | 2 +- integration/package.json | 2 +- lerna.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 9c8cf11eb..86ab83d07 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.53.3-ledger-improvements.3", + "version": "1.53.3-ledger-improvements.4", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", diff --git a/integration/package.json b/integration/package.json index 7f0156a98..b2b4ae4e5 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.53.3-ledger-improvements.3", + "version": "1.53.3-ledger-improvements.4", "main": "index.js", "license": "MIT", "private": true, diff --git a/lerna.json b/lerna.json index e8ca7dba7..0e71a7243 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.53.3-ledger-improvements.3", + "version": "1.53.3-ledger-improvements.4", "npmClient": "yarn", "useWorkspaces": true, "command": { From 9305d282d4dc1877b837ff0dc993bc70f7234be8 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 18 Oct 2023 20:05:19 +0200 Subject: [PATCH 100/108] chore(release): publish 1.52.4 --- examples/sandbox/package.json | 32 +++++++++---------- integration/package.json | 20 ++++++------ lerna.json | 2 +- packages/hdwallet-coinbase/package.json | 4 +-- packages/hdwallet-core/package.json | 2 +- .../hdwallet-keepkey-chromeusb/package.json | 6 ++-- .../hdwallet-keepkey-electron/package.json | 4 +-- .../hdwallet-keepkey-nodehid/package.json | 4 +-- .../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-keplr/package.json | 4 +-- packages/hdwallet-ledger-webhid/package.json | 6 ++-- packages/hdwallet-ledger-webusb/package.json | 6 ++-- packages/hdwallet-ledger/package.json | 4 +-- .../package.json | 4 +-- packages/hdwallet-metamask/package.json | 4 +-- packages/hdwallet-native-vault/package.json | 4 +-- packages/hdwallet-native/package.json | 4 +-- packages/hdwallet-portis/package.json | 4 +-- packages/hdwallet-tallyho/package.json | 4 +-- packages/hdwallet-trezor-connect/package.json | 6 ++-- packages/hdwallet-trezor/package.json | 4 +-- packages/hdwallet-walletconnect/package.json | 4 +-- .../hdwallet-walletconnectV2/package.json | 4 +-- packages/hdwallet-xdefi/package.json | 4 +-- 27 files changed, 81 insertions(+), 81 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 1eaf137f9..8ebb73a06 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.3", - "@shapeshiftoss/hdwallet-keplr": "1.52.3", - "@shapeshiftoss/hdwallet-ledger": "1.52.3", - "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.3", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.3", - "@shapeshiftoss/hdwallet-metamask": "1.52.3", - "@shapeshiftoss/hdwallet-native": "1.52.3", - "@shapeshiftoss/hdwallet-portis": "1.52.3", - "@shapeshiftoss/hdwallet-tallyho": "1.52.3", - "@shapeshiftoss/hdwallet-trezor": "1.52.3", - "@shapeshiftoss/hdwallet-trezor-connect": "1.52.3", - "@shapeshiftoss/hdwallet-walletconnect": "1.52.3", - "@shapeshiftoss/hdwallet-xdefi": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.4", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.4", + "@shapeshiftoss/hdwallet-keplr": "1.52.4", + "@shapeshiftoss/hdwallet-ledger": "1.52.4", + "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.4", + "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.4", + "@shapeshiftoss/hdwallet-metamask": "1.52.4", + "@shapeshiftoss/hdwallet-native": "1.52.4", + "@shapeshiftoss/hdwallet-portis": "1.52.4", + "@shapeshiftoss/hdwallet-tallyho": "1.52.4", + "@shapeshiftoss/hdwallet-trezor": "1.52.4", + "@shapeshiftoss/hdwallet-trezor-connect": "1.52.4", + "@shapeshiftoss/hdwallet-walletconnect": "1.52.4", + "@shapeshiftoss/hdwallet-xdefi": "1.52.4", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index 485ea2048..18e780fa4 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.3", + "version": "1.52.4", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.3", - "@shapeshiftoss/hdwallet-ledger": "1.52.3", - "@shapeshiftoss/hdwallet-native": "1.52.3", - "@shapeshiftoss/hdwallet-portis": "1.52.3", - "@shapeshiftoss/hdwallet-trezor": "1.52.3", - "@shapeshiftoss/hdwallet-xdefi": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-keepkey": "1.52.4", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.4", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.4", + "@shapeshiftoss/hdwallet-ledger": "1.52.4", + "@shapeshiftoss/hdwallet-native": "1.52.4", + "@shapeshiftoss/hdwallet-portis": "1.52.4", + "@shapeshiftoss/hdwallet-trezor": "1.52.4", + "@shapeshiftoss/hdwallet-xdefi": "1.52.4", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index 9f9579f0c..775b6dc9a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.3", + "version": "1.52.4", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index b8f1dafd4..25c520c19 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json index 9bbed2772..e029713fd 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index f2fdc6b02..054eac834 100644 --- a/packages/hdwallet-keepkey-chromeusb/package.json +++ b/packages/hdwallet-keepkey-chromeusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-chromeusb", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey": "1.52.3" + "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-keepkey": "1.52.4" } } diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index b63489f80..f262ba9f9 100644 --- a/packages/hdwallet-keepkey-electron/package.json +++ b/packages/hdwallet-keepkey-electron/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-electron", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.3", + "@shapeshiftoss/hdwallet-keepkey": "1.52.4", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index da40891f1..591263715 100644 --- a/packages/hdwallet-keepkey-nodehid/package.json +++ b/packages/hdwallet-keepkey-nodehid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodehid", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.3" + "@shapeshiftoss/hdwallet-keepkey": "1.52.4" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index 6bf556d75..80bf14329 100644 --- a/packages/hdwallet-keepkey-nodewebusb/package.json +++ b/packages/hdwallet-keepkey-nodewebusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey": "1.52.3" + "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-keepkey": "1.52.4" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index d4be0a5d8..33d434735 100644 --- a/packages/hdwallet-keepkey-tcp/package.json +++ b/packages/hdwallet-keepkey-tcp/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-tcp", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-keepkey": "1.52.4", "axios": "^0.21.1" } } diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index c75d5a98b..1925db865 100644 --- a/packages/hdwallet-keepkey-webusb/package.json +++ b/packages/hdwallet-keepkey-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-webusb", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-keepkey": "1.52.3" + "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-keepkey": "1.52.4" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4" diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index e0d71737c..c33d785cf 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^3.3.0", "@keepkey/device-protocol": "^7.12.2", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "bignumber.js": "^9.0.1", "bnb-javascript-sdk-nobroadcast": "^2.16.14", diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json index 906c72fe8..17e4cce06 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/caip": "8.15.0", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@shapeshiftoss/types": "3.1.3", "base64-js": "^1.5.1", diff --git a/packages/hdwallet-ledger-webhid/package.json b/packages/hdwallet-ledger-webhid/package.json index 5c4e08268..1c3dc736b 100644 --- a/packages/hdwallet-ledger-webhid/package.json +++ b/packages/hdwallet-ledger-webhid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webhid", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -19,8 +19,8 @@ "@ledgerhq/hw-transport": "^6.7.0", "@ledgerhq/hw-transport-webhid": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-ledger": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-ledger": "1.52.4", "@types/w3c-web-hid": "^1.0.2" }, "devDependencies": { diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index d2dc648bf..a7fc35562 100644 --- a/packages/hdwallet-ledger-webusb/package.json +++ b/packages/hdwallet-ledger-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webusb", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -20,8 +20,8 @@ "@ledgerhq/hw-transport-webusb": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", "@ledgerhq/logs": "^6.10.1", - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-ledger": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-ledger": "1.52.4", "@types/w3c-web-usb": "^1.0.4", "p-queue": "^7.4.1" }, diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index bdce74b92..17804e258 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -18,7 +18,7 @@ "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", "bitcoinjs-message": "^2.0.0", diff --git a/packages/hdwallet-metamask-shapeshift-multichain/package.json b/packages/hdwallet-metamask-shapeshift-multichain/package.json index e70d62c8f..5382f6ba5 100644 --- a/packages/hdwallet-metamask-shapeshift-multichain/package.json +++ b/packages/hdwallet-metamask-shapeshift-multichain/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-shapeshift-multichain", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", "@shapeshiftoss/common-api": "^9.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", "@shapeshiftoss/metamask-snaps-adapter": "^1.0.8", "@shapeshiftoss/metamask-snaps-types": "^1.0.8", "eth-rpc-errors": "^4.0.3", diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index a3c4c81b6..3f181baab 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index e4c9f5314..f0dc8af70 100644 --- a/packages/hdwallet-native-vault/package.json +++ b/packages/hdwallet-native-vault/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native-vault", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-native": "1.52.3", + "@shapeshiftoss/hdwallet-native": "1.52.4", "bip39": "^3.0.4", "hash-wasm": "^4.9.0", "idb-keyval": "^6.0.3", diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index 44655010b..6a4973ca0 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", "@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index 6d55d31ca..daf476efc 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@portis/web3": "3.0.10", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index e688dc75b..512ec2194 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-tallyho", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", "lodash": "^4.17.21", "tallyho-onboarding": "^1.0.2" }, diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index 8196d257c..3437dbd4b 100644 --- a/packages/hdwallet-trezor-connect/package.json +++ b/packages/hdwallet-trezor-connect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor-connect", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", - "@shapeshiftoss/hdwallet-trezor": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-trezor": "1.52.4", "@trezor/rollout": "^1.2.0", "trezor-connect": "^8.2.1" } diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index 795a537a5..c09bacb6a 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", "base64-js": "^1.5.1", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index 8101de3f3..d53919558 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", "@walletconnect/qrcode-modal": "^1.7.8", "@walletconnect/web3-provider": "^1.7.8", "ethers": "^5.6.5" diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index ff4681cca..44d72ea45 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", "@walletconnect/ethereum-provider": "^2.10.1", "@walletconnect/modal": "^2.6.2", "ethers": "^5.6.5" diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index 1d2c43eb9..aaa1ca359 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-xdefi", - "version": "1.52.3", + "version": "1.52.4", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.3", + "@shapeshiftoss/hdwallet-core": "1.52.4", "lodash": "^4.17.21" }, "devDependencies": { From cb09aba9a058cc5621b113b355a405d2a4057b59 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 18 Oct 2023 20:13:47 +0200 Subject: [PATCH 101/108] chore(release): publish 1.52.5 --- examples/sandbox/package.json | 32 +++++++++---------- integration/package.json | 20 ++++++------ lerna.json | 2 +- packages/hdwallet-coinbase/package.json | 4 +-- packages/hdwallet-core/package.json | 2 +- .../hdwallet-keepkey-chromeusb/package.json | 6 ++-- .../hdwallet-keepkey-electron/package.json | 4 +-- .../hdwallet-keepkey-nodehid/package.json | 4 +-- .../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-keplr/package.json | 4 +-- packages/hdwallet-ledger-webhid/package.json | 6 ++-- packages/hdwallet-ledger-webusb/package.json | 6 ++-- packages/hdwallet-ledger/package.json | 4 +-- .../package.json | 4 +-- packages/hdwallet-metamask/package.json | 4 +-- packages/hdwallet-native-vault/package.json | 4 +-- packages/hdwallet-native/package.json | 4 +-- packages/hdwallet-portis/package.json | 4 +-- packages/hdwallet-tallyho/package.json | 4 +-- packages/hdwallet-trezor-connect/package.json | 6 ++-- packages/hdwallet-trezor/package.json | 4 +-- packages/hdwallet-walletconnect/package.json | 4 +-- .../hdwallet-walletconnectV2/package.json | 4 +-- packages/hdwallet-xdefi/package.json | 4 +-- 27 files changed, 81 insertions(+), 81 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 8ebb73a06..378aaded6 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.4", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.4", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.4", - "@shapeshiftoss/hdwallet-keplr": "1.52.4", - "@shapeshiftoss/hdwallet-ledger": "1.52.4", - "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.4", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.4", - "@shapeshiftoss/hdwallet-metamask": "1.52.4", - "@shapeshiftoss/hdwallet-native": "1.52.4", - "@shapeshiftoss/hdwallet-portis": "1.52.4", - "@shapeshiftoss/hdwallet-tallyho": "1.52.4", - "@shapeshiftoss/hdwallet-trezor": "1.52.4", - "@shapeshiftoss/hdwallet-trezor-connect": "1.52.4", - "@shapeshiftoss/hdwallet-walletconnect": "1.52.4", - "@shapeshiftoss/hdwallet-xdefi": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.5", + "@shapeshiftoss/hdwallet-keplr": "1.52.5", + "@shapeshiftoss/hdwallet-ledger": "1.52.5", + "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.5", + "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.5", + "@shapeshiftoss/hdwallet-metamask": "1.52.5", + "@shapeshiftoss/hdwallet-native": "1.52.5", + "@shapeshiftoss/hdwallet-portis": "1.52.5", + "@shapeshiftoss/hdwallet-tallyho": "1.52.5", + "@shapeshiftoss/hdwallet-trezor": "1.52.5", + "@shapeshiftoss/hdwallet-trezor-connect": "1.52.5", + "@shapeshiftoss/hdwallet-walletconnect": "1.52.5", + "@shapeshiftoss/hdwallet-xdefi": "1.52.5", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index 18e780fa4..b4d89f943 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.4", + "version": "1.52.5", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.4", - "@shapeshiftoss/hdwallet-keepkey": "1.52.4", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.4", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.4", - "@shapeshiftoss/hdwallet-ledger": "1.52.4", - "@shapeshiftoss/hdwallet-native": "1.52.4", - "@shapeshiftoss/hdwallet-portis": "1.52.4", - "@shapeshiftoss/hdwallet-trezor": "1.52.4", - "@shapeshiftoss/hdwallet-xdefi": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.5", + "@shapeshiftoss/hdwallet-ledger": "1.52.5", + "@shapeshiftoss/hdwallet-native": "1.52.5", + "@shapeshiftoss/hdwallet-portis": "1.52.5", + "@shapeshiftoss/hdwallet-trezor": "1.52.5", + "@shapeshiftoss/hdwallet-xdefi": "1.52.5", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index 775b6dc9a..1abeb2256 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.4", + "version": "1.52.5", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index 25c520c19..bf1ce6625 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json index e029713fd..be2824ebc 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index 054eac834..3d406db4f 100644 --- a/packages/hdwallet-keepkey-chromeusb/package.json +++ b/packages/hdwallet-keepkey-chromeusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-chromeusb", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.4", - "@shapeshiftoss/hdwallet-keepkey": "1.52.4" + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey": "1.52.5" } } diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index f262ba9f9..397a3bb98 100644 --- a/packages/hdwallet-keepkey-electron/package.json +++ b/packages/hdwallet-keepkey-electron/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-electron", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.4", + "@shapeshiftoss/hdwallet-keepkey": "1.52.5", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index 591263715..c7c3b6641 100644 --- a/packages/hdwallet-keepkey-nodehid/package.json +++ b/packages/hdwallet-keepkey-nodehid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodehid", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.4" + "@shapeshiftoss/hdwallet-keepkey": "1.52.5" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index 80bf14329..fdc4fbc0a 100644 --- a/packages/hdwallet-keepkey-nodewebusb/package.json +++ b/packages/hdwallet-keepkey-nodewebusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.4", - "@shapeshiftoss/hdwallet-keepkey": "1.52.4" + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey": "1.52.5" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index 33d434735..6e7ad9d39 100644 --- a/packages/hdwallet-keepkey-tcp/package.json +++ b/packages/hdwallet-keepkey-tcp/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-tcp", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.4", - "@shapeshiftoss/hdwallet-keepkey": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey": "1.52.5", "axios": "^0.21.1" } } diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index 1925db865..cbdc09b77 100644 --- a/packages/hdwallet-keepkey-webusb/package.json +++ b/packages/hdwallet-keepkey-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-webusb", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.4", - "@shapeshiftoss/hdwallet-keepkey": "1.52.4" + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey": "1.52.5" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4" diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index c33d785cf..b6dd00e43 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^3.3.0", "@keepkey/device-protocol": "^7.12.2", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "bignumber.js": "^9.0.1", "bnb-javascript-sdk-nobroadcast": "^2.16.14", diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json index 17e4cce06..3e43c24e8 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/caip": "8.15.0", - "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@shapeshiftoss/types": "3.1.3", "base64-js": "^1.5.1", diff --git a/packages/hdwallet-ledger-webhid/package.json b/packages/hdwallet-ledger-webhid/package.json index 1c3dc736b..9db488887 100644 --- a/packages/hdwallet-ledger-webhid/package.json +++ b/packages/hdwallet-ledger-webhid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webhid", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -19,8 +19,8 @@ "@ledgerhq/hw-transport": "^6.7.0", "@ledgerhq/hw-transport-webhid": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", - "@shapeshiftoss/hdwallet-core": "1.52.4", - "@shapeshiftoss/hdwallet-ledger": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-ledger": "1.52.5", "@types/w3c-web-hid": "^1.0.2" }, "devDependencies": { diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index a7fc35562..e09d14d49 100644 --- a/packages/hdwallet-ledger-webusb/package.json +++ b/packages/hdwallet-ledger-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webusb", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -20,8 +20,8 @@ "@ledgerhq/hw-transport-webusb": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", "@ledgerhq/logs": "^6.10.1", - "@shapeshiftoss/hdwallet-core": "1.52.4", - "@shapeshiftoss/hdwallet-ledger": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-ledger": "1.52.5", "@types/w3c-web-usb": "^1.0.4", "p-queue": "^7.4.1" }, diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index 17804e258..1e22505bd 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -18,7 +18,7 @@ "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", "bitcoinjs-message": "^2.0.0", diff --git a/packages/hdwallet-metamask-shapeshift-multichain/package.json b/packages/hdwallet-metamask-shapeshift-multichain/package.json index 5382f6ba5..c0dfa45ed 100644 --- a/packages/hdwallet-metamask-shapeshift-multichain/package.json +++ b/packages/hdwallet-metamask-shapeshift-multichain/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-shapeshift-multichain", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", "@shapeshiftoss/common-api": "^9.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", "@shapeshiftoss/metamask-snaps-adapter": "^1.0.8", "@shapeshiftoss/metamask-snaps-types": "^1.0.8", "eth-rpc-errors": "^4.0.3", diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index 3f181baab..535d6ecfa 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", - "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index f0dc8af70..a4eb6d536 100644 --- a/packages/hdwallet-native-vault/package.json +++ b/packages/hdwallet-native-vault/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native-vault", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-native": "1.52.4", + "@shapeshiftoss/hdwallet-native": "1.52.5", "bip39": "^3.0.4", "hash-wasm": "^4.9.0", "idb-keyval": "^6.0.3", diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index 6a4973ca0..5e880bd9c 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", "@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6", - "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index daf476efc..5093312bf 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@portis/web3": "3.0.10", - "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index 512ec2194..b022b1597 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-tallyho", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", "lodash": "^4.17.21", "tallyho-onboarding": "^1.0.2" }, diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index 3437dbd4b..8d7a66d11 100644 --- a/packages/hdwallet-trezor-connect/package.json +++ b/packages/hdwallet-trezor-connect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor-connect", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.4", - "@shapeshiftoss/hdwallet-trezor": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-trezor": "1.52.5", "@trezor/rollout": "^1.2.0", "trezor-connect": "^8.2.1" } diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index c09bacb6a..7f4b01609 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", "base64-js": "^1.5.1", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index d53919558..997bb6add 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", "@walletconnect/qrcode-modal": "^1.7.8", "@walletconnect/web3-provider": "^1.7.8", "ethers": "^5.6.5" diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index 44d72ea45..67f075191 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", "@walletconnect/ethereum-provider": "^2.10.1", "@walletconnect/modal": "^2.6.2", "ethers": "^5.6.5" diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index aaa1ca359..8fe5be1df 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-xdefi", - "version": "1.52.4", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.4", + "@shapeshiftoss/hdwallet-core": "1.52.5", "lodash": "^4.17.21" }, "devDependencies": { From b825919d005a5b8d5f371df40dc6cec23fa5bb48 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 18 Oct 2023 20:16:31 +0200 Subject: [PATCH 102/108] chore(release): publish 1.52.6 --- examples/sandbox/package.json | 32 +++++++++---------- integration/package.json | 20 ++++++------ lerna.json | 2 +- packages/hdwallet-coinbase/package.json | 4 +-- packages/hdwallet-core/package.json | 2 +- .../hdwallet-keepkey-chromeusb/package.json | 6 ++-- .../hdwallet-keepkey-electron/package.json | 4 +-- .../hdwallet-keepkey-nodehid/package.json | 4 +-- .../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-keplr/package.json | 4 +-- packages/hdwallet-ledger-webhid/package.json | 6 ++-- packages/hdwallet-ledger-webusb/package.json | 6 ++-- packages/hdwallet-ledger/package.json | 4 +-- .../package.json | 4 +-- packages/hdwallet-metamask/package.json | 4 +-- packages/hdwallet-native-vault/package.json | 4 +-- packages/hdwallet-native/package.json | 4 +-- packages/hdwallet-portis/package.json | 4 +-- packages/hdwallet-tallyho/package.json | 4 +-- packages/hdwallet-trezor-connect/package.json | 6 ++-- packages/hdwallet-trezor/package.json | 4 +-- packages/hdwallet-walletconnect/package.json | 4 +-- .../hdwallet-walletconnectV2/package.json | 4 +-- packages/hdwallet-xdefi/package.json | 4 +-- 27 files changed, 81 insertions(+), 81 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 378aaded6..94b93c775 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.5", - "@shapeshiftoss/hdwallet-keplr": "1.52.5", - "@shapeshiftoss/hdwallet-ledger": "1.52.5", - "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.5", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.5", - "@shapeshiftoss/hdwallet-metamask": "1.52.5", - "@shapeshiftoss/hdwallet-native": "1.52.5", - "@shapeshiftoss/hdwallet-portis": "1.52.5", - "@shapeshiftoss/hdwallet-tallyho": "1.52.5", - "@shapeshiftoss/hdwallet-trezor": "1.52.5", - "@shapeshiftoss/hdwallet-trezor-connect": "1.52.5", - "@shapeshiftoss/hdwallet-walletconnect": "1.52.5", - "@shapeshiftoss/hdwallet-xdefi": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.6", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.6", + "@shapeshiftoss/hdwallet-keplr": "1.52.6", + "@shapeshiftoss/hdwallet-ledger": "1.52.6", + "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.6", + "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.6", + "@shapeshiftoss/hdwallet-metamask": "1.52.6", + "@shapeshiftoss/hdwallet-native": "1.52.6", + "@shapeshiftoss/hdwallet-portis": "1.52.6", + "@shapeshiftoss/hdwallet-tallyho": "1.52.6", + "@shapeshiftoss/hdwallet-trezor": "1.52.6", + "@shapeshiftoss/hdwallet-trezor-connect": "1.52.6", + "@shapeshiftoss/hdwallet-walletconnect": "1.52.6", + "@shapeshiftoss/hdwallet-xdefi": "1.52.6", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index b4d89f943..8f3d7ea38 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.5", + "version": "1.52.6", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.5", - "@shapeshiftoss/hdwallet-ledger": "1.52.5", - "@shapeshiftoss/hdwallet-native": "1.52.5", - "@shapeshiftoss/hdwallet-portis": "1.52.5", - "@shapeshiftoss/hdwallet-trezor": "1.52.5", - "@shapeshiftoss/hdwallet-xdefi": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-keepkey": "1.52.6", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.6", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.6", + "@shapeshiftoss/hdwallet-ledger": "1.52.6", + "@shapeshiftoss/hdwallet-native": "1.52.6", + "@shapeshiftoss/hdwallet-portis": "1.52.6", + "@shapeshiftoss/hdwallet-trezor": "1.52.6", + "@shapeshiftoss/hdwallet-xdefi": "1.52.6", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index 1abeb2256..e39242c53 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.5", + "version": "1.52.6", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index bf1ce6625..0c953c777 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json index be2824ebc..c576885e2 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index 3d406db4f..b250827f3 100644 --- a/packages/hdwallet-keepkey-chromeusb/package.json +++ b/packages/hdwallet-keepkey-chromeusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-chromeusb", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey": "1.52.5" + "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-keepkey": "1.52.6" } } diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index 397a3bb98..325339384 100644 --- a/packages/hdwallet-keepkey-electron/package.json +++ b/packages/hdwallet-keepkey-electron/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-electron", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey": "1.52.6", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index c7c3b6641..1377b9a9f 100644 --- a/packages/hdwallet-keepkey-nodehid/package.json +++ b/packages/hdwallet-keepkey-nodehid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodehid", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.5" + "@shapeshiftoss/hdwallet-keepkey": "1.52.6" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index fdc4fbc0a..20ae0e6ec 100644 --- a/packages/hdwallet-keepkey-nodewebusb/package.json +++ b/packages/hdwallet-keepkey-nodewebusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey": "1.52.5" + "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-keepkey": "1.52.6" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index 6e7ad9d39..e92b652e5 100644 --- a/packages/hdwallet-keepkey-tcp/package.json +++ b/packages/hdwallet-keepkey-tcp/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-tcp", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-keepkey": "1.52.6", "axios": "^0.21.1" } } diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index cbdc09b77..7fe7323c8 100644 --- a/packages/hdwallet-keepkey-webusb/package.json +++ b/packages/hdwallet-keepkey-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-webusb", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey": "1.52.5" + "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-keepkey": "1.52.6" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4" diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index b6dd00e43..91a950e4a 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^3.3.0", "@keepkey/device-protocol": "^7.12.2", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "bignumber.js": "^9.0.1", "bnb-javascript-sdk-nobroadcast": "^2.16.14", diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json index 3e43c24e8..372f7da25 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/caip": "8.15.0", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@shapeshiftoss/types": "3.1.3", "base64-js": "^1.5.1", diff --git a/packages/hdwallet-ledger-webhid/package.json b/packages/hdwallet-ledger-webhid/package.json index 9db488887..4c48c4236 100644 --- a/packages/hdwallet-ledger-webhid/package.json +++ b/packages/hdwallet-ledger-webhid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webhid", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -19,8 +19,8 @@ "@ledgerhq/hw-transport": "^6.7.0", "@ledgerhq/hw-transport-webhid": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-ledger": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-ledger": "1.52.6", "@types/w3c-web-hid": "^1.0.2" }, "devDependencies": { diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index e09d14d49..82aaaaf56 100644 --- a/packages/hdwallet-ledger-webusb/package.json +++ b/packages/hdwallet-ledger-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webusb", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -20,8 +20,8 @@ "@ledgerhq/hw-transport-webusb": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", "@ledgerhq/logs": "^6.10.1", - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-ledger": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-ledger": "1.52.6", "@types/w3c-web-usb": "^1.0.4", "p-queue": "^7.4.1" }, diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index 1e22505bd..ac597b32f 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -18,7 +18,7 @@ "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", "bitcoinjs-message": "^2.0.0", diff --git a/packages/hdwallet-metamask-shapeshift-multichain/package.json b/packages/hdwallet-metamask-shapeshift-multichain/package.json index c0dfa45ed..ff58859c9 100644 --- a/packages/hdwallet-metamask-shapeshift-multichain/package.json +++ b/packages/hdwallet-metamask-shapeshift-multichain/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-shapeshift-multichain", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", "@shapeshiftoss/common-api": "^9.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", "@shapeshiftoss/metamask-snaps-adapter": "^1.0.8", "@shapeshiftoss/metamask-snaps-types": "^1.0.8", "eth-rpc-errors": "^4.0.3", diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index 535d6ecfa..e61eecc0f 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index a4eb6d536..39dd35410 100644 --- a/packages/hdwallet-native-vault/package.json +++ b/packages/hdwallet-native-vault/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native-vault", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-native": "1.52.5", + "@shapeshiftoss/hdwallet-native": "1.52.6", "bip39": "^3.0.4", "hash-wasm": "^4.9.0", "idb-keyval": "^6.0.3", diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index 5e880bd9c..7e6a91ed3 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", "@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index 5093312bf..a83a27c5f 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@portis/web3": "3.0.10", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index b022b1597..29e856e48 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-tallyho", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", "lodash": "^4.17.21", "tallyho-onboarding": "^1.0.2" }, diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index 8d7a66d11..1d85846c0 100644 --- a/packages/hdwallet-trezor-connect/package.json +++ b/packages/hdwallet-trezor-connect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor-connect", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-trezor": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-trezor": "1.52.6", "@trezor/rollout": "^1.2.0", "trezor-connect": "^8.2.1" } diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index 7f4b01609..a17e13756 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", "base64-js": "^1.5.1", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index 997bb6add..9c3425293 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", "@walletconnect/qrcode-modal": "^1.7.8", "@walletconnect/web3-provider": "^1.7.8", "ethers": "^5.6.5" diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index 67f075191..8c665baa8 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", "@walletconnect/ethereum-provider": "^2.10.1", "@walletconnect/modal": "^2.6.2", "ethers": "^5.6.5" diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index 8fe5be1df..b75377706 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-xdefi", - "version": "1.52.5", + "version": "1.52.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.6", "lodash": "^4.17.21" }, "devDependencies": { From 6da33aed50ab8bf5f43390144a31f124c2fe5460 Mon Sep 17 00:00:00 2001 From: kaladinlight <35275952+kaladinlight@users.noreply.github.com> Date: Wed, 18 Oct 2023 13:18:23 -0600 Subject: [PATCH 103/108] cleanup --- packages/hdwallet-ledger-webusb/src/transport.ts | 2 -- packages/hdwallet-ledger/src/thorchain/index.ts | 2 -- 2 files changed, 4 deletions(-) diff --git a/packages/hdwallet-ledger-webusb/src/transport.ts b/packages/hdwallet-ledger-webusb/src/transport.ts index 214a2519d..b0efc05af 100644 --- a/packages/hdwallet-ledger-webusb/src/transport.ts +++ b/packages/hdwallet-ledger-webusb/src/transport.ts @@ -81,8 +81,6 @@ export async function translateCoinAndMethod].bind(thor); return methodInstance as LedgerTransportMethod; } diff --git a/packages/hdwallet-ledger/src/thorchain/index.ts b/packages/hdwallet-ledger/src/thorchain/index.ts index d4a7f6727..e9e595cde 100644 --- a/packages/hdwallet-ledger/src/thorchain/index.ts +++ b/packages/hdwallet-ledger/src/thorchain/index.ts @@ -10,8 +10,6 @@ export * from "./common"; export * from "./helpers"; export * from "./hw-app-thor"; -// TODO(gomes): move all below to ./thorchain - const protoTxBuilder = PLazy.from(() => import("@shapeshiftoss/proto-tx-builder")); export const thorchainGetAddress = async ( From bb48842ce45d3a7e3b0fe9792d2aacbdfab4939b Mon Sep 17 00:00:00 2001 From: kaladinlight <35275952+kaladinlight@users.noreply.github.com> Date: Wed, 18 Oct 2023 13:31:39 -0600 Subject: [PATCH 104/108] add ripemd types --- packages/hdwallet-ledger/package.json | 1 + yarn.lock | 43 +-------------------------- 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index ac597b32f..062ccfa71 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -36,6 +36,7 @@ "@types/bs58check": "^2.1.0", "@types/ethereumjs-tx": "1.0.1", "@types/ethereumjs-util": "^6.1.0", + "@types/ripemd160": "^2.0.2", "typedoc": "^0.20.36" } } diff --git a/yarn.lock b/yarn.lock index f043ec101..271b5067c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5557,18 +5557,6 @@ web-encoding "^1.1.0" wif "^2.0.6" -"@shapeshiftoss/hdwallet-core@1.52.2", "@shapeshiftoss/hdwallet-core@^1.50.4": - version "1.52.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.52.2.tgz#2d6c28ae62a062dea6825403d4a5b65227426a2b" - integrity sha512-ztCQJkcU/g+1ZG+X2HQFRW1pJma8zRm1A3hl1rmk4lG+zkT88YxDQbzzLCoaGDp6P18vP3ou/oQwhee1O+sNVQ== - dependencies: - "@shapeshiftoss/proto-tx-builder" "^0.8.0" - eip-712 "^1.0.0" - eventemitter2 "^5.0.1" - lodash "^4.17.21" - rxjs "^6.4.0" - type-assertions "^1.1.0" - "@shapeshiftoss/hdwallet-core@latest": version "1.18.4" resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-core/-/hdwallet-core-1.18.4.tgz#7272baa4b43de0fbb5e651d47cdeb9554f4ddd33" @@ -5579,35 +5567,6 @@ rxjs "^6.4.0" type-assertions "^1.1.0" -"@shapeshiftoss/hdwallet-native@^1.50.4": - version "1.52.2" - resolved "https://registry.yarnpkg.com/@shapeshiftoss/hdwallet-native/-/hdwallet-native-1.52.2.tgz#b69201d7c96b67a47ffb4588ea284aeab8d4bc31" - integrity sha512-cfPZg4WJhaMktwlPdGZHsuCsJKiDQcSgbjKDMjsojk680b/tgPaJ+nzTuihTo7Flp6lITxpcXTXM1Da3e/GdSQ== - dependencies: - "@shapeshiftoss/bitcoinjs-lib" "5.2.0-shapeshift.2" - "@shapeshiftoss/fiosdk" "1.2.1-shapeshift.6" - "@shapeshiftoss/hdwallet-core" "1.52.2" - "@shapeshiftoss/proto-tx-builder" "^0.8.0" - "@zxing/text-encoding" "^0.9.0" - bchaddrjs "^0.4.9" - bech32 "^1.1.4" - bignumber.js "^9.0.1" - bip32 "^2.0.5" - bip39 "^3.0.2" - bnb-javascript-sdk-nobroadcast "^2.16.14" - crypto-js "^4.0.0" - eip-712 "^1.0.0" - ethers "5.7.2" - eventemitter2 "^5.0.1" - funtypes "^3.0.1" - lodash "^4.17.21" - node-fetch "^2.6.1" - p-lazy "^3.1.0" - scrypt-js "^3.0.1" - tendermint-tx-builder "^1.0.9" - tiny-secp256k1 "^1.1.6" - web-encoding "^1.1.0" - "@shapeshiftoss/logger@^1.1.2", "@shapeshiftoss/logger@^1.1.3": version "1.1.3" resolved "https://registry.yarnpkg.com/@shapeshiftoss/logger/-/logger-1.1.3.tgz#ff05765775351c8adc99cf747f14b5619311e023" @@ -6472,7 +6431,7 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/ripemd160@^2.0.1": +"@types/ripemd160@^2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@types/ripemd160/-/ripemd160-2.0.2.tgz#e8ec7b1572e25fff9b3d0c4bc79022df4e037d12" integrity sha512-hv3Oh/+ldCqp1xBRGi/1G6y2fxV6wUiiwjPt2Q7fe4UgmbD52ChdmxJyjDsGCRb9yuTBS9281UhH4D9gO85k7A== From d5fedc01e79bcc54ea739b56fc3c0e86def36d2a Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 18 Oct 2023 22:39:17 +0200 Subject: [PATCH 105/108] Revert "chore(release): publish 1.52.6" This reverts commit b825919d005a5b8d5f371df40dc6cec23fa5bb48. --- examples/sandbox/package.json | 32 +++++++++---------- integration/package.json | 20 ++++++------ lerna.json | 2 +- packages/hdwallet-coinbase/package.json | 4 +-- packages/hdwallet-core/package.json | 2 +- .../hdwallet-keepkey-chromeusb/package.json | 6 ++-- .../hdwallet-keepkey-electron/package.json | 4 +-- .../hdwallet-keepkey-nodehid/package.json | 4 +-- .../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-keplr/package.json | 4 +-- packages/hdwallet-ledger-webhid/package.json | 6 ++-- packages/hdwallet-ledger-webusb/package.json | 6 ++-- packages/hdwallet-ledger/package.json | 4 +-- .../package.json | 4 +-- packages/hdwallet-metamask/package.json | 4 +-- packages/hdwallet-native-vault/package.json | 4 +-- packages/hdwallet-native/package.json | 4 +-- packages/hdwallet-portis/package.json | 4 +-- packages/hdwallet-tallyho/package.json | 4 +-- packages/hdwallet-trezor-connect/package.json | 6 ++-- packages/hdwallet-trezor/package.json | 4 +-- packages/hdwallet-walletconnect/package.json | 4 +-- .../hdwallet-walletconnectV2/package.json | 4 +-- packages/hdwallet-xdefi/package.json | 4 +-- 27 files changed, 81 insertions(+), 81 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 94b93c775..378aaded6 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.6", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.6", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.6", - "@shapeshiftoss/hdwallet-keplr": "1.52.6", - "@shapeshiftoss/hdwallet-ledger": "1.52.6", - "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.6", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.6", - "@shapeshiftoss/hdwallet-metamask": "1.52.6", - "@shapeshiftoss/hdwallet-native": "1.52.6", - "@shapeshiftoss/hdwallet-portis": "1.52.6", - "@shapeshiftoss/hdwallet-tallyho": "1.52.6", - "@shapeshiftoss/hdwallet-trezor": "1.52.6", - "@shapeshiftoss/hdwallet-trezor-connect": "1.52.6", - "@shapeshiftoss/hdwallet-walletconnect": "1.52.6", - "@shapeshiftoss/hdwallet-xdefi": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.5", + "@shapeshiftoss/hdwallet-keplr": "1.52.5", + "@shapeshiftoss/hdwallet-ledger": "1.52.5", + "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.5", + "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.5", + "@shapeshiftoss/hdwallet-metamask": "1.52.5", + "@shapeshiftoss/hdwallet-native": "1.52.5", + "@shapeshiftoss/hdwallet-portis": "1.52.5", + "@shapeshiftoss/hdwallet-tallyho": "1.52.5", + "@shapeshiftoss/hdwallet-trezor": "1.52.5", + "@shapeshiftoss/hdwallet-trezor-connect": "1.52.5", + "@shapeshiftoss/hdwallet-walletconnect": "1.52.5", + "@shapeshiftoss/hdwallet-xdefi": "1.52.5", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index 8f3d7ea38..b4d89f943 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.6", + "version": "1.52.5", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.6", - "@shapeshiftoss/hdwallet-keepkey": "1.52.6", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.6", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.6", - "@shapeshiftoss/hdwallet-ledger": "1.52.6", - "@shapeshiftoss/hdwallet-native": "1.52.6", - "@shapeshiftoss/hdwallet-portis": "1.52.6", - "@shapeshiftoss/hdwallet-trezor": "1.52.6", - "@shapeshiftoss/hdwallet-xdefi": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.5", + "@shapeshiftoss/hdwallet-ledger": "1.52.5", + "@shapeshiftoss/hdwallet-native": "1.52.5", + "@shapeshiftoss/hdwallet-portis": "1.52.5", + "@shapeshiftoss/hdwallet-trezor": "1.52.5", + "@shapeshiftoss/hdwallet-xdefi": "1.52.5", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index e39242c53..1abeb2256 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.6", + "version": "1.52.5", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index 0c953c777..bf1ce6625 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json index c576885e2..be2824ebc 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index b250827f3..3d406db4f 100644 --- a/packages/hdwallet-keepkey-chromeusb/package.json +++ b/packages/hdwallet-keepkey-chromeusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-chromeusb", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.6", - "@shapeshiftoss/hdwallet-keepkey": "1.52.6" + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey": "1.52.5" } } diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index 325339384..397a3bb98 100644 --- a/packages/hdwallet-keepkey-electron/package.json +++ b/packages/hdwallet-keepkey-electron/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-electron", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.6", + "@shapeshiftoss/hdwallet-keepkey": "1.52.5", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index 1377b9a9f..c7c3b6641 100644 --- a/packages/hdwallet-keepkey-nodehid/package.json +++ b/packages/hdwallet-keepkey-nodehid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodehid", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.6" + "@shapeshiftoss/hdwallet-keepkey": "1.52.5" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index 20ae0e6ec..fdc4fbc0a 100644 --- a/packages/hdwallet-keepkey-nodewebusb/package.json +++ b/packages/hdwallet-keepkey-nodewebusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.6", - "@shapeshiftoss/hdwallet-keepkey": "1.52.6" + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey": "1.52.5" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index e92b652e5..6e7ad9d39 100644 --- a/packages/hdwallet-keepkey-tcp/package.json +++ b/packages/hdwallet-keepkey-tcp/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-tcp", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.6", - "@shapeshiftoss/hdwallet-keepkey": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey": "1.52.5", "axios": "^0.21.1" } } diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index 7fe7323c8..cbdc09b77 100644 --- a/packages/hdwallet-keepkey-webusb/package.json +++ b/packages/hdwallet-keepkey-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-webusb", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.6", - "@shapeshiftoss/hdwallet-keepkey": "1.52.6" + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey": "1.52.5" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4" diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index 91a950e4a..b6dd00e43 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^3.3.0", "@keepkey/device-protocol": "^7.12.2", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "bignumber.js": "^9.0.1", "bnb-javascript-sdk-nobroadcast": "^2.16.14", diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json index 372f7da25..3e43c24e8 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/caip": "8.15.0", - "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@shapeshiftoss/types": "3.1.3", "base64-js": "^1.5.1", diff --git a/packages/hdwallet-ledger-webhid/package.json b/packages/hdwallet-ledger-webhid/package.json index 4c48c4236..9db488887 100644 --- a/packages/hdwallet-ledger-webhid/package.json +++ b/packages/hdwallet-ledger-webhid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webhid", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -19,8 +19,8 @@ "@ledgerhq/hw-transport": "^6.7.0", "@ledgerhq/hw-transport-webhid": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", - "@shapeshiftoss/hdwallet-core": "1.52.6", - "@shapeshiftoss/hdwallet-ledger": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-ledger": "1.52.5", "@types/w3c-web-hid": "^1.0.2" }, "devDependencies": { diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index 82aaaaf56..e09d14d49 100644 --- a/packages/hdwallet-ledger-webusb/package.json +++ b/packages/hdwallet-ledger-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webusb", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -20,8 +20,8 @@ "@ledgerhq/hw-transport-webusb": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", "@ledgerhq/logs": "^6.10.1", - "@shapeshiftoss/hdwallet-core": "1.52.6", - "@shapeshiftoss/hdwallet-ledger": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-ledger": "1.52.5", "@types/w3c-web-usb": "^1.0.4", "p-queue": "^7.4.1" }, diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index 062ccfa71..18e8d6ab1 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -18,7 +18,7 @@ "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", "bitcoinjs-message": "^2.0.0", diff --git a/packages/hdwallet-metamask-shapeshift-multichain/package.json b/packages/hdwallet-metamask-shapeshift-multichain/package.json index ff58859c9..c0dfa45ed 100644 --- a/packages/hdwallet-metamask-shapeshift-multichain/package.json +++ b/packages/hdwallet-metamask-shapeshift-multichain/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-shapeshift-multichain", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", "@shapeshiftoss/common-api": "^9.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", "@shapeshiftoss/metamask-snaps-adapter": "^1.0.8", "@shapeshiftoss/metamask-snaps-types": "^1.0.8", "eth-rpc-errors": "^4.0.3", diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index e61eecc0f..535d6ecfa 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", - "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index 39dd35410..a4eb6d536 100644 --- a/packages/hdwallet-native-vault/package.json +++ b/packages/hdwallet-native-vault/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native-vault", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-native": "1.52.6", + "@shapeshiftoss/hdwallet-native": "1.52.5", "bip39": "^3.0.4", "hash-wasm": "^4.9.0", "idb-keyval": "^6.0.3", diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index 7e6a91ed3..5e880bd9c 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", "@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6", - "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index a83a27c5f..5093312bf 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@portis/web3": "3.0.10", - "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index 29e856e48..b022b1597 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-tallyho", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", "lodash": "^4.17.21", "tallyho-onboarding": "^1.0.2" }, diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index 1d85846c0..8d7a66d11 100644 --- a/packages/hdwallet-trezor-connect/package.json +++ b/packages/hdwallet-trezor-connect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor-connect", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.6", - "@shapeshiftoss/hdwallet-trezor": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-trezor": "1.52.5", "@trezor/rollout": "^1.2.0", "trezor-connect": "^8.2.1" } diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index a17e13756..7f4b01609 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", "base64-js": "^1.5.1", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index 9c3425293..997bb6add 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", "@walletconnect/qrcode-modal": "^1.7.8", "@walletconnect/web3-provider": "^1.7.8", "ethers": "^5.6.5" diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index 8c665baa8..67f075191 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", "@walletconnect/ethereum-provider": "^2.10.1", "@walletconnect/modal": "^2.6.2", "ethers": "^5.6.5" diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index b75377706..8fe5be1df 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-xdefi", - "version": "1.52.6", + "version": "1.52.5", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.6", + "@shapeshiftoss/hdwallet-core": "1.52.5", "lodash": "^4.17.21" }, "devDependencies": { From f37e481c5c6514582e9ebd4b70428984fed55311 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 18 Oct 2023 22:39:57 +0200 Subject: [PATCH 106/108] chore(release): publish 1.52.7 --- examples/sandbox/package.json | 32 +++++++++---------- integration/package.json | 20 ++++++------ lerna.json | 2 +- packages/hdwallet-coinbase/package.json | 4 +-- packages/hdwallet-core/package.json | 2 +- .../hdwallet-keepkey-chromeusb/package.json | 6 ++-- .../hdwallet-keepkey-electron/package.json | 4 +-- .../hdwallet-keepkey-nodehid/package.json | 4 +-- .../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-keplr/package.json | 4 +-- packages/hdwallet-ledger-webhid/package.json | 6 ++-- packages/hdwallet-ledger-webusb/package.json | 6 ++-- packages/hdwallet-ledger/package.json | 4 +-- .../package.json | 4 +-- packages/hdwallet-metamask/package.json | 4 +-- packages/hdwallet-native-vault/package.json | 4 +-- packages/hdwallet-native/package.json | 4 +-- packages/hdwallet-portis/package.json | 4 +-- packages/hdwallet-tallyho/package.json | 4 +-- packages/hdwallet-trezor-connect/package.json | 6 ++-- packages/hdwallet-trezor/package.json | 4 +-- packages/hdwallet-walletconnect/package.json | 4 +-- .../hdwallet-walletconnectV2/package.json | 4 +-- packages/hdwallet-xdefi/package.json | 4 +-- 27 files changed, 81 insertions(+), 81 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 378aaded6..ff78a4984 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf dist node_modules public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.5", - "@shapeshiftoss/hdwallet-keplr": "1.52.5", - "@shapeshiftoss/hdwallet-ledger": "1.52.5", - "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.5", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.5", - "@shapeshiftoss/hdwallet-metamask": "1.52.5", - "@shapeshiftoss/hdwallet-native": "1.52.5", - "@shapeshiftoss/hdwallet-portis": "1.52.5", - "@shapeshiftoss/hdwallet-tallyho": "1.52.5", - "@shapeshiftoss/hdwallet-trezor": "1.52.5", - "@shapeshiftoss/hdwallet-trezor-connect": "1.52.5", - "@shapeshiftoss/hdwallet-walletconnect": "1.52.5", - "@shapeshiftoss/hdwallet-xdefi": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.7", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.7", + "@shapeshiftoss/hdwallet-keplr": "1.52.7", + "@shapeshiftoss/hdwallet-ledger": "1.52.7", + "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.7", + "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.7", + "@shapeshiftoss/hdwallet-metamask": "1.52.7", + "@shapeshiftoss/hdwallet-native": "1.52.7", + "@shapeshiftoss/hdwallet-portis": "1.52.7", + "@shapeshiftoss/hdwallet-tallyho": "1.52.7", + "@shapeshiftoss/hdwallet-trezor": "1.52.7", + "@shapeshiftoss/hdwallet-trezor-connect": "1.52.7", + "@shapeshiftoss/hdwallet-walletconnect": "1.52.7", + "@shapeshiftoss/hdwallet-xdefi": "1.52.7", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index b4d89f943..e3157b29a 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.52.5", + "version": "1.52.7", "main": "index.js", "license": "MIT", "private": true, @@ -10,15 +10,15 @@ "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.5", - "@shapeshiftoss/hdwallet-ledger": "1.52.5", - "@shapeshiftoss/hdwallet-native": "1.52.5", - "@shapeshiftoss/hdwallet-portis": "1.52.5", - "@shapeshiftoss/hdwallet-trezor": "1.52.5", - "@shapeshiftoss/hdwallet-xdefi": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", + "@shapeshiftoss/hdwallet-keepkey": "1.52.7", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.7", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.7", + "@shapeshiftoss/hdwallet-ledger": "1.52.7", + "@shapeshiftoss/hdwallet-native": "1.52.7", + "@shapeshiftoss/hdwallet-portis": "1.52.7", + "@shapeshiftoss/hdwallet-trezor": "1.52.7", + "@shapeshiftoss/hdwallet-xdefi": "1.52.7", "fast-json-stable-stringify": "^2.1.0", "msw": "^0.27.1", "whatwg-fetch": "^3.6.2" diff --git a/lerna.json b/lerna.json index 1abeb2256..228369f0f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.52.5", + "version": "1.52.7", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index bf1ce6625..8b78dbfa8 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json index be2824ebc..aec3e883a 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index 3d406db4f..2f10a55d6 100644 --- a/packages/hdwallet-keepkey-chromeusb/package.json +++ b/packages/hdwallet-keepkey-chromeusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-chromeusb", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey": "1.52.5" + "@shapeshiftoss/hdwallet-core": "1.52.7", + "@shapeshiftoss/hdwallet-keepkey": "1.52.7" } } diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index 397a3bb98..350706770 100644 --- a/packages/hdwallet-keepkey-electron/package.json +++ b/packages/hdwallet-keepkey-electron/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-electron", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.5", + "@shapeshiftoss/hdwallet-keepkey": "1.52.7", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index c7c3b6641..d633dca41 100644 --- a/packages/hdwallet-keepkey-nodehid/package.json +++ b/packages/hdwallet-keepkey-nodehid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodehid", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.52.5" + "@shapeshiftoss/hdwallet-keepkey": "1.52.7" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index fdc4fbc0a..ab1ddbe87 100644 --- a/packages/hdwallet-keepkey-nodewebusb/package.json +++ b/packages/hdwallet-keepkey-nodewebusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey": "1.52.5" + "@shapeshiftoss/hdwallet-core": "1.52.7", + "@shapeshiftoss/hdwallet-keepkey": "1.52.7" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index 6e7ad9d39..75561e143 100644 --- a/packages/hdwallet-keepkey-tcp/package.json +++ b/packages/hdwallet-keepkey-tcp/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-tcp", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", + "@shapeshiftoss/hdwallet-keepkey": "1.52.7", "axios": "^0.21.1" } } diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index cbdc09b77..326cb5142 100644 --- a/packages/hdwallet-keepkey-webusb/package.json +++ b/packages/hdwallet-keepkey-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey-webusb", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-keepkey": "1.52.5" + "@shapeshiftoss/hdwallet-core": "1.52.7", + "@shapeshiftoss/hdwallet-keepkey": "1.52.7" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4" diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index b6dd00e43..f2268faca 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^3.3.0", "@keepkey/device-protocol": "^7.12.2", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "bignumber.js": "^9.0.1", "bnb-javascript-sdk-nobroadcast": "^2.16.14", diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json index 3e43c24e8..b063cd4fb 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/caip": "8.15.0", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@shapeshiftoss/types": "3.1.3", "base64-js": "^1.5.1", diff --git a/packages/hdwallet-ledger-webhid/package.json b/packages/hdwallet-ledger-webhid/package.json index 9db488887..ef31127a8 100644 --- a/packages/hdwallet-ledger-webhid/package.json +++ b/packages/hdwallet-ledger-webhid/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webhid", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -19,8 +19,8 @@ "@ledgerhq/hw-transport": "^6.7.0", "@ledgerhq/hw-transport-webhid": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-ledger": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", + "@shapeshiftoss/hdwallet-ledger": "1.52.7", "@types/w3c-web-hid": "^1.0.2" }, "devDependencies": { diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index e09d14d49..55fb8552b 100644 --- a/packages/hdwallet-ledger-webusb/package.json +++ b/packages/hdwallet-ledger-webusb/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger-webusb", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -20,8 +20,8 @@ "@ledgerhq/hw-transport-webusb": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", "@ledgerhq/logs": "^6.10.1", - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-ledger": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", + "@shapeshiftoss/hdwallet-ledger": "1.52.7", "@types/w3c-web-usb": "^1.0.4", "p-queue": "^7.4.1" }, diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index 18e8d6ab1..b537567c3 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -18,7 +18,7 @@ "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", "bitcoinjs-message": "^2.0.0", diff --git a/packages/hdwallet-metamask-shapeshift-multichain/package.json b/packages/hdwallet-metamask-shapeshift-multichain/package.json index c0dfa45ed..31d503001 100644 --- a/packages/hdwallet-metamask-shapeshift-multichain/package.json +++ b/packages/hdwallet-metamask-shapeshift-multichain/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-shapeshift-multichain", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", "@shapeshiftoss/common-api": "^9.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", "@shapeshiftoss/metamask-snaps-adapter": "^1.0.8", "@shapeshiftoss/metamask-snaps-types": "^1.0.8", "eth-rpc-errors": "^4.0.3", diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index 535d6ecfa..b83f50c05 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@metamask/detect-provider": "^1.2.0", "@metamask/onboarding": "^1.0.1", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", "eth-rpc-errors": "^4.0.3", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index a4eb6d536..76b54db47 100644 --- a/packages/hdwallet-native-vault/package.json +++ b/packages/hdwallet-native-vault/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native-vault", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-native": "1.52.5", + "@shapeshiftoss/hdwallet-native": "1.52.7", "bip39": "^3.0.4", "hash-wasm": "^4.9.0", "idb-keyval": "^6.0.3", diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index 5e880bd9c..7ef60f951 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2", "@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index 5093312bf..39e7fb26e 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@portis/web3": "3.0.10", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index b022b1597..0a405a476 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-tallyho", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", "lodash": "^4.17.21", "tallyho-onboarding": "^1.0.2" }, diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index 8d7a66d11..8a571510c 100644 --- a/packages/hdwallet-trezor-connect/package.json +++ b/packages/hdwallet-trezor-connect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor-connect", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", - "@shapeshiftoss/hdwallet-trezor": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", + "@shapeshiftoss/hdwallet-trezor": "1.52.7", "@trezor/rollout": "^1.2.0", "trezor-connect": "^8.2.1" } diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index 7f4b01609..9e6cec346 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", "base64-js": "^1.5.1", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index 997bb6add..ed308ecb8 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", "@walletconnect/qrcode-modal": "^1.7.8", "@walletconnect/web3-provider": "^1.7.8", "ethers": "^5.6.5" diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index 67f075191..987fa4f90 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", "@walletconnect/ethereum-provider": "^2.10.1", "@walletconnect/modal": "^2.6.2", "ethers": "^5.6.5" diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index 8fe5be1df..82870af48 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-xdefi", - "version": "1.52.5", + "version": "1.52.7", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.52.5", + "@shapeshiftoss/hdwallet-core": "1.52.7", "lodash": "^4.17.21" }, "devDependencies": { From 278995a90385366cd68a4baefc841e8c9d6e288c Mon Sep 17 00:00:00 2001 From: kaladinlight <35275952+kaladinlight@users.noreply.github.com> Date: Wed, 18 Oct 2023 16:42:11 -0600 Subject: [PATCH 107/108] extend, implement, type, and fix integration tests --- integration/src/thorchain/thorchain.ts | 3 +- integration/src/wallets/ledger.ts | 57 +++++++++ packages/hdwallet-ledger/src/ledger.ts | 116 ++++-------------- .../src/thorchain/hw-app-thor.ts | 4 +- .../hdwallet-ledger/src/thorchain/utils.ts | 10 +- 5 files changed, 89 insertions(+), 101 deletions(-) diff --git a/integration/src/thorchain/thorchain.ts b/integration/src/thorchain/thorchain.ts index cce066297..b95ec45a0 100644 --- a/integration/src/thorchain/thorchain.ts +++ b/integration/src/thorchain/thorchain.ts @@ -1,5 +1,6 @@ import * as core from "@shapeshiftoss/hdwallet-core"; import * as keepkey from "@shapeshiftoss/hdwallet-keepkey"; +import * as ledger from "@shapeshiftoss/hdwallet-ledger"; import tx_unsigned_swap_amino from "./tx01.mainnet.thorchain.swap.amino.json"; import tx_unsigned_swap from "./tx01.mainnet.thorchain.swap.json"; @@ -25,7 +26,7 @@ export function thorchainTests(get: () => { wallet: core.HDWallet; info: core.HD beforeAll(async () => { const { wallet: w } = get(); if (core.supportsThorchain(w)) wallet = w; - useAmino = w instanceof keepkey.KeepKeyHDWallet; + useAmino = w instanceof keepkey.KeepKeyHDWallet || w instanceof ledger.LedgerHDWallet; }); beforeEach(async () => { diff --git a/integration/src/wallets/ledger.ts b/integration/src/wallets/ledger.ts index 41a696d7a..2f424a5ef 100644 --- a/integration/src/wallets/ledger.ts +++ b/integration/src/wallets/ledger.ts @@ -1,5 +1,6 @@ import * as core from "@shapeshiftoss/hdwallet-core"; import * as ledger from "@shapeshiftoss/hdwallet-ledger"; +import { toByteArray } from "base64-js"; export class MockTransport extends ledger.LedgerTransport { memoized = new Map(); @@ -212,6 +213,62 @@ export class MockTransport extends ledger.LedgerTransport { '{"success":true,"coin":"Btc","method":"getWalletPublicKey","payload":{"bitcoinAddress":"1FH6ehAd5ZFXCM1cLGzHxK1s4dGdq1JusM","chainCode":"fixme","publicKey":"fixme"}}' ) ); + + // Thorchain + this.memoize( + "Rune", + "getAddressAndPubKey", + JSON.parse(`[[${core.bip32ToAddressNList("m/44'/931'/0'/0/0")}], "thor"]`), + JSON.parse( + `{"success":true,"coin":"Rune","method":"getAddressAndPubkey","payload":{"bech32_address":"thor1ls33ayg26kmltw7jjy55p32ghjna09zp74t4az","compressed_pk":[${toByteArray( + "AxUZcTuLQr3DZxEtMxMs8Uzt+SisV3HURLpFm5SXEXuj" + )}]}}` + ) + ); + + const sig1 = toByteArray( + "1s+0FVJ5R8O+ewGq5yNbTQuVG5MJZppFDqVJ4cd5D68ogOb2GMVHvYCH2dvQXo/uK/fT6Rk6dLGhK8tgW/HqtA==" + ); + const r1 = sig1.slice(0, 32); + const s1 = sig1.slice(32, 64); + const rawSig1 = Uint8Array.from([48, 68, 2, 32, ...r1, 2, 32, ...s1]); + this.memoize( + "Rune", + "sign", + JSON.parse( + '[{"tx":{"account_number":"17","chain_id":"thorchain-mainnet-v1","sequence":"2","fee":{"amount":[{"amount":"3000","denom":"rune"}],"gas":"200000"},"memo":"","msg":[{"type":"thorchain/MsgSend","value":{"amount":[{"amount":"100","denom":"rune"}],"from_address":"thor1ls33ayg26kmltw7jjy55p32ghjna09zp74t4az","to_address":"thor1wy58774wagy4hkljz9mchhqtgk949zdwwe80d5"}}],"signatures":[]},"addressNList":[2147483692,2147484579,2147483648,0,0],"chain_id":"thorchain-mainnet-v1","account_number":"17","sequence":"2"}]' + ), + { + success: true, + coin: "Rune", + method: "sign", + payload: { + signature: rawSig1, + }, + } + ); + + const sig2 = toByteArray( + "0Bjk7npdUw/Qa4MQTS4PH8sw8jM4JSzpd7G2DsF3DMVoYgdpO2fjHh/DUq6v30nghxUSJj0jNm0VIq9viPB+tQ==" + ); + const r2 = sig2.slice(0, 32); + const s2 = sig2.slice(32, 64); + const rawSig2 = Uint8Array.from([48, 68, 2, 32, ...r2, 2, 32, ...s2]); + this.memoize( + "Rune", + "sign", + JSON.parse( + '[{"tx":{"account_number":"2722","chain_id":"thorchain-mainnet-v1","sequence":"4","fee":{"amount":[{"amount":"0","denom":"rune"}],"gas":"350000"},"memo":"","msg":[{"type":"thorchain/MsgDeposit","value":{"coins":[{"asset":"THOR.RUNE","amount":"50994000"}],"memo":"SWAP:BNB.BNB:bnb12splwpg8jenr9pjw3dwc5rr35t8792y8pc4mtf:348953501","signer":"thor1ls33ayg26kmltw7jjy55p32ghjna09zp74t4az"}}],"signatures":[]},"addressNList":[2147483692,2147484579,2147483648,0,0],"chain_id":"thorchain-mainnet-v1","account_number":"2722","sequence":"4"}]' + ), + { + success: true, + coin: "Rune", + method: "sign", + payload: { + signature: rawSig2, + }, + } + ); } catch (e) { console.error(e); } diff --git a/packages/hdwallet-ledger/src/ledger.ts b/packages/hdwallet-ledger/src/ledger.ts index bceae89b7..4265a2cd1 100644 --- a/packages/hdwallet-ledger/src/ledger.ts +++ b/packages/hdwallet-ledger/src/ledger.ts @@ -135,9 +135,12 @@ function describeUTXOPath(path: core.BIP32Path, coin: core.Coin, scriptType?: co } } -export class LedgerHDWalletInfo implements core.HDWalletInfo, core.BTCWalletInfo, core.ETHWalletInfo { +export class LedgerHDWalletInfo + implements core.HDWalletInfo, core.BTCWalletInfo, core.ETHWalletInfo, core.ThorchainWalletInfo +{ readonly _supportsBTCInfo = true; readonly _supportsETHInfo = true; + readonly _supportsThorchainInfo = true; public getVendor(): string { return "Ledger"; @@ -187,6 +190,16 @@ export class LedgerHDWalletInfo implements core.HDWalletInfo, core.BTCWalletInfo return eth.ethGetAccountPaths(msg); } + public thorchainGetAccountPaths(msg: core.ThorchainGetAccountPaths): Array { + const slip44 = core.slip44ByCoin("Thorchain"); + return [{ addressNList: [0x80000000 + 44, 0x80000000 + slip44, 0x80000000 + msg.accountIdx, 0, 0] }]; + } + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + public thorchainNextAccountPath(msg: core.ThorchainAccountPath): core.ThorchainAccountPath | undefined { + return undefined; + } + // eslint-disable-next-line @typescript-eslint/no-unused-vars public hasNativeShapeShift(srcCoin: core.Coin, dstCoin: core.Coin): boolean { return false; @@ -224,6 +237,8 @@ export class LedgerHDWalletInfo implements core.HDWalletInfo, core.BTCWalletInfo switch (msg.coin) { case "Ethereum": return describeETHPath(msg.path); + case "Thorchain": + return core.thorchainDescribePath(msg.path); default: return describeUTXOPath(msg.path, msg.coin, msg.scriptType); } @@ -291,7 +306,10 @@ export class LedgerHDWalletInfo implements core.HDWalletInfo, core.BTCWalletInfo } } -export class LedgerHDWallet implements core.HDWallet, core.BTCWallet, core.ETHWallet { +export class LedgerHDWallet + extends LedgerHDWalletInfo + implements core.HDWallet, core.BTCWallet, core.ETHWallet, core.ThorchainWallet +{ readonly _supportsETHInfo = true; readonly _supportsBTCInfo = true; readonly _supportsBTC = true; @@ -312,6 +330,7 @@ export class LedgerHDWallet implements core.HDWallet, core.BTCWallet, core.ETHWa info: LedgerHDWalletInfo & core.HDWalletInfo; constructor(transport: LedgerTransport) { + super(); this.transport = transport; this.info = new LedgerHDWalletInfo(); } @@ -377,10 +396,6 @@ export class LedgerHDWallet implements core.HDWallet, core.BTCWallet, core.ETHWa return version; } - public getVendor(): string { - return "Ledger"; - } - public async getModel(): Promise { const { device: { productName }, @@ -419,39 +434,6 @@ export class LedgerHDWallet implements core.HDWallet, core.BTCWallet, core.ETHWa } } - // eslint-disable-next-line @typescript-eslint/no-unused-vars - public hasNativeShapeShift(srcCoin: core.Coin, dstCoin: core.Coin): boolean { - return false; - } - - public supportsBip44Accounts(): boolean { - return this.info.supportsBip44Accounts(); - } - - public supportsOfflineSigning(): boolean { - return true; - } - - public supportsBroadcast(): boolean { - return false; - } - - public hasOnDeviceDisplay(): boolean { - return true; - } - - public hasOnDevicePassphrase(): boolean { - return true; - } - - public hasOnDevicePinEntry(): boolean { - return true; - } - - public hasOnDeviceRecovery(): boolean { - return true; - } - // eslint-disable-next-line @typescript-eslint/no-unused-vars public async loadDevice(msg: core.LoadDevice): Promise { return; @@ -500,14 +482,6 @@ export class LedgerHDWallet implements core.HDWallet, core.BTCWallet, core.ETHWa return; } - public async btcSupportsCoin(coin: core.Coin): Promise { - return this.info.btcSupportsCoin(coin); - } - - public async btcSupportsScriptType(coin: core.Coin, scriptType: core.BTCInputScriptType): Promise { - return this.info.btcSupportsScriptType(coin, scriptType); - } - public async btcGetAddress(msg: core.BTCGetAddress): Promise { await this.validateCurrentApp(msg.coin); return btc.btcGetAddress(this.transport, msg); @@ -525,14 +499,6 @@ export class LedgerHDWallet implements core.HDWallet, core.BTCWallet, core.ETHWa return btc.btcSignTx(this, this.transport, msg); } - public async btcSupportsSecureTransfer(): Promise { - return this.info.btcSupportsSecureTransfer(); - } - - public btcSupportsNativeShapeShift(): boolean { - return this.info.btcSupportsNativeShapeShift(); - } - public async btcSignMessage(msg: core.BTCSignMessage): Promise { await this.validateCurrentApp(msg.coin); return btc.btcSignMessage(this, this.transport, msg); @@ -542,14 +508,6 @@ export class LedgerHDWallet implements core.HDWallet, core.BTCWallet, core.ETHWa return btc.btcVerifyMessage(msg); } - public btcGetAccountPaths(msg: core.BTCGetAccountPaths): Array { - return this.info.btcGetAccountPaths(msg); - } - - public btcIsSameAccount(msg: Array): boolean { - return this.info.btcIsSameAccount(msg); - } - public async ethSignTx(msg: core.ETHSignTx): Promise { await this.validateCurrentApp("Ethereum"); return eth.ethSignTx(this.transport, msg); @@ -569,41 +527,9 @@ export class LedgerHDWallet implements core.HDWallet, core.BTCWallet, core.ETHWa return eth.ethVerifyMessage(msg); } - public async ethSupportsNetwork(chain_id: number): Promise { - return this.info.ethSupportsNetwork(chain_id); - } - - public async ethSupportsSecureTransfer(): Promise { - return this.info.ethSupportsSecureTransfer(); - } - - public ethSupportsNativeShapeShift(): boolean { - return this.info.ethSupportsNativeShapeShift(); - } - - public async ethSupportsEIP1559(): Promise { - return await this.info.ethSupportsEIP1559(); - } - - public ethGetAccountPaths(msg: core.ETHGetAccountPath): Array { - return this.info.ethGetAccountPaths(msg); - } - - public describePath(msg: core.DescribePath): core.PathDescription { - return this.info.describePath(msg); - } - public disconnect(): Promise { return this.transport.disconnect(); } - - public btcNextAccountPath(msg: core.BTCAccountPath): core.BTCAccountPath | undefined { - return this.info.btcNextAccountPath(msg); - } - - public ethNextAccountPath(msg: core.ETHAccountPath): core.ETHAccountPath | undefined { - return this.info.ethNextAccountPath(msg); - } } export function info(): LedgerHDWalletInfo { diff --git a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts index 75e243635..1ff37717b 100644 --- a/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts +++ b/packages/hdwallet-ledger/src/thorchain/hw-app-thor.ts @@ -36,13 +36,13 @@ const THOR_CHAIN = "thorchain-mainnet-v1"; export type GetAddressAndPubKeyResponse = { bech32_address: string; - compressed_pk: any; + compressed_pk: Uint8Array; error_message: string; return_code: number; }; export type SignResponse = { - signature: any; + signature: Uint8Array; error_message: string; return_code: number; }; diff --git a/packages/hdwallet-ledger/src/thorchain/utils.ts b/packages/hdwallet-ledger/src/thorchain/utils.ts index 6359e86ca..1c4b14b7c 100644 --- a/packages/hdwallet-ledger/src/thorchain/utils.ts +++ b/packages/hdwallet-ledger/src/thorchain/utils.ts @@ -1,6 +1,6 @@ import { fromByteArray } from "base64-js"; -export const getSignature = (signatureArray: any) => { +export const getSignature = (signatureArray: Uint8Array) => { // Check Type Length Value encoding if (signatureArray.length < 64) { throw new Error("Invalid Signature: Too short"); @@ -28,7 +28,9 @@ export const getSignature = (signatureArray: any) => { // add leading zero's to pad to 32 bytes while (rSignature.length < 32) { - rSignature.unshift(0); + const rSignaturePadded = new Uint8Array(32); + rSignaturePadded.set(rSignature, 32 - rSignature.length); + rSignature = rSignaturePadded; } // s signature @@ -53,7 +55,9 @@ export const getSignature = (signatureArray: any) => { // add leading zero's to pad to 32 bytes while (sSignature.length < 32) { - sSignature.unshift(0); + const sSignaturePadded = new Uint8Array(32); + sSignaturePadded.set(sSignature, 32 - sSignature.length); + sSignature = sSignaturePadded; } if (rSignature.length !== 32 || sSignature.length !== 32) { From fbf8a6acdc6d3f255bbf9d72c8bd8122a2675b0b Mon Sep 17 00:00:00 2001 From: kaladinlight <35275952+kaladinlight@users.noreply.github.com> Date: Wed, 18 Oct 2023 16:54:22 -0600 Subject: [PATCH 108/108] pretty --- integration/src/wallets/ledger.ts | 5 ++--- packages/hdwallet-ledger/src/ledger.ts | 15 ++++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/integration/src/wallets/ledger.ts b/integration/src/wallets/ledger.ts index 2f424a5ef..7a4543051 100644 --- a/integration/src/wallets/ledger.ts +++ b/integration/src/wallets/ledger.ts @@ -215,14 +215,13 @@ export class MockTransport extends ledger.LedgerTransport { ); // Thorchain + const compress_pk = toByteArray("AxUZcTuLQr3DZxEtMxMs8Uzt+SisV3HURLpFm5SXEXuj"); this.memoize( "Rune", "getAddressAndPubKey", JSON.parse(`[[${core.bip32ToAddressNList("m/44'/931'/0'/0/0")}], "thor"]`), JSON.parse( - `{"success":true,"coin":"Rune","method":"getAddressAndPubkey","payload":{"bech32_address":"thor1ls33ayg26kmltw7jjy55p32ghjna09zp74t4az","compressed_pk":[${toByteArray( - "AxUZcTuLQr3DZxEtMxMs8Uzt+SisV3HURLpFm5SXEXuj" - )}]}}` + `{"success":true,"coin":"Rune","method":"getAddressAndPubkey","payload":{"bech32_address":"thor1ls33ayg26kmltw7jjy55p32ghjna09zp74t4az","compressed_pk":[${compress_pk}]}}` ) ); diff --git a/packages/hdwallet-ledger/src/ledger.ts b/packages/hdwallet-ledger/src/ledger.ts index 4265a2cd1..37ee83916 100644 --- a/packages/hdwallet-ledger/src/ledger.ts +++ b/packages/hdwallet-ledger/src/ledger.ts @@ -486,13 +486,6 @@ export class LedgerHDWallet await this.validateCurrentApp(msg.coin); return btc.btcGetAddress(this.transport, msg); } - public thorchainGetAddress(msg: core.ThorchainGetAddress): Promise { - return thorchain.thorchainGetAddress(this.transport, msg); - } - - public thorchainSignTx(msg: core.ThorchainSignTx): Promise { - return thorchain.thorchainSignTx(this.transport, msg); - } public async btcSignTx(msg: core.BTCSignTxLedger): Promise { await this.validateCurrentApp(msg.coin); @@ -527,6 +520,14 @@ export class LedgerHDWallet return eth.ethVerifyMessage(msg); } + public thorchainGetAddress(msg: core.ThorchainGetAddress): Promise { + return thorchain.thorchainGetAddress(this.transport, msg); + } + + public thorchainSignTx(msg: core.ThorchainSignTx): Promise { + return thorchain.thorchainSignTx(this.transport, msg); + } + public disconnect(): Promise { return this.transport.disconnect(); }