From 533c1b1e6b799fc1d48f81e4f9276d797ca4d701 Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Mon, 11 Sep 2023 10:42:51 +1000 Subject: [PATCH 01/18] chore: wcv2 skeleton --- .../hdwallet-walletconnectV2/package.json | 27 + .../hdwallet-walletconnectV2/src/adapter.ts | 45 ++ .../hdwallet-walletconnectV2/src/ethereum.ts | 76 ++ .../hdwallet-walletconnectV2/src/index.ts | 2 + .../src/walletconnect.ts | 400 ++++++++++ .../hdwallet-walletconnectV2/tsconfig.json | 11 + yarn.lock | 729 +++++++++++++++++- 7 files changed, 1288 insertions(+), 2 deletions(-) create mode 100644 packages/hdwallet-walletconnectV2/package.json create mode 100644 packages/hdwallet-walletconnectV2/src/adapter.ts create mode 100644 packages/hdwallet-walletconnectV2/src/ethereum.ts create mode 100644 packages/hdwallet-walletconnectV2/src/index.ts create mode 100644 packages/hdwallet-walletconnectV2/src/walletconnect.ts create mode 100644 packages/hdwallet-walletconnectV2/tsconfig.json diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json new file mode 100644 index 000000000..e7d894b75 --- /dev/null +++ b/packages/hdwallet-walletconnectV2/package.json @@ -0,0 +1,27 @@ +{ + "name": "@shapeshiftoss/hdwallet-walletconnectv2", + "version": "1.50.4", + "license": "MIT", + "publishConfig": { + "access": "public" + }, + "main": "dist/index.js", + "source": "src/index.ts", + "types": "dist/index.d.ts", + "scripts": { + "build": "tsc --build", + "clean": "rm -rf dist tsconfig.tsbuildinfo", + "dev": "yarn tsc --build --watch", + "prepublishOnly": "yarn clean && yarn build" + }, + "dependencies": { + "@shapeshiftoss/hdwallet-core": "1.50.4", + "@walletconnect/ethereum-provider": "^2.10.0", + "@walletconnect/modal": "^2.6.1", + "ethers": "^5.6.5" + }, + "devDependencies": { + "@walletconnect/types": "^2.10.0", + "typescript": "^5.2.2" + } +} diff --git a/packages/hdwallet-walletconnectV2/src/adapter.ts b/packages/hdwallet-walletconnectV2/src/adapter.ts new file mode 100644 index 000000000..f63d51027 --- /dev/null +++ b/packages/hdwallet-walletconnectV2/src/adapter.ts @@ -0,0 +1,45 @@ +import * as core from "@shapeshiftoss/hdwallet-core"; +import { EthereumProvider } from "@walletconnect/ethereum-provider"; +import { EthereumProviderOptions } from "@walletconnect/ethereum-provider/dist/types/EthereumProvider"; +import { WalletConnectV2HDWallet } from "hdwallet-walletconnectV2/src/walletconnect"; + +// import { WalletConnectV2HDWallet } from "./walletconnect"; + +export class WalletConnectV2Adapter { + keyring: core.Keyring; + private readonly providerConfig: EthereumProviderOptions; + + private constructor(keyring: core.Keyring, config: EthereumProviderOptions) { + this.keyring = keyring; + this.providerConfig = config; + } + + public static useKeyring(keyring: core.Keyring, config: EthereumProviderOptions) { + return new WalletConnectV2Adapter(keyring, config); + } + + public async initialize(): Promise { + return Object.keys(this.keyring.wallets).length; + } + + public async pairDevice(): Promise { + try { + if (!this.providerConfig) { + throw new Error("WalletConnectV2 provider configuration not set."); + } + + const provider = await EthereumProvider.init(this.providerConfig); + const wallet = new WalletConnectV2HDWallet(provider); + + // Enable session (triggers QR Code modal) + await wallet.initialize(); + const deviceID = await wallet.getDeviceID(); + this.keyring.add(wallet, deviceID); + this.keyring.emit(["WalletConnect", deviceID, core.Events.CONNECT], deviceID); + return wallet; + } catch (error) { + console.error("Could not pair WalletConnect"); + throw error; + } + } +} diff --git a/packages/hdwallet-walletconnectV2/src/ethereum.ts b/packages/hdwallet-walletconnectV2/src/ethereum.ts new file mode 100644 index 000000000..af310ebf7 --- /dev/null +++ b/packages/hdwallet-walletconnectV2/src/ethereum.ts @@ -0,0 +1,76 @@ +import * as core from "@shapeshiftoss/hdwallet-core"; +import * as ethers from "ethers"; + +export function describeETHPath(path: core.BIP32Path): core.PathDescription { + const pathStr = core.addressNListToBIP32(path); + const unknown: core.PathDescription = { + verbose: pathStr, + coin: "Ethereum", + isKnown: false, + }; + + if (path.length !== 5) return unknown; + + if (path[0] !== 0x80000000 + 44) return unknown; + + if (path[1] !== 0x80000000 + core.slip44ByCoin("Ethereum")) return unknown; + + if ((path[2] & 0x80000000) >>> 0 !== 0x80000000) return unknown; + + if (path[3] !== 0) return unknown; + + if (path[4] !== 0) return unknown; + + const index = path[2] & 0x7fffffff; + return { + verbose: `Ethereum Account #${index}`, + accountIdx: index, + wholeAccount: true, + coin: "Ethereum", + isKnown: true, + }; +} + +export async function ethSignTx( + args: core.ETHSignTx & { from: string }, + provider: any +): Promise { + return await provider.wc.signTransaction(args); +} + +export async function ethSendTx( + args: core.ETHSignTx & { from: string }, + provider: any +): Promise { + const txHash: string = await provider.wc.sendTransaction(args); + return txHash + ? { + hash: txHash, + } + : null; +} + +export async function ethSignMessage( + args: { data: string | ethers.Bytes; fromAddress: string }, + provider: any +): Promise { + const buffer = ethers.utils.isBytes(args.data) + ? Buffer.from(ethers.utils.arrayify(args.data)) + : Buffer.from(args.data); + return await provider.wc.signMessage([buffer.toString("hex"), args.fromAddress]); +} + +export async function ethGetAddress(provider: any): Promise { + try { + if (!(provider && provider.request && provider.connected)) { + throw new Error("No WalletConnect provider available."); + } + const ethAccounts = await provider.request({ + method: "eth_accounts", + }); + return ethAccounts[0]; + } catch (error) { + console.error(error); + return null; + } +} diff --git a/packages/hdwallet-walletconnectV2/src/index.ts b/packages/hdwallet-walletconnectV2/src/index.ts new file mode 100644 index 000000000..caab58802 --- /dev/null +++ b/packages/hdwallet-walletconnectV2/src/index.ts @@ -0,0 +1,2 @@ +export * from "./adapter"; +export * from "./walletconnect"; diff --git a/packages/hdwallet-walletconnectV2/src/walletconnect.ts b/packages/hdwallet-walletconnectV2/src/walletconnect.ts new file mode 100644 index 000000000..e3cb1b59e --- /dev/null +++ b/packages/hdwallet-walletconnectV2/src/walletconnect.ts @@ -0,0 +1,400 @@ +import * as core from "@shapeshiftoss/hdwallet-core"; +import EthereumProvider from "@walletconnect/ethereum-provider"; +import { ProviderInfo } from "@walletconnect/ethereum-provider/dist/types/types"; +import isObject from "lodash/isObject"; + +import * as eth from "./ethereum"; + +interface WCState { + connected?: boolean; + chainId: number; + accounts?: string[]; + address?: string; +} + +export function isWalletConnect(wallet: core.HDWallet): wallet is WalletConnectV2HDWallet { + return isObject(wallet) && (wallet as any)._isWalletConnect; +} + +/** + * WalletConnect Wallet Info + * + * Supported JSON-RPC API Methods: + * - personal_sign + * - eth_sign + * - eth_signTypedData + * - eth_sendTransaction + * - eth_signTransaction + * 🚧 eth_sendRawTransaction + * @see https://docs.walletconnect.com/ + */ +export class WalletConnectV2WalletInfo implements core.HDWalletInfo, core.ETHWalletInfo { + readonly _supportsETHInfo = true; + readonly _supportsBTCInfo = false; + public getVendor(): string { + return "WalletConnectV2"; + } + + public hasOnDevicePinEntry(): boolean { + return false; + } + + public hasOnDevicePassphrase(): boolean { + return false; + } + + public hasOnDeviceDisplay(): boolean { + return false; + } + + public hasOnDeviceRecovery(): boolean { + return false; + } + + public hasNativeShapeShift(): boolean { + return false; + } + + public supportsBip44Accounts(): boolean { + return false; + } + + public supportsOfflineSigning(): boolean { + return false; + } + + public supportsBroadcast(): boolean { + return true; + } + + public describePath(msg: core.DescribePath): core.PathDescription { + switch (msg.coin) { + case "Ethereum": + return eth.describeETHPath(msg.path); + default: + throw new Error("Unsupported path"); + } + } + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + public ethNextAccountPath(_msg: core.ETHAccountPath): core.ETHAccountPath | undefined { + return undefined; + } + + public async ethSupportsNetwork(chainId = 1): Promise { + return chainId === 1; + } + + public async ethSupportsSecureTransfer(): Promise { + return false; + } + + public ethSupportsNativeShapeShift(): boolean { + return false; + } + + public async ethSupportsEIP1559(): Promise { + return false; + } + + public ethGetAccountPaths(msg: core.ETHGetAccountPath): Array { + const slip44 = core.slip44ByCoin(msg.coin); + if (slip44 === undefined) return []; + return [ + { + addressNList: [0x80000000 + 44, 0x80000000 + slip44, 0x80000000 + msg.accountIdx, 0, 0], + hardenedPath: [0x80000000 + 44, 0x80000000 + slip44, 0x80000000 + msg.accountIdx], + relPath: [0, 0], + description: "WalletConnectV2", + }, + ]; + } +} + +export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { + readonly _supportsETH = true; + readonly _supportsETHInfo = true; + readonly _supportsBTCInfo = false; + readonly _supportsBTC = false; + readonly _isWalletConnect = true; + readonly _supportsEthSwitchChain = false; + readonly _supportsAvalanche = false; + readonly _supportsOptimism = false; + readonly _supportsBSC = false; + readonly _supportsPolygon = false; + readonly _supportsGnosis = false; + + info: WalletConnectV2WalletInfo & core.HDWalletInfo; + provider: EthereumProvider; + connected = false; + chainId = -1; + accounts: string[] = []; + ethAddress = ""; + + constructor(provider: EthereumProvider) { + this.provider = provider; + this.info = new WalletConnectV2WalletInfo(); + } + + async getFeatures(): Promise> { + return {}; + } + + public async isLocked(): Promise { + return false; + } + + public getVendor(): string { + return "WalletConnectV2"; + } + + public async getModel(): Promise { + return "WalletConnectV2"; + } + + public async getLabel(): Promise { + return "WalletConnectV2"; + } + + public async initialize(): Promise { + /** Subscribe to EIP-1193 events */ + this.provider.on("session_event", async (args) => { + // const { chainId, event } = args.params; + // this.onSessionUpdate(chainId); + }); + + /** Note that this event does not fire on page reload */ + this.provider.on("connect", (args) => { + this.onConnect(args); + }); + + this.provider.on("disconnect", (error) => { + if (error) { + throw error; + } + this.onDisconnect(); + }); + + /** Display QR modal to connect */ + await this.provider.enable(); + } + + public hasOnDevicePinEntry(): boolean { + return this.info.hasOnDevicePinEntry(); + } + + public hasOnDevicePassphrase(): boolean { + return this.info.hasOnDevicePassphrase(); + } + + public hasOnDeviceDisplay(): boolean { + return this.info.hasOnDeviceDisplay(); + } + + public hasOnDeviceRecovery(): boolean { + return this.info.hasOnDeviceRecovery(); + } + + public hasNativeShapeShift(srcCoin: core.Coin, dstCoin: core.Coin): boolean { + return this.info.hasNativeShapeShift(srcCoin, dstCoin); + } + + public supportsBip44Accounts(): boolean { + return this.info.supportsBip44Accounts(); + } + + /** + * Supports Offline Signing + * + * Offline signing is supported when `signTransaction` does not broadcast + * the tx message. WalletConnect's core Connector implementation always + * makes a request, so offline signing is not supported. + * @see https://github.com/WalletConnect/walletconnect-monorepo/blob/7573fa9e1d91588d4af3409159b4fd2f9448a0e2/packages/clients/core/src/index.ts#L630 + */ + public supportsOfflineSigning(): boolean { + return false; + } + + public supportsBroadcast(): boolean { + return true; + } + + public async clearSession(): Promise { + await this.disconnect(); + } + + public async ping(msg: core.Ping): Promise { + // ping function for Wallet Connect? + return { msg: msg.msg }; + } + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + public async sendPin(_pin: string): Promise { + // no concept of pin in WalletConnect + } + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + public async sendPassphrase(_passphrase: string): Promise { + // cannot send passphrase. Could show the widget? + } + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + public async sendCharacter(_character: string): Promise { + // no concept of sendCharacter + } + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + public async sendWord(_word: string): Promise { + // no concept of sendWord + } + + public async cancel(): Promise { + // no concept of cancel + } + + public async wipe(): Promise { + return; + } + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + public async reset(_msg: core.ResetDevice): Promise { + // no concept of reset + return; + } + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + public async recover(_msg: core.RecoverDevice): Promise { + // no concept of recover + } + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + public async loadDevice(_msg: core.LoadDevice): Promise { + return; + } + + public describePath(msg: core.DescribePath): core.PathDescription { + return this.info.describePath(msg); + } + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + public async getPublicKeys(_msg: Array): Promise> { + // Ethereum public keys are not exposed by the RPC API + return []; + } + + public async isInitialized(): Promise { + return true; + } + + public async disconnect(): Promise { + await this.provider.disconnect(); + } + + public async ethSupportsNetwork(chainId = 1): Promise { + return chainId === 1; + } + + public async ethSupportsSecureTransfer(): Promise { + return false; + } + + public ethSupportsNativeShapeShift(): boolean { + return false; + } + + public async ethSupportsEIP1559(): Promise { + return false; + } + + public ethGetAccountPaths(msg: core.ETHGetAccountPath): Array { + return this.info.ethGetAccountPaths(msg); + } + + public ethNextAccountPath(msg: core.ETHAccountPath): core.ETHAccountPath | undefined { + return this.info.ethNextAccountPath(msg); + } + + public async ethGetAddress(): Promise { + if (this.ethAddress) { + return this.ethAddress; + } + const address = await eth.ethGetAddress(this.provider); + if (address) { + this.ethAddress = address; + return address; + } else { + this.ethAddress = ""; + return null; + } + } + + /** + * Ethereum Signed Transaction + * + * @see https://docs.walletconnect.com/client-api#sign-transaction-eth_signtransaction + */ + public async ethSignTx(msg: core.ETHSignTx): Promise { + return eth.ethSignTx({ ...msg, from: this.ethAddress }, this.provider); + } + + /** + * Ethereum Send Transaction + * + * @see https://docs.walletconnect.com/client-api#send-transaction-eth_sendtransaction + */ + public async ethSendTx(msg: core.ETHSignTx): Promise { + return eth.ethSendTx({ ...msg, from: this.ethAddress }, this.provider); + } + + /** + * Ethereum Sign Message + * + * @see https://docs.walletconnect.com/client-api#sign-message-eth_sign + */ + public async ethSignMessage(msg: core.ETHSignMessage): Promise { + return eth.ethSignMessage({ data: msg.message, fromAddress: this.ethAddress }, this.provider); + } + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + public async ethVerifyMessage(msg: core.ETHVerifyMessage): Promise { + console.error("Method ethVerifyMessage unsupported for WalletConnectV2 wallet!"); + return null; + } + + public async getDeviceID(): Promise { + return "wc:" + (await this.ethGetAddress()); + } + + public async getFirmwareVersion(): Promise { + return "WalletConnectV2"; + } + + private onConnect(payload: ProviderInfo) { + const { chainId } = payload; + this.setState({ connected: true, chainId: parseInt(chainId, 10) }); + } + + private onSessionUpdate(accounts: string[], chainId: number) { + const [address] = accounts; + this.setState({ accounts, address, chainId }); + } + + /** + * onDisconnect + * + * Resets state. + */ + private onDisconnect() { + this.setState({ connected: false, chainId: 1, accounts: [], address: "" }); + } + + private setState(config: WCState) { + const { connected, chainId } = config; + if (connected !== undefined) { + this.connected = connected; + } + this.chainId = chainId; + // this.accounts = accounts; + // this.ethAddress = address; + } +} diff --git a/packages/hdwallet-walletconnectV2/tsconfig.json b/packages/hdwallet-walletconnectV2/tsconfig.json new file mode 100644 index 000000000..485533874 --- /dev/null +++ b/packages/hdwallet-walletconnectV2/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "dist", + "skipLibCheck": true + }, + "include": ["src/**/*"], + "exclude": ["node_modules", "dist"], + "references": [{ "path": "../hdwallet-core" }] +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index f7dc38caf..efabc85cc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3692,6 +3692,18 @@ npmlog "^4.1.2" write-file-atomic "^2.3.0" +"@lit-labs/ssr-dom-shim@^1.0.0", "@lit-labs/ssr-dom-shim@^1.1.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.1.tgz#64df34e2f12e68e78ac57e571d25ec07fa460ca9" + integrity sha512-kXOeFbfCm4fFf2A3WwVEeQj55tMZa8c8/f9AKHMobQMkzNUfUj+antR3fRPaZJawsa1aZiP/Da3ndpZrwEe4rQ== + +"@lit/reactive-element@^1.3.0", "@lit/reactive-element@^1.6.0": + version "1.6.3" + resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-1.6.3.tgz#25b4eece2592132845d303e091bad9b04cdcfe03" + integrity sha512-QuTgnG52Poic7uM1AN5yJ09QMe0O28e10XzSvWDz02TJiiKee4stsiownEIadWm8nYzyDAyT+gKzUoZmiWQtsQ== + dependencies: + "@lit-labs/ssr-dom-shim" "^1.0.0" + "@metamask/detect-provider@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@metamask/detect-provider/-/detect-provider-1.2.0.tgz#3667a7531f2a682e3c3a43eaf3a1958bdb42a696" @@ -3719,6 +3731,75 @@ semver "^7.3.8" superstruct "^1.0.3" +"@motionone/animation@^10.15.1": + version "10.15.1" + resolved "https://registry.yarnpkg.com/@motionone/animation/-/animation-10.15.1.tgz#4a85596c31cbc5100ae8eb8b34c459fb0ccf6807" + integrity sha512-mZcJxLjHor+bhcPuIFErMDNyrdb2vJur8lSfMCsuCB4UyV8ILZLvK+t+pg56erv8ud9xQGK/1OGPt10agPrCyQ== + dependencies: + "@motionone/easing" "^10.15.1" + "@motionone/types" "^10.15.1" + "@motionone/utils" "^10.15.1" + tslib "^2.3.1" + +"@motionone/dom@^10.16.2": + version "10.16.2" + resolved "https://registry.yarnpkg.com/@motionone/dom/-/dom-10.16.2.tgz#0c44df8ee3d1cfc50ee11d27050b27824355a61a" + integrity sha512-bnuHdNbge1FutZXv+k7xub9oPWcF0hsu8y1HTH/qg6av58YI0VufZ3ngfC7p2xhMJMnoh0LXFma2EGTgPeCkeg== + dependencies: + "@motionone/animation" "^10.15.1" + "@motionone/generators" "^10.15.1" + "@motionone/types" "^10.15.1" + "@motionone/utils" "^10.15.1" + hey-listen "^1.0.8" + tslib "^2.3.1" + +"@motionone/easing@^10.15.1": + version "10.15.1" + resolved "https://registry.yarnpkg.com/@motionone/easing/-/easing-10.15.1.tgz#95cf3adaef34da6deebb83940d8143ede3deb693" + integrity sha512-6hIHBSV+ZVehf9dcKZLT7p5PEKHGhDwky2k8RKkmOvUoYP3S+dXsKupyZpqx5apjd9f+php4vXk4LuS+ADsrWw== + dependencies: + "@motionone/utils" "^10.15.1" + tslib "^2.3.1" + +"@motionone/generators@^10.15.1": + version "10.15.1" + resolved "https://registry.yarnpkg.com/@motionone/generators/-/generators-10.15.1.tgz#dc6abb11139d1bafe758a41c134d4c753a9b871c" + integrity sha512-67HLsvHJbw6cIbLA/o+gsm7h+6D4Sn7AUrB/GPxvujse1cGZ38F5H7DzoH7PhX+sjvtDnt2IhFYF2Zp1QTMKWQ== + dependencies: + "@motionone/types" "^10.15.1" + "@motionone/utils" "^10.15.1" + tslib "^2.3.1" + +"@motionone/svelte@^10.16.2": + version "10.16.2" + resolved "https://registry.yarnpkg.com/@motionone/svelte/-/svelte-10.16.2.tgz#0b37c3b12927814d31d24941d1ca0ff49981b444" + integrity sha512-38xsroKrfK+aHYhuQlE6eFcGy0EwrB43Q7RGjF73j/kRUTcLNu/LAaKiLLsN5lyqVzCgTBVt4TMT/ShWbTbc5Q== + dependencies: + "@motionone/dom" "^10.16.2" + tslib "^2.3.1" + +"@motionone/types@^10.15.1": + version "10.15.1" + resolved "https://registry.yarnpkg.com/@motionone/types/-/types-10.15.1.tgz#89441b54285012795cbba8612cbaa0fa420db3eb" + integrity sha512-iIUd/EgUsRZGrvW0jqdst8st7zKTzS9EsKkP+6c6n4MPZoQHwiHuVtTQLD6Kp0bsBLhNzKIBlHXponn/SDT4hA== + +"@motionone/utils@^10.15.1": + version "10.15.1" + resolved "https://registry.yarnpkg.com/@motionone/utils/-/utils-10.15.1.tgz#6b5f51bde75be88b5411e084310299050368a438" + integrity sha512-p0YncgU+iklvYr/Dq4NobTRdAPv9PveRDUXabPEeOjBLSO/1FNB2phNTZxOxpi1/GZwYpAoECEa0Wam+nsmhSw== + dependencies: + "@motionone/types" "^10.15.1" + hey-listen "^1.0.8" + tslib "^2.3.1" + +"@motionone/vue@^10.16.2": + version "10.16.2" + resolved "https://registry.yarnpkg.com/@motionone/vue/-/vue-10.16.2.tgz#faf13afc27620a2df870c71c58a04ee8de8dea65" + integrity sha512-7/dEK/nWQXOkJ70bqb2KyNfSWbNvWqKKq1C8juj+0Mg/AorgD8O5wE3naddK0G+aXuNMqRuc4jlsYHHWHtIzVw== + dependencies: + "@motionone/dom" "^10.16.2" + tslib "^2.3.1" + "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" @@ -4832,6 +4913,140 @@ rpc-websockets "^7.5.1" superstruct "^0.14.2" +"@stablelib/aead@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/aead/-/aead-1.0.1.tgz#c4b1106df9c23d1b867eb9b276d8f42d5fc4c0c3" + integrity sha512-q39ik6sxGHewqtO0nP4BuSe3db5G1fEJE8ukvngS2gLkBXyy6E7pLubhbYgnkDFv6V8cWaxcE4Xn0t6LWcJkyg== + +"@stablelib/binary@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/binary/-/binary-1.0.1.tgz#c5900b94368baf00f811da5bdb1610963dfddf7f" + integrity sha512-ClJWvmL6UBM/wjkvv/7m5VP3GMr9t0osr4yVgLZsLCOz4hGN9gIAFEqnJ0TsSMAN+n840nf2cHZnA5/KFqHC7Q== + dependencies: + "@stablelib/int" "^1.0.1" + +"@stablelib/bytes@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/bytes/-/bytes-1.0.1.tgz#0f4aa7b03df3080b878c7dea927d01f42d6a20d8" + integrity sha512-Kre4Y4kdwuqL8BR2E9hV/R5sOrUj6NanZaZis0V6lX5yzqC3hBuVSDXUIBqQv/sCpmuWRiHLwqiT1pqqjuBXoQ== + +"@stablelib/chacha20poly1305@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/chacha20poly1305/-/chacha20poly1305-1.0.1.tgz#de6b18e283a9cb9b7530d8767f99cde1fec4c2ee" + integrity sha512-MmViqnqHd1ymwjOQfghRKw2R/jMIGT3wySN7cthjXCBdO+qErNPUBnRzqNpnvIwg7JBCg3LdeCZZO4de/yEhVA== + dependencies: + "@stablelib/aead" "^1.0.1" + "@stablelib/binary" "^1.0.1" + "@stablelib/chacha" "^1.0.1" + "@stablelib/constant-time" "^1.0.1" + "@stablelib/poly1305" "^1.0.1" + "@stablelib/wipe" "^1.0.1" + +"@stablelib/chacha@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/chacha/-/chacha-1.0.1.tgz#deccfac95083e30600c3f92803a3a1a4fa761371" + integrity sha512-Pmlrswzr0pBzDofdFuVe1q7KdsHKhhU24e8gkEwnTGOmlC7PADzLVxGdn2PoNVBBabdg0l/IfLKg6sHAbTQugg== + dependencies: + "@stablelib/binary" "^1.0.1" + "@stablelib/wipe" "^1.0.1" + +"@stablelib/constant-time@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/constant-time/-/constant-time-1.0.1.tgz#bde361465e1cf7b9753061b77e376b0ca4c77e35" + integrity sha512-tNOs3uD0vSJcK6z1fvef4Y+buN7DXhzHDPqRLSXUel1UfqMB1PWNsnnAezrKfEwTLpN0cGH2p9NNjs6IqeD0eg== + +"@stablelib/ed25519@^1.0.2": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@stablelib/ed25519/-/ed25519-1.0.3.tgz#f8fdeb6f77114897c887bb6a3138d659d3f35996" + integrity sha512-puIMWaX9QlRsbhxfDc5i+mNPMY+0TmQEskunY1rZEBPi1acBCVQAhnsk/1Hk50DGPtVsZtAWQg4NHGlVaO9Hqg== + dependencies: + "@stablelib/random" "^1.0.2" + "@stablelib/sha512" "^1.0.1" + "@stablelib/wipe" "^1.0.1" + +"@stablelib/hash@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/hash/-/hash-1.0.1.tgz#3c944403ff2239fad8ebb9015e33e98444058bc5" + integrity sha512-eTPJc/stDkdtOcrNMZ6mcMK1e6yBbqRBaNW55XA1jU8w/7QdnCF0CmMmOD1m7VSkBR44PWrMHU2l6r8YEQHMgg== + +"@stablelib/hkdf@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/hkdf/-/hkdf-1.0.1.tgz#b4efd47fd56fb43c6a13e8775a54b354f028d98d" + integrity sha512-SBEHYE16ZXlHuaW5RcGk533YlBj4grMeg5TooN80W3NpcHRtLZLLXvKyX0qcRFxf+BGDobJLnwkvgEwHIDBR6g== + dependencies: + "@stablelib/hash" "^1.0.1" + "@stablelib/hmac" "^1.0.1" + "@stablelib/wipe" "^1.0.1" + +"@stablelib/hmac@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/hmac/-/hmac-1.0.1.tgz#3d4c1b8cf194cb05d28155f0eed8a299620a07ec" + integrity sha512-V2APD9NSnhVpV/QMYgCVMIYKiYG6LSqw1S65wxVoirhU/51ACio6D4yDVSwMzuTJXWZoVHbDdINioBwKy5kVmA== + dependencies: + "@stablelib/constant-time" "^1.0.1" + "@stablelib/hash" "^1.0.1" + "@stablelib/wipe" "^1.0.1" + +"@stablelib/int@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/int/-/int-1.0.1.tgz#75928cc25d59d73d75ae361f02128588c15fd008" + integrity sha512-byr69X/sDtDiIjIV6m4roLVWnNNlRGzsvxw+agj8CIEazqWGOQp2dTYgQhtyVXV9wpO6WyXRQUzLV/JRNumT2w== + +"@stablelib/keyagreement@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/keyagreement/-/keyagreement-1.0.1.tgz#4612efb0a30989deb437cd352cee637ca41fc50f" + integrity sha512-VKL6xBwgJnI6l1jKrBAfn265cspaWBPAPEc62VBQrWHLqVgNRE09gQ/AnOEyKUWrrqfD+xSQ3u42gJjLDdMDQg== + dependencies: + "@stablelib/bytes" "^1.0.1" + +"@stablelib/poly1305@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/poly1305/-/poly1305-1.0.1.tgz#93bfb836c9384685d33d70080718deae4ddef1dc" + integrity sha512-1HlG3oTSuQDOhSnLwJRKeTRSAdFNVB/1djy2ZbS35rBSJ/PFqx9cf9qatinWghC2UbfOYD8AcrtbUQl8WoxabA== + dependencies: + "@stablelib/constant-time" "^1.0.1" + "@stablelib/wipe" "^1.0.1" + +"@stablelib/random@^1.0.1", "@stablelib/random@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@stablelib/random/-/random-1.0.2.tgz#2dece393636489bf7e19c51229dd7900eddf742c" + integrity sha512-rIsE83Xpb7clHPVRlBj8qNe5L8ISQOzjghYQm/dZ7VaM2KHYwMW5adjQjrzTZCchFnNCNhkwtnOBa9HTMJCI8w== + dependencies: + "@stablelib/binary" "^1.0.1" + "@stablelib/wipe" "^1.0.1" + +"@stablelib/sha256@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/sha256/-/sha256-1.0.1.tgz#77b6675b67f9b0ea081d2e31bda4866297a3ae4f" + integrity sha512-GIIH3e6KH+91FqGV42Kcj71Uefd/QEe7Dy42sBTeqppXV95ggCcxLTk39bEr+lZfJmp+ghsR07J++ORkRELsBQ== + dependencies: + "@stablelib/binary" "^1.0.1" + "@stablelib/hash" "^1.0.1" + "@stablelib/wipe" "^1.0.1" + +"@stablelib/sha512@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/sha512/-/sha512-1.0.1.tgz#6da700c901c2c0ceacbd3ae122a38ac57c72145f" + integrity sha512-13gl/iawHV9zvDKciLo1fQ8Bgn2Pvf7OV6amaRVKiq3pjQ3UmEpXxWiAfV8tYjUpeZroBxtyrwtdooQT/i3hzw== + dependencies: + "@stablelib/binary" "^1.0.1" + "@stablelib/hash" "^1.0.1" + "@stablelib/wipe" "^1.0.1" + +"@stablelib/wipe@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/wipe/-/wipe-1.0.1.tgz#d21401f1d59ade56a62e139462a97f104ed19a36" + integrity sha512-WfqfX/eXGiAd3RJe4VU2snh/ZPwtSjLG4ynQ/vYzvghTh7dHFcI1wl+nrkWG6lGhukOxOsUHfv8dUXr58D0ayg== + +"@stablelib/x25519@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@stablelib/x25519/-/x25519-1.0.3.tgz#13c8174f774ea9f3e5e42213cbf9fc68a3c7b7fd" + integrity sha512-KnTbKmUhPhHavzobclVJQG5kuivH+qDLpe84iRqX3CLrKp881cF160JvXJ+hjn1aMyCwYOKeIZefIH/P5cJoRw== + dependencies: + "@stablelib/keyagreement" "^1.0.1" + "@stablelib/random" "^1.0.2" + "@stablelib/wipe" "^1.0.1" + "@swc/helpers@^0.2.11": version "0.2.14" resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.2.14.tgz#20288c3627442339dd3d743c944f7043ee3590f0" @@ -5321,6 +5536,11 @@ dependencies: "@types/node" "*" +"@types/trusted-types@^2.0.2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.3.tgz#a136f83b0758698df454e328759dbd3d44555311" + integrity sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g== + "@types/urijs@^1.19.6": version "1.19.17" resolved "https://registry.yarnpkg.com/@types/urijs/-/urijs-1.19.17.tgz#232ac9884b6a2aeab5dbe70b79cdb91d5067c325" @@ -5501,6 +5721,28 @@ "@walletconnect/types" "^1.7.8" "@walletconnect/utils" "^1.7.8" +"@walletconnect/core@2.10.0": + version "2.10.0" + resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.10.0.tgz#b659de4dfb374becd938964abd4f2150d410e617" + integrity sha512-Z8pdorfIMueuiBXLdnf7yloiO9JIiobuxN3j0OTal+MYc4q5/2O7d+jdD1DAXbLi1taJx3x60UXT/FPVkjIqIQ== + dependencies: + "@walletconnect/heartbeat" "1.2.1" + "@walletconnect/jsonrpc-provider" "1.0.13" + "@walletconnect/jsonrpc-types" "1.0.3" + "@walletconnect/jsonrpc-utils" "1.0.8" + "@walletconnect/jsonrpc-ws-connection" "1.0.13" + "@walletconnect/keyvaluestorage" "^1.0.2" + "@walletconnect/logger" "^2.0.1" + "@walletconnect/relay-api" "^1.0.9" + "@walletconnect/relay-auth" "^1.0.4" + "@walletconnect/safe-json" "^1.0.2" + "@walletconnect/time" "^1.0.2" + "@walletconnect/types" "2.10.0" + "@walletconnect/utils" "2.10.0" + events "^3.3.0" + lodash.isequal "4.5.0" + uint8arrays "^3.1.0" + "@walletconnect/core@^1.6.6": version "1.6.6" resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-1.6.6.tgz#0a35a9b0f91da8958bec27be801a510818f4e142" @@ -5562,6 +5804,45 @@ resolved "https://registry.yarnpkg.com/@walletconnect/environment/-/environment-1.0.0.tgz#c4545869fa9c389ec88c364e1a5f8178e8ab5034" integrity sha512-4BwqyWy6KpSvkocSaV7WR3BlZfrxLbJSLkg+j7Gl6pTDE+U55lLhJvQaMuDVazXYxcjBsG09k7UlH7cGiUI5vQ== +"@walletconnect/environment@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@walletconnect/environment/-/environment-1.0.1.tgz#1d7f82f0009ab821a2ba5ad5e5a7b8ae3b214cd7" + integrity sha512-T426LLZtHj8e8rYnKfzsw1aG6+M0BT1ZxayMdv/p8yM0MU+eJDISqNY3/bccxRr4LrF9csq02Rhqt08Ibl0VRg== + dependencies: + tslib "1.14.1" + +"@walletconnect/ethereum-provider@^2.10.0": + version "2.10.0" + resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.10.0.tgz#eebde38674222a48be35bb4aa3f6a74247ba059b" + integrity sha512-NyTm7RcrtAiSaYQPh6G4sOtr1kg/pL5Z3EDE6rBTV3Se5pMsYvtuwMiSol7MidsQpf4ux9HFhthTO3imcoWImw== + dependencies: + "@walletconnect/jsonrpc-http-connection" "^1.0.7" + "@walletconnect/jsonrpc-provider" "^1.0.13" + "@walletconnect/jsonrpc-types" "^1.0.3" + "@walletconnect/jsonrpc-utils" "^1.0.8" + "@walletconnect/sign-client" "2.10.0" + "@walletconnect/types" "2.10.0" + "@walletconnect/universal-provider" "2.10.0" + "@walletconnect/utils" "2.10.0" + events "^3.3.0" + +"@walletconnect/events@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@walletconnect/events/-/events-1.0.1.tgz#2b5f9c7202019e229d7ccae1369a9e86bda7816c" + integrity sha512-NPTqaoi0oPBVNuLv7qPaJazmGHs5JGyO8eEAk5VGKmJzDR7AHzD4k6ilox5kxk1iwiOnFopBOOMLs86Oa76HpQ== + dependencies: + keyvaluestorage-interface "^1.0.0" + tslib "1.14.1" + +"@walletconnect/heartbeat@1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@walletconnect/heartbeat/-/heartbeat-1.2.1.tgz#afaa3a53232ae182d7c9cff41c1084472d8f32e9" + integrity sha512-yVzws616xsDLJxuG/28FqtZ5rzrTA4gUjdEMTbWB5Y8V1XHRmqq4efAxCw5ie7WjbXFSUyBHaWlMR+2/CpQC5Q== + dependencies: + "@walletconnect/events" "^1.0.1" + "@walletconnect/time" "^1.0.2" + tslib "1.14.1" + "@walletconnect/http-connection@^1.7.8": version "1.7.8" resolved "https://registry.yarnpkg.com/@walletconnect/http-connection/-/http-connection-1.7.8.tgz#98bcc726c29751ddc791ff151742aa712bf679a7" @@ -5590,6 +5871,33 @@ "@walletconnect/types" "^1.7.8" "@walletconnect/utils" "^1.7.8" +"@walletconnect/jsonrpc-http-connection@^1.0.7": + version "1.0.7" + resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-http-connection/-/jsonrpc-http-connection-1.0.7.tgz#a6973569b8854c22da707a759d241e4f5c2d5a98" + integrity sha512-qlfh8fCfu8LOM9JRR9KE0s0wxP6ZG9/Jom8M0qsoIQeKF3Ni0FyV4V1qy/cc7nfI46SLQLSl4tgWSfLiE1swyQ== + dependencies: + "@walletconnect/jsonrpc-utils" "^1.0.6" + "@walletconnect/safe-json" "^1.0.1" + cross-fetch "^3.1.4" + tslib "1.14.1" + +"@walletconnect/jsonrpc-provider@1.0.13", "@walletconnect/jsonrpc-provider@^1.0.13": + version "1.0.13" + resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-provider/-/jsonrpc-provider-1.0.13.tgz#9a74da648d015e1fffc745f0c7d629457f53648b" + integrity sha512-K73EpThqHnSR26gOyNEL+acEex3P7VWZe6KE12ZwKzAt2H4e5gldZHbjsu2QR9cLeJ8AXuO7kEMOIcRv1QEc7g== + dependencies: + "@walletconnect/jsonrpc-utils" "^1.0.8" + "@walletconnect/safe-json" "^1.0.2" + tslib "1.14.1" + +"@walletconnect/jsonrpc-types@1.0.3", "@walletconnect/jsonrpc-types@^1.0.2", "@walletconnect/jsonrpc-types@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-types/-/jsonrpc-types-1.0.3.tgz#65e3b77046f1a7fa8347ae02bc1b841abe6f290c" + integrity sha512-iIQ8hboBl3o5ufmJ8cuduGad0CQm3ZlsHtujv9Eu16xq89q+BG7Nh5VLxxUgmtpnrePgFkTwXirCTkwJH1v+Yw== + dependencies: + keyvaluestorage-interface "^1.0.0" + tslib "1.14.1" + "@walletconnect/jsonrpc-types@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-types/-/jsonrpc-types-1.0.0.tgz#fa75ad5e8f106a2e33287b1e6833e22ed0225055" @@ -5597,6 +5905,15 @@ dependencies: keyvaluestorage-interface "^1.0.0" +"@walletconnect/jsonrpc-utils@1.0.8", "@walletconnect/jsonrpc-utils@^1.0.6", "@walletconnect/jsonrpc-utils@^1.0.7", "@walletconnect/jsonrpc-utils@^1.0.8": + version "1.0.8" + resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-utils/-/jsonrpc-utils-1.0.8.tgz#82d0cc6a5d6ff0ecc277cb35f71402c91ad48d72" + integrity sha512-vdeb03bD8VzJUL6ZtzRYsFMq1eZQcM3EAzT0a3st59dyLfJ0wq+tKMpmGH7HlB7waD858UWgfIcudbPFsbzVdw== + dependencies: + "@walletconnect/environment" "^1.0.1" + "@walletconnect/jsonrpc-types" "^1.0.3" + tslib "1.14.1" + "@walletconnect/jsonrpc-utils@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-utils/-/jsonrpc-utils-1.0.0.tgz#1a2f668d606e8f0b6e7d8fdebae86001bd037a3f" @@ -5605,11 +5922,63 @@ "@walletconnect/environment" "^1.0.0" "@walletconnect/jsonrpc-types" "^1.0.0" +"@walletconnect/jsonrpc-ws-connection@1.0.13": + version "1.0.13" + resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-ws-connection/-/jsonrpc-ws-connection-1.0.13.tgz#23b0cdd899801bfbb44a6556936ec2b93ef2adf4" + integrity sha512-mfOM7uFH4lGtQxG+XklYuFBj6dwVvseTt5/ahOkkmpcAEgz2umuzu7fTR+h5EmjQBdrmYyEBOWADbeaFNxdySg== + dependencies: + "@walletconnect/jsonrpc-utils" "^1.0.6" + "@walletconnect/safe-json" "^1.0.2" + events "^3.3.0" + tslib "1.14.1" + ws "^7.5.1" + +"@walletconnect/keyvaluestorage@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@walletconnect/keyvaluestorage/-/keyvaluestorage-1.0.2.tgz#92f5ca0f54c1a88a093778842ce0c874d86369c8" + integrity sha512-U/nNG+VLWoPFdwwKx0oliT4ziKQCEoQ27L5Hhw8YOFGA2Po9A9pULUYNWhDgHkrb0gYDNt//X7wABcEWWBd3FQ== + dependencies: + safe-json-utils "^1.1.1" + tslib "1.14.1" + +"@walletconnect/logger@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@walletconnect/logger/-/logger-2.0.1.tgz#7f489b96e9a1ff6bf3e58f0fbd6d69718bf844a8" + integrity sha512-SsTKdsgWm+oDTBeNE/zHxxr5eJfZmE9/5yp/Ku+zJtcTAjELb3DXueWkDXmE9h8uHIbJzIb5wj5lPdzyrjT6hQ== + dependencies: + pino "7.11.0" + tslib "1.14.1" + "@walletconnect/mobile-registry@^1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@walletconnect/mobile-registry/-/mobile-registry-1.4.0.tgz#502cf8ab87330841d794819081e748ebdef7aee5" integrity sha512-ZtKRio4uCZ1JUF7LIdecmZt7FOLnX72RPSY7aUVu7mj7CSfxDwUn6gBuK6WGtH+NZCldBqDl5DenI5fFSvkKYw== +"@walletconnect/modal-core@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@walletconnect/modal-core/-/modal-core-2.6.1.tgz#bc76055d0b644a2d4b98024324825c108a700905" + integrity sha512-f2hYlJ5pwzGvjyaZ6BoGR5uiMgXzWXt6w6ktt1N8lmY6PiYp8whZgqx2hTxVWwVlsGnaIfh6UHp1hGnANx0eTQ== + dependencies: + valtio "1.11.0" + +"@walletconnect/modal-ui@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@walletconnect/modal-ui/-/modal-ui-2.6.1.tgz#200c54c8dfe3c71321abb2724e18bb357dfd6371" + integrity sha512-RFUOwDAMijSK8B7W3+KoLKaa1l+KEUG0LCrtHqaB0H0cLnhEGdLR+kdTdygw+W8+yYZbkM5tXBm7MlFbcuyitA== + dependencies: + "@walletconnect/modal-core" "2.6.1" + lit "2.7.6" + motion "10.16.2" + qrcode "1.5.3" + +"@walletconnect/modal@^2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@walletconnect/modal/-/modal-2.6.1.tgz#066fdbfcff83b58c8a9da66ab4af0eb93e3626de" + integrity sha512-G84tSzdPKAFk1zimgV7JzIUFT5olZUVtI3GcOk77OeLYjlMfnDT23RVRHm5EyCrjkptnvpD0wQScXePOFd2Xcw== + dependencies: + "@walletconnect/modal-core" "2.6.1" + "@walletconnect/modal-ui" "2.6.1" + "@walletconnect/qrcode-modal@^1.7.8": version "1.7.8" resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.7.8.tgz#52b3d15922f3e371ddc92fd0f49f93ff40241365" @@ -5640,11 +6009,53 @@ "@walletconnect/environment" "^1.0.0" randombytes "^2.1.0" +"@walletconnect/relay-api@^1.0.9": + version "1.0.9" + resolved "https://registry.yarnpkg.com/@walletconnect/relay-api/-/relay-api-1.0.9.tgz#f8c2c3993dddaa9f33ed42197fc9bfebd790ecaf" + integrity sha512-Q3+rylJOqRkO1D9Su0DPE3mmznbAalYapJ9qmzDgK28mYF9alcP3UwG/og5V7l7CFOqzCLi7B8BvcBUrpDj0Rg== + dependencies: + "@walletconnect/jsonrpc-types" "^1.0.2" + tslib "1.14.1" + +"@walletconnect/relay-auth@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@walletconnect/relay-auth/-/relay-auth-1.0.4.tgz#0b5c55c9aa3b0ef61f526ce679f3ff8a5c4c2c7c" + integrity sha512-kKJcS6+WxYq5kshpPaxGHdwf5y98ZwbfuS4EE/NkQzqrDFm5Cj+dP8LofzWvjrrLkZq7Afy7WrQMXdLy8Sx7HQ== + dependencies: + "@stablelib/ed25519" "^1.0.2" + "@stablelib/random" "^1.0.1" + "@walletconnect/safe-json" "^1.0.1" + "@walletconnect/time" "^1.0.2" + tslib "1.14.1" + uint8arrays "^3.0.0" + "@walletconnect/safe-json@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@walletconnect/safe-json/-/safe-json-1.0.0.tgz#12eeb11d43795199c045fafde97e3c91646683b2" integrity sha512-QJzp/S/86sUAgWY6eh5MKYmSfZaRpIlmCJdi5uG4DJlKkZrHEF7ye7gA+VtbVzvTtpM/gRwO2plQuiooIeXjfg== +"@walletconnect/safe-json@^1.0.1", "@walletconnect/safe-json@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@walletconnect/safe-json/-/safe-json-1.0.2.tgz#7237e5ca48046e4476154e503c6d3c914126fa77" + integrity sha512-Ogb7I27kZ3LPC3ibn8ldyUr5544t3/STow9+lzz7Sfo808YD7SBWk7SAsdBFlYgP2zDRy2hS3sKRcuSRM0OTmA== + dependencies: + tslib "1.14.1" + +"@walletconnect/sign-client@2.10.0": + version "2.10.0" + resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.10.0.tgz#0fee8f12821e37783099f0c7bd64e6efdfbd9d86" + integrity sha512-hbDljDS53kR/It3oXD91UkcOsT6diNnW5+Zzksm0YEfwww5dop/YfNlcdnc8+jKUhWOL/YDPNQCjzsCSNlVzbw== + dependencies: + "@walletconnect/core" "2.10.0" + "@walletconnect/events" "^1.0.1" + "@walletconnect/heartbeat" "1.2.1" + "@walletconnect/jsonrpc-utils" "1.0.8" + "@walletconnect/logger" "^2.0.1" + "@walletconnect/time" "^1.0.2" + "@walletconnect/types" "2.10.0" + "@walletconnect/utils" "2.10.0" + events "^3.3.0" + "@walletconnect/socket-transport@^1.6.6": version "1.6.6" resolved "https://registry.yarnpkg.com/@walletconnect/socket-transport/-/socket-transport-1.6.6.tgz#b80974fe3e2a2f93ba1f6b40df5a0ea492b94086" @@ -5663,6 +6074,25 @@ "@walletconnect/utils" "^1.7.8" ws "7.5.3" +"@walletconnect/time@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@walletconnect/time/-/time-1.0.2.tgz#6c5888b835750ecb4299d28eecc5e72c6d336523" + integrity sha512-uzdd9woDcJ1AaBZRhqy5rNC9laqWGErfc4dxA9a87mPdKOgWMD85mcFo9dIYIts/Jwocfwn07EC6EzclKubk/g== + dependencies: + tslib "1.14.1" + +"@walletconnect/types@2.10.0", "@walletconnect/types@^2.10.0": + version "2.10.0" + resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.10.0.tgz#5d63235b49e03d609521402a4b49627dbc4ed514" + integrity sha512-kSTA/WZnbKdEbvbXSW16Ty6dOSzOZCHnGg6JH7q1MuraalD2HuNg00lVVu7QAZ/Rj1Gn9DAkrgP5Wd5a8Xq//Q== + dependencies: + "@walletconnect/events" "^1.0.1" + "@walletconnect/heartbeat" "1.2.1" + "@walletconnect/jsonrpc-types" "1.0.3" + "@walletconnect/keyvaluestorage" "^1.0.2" + "@walletconnect/logger" "^2.0.1" + events "^3.3.0" + "@walletconnect/types@^1.6.6": version "1.6.6" resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.6.6.tgz#8d644e2a390e494e40424c60272e91b4820bf0d4" @@ -5673,6 +6103,41 @@ resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.7.8.tgz#ec397e6fbdc8147bccc17029edfeb41c50a5ca09" integrity sha512-0oSZhKIrtXRJVP1jQ0EDTRtotQY6kggGjDcmm/LLQBKnOZXdPeo0sPkV/7DjT5plT3O7Cjc6JvuXt9WOY0hlCA== +"@walletconnect/universal-provider@2.10.0": + version "2.10.0" + resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.10.0.tgz#565d6478dcb5cc66955e5f03d6a00f51c9bcac14" + integrity sha512-jtVWf+AeTCqBcB3lCmWkv3bvSmdRCkQdo67GNoT5y6/pvVHMxfjgrJNBOUsWQMxpREpWDpZ993X0JRjsYVsMcA== + dependencies: + "@walletconnect/jsonrpc-http-connection" "^1.0.7" + "@walletconnect/jsonrpc-provider" "1.0.13" + "@walletconnect/jsonrpc-types" "^1.0.2" + "@walletconnect/jsonrpc-utils" "^1.0.7" + "@walletconnect/logger" "^2.0.1" + "@walletconnect/sign-client" "2.10.0" + "@walletconnect/types" "2.10.0" + "@walletconnect/utils" "2.10.0" + events "^3.3.0" + +"@walletconnect/utils@2.10.0": + version "2.10.0" + resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.10.0.tgz#6918d12180d797b8bd4a19fb2ff128e394e181d6" + integrity sha512-9GRyEz/7CJW+G04RvrjPET5k7hOEsB9b3fF9cWDk/iDCxSWpbkU/hv/urRB36C+gvQMAZgIZYX3dHfzJWkY/2g== + dependencies: + "@stablelib/chacha20poly1305" "1.0.1" + "@stablelib/hkdf" "1.0.1" + "@stablelib/random" "^1.0.2" + "@stablelib/sha256" "1.0.1" + "@stablelib/x25519" "^1.0.3" + "@walletconnect/relay-api" "^1.0.9" + "@walletconnect/safe-json" "^1.0.2" + "@walletconnect/time" "^1.0.2" + "@walletconnect/types" "2.10.0" + "@walletconnect/window-getters" "^1.0.1" + "@walletconnect/window-metadata" "^1.0.1" + detect-browser "5.3.0" + query-string "7.1.3" + uint8arrays "^3.1.0" + "@walletconnect/utils@^1.6.6": version "1.6.6" resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-1.6.6.tgz#e8e49a5f2c35e4a5f9153b09ad076655f38d8c96" @@ -5716,6 +6181,13 @@ resolved "https://registry.yarnpkg.com/@walletconnect/window-getters/-/window-getters-1.0.0.tgz#1053224f77e725dfd611c83931b5f6c98c32bfc8" integrity sha512-xB0SQsLaleIYIkSsl43vm8EwETpBzJ2gnzk7e0wMF3ktqiTGS6TFHxcprMl5R44KKh4tCcHCJwolMCaDSwtAaA== +"@walletconnect/window-getters@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@walletconnect/window-getters/-/window-getters-1.0.1.tgz#f36d1c72558a7f6b87ecc4451fc8bd44f63cbbdc" + integrity sha512-vHp+HqzGxORPAN8gY03qnbTMnhqIwjeRJNOMOAzePRg4xVEEE2WvYsI9G2NMjOknA8hnuYbU3/hwLcKbjhc8+Q== + dependencies: + tslib "1.14.1" + "@walletconnect/window-metadata@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@walletconnect/window-metadata/-/window-metadata-1.0.0.tgz#93b1cc685e6b9b202f29c26be550fde97800c4e5" @@ -5723,6 +6195,14 @@ dependencies: "@walletconnect/window-getters" "^1.0.0" +"@walletconnect/window-metadata@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@walletconnect/window-metadata/-/window-metadata-1.0.1.tgz#2124f75447b7e989e4e4e1581d55d25bc75f7be5" + integrity sha512-9koTqyGrM2cqFRW517BPY/iEtUDx2r1+Pwwu5m7sJ7ka79wi3EyqhqcICk/yDmv6jAS1rjKgTKXlEhanYjijcA== + dependencies: + "@walletconnect/window-getters" "^1.0.1" + tslib "1.14.1" + "@xstate/react@^1.6.1": version "1.6.1" resolved "https://registry.yarnpkg.com/@xstate/react/-/react-1.6.1.tgz#7e920520ba54d3c2ade55639761d7ca2c25c4900" @@ -6195,6 +6675,11 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== +atomic-sleep@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b" + integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ== + available-typed-arrays@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz#9e0ae84ecff20caae6a94a1c3bc39b955649b7a9" @@ -7957,6 +8442,13 @@ cross-fetch@^3.0.6: dependencies: node-fetch "2.6.1" +cross-fetch@^3.1.4: + version "3.1.8" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.8.tgz#0327eba65fd68a7d119f8fb2bf9334a1a7956f82" + integrity sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg== + dependencies: + node-fetch "^2.6.12" + cross-spawn@^6.0.0, cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -8258,6 +8750,11 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= +decode-uri-component@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" + integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== + decompress-response@^3.2.0, decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" @@ -8381,6 +8878,11 @@ detect-browser@5.2.0: resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.2.0.tgz#c9cd5afa96a6a19fda0bbe9e9be48a6b6e1e9c97" integrity sha512-tr7XntDAu50BVENgQfajMLzacmSe34D+qZc4zjnniz0ZVuw/TZcLcyxHQjYpJTM36sGEkZZlYLnIM1hH7alTMA== +detect-browser@5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.3.0.tgz#9705ef2bddf46072d0f7265a1fe300e36fe7ceca" + integrity sha512-53rsFbGdwMwlF7qvCt0ypLM5V5/Mbl0szB7GPN8y9NCcbknYOeVVXdrXEq+90IwAfrrzt6Hd+u2E2ntakICU8w== + detect-indent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" @@ -8588,6 +9090,16 @@ duplexify@^4.1.1: readable-stream "^3.1.1" stream-shift "^1.0.0" +duplexify@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.2.tgz#18b4f8d28289132fa0b9573c898d9f903f81c7b0" + integrity sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw== + dependencies: + end-of-stream "^1.4.1" + inherits "^2.0.3" + readable-stream "^3.1.1" + stream-shift "^1.0.0" + ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -8699,6 +9211,11 @@ enabled@2.0.x: resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== +encode-utf8@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda" + integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw== + encodeurl@^1.0.2, encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -9812,6 +10329,11 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= +fast-redact@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.3.0.tgz#7c83ce3a7be4898241a46560d51de10f653f7634" + integrity sha512-6T5V1QK1u4oF+ATxs1lWUmlEk6P2T9HqJG3e2DnHOdVgZy2rFJBoEnrIedcTXlkAHU/zKC+7KETJ+KGGKwxgMQ== + fast-safe-stringify@^2.0.6: version "2.0.8" resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz#dc2af48c46cf712b683e849b2bbd446b32de936f" @@ -10642,6 +11164,11 @@ headers-utils@^1.2.0: resolved "https://registry.yarnpkg.com/headers-utils/-/headers-utils-1.2.5.tgz#899d6a76b21bcbe18d6108f56136fdbd4f30c404" integrity sha512-DAzV5P/pk3wTU/8TLZN+zFTDv4Xa1QDTU8pRvovPetcOMbmqq8CwsAvZBLPZHH6usxyy31zMp7I4aCYb6XIf6w== +hey-listen@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/hey-listen/-/hey-listen-1.0.8.tgz#8e59561ff724908de1aa924ed6ecc84a56a9aa68" + integrity sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q== + hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -12522,6 +13049,31 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= +lit-element@^3.3.0: + version "3.3.3" + resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-3.3.3.tgz#10bc19702b96ef5416cf7a70177255bfb17b3209" + integrity sha512-XbeRxmTHubXENkV4h8RIPyr8lXc+Ff28rkcQzw3G6up2xg5E8Zu1IgOWIwBLEQsu3cOVFqdYwiVi0hv0SlpqUA== + dependencies: + "@lit-labs/ssr-dom-shim" "^1.1.0" + "@lit/reactive-element" "^1.3.0" + lit-html "^2.8.0" + +lit-html@^2.7.0, lit-html@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-2.8.0.tgz#96456a4bb4ee717b9a7d2f94562a16509d39bffa" + integrity sha512-o9t+MQM3P4y7M7yNzqAyjp7z+mQGa4NS4CxiyLqFPyFWyc4O+nodLrkrxSaCTrla6M5YOLaT3RpbbqjszB5g3Q== + dependencies: + "@types/trusted-types" "^2.0.2" + +lit@2.7.6: + version "2.7.6" + resolved "https://registry.yarnpkg.com/lit/-/lit-2.7.6.tgz#810007b876ed43e0c70124de91831921598b1665" + integrity sha512-1amFHA7t4VaaDe+vdQejSVBklwtH9svGoG6/dZi9JhxtJBBlqY5D1RV7iLUYY0trCqQc4NfhYYZilZiVHt7Hxg== + dependencies: + "@lit/reactive-element" "^1.6.0" + lit-element "^3.3.0" + lit-html "^2.7.0" + litecoin-regex@^1.0.8: version "1.0.9" resolved "https://registry.yarnpkg.com/litecoin-regex/-/litecoin-regex-1.0.9.tgz#0e67b4f1aa50ab1fda2d2ecf32879bb24041cc7d" @@ -12613,6 +13165,11 @@ lodash.get@^4.4.2: resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= +lodash.isequal@4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== + lodash.ismatch@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37" @@ -13199,6 +13756,18 @@ monero-regex@^1.0.8: resolved "https://registry.yarnpkg.com/monero-regex/-/monero-regex-1.0.9.tgz#4445e98a5d48d038b050fc25ff2e9155b989525c" integrity sha512-4kUBp+a/DWmL/m/oVUQLJHe7BKvY4M3XoLtCnCBo/qbXH/FOD/umuttAMFoBTp/1imsYmvPtxxNYxdQY9T+DKg== +motion@10.16.2: + version "10.16.2" + resolved "https://registry.yarnpkg.com/motion/-/motion-10.16.2.tgz#7dc173c6ad62210a7e9916caeeaf22c51e598d21" + integrity sha512-p+PurYqfUdcJZvtnmAqu5fJgV2kR0uLFQuBKtLeFVTrYEVllI99tiOTSefVNYuip9ELTEkepIIDftNdze76NAQ== + dependencies: + "@motionone/animation" "^10.15.1" + "@motionone/dom" "^10.16.2" + "@motionone/svelte" "^10.16.2" + "@motionone/types" "^10.15.1" + "@motionone/utils" "^10.15.1" + "@motionone/vue" "^10.16.2" + move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" @@ -13301,6 +13870,11 @@ multicodec@^1.0.0: buffer "^5.6.0" varint "^5.0.0" +multiformats@^9.4.2: + version "9.9.0" + resolved "https://registry.yarnpkg.com/multiformats/-/multiformats-9.9.0.tgz#c68354e7d21037a8f1f8833c8ccd68618e8f1d37" + integrity sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg== + multihashes@^0.4.15, multihashes@~0.4.15: version "0.4.21" resolved "https://registry.yarnpkg.com/multihashes/-/multihashes-0.4.21.tgz#dc02d525579f334a7909ade8a122dabb58ccfcb5" @@ -13460,6 +14034,13 @@ node-fetch@2.6.1, node-fetch@^2.5.0, node-fetch@^2.6.0, node-fetch@^2.6.1: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== +node-fetch@^2.6.12: + version "2.7.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" + integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== + dependencies: + whatwg-url "^5.0.0" + node-fetch@^2.6.7: version "2.6.11" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25" @@ -13804,6 +14385,11 @@ octokit-pagination-methods@^1.1.0: resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4" integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ== +on-exit-leak-free@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-0.2.0.tgz#b39c9e3bf7690d890f4861558b0d7b90a442d209" + integrity sha512-dqaz3u44QbRXQooZLTUKU41ZrzYrcvLISVgbrzbyCMxpmSLJvZ3ZamIJIZ29P6OhZIkNIQKosdeM6t1LYbA9hg== + on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -14356,6 +14942,36 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= +pino-abstract-transport@v0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-0.5.0.tgz#4b54348d8f73713bfd14e3dc44228739aa13d9c0" + integrity sha512-+KAgmVeqXYbTtU2FScx1XS3kNyfZ5TrXY07V96QnUSFqo2gAqlvmaxH67Lj7SWazqsMabf+58ctdTcBgnOLUOQ== + dependencies: + duplexify "^4.1.2" + split2 "^4.0.0" + +pino-std-serializers@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-4.0.0.tgz#1791ccd2539c091ae49ce9993205e2cd5dbba1e2" + integrity sha512-cK0pekc1Kjy5w9V2/n+8MkZwusa6EyyxfeQCB799CQRhRt/CqYKiWs5adeu8Shve2ZNffvfC/7J64A2PJo1W/Q== + +pino@7.11.0: + version "7.11.0" + resolved "https://registry.yarnpkg.com/pino/-/pino-7.11.0.tgz#0f0ea5c4683dc91388081d44bff10c83125066f6" + integrity sha512-dMACeu63HtRLmCG8VKdy4cShCPKaYDR4youZqoSWLxl5Gu99HUw8bw75thbPv9Nip+H+QYX8o3ZJbTdVZZ2TVg== + dependencies: + atomic-sleep "^1.0.0" + fast-redact "^3.0.0" + on-exit-leak-free "^0.2.0" + pino-abstract-transport v0.5.0 + pino-std-serializers "^4.0.0" + process-warning "^1.0.0" + quick-format-unescaped "^4.0.3" + real-require "^0.1.0" + safe-stable-stringify "^2.1.0" + sonic-boom "^2.2.1" + thread-stream "^0.15.1" + pirates@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" @@ -14387,6 +15003,11 @@ pngjs@^3.3.0: resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f" integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w== +pngjs@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-5.0.0.tgz#e79dd2b215767fd9c04561c01236df960bce7fbb" + integrity sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw== + pocket-js-core@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/pocket-js-core/-/pocket-js-core-0.0.3.tgz#1ab278b9a6a5775e2bdc3c2c2e218057774061e4" @@ -14733,6 +15354,11 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== +process-warning@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-1.0.0.tgz#980a0b25dc38cd6034181be4b7726d89066b4616" + integrity sha512-du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q== + process@^0.11.10: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" @@ -14893,6 +15519,11 @@ proxy-addr@~2.0.5: forwarded "0.2.0" ipaddr.js "1.9.1" +proxy-compare@2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/proxy-compare/-/proxy-compare-2.5.1.tgz#17818e33d1653fbac8c2ec31406bce8a2966f600" + integrity sha512-oyfc0Tx87Cpwva5ZXezSp5V9vht1c7dZBhvuV/y3ctkgMVUmiAGDVeeB0dKhGSyT0v1ZTEQYpe/RXlBVBNuCLA== + prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" @@ -15001,6 +15632,16 @@ qrcode@1.4.4: pngjs "^3.3.0" yargs "^13.2.4" +qrcode@1.5.3: + version "1.5.3" + resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.3.tgz#03afa80912c0dccf12bc93f615a535aad1066170" + integrity sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg== + dependencies: + dijkstrajs "^1.0.1" + encode-utf8 "^1.0.3" + pngjs "^5.0.0" + yargs "^15.3.1" + qs@6.7.0: version "6.7.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" @@ -15034,6 +15675,16 @@ query-string@6.13.5: split-on-first "^1.0.0" strict-uri-encode "^2.0.0" +query-string@7.1.3: + version "7.1.3" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.3.tgz#a1cf90e994abb113a325804a972d98276fe02328" + integrity sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg== + dependencies: + decode-uri-component "^0.2.2" + filter-obj "^1.1.0" + split-on-first "^1.0.0" + strict-uri-encode "^2.0.0" + query-string@^5.0.1: version "5.1.1" resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" @@ -15073,6 +15724,11 @@ queue-microtask@^1.2.2: resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== +quick-format-unescaped@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz#93ef6dd8d3453cbc7970dd614fad4c5954d6b5a7" + integrity sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg== + quick-lru@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" @@ -15273,6 +15929,11 @@ readonly-date@^1.0.0: resolved "https://registry.yarnpkg.com/readonly-date/-/readonly-date-1.0.0.tgz#5af785464d8c7d7c40b9d738cbde8c646f97dcd9" integrity sha512-tMKIV7hlk0h4mO3JTmmVuIlJVXjKk3Sep9Bf5OH0O+758ruuVkUy2J9SttDLm91IEX/WHlXPSpxMGjPj4beMIQ== +real-require@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.1.0.tgz#736ac214caa20632847b7ca8c1056a0767df9381" + integrity sha512-r/H9MzAWtrv8aSVjPCMFpDMl5q66GqtmmRkRjpHTsp4zBAa+snZyiQNlMONiUmEJcsnaw0wCauJ2GWODr/aFkg== + realistic-structured-clone@^2.0.1: version "2.0.3" resolved "https://registry.yarnpkg.com/realistic-structured-clone/-/realistic-structured-clone-2.0.3.tgz#8a252a87db8278d92267ad7a168c4f43fa485795" @@ -15741,6 +16402,11 @@ safe-event-emitter@^1.0.1: dependencies: events "^3.0.0" +safe-json-utils@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/safe-json-utils/-/safe-json-utils-1.1.1.tgz#0e883874467d95ab914c3f511096b89bfb3e63b1" + integrity sha512-SAJWGKDs50tAbiDXLf89PDwt9XYkWyANFWVzn4dTXl5QyI8t2o/bW5/OJl3lvc2WVU4MEpTo9Yz5NVFNsp+OJQ== + safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" @@ -15753,6 +16419,11 @@ safe-stable-stringify@^1.1.0: resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz#c8a220ab525cd94e60ebf47ddc404d610dc5d84a" integrity sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw== +safe-stable-stringify@^2.1.0: + version "2.4.3" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886" + integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g== + "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -16167,6 +16838,13 @@ sodium-native@^2.3.0: nan "^2.14.0" node-gyp-build "^4.1.0" +sonic-boom@^2.2.1: + version "2.8.0" + resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-2.8.0.tgz#c1def62a77425090e6ad7516aad8eb402e047611" + integrity sha512-kuonw1YOYYNOve5iHdSahXPOK49GqwA+LZhI6Wz/l0rP57iKyXXIHaRagOBHAPmGwJC6od2Z9zgvZ5loSgMlVg== + dependencies: + atomic-sleep "^1.0.0" + sort-keys@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128" @@ -16285,6 +16963,11 @@ split2@^3.0.0: dependencies: readable-stream "^3.0.0" +split2@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4" + integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg== + split@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" @@ -16851,6 +17534,13 @@ thenify-all@^1.0.0: dependencies: any-promise "^1.0.0" +thread-stream@^0.15.1: + version "0.15.2" + resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-0.15.2.tgz#fb95ad87d2f1e28f07116eb23d85aba3bc0425f4" + integrity sha512-UkEhKIg2pD+fjkHQKyJO3yoIvAP3N6RlNFt2dUhcS1FGvCD1cQa1M/PGknCLFIyZdtJOWQjejp7bdNqmN7zwdA== + dependencies: + real-require "^0.1.0" + throat@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" @@ -17107,7 +17797,7 @@ ts-node@^8.10.2: source-map-support "^0.5.17" yn "3.1.1" -tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0: +tslib@1.14.1, tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== @@ -17117,6 +17807,11 @@ tslib@^2.0.0, tslib@^2.1.0, tslib@^2.2.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== +tslib@^2.3.1: + version "2.6.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== + tslib@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" @@ -17297,6 +17992,11 @@ typescript@^4.3.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== +typescript@^5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" + integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== + typeson-registry@^1.0.0-alpha.20: version "1.0.0-alpha.39" resolved "https://registry.yarnpkg.com/typeson-registry/-/typeson-registry-1.0.0-alpha.39.tgz#9e0f5aabd5eebfcffd65a796487541196f4b1211" @@ -17321,6 +18021,13 @@ uid-number@0.0.6: resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" integrity sha1-DqEOgDXo61uOREnwbaHHMGY7qoE= +uint8arrays@^3.0.0, uint8arrays@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-3.1.1.tgz#2d8762acce159ccd9936057572dade9459f65ae0" + integrity sha512-+QJa8QRnbdXVpHYjLoTpJIdCTiw9Ir62nocClWuXIq2JIh4Uta0cQsTSpFL678p2CN8B+XSApwcU+pQEqVpKWg== + dependencies: + multiformats "^9.4.2" + ultron@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" @@ -17488,6 +18195,11 @@ use-subscription@^1.3.0: dependencies: object-assign "^4.1.1" +use-sync-external-store@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" + integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== + use@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" @@ -17603,6 +18315,14 @@ validate@^5.1.0: eivindfjeldstad-dot "0.0.1" typecast "0.0.1" +valtio@1.11.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/valtio/-/valtio-1.11.0.tgz#c029dcd17a0f99d2fbec933721fe64cfd32a31ed" + integrity sha512-65Yd0yU5qs86b5lN1eu/nzcTgQ9/6YnD6iO+DDaDbQLn1Zv2w12Gwk43WkPlUBxk5wL/6cD5YMFf7kj6HZ1Kpg== + dependencies: + proxy-compare "2.5.1" + use-sync-external-store "1.2.0" + varint@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/varint/-/varint-5.0.0.tgz#d826b89f7490732fabc0c0ed693ed475dcb29ebf" @@ -18261,6 +18981,11 @@ ws@^7, ws@^7.2.0: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== +ws@^7.5.1: + version "7.5.9" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" + integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== + ws@^8.5.0: version "8.13.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" @@ -18447,7 +19172,7 @@ yargs@^14.2.2: y18n "^4.0.0" yargs-parser "^15.0.1" -yargs@^15.4.1: +yargs@^15.3.1, yargs@^15.4.1: version "15.4.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== From fc639329fe77bc255b88a4cfcadec2ac174dc68a Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Mon, 11 Sep 2023 11:02:54 +1000 Subject: [PATCH 02/18] chore: resolve json modules & tidy --- examples/sandbox/tsconfig.json | 5 +++++ packages/hdwallet-walletconnectV2/src/adapter.ts | 7 +++---- .../hdwallet-walletconnectV2/src/walletconnect.ts | 12 ++++++------ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/examples/sandbox/tsconfig.json b/examples/sandbox/tsconfig.json index e69de29bb..1589f985f 100644 --- a/examples/sandbox/tsconfig.json +++ b/examples/sandbox/tsconfig.json @@ -0,0 +1,5 @@ +{ + "compilerOptions": { + "resolveJsonModule": true, + } +} \ No newline at end of file diff --git a/packages/hdwallet-walletconnectV2/src/adapter.ts b/packages/hdwallet-walletconnectV2/src/adapter.ts index f63d51027..835d2b753 100644 --- a/packages/hdwallet-walletconnectV2/src/adapter.ts +++ b/packages/hdwallet-walletconnectV2/src/adapter.ts @@ -3,8 +3,6 @@ import { EthereumProvider } from "@walletconnect/ethereum-provider"; import { EthereumProviderOptions } from "@walletconnect/ethereum-provider/dist/types/EthereumProvider"; import { WalletConnectV2HDWallet } from "hdwallet-walletconnectV2/src/walletconnect"; -// import { WalletConnectV2HDWallet } from "./walletconnect"; - export class WalletConnectV2Adapter { keyring: core.Keyring; private readonly providerConfig: EthereumProviderOptions; @@ -28,6 +26,7 @@ export class WalletConnectV2Adapter { throw new Error("WalletConnectV2 provider configuration not set."); } + // TODO: Swap with UniversalProvider: https://docs.walletconnect.com/2.0/advanced/providers/universal const provider = await EthereumProvider.init(this.providerConfig); const wallet = new WalletConnectV2HDWallet(provider); @@ -35,10 +34,10 @@ export class WalletConnectV2Adapter { await wallet.initialize(); const deviceID = await wallet.getDeviceID(); this.keyring.add(wallet, deviceID); - this.keyring.emit(["WalletConnect", deviceID, core.Events.CONNECT], deviceID); + this.keyring.emit(["WalletConnect", deviceID, core.Events.CONNECT], deviceID); // TODO: emit "WalletConnectV2"? return wallet; } catch (error) { - console.error("Could not pair WalletConnect"); + console.error("Could not pair WalletConnectV2"); throw error; } } diff --git a/packages/hdwallet-walletconnectV2/src/walletconnect.ts b/packages/hdwallet-walletconnectV2/src/walletconnect.ts index e3cb1b59e..2ad16909b 100644 --- a/packages/hdwallet-walletconnectV2/src/walletconnect.ts +++ b/packages/hdwallet-walletconnectV2/src/walletconnect.ts @@ -116,13 +116,13 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { readonly _supportsETHInfo = true; readonly _supportsBTCInfo = false; readonly _supportsBTC = false; - readonly _isWalletConnect = true; + readonly _isWalletConnect = true; // TODO: _isWalletConnectV2? readonly _supportsEthSwitchChain = false; - readonly _supportsAvalanche = false; - readonly _supportsOptimism = false; - readonly _supportsBSC = false; - readonly _supportsPolygon = false; - readonly _supportsGnosis = false; + readonly _supportsAvalanche = true; + readonly _supportsOptimism = true; + readonly _supportsBSC = true; + readonly _supportsPolygon = true; + readonly _supportsGnosis = true; info: WalletConnectV2WalletInfo & core.HDWalletInfo; provider: EthereumProvider; From 27cf4626ca7dd77321f2d37116d4fa20cbb6d6d6 Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Mon, 11 Sep 2023 13:56:34 +1000 Subject: [PATCH 03/18] chore: building & skeleton in sandbox --- examples/sandbox/index.html | 1 + examples/sandbox/index.ts | 24 +++++++++++++++++++ examples/sandbox/package.json | 1 + .../hdwallet-walletconnectV2/package.json | 6 ++--- .../hdwallet-walletconnectV2/src/adapter.ts | 3 ++- .../hdwallet-walletconnectV2/tsconfig.json | 15 +++++++++--- yarn.lock | 13 +++++----- 7 files changed, 49 insertions(+), 14 deletions(-) diff --git a/examples/sandbox/index.html b/examples/sandbox/index.html index 83bad8084..84a0085ef 100644 --- a/examples/sandbox/index.html +++ b/examples/sandbox/index.html @@ -121,6 +121,7 @@

Select

+ diff --git a/examples/sandbox/index.ts b/examples/sandbox/index.ts index 6a36e2337..989dec11f 100644 --- a/examples/sandbox/index.ts +++ b/examples/sandbox/index.ts @@ -16,7 +16,9 @@ import * as tallyHo from "@shapeshiftoss/hdwallet-tallyho"; import * as trezorConnect from "@shapeshiftoss/hdwallet-trezor-connect"; import { WalletConnectProviderConfig } from "@shapeshiftoss/hdwallet-walletconnect"; import * as walletConnect from "@shapeshiftoss/hdwallet-walletconnect"; +import * as walletConnectv2 from "@shapeshiftoss/hdwallet-walletconnectv2"; import * as xdefi from "@shapeshiftoss/hdwallet-xdefi"; +import { EthereumProviderOptions } from "@walletconnect/ethereum-provider/dist/types/EthereumProvider"; import $ from "jquery"; import Web3 from "web3"; @@ -77,6 +79,7 @@ const walletConnectOptions: WalletConnectProviderConfig = { 1: "https://mainnet.infura.io/v3/d734c7eebcdf400185d7eb67322a7e57", }, }; +const walletConnectV2Options: EthereumProviderOptions = {}; const coinbaseOptions: CoinbaseProviderConfig = { appName: "ShapeShift Sandbox", @@ -109,6 +112,7 @@ const portisAdapter = portis.PortisAdapter.useKeyring(keyring, { portisAppId }); const metaMaskAdapter = metaMask.MetaMaskAdapter.useKeyring(keyring); const tallyHoAdapter = tallyHo.TallyHoAdapter.useKeyring(keyring); const walletConnectAdapter = walletConnect.WalletConnectAdapter.useKeyring(keyring, walletConnectOptions); +const walletConnectV2Adapter = walletConnectv2.WalletConnectV2Adapter.useKeyring(keyring, walletConnectV2Options); const xdefiAdapter = xdefi.XDEFIAdapter.useKeyring(keyring); const keplrAdapter = keplr.KeplrAdapter.useKeyring(keyring); const nativeAdapter = native.NativeAdapter.useKeyring(keyring); @@ -141,6 +145,7 @@ const $metaMask = $("#metaMask"); const $coinbase = $("#coinbase"); const $tallyHo = $("#tallyHo"); const $walletConnect = $("#walletConnect"); +const $walletConnectV2 = $("#walletConnectV2"); const $xdefi = $("#xdefi"); const $keplr = $("#keplr"); const $keyring = $("#keyring"); @@ -283,6 +288,19 @@ $walletConnect.on("click", async (e) => { } }); +$walletConnectV2.on("click", async (e) => { + e.preventDefault(); + try { + wallet = await walletConnectV2Adapter.pairDevice(); + window["wallet"] = wallet; + let deviceID = "nothing"; + deviceID = await wallet.getDeviceID(); + $("#keyring select").val(deviceID); + } catch (error) { + console.error(error); + } +}); + $xdefi.on("click", async (e) => { e.preventDefault(); wallet = await xdefiAdapter.pairDevice(); @@ -401,6 +419,12 @@ async function deviceConnected(deviceId) { console.error("Could not initialize WalletConnectAdapter", e); } + try { + await walletConnectV2Adapter.initialize(); + } catch (e) { + console.error("Could not initialize WalletConnectV2Adapter", e); + } + for (const deviceID of Object.keys(keyring.wallets)) { await deviceConnected(deviceID); } diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 669b4dbe8..98b8a3e74 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -24,6 +24,7 @@ "@shapeshiftoss/hdwallet-trezor": "1.50.4", "@shapeshiftoss/hdwallet-trezor-connect": "1.50.4", "@shapeshiftoss/hdwallet-walletconnect": "1.50.4", + "@shapeshiftoss/hdwallet-walletconnectv2": "/Users/apotheosis/git/shapeshift/hdwallet/packages/hdwallet-walletconnectV2", "@shapeshiftoss/hdwallet-xdefi": "1.50.4", "bip32": "^2.0.4", "jquery": "^3.4.1", diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index e7d894b75..5eeedf58d 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -17,11 +17,9 @@ "dependencies": { "@shapeshiftoss/hdwallet-core": "1.50.4", "@walletconnect/ethereum-provider": "^2.10.0", - "@walletconnect/modal": "^2.6.1", - "ethers": "^5.6.5" + "@walletconnect/modal": "^2.6.1" }, "devDependencies": { - "@walletconnect/types": "^2.10.0", - "typescript": "^5.2.2" + "typescript": "^4.3.2" } } diff --git a/packages/hdwallet-walletconnectV2/src/adapter.ts b/packages/hdwallet-walletconnectV2/src/adapter.ts index 835d2b753..3bb5befc1 100644 --- a/packages/hdwallet-walletconnectV2/src/adapter.ts +++ b/packages/hdwallet-walletconnectV2/src/adapter.ts @@ -1,7 +1,8 @@ import * as core from "@shapeshiftoss/hdwallet-core"; import { EthereumProvider } from "@walletconnect/ethereum-provider"; import { EthereumProviderOptions } from "@walletconnect/ethereum-provider/dist/types/EthereumProvider"; -import { WalletConnectV2HDWallet } from "hdwallet-walletconnectV2/src/walletconnect"; + +import { WalletConnectV2HDWallet } from "./walletconnect"; export class WalletConnectV2Adapter { keyring: core.Keyring; diff --git a/packages/hdwallet-walletconnectV2/tsconfig.json b/packages/hdwallet-walletconnectV2/tsconfig.json index 485533874..51737df4e 100644 --- a/packages/hdwallet-walletconnectV2/tsconfig.json +++ b/packages/hdwallet-walletconnectV2/tsconfig.json @@ -5,7 +5,16 @@ "outDir": "dist", "skipLibCheck": true }, - "include": ["src/**/*"], - "exclude": ["node_modules", "dist"], - "references": [{ "path": "../hdwallet-core" }] + "include": [ + "src/**/*" + ], + "exclude": [ + "node_modules", + "dist" + ], + "references": [ + { + "path": "../hdwallet-core" + } + ] } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index efabc85cc..43629eff0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4846,6 +4846,12 @@ rxjs "^6.4.0" type-assertions "^1.1.0" +"@shapeshiftoss/hdwallet-walletconnectv2@file:packages/hdwallet-walletconnectV2": + version "1.50.4" + dependencies: + "@shapeshiftoss/hdwallet-core" "1.50.4" + "@walletconnect/ethereum-provider" "^2.10.0" + "@shapeshiftoss/proto-tx-builder@^0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@shapeshiftoss/proto-tx-builder/-/proto-tx-builder-0.8.0.tgz#12523e76e6ae2c794e8ad5439dedf65d30c78185" @@ -6081,7 +6087,7 @@ dependencies: tslib "1.14.1" -"@walletconnect/types@2.10.0", "@walletconnect/types@^2.10.0": +"@walletconnect/types@2.10.0": version "2.10.0" resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.10.0.tgz#5d63235b49e03d609521402a4b49627dbc4ed514" integrity sha512-kSTA/WZnbKdEbvbXSW16Ty6dOSzOZCHnGg6JH7q1MuraalD2HuNg00lVVu7QAZ/Rj1Gn9DAkrgP5Wd5a8Xq//Q== @@ -17992,11 +17998,6 @@ typescript@^4.3.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== -typescript@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" - integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== - typeson-registry@^1.0.0-alpha.20: version "1.0.0-alpha.39" resolved "https://registry.yarnpkg.com/typeson-registry/-/typeson-registry-1.0.0-alpha.39.tgz#9e0f5aabd5eebfcffd65a796487541196f4b1211" From b06808db3cc0cd4de29bf2ce8b0b0ac37ee859cb Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Tue, 12 Sep 2023 09:04:53 +1000 Subject: [PATCH 04/18] chore: wire up sandbox, add TODOs --- examples/sandbox/index.html | 4 +- examples/sandbox/index.ts | 28 ++++++++++++- .../hdwallet-walletconnectV2/package.json | 3 +- .../hdwallet-walletconnectV2/src/adapter.ts | 2 +- .../hdwallet-walletconnectV2/src/ethereum.ts | 25 +++++++----- .../src/walletconnect.ts | 40 +++++++++++++------ 6 files changed, 76 insertions(+), 26 deletions(-) diff --git a/examples/sandbox/index.html b/examples/sandbox/index.html index 84a0085ef..53cba9777 100644 --- a/examples/sandbox/index.html +++ b/examples/sandbox/index.html @@ -121,7 +121,7 @@

Select

- + @@ -146,6 +146,8 @@

Manage

+ +
diff --git a/examples/sandbox/index.ts b/examples/sandbox/index.ts index 989dec11f..757a378d4 100644 --- a/examples/sandbox/index.ts +++ b/examples/sandbox/index.ts @@ -79,7 +79,13 @@ const walletConnectOptions: WalletConnectProviderConfig = { 1: "https://mainnet.infura.io/v3/d734c7eebcdf400185d7eb67322a7e57", }, }; -const walletConnectV2Options: EthereumProviderOptions = {}; +const walletConnectV2Options: EthereumProviderOptions = { + projectId: "5abef0455c768644c2bc866f1520374f", + chains: [1], + optionalChains: [100], + optionalMethods: ["eth_signTypedData", "eth_signTypedData_v4", "eth_sign"], + showQrModal: true, +}; const coinbaseOptions: CoinbaseProviderConfig = { appName: "ShapeShift Sandbox", @@ -542,6 +548,8 @@ const $getXpubs = $("#getXpubs"); const $doPing = $("#doPing"); const $doWipe = $("#doWipe"); const $doLoadDevice = $("#doLoadDevice"); +const $doDisconnect = $("#doDisconnect"); +const $doClearSession = $("#doClearSession"); const $manageResults = $("#manageResults"); $getVendor.on("click", async (e) => { @@ -675,6 +683,24 @@ $doLoadDevice.on("click", (e) => { }); }); +$doDisconnect.on("click", (e) => { + e.preventDefault(); + if (!wallet) { + $manageResults.val("No wallet?"); + return; + } + wallet.disconnect().then(() => $manageResults.val("Disconnected")); +}); + +$doClearSession.on("click", (e) => { + e.preventDefault(); + if (!wallet) { + $manageResults.val("No wallet?"); + return; + } + wallet.clearSession().then(() => $manageResults.val("Session Cleared")); +}); + const $openApp = $("#openApp"); const $ledgerAppToOpen = $("#ledgerAppToOpen"); const $validateApp = $("#validateApp"); diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index 5eeedf58d..0cfa48833 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -17,7 +17,8 @@ "dependencies": { "@shapeshiftoss/hdwallet-core": "1.50.4", "@walletconnect/ethereum-provider": "^2.10.0", - "@walletconnect/modal": "^2.6.1" + "@walletconnect/modal": "^2.6.1", + "ethers": "^5.6.5" }, "devDependencies": { "typescript": "^4.3.2" diff --git a/packages/hdwallet-walletconnectV2/src/adapter.ts b/packages/hdwallet-walletconnectV2/src/adapter.ts index 3bb5befc1..b79d7f3c1 100644 --- a/packages/hdwallet-walletconnectV2/src/adapter.ts +++ b/packages/hdwallet-walletconnectV2/src/adapter.ts @@ -21,7 +21,7 @@ export class WalletConnectV2Adapter { return Object.keys(this.keyring.wallets).length; } - public async pairDevice(): Promise { + public async pairDevice(): Promise { try { if (!this.providerConfig) { throw new Error("WalletConnectV2 provider configuration not set."); diff --git a/packages/hdwallet-walletconnectV2/src/ethereum.ts b/packages/hdwallet-walletconnectV2/src/ethereum.ts index af310ebf7..c611dbc93 100644 --- a/packages/hdwallet-walletconnectV2/src/ethereum.ts +++ b/packages/hdwallet-walletconnectV2/src/ethereum.ts @@ -1,4 +1,5 @@ import * as core from "@shapeshiftoss/hdwallet-core"; +import EthereumProvider from "@walletconnect/ethereum-provider"; import * as ethers from "ethers"; export function describeETHPath(path: core.BIP32Path): core.PathDescription { @@ -33,16 +34,16 @@ export function describeETHPath(path: core.BIP32Path): core.PathDescription { export async function ethSignTx( args: core.ETHSignTx & { from: string }, - provider: any + provider: EthereumProvider ): Promise { - return await provider.wc.signTransaction(args); + return await provider.request({ method: "eth_signTransaction", params: [args] }); } export async function ethSendTx( args: core.ETHSignTx & { from: string }, - provider: any + provider: EthereumProvider ): Promise { - const txHash: string = await provider.wc.sendTransaction(args); + const txHash: string = await provider.request({ method: "eth_sendTransaction", params: [args] }); return txHash ? { hash: txHash, @@ -52,20 +53,24 @@ export async function ethSendTx( export async function ethSignMessage( args: { data: string | ethers.Bytes; fromAddress: string }, - provider: any + provider: EthereumProvider ): Promise { const buffer = ethers.utils.isBytes(args.data) ? Buffer.from(ethers.utils.arrayify(args.data)) : Buffer.from(args.data); - return await provider.wc.signMessage([buffer.toString("hex"), args.fromAddress]); + + return await provider.request({ + method: "eth_sign", + params: [args.fromAddress, buffer], + }); } -export async function ethGetAddress(provider: any): Promise { +export async function ethGetAddress(provider: EthereumProvider): Promise { try { - if (!(provider && provider.request && provider.connected)) { - throw new Error("No WalletConnect provider available."); + if (!(provider && provider.connected)) { + throw new Error("No WalletConnectV2 provider available."); } - const ethAccounts = await provider.request({ + const ethAccounts: string[] = await provider.request({ method: "eth_accounts", }); return ethAccounts[0]; diff --git a/packages/hdwallet-walletconnectV2/src/walletconnect.ts b/packages/hdwallet-walletconnectV2/src/walletconnect.ts index 2ad16909b..1f4e9af4b 100644 --- a/packages/hdwallet-walletconnectV2/src/walletconnect.ts +++ b/packages/hdwallet-walletconnectV2/src/walletconnect.ts @@ -5,6 +5,7 @@ import isObject from "lodash/isObject"; import * as eth from "./ethereum"; +// FIXME: what is the actual state? interface WCState { connected?: boolean; chainId: number; @@ -12,8 +13,8 @@ interface WCState { address?: string; } -export function isWalletConnect(wallet: core.HDWallet): wallet is WalletConnectV2HDWallet { - return isObject(wallet) && (wallet as any)._isWalletConnect; +export function isWalletConnectV2(wallet: core.HDWallet): wallet is WalletConnectV2HDWallet { + return isObject(wallet) && (wallet as any)._isWalletConnectV2; } /** @@ -67,6 +68,7 @@ export class WalletConnectV2WalletInfo implements core.HDWalletInfo, core.ETHWal return true; } + // FIXME public describePath(msg: core.DescribePath): core.PathDescription { switch (msg.coin) { case "Ethereum": @@ -81,6 +83,7 @@ export class WalletConnectV2WalletInfo implements core.HDWalletInfo, core.ETHWal return undefined; } + // FIXME public async ethSupportsNetwork(chainId = 1): Promise { return chainId === 1; } @@ -93,8 +96,9 @@ export class WalletConnectV2WalletInfo implements core.HDWalletInfo, core.ETHWal return false; } + // FIXME: confirm this is true public async ethSupportsEIP1559(): Promise { - return false; + return true; } public ethGetAccountPaths(msg: core.ETHGetAccountPath): Array { @@ -116,7 +120,7 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { readonly _supportsETHInfo = true; readonly _supportsBTCInfo = false; readonly _supportsBTC = false; - readonly _isWalletConnect = true; // TODO: _isWalletConnectV2? + readonly _isWalletConnectV2 = true; readonly _supportsEthSwitchChain = false; readonly _supportsAvalanche = true; readonly _supportsOptimism = true; @@ -127,9 +131,9 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { info: WalletConnectV2WalletInfo & core.HDWalletInfo; provider: EthereumProvider; connected = false; - chainId = -1; + chainId = -1; // FIXME: undefined? accounts: string[] = []; - ethAddress = ""; + ethAddress = ""; // FIXME: undefined? constructor(provider: EthereumProvider) { this.provider = provider; @@ -156,6 +160,7 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { return "WalletConnectV2"; } + // FIXME: flesh out? public async initialize(): Promise { /** Subscribe to EIP-1193 events */ this.provider.on("session_event", async (args) => { @@ -165,9 +170,11 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { /** Note that this event does not fire on page reload */ this.provider.on("connect", (args) => { - this.onConnect(args); + const { chainId } = args; + this.setState({ connected: true, chainId: parseInt(chainId, 10) }); }); + // FIXME: error is always defined? this.provider.on("disconnect", (error) => { if (error) { throw error; @@ -175,6 +182,15 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { this.onDisconnect(); }); + // TODO + this.provider.on("message", (args) => {}); + this.provider.on("chainChanged", (args) => {}); + this.provider.on("accountsChanged", (args) => {}); + this.provider.on("session_event", (args) => {}); + this.provider.on("session_delete", (args) => {}); + this.provider.on("session_update", (args) => {}); + this.provider.on("display_uri", (args) => {}); + /** Display QR modal to connect */ await this.provider.enable(); } @@ -290,6 +306,7 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { await this.provider.disconnect(); } + // FIXME public async ethSupportsNetwork(chainId = 1): Promise { return chainId === 1; } @@ -302,6 +319,7 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { return false; } + // FIXME? public async ethSupportsEIP1559(): Promise { return false; } @@ -320,6 +338,7 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { } const address = await eth.ethGetAddress(this.provider); if (address) { + // FIXME: why does a getter set something? this.ethAddress = address; return address; } else { @@ -355,6 +374,7 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { return eth.ethSignMessage({ data: msg.message, fromAddress: this.ethAddress }, this.provider); } + // FIXME: is this still true for V2? // eslint-disable-next-line @typescript-eslint/no-unused-vars public async ethVerifyMessage(msg: core.ETHVerifyMessage): Promise { console.error("Method ethVerifyMessage unsupported for WalletConnectV2 wallet!"); @@ -369,11 +389,6 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { return "WalletConnectV2"; } - private onConnect(payload: ProviderInfo) { - const { chainId } = payload; - this.setState({ connected: true, chainId: parseInt(chainId, 10) }); - } - private onSessionUpdate(accounts: string[], chainId: number) { const [address] = accounts; this.setState({ accounts, address, chainId }); @@ -385,6 +400,7 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { * Resets state. */ private onDisconnect() { + // FIXME: chinaId set to 1? this.setState({ connected: false, chainId: 1, accounts: [], address: "" }); } From 6c8fe3e3a74960bcd4379b1d5a218255c9a03572 Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Tue, 12 Sep 2023 10:11:56 +1000 Subject: [PATCH 05/18] feat: send & verify working --- examples/sandbox/index.ts | 10 +++++++- .../hdwallet-walletconnectV2/src/adapter.ts | 2 +- .../hdwallet-walletconnectV2/src/ethereum.ts | 25 +++++++++++++++++-- .../hdwallet-walletconnectV2/src/index.ts | 2 +- .../{walletconnect.ts => walletconnectV2.ts} | 5 +--- 5 files changed, 35 insertions(+), 9 deletions(-) rename packages/hdwallet-walletconnectV2/src/{walletconnect.ts => walletconnectV2.ts} (98%) diff --git a/examples/sandbox/index.ts b/examples/sandbox/index.ts index 757a378d4..5845ecc81 100644 --- a/examples/sandbox/index.ts +++ b/examples/sandbox/index.ts @@ -83,7 +83,15 @@ const walletConnectV2Options: EthereumProviderOptions = { projectId: "5abef0455c768644c2bc866f1520374f", chains: [1], optionalChains: [100], - optionalMethods: ["eth_signTypedData", "eth_signTypedData_v4", "eth_sign"], + optionalMethods: [ + "eth_signTypedData", + "eth_signTypedData_v4", + "eth_sign", + "ethVerifyMessage", + "eth_accounts", + "eth_sendTransaction", + "eth_signTransaction", + ], showQrModal: true, }; diff --git a/packages/hdwallet-walletconnectV2/src/adapter.ts b/packages/hdwallet-walletconnectV2/src/adapter.ts index b79d7f3c1..ca3cc8db7 100644 --- a/packages/hdwallet-walletconnectV2/src/adapter.ts +++ b/packages/hdwallet-walletconnectV2/src/adapter.ts @@ -2,7 +2,7 @@ import * as core from "@shapeshiftoss/hdwallet-core"; import { EthereumProvider } from "@walletconnect/ethereum-provider"; import { EthereumProviderOptions } from "@walletconnect/ethereum-provider/dist/types/EthereumProvider"; -import { WalletConnectV2HDWallet } from "./walletconnect"; +import { WalletConnectV2HDWallet } from "./walletconnectV2"; export class WalletConnectV2Adapter { keyring: core.Keyring; diff --git a/packages/hdwallet-walletconnectV2/src/ethereum.ts b/packages/hdwallet-walletconnectV2/src/ethereum.ts index c611dbc93..d44840d97 100644 --- a/packages/hdwallet-walletconnectV2/src/ethereum.ts +++ b/packages/hdwallet-walletconnectV2/src/ethereum.ts @@ -40,10 +40,27 @@ export async function ethSignTx( } export async function ethSendTx( - args: core.ETHSignTx & { from: string }, + msg: core.ETHSignTx & { from: string }, provider: EthereumProvider ): Promise { - const txHash: string = await provider.request({ method: "eth_sendTransaction", params: [args] }); + const utxBase = { + from: msg.from, + to: msg.to, + value: msg.value, + data: msg.data, + chainId: msg.chainId, + nonce: msg.nonce, + gasLimit: msg.gasLimit, + }; + + const utx = msg.maxFeePerGas + ? { + ...utxBase, + maxFeePerGas: msg.maxFeePerGas, + maxPriorityFeePerGas: msg.maxPriorityFeePerGas, + } + : { ...utxBase, gasPrice: msg.gasPrice }; + const txHash: string = await provider.request({ method: "eth_sendTransaction", params: [utx] }); return txHash ? { hash: txHash, @@ -79,3 +96,7 @@ export async function ethGetAddress(provider: EthereumProvider): Promise { + return await provider.request({ method: "ethVerifyMessage", params: [args.message, args.signature] }); +} diff --git a/packages/hdwallet-walletconnectV2/src/index.ts b/packages/hdwallet-walletconnectV2/src/index.ts index caab58802..e99ea78a1 100644 --- a/packages/hdwallet-walletconnectV2/src/index.ts +++ b/packages/hdwallet-walletconnectV2/src/index.ts @@ -1,2 +1,2 @@ export * from "./adapter"; -export * from "./walletconnect"; +export * from "./walletconnectV2"; diff --git a/packages/hdwallet-walletconnectV2/src/walletconnect.ts b/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts similarity index 98% rename from packages/hdwallet-walletconnectV2/src/walletconnect.ts rename to packages/hdwallet-walletconnectV2/src/walletconnectV2.ts index 1f4e9af4b..eba196c74 100644 --- a/packages/hdwallet-walletconnectV2/src/walletconnect.ts +++ b/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts @@ -374,11 +374,8 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { return eth.ethSignMessage({ data: msg.message, fromAddress: this.ethAddress }, this.provider); } - // FIXME: is this still true for V2? - // eslint-disable-next-line @typescript-eslint/no-unused-vars public async ethVerifyMessage(msg: core.ETHVerifyMessage): Promise { - console.error("Method ethVerifyMessage unsupported for WalletConnectV2 wallet!"); - return null; + return eth.ethVerifyMessage(this.provider, msg); } public async getDeviceID(): Promise { From fe52fdcd9bb38bc05caf278b5cdee3d886679828 Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Tue, 12 Sep 2023 12:06:31 +1000 Subject: [PATCH 06/18] fix: exclude addressNList from payload --- .../hdwallet-walletconnectV2/src/ethereum.ts | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/packages/hdwallet-walletconnectV2/src/ethereum.ts b/packages/hdwallet-walletconnectV2/src/ethereum.ts index d44840d97..40273d5cc 100644 --- a/packages/hdwallet-walletconnectV2/src/ethereum.ts +++ b/packages/hdwallet-walletconnectV2/src/ethereum.ts @@ -2,6 +2,26 @@ import * as core from "@shapeshiftoss/hdwallet-core"; import EthereumProvider from "@walletconnect/ethereum-provider"; import * as ethers from "ethers"; +const getUnsignedTxFromMessage = (msg: core.ETHSignTx & { from: string }) => { + const utxBase = { + from: msg.from, + to: msg.to, + value: msg.value, + data: msg.data, + chainId: msg.chainId, + nonce: msg.nonce, + gasLimit: msg.gasLimit, + }; + + return msg.maxFeePerGas + ? { + ...utxBase, + maxFeePerGas: msg.maxFeePerGas, + maxPriorityFeePerGas: msg.maxPriorityFeePerGas, + } + : { ...utxBase, gasPrice: msg.gasPrice }; +}; + export function describeETHPath(path: core.BIP32Path): core.PathDescription { const pathStr = core.addressNListToBIP32(path); const unknown: core.PathDescription = { @@ -36,30 +56,15 @@ export async function ethSignTx( args: core.ETHSignTx & { from: string }, provider: EthereumProvider ): Promise { - return await provider.request({ method: "eth_signTransaction", params: [args] }); + const utx = getUnsignedTxFromMessage(args); + return await provider.request({ method: "eth_signTransaction", params: [utx] }); } export async function ethSendTx( msg: core.ETHSignTx & { from: string }, provider: EthereumProvider ): Promise { - const utxBase = { - from: msg.from, - to: msg.to, - value: msg.value, - data: msg.data, - chainId: msg.chainId, - nonce: msg.nonce, - gasLimit: msg.gasLimit, - }; - - const utx = msg.maxFeePerGas - ? { - ...utxBase, - maxFeePerGas: msg.maxFeePerGas, - maxPriorityFeePerGas: msg.maxPriorityFeePerGas, - } - : { ...utxBase, gasPrice: msg.gasPrice }; + const utx = getUnsignedTxFromMessage(msg); const txHash: string = await provider.request({ method: "eth_sendTransaction", params: [utx] }); return txHash ? { From c617ee147ad21a0463b2c327704e04c9168839f9 Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Thu, 21 Sep 2023 09:30:00 +1000 Subject: [PATCH 07/18] perf: do not import * --- packages/hdwallet-walletconnect/src/adapter.ts | 10 +++++----- packages/hdwallet-walletconnectV2/src/adapter.ts | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/hdwallet-walletconnect/src/adapter.ts b/packages/hdwallet-walletconnect/src/adapter.ts index 0da7bd8b0..797c88585 100644 --- a/packages/hdwallet-walletconnect/src/adapter.ts +++ b/packages/hdwallet-walletconnect/src/adapter.ts @@ -1,4 +1,4 @@ -import * as core from "@shapeshiftoss/hdwallet-core"; +import { Events, Keyring } from "@shapeshiftoss/hdwallet-core"; import WalletConnectProvider from "@walletconnect/web3-provider"; import { WalletConnectHDWallet } from "./walletconnect"; @@ -10,15 +10,15 @@ export type WalletConnectProviderConfig = | { rpc: { [key: number]: string } }; export class WalletConnectAdapter { - keyring: core.Keyring; + keyring: Keyring; private providerConfig: WalletConnectProviderConfig; - private constructor(keyring: core.Keyring, config: WalletConnectProviderConfig) { + private constructor(keyring: Keyring, config: WalletConnectProviderConfig) { this.keyring = keyring; this.providerConfig = config; } - public static useKeyring(keyring: core.Keyring, config: WalletConnectProviderConfig) { + public static useKeyring(keyring: Keyring, config: WalletConnectProviderConfig) { return new WalletConnectAdapter(keyring, config); } @@ -38,7 +38,7 @@ export class WalletConnectAdapter { await wallet.initialize(); const deviceID = await wallet.getDeviceID(); this.keyring.add(wallet, deviceID); - this.keyring.emit(["WalletConnect", deviceID, core.Events.CONNECT], deviceID); + this.keyring.emit(["WalletConnect", deviceID, Events.CONNECT], deviceID); return wallet; } catch (error) { console.error("Could not pair WalletConnect"); diff --git a/packages/hdwallet-walletconnectV2/src/adapter.ts b/packages/hdwallet-walletconnectV2/src/adapter.ts index ca3cc8db7..05a8450f7 100644 --- a/packages/hdwallet-walletconnectV2/src/adapter.ts +++ b/packages/hdwallet-walletconnectV2/src/adapter.ts @@ -1,19 +1,19 @@ -import * as core from "@shapeshiftoss/hdwallet-core"; +import { Events, Keyring } from "@shapeshiftoss/hdwallet-core"; import { EthereumProvider } from "@walletconnect/ethereum-provider"; import { EthereumProviderOptions } from "@walletconnect/ethereum-provider/dist/types/EthereumProvider"; import { WalletConnectV2HDWallet } from "./walletconnectV2"; export class WalletConnectV2Adapter { - keyring: core.Keyring; + keyring: Keyring; private readonly providerConfig: EthereumProviderOptions; - private constructor(keyring: core.Keyring, config: EthereumProviderOptions) { + private constructor(keyring: Keyring, config: EthereumProviderOptions) { this.keyring = keyring; this.providerConfig = config; } - public static useKeyring(keyring: core.Keyring, config: EthereumProviderOptions) { + public static useKeyring(keyring: Keyring, config: EthereumProviderOptions) { return new WalletConnectV2Adapter(keyring, config); } @@ -35,7 +35,7 @@ export class WalletConnectV2Adapter { await wallet.initialize(); const deviceID = await wallet.getDeviceID(); this.keyring.add(wallet, deviceID); - this.keyring.emit(["WalletConnect", deviceID, core.Events.CONNECT], deviceID); // TODO: emit "WalletConnectV2"? + this.keyring.emit(["WalletConnect", deviceID, Events.CONNECT], deviceID); // TODO: emit "WalletConnectV2"? return wallet; } catch (error) { console.error("Could not pair WalletConnectV2"); From a7138d91de947cb68006979276935e6426e39e9e Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Thu, 21 Sep 2023 09:37:46 +1000 Subject: [PATCH 08/18] perf: more import optimisation --- .../hdwallet-walletconnectV2/src/ethereum.ts | 33 +++++---- .../src/walletconnectV2.ts | 69 ++++++++++++------- 2 files changed, 67 insertions(+), 35 deletions(-) diff --git a/packages/hdwallet-walletconnectV2/src/ethereum.ts b/packages/hdwallet-walletconnectV2/src/ethereum.ts index 40273d5cc..21d4ed34f 100644 --- a/packages/hdwallet-walletconnectV2/src/ethereum.ts +++ b/packages/hdwallet-walletconnectV2/src/ethereum.ts @@ -1,8 +1,17 @@ -import * as core from "@shapeshiftoss/hdwallet-core"; +import type { + BIP32Path, + ETHSignedMessage, + ETHSignedTx, + ETHSignTx, + ETHTxHash, + ETHVerifyMessage, + PathDescription, +} from "@shapeshiftoss/hdwallet-core"; +import { addressNListToBIP32, slip44ByCoin } from "@shapeshiftoss/hdwallet-core"; import EthereumProvider from "@walletconnect/ethereum-provider"; import * as ethers from "ethers"; -const getUnsignedTxFromMessage = (msg: core.ETHSignTx & { from: string }) => { +const getUnsignedTxFromMessage = (msg: ETHSignTx & { from: string }) => { const utxBase = { from: msg.from, to: msg.to, @@ -22,9 +31,9 @@ const getUnsignedTxFromMessage = (msg: core.ETHSignTx & { from: string }) => { : { ...utxBase, gasPrice: msg.gasPrice }; }; -export function describeETHPath(path: core.BIP32Path): core.PathDescription { - const pathStr = core.addressNListToBIP32(path); - const unknown: core.PathDescription = { +export function describeETHPath(path: BIP32Path): PathDescription { + const pathStr = addressNListToBIP32(path); + const unknown: PathDescription = { verbose: pathStr, coin: "Ethereum", isKnown: false, @@ -34,7 +43,7 @@ export function describeETHPath(path: core.BIP32Path): core.PathDescription { if (path[0] !== 0x80000000 + 44) return unknown; - if (path[1] !== 0x80000000 + core.slip44ByCoin("Ethereum")) return unknown; + if (path[1] !== 0x80000000 + slip44ByCoin("Ethereum")) return unknown; if ((path[2] & 0x80000000) >>> 0 !== 0x80000000) return unknown; @@ -53,17 +62,17 @@ export function describeETHPath(path: core.BIP32Path): core.PathDescription { } export async function ethSignTx( - args: core.ETHSignTx & { from: string }, + args: ETHSignTx & { from: string }, provider: EthereumProvider -): Promise { +): Promise { const utx = getUnsignedTxFromMessage(args); return await provider.request({ method: "eth_signTransaction", params: [utx] }); } export async function ethSendTx( - msg: core.ETHSignTx & { from: string }, + msg: ETHSignTx & { from: string }, provider: EthereumProvider -): Promise { +): Promise { const utx = getUnsignedTxFromMessage(msg); const txHash: string = await provider.request({ method: "eth_sendTransaction", params: [utx] }); return txHash @@ -76,7 +85,7 @@ export async function ethSendTx( export async function ethSignMessage( args: { data: string | ethers.Bytes; fromAddress: string }, provider: EthereumProvider -): Promise { +): Promise { const buffer = ethers.utils.isBytes(args.data) ? Buffer.from(ethers.utils.arrayify(args.data)) : Buffer.from(args.data); @@ -102,6 +111,6 @@ export async function ethGetAddress(provider: EthereumProvider): Promise { +export async function ethVerifyMessage(provider: EthereumProvider, args: ETHVerifyMessage): Promise { return await provider.request({ method: "ethVerifyMessage", params: [args.message, args.signature] }); } diff --git a/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts b/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts index eba196c74..b22519117 100644 --- a/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts +++ b/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts @@ -1,6 +1,29 @@ -import * as core from "@shapeshiftoss/hdwallet-core"; +import type { + Coin, + DescribePath, + ETHAccountPath, + ETHGetAccountPath, + ETHSignedMessage, + ETHSignedTx, + ETHSignMessage, + ETHSignTx, + ETHTxHash, + ETHVerifyMessage, + ETHWallet, + ETHWalletInfo, + GetPublicKey, + HDWallet, + HDWalletInfo, + LoadDevice, + PathDescription, + Ping, + Pong, + PublicKey, + RecoverDevice, + ResetDevice, +} from "@shapeshiftoss/hdwallet-core"; +import { slip44ByCoin } from "@shapeshiftoss/hdwallet-core"; import EthereumProvider from "@walletconnect/ethereum-provider"; -import { ProviderInfo } from "@walletconnect/ethereum-provider/dist/types/types"; import isObject from "lodash/isObject"; import * as eth from "./ethereum"; @@ -13,7 +36,7 @@ interface WCState { address?: string; } -export function isWalletConnectV2(wallet: core.HDWallet): wallet is WalletConnectV2HDWallet { +export function isWalletConnectV2(wallet: HDWallet): wallet is WalletConnectV2HDWallet { return isObject(wallet) && (wallet as any)._isWalletConnectV2; } @@ -29,7 +52,7 @@ export function isWalletConnectV2(wallet: core.HDWallet): wallet is WalletConnec * 🚧 eth_sendRawTransaction * @see https://docs.walletconnect.com/ */ -export class WalletConnectV2WalletInfo implements core.HDWalletInfo, core.ETHWalletInfo { +export class WalletConnectV2WalletInfo implements HDWalletInfo, ETHWalletInfo { readonly _supportsETHInfo = true; readonly _supportsBTCInfo = false; public getVendor(): string { @@ -69,7 +92,7 @@ export class WalletConnectV2WalletInfo implements core.HDWalletInfo, core.ETHWal } // FIXME - public describePath(msg: core.DescribePath): core.PathDescription { + public describePath(msg: DescribePath): PathDescription { switch (msg.coin) { case "Ethereum": return eth.describeETHPath(msg.path); @@ -79,7 +102,7 @@ export class WalletConnectV2WalletInfo implements core.HDWalletInfo, core.ETHWal } // eslint-disable-next-line @typescript-eslint/no-unused-vars - public ethNextAccountPath(_msg: core.ETHAccountPath): core.ETHAccountPath | undefined { + public ethNextAccountPath(_msg: ETHAccountPath): ETHAccountPath | undefined { return undefined; } @@ -101,8 +124,8 @@ export class WalletConnectV2WalletInfo implements core.HDWalletInfo, core.ETHWal return true; } - public ethGetAccountPaths(msg: core.ETHGetAccountPath): Array { - const slip44 = core.slip44ByCoin(msg.coin); + public ethGetAccountPaths(msg: ETHGetAccountPath): Array { + const slip44 = slip44ByCoin(msg.coin); if (slip44 === undefined) return []; return [ { @@ -115,7 +138,7 @@ export class WalletConnectV2WalletInfo implements core.HDWalletInfo, core.ETHWal } } -export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { +export class WalletConnectV2HDWallet implements HDWallet, ETHWallet { readonly _supportsETH = true; readonly _supportsETHInfo = true; readonly _supportsBTCInfo = false; @@ -128,7 +151,7 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { readonly _supportsPolygon = true; readonly _supportsGnosis = true; - info: WalletConnectV2WalletInfo & core.HDWalletInfo; + info: WalletConnectV2WalletInfo & HDWalletInfo; provider: EthereumProvider; connected = false; chainId = -1; // FIXME: undefined? @@ -211,7 +234,7 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { return this.info.hasOnDeviceRecovery(); } - public hasNativeShapeShift(srcCoin: core.Coin, dstCoin: core.Coin): boolean { + public hasNativeShapeShift(srcCoin: Coin, dstCoin: Coin): boolean { return this.info.hasNativeShapeShift(srcCoin, dstCoin); } @@ -239,7 +262,7 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { await this.disconnect(); } - public async ping(msg: core.Ping): Promise { + public async ping(msg: Ping): Promise { // ping function for Wallet Connect? return { msg: msg.msg }; } @@ -273,27 +296,27 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { } // eslint-disable-next-line @typescript-eslint/no-unused-vars - public async reset(_msg: core.ResetDevice): Promise { + public async reset(_msg: ResetDevice): Promise { // no concept of reset return; } // eslint-disable-next-line @typescript-eslint/no-unused-vars - public async recover(_msg: core.RecoverDevice): Promise { + public async recover(_msg: RecoverDevice): Promise { // no concept of recover } // eslint-disable-next-line @typescript-eslint/no-unused-vars - public async loadDevice(_msg: core.LoadDevice): Promise { + public async loadDevice(_msg: LoadDevice): Promise { return; } - public describePath(msg: core.DescribePath): core.PathDescription { + public describePath(msg: DescribePath): PathDescription { return this.info.describePath(msg); } // eslint-disable-next-line @typescript-eslint/no-unused-vars - public async getPublicKeys(_msg: Array): Promise> { + public async getPublicKeys(_msg: Array): Promise> { // Ethereum public keys are not exposed by the RPC API return []; } @@ -324,11 +347,11 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { return false; } - public ethGetAccountPaths(msg: core.ETHGetAccountPath): Array { + public ethGetAccountPaths(msg: ETHGetAccountPath): Array { return this.info.ethGetAccountPaths(msg); } - public ethNextAccountPath(msg: core.ETHAccountPath): core.ETHAccountPath | undefined { + public ethNextAccountPath(msg: ETHAccountPath): ETHAccountPath | undefined { return this.info.ethNextAccountPath(msg); } @@ -352,7 +375,7 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { * * @see https://docs.walletconnect.com/client-api#sign-transaction-eth_signtransaction */ - public async ethSignTx(msg: core.ETHSignTx): Promise { + public async ethSignTx(msg: ETHSignTx): Promise { return eth.ethSignTx({ ...msg, from: this.ethAddress }, this.provider); } @@ -361,7 +384,7 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { * * @see https://docs.walletconnect.com/client-api#send-transaction-eth_sendtransaction */ - public async ethSendTx(msg: core.ETHSignTx): Promise { + public async ethSendTx(msg: ETHSignTx): Promise { return eth.ethSendTx({ ...msg, from: this.ethAddress }, this.provider); } @@ -370,11 +393,11 @@ export class WalletConnectV2HDWallet implements core.HDWallet, core.ETHWallet { * * @see https://docs.walletconnect.com/client-api#sign-message-eth_sign */ - public async ethSignMessage(msg: core.ETHSignMessage): Promise { + public async ethSignMessage(msg: ETHSignMessage): Promise { return eth.ethSignMessage({ data: msg.message, fromAddress: this.ethAddress }, this.provider); } - public async ethVerifyMessage(msg: core.ETHVerifyMessage): Promise { + public async ethVerifyMessage(msg: ETHVerifyMessage): Promise { return eth.ethVerifyMessage(this.provider, msg); } From 895a1f145f004f6d3f5f3024462a108f232774c5 Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Thu, 21 Sep 2023 09:41:54 +1000 Subject: [PATCH 09/18] chore: tidy up --- packages/hdwallet-walletconnectV2/src/ethereum.ts | 9 ++++----- packages/hdwallet-walletconnectV2/src/walletconnectV2.ts | 2 -- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/hdwallet-walletconnectV2/src/ethereum.ts b/packages/hdwallet-walletconnectV2/src/ethereum.ts index 21d4ed34f..cbdf939bb 100644 --- a/packages/hdwallet-walletconnectV2/src/ethereum.ts +++ b/packages/hdwallet-walletconnectV2/src/ethereum.ts @@ -9,7 +9,8 @@ import type { } from "@shapeshiftoss/hdwallet-core"; import { addressNListToBIP32, slip44ByCoin } from "@shapeshiftoss/hdwallet-core"; import EthereumProvider from "@walletconnect/ethereum-provider"; -import * as ethers from "ethers"; +import type { Bytes } from "ethers"; +import { arrayify, isBytes } from "ethers/lib/utils"; const getUnsignedTxFromMessage = (msg: ETHSignTx & { from: string }) => { const utxBase = { @@ -83,12 +84,10 @@ export async function ethSendTx( } export async function ethSignMessage( - args: { data: string | ethers.Bytes; fromAddress: string }, + args: { data: string | Bytes; fromAddress: string }, provider: EthereumProvider ): Promise { - const buffer = ethers.utils.isBytes(args.data) - ? Buffer.from(ethers.utils.arrayify(args.data)) - : Buffer.from(args.data); + const buffer = isBytes(args.data) ? Buffer.from(arrayify(args.data)) : Buffer.from(args.data); return await provider.request({ method: "eth_sign", diff --git a/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts b/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts index b22519117..2803527d3 100644 --- a/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts +++ b/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts @@ -430,7 +430,5 @@ export class WalletConnectV2HDWallet implements HDWallet, ETHWallet { this.connected = connected; } this.chainId = chainId; - // this.accounts = accounts; - // this.ethAddress = address; } } From a5955b500905d70c8edeae0fb5aba9e212bbeb58 Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Fri, 22 Sep 2023 12:22:41 +1000 Subject: [PATCH 10/18] chore: more tidy up --- .../hdwallet-walletconnectV2/src/adapter.ts | 1 - .../src/walletconnectV2.ts | 168 +++++------------- 2 files changed, 47 insertions(+), 122 deletions(-) diff --git a/packages/hdwallet-walletconnectV2/src/adapter.ts b/packages/hdwallet-walletconnectV2/src/adapter.ts index 05a8450f7..6cf3b5aed 100644 --- a/packages/hdwallet-walletconnectV2/src/adapter.ts +++ b/packages/hdwallet-walletconnectV2/src/adapter.ts @@ -27,7 +27,6 @@ export class WalletConnectV2Adapter { throw new Error("WalletConnectV2 provider configuration not set."); } - // TODO: Swap with UniversalProvider: https://docs.walletconnect.com/2.0/advanced/providers/universal const provider = await EthereumProvider.init(this.providerConfig); const wallet = new WalletConnectV2HDWallet(provider); diff --git a/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts b/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts index 2803527d3..ff4ad2c82 100644 --- a/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts +++ b/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts @@ -11,30 +11,18 @@ import type { ETHVerifyMessage, ETHWallet, ETHWalletInfo, - GetPublicKey, HDWallet, HDWalletInfo, - LoadDevice, PathDescription, Ping, Pong, PublicKey, - RecoverDevice, - ResetDevice, } from "@shapeshiftoss/hdwallet-core"; import { slip44ByCoin } from "@shapeshiftoss/hdwallet-core"; import EthereumProvider from "@walletconnect/ethereum-provider"; import isObject from "lodash/isObject"; -import * as eth from "./ethereum"; - -// FIXME: what is the actual state? -interface WCState { - connected?: boolean; - chainId: number; - accounts?: string[]; - address?: string; -} +import { describeETHPath, ethGetAddress, ethSendTx, ethSignMessage, ethSignTx, ethVerifyMessage } from "./ethereum"; export function isWalletConnectV2(wallet: HDWallet): wallet is WalletConnectV2HDWallet { return isObject(wallet) && (wallet as any)._isWalletConnectV2; @@ -49,8 +37,8 @@ export function isWalletConnectV2(wallet: HDWallet): wallet is WalletConnectV2HD * - eth_signTypedData * - eth_sendTransaction * - eth_signTransaction - * 🚧 eth_sendRawTransaction - * @see https://docs.walletconnect.com/ + * - eth_sendRawTransaction + * @see https://specs.walletconnect.com/2.0/blockchain-rpc/ethereum-rpc */ export class WalletConnectV2WalletInfo implements HDWalletInfo, ETHWalletInfo { readonly _supportsETHInfo = true; @@ -91,24 +79,21 @@ export class WalletConnectV2WalletInfo implements HDWalletInfo, ETHWalletInfo { return true; } - // FIXME public describePath(msg: DescribePath): PathDescription { switch (msg.coin) { case "Ethereum": - return eth.describeETHPath(msg.path); + return describeETHPath(msg.path); default: throw new Error("Unsupported path"); } } - // eslint-disable-next-line @typescript-eslint/no-unused-vars - public ethNextAccountPath(_msg: ETHAccountPath): ETHAccountPath | undefined { + public ethNextAccountPath(): ETHAccountPath | undefined { return undefined; } - // FIXME - public async ethSupportsNetwork(chainId = 1): Promise { - return chainId === 1; + public async ethSupportsNetwork(chainId: number): Promise { + return [1, 10, 56, 100, 137, 43114].includes(chainId); } public async ethSupportsSecureTransfer(): Promise { @@ -119,7 +104,6 @@ export class WalletConnectV2WalletInfo implements HDWalletInfo, ETHWalletInfo { return false; } - // FIXME: confirm this is true public async ethSupportsEIP1559(): Promise { return true; } @@ -144,7 +128,7 @@ export class WalletConnectV2HDWallet implements HDWallet, ETHWallet { readonly _supportsBTCInfo = false; readonly _supportsBTC = false; readonly _isWalletConnectV2 = true; - readonly _supportsEthSwitchChain = false; + readonly _supportsEthSwitchChain = true; readonly _supportsAvalanche = true; readonly _supportsOptimism = true; readonly _supportsBSC = true; @@ -154,9 +138,9 @@ export class WalletConnectV2HDWallet implements HDWallet, ETHWallet { info: WalletConnectV2WalletInfo & HDWalletInfo; provider: EthereumProvider; connected = false; - chainId = -1; // FIXME: undefined? + chainId: number | undefined; accounts: string[] = []; - ethAddress = ""; // FIXME: undefined? + ethAddress: string | undefined; constructor(provider: EthereumProvider) { this.provider = provider; @@ -183,37 +167,7 @@ export class WalletConnectV2HDWallet implements HDWallet, ETHWallet { return "WalletConnectV2"; } - // FIXME: flesh out? public async initialize(): Promise { - /** Subscribe to EIP-1193 events */ - this.provider.on("session_event", async (args) => { - // const { chainId, event } = args.params; - // this.onSessionUpdate(chainId); - }); - - /** Note that this event does not fire on page reload */ - this.provider.on("connect", (args) => { - const { chainId } = args; - this.setState({ connected: true, chainId: parseInt(chainId, 10) }); - }); - - // FIXME: error is always defined? - this.provider.on("disconnect", (error) => { - if (error) { - throw error; - } - this.onDisconnect(); - }); - - // TODO - this.provider.on("message", (args) => {}); - this.provider.on("chainChanged", (args) => {}); - this.provider.on("accountsChanged", (args) => {}); - this.provider.on("session_event", (args) => {}); - this.provider.on("session_delete", (args) => {}); - this.provider.on("session_update", (args) => {}); - this.provider.on("display_uri", (args) => {}); - /** Display QR modal to connect */ await this.provider.enable(); } @@ -248,14 +202,13 @@ export class WalletConnectV2HDWallet implements HDWallet, ETHWallet { * Offline signing is supported when `signTransaction` does not broadcast * the tx message. WalletConnect's core Connector implementation always * makes a request, so offline signing is not supported. - * @see https://github.com/WalletConnect/walletconnect-monorepo/blob/7573fa9e1d91588d4af3409159b4fd2f9448a0e2/packages/clients/core/src/index.ts#L630 */ public supportsOfflineSigning(): boolean { - return false; + return this.info.supportsOfflineSigning(); } public supportsBroadcast(): boolean { - return true; + return this.info.supportsBroadcast(); } public async clearSession(): Promise { @@ -263,51 +216,42 @@ export class WalletConnectV2HDWallet implements HDWallet, ETHWallet { } public async ping(msg: Ping): Promise { - // ping function for Wallet Connect? return { msg: msg.msg }; } - // eslint-disable-next-line @typescript-eslint/no-unused-vars - public async sendPin(_pin: string): Promise { - // no concept of pin in WalletConnect + public async sendPin(): Promise { + return; } - // eslint-disable-next-line @typescript-eslint/no-unused-vars - public async sendPassphrase(_passphrase: string): Promise { - // cannot send passphrase. Could show the widget? + public async sendPassphrase(): Promise { + return; } - // eslint-disable-next-line @typescript-eslint/no-unused-vars - public async sendCharacter(_character: string): Promise { - // no concept of sendCharacter + public async sendCharacter(): Promise { + return; } - // eslint-disable-next-line @typescript-eslint/no-unused-vars - public async sendWord(_word: string): Promise { - // no concept of sendWord + public async sendWord(): Promise { + return; } public async cancel(): Promise { - // no concept of cancel + return; } public async wipe(): Promise { return; } - // eslint-disable-next-line @typescript-eslint/no-unused-vars - public async reset(_msg: ResetDevice): Promise { - // no concept of reset + public async reset(): Promise { return; } - // eslint-disable-next-line @typescript-eslint/no-unused-vars - public async recover(_msg: RecoverDevice): Promise { - // no concept of recover + public async recover(): Promise { + return; } - // eslint-disable-next-line @typescript-eslint/no-unused-vars - public async loadDevice(_msg: LoadDevice): Promise { + public async loadDevice(): Promise { return; } @@ -315,8 +259,7 @@ export class WalletConnectV2HDWallet implements HDWallet, ETHWallet { return this.info.describePath(msg); } - // eslint-disable-next-line @typescript-eslint/no-unused-vars - public async getPublicKeys(_msg: Array): Promise> { + public async getPublicKeys(): Promise> { // Ethereum public keys are not exposed by the RPC API return []; } @@ -329,43 +272,40 @@ export class WalletConnectV2HDWallet implements HDWallet, ETHWallet { await this.provider.disconnect(); } - // FIXME public async ethSupportsNetwork(chainId = 1): Promise { - return chainId === 1; + return this.info.ethSupportsNetwork(chainId); } public async ethSupportsSecureTransfer(): Promise { - return false; + return this.info.ethSupportsSecureTransfer(); } public ethSupportsNativeShapeShift(): boolean { - return false; + return this.info.ethSupportsNativeShapeShift(); } - // FIXME? public async ethSupportsEIP1559(): Promise { - return false; + return this.info.ethSupportsEIP1559(); } public ethGetAccountPaths(msg: ETHGetAccountPath): Array { return this.info.ethGetAccountPaths(msg); } - public ethNextAccountPath(msg: ETHAccountPath): ETHAccountPath | undefined { - return this.info.ethNextAccountPath(msg); + public ethNextAccountPath(): ETHAccountPath | undefined { + return this.info.ethNextAccountPath(); } public async ethGetAddress(): Promise { if (this.ethAddress) { return this.ethAddress; } - const address = await eth.ethGetAddress(this.provider); + const address = await ethGetAddress(this.provider); if (address) { - // FIXME: why does a getter set something? this.ethAddress = address; return address; } else { - this.ethAddress = ""; + this.ethAddress = undefined; return null; } } @@ -376,7 +316,10 @@ export class WalletConnectV2HDWallet implements HDWallet, ETHWallet { * @see https://docs.walletconnect.com/client-api#sign-transaction-eth_signtransaction */ public async ethSignTx(msg: ETHSignTx): Promise { - return eth.ethSignTx({ ...msg, from: this.ethAddress }, this.provider); + if (!this.ethAddress) { + throw new Error("No eth address"); + } + return ethSignTx({ ...msg, from: this.ethAddress }, this.provider); } /** @@ -385,7 +328,10 @@ export class WalletConnectV2HDWallet implements HDWallet, ETHWallet { * @see https://docs.walletconnect.com/client-api#send-transaction-eth_sendtransaction */ public async ethSendTx(msg: ETHSignTx): Promise { - return eth.ethSendTx({ ...msg, from: this.ethAddress }, this.provider); + if (!this.ethAddress) { + throw new Error("No eth address"); + } + return ethSendTx({ ...msg, from: this.ethAddress }, this.provider); } /** @@ -394,11 +340,14 @@ export class WalletConnectV2HDWallet implements HDWallet, ETHWallet { * @see https://docs.walletconnect.com/client-api#sign-message-eth_sign */ public async ethSignMessage(msg: ETHSignMessage): Promise { - return eth.ethSignMessage({ data: msg.message, fromAddress: this.ethAddress }, this.provider); + if (!this.ethAddress) { + throw new Error("No eth address"); + } + return ethSignMessage({ data: msg.message, fromAddress: this.ethAddress }, this.provider); } public async ethVerifyMessage(msg: ETHVerifyMessage): Promise { - return eth.ethVerifyMessage(this.provider, msg); + return ethVerifyMessage(this.provider, msg); } public async getDeviceID(): Promise { @@ -408,27 +357,4 @@ export class WalletConnectV2HDWallet implements HDWallet, ETHWallet { public async getFirmwareVersion(): Promise { return "WalletConnectV2"; } - - private onSessionUpdate(accounts: string[], chainId: number) { - const [address] = accounts; - this.setState({ accounts, address, chainId }); - } - - /** - * onDisconnect - * - * Resets state. - */ - private onDisconnect() { - // FIXME: chinaId set to 1? - this.setState({ connected: false, chainId: 1, accounts: [], address: "" }); - } - - private setState(config: WCState) { - const { connected, chainId } = config; - if (connected !== undefined) { - this.connected = connected; - } - this.chainId = chainId; - } } From 17267c1059430b78d8e8e53b907cae2790896d3b Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Fri, 22 Sep 2023 12:51:24 +1000 Subject: [PATCH 11/18] chore: add _supportsArbitrum --- packages/hdwallet-walletconnectV2/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index 0cfa48833..36762d634 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -15,9 +15,9 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.4", - "@walletconnect/ethereum-provider": "^2.10.0", - "@walletconnect/modal": "^2.6.1", + "@shapeshiftoss/hdwallet-core": "1.50.5", + "@walletconnect/ethereum-provider": "^2.10.1", + "@walletconnect/modal": "^2.6.2", "ethers": "^5.6.5" }, "devDependencies": { From 64bf68d0087821d82d2c714a82991cee8dbdc4b3 Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Fri, 22 Sep 2023 13:02:36 +1000 Subject: [PATCH 12/18] chore: add _supportsArbitrum --- packages/hdwallet-walletconnectV2/src/walletconnectV2.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts b/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts index ff4ad2c82..35c24c2e2 100644 --- a/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts +++ b/packages/hdwallet-walletconnectV2/src/walletconnectV2.ts @@ -134,6 +134,7 @@ export class WalletConnectV2HDWallet implements HDWallet, ETHWallet { readonly _supportsBSC = true; readonly _supportsPolygon = true; readonly _supportsGnosis = true; + readonly _supportsArbitrum = true; info: WalletConnectV2WalletInfo & HDWalletInfo; provider: EthereumProvider; From 38c986741d19864331e3ce5046045eb0fc232438 Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Fri, 22 Sep 2023 19:47:55 +1000 Subject: [PATCH 13/18] chore(release): publish 1.50.5-alpha.0 --- examples/sandbox/package.json | 32 +++++++++---------- integration/package.json | 20 ++++++------ lerna.json | 2 +- packages/hdwallet-coinbase/package.json | 4 +-- packages/hdwallet-core/package.json | 2 +- .../hdwallet-keepkey-chromeusb/package.json | 6 ++-- .../hdwallet-keepkey-electron/package.json | 4 +-- .../hdwallet-keepkey-nodehid/package.json | 4 +-- .../hdwallet-keepkey-nodewebusb/package.json | 6 ++-- packages/hdwallet-keepkey-tcp/package.json | 6 ++-- packages/hdwallet-keepkey-webusb/package.json | 6 ++-- packages/hdwallet-keepkey/package.json | 4 +-- packages/hdwallet-keplr/package.json | 4 +-- packages/hdwallet-ledger-webhid/package.json | 6 ++-- packages/hdwallet-ledger-webusb/package.json | 6 ++-- packages/hdwallet-ledger/package.json | 4 +-- packages/hdwallet-metamask/package.json | 4 +-- packages/hdwallet-native-vault/package.json | 4 +-- packages/hdwallet-native/package.json | 4 +-- packages/hdwallet-portis/package.json | 4 +-- packages/hdwallet-tallyho/package.json | 4 +-- packages/hdwallet-trezor-connect/package.json | 6 ++-- packages/hdwallet-trezor/package.json | 4 +-- packages/hdwallet-walletconnect/package.json | 4 +-- .../hdwallet-walletconnectV2/package.json | 2 +- packages/hdwallet-xdefi/package.json | 4 +-- 26 files changed, 78 insertions(+), 78 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 98b8a3e74..91540f55a 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "hdwallet-sandbox", - "version": "1.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,22 +10,22 @@ "clean": "rm -rf public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.4", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.50.4", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.50.4", - "@shapeshiftoss/hdwallet-keplr": "1.50.4", - "@shapeshiftoss/hdwallet-ledger": "1.50.4", - "@shapeshiftoss/hdwallet-ledger-webhid": "1.50.4", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.50.4", - "@shapeshiftoss/hdwallet-metamask": "1.50.4", - "@shapeshiftoss/hdwallet-native": "1.50.4", - "@shapeshiftoss/hdwallet-portis": "1.50.4", - "@shapeshiftoss/hdwallet-tallyho": "1.50.4", - "@shapeshiftoss/hdwallet-trezor": "1.50.4", - "@shapeshiftoss/hdwallet-trezor-connect": "1.50.4", - "@shapeshiftoss/hdwallet-walletconnect": "1.50.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-keplr": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-ledger": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-metamask": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-native": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-portis": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-tallyho": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-trezor": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-walletconnect": "^1.50.5-alpha.0", "@shapeshiftoss/hdwallet-walletconnectv2": "/Users/apotheosis/git/shapeshift/hdwallet/packages/hdwallet-walletconnectV2", - "@shapeshiftoss/hdwallet-xdefi": "1.50.4", + "@shapeshiftoss/hdwallet-xdefi": "^1.50.5-alpha.0", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index a37184e30..d0d9b6497 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.50.4", + "version": "1.50.5-alpha.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.4", - "@shapeshiftoss/hdwallet-keepkey": "1.50.4", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.50.4", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.50.4", - "@shapeshiftoss/hdwallet-ledger": "1.50.4", - "@shapeshiftoss/hdwallet-native": "1.50.4", - "@shapeshiftoss/hdwallet-portis": "1.50.4", - "@shapeshiftoss/hdwallet-trezor": "1.50.4", - "@shapeshiftoss/hdwallet-xdefi": "1.50.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-ledger": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-native": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-portis": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-trezor": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-xdefi": "^1.50.5-alpha.0", "@types/jest": "^26.0.23", "fast-json-stable-stringify": "^2.1.0", "jest": "^26.6.3", diff --git a/lerna.json b/lerna.json index 5b21514a7..e4cfb9d05 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "3.22.1", - "version": "1.50.4", + "version": "1.50.5-alpha.0", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index a90fafcaf..cbccd1603 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "1.50.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", "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 ed330fd58..1351dbf19 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index bd68b3120..a91c94e49 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.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.4", - "@shapeshiftoss/hdwallet-keepkey": "1.50.4" + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.5-alpha.0" }, "devDependencies": { "typescript": "^4.3.2" diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index c5512ce45..baaa54cbd 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.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.50.4", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.5-alpha.0", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index ad6df0d7e..cb3baa5c2 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.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.50.4" + "@shapeshiftoss/hdwallet-keepkey": "^1.50.5-alpha.0" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index 672aa9cb1..6f6c43364 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.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.4", - "@shapeshiftoss/hdwallet-keepkey": "1.50.4" + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.5-alpha.0" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index 0390d0958..51d0d2fff 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.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.4", - "@shapeshiftoss/hdwallet-keepkey": "1.50.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.5-alpha.0", "axios": "^0.21.1" }, "devDependencies": { diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index 21380a60c..c66f36ae6 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.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.4", - "@shapeshiftoss/hdwallet-keepkey": "1.50.4" + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.5-alpha.0" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4", diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index 9c345b715..df3371fd9 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.50.4", + "version": "1.50.5-alpha.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.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.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-keplr/package.json b/packages/hdwallet-keplr/package.json index 0d264f050..fa3ba1d11 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/caip": "3.0.0", - "@shapeshiftoss/hdwallet-core": "1.50.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.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 index f800c0b5f..9640dfa92 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.50.4", + "version": "1.50.5-alpha.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.4", - "@shapeshiftoss/hdwallet-ledger": "1.50.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-ledger": "^1.50.5-alpha.0", "@types/w3c-web-hid": "^1.0.2", "typescript": "^4.3.2" }, diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index 4a1a66070..cac7d4478 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.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -19,8 +19,8 @@ "@ledgerhq/hw-transport": "^6.7.0", "@ledgerhq/hw-transport-webusb": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", - "@shapeshiftoss/hdwallet-core": "1.50.4", - "@shapeshiftoss/hdwallet-ledger": "1.50.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-ledger": "^1.50.5-alpha.0", "@types/w3c-web-usb": "^1.0.4", "typescript": "^4.3.2" }, diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index a6fdc6628..5a8ebe4c1 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "1.50.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index d4f4145a4..81704ecd9 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask", - "version": "1.50.4", + "version": "1.50.5-alpha.0", "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.50.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", "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 index 30286653b..05d7dd3da 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.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-native": "1.50.4", + "@shapeshiftoss/hdwallet-native": "^1.50.5-alpha.0", "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 index 4604e38c1..ae2d75cb5 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.50.4", + "version": "1.50.5-alpha.0", "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.50.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index 347bc33d6..ea7e6510b 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@portis/web3": "3.0.10", - "@shapeshiftoss/hdwallet-core": "1.50.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index 750adc68f..fce866c93 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-tallyho", - "version": "1.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", "lodash": "^4.17.21", "tallyho-onboarding": "^1.0.2" }, diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index 0359eae10..47cd15abf 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.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.4", - "@shapeshiftoss/hdwallet-trezor": "1.50.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-trezor": "^1.50.5-alpha.0", "@trezor/rollout": "^1.2.0", "trezor-connect": "^8.2.1" }, diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index 105ad05be..382aa1edd 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "1.50.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", "base64-js": "^1.5.1", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index fbec774ec..99ed4db05 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", "@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 36762d634..fdf8d48ee 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index 39e2904c2..e49a4f0d1 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-xdefi", - "version": "1.50.4", + "version": "1.50.5-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.4", + "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", "lodash": "^4.17.21" }, "devDependencies": { From 0cc779a6c11b84e306df0d07d3a07b352ca41757 Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Fri, 22 Sep 2023 19:55:42 +1000 Subject: [PATCH 14/18] bump packages --- packages/hdwallet-coinbase/package.json | 3 ++- packages/hdwallet-core/package.json | 3 ++- packages/hdwallet-keepkey-chromeusb/package.json | 3 ++- packages/hdwallet-keepkey-electron/package.json | 3 ++- packages/hdwallet-keepkey-nodehid/package.json | 3 ++- packages/hdwallet-keepkey-nodewebusb/package.json | 3 ++- packages/hdwallet-keepkey-tcp/package.json | 3 ++- packages/hdwallet-keepkey-webusb/package.json | 3 ++- packages/hdwallet-keepkey/package.json | 3 ++- packages/hdwallet-keplr/package.json | 3 ++- packages/hdwallet-ledger-webhid/package.json | 3 ++- packages/hdwallet-ledger-webusb/package.json | 3 ++- packages/hdwallet-ledger/package.json | 3 ++- packages/hdwallet-metamask/package.json | 3 ++- packages/hdwallet-native-vault/package.json | 3 ++- packages/hdwallet-native/package.json | 3 ++- packages/hdwallet-portis/package.json | 3 ++- packages/hdwallet-tallyho/package.json | 3 ++- packages/hdwallet-trezor-connect/package.json | 3 ++- packages/hdwallet-trezor/package.json | 3 ++- packages/hdwallet-walletconnect/package.json | 3 ++- packages/hdwallet-walletconnectV2/package.json | 3 ++- packages/hdwallet-xdefi/package.json | 3 ++- 23 files changed, 46 insertions(+), 23 deletions(-) diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index cbccd1603..62ae4e94d 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -22,5 +22,6 @@ "devDependencies": { "@types/lodash": "^4.14.168", "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json index 1351dbf19..a530b7232 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -29,5 +29,6 @@ "jest-environment-jsdom": "^25.5.0", "ts-jest": "^26.5.5", "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index a91c94e49..776db0f68 100644 --- a/packages/hdwallet-keepkey-chromeusb/package.json +++ b/packages/hdwallet-keepkey-chromeusb/package.json @@ -19,5 +19,6 @@ }, "devDependencies": { "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index baaa54cbd..26182cc56 100644 --- a/packages/hdwallet-keepkey-electron/package.json +++ b/packages/hdwallet-keepkey-electron/package.json @@ -24,5 +24,6 @@ "@types/uuid": "^8.3.0", "electron": "^12.0.9", "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index cb3baa5c2..dcc4aead3 100644 --- a/packages/hdwallet-keepkey-nodehid/package.json +++ b/packages/hdwallet-keepkey-nodehid/package.json @@ -22,5 +22,6 @@ "devDependencies": { "@types/node-hid": "^1.3.1", "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index 6f6c43364..2871b6447 100644 --- a/packages/hdwallet-keepkey-nodewebusb/package.json +++ b/packages/hdwallet-keepkey-nodewebusb/package.json @@ -23,5 +23,6 @@ "devDependencies": { "typescript": "^4.3.2", "usb": "^2.3.1" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index 51d0d2fff..b9d7d1662 100644 --- a/packages/hdwallet-keepkey-tcp/package.json +++ b/packages/hdwallet-keepkey-tcp/package.json @@ -20,5 +20,6 @@ }, "devDependencies": { "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index c66f36ae6..91c00dfe2 100644 --- a/packages/hdwallet-keepkey-webusb/package.json +++ b/packages/hdwallet-keepkey-webusb/package.json @@ -20,5 +20,6 @@ "devDependencies": { "@types/w3c-web-usb": "^1.0.4", "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index df3371fd9..5f37adc77 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -46,5 +46,6 @@ "@types/tiny-secp256k1": "^1.0.0", "typedoc": "^0.20.36", "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json index fa3ba1d11..ec1e19129 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -27,5 +27,6 @@ "@keplr-wallet/types": "^0.9.10", "@types/lodash": "^4.14.168", "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-ledger-webhid/package.json b/packages/hdwallet-ledger-webhid/package.json index 9640dfa92..e845856c0 100644 --- a/packages/hdwallet-ledger-webhid/package.json +++ b/packages/hdwallet-ledger-webhid/package.json @@ -26,5 +26,6 @@ }, "devDependencies": { "@types/ledgerhq__hw-transport": "^4.21.3" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index cac7d4478..979acba23 100644 --- a/packages/hdwallet-ledger-webusb/package.json +++ b/packages/hdwallet-ledger-webusb/package.json @@ -27,5 +27,6 @@ "devDependencies": { "@types/ledgerhq__hw-transport": "^4.21.3", "@types/w3c-web-usb": "^1.0.6" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index 5a8ebe4c1..0138ecbe4 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -38,5 +38,6 @@ "@types/lodash": "^4.14.168", "typedoc": "^0.20.36", "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index 81704ecd9..72a3fa01d 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -23,5 +23,6 @@ "devDependencies": { "@types/lodash": "^4.14.168", "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index 05d7dd3da..862a7a212 100644 --- a/packages/hdwallet-native-vault/package.json +++ b/packages/hdwallet-native-vault/package.json @@ -31,5 +31,6 @@ "jest-environment-jsdom": "^25.5.0", "ts-jest": "^26.5.5", "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index ae2d75cb5..2b114d7b8 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -60,5 +60,6 @@ "msw": "^0.27.1", "ts-jest": "^26.5.5", "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index ea7e6510b..5c3d920ff 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -27,5 +27,6 @@ "devDependencies": { "@types/lodash": "^4.14.168", "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index fce866c93..47d6df3ce 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -21,5 +21,6 @@ "devDependencies": { "@types/lodash": "^4.14.168", "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index 47cd15abf..e98bb7656 100644 --- a/packages/hdwallet-trezor-connect/package.json +++ b/packages/hdwallet-trezor-connect/package.json @@ -21,5 +21,6 @@ }, "devDependencies": { "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index 382aa1edd..7e1779581 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -25,5 +25,6 @@ "@types/lodash": "^4.14.168", "typedoc": "^0.20.36", "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index 99ed4db05..2934994f6 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -22,5 +22,6 @@ }, "devDependencies": { "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-walletconnectV2/package.json b/packages/hdwallet-walletconnectV2/package.json index fdf8d48ee..e4cb364e4 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -22,5 +22,6 @@ }, "devDependencies": { "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index e49a4f0d1..01b2c60dd 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -20,5 +20,6 @@ "devDependencies": { "@types/lodash": "^4.14.168", "typescript": "^4.3.2" - } + }, + "gitHead": "64bf68d0087821d82d2c714a82991cee8dbdc4b3" } From ce619a11f07e8790702ab3bf4308172f041dfe77 Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Fri, 22 Sep 2023 19:57:17 +1000 Subject: [PATCH 15/18] chore(release): publish 1.50.6-alpha.0 --- examples/sandbox/package.json | 32 +++++++++---------- integration/package.json | 20 ++++++------ lerna.json | 2 +- packages/hdwallet-coinbase/package.json | 4 +-- packages/hdwallet-core/package.json | 2 +- .../hdwallet-keepkey-chromeusb/package.json | 6 ++-- .../hdwallet-keepkey-electron/package.json | 4 +-- .../hdwallet-keepkey-nodehid/package.json | 4 +-- .../hdwallet-keepkey-nodewebusb/package.json | 6 ++-- packages/hdwallet-keepkey-tcp/package.json | 6 ++-- packages/hdwallet-keepkey-webusb/package.json | 6 ++-- packages/hdwallet-keepkey/package.json | 4 +-- packages/hdwallet-keplr/package.json | 4 +-- packages/hdwallet-ledger-webhid/package.json | 6 ++-- packages/hdwallet-ledger-webusb/package.json | 6 ++-- packages/hdwallet-ledger/package.json | 4 +-- packages/hdwallet-metamask/package.json | 4 +-- packages/hdwallet-native-vault/package.json | 4 +-- packages/hdwallet-native/package.json | 4 +-- packages/hdwallet-portis/package.json | 4 +-- packages/hdwallet-tallyho/package.json | 4 +-- packages/hdwallet-trezor-connect/package.json | 6 ++-- packages/hdwallet-trezor/package.json | 4 +-- packages/hdwallet-walletconnect/package.json | 4 +-- .../hdwallet-walletconnectV2/package.json | 2 +- packages/hdwallet-xdefi/package.json | 4 +-- 26 files changed, 78 insertions(+), 78 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 91540f55a..776109ab5 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "hdwallet-sandbox", - "version": "1.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,22 +10,22 @@ "clean": "rm -rf public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-keplr": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-ledger": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-ledger-webhid": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-ledger-webusb": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-metamask": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-native": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-portis": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-tallyho": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-trezor": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-trezor-connect": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-walletconnect": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-keplr": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-ledger": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-metamask": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-native": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-portis": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-tallyho": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-trezor": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-walletconnect": "^1.50.6-alpha.0", "@shapeshiftoss/hdwallet-walletconnectv2": "/Users/apotheosis/git/shapeshift/hdwallet/packages/hdwallet-walletconnectV2", - "@shapeshiftoss/hdwallet-xdefi": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-xdefi": "^1.50.6-alpha.0", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index d0d9b6497..eac5f7359 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.50.5-alpha.0", + "version": "1.50.6-alpha.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.5-alpha.0", - "@shapeshiftoss/hdwallet-keepkey": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-ledger": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-native": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-portis": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-trezor": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-xdefi": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-ledger": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-native": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-portis": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-trezor": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-xdefi": "^1.50.6-alpha.0", "@types/jest": "^26.0.23", "fast-json-stable-stringify": "^2.1.0", "jest": "^26.6.3", diff --git a/lerna.json b/lerna.json index e4cfb9d05..efe1bcc2d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "3.22.1", - "version": "1.50.5-alpha.0", + "version": "1.50.6-alpha.0", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index 62ae4e94d..fdb370a55 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", "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 a530b7232..e5c9a7676 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index 776db0f68..401d7ade6 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.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-keepkey": "^1.50.5-alpha.0" + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.6-alpha.0" }, "devDependencies": { "typescript": "^4.3.2" diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index 26182cc56..b95725c93 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.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.6-alpha.0", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index dcc4aead3..51698d156 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.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "^1.50.5-alpha.0" + "@shapeshiftoss/hdwallet-keepkey": "^1.50.6-alpha.0" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index 2871b6447..9944e9690 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.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-keepkey": "^1.50.5-alpha.0" + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.6-alpha.0" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index b9d7d1662..2b4cd3f0f 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.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-keepkey": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.6-alpha.0", "axios": "^0.21.1" }, "devDependencies": { diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index 91c00dfe2..558219995 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.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-keepkey": "^1.50.5-alpha.0" + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.6-alpha.0" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4", diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index 5f37adc77..cfb195ce6 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.50.5-alpha.0", + "version": "1.50.6-alpha.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.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.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-keplr/package.json b/packages/hdwallet-keplr/package.json index ec1e19129..667817f23 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/caip": "3.0.0", - "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.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 index e845856c0..d6f17718b 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.50.5-alpha.0", + "version": "1.50.6-alpha.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.5-alpha.0", - "@shapeshiftoss/hdwallet-ledger": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-ledger": "^1.50.6-alpha.0", "@types/w3c-web-hid": "^1.0.2", "typescript": "^4.3.2" }, diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index 979acba23..8fdcb5aa7 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.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -19,8 +19,8 @@ "@ledgerhq/hw-transport": "^6.7.0", "@ledgerhq/hw-transport-webusb": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", - "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-ledger": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-ledger": "^1.50.6-alpha.0", "@types/w3c-web-usb": "^1.0.4", "typescript": "^4.3.2" }, diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index 0138ecbe4..e0a66290d 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index 72a3fa01d..904b42833 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask", - "version": "1.50.5-alpha.0", + "version": "1.50.6-alpha.0", "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.50.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", "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 index 862a7a212..4ec81b725 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.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-native": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-native": "^1.50.6-alpha.0", "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 index 2b114d7b8..333739904 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.50.5-alpha.0", + "version": "1.50.6-alpha.0", "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.50.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index 5c3d920ff..8196aea10 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@portis/web3": "3.0.10", - "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index 47d6df3ce..1697315d9 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-tallyho", - "version": "1.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", "lodash": "^4.17.21", "tallyho-onboarding": "^1.0.2" }, diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index e98bb7656..48dfb5444 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.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", - "@shapeshiftoss/hdwallet-trezor": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", + "@shapeshiftoss/hdwallet-trezor": "^1.50.6-alpha.0", "@trezor/rollout": "^1.2.0", "trezor-connect": "^8.2.1" }, diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index 7e1779581..5987cf298 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", "base64-js": "^1.5.1", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index 2934994f6..3c8e9fc8e 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", "@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 e4cb364e4..699635537 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index 01b2c60dd..a1b1b1b79 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-xdefi", - "version": "1.50.5-alpha.0", + "version": "1.50.6-alpha.0", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "^1.50.5-alpha.0", + "@shapeshiftoss/hdwallet-core": "^1.50.6-alpha.0", "lodash": "^4.17.21" }, "devDependencies": { From 0d903e4b1cbbb2d4d49d13e0e8b6603cee5b8e71 Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Mon, 25 Sep 2023 09:14:45 +1000 Subject: [PATCH 16/18] chore: add comment on skipLibCheck --- packages/hdwallet-walletconnectV2/tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/hdwallet-walletconnectV2/tsconfig.json b/packages/hdwallet-walletconnectV2/tsconfig.json index 51737df4e..1aa19f951 100644 --- a/packages/hdwallet-walletconnectV2/tsconfig.json +++ b/packages/hdwallet-walletconnectV2/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "rootDir": "src", "outDir": "dist", + // We need skipLibCheck because of: https://github.com/WalletConnect/web3modal/issues/1211#issuecomment-1639554723 "skipLibCheck": true }, "include": [ From 11718b9f15a77ea81a5164da51e7a9af08943d2c Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Mon, 25 Sep 2023 09:22:05 +1000 Subject: [PATCH 17/18] chore: update emit string --- packages/hdwallet-walletconnectV2/src/adapter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hdwallet-walletconnectV2/src/adapter.ts b/packages/hdwallet-walletconnectV2/src/adapter.ts index 6cf3b5aed..6f15c5c02 100644 --- a/packages/hdwallet-walletconnectV2/src/adapter.ts +++ b/packages/hdwallet-walletconnectV2/src/adapter.ts @@ -34,7 +34,7 @@ export class WalletConnectV2Adapter { await wallet.initialize(); const deviceID = await wallet.getDeviceID(); this.keyring.add(wallet, deviceID); - this.keyring.emit(["WalletConnect", deviceID, Events.CONNECT], deviceID); // TODO: emit "WalletConnectV2"? + this.keyring.emit(["WalletConnectV2", deviceID, Events.CONNECT], deviceID); return wallet; } catch (error) { console.error("Could not pair WalletConnectV2"); From cadc75c070a145d7c6fae3c1339709bf3282983f Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Mon, 25 Sep 2023 14:11:37 +1000 Subject: [PATCH 18/18] chore(release): publish 1.50.6 --- examples/sandbox/package.json | 32 +++++++++---------- integration/package.json | 20 ++++++------ lerna.json | 2 +- packages/hdwallet-coinbase/package.json | 4 +-- packages/hdwallet-core/package.json | 2 +- .../hdwallet-keepkey-chromeusb/package.json | 6 ++-- .../hdwallet-keepkey-electron/package.json | 4 +-- .../hdwallet-keepkey-nodehid/package.json | 4 +-- .../hdwallet-keepkey-nodewebusb/package.json | 6 ++-- packages/hdwallet-keepkey-tcp/package.json | 6 ++-- packages/hdwallet-keepkey-webusb/package.json | 6 ++-- packages/hdwallet-keepkey/package.json | 4 +-- packages/hdwallet-keplr/package.json | 4 +-- packages/hdwallet-ledger-webhid/package.json | 6 ++-- packages/hdwallet-ledger-webusb/package.json | 6 ++-- packages/hdwallet-ledger/package.json | 4 +-- packages/hdwallet-metamask/package.json | 4 +-- packages/hdwallet-native-vault/package.json | 4 +-- packages/hdwallet-native/package.json | 4 +-- packages/hdwallet-portis/package.json | 4 +-- packages/hdwallet-tallyho/package.json | 4 +-- packages/hdwallet-trezor-connect/package.json | 6 ++-- packages/hdwallet-trezor/package.json | 4 +-- packages/hdwallet-walletconnect/package.json | 4 +-- .../hdwallet-walletconnectV2/package.json | 4 +-- packages/hdwallet-xdefi/package.json | 4 +-- 26 files changed, 79 insertions(+), 79 deletions(-) diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json index 86c1d3934..bb07f1fc7 100644 --- a/examples/sandbox/package.json +++ b/examples/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "hdwallet-sandbox", - "version": "1.50.5", + "version": "1.50.6", "license": "MIT", "private": true, "browserslist": "> 0.5%, last 2 versions, not dead", @@ -10,21 +10,21 @@ "clean": "rm -rf public .parcel-cache" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.5", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.50.5", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.50.5", - "@shapeshiftoss/hdwallet-keplr": "1.50.5", - "@shapeshiftoss/hdwallet-ledger": "1.50.5", - "@shapeshiftoss/hdwallet-ledger-webhid": "1.50.5", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.50.5", - "@shapeshiftoss/hdwallet-metamask": "1.50.5", - "@shapeshiftoss/hdwallet-native": "1.50.5", - "@shapeshiftoss/hdwallet-portis": "1.50.5", - "@shapeshiftoss/hdwallet-tallyho": "1.50.5", - "@shapeshiftoss/hdwallet-trezor": "1.50.5", - "@shapeshiftoss/hdwallet-trezor-connect": "1.50.5", - "@shapeshiftoss/hdwallet-walletconnect": "1.50.5", - "@shapeshiftoss/hdwallet-xdefi": "1.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.50.6", + "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.50.6", + "@shapeshiftoss/hdwallet-keplr": "^1.50.6", + "@shapeshiftoss/hdwallet-ledger": "^1.50.6", + "@shapeshiftoss/hdwallet-ledger-webhid": "^1.50.6", + "@shapeshiftoss/hdwallet-ledger-webusb": "^1.50.6", + "@shapeshiftoss/hdwallet-metamask": "^1.50.6", + "@shapeshiftoss/hdwallet-native": "^1.50.6", + "@shapeshiftoss/hdwallet-portis": "^1.50.6", + "@shapeshiftoss/hdwallet-tallyho": "^1.50.6", + "@shapeshiftoss/hdwallet-trezor": "^1.50.6", + "@shapeshiftoss/hdwallet-trezor-connect": "^1.50.6", + "@shapeshiftoss/hdwallet-walletconnect": "^1.50.6", + "@shapeshiftoss/hdwallet-xdefi": "^1.50.6", "bip32": "^2.0.4", "jquery": "^3.4.1", "json": "^9.0.6", diff --git a/integration/package.json b/integration/package.json index 65ad83da9..e6f2fb289 100644 --- a/integration/package.json +++ b/integration/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/integration", - "version": "1.50.5", + "version": "1.50.6", "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.5", - "@shapeshiftoss/hdwallet-keepkey": "1.50.5", - "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.50.5", - "@shapeshiftoss/hdwallet-keepkey-tcp": "1.50.5", - "@shapeshiftoss/hdwallet-ledger": "1.50.5", - "@shapeshiftoss/hdwallet-native": "1.50.5", - "@shapeshiftoss/hdwallet-portis": "1.50.5", - "@shapeshiftoss/hdwallet-trezor": "1.50.5", - "@shapeshiftoss/hdwallet-xdefi": "1.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.6", + "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.50.6", + "@shapeshiftoss/hdwallet-keepkey-tcp": "^1.50.6", + "@shapeshiftoss/hdwallet-ledger": "^1.50.6", + "@shapeshiftoss/hdwallet-native": "^1.50.6", + "@shapeshiftoss/hdwallet-portis": "^1.50.6", + "@shapeshiftoss/hdwallet-trezor": "^1.50.6", + "@shapeshiftoss/hdwallet-xdefi": "^1.50.6", "@types/jest": "^26.0.23", "fast-json-stable-stringify": "^2.1.0", "jest": "^26.6.3", diff --git a/lerna.json b/lerna.json index 467fd552a..576b33c75 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "3.22.1", - "version": "1.50.5", + "version": "1.50.6", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index 41fc73b91..0c1e842f9 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-coinbase", - "version": "1.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.6.6", - "@shapeshiftoss/hdwallet-core": "1.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", "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 ee2cee4d3..e58e083f7 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-core", - "version": "1.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" diff --git a/packages/hdwallet-keepkey-chromeusb/package.json b/packages/hdwallet-keepkey-chromeusb/package.json index 7cacb868b..f880644e8 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.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.5", - "@shapeshiftoss/hdwallet-keepkey": "1.50.5" + "@shapeshiftoss/hdwallet-core": "^1.50.6", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.6" }, "devDependencies": { "typescript": "^4.3.2" diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index b5ac706b2..ea60289e2 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.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.50.5", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.6", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index 5869435fa..e9ea4069b 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.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-keepkey": "1.50.5" + "@shapeshiftoss/hdwallet-keepkey": "^1.50.6" }, "peerDependencies": { "node-hid": "^2.1.1" diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index 4f39afa8e..b37f57fd6 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.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.5", - "@shapeshiftoss/hdwallet-keepkey": "1.50.5" + "@shapeshiftoss/hdwallet-core": "^1.50.6", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.6" }, "peerDependencies": { "usb": "^2.3.1" diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index 817eb1935..9d439e525 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.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.5", - "@shapeshiftoss/hdwallet-keepkey": "1.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.6", "axios": "^0.21.1" }, "devDependencies": { diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index 598c3d35a..d44cc80c1 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.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.5", - "@shapeshiftoss/hdwallet-keepkey": "1.50.5" + "@shapeshiftoss/hdwallet-core": "^1.50.6", + "@shapeshiftoss/hdwallet-keepkey": "^1.50.6" }, "devDependencies": { "@types/w3c-web-usb": "^1.0.4", diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index 97cf22553..2aac51a6d 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keepkey", - "version": "1.50.5", + "version": "1.50.6", "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.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", "@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 index ddb895eff..58b075680 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-keplr", - "version": "1.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@shapeshiftoss/caip": "3.0.0", - "@shapeshiftoss/hdwallet-core": "1.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", "@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 index 3e7b145aa..dab2e9dc5 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.50.5", + "version": "1.50.6", "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.5", - "@shapeshiftoss/hdwallet-ledger": "1.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", + "@shapeshiftoss/hdwallet-ledger": "^1.50.6", "@types/w3c-web-hid": "^1.0.2", "typescript": "^4.3.2" }, diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index 119d7952d..fd7e8968d 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.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -19,8 +19,8 @@ "@ledgerhq/hw-transport": "^6.7.0", "@ledgerhq/hw-transport-webusb": "^6.7.0", "@ledgerhq/live-common": "^21.8.2", - "@shapeshiftoss/hdwallet-core": "1.50.5", - "@shapeshiftoss/hdwallet-ledger": "1.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", + "@shapeshiftoss/hdwallet-ledger": "^1.50.6", "@types/w3c-web-usb": "^1.0.4", "typescript": "^4.3.2" }, diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index e19c385e9..cec2e6126 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-ledger", - "version": "1.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "1.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", "base64-js": "^1.5.1", "bchaddrjs": "^0.4.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-metamask/package.json b/packages/hdwallet-metamask/package.json index 6b84ebb6e..488c6a624 100644 --- a/packages/hdwallet-metamask/package.json +++ b/packages/hdwallet-metamask/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-metamask", - "version": "1.50.5", + "version": "1.50.6", "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.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", "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 index dc12367f8..2fa28f75d 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.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-native": "1.50.5", + "@shapeshiftoss/hdwallet-native": "^1.50.6", "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 index 24e42c29f..67998d0aa 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-native", - "version": "1.50.5", + "version": "1.50.6", "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.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", "@shapeshiftoss/proto-tx-builder": "^0.8.0", "@zxing/text-encoding": "^0.9.0", "bchaddrjs": "^0.4.9", diff --git a/packages/hdwallet-portis/package.json b/packages/hdwallet-portis/package.json index 514cc33f0..3876f463e 100644 --- a/packages/hdwallet-portis/package.json +++ b/packages/hdwallet-portis/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-portis", - "version": "1.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ }, "dependencies": { "@portis/web3": "3.0.10", - "@shapeshiftoss/hdwallet-core": "1.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", "base64-js": "^1.5.1", "bip32": "^2.0.4", "bitcoinjs-lib": "^5.1.6", diff --git a/packages/hdwallet-tallyho/package.json b/packages/hdwallet-tallyho/package.json index 180f6db7a..a66caa8de 100644 --- a/packages/hdwallet-tallyho/package.json +++ b/packages/hdwallet-tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-tallyho", - "version": "1.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", "lodash": "^4.17.21", "tallyho-onboarding": "^1.0.2" }, diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index 72a17c05a..9759ecc89 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.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,8 +14,8 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.5", - "@shapeshiftoss/hdwallet-trezor": "1.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", + "@shapeshiftoss/hdwallet-trezor": "^1.50.6", "@trezor/rollout": "^1.2.0", "trezor-connect": "^8.2.1" }, diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index a3ab0f747..06336d9f3 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-trezor", - "version": "1.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -17,7 +17,7 @@ "dependencies": { "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", - "@shapeshiftoss/hdwallet-core": "1.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", "base64-js": "^1.5.1", "lodash": "^4.17.21" }, diff --git a/packages/hdwallet-walletconnect/package.json b/packages/hdwallet-walletconnect/package.json index 1d893e6a3..77f5780ee 100644 --- a/packages/hdwallet-walletconnect/package.json +++ b/packages/hdwallet-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnect", - "version": "1.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", "@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 699635537..0ba0a37cb 100644 --- a/packages/hdwallet-walletconnectV2/package.json +++ b/packages/hdwallet-walletconnectV2/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-walletconnectv2", - "version": "1.50.6-alpha.0", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -15,7 +15,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", "@walletconnect/ethereum-provider": "^2.10.1", "@walletconnect/modal": "^2.6.2", "ethers": "^5.6.5" diff --git a/packages/hdwallet-xdefi/package.json b/packages/hdwallet-xdefi/package.json index 8e4e5d61c..f9f395f4d 100644 --- a/packages/hdwallet-xdefi/package.json +++ b/packages/hdwallet-xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@shapeshiftoss/hdwallet-xdefi", - "version": "1.50.5", + "version": "1.50.6", "license": "MIT", "publishConfig": { "access": "public" @@ -14,7 +14,7 @@ "prepublishOnly": "yarn clean && yarn build" }, "dependencies": { - "@shapeshiftoss/hdwallet-core": "1.50.5", + "@shapeshiftoss/hdwallet-core": "^1.50.6", "lodash": "^4.17.21" }, "devDependencies": {