diff --git a/examples/sandbox/index.ts b/examples/sandbox/index.ts index 0e1e91325..6f7f9c7c2 100644 --- a/examples/sandbox/index.ts +++ b/examples/sandbox/index.ts @@ -255,7 +255,8 @@ $gridplus.on("click", async (e) => { window["pairingCodeEntered"] = async function () { const input = document.getElementById("#pairingCodeInput") as HTMLInputElement; document.getElementById("#pairingCodeModal").className = "modal"; - wallet = await gridplusAdapter.pairDevice(input.value); + const { wallet: gridplusWallet } = await gridplusAdapter.pairDevice(input.value); + wallet = gridplusWallet; window["wallet"] = wallet; $("#keyring select").val(await wallet.getDeviceID()); }; diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 1e815c059..3e2bc2006 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-sandbox", - "version": "1.62.15", + "version": "1.62.16", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -12,24 +12,24 @@ "dependencies": { "@esm2cjs/p-queue": "^7.3.0", "@metamask/eth-sig-util": "^7.0.0", - "@shapeshiftoss/hdwallet-coinbase": "1.62.15", - "@shapeshiftoss/hdwallet-core": "1.62.15", - "@shapeshiftoss/hdwallet-keepkey": "1.62.15", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.62.15", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.62.15", - "@shapeshiftoss/hdwallet-keplr": "1.62.15", - "@shapeshiftoss/hdwallet-ledger": "1.62.15", - "@shapeshiftoss/hdwallet-ledger-webhid": "1.62.15", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.62.15", - "@shapeshiftoss/hdwallet-metamask-multichain": "1.62.15", - "@shapeshiftoss/hdwallet-native": "1.62.15", - "@shapeshiftoss/hdwallet-phantom": "1.62.15", - "@shapeshiftoss/hdwallet-portis": "1.62.15", - "@shapeshiftoss/hdwallet-trezor": "1.62.15", - "@shapeshiftoss/hdwallet-trezor-connect": "1.62.15", - "@shapeshiftoss/hdwallet-vultisig": "1.62.15", - "@shapeshiftoss/hdwallet-walletconnect": "1.62.15", - "@shapeshiftoss/hdwallet-walletconnectv2": "1.62.15", + "@shapeshiftoss/hdwallet-coinbase": "1.62.16", + "@shapeshiftoss/hdwallet-core": "1.62.16", + "@shapeshiftoss/hdwallet-keepkey": "1.62.16", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.62.16", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.62.16", + "@shapeshiftoss/hdwallet-keplr": "1.62.16", + "@shapeshiftoss/hdwallet-ledger": "1.62.16", + "@shapeshiftoss/hdwallet-ledger-webhid": "1.62.16", + "@shapeshiftoss/hdwallet-ledger-webusb": "1.62.16", + "@shapeshiftoss/hdwallet-metamask-multichain": "1.62.16", + "@shapeshiftoss/hdwallet-native": "1.62.16", + "@shapeshiftoss/hdwallet-phantom": "1.62.16", + "@shapeshiftoss/hdwallet-portis": "1.62.16", + "@shapeshiftoss/hdwallet-trezor": "1.62.16", + "@shapeshiftoss/hdwallet-trezor-connect": "1.62.16", + "@shapeshiftoss/hdwallet-vultisig": "1.62.16", + "@shapeshiftoss/hdwallet-walletconnect": "1.62.16", + "@shapeshiftoss/hdwallet-walletconnectv2": "1.62.16", "bip32": "^2.0.4", "eip-712": "^1.0.0", "jquery": "^3.7.1", diff --git a/integration/package.json b/integration/package.json index a5fb3296d..185ec5db9 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.62.15", + "version": "1.62.16", "main": "index.js", "license": "MIT", "private": true, @@ -11,16 +11,16 @@ }, "dependencies": { "@bitcoinerlab/secp256k1": "^1.1.1", - "@shapeshiftoss/hdwallet-core": "1.62.15", - "@shapeshiftoss/hdwallet-keepkey": "1.62.15", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.62.15", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.62.15", - "@shapeshiftoss/hdwallet-ledger": "1.62.15", - "@shapeshiftoss/hdwallet-metamask-multichain": "1.62.15", - "@shapeshiftoss/hdwallet-native": "1.62.15", - "@shapeshiftoss/hdwallet-portis": "1.62.15", - "@shapeshiftoss/hdwallet-trezor": "1.62.15", - "@shapeshiftoss/hdwallet-vultisig": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", + "@shapeshiftoss/hdwallet-keepkey": "1.62.16", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.62.16", + "@shapeshiftoss/hdwallet-keepkey-tcp": "1.62.16", + "@shapeshiftoss/hdwallet-ledger": "1.62.16", + "@shapeshiftoss/hdwallet-metamask-multichain": "1.62.16", + "@shapeshiftoss/hdwallet-native": "1.62.16", + "@shapeshiftoss/hdwallet-portis": "1.62.16", + "@shapeshiftoss/hdwallet-trezor": "1.62.16", + "@shapeshiftoss/hdwallet-vultisig": "1.62.16", "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 d787c2f6d..3ac60cb98 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "5.2.0", - "version": "1.62.15", + "version": "1.62.16", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index ae13b334a..f097e8988 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", "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 540611ad3..ab8201c58 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-gridplus/package.json b/packages/hdwallet-gridplus/package.json index c8aaadff2..35b16c8ea 100644 --- a/packages/hdwallet-gridplus/package.json +++ b/packages/hdwallet-gridplus/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-gridplus", - "version": "1.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -20,7 +20,7 @@ "@ethereumjs/rlp": "5.0.2", "@ethereumjs/tx": "5.4.0", "@metamask/eth-sig-util": "^7.0.0", - "@shapeshiftoss/hdwallet-core": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", "bech32": "^1.1.4", "bs58": "^5.0.0", "crypto-js": "^4.2.0", diff --git a/packages/hdwallet-gridplus/src/adapter.ts b/packages/hdwallet-gridplus/src/adapter.ts index 476a4a63b..f8acea8d3 100644 --- a/packages/hdwallet-gridplus/src/adapter.ts +++ b/packages/hdwallet-gridplus/src/adapter.ts @@ -2,7 +2,7 @@ import * as core from "@shapeshiftoss/hdwallet-core"; import { createHash } from "crypto"; import { Client } from "gridplus-sdk"; -import { GridPlusHDWallet } from "./gridplus"; +import { GridPlusHDWallet, SafeCardType } from "./gridplus"; const name = "ShapeShift"; const baseUrl = "https://signing.gridpl.us"; @@ -20,9 +20,13 @@ export class GridPlusAdapter { return new GridPlusAdapter(keyring); } - public async connectDevice(deviceId: string, password = ""): Promise { + public async connectDevice( + deviceId: string, + expectedActiveWalletId?: string, + expectedType?: SafeCardType + ): Promise { const privKey = createHash("sha256") - .update(deviceId + password + name) + .update(deviceId + name) .digest(); if (!this.client) { @@ -34,10 +38,20 @@ export class GridPlusAdapter { } const isPaired = await this.client.connect(deviceId); - if (isPaired) return new GridPlusHDWallet(this.client); + if (!isPaired) return undefined; + + const wallet = new GridPlusHDWallet(this.client); + + if (expectedActiveWalletId) await wallet.validateActiveWallet(expectedActiveWalletId, expectedType); + + return wallet; } - public async pairDevice(pairingCode: string): Promise { + public async pairDevice(pairingCode: string): Promise<{ + wallet: GridPlusHDWallet; + activeWalletId: string; + type: SafeCardType; + }> { if (!this.client) throw new Error("No client connected. Call connectDevice first."); const success = await this.client.pair(pairingCode); @@ -46,6 +60,16 @@ export class GridPlusAdapter { const wallet = new GridPlusHDWallet(this.client); this.keyring.add(wallet, this.client.getDeviceId()); - return wallet; + const activeWallet = this.client.getActiveWallet(); + if (!activeWallet) throw new Error("No active wallet found on device"); + + const activeWalletId = activeWallet.uid.toString("hex"); + const type = activeWallet.external ? "external" : "internal"; + + return { + wallet, + activeWalletId, + type, + }; } } diff --git a/packages/hdwallet-gridplus/src/gridplus.ts b/packages/hdwallet-gridplus/src/gridplus.ts index cb88abdd6..bf563fb00 100644 --- a/packages/hdwallet-gridplus/src/gridplus.ts +++ b/packages/hdwallet-gridplus/src/gridplus.ts @@ -1,6 +1,7 @@ import * as core from "@shapeshiftoss/hdwallet-core"; import { Client, Constants } from "gridplus-sdk"; import isObject from "lodash/isObject"; +import { zeroHash } from "viem"; import * as btc from "./bitcoin"; import * as cosmos from "./cosmos"; @@ -9,7 +10,9 @@ import * as mayachain from "./mayachain"; import * as solana from "./solana"; import * as thorchain from "./thorchain"; -const ZERO_BUFFER = Buffer.alloc(32); +export type SafeCardType = "external" | "internal"; + +const isSafecardConnected = (uid?: Buffer): boolean => !!uid && `0x${uid.toString("hex")}` !== zeroHash; export function isGridPlus(wallet: core.HDWallet): wallet is GridPlusHDWallet { return isObject(wallet) && (wallet as any)._isGridPlus; @@ -299,12 +302,19 @@ export class GridPlusHDWallet readonly _isGridPlus = true; client: Client | undefined; + private expectedActiveWalletId?: string; + private expectedType?: SafeCardType; constructor(client: Client) { super(); this.client = client; } + public setExpectedActiveWalletId(activeWalletId: string, type?: SafeCardType): void { + this.expectedActiveWalletId = activeWalletId; + this.expectedType = type; + } + async cancel(): Promise {} async clearSession(): Promise {} async initialize(): Promise {} @@ -367,8 +377,45 @@ export class GridPlusHDWallet const { external, internal } = await this.client.fetchActiveWallet(); - if (!external.uid.equals(ZERO_BUFFER)) return external.uid.toString("hex"); - if (!internal.uid.equals(ZERO_BUFFER)) return internal.uid.toString("hex"); + if (isSafecardConnected(external.uid)) return external.uid.toString("hex"); + if (isSafecardConnected(internal.uid)) return internal.uid.toString("hex"); + } + + /** + * Validate that the currently active wallet matches expectations + * Throws if expectedActiveWalletId is provided and doesn't match + */ + public async validateActiveWallet( + expectedActiveWalletId?: string, + expectedType?: SafeCardType + ): Promise<{ + activeWalletId: string; + type: SafeCardType; + }> { + if (!this.client) throw new Error("Device not connected"); + + const activeWallets = await this.client.fetchActiveWallet(); + + // Determine active wallet type (external SafeCard takes priority) + const type: SafeCardType = (() => { + if (isSafecardConnected(activeWallets.external?.uid)) return "external"; + if (isSafecardConnected(activeWallets.internal?.uid)) return "internal"; + + throw new Error("No active wallet found on device"); + })(); + + const activeWallet = activeWallets[type]; + const activeWalletId = activeWallet.uid.toString("hex"); + + // Validate against expected activeWalletId if provided + if (expectedActiveWalletId && activeWalletId !== expectedActiveWalletId) { + if (expectedType === "internal") { + throw new Error("Remove inserted SafeCard to access internal GridPlus wallet"); + } + throw new Error("Active SafeCard doesn't match expected SafeCard"); + } + + return { activeWalletId, type }; } async getPublicKeys(msg: Array): Promise> { @@ -426,6 +473,9 @@ export class GridPlusHDWallet async btcSignTx(msg: core.BTCSignTx): Promise { if (!this.client) throw new Error("Device not connected"); + if (!this.expectedActiveWalletId) throw new Error("Expected SafeCard ID not set"); + + await this.validateActiveWallet(this.expectedActiveWalletId, this.expectedType); return btc.btcSignTx(this.client, msg); } @@ -444,16 +494,25 @@ export class GridPlusHDWallet async ethSignTx(msg: core.ETHSignTx): Promise { if (!this.client) throw new Error("Device not connected"); + if (!this.expectedActiveWalletId) throw new Error("Expected SafeCard ID not set"); + + await this.validateActiveWallet(this.expectedActiveWalletId, this.expectedType); return eth.ethSignTx(this.client, msg); } async ethSignTypedData(msg: core.ETHSignTypedData): Promise { if (!this.client) throw new Error("Device not connected"); + if (!this.expectedActiveWalletId) throw new Error("Expected SafeCard ID not set"); + + await this.validateActiveWallet(this.expectedActiveWalletId, this.expectedType); return eth.ethSignTypedData(this.client, msg); } async ethSignMessage(msg: core.ETHSignMessage): Promise { if (!this.client) throw new Error("Device not connected"); + if (!this.expectedActiveWalletId) throw new Error("Expected SafeCard ID not set"); + + await this.validateActiveWallet(this.expectedActiveWalletId, this.expectedType); return eth.ethSignMessage(this.client, msg); } @@ -480,6 +539,9 @@ export class GridPlusHDWallet async solanaSignTx(msg: core.SolanaSignTx): Promise { this.assertSolanaFwSupport(); + if (!this.expectedActiveWalletId) throw new Error("Expected SafeCard ID not set"); + + await this.validateActiveWallet(this.expectedActiveWalletId, this.expectedType); return solana.solanaSignTx(this.client, msg); } @@ -490,6 +552,9 @@ export class GridPlusHDWallet async cosmosSignTx(msg: core.CosmosSignTx): Promise { if (!this.client) throw new Error("Device not connected"); + if (!this.expectedActiveWalletId) throw new Error("Expected SafeCard ID not set"); + + await this.validateActiveWallet(this.expectedActiveWalletId, this.expectedType); return cosmos.cosmosSignTx(this.client, msg); } @@ -500,6 +565,9 @@ export class GridPlusHDWallet async thorchainSignTx(msg: core.ThorchainSignTx): Promise { if (!this.client) throw new Error("Device not connected"); + if (!this.expectedActiveWalletId) throw new Error("Expected SafeCard ID not set"); + + await this.validateActiveWallet(this.expectedActiveWalletId, this.expectedType); return thorchain.thorchainSignTx(this.client, msg); } @@ -510,6 +578,9 @@ export class GridPlusHDWallet async mayachainSignTx(msg: core.MayachainSignTx): Promise { if (!this.client) throw new Error("Device not connected"); + if (!this.expectedActiveWalletId) throw new Error("Expected SafeCard ID not set"); + + await this.validateActiveWallet(this.expectedActiveWalletId, this.expectedType); return mayachain.mayachainSignTx(this.client, msg); } } diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index 876f64216..2df0c50e6 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.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.62.15", - "@shapeshiftoss/hdwallet-keepkey": "1.62.15" + "@shapeshiftoss/hdwallet-core": "1.62.16", + "@shapeshiftoss/hdwallet-keepkey": "1.62.16" } } diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index 07206bfec..dca028743 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.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.62.15", + "@shapeshiftoss/hdwallet-keepkey": "1.62.16", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index b0c006354..1a013438e 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.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.62.15" + "@shapeshiftoss/hdwallet-keepkey": "1.62.16" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index ee167e15b..6883a70e5 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.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.62.15", - "@shapeshiftoss/hdwallet-keepkey": "1.62.15" + "@shapeshiftoss/hdwallet-core": "1.62.16", + "@shapeshiftoss/hdwallet-keepkey": "1.62.16" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index 29157c001..de80f2e70 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.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.62.15", - "@shapeshiftoss/hdwallet-keepkey": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", + "@shapeshiftoss/hdwallet-keepkey": "1.62.16", "axios": "^0.21.1" } } diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index 0af11fd8b..4990af9d2 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.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.62.15", - "@shapeshiftoss/hdwallet-keepkey": "1.62.15" + "@shapeshiftoss/hdwallet-core": "1.62.16", + "@shapeshiftoss/hdwallet-keepkey": "1.62.16" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4" diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index 317aa0def..96025ecf6 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -21,7 +21,7 @@ "@keepkey/device-protocol": "7.13.4", "@metamask/eth-sig-util": "^7.0.0", "@shapeshiftoss/bitcoinjs-lib": "7.0.0-shapeshift.0", - "@shapeshiftoss/hdwallet-core": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", "@shapeshiftoss/proto-tx-builder": "0.10.0", "bignumber.js": "^9.0.1", "bnb-javascript-sdk-nobroadcast": "2.16.15", diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json index b851588bd..56b5a54b4 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "@cosmjs/amino": "^0.28.13", "@cosmjs/stargate": "^0.28.13", "@shapeshiftoss/caip": "8.15.0", - "@shapeshiftoss/hdwallet-core": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", "@shapeshiftoss/proto-tx-builder": "0.10.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 1a468785f..9dcc23588 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.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -18,8 +18,8 @@ "@ledgerhq/hw-app-eth": "^6.45.13", "@ledgerhq/hw-transport": "6.31.8", "@ledgerhq/hw-transport-webhid": "^6.30.4", - "@shapeshiftoss/hdwallet-core": "1.62.15", - "@shapeshiftoss/hdwallet-ledger": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", + "@shapeshiftoss/hdwallet-ledger": "1.62.16", "@types/w3c-web-hid": "^1.0.2" } } diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index 9ffd8b870..ab1f806b2 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.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -20,8 +20,8 @@ "@ledgerhq/hw-app-solana": "^7.5.1", "@ledgerhq/hw-transport": "6.31.8", "@ledgerhq/hw-transport-webusb": "6.29.8", - "@shapeshiftoss/hdwallet-core": "1.62.15", - "@shapeshiftoss/hdwallet-ledger": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", + "@shapeshiftoss/hdwallet-ledger": "1.62.16", "@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 4f30a799b..a675f16d0 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -25,7 +25,7 @@ "@ledgerhq/hw-transport": "6.31.8", "@ledgerhq/logs": "6.13.0", "@shapeshiftoss/bitcoinjs-lib": "7.0.0-shapeshift.0", - "@shapeshiftoss/hdwallet-core": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", "@solana/web3.js": "1.95.8", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", diff --git a/packages/hdwallet-metamask-multichain/package.json b/packages/hdwallet-metamask-multichain/package.json index 8bd731eb4..1ebe0075f 100644 --- a/packages/hdwallet-metamask-multichain/package.json +++ b/packages/hdwallet-metamask-multichain/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask-multichain", - "version": "1.62.15", + "version": "1.62.16", "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.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", "@shapeshiftoss/metamask-snaps-adapter": "^1.0.12", "@shapeshiftoss/metamask-snaps-types": "^1.0.12", "eth-rpc-errors": "^4.0.3", diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index a79866991..55f2061ba 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.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@bitcoinerlab/secp256k1": "^1.1.1", - "@shapeshiftoss/hdwallet-native": "1.62.15", + "@shapeshiftoss/hdwallet-native": "1.62.16", "bip39": "^3.0.4", "hash-wasm": "^4.11.0", "idb-keyval": "^6.0.3", diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index 323c5fd28..063da0e51 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "@bitcoinerlab/secp256k1": "^1.1.1", "@noble/curves": "^1.4.0", "@shapeshiftoss/bitcoinjs-lib": "7.0.0-shapeshift.0", - "@shapeshiftoss/hdwallet-core": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", "@shapeshiftoss/proto-tx-builder": "0.10.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-phantom/package.json b/packages/hdwallet-phantom/package.json index 0b25d4c9d..325abe47f 100644 --- a/packages/hdwallet-phantom/package.json +++ b/packages/hdwallet-phantom/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-phantom", - "version": "1.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/bitcoinjs-lib": "7.0.0-shapeshift.0", - "@shapeshiftoss/hdwallet-core": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", "@solana/web3.js": "1.95.8", "base64-js": "^1.5.1", "bitcoinjs-message": "^2.0.0", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index e3cdd865d..976710029 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -16,7 +16,7 @@ "dependencies": { "@portis/web3": "3.0.10", "@shapeshiftoss/bitcoinjs-lib": "7.0.0-shapeshift.0", - "@shapeshiftoss/hdwallet-core": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-message": "^2.1.0", diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index cf5d0e639..9f97f261f 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.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.62.15", - "@shapeshiftoss/hdwallet-trezor": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", + "@shapeshiftoss/hdwallet-trezor": "1.62.16", "@trezor/connect-web": "^9.6.4" } } diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index 042fe58bb..a01342499 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "3.2.0", "@ethereumjs/tx": "4.2.0", - "@shapeshiftoss/hdwallet-core": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", "lodash": "^4.17.21" diff --git a/packages/hdwallet-vultisig/package.json b/packages/hdwallet-vultisig/package.json index d118403f9..91b718d84 100644 --- a/packages/hdwallet-vultisig/package.json +++ b/packages/hdwallet-vultisig/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-vultisig", - "version": "1.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "@cosmjs/amino": "^0.28.13", "@cosmjs/stargate": "^0.28.13", "@shapeshiftoss/bitcoinjs-lib": "7.0.0-shapeshift.0", - "@shapeshiftoss/hdwallet-core": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", "@solana/web3.js": "1.95.8", "base64-js": "^1.5.1", "bitcoinjs-message": "^2.0.0", diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index 7f5fe18f8..c9b412af7 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", "@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 3a90f6b0e..8d6d4a403 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.62.15", + "version": "1.62.16", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.62.15", + "@shapeshiftoss/hdwallet-core": "1.62.16", "@walletconnect/ethereum-provider": "^2.20.2", "@walletconnect/modal": "^2.6.2", "ethers": "^5.6.5"