Merge remote-tracking branch 'origin/master' into feat_unrug_snaps_in…

…tegrity
shapeshift · Oct 3, 2023 · f21593c · f21593c
2 parents 778b8c0 + b2d5707
commit f21593c
Show file tree

Hide file tree

Showing 50 changed files with 163 additions and 175 deletions.
diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-sandbox",
-  "version": "1.50.10",
+  "version": "1.51.0",
   "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.50.10",
-    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.50.10",
-    "@shapeshiftoss/hdwallet-keepkey-webusb": "1.50.10",
-    "@shapeshiftoss/hdwallet-keplr": "1.50.10",
-    "@shapeshiftoss/hdwallet-ledger": "1.50.10",
-    "@shapeshiftoss/hdwallet-ledger-webhid": "1.50.10",
-    "@shapeshiftoss/hdwallet-ledger-webusb": "1.50.10",
-    "@shapeshiftoss/hdwallet-metamask": "1.50.10",
-    "@shapeshiftoss/hdwallet-native": "1.50.10",
-    "@shapeshiftoss/hdwallet-portis": "1.50.10",
-    "@shapeshiftoss/hdwallet-tallyho": "1.50.10",
-    "@shapeshiftoss/hdwallet-trezor": "1.50.10",
-    "@shapeshiftoss/hdwallet-trezor-connect": "1.50.10",
-    "@shapeshiftoss/hdwallet-walletconnect": "1.50.10",
-    "@shapeshiftoss/hdwallet-xdefi": "1.50.10",
+    "@shapeshiftoss/hdwallet-core": "1.51.0",
+    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.51.0",
+    "@shapeshiftoss/hdwallet-keepkey-webusb": "1.51.0",
+    "@shapeshiftoss/hdwallet-keplr": "1.51.0",
+    "@shapeshiftoss/hdwallet-ledger": "1.51.0",
+    "@shapeshiftoss/hdwallet-ledger-webhid": "1.51.0",
+    "@shapeshiftoss/hdwallet-ledger-webusb": "1.51.0",
+    "@shapeshiftoss/hdwallet-metamask": "1.51.0",
+    "@shapeshiftoss/hdwallet-native": "1.51.0",
+    "@shapeshiftoss/hdwallet-portis": "1.51.0",
+    "@shapeshiftoss/hdwallet-tallyho": "1.51.0",
+    "@shapeshiftoss/hdwallet-trezor": "1.51.0",
+    "@shapeshiftoss/hdwallet-trezor-connect": "1.51.0",
+    "@shapeshiftoss/hdwallet-walletconnect": "1.51.0",
+    "@shapeshiftoss/hdwallet-xdefi": "1.51.0",
     "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.50.10",
+  "version": "1.51.0",
   "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.50.10",
-    "@shapeshiftoss/hdwallet-keepkey": "1.50.10",
-    "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.50.10",
-    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.50.10",
-    "@shapeshiftoss/hdwallet-ledger": "1.50.10",
-    "@shapeshiftoss/hdwallet-native": "1.50.10",
-    "@shapeshiftoss/hdwallet-portis": "1.50.10",
-    "@shapeshiftoss/hdwallet-trezor": "1.50.10",
-    "@shapeshiftoss/hdwallet-xdefi": "1.50.10",
+    "@shapeshiftoss/hdwallet-core": "1.51.0",
+    "@shapeshiftoss/hdwallet-keepkey": "1.51.0",
+    "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.51.0",
+    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.51.0",
+    "@shapeshiftoss/hdwallet-ledger": "1.51.0",
+    "@shapeshiftoss/hdwallet-native": "1.51.0",
+    "@shapeshiftoss/hdwallet-portis": "1.51.0",
+    "@shapeshiftoss/hdwallet-trezor": "1.51.0",
+    "@shapeshiftoss/hdwallet-xdefi": "1.51.0",
     "fast-json-stable-stringify": "^2.1.0",
     "msw": "^0.27.1",
     "whatwg-fetch": "^3.6.2"

diff --git a/integration/src/ethereum/ethereum.ts b/integration/src/ethereum/ethereum.ts
@@ -396,7 +396,7 @@ export function ethereumTests(get: () => { wallet: core.HDWallet; info: core.HDW
         if (ledger.isLedger(wallet)) return; // FIXME: Expected failure
         const res = await wallet.ethSignMessage({
           addressNList: core.bip32ToAddressNList("m/44'/60'/0'/0/0"),
-          message: "Hello World",
+          message: "0x48656c6c6f20576f726c64", // "Hello World",
         });
         expect(res?.address).toEqual("0x3f2329C9ADFbcCd9A84f52c906E936A42dA18CB8");
         expect(res?.signature).toEqual(

diff --git a/integration/src/wallets/metamask.ts b/integration/src/wallets/metamask.ts
@@ -18,7 +18,7 @@ export async function createWallet(): Promise<core.HDWallet> {
         case "personal_sign": {
           const [message] = params;
 
-          if (message === "48656c6c6f20576f726c64")
+          if (message === "48656c6c6f20576f726c64" || message === "0x48656c6c6f20576f726c64")
             return "0x29f7212ecc1c76cea81174af267b67506f754ea8c73f144afa900a0d85b24b21319621aeb062903e856352f38305710190869c3ce5a1425d65ef4fa558d0fc251b";
 
           throw new Error("unknown message");
@@ -161,7 +161,7 @@ export function selfTest(get: () => core.HDWallet): void {
     if (!wallet) return;
     const res = await wallet.ethSignMessage({
       addressNList: core.bip32ToAddressNList("m/44'/60'/0'/0/0"),
-      message: "Hello World",
+      message: "0x48656c6c6f20576f726c64", // "Hello World"
     });
     expect(res?.address).toEqual("0x3f2329C9ADFbcCd9A84f52c906E936A42dA18CB8");
     expect(res?.signature).toEqual(

diff --git a/integration/src/wallets/trezor.ts b/integration/src/wallets/trezor.ts
@@ -112,7 +112,7 @@ export class MockTransport extends trezor.TrezorTransport {
       "ethereumSignMessage",
       {
         path: [2147483692, 2147483708, 2147483648, 0, 0],
-        message: "Hello World",
+        message: "0x48656c6c6f20576f726c64", // "Hello World"
       },
       {
         success: true,

diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "lerna": "5.2.0",
-  "version": "1.50.10",
+  "version": "1.51.0",
   "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.50.10",
+  "version": "1.51.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@coinbase/wallet-sdk": "^3.6.6",
-    "@shapeshiftoss/hdwallet-core": "1.50.10",
+    "@shapeshiftoss/hdwallet-core": "1.51.0",
     "eth-rpc-errors": "^4.0.3",
     "lodash": "^4.17.21"
   },

diff --git a/packages/hdwallet-coinbase/src/coinbase.test.ts b/packages/hdwallet-coinbase/src/coinbase.test.ts
@@ -51,7 +51,7 @@ describe("CoinbaseHDWallet", () => {
         }`
       ),
     } as any;
-    const msg = "super secret message";
+    const msg = "0x737570657220736563726574206d657373616765"; // super secret message
     expect(
       await wallet.ethSignMessage({
         addressNList: core.bip32ToAddressNList("m/44'/60'/0'/0/0"),
@@ -73,7 +73,7 @@ describe("CoinbaseHDWallet", () => {
       request: jest.fn().mockRejectedValue(new Error("An Error has occurred")),
     } as any;
 
-    const msg = "super secret message";
+    const msg = "0x737570657220736563726574206d657373616765"; // super secret message
     const sig = await wallet.ethSignMessage({
       addressNList: core.bip32ToAddressNList("m/44'/60'/0'/0/0"),
       message: msg,
@@ -87,7 +87,7 @@ describe("CoinbaseHDWallet", () => {
       request: jest.fn().mockReturnValue(["0x73d0385F4d8E00C5e6504C6030F47BF6212736A8"]),
     } as any;
 
-    const msg = "super secret message";
+    const msg = "0x737570657220736563726574206d657373616765"; // super secret message
     const sig = await wallet.ethSignMessage({
       addressNList: core.bip32ToAddressNList("m/44'/60'/0'/0/0"),
       message: msg,

diff --git a/packages/hdwallet-coinbase/src/ethereum.ts b/packages/hdwallet-coinbase/src/ethereum.ts
@@ -1,6 +1,6 @@
 import * as core from "@shapeshiftoss/hdwallet-core";
 import { ETHSignedMessage } from "@shapeshiftoss/hdwallet-core";
-import * as ethers from "ethers";
+import { isHexString } from "ethers/lib/utils";
 
 export function describeETHPath(path: core.BIP32Path): core.PathDescription {
   return core.describeETHPath(path);
@@ -86,12 +86,10 @@ export async function ethSignMessage(
   address: string
 ): Promise<core.ETHSignedMessage | null> {
   try {
-    const buffer = ethers.utils.isBytes(msg.message)
-      ? Buffer.from(ethers.utils.arrayify(msg.message))
-      : Buffer.from(msg.message);
+    if (!isHexString(msg.message)) throw new Error("data is not an hex string");
     const signedMsg = await ethereum.request({
       method: "personal_sign",
-      params: [buffer.toString("hex"), address],
+      params: [msg, address],
     });
 
     return {

diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-core",
-  "version": "1.50.10",
+  "version": "1.51.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"

diff --git a/packages/hdwallet-core/src/ethereum.ts b/packages/hdwallet-core/src/ethereum.ts
@@ -94,7 +94,7 @@ export interface ETHSignedTx {
 
 export interface ETHSignMessage {
   addressNList: BIP32Path;
-  message: string | Bytes;
+  message: string;
 }
 
 export interface ETHSignedMessage {

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.50.10",
+  "version": "1.51.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.50.10",
-    "@shapeshiftoss/hdwallet-keepkey": "1.50.10"
+    "@shapeshiftoss/hdwallet-core": "1.51.0",
+    "@shapeshiftoss/hdwallet-keepkey": "1.51.0"
   }
 }
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.50.10",
+  "version": "1.51.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-keepkey": "1.50.10",
+    "@shapeshiftoss/hdwallet-keepkey": "1.51.0",
     "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.50.10",
+  "version": "1.51.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-keepkey": "1.50.10"
+    "@shapeshiftoss/hdwallet-keepkey": "1.51.0"
   },
   "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.50.10",
+  "version": "1.51.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,8 +14,8 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.50.10",
-    "@shapeshiftoss/hdwallet-keepkey": "1.50.10"
+    "@shapeshiftoss/hdwallet-core": "1.51.0",
+    "@shapeshiftoss/hdwallet-keepkey": "1.51.0"
   },
   "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.50.10",
+  "version": "1.51.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,8 +14,8 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.50.10",
-    "@shapeshiftoss/hdwallet-keepkey": "1.50.10",
+    "@shapeshiftoss/hdwallet-core": "1.51.0",
+    "@shapeshiftoss/hdwallet-keepkey": "1.51.0",
     "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.50.10",
+  "version": "1.51.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,8 +14,8 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.50.10",
-    "@shapeshiftoss/hdwallet-keepkey": "1.50.10"
+    "@shapeshiftoss/hdwallet-core": "1.51.0",
+    "@shapeshiftoss/hdwallet-keepkey": "1.51.0"
   },
   "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.50.10",
+  "version": "1.51.0",
   "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.50.10",
+    "@shapeshiftoss/hdwallet-core": "1.51.0",
     "@shapeshiftoss/proto-tx-builder": "^0.8.0",
     "bignumber.js": "^9.0.1",
     "bnb-javascript-sdk-nobroadcast": "^2.16.14",

diff --git a/packages/hdwallet-keepkey/src/ethereum.ts b/packages/hdwallet-keepkey/src/ethereum.ts
@@ -173,12 +173,10 @@ export async function ethGetAddress(transport: Transport, msg: core.ETHGetAddres
 
 export async function ethSignMessage(transport: Transport, msg: core.ETHSignMessage): Promise<core.ETHSignedMessage> {
   const { addressNList, message } = msg;
+  if (!ethers.utils.isHexString(message)) throw new Error("data is not an hex string");
   const m = new Ethereum.EthereumSignMessage();
   m.setAddressNList(addressNList);
-  const messageBytes =
-    typeof message === "string" && !ethers.utils.isHexString(message)
-      ? ethers.utils.toUtf8Bytes(message)
-      : ethers.utils.arrayify(message);
+  const messageBytes = ethers.utils.arrayify(message);
   m.setMessage(messageBytes);
   const response = await transport.call(Messages.MessageType.MESSAGETYPE_ETHEREUMSIGNMESSAGE, m, {
     msgTimeout: core.LONG_TIMEOUT,

diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-keplr",
-  "version": "1.50.10",
+  "version": "1.51.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@shapeshiftoss/caip": "8.15.0",
-    "@shapeshiftoss/hdwallet-core": "1.50.10",
+    "@shapeshiftoss/hdwallet-core": "1.51.0",
     "@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.50.10",
+  "version": "1.51.0",
   "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.50.10",
-    "@shapeshiftoss/hdwallet-ledger": "1.50.10",
+    "@shapeshiftoss/hdwallet-core": "1.51.0",
+    "@shapeshiftoss/hdwallet-ledger": "1.51.0",
     "@types/w3c-web-hid": "^1.0.2"
   },
   "devDependencies": {