perf: don't import * as ethers (#651)

shapeshift · Oct 25, 2023 · de3593e · de3593e · vercel · Oct 25, 2023
1 parent 11727c2
commit de3593e
Show file tree

Hide file tree

Showing 38 changed files with 153 additions and 145 deletions.
diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-sandbox",
-  "version": "1.52.9",
+  "version": "1.52.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.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",
+    "@shapeshiftoss/hdwallet-core": "1.52.10",
+    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.10",
+    "@shapeshiftoss/hdwallet-keepkey-webusb": "1.52.10",
+    "@shapeshiftoss/hdwallet-keplr": "1.52.10",
+    "@shapeshiftoss/hdwallet-ledger": "1.52.10",
+    "@shapeshiftoss/hdwallet-ledger-webhid": "1.52.10",
+    "@shapeshiftoss/hdwallet-ledger-webusb": "1.52.10",
+    "@shapeshiftoss/hdwallet-metamask": "1.52.10",
+    "@shapeshiftoss/hdwallet-native": "1.52.10",
+    "@shapeshiftoss/hdwallet-portis": "1.52.10",
+    "@shapeshiftoss/hdwallet-tallyho": "1.52.10",
+    "@shapeshiftoss/hdwallet-trezor": "1.52.10",
+    "@shapeshiftoss/hdwallet-trezor-connect": "1.52.10",
+    "@shapeshiftoss/hdwallet-walletconnect": "1.52.10",
+    "@shapeshiftoss/hdwallet-xdefi": "1.52.10",
     "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.9",
+  "version": "1.52.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.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",
+    "@shapeshiftoss/hdwallet-core": "1.52.10",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.10",
+    "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.52.10",
+    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.52.10",
+    "@shapeshiftoss/hdwallet-ledger": "1.52.10",
+    "@shapeshiftoss/hdwallet-native": "1.52.10",
+    "@shapeshiftoss/hdwallet-portis": "1.52.10",
+    "@shapeshiftoss/hdwallet-trezor": "1.52.10",
+    "@shapeshiftoss/hdwallet-xdefi": "1.52.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
@@ -1,6 +1,6 @@
 {
   "lerna": "5.2.0",
-  "version": "1.52.9",
+  "version": "1.52.10",
   "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.9",
+  "version": "1.52.10",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@coinbase/wallet-sdk": "^3.6.6",
-    "@shapeshiftoss/hdwallet-core": "1.52.9",
+    "@shapeshiftoss/hdwallet-core": "1.52.10",
     "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.9",
+  "version": "1.52.10",
   "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.9",
+  "version": "1.52.10",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.9",
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.9"
+    "@shapeshiftoss/hdwallet-core": "1.52.10",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.10"
   }
 }
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.9",
+  "version": "1.52.10",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.9",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.10",
     "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.9",
+  "version": "1.52.10",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.9"
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.10"
   },
   "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.9",
+  "version": "1.52.10",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,8 +14,8 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.9",
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.9"
+    "@shapeshiftoss/hdwallet-core": "1.52.10",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.10"
   },
   "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.9",
+  "version": "1.52.10",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,8 +14,8 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.9",
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.9",
+    "@shapeshiftoss/hdwallet-core": "1.52.10",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.10",
     "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.9",
+  "version": "1.52.10",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -14,8 +14,8 @@
     "prepublishOnly": "yarn clean && yarn build"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.52.9",
-    "@shapeshiftoss/hdwallet-keepkey": "1.52.9"
+    "@shapeshiftoss/hdwallet-core": "1.52.10",
+    "@shapeshiftoss/hdwallet-keepkey": "1.52.10"
   },
   "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.9",
+  "version": "1.52.10",
   "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.9",
+    "@shapeshiftoss/hdwallet-core": "1.52.10",
     "@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
@@ -6,7 +6,7 @@ import * as Types from "@keepkey/device-protocol/lib/types_pb";
 import * as core from "@shapeshiftoss/hdwallet-core";
 import { getMessage, getTypeHash } from "eip-712";
 import * as eip55 from "eip55";
-import * as ethers from "ethers";
+import { arrayify, isBytes, isHexString } from "ethers/lib/utils.js";
 
 import { Transport } from "./transport";
 import { toUTF8Array } from "./utils";
@@ -173,10 +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");
+  if (!isHexString(message)) throw new Error("data is not an hex string");
   const m = new Ethereum.EthereumSignMessage();
   m.setAddressNList(addressNList);
-  const messageBytes = ethers.utils.arrayify(message);
+  const messageBytes = arrayify(message);
   m.setMessage(messageBytes);
   const response = await transport.call(Messages.MessageType.MESSAGETYPE_ETHEREUMSIGNMESSAGE, m, {
     msgTimeout: core.LONG_TIMEOUT,
@@ -272,7 +272,7 @@ export async function ethVerifyMessage(transport: Transport, msg: core.ETHVerify
   const m = new Ethereum.EthereumVerifyMessage();
   m.setAddress(core.arrayify(msg.address));
   m.setSignature(core.arrayify(msg.signature));
-  m.setMessage(ethers.utils.isBytes(msg.message) ? ethers.utils.arrayify(msg.message) : toUTF8Array(msg.message));
+  m.setMessage(isBytes(msg.message) ? arrayify(msg.message) : toUTF8Array(msg.message));
   let event: core.Event;
   try {
     event = await transport.call(Messages.MessageType.MESSAGETYPE_ETHEREUMVERIFYMESSAGE, m, {

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.9",
+  "version": "1.52.10",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@shapeshiftoss/caip": "8.15.0",
-    "@shapeshiftoss/hdwallet-core": "1.52.9",
+    "@shapeshiftoss/hdwallet-core": "1.52.10",
     "@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.9",
+  "version": "1.52.10",
   "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.9",
-    "@shapeshiftoss/hdwallet-ledger": "1.52.9",
+    "@shapeshiftoss/hdwallet-core": "1.52.10",
+    "@shapeshiftoss/hdwallet-ledger": "1.52.10",
     "@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.9",
+  "version": "1.52.10",
   "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.9",
-    "@shapeshiftoss/hdwallet-ledger": "1.52.9",
+    "@shapeshiftoss/hdwallet-core": "1.52.10",
+    "@shapeshiftoss/hdwallet-ledger": "1.52.10",
     "@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.9",
+  "version": "1.52.10",
   "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.9",
+    "@shapeshiftoss/hdwallet-core": "1.52.10",
     "base64-js": "^1.5.1",
     "bchaddrjs": "^0.4.4",
     "bitcoinjs-message": "^2.0.0",

diff --git a/packages/hdwallet-ledger/src/ethereum.ts b/packages/hdwallet-ledger/src/ethereum.ts
@@ -6,7 +6,7 @@ import EthereumTx from "ethereumjs-tx";
 // @ts-ignore
 // TODO: fix ts-ignore
 import * as ethereumUtil from "ethereumjs-util";
-import * as ethers from "ethers";
+import { arrayify, isBytes } from "ethers/lib/utils.js";
 import { isHexString } from "ethjs-util";
 
 import { LedgerTransport } from "./transport";
@@ -189,9 +189,7 @@ export async function ethVerifyMessage(msg: core.ETHVerifyMessage): Promise<bool
     return false;
   }
   sigb[64] = sigb[64] === 0 || sigb[64] === 1 ? sigb[64] + 27 : sigb[64];
-  const buffer = ethers.utils.isBytes(msg.message)
-    ? Buffer.from(ethers.utils.arrayify(msg.message))
-    : Buffer.from(msg.message);
+  const buffer = isBytes(msg.message) ? Buffer.from(arrayify(msg.message)) : Buffer.from(msg.message);
   const hash = ethereumUtil.hashPersonalMessage(buffer);
   const pubKey = ethereumUtil.ecrecover(hash, sigb[64], sigb.slice(0, 32), sigb.slice(32, 64));
 

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.9",
+  "version": "1.52.10",
   "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.9",
+    "@shapeshiftoss/hdwallet-core": "1.52.10",
     "@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-shapeshift-multichain/src/adapter.ts b/packages/hdwallet-metamask-shapeshift-multichain/src/adapter.ts
@@ -2,7 +2,7 @@ import detectEthereumProvider from "@metamask/detect-provider";
 import MetaMaskOnboarding from "@metamask/onboarding";
 import * as core from "@shapeshiftoss/hdwallet-core";
 import { enableShapeShiftSnap, shapeShiftSnapInstalled } from "@shapeshiftoss/metamask-snaps-adapter";
-import * as ethers from "ethers";
+import { providers } from "ethers";
 
 import { SNAP_ID } from "./common";
 import { MetaMaskShapeShiftMultiChainHDWallet } from "./shapeshift-multichain";
@@ -29,7 +29,7 @@ export class MetaMaskAdapter {
       mustBeMetaMask: true,
       silent: false,
       timeout: 3000,
-    })) as ethers.providers.ExternalProvider | null;
+    })) as providers.ExternalProvider | null;
     if (!provider) {
       const onboarding = new MetaMaskOnboarding();
       onboarding.startOnboarding();