feat: cashaddr getWalletPublicKeys format (#650)

Co-authored-by: kaladinlight <35275952+kaladinlight@users.noreply.github.com>
shapeshift · Oct 25, 2023 · 12288a2 · 12288a2 · vercel · Oct 25, 2023
1 parent c0dddd4
commit 12288a2
Show file tree

Hide file tree

Showing 28 changed files with 89 additions and 82 deletions.
diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-sandbox",
-  "version": "1.52.8",
+  "version": "1.52.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.8",
-    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.8",
-    "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.8",
-    "@shapeshiftoss/hdwallet-keplr": "1.52.8",
-    "@shapeshiftoss/hdwallet-ledger": "1.52.8",
-    "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.8",
-    "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.8",
-    "@shapeshiftoss/hdwallet-metamask": "1.52.8",
-    "@shapeshiftoss/hdwallet-native": "1.52.8",
-    "@shapeshiftoss/hdwallet-portis": "1.52.8",
-    "@shapeshiftoss/hdwallet-tallyho": "1.52.8",
-    "@shapeshiftoss/hdwallet-trezor": "1.52.8",
-    "@shapeshiftoss/hdwallet-trezor-connect": "1.52.8",
-    "@shapeshiftoss/hdwallet-walletconnect": "1.52.8",
-    "@shapeshiftoss/hdwallet-xdefi": "1.52.8",
+    "@shapeshiftoss/hdwallet-core": "1.52.9",
+    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.9",
+    "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.9",
+    "@shapeshiftoss/hdwallet-keplr": "1.52.9",
+    "@shapeshiftoss/hdwallet-ledger": "1.52.9",
+    "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.9",
+    "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.9",
+    "@shapeshiftoss/hdwallet-metamask": "1.52.9",
+    "@shapeshiftoss/hdwallet-native": "1.52.9",
+    "@shapeshiftoss/hdwallet-portis": "1.52.9",
+    "@shapeshiftoss/hdwallet-tallyho": "1.52.9",
+    "@shapeshiftoss/hdwallet-trezor": "1.52.9",
+    "@shapeshiftoss/hdwallet-trezor-connect": "1.52.9",
+    "@shapeshiftoss/hdwallet-walletconnect": "1.52.9",
+    "@shapeshiftoss/hdwallet-xdefi": "1.52.9",
     "bip32": "^2.0.4",
     "jquery": "^3.4.1",
     "json": "^9.0.6",

diff --git a/integration/package.json b/integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/integration",
-  "version": "1.52.8",
+  "version": "1.52.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.8",
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.8",
-    "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.8",
-    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.8",
-    "@shapeshiftoss/hdwallet-ledger": "1.52.8",
-    "@shapeshiftoss/hdwallet-native": "1.52.8",
-    "@shapeshiftoss/hdwallet-portis": "1.52.8",
-    "@shapeshiftoss/hdwallet-trezor": "1.52.8",
-    "@shapeshiftoss/hdwallet-xdefi": "1.52.8",
+    "@shapeshiftoss/hdwallet-core": "1.52.9",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.9",
+    "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.9",
+    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.9",
+    "@shapeshiftoss/hdwallet-ledger": "1.52.9",
+    "@shapeshiftoss/hdwallet-native": "1.52.9",
+    "@shapeshiftoss/hdwallet-portis": "1.52.9",
+    "@shapeshiftoss/hdwallet-trezor": "1.52.9",
+    "@shapeshiftoss/hdwallet-xdefi": "1.52.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
@@ -1,6 +1,6 @@
 {
   "lerna": "5.2.0",
-  "version": "1.52.8",
+  "version": "1.52.9",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-coinbase",
-  "version": "1.52.8",
+  "version": "1.52.9",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@coinbase/wallet-sdk": "^3.6.6",
-    "@shapeshiftoss/hdwallet-core": "1.52.8",
+    "@shapeshiftoss/hdwallet-core": "1.52.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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-core",
-  "version": "1.52.8",
+  "version": "1.52.9",
   "license": "MIT",
   "publishConfig": {
     "access": "public"

diff --git 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.8",
+  "version": "1.52.9",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.8",
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.8"
+    "@shapeshiftoss/hdwallet-core": "1.52.9",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.9"
   }
 }
diff --git 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.8",
+  "version": "1.52.9",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.8",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.9",
     "uuid": "^8.3.2"
   },
   "peerDependencies": {

diff --git 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.8",
+  "version": "1.52.9",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.8"
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.9"
   },
   "peerDependencies": {
     "node-hid": "^2.1.1"

diff --git 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.8",
+  "version": "1.52.9",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,8 +14,8 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.8",
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.8"
+    "@shapeshiftoss/hdwallet-core": "1.52.9",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.9"
   },
   "peerDependencies": {
     "usb": "^2.3.1"

diff --git 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.8",
+  "version": "1.52.9",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,8 +14,8 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.8",
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.8",
+    "@shapeshiftoss/hdwallet-core": "1.52.9",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.9",
     "axios": "^0.21.1"
   }
 }
diff --git 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.8",
+  "version": "1.52.9",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,8 +14,8 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.8",
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.8"
+    "@shapeshiftoss/hdwallet-core": "1.52.9",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.9"
   },
   "devDependencies": {
     "@types/w3c-web-usb": "^1.0.4"

diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-keepkey",
-  "version": "1.52.8",
+  "version": "1.52.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.8",
+    "@shapeshiftoss/hdwallet-core": "1.52.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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-keplr",
-  "version": "1.52.8",
+  "version": "1.52.9",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@shapeshiftoss/caip": "8.15.0",
-    "@shapeshiftoss/hdwallet-core": "1.52.8",
+    "@shapeshiftoss/hdwallet-core": "1.52.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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-ledger-webhid",
-  "version": "1.52.8",
+  "version": "1.52.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.8",
-    "@shapeshiftoss/hdwallet-ledger": "1.52.8",
+    "@shapeshiftoss/hdwallet-core": "1.52.9",
+    "@shapeshiftoss/hdwallet-ledger": "1.52.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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-ledger-webusb",
-  "version": "1.52.8",
+  "version": "1.52.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.8",
-    "@shapeshiftoss/hdwallet-ledger": "1.52.8",
+    "@shapeshiftoss/hdwallet-core": "1.52.9",
+    "@shapeshiftoss/hdwallet-ledger": "1.52.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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-ledger",
-  "version": "1.52.8",
+  "version": "1.52.9",
   "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.8",
+    "@shapeshiftoss/hdwallet-core": "1.52.9",
     "base64-js": "^1.5.1",
     "bchaddrjs": "^0.4.4",
     "bitcoinjs-message": "^2.0.0",

diff --git a/packages/hdwallet-ledger/src/bitcoin.ts b/packages/hdwallet-ledger/src/bitcoin.ts
@@ -37,9 +37,16 @@ export async function btcSupportsScriptType(coin: core.Coin, scriptType?: core.B
 
 export async function btcGetAddress(transport: LedgerTransport, msg: core.BTCGetAddress): Promise<string> {
   const bip32path = core.addressNListToBIP32(msg.addressNList);
+
+  const scriptTypeish = (() => {
+    if (msg.coin === "BitcoinCash") return core.BTCInputScriptType.CashAddr;
+    if (msg.scriptType) return msg.scriptType;
+    return core.BTCInputScriptType.SpendAddress;
+  })();
+
   const opts = {
     verify: !!msg.showDisplay,
-    format: translateScriptType(msg.scriptType ?? core.BTCInputScriptType.SpendAddress),
+    format: translateScriptType(scriptTypeish),
   };
 
   const res = await transport.call("Btc", "getWalletPublicKey", bip32path, opts);

diff --git 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.8",
+  "version": "1.52.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.8",
+    "@shapeshiftoss/hdwallet-core": "1.52.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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-metamask",
-  "version": "1.52.8",
+  "version": "1.52.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.8",
+    "@shapeshiftoss/hdwallet-core": "1.52.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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-native-vault",
-  "version": "1.52.8",
+  "version": "1.52.9",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-native": "1.52.8",
+    "@shapeshiftoss/hdwallet-native": "1.52.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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-native",
-  "version": "1.52.8",
+  "version": "1.52.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.8",
+    "@shapeshiftoss/hdwallet-core": "1.52.9",
     "@shapeshiftoss/proto-tx-builder": "^0.8.0",
     "@zxing/text-encoding": "^0.9.0",
     "bchaddrjs": "^0.4.9",