Merge in master, fix conflicts

shapeshift · Oct 18, 2023 · 33d5302 · 33d5302
2 parents 1045c4a + f058a85
commit 33d5302
Show file tree

Hide file tree

Showing 30 changed files with 141 additions and 109 deletions.
diff --git a/examples/sandbox/index.ts b/examples/sandbox/index.ts
@@ -628,31 +628,31 @@ $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",
+        addressNList: [2147483732, 2147483648, 2147483648],
+        curve: "secp256k1",
+        scriptType: core.BTCInputScriptType.SpendWitness,
       },
       {
-        addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 1],
-        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,
       },
       {
-        addressNList: [0x80000000 + 49, 0x80000000 + 0, 0x80000000 + 0],
-        curve: "secp256k1",
-        showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it
         coin: "Bitcoin",
-        scriptType: core.BTCInputScriptType.SpendP2SHWitness,
+        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,
       },
     ];
     const ltcGetPublicKeysInput = [
@@ -662,23 +662,23 @@ $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
       {
         addressNList: [2147483697, 2147483650, 2147483648],
         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
       {
         addressNList: [2147483692, 2147483650, 2147483648],
         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 = [
@@ -687,6 +687,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/examples/sandbox/package.json b/examples/sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-sandbox",
-  "version": "1.52.2",
+  "version": "1.52.4",
   "license": "MIT",
   "private": true,
   "browserslist": "> 0.5%, last 2 versions, not dead",
@@ -11,21 +11,21 @@
   },
   "dependencies": {
     "@metamask/eth-sig-util": "^7.0.0",
-    "@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.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",
     "eip-712": "^1.0.0",
     "ethereumjs-util": "^7.1.5",

diff --git a/integration/package.json b/integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/integration",
-  "version": "1.52.2",
+  "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.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.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
@@ -1,6 +1,6 @@
 {
   "lerna": "5.2.0",
-  "version": "1.52.2",
+  "version": "1.52.4",
   "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.2",
+  "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.2",
+    "@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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-core",
-  "version": "1.52.2",
+  "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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-keepkey-chromeusb",
-  "version": "1.52.2",
+  "version": "1.52.4",
   "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.4",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.4"
   }
 }
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.2",
+  "version": "1.52.4",
   "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.4",
     "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.2",
+  "version": "1.52.4",
   "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.4"
   },
   "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.2",
+  "version": "1.52.4",
   "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.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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-keepkey-tcp",
-  "version": "1.52.2",
+  "version": "1.52.4",
   "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.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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-keepkey-webusb",
-  "version": "1.52.2",
+  "version": "1.52.4",
   "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.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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-keepkey",
-  "version": "1.52.2",
+  "version": "1.52.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -20,7 +20,7 @@
     "@keepkey/device-protocol": "^7.12.2",
     "@metamask/eth-sig-util": "^7.0.0",
     "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2",
-    "@shapeshiftoss/hdwallet-core": "1.52.2",
+    "@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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-keplr",
-  "version": "1.52.2",
+  "version": "1.52.4",
   "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.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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-ledger-webhid",
-  "version": "1.52.2",
+  "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.2",
-    "@shapeshiftoss/hdwallet-ledger": "1.52.2",
+    "@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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-ledger-webusb",
-  "version": "1.52.2",
+  "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.2",
-    "@shapeshiftoss/hdwallet-ledger": "1.52.2",
+    "@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
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-ledger",
-  "version": "1.52.2",
+  "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.2",
+    "@shapeshiftoss/hdwallet-core": "1.52.4",
     "base64-js": "^1.5.1",
     "bchaddrjs": "^0.4.4",
     "bitcoinjs-message": "^2.0.0",