From b9cc0c3e1c7187ae04939f689c9fd125f1350d4b Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Wed, 18 Sep 2024 17:46:22 +0200 Subject: [PATCH 01/25] [skip ci] wip: phantom wire-up --- .yarnrc.yml | 2 +- package.json | 27 +-- src/assets/translations/en/main.json | 16 ++ src/components/Icons/PhantomIcon.tsx | 20 ++ src/context/WalletProvider/KeyManager.ts | 1 + .../Phantom/components/Connect.tsx | 83 ++++++++ .../Phantom/components/Failure.tsx | 10 + .../Phantom/components/SnapInstall.tsx | 21 ++ .../Phantom/components/SnapUpdate.tsx | 17 ++ src/context/WalletProvider/Phantom/config.ts | 16 ++ src/context/WalletProvider/WalletProvider.tsx | 1 + src/context/WalletProvider/config.ts | 23 +++ src/context/WalletProvider/types.ts | 2 + src/lib/account/utxo.ts | 15 +- yarn.lock | 183 ++++++++++-------- 15 files changed, 343 insertions(+), 94 deletions(-) create mode 100644 src/components/Icons/PhantomIcon.tsx create mode 100644 src/context/WalletProvider/Phantom/components/Connect.tsx create mode 100644 src/context/WalletProvider/Phantom/components/Failure.tsx create mode 100644 src/context/WalletProvider/Phantom/components/SnapInstall.tsx create mode 100644 src/context/WalletProvider/Phantom/components/SnapUpdate.tsx create mode 100644 src/context/WalletProvider/Phantom/config.ts diff --git a/.yarnrc.yml b/.yarnrc.yml index 63e1e733135..8add129182d 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,6 +1,6 @@ nodeLinker: node-modules -npmRegistryServer: "https://registry.npmjs.org" +npmRegistryServer: "http://127.0.0.1:4873/" plugins: - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs diff --git a/package.json b/package.json index 84befb52d0c..0cc98199d10 100644 --- a/package.json +++ b/package.json @@ -91,19 +91,20 @@ "@shapeshiftoss/caip": "workspace:^", "@shapeshiftoss/chain-adapters": "workspace:^", "@shapeshiftoss/errors": "workspace:^", - "@shapeshiftoss/hdwallet-coinbase": "1.55.4", - "@shapeshiftoss/hdwallet-core": "1.55.4", - "@shapeshiftoss/hdwallet-keepkey": "1.55.4", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.55.4", - "@shapeshiftoss/hdwallet-keplr": "1.55.4", - "@shapeshiftoss/hdwallet-ledger": "1.55.4", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.55.4", - "@shapeshiftoss/hdwallet-metamask": "1.55.4", - "@shapeshiftoss/hdwallet-native": "1.55.4", - "@shapeshiftoss/hdwallet-native-vault": "1.55.4", - "@shapeshiftoss/hdwallet-shapeshift-multichain": "1.55.4", - "@shapeshiftoss/hdwallet-walletconnectv2": "1.55.4", - "@shapeshiftoss/hdwallet-xdefi": "1.55.4", + "@shapeshiftoss/hdwallet-coinbase": "1.55.5-phantom.6", + "@shapeshiftoss/hdwallet-core": "1.55.5-phantom.6", + "@shapeshiftoss/hdwallet-keepkey": "1.55.5-phantom.6", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.55.5-phantom.6", + "@shapeshiftoss/hdwallet-keplr": "1.55.5-phantom.6", + "@shapeshiftoss/hdwallet-ledger": "1.55.5-phantom.6", + "@shapeshiftoss/hdwallet-ledger-webusb": "1.55.5-phantom.6", + "@shapeshiftoss/hdwallet-metamask": "1.55.5-phantom.6", + "@shapeshiftoss/hdwallet-native": "1.55.5-phantom.6", + "@shapeshiftoss/hdwallet-native-vault": "1.55.5-phantom.6", + "@shapeshiftoss/hdwallet-phantom": "1.55.5-phantom.6", + "@shapeshiftoss/hdwallet-shapeshift-multichain": "1.55.5-phantom.6", + "@shapeshiftoss/hdwallet-walletconnectv2": "1.55.5-phantom.6", + "@shapeshiftoss/hdwallet-xdefi": "1.55.5-phantom.6", "@shapeshiftoss/swapper": "workspace:^", "@shapeshiftoss/types": "workspace:^", "@shapeshiftoss/unchained-client": "workspace:^", diff --git a/src/assets/translations/en/main.json b/src/assets/translations/en/main.json index 13ddb65bc9c..615df845a96 100644 --- a/src/assets/translations/en/main.json +++ b/src/assets/translations/en/main.json @@ -1525,6 +1525,22 @@ "button": "Open" } }, + "phantom": { + "errors": { + "unknown": "An unexpected error occurred communicating with Phantom", + "connectFailure": "Unable to connect Phantom wallet", + "multipleWallets": "Detected Ethereum provider is not Phantom. Do you have multiple wallets installed?" + }, + "connect": { + "header": "Pair Phantom", + "body": "Click Pair and login to Phantom from the popup window", + "button": "Pair" + }, + "failure": { + "header": "Error", + "body": "Unable to connect Phantom wallet" + } + }, "metaMaskSnap": { "title": "Multichain support is now available for MetaMask!", "subtitle": "Add the Multichain Snap on Metamask to send, receive, track, trade, and earn with the following chains:", diff --git a/src/components/Icons/PhantomIcon.tsx b/src/components/Icons/PhantomIcon.tsx new file mode 100644 index 00000000000..71bda421618 --- /dev/null +++ b/src/components/Icons/PhantomIcon.tsx @@ -0,0 +1,20 @@ +import { createIcon } from '@chakra-ui/react' + +export const PhantomIcon = createIcon({ + displayName: 'PhantomIcon', + path: ( + + + + ), + viewBox: '0 0 593 493', +}) diff --git a/src/context/WalletProvider/KeyManager.ts b/src/context/WalletProvider/KeyManager.ts index db8dddf826d..f2c9a8895c8 100644 --- a/src/context/WalletProvider/KeyManager.ts +++ b/src/context/WalletProvider/KeyManager.ts @@ -3,6 +3,7 @@ export enum KeyManager { Native = 'native', KeepKey = 'keepkey', MetaMask = 'metamask', + Phantom = 'phantom', Demo = 'demo', XDefi = 'xdefi', Keplr = 'keplr', diff --git a/src/context/WalletProvider/Phantom/components/Connect.tsx b/src/context/WalletProvider/Phantom/components/Connect.tsx new file mode 100644 index 00000000000..e8866bb0b72 --- /dev/null +++ b/src/context/WalletProvider/Phantom/components/Connect.tsx @@ -0,0 +1,83 @@ +import React, { useCallback, useState } from 'react' +import type { RouteComponentProps } from 'react-router-dom' +import type { ActionTypes } from 'context/WalletProvider/actions' +import { WalletActions } from 'context/WalletProvider/actions' +import { KeyManager } from 'context/WalletProvider/KeyManager' +import { useLocalWallet } from 'context/WalletProvider/local-wallet' +import { removeAccountsAndChainListeners } from 'context/WalletProvider/WalletProvider' +import { useWallet } from 'hooks/useWallet/useWallet' + +import { ConnectModal } from '../../components/ConnectModal' +import type { LocationState } from '../../NativeWallet/types' +import { PhantomConfig } from '../config' + +export interface PhantomSetupProps + extends RouteComponentProps< + {}, + any, // history + LocationState + > { + dispatch: React.Dispatch +} + +export const PhantomConnect = ({ history }: PhantomSetupProps) => { + const { dispatch, getAdapter, onProviderChange } = useWallet() + const localWallet = useLocalWallet() + const [loading, setLoading] = useState(false) + const [error, setError] = useState(null) + + const setErrorLoading = useCallback((e: string | null) => { + setError(e) + setLoading(false) + }, []) + + const pairDevice = useCallback(async () => { + setError(null) + setLoading(true) + + const adapter = await getAdapter(KeyManager.Phantom) + if (adapter) { + try { + // Remove all provider event listeners from previously connected wallets + await removeAccountsAndChainListeners() + + const wallet = await adapter.pairDevice() + if (!wallet) { + setErrorLoading('walletProvider.errors.walletNotFound') + throw new Error('Call to hdwallet-phantom::pairDevice returned null or undefined') + } + + await onProviderChange(KeyManager.Phantom, wallet) + + const { name, icon } = PhantomConfig + const deviceId = await wallet.getDeviceID() + const isLocked = await wallet.isLocked() + await wallet.initialize() + dispatch({ + type: WalletActions.SET_WALLET, + payload: { wallet, name, icon, deviceId, connectedType: KeyManager.Phantom }, + }) + dispatch({ type: WalletActions.SET_IS_CONNECTED, payload: true }) + dispatch({ type: WalletActions.SET_IS_LOCKED, payload: isLocked }) + localWallet.setLocalWalletTypeAndDeviceId(KeyManager.Phantom, deviceId) + dispatch({ type: WalletActions.SET_WALLET_MODAL, payload: false }) + } catch (e: any) { + console.error(e, 'Phantom Connect: There was an error initializing the wallet') + setErrorLoading(e.message) + history.push('/phantom/failure') + } + } + setLoading(false) + }, [dispatch, getAdapter, history, localWallet, onProviderChange, setErrorLoading]) + + return ( + + ) +} diff --git a/src/context/WalletProvider/Phantom/components/Failure.tsx b/src/context/WalletProvider/Phantom/components/Failure.tsx new file mode 100644 index 00000000000..1032f684438 --- /dev/null +++ b/src/context/WalletProvider/Phantom/components/Failure.tsx @@ -0,0 +1,10 @@ +import { FailureModal } from 'context/WalletProvider/components/FailureModal' + +export const PhantomFailure = () => { + return ( + + ) +} diff --git a/src/context/WalletProvider/Phantom/components/SnapInstall.tsx b/src/context/WalletProvider/Phantom/components/SnapInstall.tsx new file mode 100644 index 00000000000..be3f4769e8f --- /dev/null +++ b/src/context/WalletProvider/Phantom/components/SnapInstall.tsx @@ -0,0 +1,21 @@ +import { useCallback } from 'react' +import { SnapContent } from 'components/Modals/Snaps/SnapContent' +import { WalletActions } from 'context/WalletProvider/actions' +import { useWallet } from 'hooks/useWallet/useWallet' + +export const SnapInstall = () => { + const { dispatch } = useWallet() + + const handleClose = useCallback(() => { + dispatch({ type: WalletActions.SET_WALLET_MODAL, payload: false }) + }, [dispatch]) + + return ( + + ) +} diff --git a/src/context/WalletProvider/Phantom/components/SnapUpdate.tsx b/src/context/WalletProvider/Phantom/components/SnapUpdate.tsx new file mode 100644 index 00000000000..fc9f9b4a82b --- /dev/null +++ b/src/context/WalletProvider/Phantom/components/SnapUpdate.tsx @@ -0,0 +1,17 @@ +import { useCallback } from 'react' +import { SnapContent } from 'components/Modals/Snaps/SnapContent' +import { WalletActions } from 'context/WalletProvider/actions' +import { useWallet } from 'hooks/useWallet/useWallet' + +export const SnapUpdate = () => { + const { dispatch } = useWallet() + + const handleClose = useCallback(() => { + dispatch({ type: WalletActions.SET_WALLET_MODAL, payload: false }) + }, [dispatch]) + + return ( + // If we land here, we know the version is incorrect + + ) +} diff --git a/src/context/WalletProvider/Phantom/config.ts b/src/context/WalletProvider/Phantom/config.ts new file mode 100644 index 00000000000..0f43576e4d1 --- /dev/null +++ b/src/context/WalletProvider/Phantom/config.ts @@ -0,0 +1,16 @@ +import type { PhantomAdapter } from '@shapeshiftoss/hdwallet-phantom' +import { PhantomIcon } from 'components/Icons/PhantomIcon' +import type { SupportedWalletInfo } from 'context/WalletProvider/config' + +type PhantomConfigType = Omit, 'routes'> + +export const PhantomConfig: PhantomConfigType = { + adapters: [ + { + loadAdapter: () => import('@shapeshiftoss/hdwallet-phantom').then(m => m.PhantomAdapter), + }, + ], + supportsMobile: 'browser', + icon: PhantomIcon, + name: 'Phantom', +} diff --git a/src/context/WalletProvider/WalletProvider.tsx b/src/context/WalletProvider/WalletProvider.tsx index 03ed1b25318..538917b7d10 100644 --- a/src/context/WalletProvider/WalletProvider.tsx +++ b/src/context/WalletProvider/WalletProvider.tsx @@ -80,6 +80,7 @@ export type MetaMaskLikeProvider = BrowserProvider export type KeyManagerWithProvider = | KeyManager.XDefi | KeyManager.MetaMask + | KeyManager.Phantom | KeyManager.WalletConnectV2 | KeyManager.Coinbase diff --git a/src/context/WalletProvider/config.ts b/src/context/WalletProvider/config.ts index bb6f197f941..c65a2a49531 100644 --- a/src/context/WalletProvider/config.ts +++ b/src/context/WalletProvider/config.ts @@ -6,6 +6,7 @@ import type { KeplrAdapter } from '@shapeshiftoss/hdwallet-keplr' import type { WebUSBLedgerAdapter as LedgerAdapter } from '@shapeshiftoss/hdwallet-ledger-webusb' import type { MetaMaskAdapter } from '@shapeshiftoss/hdwallet-metamask' import type { NativeAdapter } from '@shapeshiftoss/hdwallet-native' +import type { PhantomAdapter } from '@shapeshiftoss/hdwallet-phantom' import type { MetaMaskAdapter as MetaMaskMultiChainAdapter } from '@shapeshiftoss/hdwallet-shapeshift-multichain' import type { WalletConnectV2Adapter } from '@shapeshiftoss/hdwallet-walletconnectv2' import type { XDEFIAdapter } from '@shapeshiftoss/hdwallet-xdefi' @@ -26,6 +27,7 @@ import { LedgerConfig } from './Ledger/config' import { MetaMaskConfig } from './MetaMask/config' import { MobileConfig } from './MobileWallet/config' import { NativeConfig } from './NativeWallet/config' +import { PhantomConfig } from './Phantom/config' import { KeepKeyRoutes } from './routes' import { NativeWalletRoutes } from './types' import { WalletConnectV2Config } from './WalletConnectV2/config' @@ -238,6 +240,18 @@ const MetaMaskFailure = lazy(() => default: MetaMaskFailure, })), ) + +const PhantomConnect = lazy(() => + import('./Phantom/components/Connect').then(({ PhantomConnect }) => ({ + default: PhantomConnect, + })), +) +const PhantomFailure = lazy(() => + import('./Phantom/components/Failure').then(({ PhantomFailure }) => ({ + default: PhantomFailure, + })), +) + const MetaMaskMenu = lazy(() => import('./MetaMask/components/MetaMaskMenu').then(({ MetaMaskMenu }) => ({ default: MetaMaskMenu, @@ -325,6 +339,7 @@ export type SupportedWalletInfoByKeyManager = { [KeyManager.KeepKey]: SupportedWalletInfo [KeyManager.Keplr]: SupportedWalletInfo [KeyManager.Ledger]: SupportedWalletInfo + [KeyManager.Phantom]: SupportedWalletInfo [KeyManager.MetaMask]: SupportedWalletInfo< typeof MetaMaskAdapter | typeof MetaMaskMultiChainAdapter > @@ -404,6 +419,14 @@ export const SUPPORTED_WALLETS: SupportedWalletInfoByKeyManager = { ], connectedMenuComponent: MetaMaskMenu, }, + [KeyManager.Phantom]: { + ...PhantomConfig, + routes: [ + { path: '/phantom/connect', component: PhantomConnect }, + { path: '/phantom/failure', component: PhantomFailure }, + ], + }, + [KeyManager.XDefi]: { ...XDEFIConfig, routes: [ diff --git a/src/context/WalletProvider/types.ts b/src/context/WalletProvider/types.ts index 68a84f6a1e4..21e6c5dd413 100644 --- a/src/context/WalletProvider/types.ts +++ b/src/context/WalletProvider/types.ts @@ -5,6 +5,7 @@ import type { KeplrAdapter } from '@shapeshiftoss/hdwallet-keplr' import type { WebUSBLedgerAdapter } from '@shapeshiftoss/hdwallet-ledger-webusb' import type { MetaMaskAdapter } from '@shapeshiftoss/hdwallet-metamask' import type { NativeAdapter } from '@shapeshiftoss/hdwallet-native' +import type { PhantomAdapter } from '@shapeshiftoss/hdwallet-phantom' import type { WalletConnectV2Adapter } from '@shapeshiftoss/hdwallet-walletconnectv2' import type { XDEFIAdapter } from '@shapeshiftoss/hdwallet-xdefi' @@ -19,6 +20,7 @@ export type AdaptersByKeyManager = { [KeyManager.Keplr]: KeplrAdapter [KeyManager.WalletConnectV2]: WalletConnectV2Adapter [KeyManager.MetaMask]: MetaMaskAdapter + [KeyManager.Phantom]: PhantomAdapter [KeyManager.Coinbase]: CoinbaseAdapter [KeyManager.XDefi]: XDEFIAdapter } diff --git a/src/lib/account/utxo.ts b/src/lib/account/utxo.ts index 3e51ac17725..1ae12aae001 100644 --- a/src/lib/account/utxo.ts +++ b/src/lib/account/utxo.ts @@ -1,6 +1,7 @@ import { toAccountId } from '@shapeshiftoss/caip' import { utxoAccountParams, utxoChainIds } from '@shapeshiftoss/chain-adapters' import { supportsBTC } from '@shapeshiftoss/hdwallet-core' +import { PhantomHDWallet } from '@shapeshiftoss/hdwallet-phantom' import { MetaMaskShapeShiftMultiChainHDWallet } from '@shapeshiftoss/hdwallet-shapeshift-multichain' import type { AccountMetadataById, UtxoChainId } from '@shapeshiftoss/types' import { UtxoAccountType } from '@shapeshiftoss/types' @@ -23,8 +24,20 @@ export const deriveUtxoAccountIdsAndMetadata: DeriveAccountIdsAndMetadata = asyn // MetaMask snaps adapter only supports legacy for BTC and LTC supportedAccountTypes = [UtxoAccountType.P2pkh] } + if (wallet instanceof PhantomHDWallet) { + // Phantom supposedly supports more script types, but only supports Segwit Native (bech32 addresses) for now + supportedAccountTypes = [UtxoAccountType.SegwitNative] + } for (const accountType of supportedAccountTypes) { - const { xpub: pubkey } = await adapter.getPublicKey(wallet, accountNumber, accountType) + const { xpub: pubkey } = await adapter + .getPublicKey(wallet, accountNumber, accountType) + .catch(e => { + console.error( + `Error getting pubkey for chainId: ${chainId} accountType: ${accountType} accountNumber: ${accountNumber}`, + e, + ) + return { xpub: null } + }) if (!pubkey) continue diff --git a/yarn.lock b/yarn.lock index c8e5cd136b0..1ee92812133 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11270,15 +11270,15 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-coinbase@npm:1.55.4": - version: 1.55.4 - resolution: "@shapeshiftoss/hdwallet-coinbase@npm:1.55.4" +"@shapeshiftoss/hdwallet-coinbase@npm:1.55.5-phantom.6": + version: 1.55.5-phantom.6 + resolution: "@shapeshiftoss/hdwallet-coinbase@npm:1.55.5-phantom.6" dependencies: "@coinbase/wallet-sdk": ^3.6.6 - "@shapeshiftoss/hdwallet-core": 1.55.4 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: c87ea47813c090d2f5b51510dffd21542b2f1e5b6cd0f512203d2d329d29478aac3c3dae0b9b36912f98c94d05c2328008e70b8cb7408608ed09ad11e9759236 + checksum: 513283f49b9051332c910b2de3de74b82d2a5dc66a5b716e161b6379129fc9f7d68ecda142736e34b964162fd3b2f4ef0ba6188523a1b433299c6b136c856b56 languageName: node linkType: hard @@ -11294,6 +11294,20 @@ __metadata: languageName: node linkType: hard +"@shapeshiftoss/hdwallet-core@npm:1.54.2": + version: 1.54.2 + resolution: "@shapeshiftoss/hdwallet-core@npm:1.54.2" + dependencies: + "@shapeshiftoss/proto-tx-builder": ^0.8.0 + eip-712: ^1.0.0 + eventemitter2: ^5.0.1 + lodash: ^4.17.21 + rxjs: ^6.4.0 + type-assertions: ^1.1.0 + checksum: c24df90a31fb6bb1398bfd327f3b4c239200a56cbe52615851b4b3a9c918bb0bd850f3d34209b76cb074eeaa4409f3b724ca32ee96b0078a28015286df45d397 + languageName: node + linkType: hard + "@shapeshiftoss/hdwallet-core@npm:1.55.1, @shapeshiftoss/hdwallet-core@npm:^1.55.1": version: 1.55.1 resolution: "@shapeshiftoss/hdwallet-core@npm:1.55.1" @@ -11308,9 +11322,9 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-core@npm:1.55.4": - version: 1.55.4 - resolution: "@shapeshiftoss/hdwallet-core@npm:1.55.4" +"@shapeshiftoss/hdwallet-core@npm:1.55.5-phantom.6, @shapeshiftoss/hdwallet-core@npm:^1.55.5-phantom.6": + version: 1.55.5-phantom.6 + resolution: "@shapeshiftoss/hdwallet-core@npm:1.55.5-phantom.6" dependencies: "@shapeshiftoss/proto-tx-builder": ^0.8.0 eip-712: ^1.0.0 @@ -11318,30 +11332,30 @@ __metadata: lodash: ^4.17.21 rxjs: ^6.4.0 type-assertions: ^1.1.0 - checksum: 94f6d66f3dc8ffc1cbdd07f7b66d7cf584da939ecbd278c5a1fb0a7d44bd5d04785867076221686e013cae1e2186a7040e8b3e1a644fcf9f093dc73cb50e7123 + checksum: adbcf8d62072fdeb5e211240354c74746183de0911ff6a1a6612b458c7f0aaaaef2f718caeb5b39e0c917f769b1b04bb08f23301044446fec441f5d599a074ef languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.4": - version: 1.55.4 - resolution: "@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.4" +"@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.5-phantom.6": + version: 1.55.5-phantom.6 + resolution: "@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.5-phantom.6" dependencies: - "@shapeshiftoss/hdwallet-core": 1.55.4 - "@shapeshiftoss/hdwallet-keepkey": 1.55.4 - checksum: 9b42f8291ec69a82dde21dd5d0c5d608b24a86a02dbe7b326f8ada296ff059d504fcfa2e375b225f5181a3df459b6e27738d60249e420f878f4deb14ab89ae79 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-keepkey": ^1.55.5-phantom.6 + checksum: b7c844eb12d1abc889c3e6c1b356bc77bb1d294ad4320b1ddcb74292a0108fc930a19509ec4c5c7b22834f71c1600e359cd53e81fbc8703345e62061797da4d6 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keepkey@npm:1.55.4": - version: 1.55.4 - resolution: "@shapeshiftoss/hdwallet-keepkey@npm:1.55.4" +"@shapeshiftoss/hdwallet-keepkey@npm:1.55.5-phantom.6, @shapeshiftoss/hdwallet-keepkey@npm:^1.55.5-phantom.6": + version: 1.55.5-phantom.6 + resolution: "@shapeshiftoss/hdwallet-keepkey@npm:1.55.5-phantom.6" dependencies: "@ethereumjs/common": ^2.4.0 "@ethereumjs/tx": ^3.3.0 "@keepkey/device-protocol": ^7.12.2 "@metamask/eth-sig-util": ^7.0.0 "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 - "@shapeshiftoss/hdwallet-core": 1.55.4 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 "@shapeshiftoss/proto-tx-builder": ^0.8.0 bignumber.js: ^9.0.1 bnb-javascript-sdk-nobroadcast: ^2.16.14 @@ -11353,27 +11367,27 @@ __metadata: p-lazy: ^3.1.0 semver: ^7.3.8 tiny-secp256k1: ^1.1.6 - checksum: 66ab3a06d653da8294f8fae15c66afa42b3576f58de9263a0d3c0b36e05623c7a7b6f828543b6a7dfd61eabbd787ac2505a055366d06fdc338ea2afa5590bf15 + checksum: ba87d7c55272193365ced3d82f5820d4342ac71e4a08177cbe6dff472ff6e97640a49680e45af8845181a3528d6c145effa6a9786cdcc82f3169ed87b6060636 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keplr@npm:1.55.4": - version: 1.55.4 - resolution: "@shapeshiftoss/hdwallet-keplr@npm:1.55.4" +"@shapeshiftoss/hdwallet-keplr@npm:1.55.5-phantom.6": + version: 1.55.5-phantom.6 + resolution: "@shapeshiftoss/hdwallet-keplr@npm:1.55.5-phantom.6" dependencies: "@shapeshiftoss/caip": 8.15.0 - "@shapeshiftoss/hdwallet-core": 1.55.4 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 "@shapeshiftoss/proto-tx-builder": ^0.8.0 "@shapeshiftoss/types": 3.1.3 base64-js: ^1.5.1 lodash: ^4.17.21 - checksum: b5e3d84bfb76846969fdbe297df1fa8f247bc57b048a799be8ddd972713417a5c66fcc1093d6d1285c66e9bf7066fbf82d62d0418f04276171f1dc5a86d4bf80 + checksum: 131f9d5324327c587619402348d6aff6f378475120f1b99c582db8e157a542fc5945eab6a1617a3e3b4517de07c96c9778bff2e80387da3cf2c2d4fb89e54d65 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.4": - version: 1.55.4 - resolution: "@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.4" +"@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.5-phantom.6": + version: 1.55.5-phantom.6 + resolution: "@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.5-phantom.6" dependencies: "@ledgerhq/hw-app-btc": ^10.0.8 "@ledgerhq/hw-app-eth": ^6.9.0 @@ -11381,23 +11395,23 @@ __metadata: "@ledgerhq/hw-transport-webusb": ^6.7.0 "@ledgerhq/live-common": ^21.8.2 "@ledgerhq/logs": ^6.10.1 - "@shapeshiftoss/hdwallet-core": 1.55.4 - "@shapeshiftoss/hdwallet-ledger": 1.55.4 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-ledger": ^1.55.5-phantom.6 "@types/w3c-web-usb": ^1.0.4 p-queue: ^7.4.1 - checksum: 32b46be67734253eda08c060f7675ac3114dee29064660aed4cb01bfc8bd9905054e14cc704ef6edb115832cc3bdbe21881b76e78a9a1ca4947b9e86982e4b98 + checksum: 80397ddb3296f944df43d376a754cd3370f322688ba878f148b372907a9410a6e339a0c50fb8af9f38eeef0ba5b5ae39a83e30f2402edf7860b6405c1d2618e7 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-ledger@npm:1.55.4": - version: 1.55.4 - resolution: "@shapeshiftoss/hdwallet-ledger@npm:1.55.4" +"@shapeshiftoss/hdwallet-ledger@npm:1.55.5-phantom.6, @shapeshiftoss/hdwallet-ledger@npm:^1.55.5-phantom.6": + version: 1.55.5-phantom.6 + resolution: "@shapeshiftoss/hdwallet-ledger@npm:1.55.5-phantom.6" dependencies: "@ethereumjs/common": ^2.4.0 "@ethereumjs/tx": ^3.3.0 "@ledgerhq/hw-app-cosmos": ^6.29.1 "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 - "@shapeshiftoss/hdwallet-core": 1.55.4 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 base64-js: ^1.5.1 bchaddrjs: ^0.4.4 bitcoinjs-message: ^2.0.0 @@ -11405,28 +11419,28 @@ __metadata: ethereumjs-tx: 1.3.7 ethereumjs-util: ^6.1.0 lodash: ^4.17.21 - checksum: fe2b7fc835eae5e7c1d906ace521a0181e3798e8037fd396825e7cc7e2ab7c563f7babf9de8db10a116ec33b46d6d0341c358dd8d15fe2b1e4d6727e6df60aaf + checksum: 254762f234562dfd8b4bcba85d81802e1d278ab993ee7ba17be614b873a3692d9d7d3603089c6d289b0e7a87c881771a9d2d4aea29bfb8ac35c696b997de100c languageName: node linkType: hard -"@shapeshiftoss/hdwallet-metamask@npm:1.55.4": - version: 1.55.4 - resolution: "@shapeshiftoss/hdwallet-metamask@npm:1.55.4" +"@shapeshiftoss/hdwallet-metamask@npm:1.55.5-phantom.6": + version: 1.55.5-phantom.6 + resolution: "@shapeshiftoss/hdwallet-metamask@npm:1.55.5-phantom.6" dependencies: "@metamask/detect-provider": ^1.2.0 "@metamask/onboarding": ^1.0.1 - "@shapeshiftoss/hdwallet-core": 1.55.4 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: 230b06728ef6bdf70f5d46344caaf6090e96312896c75f02b6abbd016a0ea7809d04aec9cf737ca6c450b78862f77aa989f027f8512360655f084b2321ef8beb + checksum: 2d4e9b263c7ed3b262a2667320026548538317613c526f5f3ecbd051b7b3f09c909428240eedfe3de40ffe003d9e0dbd002459df9ec873025ee072ab05b7844f languageName: node linkType: hard -"@shapeshiftoss/hdwallet-native-vault@npm:1.55.4": - version: 1.55.4 - resolution: "@shapeshiftoss/hdwallet-native-vault@npm:1.55.4" +"@shapeshiftoss/hdwallet-native-vault@npm:1.55.5-phantom.6": + version: 1.55.5-phantom.6 + resolution: "@shapeshiftoss/hdwallet-native-vault@npm:1.55.5-phantom.6" dependencies: - "@shapeshiftoss/hdwallet-native": 1.55.4 + "@shapeshiftoss/hdwallet-native": ^1.55.5-phantom.6 bip39: ^3.0.4 hash-wasm: ^4.11.0 idb-keyval: ^6.0.3 @@ -11435,17 +11449,17 @@ __metadata: type-assertions: ^1.1.0 uuid: ^8.3.2 web-encoding: ^1.1.0 - checksum: 8f06d7e69332aa66bff7b8401455c94fcd2904e2456c6566b3762bbda87166de8001a35de09a99f90d92bdd15d213919e55b6b2217020840e1e0b841967a7a64 + checksum: 8afc7cfb86ffa92b3baeb2f983aedeeec398005015a9d0a9c470efa2a718a206400aaccd2c919f3c56713da0d4207bc8cf81a96e30f447e9ec1dc148bf735637 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-native@npm:1.55.4": - version: 1.55.4 - resolution: "@shapeshiftoss/hdwallet-native@npm:1.55.4" +"@shapeshiftoss/hdwallet-native@npm:1.55.5-phantom.6, @shapeshiftoss/hdwallet-native@npm:^1.55.5-phantom.6": + version: 1.55.5-phantom.6 + resolution: "@shapeshiftoss/hdwallet-native@npm:1.55.5-phantom.6" dependencies: "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 "@shapeshiftoss/fiosdk": 1.2.1-shapeshift.6 - "@shapeshiftoss/hdwallet-core": 1.55.4 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 "@shapeshiftoss/proto-tx-builder": ^0.8.0 "@zxing/text-encoding": ^0.9.0 bchaddrjs: ^0.4.9 @@ -11467,7 +11481,7 @@ __metadata: tendermint-tx-builder: ^1.0.9 tiny-secp256k1: ^1.1.6 web-encoding: ^1.1.0 - checksum: b9eb640bda69d4c44cffbdc3c5b0551789c0a85cee54c06a5d7ab7f922af059021d7d1df8c3c801bd6bcb26d24eadd880571dbd11f954f58b8683258fa6cc7b3 + checksum: de402edf7716e6528483329ca5efcecd15634c01c6dfa7fe376767e4c5798c00e8a906646abe1d392ff887c7beb47ddd5955e3ba90042a580ca75e0b9e79a176 languageName: node linkType: hard @@ -11503,41 +11517,51 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.4": - version: 1.55.4 - resolution: "@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.4" +"@shapeshiftoss/hdwallet-phantom@npm:1.55.5-phantom.6": + version: 1.55.5-phantom.6 + resolution: "@shapeshiftoss/hdwallet-phantom@npm:1.55.5-phantom.6" + dependencies: + "@shapeshiftoss/hdwallet-core": 1.54.2 + lodash: ^4.17.21 + checksum: b80c1129d4d91e6a3965766e21ee97dcc6e5a42f20a0f5187c0431b9d2dbfd0058905476ec5f766c5714b4aadc2980165a6787e9979893a08537d99e54317c72 + languageName: node + linkType: hard + +"@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.5-phantom.6": + version: 1.55.5-phantom.6 + resolution: "@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.5-phantom.6" dependencies: "@metamask/detect-provider": ^1.2.0 "@metamask/onboarding": ^1.0.1 "@shapeshiftoss/common-api": ^9.3.0 - "@shapeshiftoss/hdwallet-core": 1.55.4 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 "@shapeshiftoss/metamask-snaps-adapter": ^1.0.10 "@shapeshiftoss/metamask-snaps-types": ^1.0.10 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: 061e420cffc2bf70d94fcaf39ccb32b6f4008df1e9dede3798c4206b0239703c4ec22fa3725eaec4b33b5e2b7c609525bf3a25592b0614a26ab217a6567fa8ad + checksum: a1a1d77e42e683755cc4b474bc96382fb0f4bb12d69893fd10a2d4af4a0831ff9be93ecae7224ce8250a0f405c6fef171415ea93d90b6b4cc8e197ef55300928 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.4": - version: 1.55.4 - resolution: "@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.4" +"@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.5-phantom.6": + version: 1.55.5-phantom.6 + resolution: "@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.5-phantom.6" dependencies: - "@shapeshiftoss/hdwallet-core": 1.55.4 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 "@walletconnect/ethereum-provider": ^2.10.1 "@walletconnect/modal": ^2.6.2 ethers: ^5.6.5 - checksum: f29146d6e09659e8504511cc690fd44ee56c624354af09ad57b59496dff565a02f6ad32e0385bf5ae169c32d6ea0a132277e1341c0c1bbc68eca3472b593fa47 + checksum: 3f7c6c96ae55fd65687b445dfaccdeba35c0022d51ba087314315851e93ada93ca7a4416d22c7dee22a551ad7f7644a4575bf4d3e33fc384fe49633ac31baf0a languageName: node linkType: hard -"@shapeshiftoss/hdwallet-xdefi@npm:1.55.4": - version: 1.55.4 - resolution: "@shapeshiftoss/hdwallet-xdefi@npm:1.55.4" +"@shapeshiftoss/hdwallet-xdefi@npm:1.55.5-phantom.6": + version: 1.55.5-phantom.6 + resolution: "@shapeshiftoss/hdwallet-xdefi@npm:1.55.5-phantom.6" dependencies: - "@shapeshiftoss/hdwallet-core": 1.55.4 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 lodash: ^4.17.21 - checksum: 0ccb34a2bcd338128dde46f948ace6b16be68e064dc9abaf0b158c6ec9007fbb249dd8a0b2efec6d42a6392e9d46fd4cbc2525344030976b757c0d50cba30627 + checksum: 57050c5cb158972df58f92b6c0463774aa025646de897e16fe45a1bc2a6b6209014c30e0b16118dd4c83523f20dc1c5861c649f0064e9db39e1cd057617dd9ad languageName: node linkType: hard @@ -11732,19 +11756,20 @@ __metadata: "@shapeshiftoss/caip": "workspace:^" "@shapeshiftoss/chain-adapters": "workspace:^" "@shapeshiftoss/errors": "workspace:^" - "@shapeshiftoss/hdwallet-coinbase": 1.55.4 - "@shapeshiftoss/hdwallet-core": 1.55.4 - "@shapeshiftoss/hdwallet-keepkey": 1.55.4 - "@shapeshiftoss/hdwallet-keepkey-webusb": 1.55.4 - "@shapeshiftoss/hdwallet-keplr": 1.55.4 - "@shapeshiftoss/hdwallet-ledger": 1.55.4 - "@shapeshiftoss/hdwallet-ledger-webusb": 1.55.4 - "@shapeshiftoss/hdwallet-metamask": 1.55.4 - "@shapeshiftoss/hdwallet-native": 1.55.4 - "@shapeshiftoss/hdwallet-native-vault": 1.55.4 - "@shapeshiftoss/hdwallet-shapeshift-multichain": 1.55.4 - "@shapeshiftoss/hdwallet-walletconnectv2": 1.55.4 - "@shapeshiftoss/hdwallet-xdefi": 1.55.4 + "@shapeshiftoss/hdwallet-coinbase": 1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-core": 1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-keepkey": 1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-keepkey-webusb": 1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-keplr": 1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-ledger": 1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-ledger-webusb": 1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-metamask": 1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-native": 1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-native-vault": 1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-phantom": 1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-shapeshift-multichain": 1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-walletconnectv2": 1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-xdefi": 1.55.5-phantom.6 "@shapeshiftoss/swapper": "workspace:^" "@shapeshiftoss/types": "workspace:^" "@shapeshiftoss/unchained-client": "workspace:^" From b2b224d6274c56cf92d79ea159a3cd9597ae6ea9 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 19 Sep 2024 10:27:48 +0200 Subject: [PATCH 02/25] feat: latest bump --- package.json | 28 +-- .../src/utxo/UtxoBaseAdapter.ts | 7 +- yarn.lock | 168 +++++++++--------- 3 files changed, 103 insertions(+), 100 deletions(-) diff --git a/package.json b/package.json index 0cc98199d10..cf7e80b73bc 100644 --- a/package.json +++ b/package.json @@ -91,20 +91,20 @@ "@shapeshiftoss/caip": "workspace:^", "@shapeshiftoss/chain-adapters": "workspace:^", "@shapeshiftoss/errors": "workspace:^", - "@shapeshiftoss/hdwallet-coinbase": "1.55.5-phantom.6", - "@shapeshiftoss/hdwallet-core": "1.55.5-phantom.6", - "@shapeshiftoss/hdwallet-keepkey": "1.55.5-phantom.6", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.55.5-phantom.6", - "@shapeshiftoss/hdwallet-keplr": "1.55.5-phantom.6", - "@shapeshiftoss/hdwallet-ledger": "1.55.5-phantom.6", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.55.5-phantom.6", - "@shapeshiftoss/hdwallet-metamask": "1.55.5-phantom.6", - "@shapeshiftoss/hdwallet-native": "1.55.5-phantom.6", - "@shapeshiftoss/hdwallet-native-vault": "1.55.5-phantom.6", - "@shapeshiftoss/hdwallet-phantom": "1.55.5-phantom.6", - "@shapeshiftoss/hdwallet-shapeshift-multichain": "1.55.5-phantom.6", - "@shapeshiftoss/hdwallet-walletconnectv2": "1.55.5-phantom.6", - "@shapeshiftoss/hdwallet-xdefi": "1.55.5-phantom.6", + "@shapeshiftoss/hdwallet-coinbase": "1.55.5-phantom.9", + "@shapeshiftoss/hdwallet-core": "1.55.5-phantom.9", + "@shapeshiftoss/hdwallet-keepkey": "1.55.5-phantom.9", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.55.5-phantom.9", + "@shapeshiftoss/hdwallet-keplr": "1.55.5-phantom.9", + "@shapeshiftoss/hdwallet-ledger": "1.55.5-phantom.9", + "@shapeshiftoss/hdwallet-ledger-webusb": "1.55.5-phantom.9", + "@shapeshiftoss/hdwallet-metamask": "1.55.5-phantom.9", + "@shapeshiftoss/hdwallet-native": "1.55.5-phantom.9", + "@shapeshiftoss/hdwallet-native-vault": "1.55.5-phantom.9", + "@shapeshiftoss/hdwallet-phantom": "1.55.5-phantom.9", + "@shapeshiftoss/hdwallet-shapeshift-multichain": "1.55.5-phantom.9", + "@shapeshiftoss/hdwallet-walletconnectv2": "1.55.5-phantom.9", + "@shapeshiftoss/hdwallet-xdefi": "1.55.5-phantom.9", "@shapeshiftoss/swapper": "workspace:^", "@shapeshiftoss/types": "workspace:^", "@shapeshiftoss/unchained-client": "workspace:^", diff --git a/packages/chain-adapters/src/utxo/UtxoBaseAdapter.ts b/packages/chain-adapters/src/utxo/UtxoBaseAdapter.ts index c19c4f1d1e7..9d9e8ac0315 100644 --- a/packages/chain-adapters/src/utxo/UtxoBaseAdapter.ts +++ b/packages/chain-adapters/src/utxo/UtxoBaseAdapter.ts @@ -323,12 +323,15 @@ export abstract class UtxoBaseAdapter implements IChainAd const signTxInputs: BTCSignTxInput[] = [] for (const input of inputs) { - if (!input.path) continue + // TOOD(gomes): v. dangerous, narrow this monkey patch for Phantom only + // if (!input.path) continue const data = await this.providers.http.getTransaction({ txid: input.txid }) signTxInputs.push({ - addressNList: bip32ToAddressNList(input.path), + // TODO(gomes): v. dangerous, should only be used for phantom since no derivation happens, and assume account 0 address 0 yadi yada + // @ts-ignore + addressNList: input.path ? bip32ToAddressNList(input.path) : undefined, scriptType: accountTypeToScriptType[accountType], amount: String(input.value), vout: input.vout, diff --git a/yarn.lock b/yarn.lock index 1ee92812133..4adafb4a063 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11270,15 +11270,15 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-coinbase@npm:1.55.5-phantom.6": - version: 1.55.5-phantom.6 - resolution: "@shapeshiftoss/hdwallet-coinbase@npm:1.55.5-phantom.6" +"@shapeshiftoss/hdwallet-coinbase@npm:1.55.5-phantom.9": + version: 1.55.5-phantom.9 + resolution: "@shapeshiftoss/hdwallet-coinbase@npm:1.55.5-phantom.9" dependencies: "@coinbase/wallet-sdk": ^3.6.6 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: 513283f49b9051332c910b2de3de74b82d2a5dc66a5b716e161b6379129fc9f7d68ecda142736e34b964162fd3b2f4ef0ba6188523a1b433299c6b136c856b56 + checksum: d982c319a51a44be4c298923fb64cc76bceaa527c0b77d4eb22fef03932f2cdfedafb71c1409d00d679758c7fe6346dad56a5eadfe57af3ee474d279ab686b91 languageName: node linkType: hard @@ -11322,9 +11322,9 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-core@npm:1.55.5-phantom.6, @shapeshiftoss/hdwallet-core@npm:^1.55.5-phantom.6": - version: 1.55.5-phantom.6 - resolution: "@shapeshiftoss/hdwallet-core@npm:1.55.5-phantom.6" +"@shapeshiftoss/hdwallet-core@npm:1.55.5-phantom.9, @shapeshiftoss/hdwallet-core@npm:^1.55.5-phantom.9": + version: 1.55.5-phantom.9 + resolution: "@shapeshiftoss/hdwallet-core@npm:1.55.5-phantom.9" dependencies: "@shapeshiftoss/proto-tx-builder": ^0.8.0 eip-712: ^1.0.0 @@ -11332,30 +11332,30 @@ __metadata: lodash: ^4.17.21 rxjs: ^6.4.0 type-assertions: ^1.1.0 - checksum: adbcf8d62072fdeb5e211240354c74746183de0911ff6a1a6612b458c7f0aaaaef2f718caeb5b39e0c917f769b1b04bb08f23301044446fec441f5d599a074ef + checksum: 96e5e9f493d3dc4d7af263e718720ee507af32bf5953e418d52b624ee6dd540f24b22894e3cc042a34f423ee55a25894506cabb1a57de5d954c4b8b277935bb6 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.5-phantom.6": - version: 1.55.5-phantom.6 - resolution: "@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.5-phantom.6" +"@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.5-phantom.9": + version: 1.55.5-phantom.9 + resolution: "@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.5-phantom.9" dependencies: - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 - "@shapeshiftoss/hdwallet-keepkey": ^1.55.5-phantom.6 - checksum: b7c844eb12d1abc889c3e6c1b356bc77bb1d294ad4320b1ddcb74292a0108fc930a19509ec4c5c7b22834f71c1600e359cd53e81fbc8703345e62061797da4d6 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-keepkey": ^1.55.5-phantom.9 + checksum: c5e563952548ac93cac7736e0e0f8fcfa7eb940ea3fff0cc23387cad45fff9ba42277c3463b6bd52f4f60004d3c753448ac13392c09e55192d3950483f9f8370 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keepkey@npm:1.55.5-phantom.6, @shapeshiftoss/hdwallet-keepkey@npm:^1.55.5-phantom.6": - version: 1.55.5-phantom.6 - resolution: "@shapeshiftoss/hdwallet-keepkey@npm:1.55.5-phantom.6" +"@shapeshiftoss/hdwallet-keepkey@npm:1.55.5-phantom.9, @shapeshiftoss/hdwallet-keepkey@npm:^1.55.5-phantom.9": + version: 1.55.5-phantom.9 + resolution: "@shapeshiftoss/hdwallet-keepkey@npm:1.55.5-phantom.9" dependencies: "@ethereumjs/common": ^2.4.0 "@ethereumjs/tx": ^3.3.0 "@keepkey/device-protocol": ^7.12.2 "@metamask/eth-sig-util": ^7.0.0 "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 "@shapeshiftoss/proto-tx-builder": ^0.8.0 bignumber.js: ^9.0.1 bnb-javascript-sdk-nobroadcast: ^2.16.14 @@ -11367,27 +11367,27 @@ __metadata: p-lazy: ^3.1.0 semver: ^7.3.8 tiny-secp256k1: ^1.1.6 - checksum: ba87d7c55272193365ced3d82f5820d4342ac71e4a08177cbe6dff472ff6e97640a49680e45af8845181a3528d6c145effa6a9786cdcc82f3169ed87b6060636 + checksum: 75a915cb0258a94e430f0f680d5072a9bd71a78681a0f72af54690b6ef96bca83845fe4090f350ed54112bca153b48c930f83ce0fdf120a1ac74ef452b6b2a47 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keplr@npm:1.55.5-phantom.6": - version: 1.55.5-phantom.6 - resolution: "@shapeshiftoss/hdwallet-keplr@npm:1.55.5-phantom.6" +"@shapeshiftoss/hdwallet-keplr@npm:1.55.5-phantom.9": + version: 1.55.5-phantom.9 + resolution: "@shapeshiftoss/hdwallet-keplr@npm:1.55.5-phantom.9" dependencies: "@shapeshiftoss/caip": 8.15.0 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 "@shapeshiftoss/proto-tx-builder": ^0.8.0 "@shapeshiftoss/types": 3.1.3 base64-js: ^1.5.1 lodash: ^4.17.21 - checksum: 131f9d5324327c587619402348d6aff6f378475120f1b99c582db8e157a542fc5945eab6a1617a3e3b4517de07c96c9778bff2e80387da3cf2c2d4fb89e54d65 + checksum: 921a96ab70cd321046d34a1030fd848c0409322f7770d28ff6c76f6ce889612ac3ea7e045d56cb6384430917588ae41fc8195331b6d138286f2c64b245db7760 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.5-phantom.6": - version: 1.55.5-phantom.6 - resolution: "@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.5-phantom.6" +"@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.5-phantom.9": + version: 1.55.5-phantom.9 + resolution: "@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.5-phantom.9" dependencies: "@ledgerhq/hw-app-btc": ^10.0.8 "@ledgerhq/hw-app-eth": ^6.9.0 @@ -11395,23 +11395,23 @@ __metadata: "@ledgerhq/hw-transport-webusb": ^6.7.0 "@ledgerhq/live-common": ^21.8.2 "@ledgerhq/logs": ^6.10.1 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 - "@shapeshiftoss/hdwallet-ledger": ^1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-ledger": ^1.55.5-phantom.9 "@types/w3c-web-usb": ^1.0.4 p-queue: ^7.4.1 - checksum: 80397ddb3296f944df43d376a754cd3370f322688ba878f148b372907a9410a6e339a0c50fb8af9f38eeef0ba5b5ae39a83e30f2402edf7860b6405c1d2618e7 + checksum: 1d96af8233354349806c22761a3ec47b05d2a0a1e134ce29e651e6b86df0845e4f76a6908616c81dcf649274bc0844c4e412aab8488b3b18245787a8034d7fc5 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-ledger@npm:1.55.5-phantom.6, @shapeshiftoss/hdwallet-ledger@npm:^1.55.5-phantom.6": - version: 1.55.5-phantom.6 - resolution: "@shapeshiftoss/hdwallet-ledger@npm:1.55.5-phantom.6" +"@shapeshiftoss/hdwallet-ledger@npm:1.55.5-phantom.9, @shapeshiftoss/hdwallet-ledger@npm:^1.55.5-phantom.9": + version: 1.55.5-phantom.9 + resolution: "@shapeshiftoss/hdwallet-ledger@npm:1.55.5-phantom.9" dependencies: "@ethereumjs/common": ^2.4.0 "@ethereumjs/tx": ^3.3.0 "@ledgerhq/hw-app-cosmos": ^6.29.1 "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 base64-js: ^1.5.1 bchaddrjs: ^0.4.4 bitcoinjs-message: ^2.0.0 @@ -11419,28 +11419,28 @@ __metadata: ethereumjs-tx: 1.3.7 ethereumjs-util: ^6.1.0 lodash: ^4.17.21 - checksum: 254762f234562dfd8b4bcba85d81802e1d278ab993ee7ba17be614b873a3692d9d7d3603089c6d289b0e7a87c881771a9d2d4aea29bfb8ac35c696b997de100c + checksum: 59cd1169c2816c36126aabcf67013d3c0258ccd3eb890b83d8d5e300be8c730a0e6a279e68a58bd935b955169acde8758402b99415d6feb422fd323c896109a3 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-metamask@npm:1.55.5-phantom.6": - version: 1.55.5-phantom.6 - resolution: "@shapeshiftoss/hdwallet-metamask@npm:1.55.5-phantom.6" +"@shapeshiftoss/hdwallet-metamask@npm:1.55.5-phantom.9": + version: 1.55.5-phantom.9 + resolution: "@shapeshiftoss/hdwallet-metamask@npm:1.55.5-phantom.9" dependencies: "@metamask/detect-provider": ^1.2.0 "@metamask/onboarding": ^1.0.1 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: 2d4e9b263c7ed3b262a2667320026548538317613c526f5f3ecbd051b7b3f09c909428240eedfe3de40ffe003d9e0dbd002459df9ec873025ee072ab05b7844f + checksum: a6f8d43dd66d4e9f42c09c73049733b14e23efb293527db61838b381175daeeaecf0fea6ab5f96027f909fec0392520bf62b56cb4eb553a73b6adcc57e87883d languageName: node linkType: hard -"@shapeshiftoss/hdwallet-native-vault@npm:1.55.5-phantom.6": - version: 1.55.5-phantom.6 - resolution: "@shapeshiftoss/hdwallet-native-vault@npm:1.55.5-phantom.6" +"@shapeshiftoss/hdwallet-native-vault@npm:1.55.5-phantom.9": + version: 1.55.5-phantom.9 + resolution: "@shapeshiftoss/hdwallet-native-vault@npm:1.55.5-phantom.9" dependencies: - "@shapeshiftoss/hdwallet-native": ^1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-native": ^1.55.5-phantom.9 bip39: ^3.0.4 hash-wasm: ^4.11.0 idb-keyval: ^6.0.3 @@ -11449,17 +11449,17 @@ __metadata: type-assertions: ^1.1.0 uuid: ^8.3.2 web-encoding: ^1.1.0 - checksum: 8afc7cfb86ffa92b3baeb2f983aedeeec398005015a9d0a9c470efa2a718a206400aaccd2c919f3c56713da0d4207bc8cf81a96e30f447e9ec1dc148bf735637 + checksum: 4d97fbb30d657ae1b9403ece7c8a4c25aee271e98569830f63f4d576d951b955352f66a9f06c311218376b36ccd19186a422ffea1ff23d0695bb6dad5b8e43fa languageName: node linkType: hard -"@shapeshiftoss/hdwallet-native@npm:1.55.5-phantom.6, @shapeshiftoss/hdwallet-native@npm:^1.55.5-phantom.6": - version: 1.55.5-phantom.6 - resolution: "@shapeshiftoss/hdwallet-native@npm:1.55.5-phantom.6" +"@shapeshiftoss/hdwallet-native@npm:1.55.5-phantom.9, @shapeshiftoss/hdwallet-native@npm:^1.55.5-phantom.9": + version: 1.55.5-phantom.9 + resolution: "@shapeshiftoss/hdwallet-native@npm:1.55.5-phantom.9" dependencies: "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 "@shapeshiftoss/fiosdk": 1.2.1-shapeshift.6 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 "@shapeshiftoss/proto-tx-builder": ^0.8.0 "@zxing/text-encoding": ^0.9.0 bchaddrjs: ^0.4.9 @@ -11481,7 +11481,7 @@ __metadata: tendermint-tx-builder: ^1.0.9 tiny-secp256k1: ^1.1.6 web-encoding: ^1.1.0 - checksum: de402edf7716e6528483329ca5efcecd15634c01c6dfa7fe376767e4c5798c00e8a906646abe1d392ff887c7beb47ddd5955e3ba90042a580ca75e0b9e79a176 + checksum: 53b0f250931037b5fd0792eb223f1a90d44cc2a5c4de91d2e600cbdc4a51160d63b0fa6d6eb8201fb680f3e6d3da42cd366d301bbfa788b6697a8ac8fb14e09f languageName: node linkType: hard @@ -11517,51 +11517,51 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-phantom@npm:1.55.5-phantom.6": - version: 1.55.5-phantom.6 - resolution: "@shapeshiftoss/hdwallet-phantom@npm:1.55.5-phantom.6" +"@shapeshiftoss/hdwallet-phantom@npm:1.55.5-phantom.9": + version: 1.55.5-phantom.9 + resolution: "@shapeshiftoss/hdwallet-phantom@npm:1.55.5-phantom.9" dependencies: "@shapeshiftoss/hdwallet-core": 1.54.2 lodash: ^4.17.21 - checksum: b80c1129d4d91e6a3965766e21ee97dcc6e5a42f20a0f5187c0431b9d2dbfd0058905476ec5f766c5714b4aadc2980165a6787e9979893a08537d99e54317c72 + checksum: a3b0804bbd43bd1dd8fa832e2661bf1361b940a29ca1f277d0060a6d809bc6d0c0f4d82dd224b97804eb45c8b935532032d3d806a6b53f48a1c91177dae26510 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.5-phantom.6": - version: 1.55.5-phantom.6 - resolution: "@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.5-phantom.6" +"@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.5-phantom.9": + version: 1.55.5-phantom.9 + resolution: "@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.5-phantom.9" dependencies: "@metamask/detect-provider": ^1.2.0 "@metamask/onboarding": ^1.0.1 "@shapeshiftoss/common-api": ^9.3.0 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 "@shapeshiftoss/metamask-snaps-adapter": ^1.0.10 "@shapeshiftoss/metamask-snaps-types": ^1.0.10 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: a1a1d77e42e683755cc4b474bc96382fb0f4bb12d69893fd10a2d4af4a0831ff9be93ecae7224ce8250a0f405c6fef171415ea93d90b6b4cc8e197ef55300928 + checksum: 7147e3f7c32e8c2cf19e46e620d2e5028495084c90be095d35c905db51713ee3d625762180580f7c2a2dfa6d90949e47c845997b46656e9710fb7e0fef36e046 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.5-phantom.6": - version: 1.55.5-phantom.6 - resolution: "@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.5-phantom.6" +"@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.5-phantom.9": + version: 1.55.5-phantom.9 + resolution: "@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.5-phantom.9" dependencies: - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 "@walletconnect/ethereum-provider": ^2.10.1 "@walletconnect/modal": ^2.6.2 ethers: ^5.6.5 - checksum: 3f7c6c96ae55fd65687b445dfaccdeba35c0022d51ba087314315851e93ada93ca7a4416d22c7dee22a551ad7f7644a4575bf4d3e33fc384fe49633ac31baf0a + checksum: ef6cd0f9992524e86e06cc718d3d49dda457508995431989b0112150ba12194239193e106852a35e95fc4865ab5cd9cee27d63d8dedbec9a51517406b6c89e54 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-xdefi@npm:1.55.5-phantom.6": - version: 1.55.5-phantom.6 - resolution: "@shapeshiftoss/hdwallet-xdefi@npm:1.55.5-phantom.6" +"@shapeshiftoss/hdwallet-xdefi@npm:1.55.5-phantom.9": + version: 1.55.5-phantom.9 + resolution: "@shapeshiftoss/hdwallet-xdefi@npm:1.55.5-phantom.9" dependencies: - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 lodash: ^4.17.21 - checksum: 57050c5cb158972df58f92b6c0463774aa025646de897e16fe45a1bc2a6b6209014c30e0b16118dd4c83523f20dc1c5861c649f0064e9db39e1cd057617dd9ad + checksum: 2a0397378bea2f799dc87a8eba32f15e11202030dff360378931eaaefabaa27436edf7b2255cf310e54a66df2deb03290526a29e28d2466454f1faf2dbb458bb languageName: node linkType: hard @@ -11756,20 +11756,20 @@ __metadata: "@shapeshiftoss/caip": "workspace:^" "@shapeshiftoss/chain-adapters": "workspace:^" "@shapeshiftoss/errors": "workspace:^" - "@shapeshiftoss/hdwallet-coinbase": 1.55.5-phantom.6 - "@shapeshiftoss/hdwallet-core": 1.55.5-phantom.6 - "@shapeshiftoss/hdwallet-keepkey": 1.55.5-phantom.6 - "@shapeshiftoss/hdwallet-keepkey-webusb": 1.55.5-phantom.6 - "@shapeshiftoss/hdwallet-keplr": 1.55.5-phantom.6 - "@shapeshiftoss/hdwallet-ledger": 1.55.5-phantom.6 - "@shapeshiftoss/hdwallet-ledger-webusb": 1.55.5-phantom.6 - "@shapeshiftoss/hdwallet-metamask": 1.55.5-phantom.6 - "@shapeshiftoss/hdwallet-native": 1.55.5-phantom.6 - "@shapeshiftoss/hdwallet-native-vault": 1.55.5-phantom.6 - "@shapeshiftoss/hdwallet-phantom": 1.55.5-phantom.6 - "@shapeshiftoss/hdwallet-shapeshift-multichain": 1.55.5-phantom.6 - "@shapeshiftoss/hdwallet-walletconnectv2": 1.55.5-phantom.6 - "@shapeshiftoss/hdwallet-xdefi": 1.55.5-phantom.6 + "@shapeshiftoss/hdwallet-coinbase": 1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-core": 1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-keepkey": 1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-keepkey-webusb": 1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-keplr": 1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-ledger": 1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-ledger-webusb": 1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-metamask": 1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-native": 1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-native-vault": 1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-phantom": 1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-shapeshift-multichain": 1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-walletconnectv2": 1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-xdefi": 1.55.5-phantom.9 "@shapeshiftoss/swapper": "workspace:^" "@shapeshiftoss/types": "workspace:^" "@shapeshiftoss/unchained-client": "workspace:^" From d917951f2535b4266b8cc4353b624b080a00a3ed Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 19 Sep 2024 17:47:24 +0200 Subject: [PATCH 03/25] fix: bech32 prefix checks for account label/ AccountDropdown --- src/state/slices/portfolioSlice/utils/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/state/slices/portfolioSlice/utils/index.ts b/src/state/slices/portfolioSlice/utils/index.ts index 46acaaa1fd7..7bceb0a3c45 100644 --- a/src/state/slices/portfolioSlice/utils/index.ts +++ b/src/state/slices/portfolioSlice/utils/index.ts @@ -41,6 +41,7 @@ import { supportsThorchain, } from '@shapeshiftoss/hdwallet-core' import type { KnownChainIds, UtxoChainId } from '@shapeshiftoss/types' +import { bech32 } from 'bech32' import cloneDeep from 'lodash/cloneDeep' import maxBy from 'lodash/maxBy' import type { BigNumber } from 'lib/bignumber/bignumber' @@ -76,7 +77,7 @@ export const accountIdToLabel = (accountId: AccountId): string => { // TODO(0xdef1cafe): translations if (pubkey.startsWith('xpub')) return 'Legacy' if (pubkey.startsWith('ypub')) return 'Segwit' - if (pubkey.startsWith('zpub')) return 'Segwit Native' + if (pubkey.startsWith('zpub') || bech32.decode(pubkey).prefix === 'bc') return 'Segwit Native' return '' case bchChainId: return 'Bitcoin Cash' From 91529f82562982a6771d48f435a8f3d77419b993 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 19 Sep 2024 22:52:50 +0200 Subject: [PATCH 04/25] fix: utxo ws :tada: --- packages/chain-adapters/src/utxo/UtxoBaseAdapter.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/chain-adapters/src/utxo/UtxoBaseAdapter.ts b/packages/chain-adapters/src/utxo/UtxoBaseAdapter.ts index 9d9e8ac0315..eb07c0bcea1 100644 --- a/packages/chain-adapters/src/utxo/UtxoBaseAdapter.ts +++ b/packages/chain-adapters/src/utxo/UtxoBaseAdapter.ts @@ -10,6 +10,7 @@ import { BTCOutputAddressType, supportsBTC, } from '@shapeshiftoss/hdwallet-core' +import { PhantomHDWallet } from '@shapeshiftoss/hdwallet-phantom' import type { BIP44Params, UtxoChainId } from '@shapeshiftoss/types' import { KnownChainIds, UtxoAccountType } from '@shapeshiftoss/types' import type * as unchained from '@shapeshiftoss/unchained-client' @@ -517,7 +518,12 @@ export abstract class UtxoBaseAdapter implements IChainAd const account = await this.getAccount( input.pubKey ?? (await this.getPublicKey(wallet, accountNumber, accountType)).xpub, ) - const addresses = (account.chainSpecific.addresses ?? []).map(address => address.pubkey) + const addresses = (() => { + // This means the account isn't an xpub account, pub a pubkey as account i.e Phantom, which doesn't expose an xpub + if (wallet instanceof PhantomHDWallet && !account.chainSpecific.addresses && account.pubkey) + return [account.pubkey] + return (account.chainSpecific.addresses ?? []).map(address => address.pubkey) + })() const subscriptionId = `${toRootDerivationPath(bip44Params)}/${accountType}` await this.providers.ws.subscribeTxs( From 745a229b1ec1f1f8bc68d3992149e6e0ad730d35 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 19 Sep 2024 22:53:06 +0200 Subject: [PATCH 05/25] chore: bump packages --- package.json | 28 ++++----- yarn.lock | 168 +++++++++++++++++++++++++-------------------------- 2 files changed, 98 insertions(+), 98 deletions(-) diff --git a/package.json b/package.json index cf7e80b73bc..66e5e77fa7f 100644 --- a/package.json +++ b/package.json @@ -91,20 +91,20 @@ "@shapeshiftoss/caip": "workspace:^", "@shapeshiftoss/chain-adapters": "workspace:^", "@shapeshiftoss/errors": "workspace:^", - "@shapeshiftoss/hdwallet-coinbase": "1.55.5-phantom.9", - "@shapeshiftoss/hdwallet-core": "1.55.5-phantom.9", - "@shapeshiftoss/hdwallet-keepkey": "1.55.5-phantom.9", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.55.5-phantom.9", - "@shapeshiftoss/hdwallet-keplr": "1.55.5-phantom.9", - "@shapeshiftoss/hdwallet-ledger": "1.55.5-phantom.9", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.55.5-phantom.9", - "@shapeshiftoss/hdwallet-metamask": "1.55.5-phantom.9", - "@shapeshiftoss/hdwallet-native": "1.55.5-phantom.9", - "@shapeshiftoss/hdwallet-native-vault": "1.55.5-phantom.9", - "@shapeshiftoss/hdwallet-phantom": "1.55.5-phantom.9", - "@shapeshiftoss/hdwallet-shapeshift-multichain": "1.55.5-phantom.9", - "@shapeshiftoss/hdwallet-walletconnectv2": "1.55.5-phantom.9", - "@shapeshiftoss/hdwallet-xdefi": "1.55.5-phantom.9", + "@shapeshiftoss/hdwallet-coinbase": "1.55.5-phantom.11", + "@shapeshiftoss/hdwallet-core": "1.55.5-phantom.11", + "@shapeshiftoss/hdwallet-keepkey": "1.55.5-phantom.11", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.55.5-phantom.11", + "@shapeshiftoss/hdwallet-keplr": "1.55.5-phantom.11", + "@shapeshiftoss/hdwallet-ledger": "1.55.5-phantom.11", + "@shapeshiftoss/hdwallet-ledger-webusb": "1.55.5-phantom.11", + "@shapeshiftoss/hdwallet-metamask": "1.55.5-phantom.11", + "@shapeshiftoss/hdwallet-native": "1.55.5-phantom.11", + "@shapeshiftoss/hdwallet-native-vault": "1.55.5-phantom.11", + "@shapeshiftoss/hdwallet-phantom": "1.55.5-phantom.11", + "@shapeshiftoss/hdwallet-shapeshift-multichain": "1.55.5-phantom.11", + "@shapeshiftoss/hdwallet-walletconnectv2": "1.55.5-phantom.11", + "@shapeshiftoss/hdwallet-xdefi": "1.55.5-phantom.11", "@shapeshiftoss/swapper": "workspace:^", "@shapeshiftoss/types": "workspace:^", "@shapeshiftoss/unchained-client": "workspace:^", diff --git a/yarn.lock b/yarn.lock index 4adafb4a063..6cd141d7865 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11270,15 +11270,15 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-coinbase@npm:1.55.5-phantom.9": - version: 1.55.5-phantom.9 - resolution: "@shapeshiftoss/hdwallet-coinbase@npm:1.55.5-phantom.9" +"@shapeshiftoss/hdwallet-coinbase@npm:1.55.5-phantom.11": + version: 1.55.5-phantom.11 + resolution: "@shapeshiftoss/hdwallet-coinbase@npm:1.55.5-phantom.11" dependencies: "@coinbase/wallet-sdk": ^3.6.6 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: d982c319a51a44be4c298923fb64cc76bceaa527c0b77d4eb22fef03932f2cdfedafb71c1409d00d679758c7fe6346dad56a5eadfe57af3ee474d279ab686b91 + checksum: a8dc78d4743e07f0e476b0587bf17c4633ee4e8ddf81132c56b083d387c27c80255249078a6e56f11003490cc8a2595f260aa214ba80ba7ed7e795fe7641cae6 languageName: node linkType: hard @@ -11322,9 +11322,9 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-core@npm:1.55.5-phantom.9, @shapeshiftoss/hdwallet-core@npm:^1.55.5-phantom.9": - version: 1.55.5-phantom.9 - resolution: "@shapeshiftoss/hdwallet-core@npm:1.55.5-phantom.9" +"@shapeshiftoss/hdwallet-core@npm:1.55.5-phantom.11, @shapeshiftoss/hdwallet-core@npm:^1.55.5-phantom.11": + version: 1.55.5-phantom.11 + resolution: "@shapeshiftoss/hdwallet-core@npm:1.55.5-phantom.11" dependencies: "@shapeshiftoss/proto-tx-builder": ^0.8.0 eip-712: ^1.0.0 @@ -11332,30 +11332,30 @@ __metadata: lodash: ^4.17.21 rxjs: ^6.4.0 type-assertions: ^1.1.0 - checksum: 96e5e9f493d3dc4d7af263e718720ee507af32bf5953e418d52b624ee6dd540f24b22894e3cc042a34f423ee55a25894506cabb1a57de5d954c4b8b277935bb6 + checksum: cccd56ed40638e375584a3326802ed8e9abd5d9a524b8f7af322503274ea8b1a11bc8ea1c67cff2ac16d9582b2c57ec135b6e5e93d39721011d7187341d73bac languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.5-phantom.9": - version: 1.55.5-phantom.9 - resolution: "@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.5-phantom.9" +"@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.5-phantom.11": + version: 1.55.5-phantom.11 + resolution: "@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.5-phantom.11" dependencies: - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 - "@shapeshiftoss/hdwallet-keepkey": ^1.55.5-phantom.9 - checksum: c5e563952548ac93cac7736e0e0f8fcfa7eb940ea3fff0cc23387cad45fff9ba42277c3463b6bd52f4f60004d3c753448ac13392c09e55192d3950483f9f8370 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-keepkey": ^1.55.5-phantom.11 + checksum: 1dfe1c5e813387cbdf210933bc50970189065645ac8677f4de7725e032e8473b4ba841278a1b8ce005cb17dc9126add62838696ad7d688f123d718f710077572 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keepkey@npm:1.55.5-phantom.9, @shapeshiftoss/hdwallet-keepkey@npm:^1.55.5-phantom.9": - version: 1.55.5-phantom.9 - resolution: "@shapeshiftoss/hdwallet-keepkey@npm:1.55.5-phantom.9" +"@shapeshiftoss/hdwallet-keepkey@npm:1.55.5-phantom.11, @shapeshiftoss/hdwallet-keepkey@npm:^1.55.5-phantom.11": + version: 1.55.5-phantom.11 + resolution: "@shapeshiftoss/hdwallet-keepkey@npm:1.55.5-phantom.11" dependencies: "@ethereumjs/common": ^2.4.0 "@ethereumjs/tx": ^3.3.0 "@keepkey/device-protocol": ^7.12.2 "@metamask/eth-sig-util": ^7.0.0 "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 "@shapeshiftoss/proto-tx-builder": ^0.8.0 bignumber.js: ^9.0.1 bnb-javascript-sdk-nobroadcast: ^2.16.14 @@ -11367,27 +11367,27 @@ __metadata: p-lazy: ^3.1.0 semver: ^7.3.8 tiny-secp256k1: ^1.1.6 - checksum: 75a915cb0258a94e430f0f680d5072a9bd71a78681a0f72af54690b6ef96bca83845fe4090f350ed54112bca153b48c930f83ce0fdf120a1ac74ef452b6b2a47 + checksum: fabcaf21c7a171c7b93588fc881017c003a133f796e0d457676eedb880737683fa3acd83f649e2dd83528212a7be8ea055c31c8a220df308e4bc2d9243649b7a languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keplr@npm:1.55.5-phantom.9": - version: 1.55.5-phantom.9 - resolution: "@shapeshiftoss/hdwallet-keplr@npm:1.55.5-phantom.9" +"@shapeshiftoss/hdwallet-keplr@npm:1.55.5-phantom.11": + version: 1.55.5-phantom.11 + resolution: "@shapeshiftoss/hdwallet-keplr@npm:1.55.5-phantom.11" dependencies: "@shapeshiftoss/caip": 8.15.0 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 "@shapeshiftoss/proto-tx-builder": ^0.8.0 "@shapeshiftoss/types": 3.1.3 base64-js: ^1.5.1 lodash: ^4.17.21 - checksum: 921a96ab70cd321046d34a1030fd848c0409322f7770d28ff6c76f6ce889612ac3ea7e045d56cb6384430917588ae41fc8195331b6d138286f2c64b245db7760 + checksum: f031397e60d06b185408a8134ff929ed5f1c8dff68e1b01f9f428efce872e254c315a3d1a7dac42482b801e3c66778c00675eee69e2462debed3f42e99f4ef94 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.5-phantom.9": - version: 1.55.5-phantom.9 - resolution: "@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.5-phantom.9" +"@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.5-phantom.11": + version: 1.55.5-phantom.11 + resolution: "@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.5-phantom.11" dependencies: "@ledgerhq/hw-app-btc": ^10.0.8 "@ledgerhq/hw-app-eth": ^6.9.0 @@ -11395,23 +11395,23 @@ __metadata: "@ledgerhq/hw-transport-webusb": ^6.7.0 "@ledgerhq/live-common": ^21.8.2 "@ledgerhq/logs": ^6.10.1 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 - "@shapeshiftoss/hdwallet-ledger": ^1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-ledger": ^1.55.5-phantom.11 "@types/w3c-web-usb": ^1.0.4 p-queue: ^7.4.1 - checksum: 1d96af8233354349806c22761a3ec47b05d2a0a1e134ce29e651e6b86df0845e4f76a6908616c81dcf649274bc0844c4e412aab8488b3b18245787a8034d7fc5 + checksum: 1558a37279821884752b87be4b4089a6a8afb0f4f7ba4ec437376a096a0c18394e99fe3806fc76cf2fccd598d14ec86a4adce90fa3b9ee34115306c1487977d1 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-ledger@npm:1.55.5-phantom.9, @shapeshiftoss/hdwallet-ledger@npm:^1.55.5-phantom.9": - version: 1.55.5-phantom.9 - resolution: "@shapeshiftoss/hdwallet-ledger@npm:1.55.5-phantom.9" +"@shapeshiftoss/hdwallet-ledger@npm:1.55.5-phantom.11, @shapeshiftoss/hdwallet-ledger@npm:^1.55.5-phantom.11": + version: 1.55.5-phantom.11 + resolution: "@shapeshiftoss/hdwallet-ledger@npm:1.55.5-phantom.11" dependencies: "@ethereumjs/common": ^2.4.0 "@ethereumjs/tx": ^3.3.0 "@ledgerhq/hw-app-cosmos": ^6.29.1 "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 base64-js: ^1.5.1 bchaddrjs: ^0.4.4 bitcoinjs-message: ^2.0.0 @@ -11419,28 +11419,28 @@ __metadata: ethereumjs-tx: 1.3.7 ethereumjs-util: ^6.1.0 lodash: ^4.17.21 - checksum: 59cd1169c2816c36126aabcf67013d3c0258ccd3eb890b83d8d5e300be8c730a0e6a279e68a58bd935b955169acde8758402b99415d6feb422fd323c896109a3 + checksum: 87af6fabd154e9e495e75e8e5a7ba9eaf00c8a9e22b7792eafbdfc0de98c78064f7fe0d2efb3b2e04c5fc2b819307eec2e148aef39fc9d7f292a8ff1e7b1cf60 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-metamask@npm:1.55.5-phantom.9": - version: 1.55.5-phantom.9 - resolution: "@shapeshiftoss/hdwallet-metamask@npm:1.55.5-phantom.9" +"@shapeshiftoss/hdwallet-metamask@npm:1.55.5-phantom.11": + version: 1.55.5-phantom.11 + resolution: "@shapeshiftoss/hdwallet-metamask@npm:1.55.5-phantom.11" dependencies: "@metamask/detect-provider": ^1.2.0 "@metamask/onboarding": ^1.0.1 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: a6f8d43dd66d4e9f42c09c73049733b14e23efb293527db61838b381175daeeaecf0fea6ab5f96027f909fec0392520bf62b56cb4eb553a73b6adcc57e87883d + checksum: 56136b584169f10e6eeaa734d9cab2fb89380e204ef2a361af1a975f87ebe044f54f8dee61ce71c8247eda709c52837745beb1a547dd694f34663e14f7ac3ce6 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-native-vault@npm:1.55.5-phantom.9": - version: 1.55.5-phantom.9 - resolution: "@shapeshiftoss/hdwallet-native-vault@npm:1.55.5-phantom.9" +"@shapeshiftoss/hdwallet-native-vault@npm:1.55.5-phantom.11": + version: 1.55.5-phantom.11 + resolution: "@shapeshiftoss/hdwallet-native-vault@npm:1.55.5-phantom.11" dependencies: - "@shapeshiftoss/hdwallet-native": ^1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-native": ^1.55.5-phantom.11 bip39: ^3.0.4 hash-wasm: ^4.11.0 idb-keyval: ^6.0.3 @@ -11449,17 +11449,17 @@ __metadata: type-assertions: ^1.1.0 uuid: ^8.3.2 web-encoding: ^1.1.0 - checksum: 4d97fbb30d657ae1b9403ece7c8a4c25aee271e98569830f63f4d576d951b955352f66a9f06c311218376b36ccd19186a422ffea1ff23d0695bb6dad5b8e43fa + checksum: 39dbf6b88d27a7688a2e3d35323d04741c41553f9d8492a72b0daf284ac6a53b784732c4a5478acbc26bb54ec7871ed054eb111557331850ed3ef8e8f2a57a1c languageName: node linkType: hard -"@shapeshiftoss/hdwallet-native@npm:1.55.5-phantom.9, @shapeshiftoss/hdwallet-native@npm:^1.55.5-phantom.9": - version: 1.55.5-phantom.9 - resolution: "@shapeshiftoss/hdwallet-native@npm:1.55.5-phantom.9" +"@shapeshiftoss/hdwallet-native@npm:1.55.5-phantom.11, @shapeshiftoss/hdwallet-native@npm:^1.55.5-phantom.11": + version: 1.55.5-phantom.11 + resolution: "@shapeshiftoss/hdwallet-native@npm:1.55.5-phantom.11" dependencies: "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 "@shapeshiftoss/fiosdk": 1.2.1-shapeshift.6 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 "@shapeshiftoss/proto-tx-builder": ^0.8.0 "@zxing/text-encoding": ^0.9.0 bchaddrjs: ^0.4.9 @@ -11481,7 +11481,7 @@ __metadata: tendermint-tx-builder: ^1.0.9 tiny-secp256k1: ^1.1.6 web-encoding: ^1.1.0 - checksum: 53b0f250931037b5fd0792eb223f1a90d44cc2a5c4de91d2e600cbdc4a51160d63b0fa6d6eb8201fb680f3e6d3da42cd366d301bbfa788b6697a8ac8fb14e09f + checksum: d374fcc4e40832ec5808d54d8bb4f9d0da1971640a330875a19676355669c4478dc54d736bb55ac884188e452858934cb0b7587821c6645881632ff658b55cd2 languageName: node linkType: hard @@ -11517,51 +11517,51 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-phantom@npm:1.55.5-phantom.9": - version: 1.55.5-phantom.9 - resolution: "@shapeshiftoss/hdwallet-phantom@npm:1.55.5-phantom.9" +"@shapeshiftoss/hdwallet-phantom@npm:1.55.5-phantom.11": + version: 1.55.5-phantom.11 + resolution: "@shapeshiftoss/hdwallet-phantom@npm:1.55.5-phantom.11" dependencies: "@shapeshiftoss/hdwallet-core": 1.54.2 lodash: ^4.17.21 - checksum: a3b0804bbd43bd1dd8fa832e2661bf1361b940a29ca1f277d0060a6d809bc6d0c0f4d82dd224b97804eb45c8b935532032d3d806a6b53f48a1c91177dae26510 + checksum: 9a14bad137fe7309b7e3bb1f1af12e3c5dd52d37d7ebbf07df9d9007e77e077f6ed3324de8c480c73131e869cd5d6e02be9f73c62a92abc826b72bf1d83b83ad languageName: node linkType: hard -"@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.5-phantom.9": - version: 1.55.5-phantom.9 - resolution: "@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.5-phantom.9" +"@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.5-phantom.11": + version: 1.55.5-phantom.11 + resolution: "@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.5-phantom.11" dependencies: "@metamask/detect-provider": ^1.2.0 "@metamask/onboarding": ^1.0.1 "@shapeshiftoss/common-api": ^9.3.0 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 "@shapeshiftoss/metamask-snaps-adapter": ^1.0.10 "@shapeshiftoss/metamask-snaps-types": ^1.0.10 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: 7147e3f7c32e8c2cf19e46e620d2e5028495084c90be095d35c905db51713ee3d625762180580f7c2a2dfa6d90949e47c845997b46656e9710fb7e0fef36e046 + checksum: f201024d54147c6094327098039ceb938c37dadfee30d7d420d2ddea8fa52a88250172be816b34d95bcdc685ed83686fb59184ffaf7f6cd0a5d39440811b8611 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.5-phantom.9": - version: 1.55.5-phantom.9 - resolution: "@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.5-phantom.9" +"@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.5-phantom.11": + version: 1.55.5-phantom.11 + resolution: "@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.5-phantom.11" dependencies: - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 "@walletconnect/ethereum-provider": ^2.10.1 "@walletconnect/modal": ^2.6.2 ethers: ^5.6.5 - checksum: ef6cd0f9992524e86e06cc718d3d49dda457508995431989b0112150ba12194239193e106852a35e95fc4865ab5cd9cee27d63d8dedbec9a51517406b6c89e54 + checksum: 5015c8e95433215e8513b034515099242a63377ca89b000e72578c1e6eeda4a3fc79a470abbbf37f5004c7a597f1a99a89d38ba6ab2deab2d1849983b8529496 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-xdefi@npm:1.55.5-phantom.9": - version: 1.55.5-phantom.9 - resolution: "@shapeshiftoss/hdwallet-xdefi@npm:1.55.5-phantom.9" +"@shapeshiftoss/hdwallet-xdefi@npm:1.55.5-phantom.11": + version: 1.55.5-phantom.11 + resolution: "@shapeshiftoss/hdwallet-xdefi@npm:1.55.5-phantom.11" dependencies: - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 lodash: ^4.17.21 - checksum: 2a0397378bea2f799dc87a8eba32f15e11202030dff360378931eaaefabaa27436edf7b2255cf310e54a66df2deb03290526a29e28d2466454f1faf2dbb458bb + checksum: 1bf1c858470140f36c9b43c67e7bb410c1de6530b9951b904d5a6a3aa79fcee4ddb994aaa187006873676658cb8c2dac49e4e28e1a2f61a467d2edd188e83e15 languageName: node linkType: hard @@ -11756,20 +11756,20 @@ __metadata: "@shapeshiftoss/caip": "workspace:^" "@shapeshiftoss/chain-adapters": "workspace:^" "@shapeshiftoss/errors": "workspace:^" - "@shapeshiftoss/hdwallet-coinbase": 1.55.5-phantom.9 - "@shapeshiftoss/hdwallet-core": 1.55.5-phantom.9 - "@shapeshiftoss/hdwallet-keepkey": 1.55.5-phantom.9 - "@shapeshiftoss/hdwallet-keepkey-webusb": 1.55.5-phantom.9 - "@shapeshiftoss/hdwallet-keplr": 1.55.5-phantom.9 - "@shapeshiftoss/hdwallet-ledger": 1.55.5-phantom.9 - "@shapeshiftoss/hdwallet-ledger-webusb": 1.55.5-phantom.9 - "@shapeshiftoss/hdwallet-metamask": 1.55.5-phantom.9 - "@shapeshiftoss/hdwallet-native": 1.55.5-phantom.9 - "@shapeshiftoss/hdwallet-native-vault": 1.55.5-phantom.9 - "@shapeshiftoss/hdwallet-phantom": 1.55.5-phantom.9 - "@shapeshiftoss/hdwallet-shapeshift-multichain": 1.55.5-phantom.9 - "@shapeshiftoss/hdwallet-walletconnectv2": 1.55.5-phantom.9 - "@shapeshiftoss/hdwallet-xdefi": 1.55.5-phantom.9 + "@shapeshiftoss/hdwallet-coinbase": 1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-core": 1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-keepkey": 1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-keepkey-webusb": 1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-keplr": 1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-ledger": 1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-ledger-webusb": 1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-metamask": 1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-native": 1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-native-vault": 1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-phantom": 1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-shapeshift-multichain": 1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-walletconnectv2": 1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-xdefi": 1.55.5-phantom.11 "@shapeshiftoss/swapper": "workspace:^" "@shapeshiftoss/types": "workspace:^" "@shapeshiftoss/unchained-client": "workspace:^" From 15f5eaf44cb77955cf9fd75c162b0a529f78a712 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Thu, 19 Sep 2024 22:55:37 +0200 Subject: [PATCH 06/25] feat: flag --- .env.base | 1 + .env.dev | 1 + .env.develop | 1 + src/config.ts | 1 + src/context/WalletProvider/SelectModal.tsx | 3 +++ src/state/slices/preferencesSlice/preferencesSlice.ts | 2 ++ src/test/mocks/store.ts | 1 + 7 files changed, 10 insertions(+) diff --git a/.env.base b/.env.base index a15243f1306..6edbff24bc8 100644 --- a/.env.base +++ b/.env.base @@ -42,6 +42,7 @@ REACT_APP_FEATURE_USDT_APPROVAL_RESET=true REACT_APP_FEATURE_PORTALS_SWAPPER=true REACT_APP_FEATURE_RUNEPOOL=true REACT_APP_FEATURE_MARKETS=false +REACT_APP_FEATURE_PHANTOM_WALLET=false # absolute URL prefix REACT_APP_ABSOLUTE_URL_PREFIX=https://app.shapeshift.com diff --git a/.env.dev b/.env.dev index 326bdaa71d6..f299a217699 100644 --- a/.env.dev +++ b/.env.dev @@ -55,3 +55,4 @@ REACT_APP_THORCHAIN_NODE_URL=https://dev-daemon.thorchain.shapeshift.com REACT_APP_MIDGARD_URL=https://dev-indexer.thorchain.shapeshift.com/v2 REACT_APP_FEATURE_MARKETS=true +REACT_APP_FEATURE_PHANTOM_WALLET=true diff --git a/.env.develop b/.env.develop index cdf541615e5..3d89e187356 100644 --- a/.env.develop +++ b/.env.develop @@ -52,3 +52,4 @@ REACT_APP_THORCHAIN_NODE_URL=https://dev-daemon.thorchain.shapeshift.com REACT_APP_MIDGARD_URL=https://dev-indexer.thorchain.shapeshift.com/v2 REACT_APP_FEATURE_MARKETS=true +REACT_APP_FEATURE_PHANTOM_WALLET=true diff --git a/src/config.ts b/src/config.ts index e369aaa9e03..61c0cafc351 100644 --- a/src/config.ts +++ b/src/config.ts @@ -172,6 +172,7 @@ const validators = { REACT_APP_FEATURE_MARKETS: bool({ default: false }), REACT_APP_PORTALS_BASE_URL: url(), REACT_APP_ZERION_BASE_URL: url(), + REACT_APP_FEATURE_PHANTOM_WALLET: bool({ default: false }), } function reporter({ errors }: envalid.ReporterOptions) { diff --git a/src/context/WalletProvider/SelectModal.tsx b/src/context/WalletProvider/SelectModal.tsx index 9e6dbbf8e62..c5e18a4371b 100644 --- a/src/context/WalletProvider/SelectModal.tsx +++ b/src/context/WalletProvider/SelectModal.tsx @@ -64,6 +64,9 @@ const WalletSelectItem = ({ const isCoinbaseEnabled = getConfig().REACT_APP_FEATURE_COINBASE_WALLET if (walletType === KeyManager.Coinbase && !isCoinbaseEnabled) return null + const isPhantomEnabled = getConfig().REACT_APP_FEATURE_PHANTOM_WALLET + if (walletType === KeyManager.Phantom && !isPhantomEnabled) return null + const isWalletConnectV2Enabled = getConfig().REACT_APP_FEATURE_WALLET_CONNECT_V2 if (walletType === KeyManager.WalletConnectV2 && !isWalletConnectV2Enabled) return null diff --git a/src/state/slices/preferencesSlice/preferencesSlice.ts b/src/state/slices/preferencesSlice/preferencesSlice.ts index b276822c6b5..cc06a169feb 100644 --- a/src/state/slices/preferencesSlice/preferencesSlice.ts +++ b/src/state/slices/preferencesSlice/preferencesSlice.ts @@ -62,6 +62,7 @@ export type FeatureFlags = { UsdtApprovalReset: boolean RunePool: boolean Markets: boolean + PhantomWallet: boolean } export type Flag = keyof FeatureFlags @@ -149,6 +150,7 @@ const initialState: Preferences = { UsdtApprovalReset: getConfig().REACT_APP_FEATURE_USDT_APPROVAL_RESET, RunePool: getConfig().REACT_APP_FEATURE_RUNEPOOL, Markets: getConfig().REACT_APP_FEATURE_MARKETS, + PhantomWallet: getConfig().REACT_APP_FEATURE_PHANTOM_WALLET, }, selectedLocale: simpleLocale(), balanceThreshold: '0', diff --git a/src/test/mocks/store.ts b/src/test/mocks/store.ts index cb9f8af6d1a..cc5087d3b14 100644 --- a/src/test/mocks/store.ts +++ b/src/test/mocks/store.ts @@ -114,6 +114,7 @@ export const mockStore: ReduxState = { RunePool: false, Portals: false, Markets: false, + PhantomWallet: false, }, selectedLocale: 'en', balanceThreshold: '0', From 447787c22f022fe42117ce4cc3b9537c95e42975 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Fri, 20 Sep 2024 11:55:53 +0200 Subject: [PATCH 07/25] fix: btc things --- packages/chain-adapters/src/utxo/utxoSelect/index.ts | 8 +++++++- src/lib/utils/thorchain/index.ts | 11 +++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/chain-adapters/src/utxo/utxoSelect/index.ts b/packages/chain-adapters/src/utxo/utxoSelect/index.ts index d703706c34a..d499806d742 100644 --- a/packages/chain-adapters/src/utxo/utxoSelect/index.ts +++ b/packages/chain-adapters/src/utxo/utxoSelect/index.ts @@ -33,7 +33,13 @@ export const utxoSelect = (input: UTXOSelectInput) => { // If input contains a `from` param, the intent is to only keep the UTXOs from that address // so we can ensure the send address is the one we want // This doesn't do any further checks, so error-handling should be done by the caller e.g `buildSendTransaction` callsites - if (!input.from || (input.from && utxo.address === input.from)) { + if ( + !input.from || + // Accommodate for pubkey (not xpub) UTXOs which don't have an address + // Can there ever be a case where a pubkey UTXO also doesn't contain an address and this is a danger for fundus? + (input.from && !utxo.address) || + (input.from && utxo.address === input.from) + ) { acc.push(sanitizedUtxo) } return acc diff --git a/src/lib/utils/thorchain/index.ts b/src/lib/utils/thorchain/index.ts index 93d48adaa97..3068bfca580 100644 --- a/src/lib/utils/thorchain/index.ts +++ b/src/lib/utils/thorchain/index.ts @@ -16,6 +16,7 @@ import { thorService } from '@shapeshiftoss/swapper/dist/swappers/ThorchainSwapp import type { AccountMetadata, Asset, KnownChainIds } from '@shapeshiftoss/types' import { TxStatus } from '@shapeshiftoss/unchained-client' import axios from 'axios' +import { bech32 } from 'bech32' import { getConfig } from 'config' import dayjs from 'dayjs' import memoize from 'lodash/memoize' @@ -223,10 +224,12 @@ const getAccountAddressesWithBalances = async ( // Memoized on accountId, see lodash docs: // "By default, the first argument provided to the memoized function is used as the map cache key." -export const getAccountAddresses = memoize( - async (accountId: AccountId): Promise => - (await getAccountAddressesWithBalances(accountId)).map(({ address }) => address), -) +export const getAccountAddresses = memoize(async (accountId: AccountId): Promise => { + // Handle the case where the accountId is a pubkey AccountId, not an xpub AccountId + if (isUtxoAccountId(accountId) && bech32.decode(fromAccountId(accountId).account).prefix === 'bc') + return [fromAccountId(accountId).account] + return (await getAccountAddressesWithBalances(accountId)).map(({ address }) => address) +}) // A THOR Tx can either be: // - a RUNE MsgDeposit message type From c9ee4ba880f8c4d8b8fd7f6bf46a3979b4fa882e Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Fri, 20 Sep 2024 12:36:46 +0200 Subject: [PATCH 08/25] fix: savers consistent withdraw dust amount --- .../Overview/ThorchainSaversOverview.tsx | 7 +------ .../Withdraw/components/Confirm.tsx | 3 +++ .../Withdraw/components/Withdraw.tsx | 2 +- .../utils/thorchain/hooks/useSendThorTx.tsx | 19 +++++++++++++------ .../RemoveLiquidity/RemoveLiquidityInput.tsx | 4 ++-- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Overview/ThorchainSaversOverview.tsx b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Overview/ThorchainSaversOverview.tsx index 5d25b3e205f..6cc7b071970 100644 --- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Overview/ThorchainSaversOverview.tsx +++ b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Overview/ThorchainSaversOverview.tsx @@ -301,12 +301,7 @@ export const ThorchainSaversOverview: React.FC = ({ label: 'common.deposit', icon: , action: DefiAction.Deposit, - isDisabled: - isFull || - hasPendingTxs || - hasPendingQueries || - isHaltedDeposits || - isDisabledDeposits, + isDisabled: false, toolTip: (() => { if (isDisabledDeposits) return translate('defi.modals.saversVaults.disabledDepositTitle') diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Confirm.tsx b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Confirm.tsx index 4fb914a7e7b..99a6db0c231 100644 --- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Confirm.tsx +++ b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Confirm.tsx @@ -220,6 +220,7 @@ export const Confirm: React.FC = ({ accountId, onNext }) => { setProtocolFeeCryptoBaseUnit( toBaseUnit(fromThorBaseUnit(protocolFeeCryptoThorBaseUnit), asset.precision), ) + setDustAmountCryptoBaseUnit( bnOrZero(toBaseUnit(fromThorBaseUnit(dust_amount), asset.precision)).toFixed( asset.precision, @@ -248,6 +249,7 @@ export const Confirm: React.FC = ({ accountId, onNext }) => { protocolFeeCryptoBaseUnit, expiry, isRunePool, + feeAsset?.assetId, ]) useEffect(() => { @@ -293,6 +295,7 @@ export const Confirm: React.FC = ({ accountId, onNext }) => { action: isRunePool ? 'withdrawRunepool' : 'withdrawSavers', memo, fromAddress, + dustAmountCryptoBaseUnit, }) const estimatedGasCryptoPrecision = useMemo(() => { diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Withdraw.tsx b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Withdraw.tsx index 0debc0c911e..b116bfa7184 100644 --- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Withdraw.tsx +++ b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Withdraw.tsx @@ -210,7 +210,7 @@ export const Withdraw: React.FC = ({ accountId, fromAddress, onNe const { estimatedFeesData, isEstimatedFeesDataLoading, - dustAmountCryptoBaseUnit, + dustAmountCryptoBaseUnitOrDefault: dustAmountCryptoBaseUnit, outboundFeeCryptoBaseUnit, } = useSendThorTx({ assetId, diff --git a/src/lib/utils/thorchain/hooks/useSendThorTx.tsx b/src/lib/utils/thorchain/hooks/useSendThorTx.tsx index 9bc0e4eb0b7..cfbb3ec54ea 100644 --- a/src/lib/utils/thorchain/hooks/useSendThorTx.tsx +++ b/src/lib/utils/thorchain/hooks/useSendThorTx.tsx @@ -66,6 +66,7 @@ type UseSendThorTxProps = { disableEstimateFeesRefetch?: boolean fromAddress: string | null memo: string | null + dustAmountCryptoBaseUnit?: string | null } export const useSendThorTx = ({ @@ -77,6 +78,7 @@ export const useSendThorTx = ({ disableEstimateFeesRefetch, fromAddress, memo: _memo, + dustAmountCryptoBaseUnit: _dustAmountCryptoBaseUnit, }: UseSendThorTxProps) => { const [txId, setTxId] = useState(null) const [serializedTxIndex, setSerializedTxIndex] = useState(null) @@ -100,14 +102,19 @@ export const useSendThorTx = ({ return ['withdrawLiquidity', 'withdrawSavers'].includes(action) }, [action]) + // Either a fall through of the passed dustAmountCryptoBaseUnit, or the default dust amount for that feeAsset // @TODO: test this with RUNEPool, might not work properly due to mapping for LPs - const dustAmountCryptoBaseUnit = useMemo(() => { - return THORCHAIN_SAVERS_DUST_THRESHOLDS_CRYPTO_BASE_UNIT[feeAsset?.assetId ?? ''] ?? '0' - }, [feeAsset]) + const dustAmountCryptoBaseUnitOrDefault = useMemo(() => { + return _dustAmountCryptoBaseUnit + ? _dustAmountCryptoBaseUnit + : THORCHAIN_SAVERS_DUST_THRESHOLDS_CRYPTO_BASE_UNIT[feeAsset?.assetId ?? ''] ?? '0' + }, [_dustAmountCryptoBaseUnit, feeAsset?.assetId]) const amountOrDustCryptoBaseUnit = useMemo(() => { - return shouldUseDustAmount ? dustAmountCryptoBaseUnit : bnOrZero(amountCryptoBaseUnit).toFixed() - }, [shouldUseDustAmount, dustAmountCryptoBaseUnit, amountCryptoBaseUnit]) + return shouldUseDustAmount + ? dustAmountCryptoBaseUnitOrDefault + : bnOrZero(amountCryptoBaseUnit).toFixed() + }, [shouldUseDustAmount, dustAmountCryptoBaseUnitOrDefault, amountCryptoBaseUnit]) const transactionType = useMemo(() => { return asset ? getThorchainTransactionType(asset.chainId) : undefined @@ -447,7 +454,7 @@ export const useSendThorTx = ({ isEstimatedFeesDataError, txId, serializedTxIndex, - dustAmountCryptoBaseUnit, + dustAmountCryptoBaseUnitOrDefault, outboundFeeCryptoBaseUnit, inboundAddress, } diff --git a/src/pages/ThorChainLP/components/RemoveLiquidity/RemoveLiquidityInput.tsx b/src/pages/ThorChainLP/components/RemoveLiquidity/RemoveLiquidityInput.tsx index 42c6a1bcc65..9f547ab0a5d 100644 --- a/src/pages/ThorChainLP/components/RemoveLiquidity/RemoveLiquidityInput.tsx +++ b/src/pages/ThorChainLP/components/RemoveLiquidity/RemoveLiquidityInput.tsx @@ -382,7 +382,7 @@ export const RemoveLiquidityInput: React.FC = ({ estimatedFeesData: estimatedRuneFeesData, isEstimatedFeesDataLoading: isEstimatedRuneFeesDataLoading, isEstimatedFeesDataError: isEstimatedRuneFeesDataError, - dustAmountCryptoBaseUnit: runeDustAmountCryptoBaseUnit, + dustAmountCryptoBaseUnitOrDefault: runeDustAmountCryptoBaseUnit, } = useSendThorTx({ assetId: thorchainAssetId, accountId: positionRuneAccountId ?? null, @@ -415,7 +415,7 @@ export const RemoveLiquidityInput: React.FC = ({ estimatedFeesData: estimatedPoolAssetFeesData, isEstimatedFeesDataLoading: isEstimatedPoolAssetFeesDataLoading, isEstimatedFeesDataError: isEstimatedPoolAssetFeesDataError, - dustAmountCryptoBaseUnit: poolAssetFeeAssetDustAmountCryptoBaseUnit, + dustAmountCryptoBaseUnitOrDefault: poolAssetFeeAssetDustAmountCryptoBaseUnit, outboundFeeCryptoBaseUnit, } = useSendThorTx({ // Asym asset withdraws are the only ones occurring an asset Tx - both sym and asym RUNE side withdraws occur a RUNE Tx instead From 32801d80310fa718c266eb2046119c7729f49f8d Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Fri, 20 Sep 2024 16:58:21 +0200 Subject: [PATCH 09/25] fix: toFixed() (pun intended) --- src/lib/utils/thorchain/hooks/useSendThorTx.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/utils/thorchain/hooks/useSendThorTx.tsx b/src/lib/utils/thorchain/hooks/useSendThorTx.tsx index cfbb3ec54ea..6f8a27394c9 100644 --- a/src/lib/utils/thorchain/hooks/useSendThorTx.tsx +++ b/src/lib/utils/thorchain/hooks/useSendThorTx.tsx @@ -112,8 +112,8 @@ export const useSendThorTx = ({ const amountOrDustCryptoBaseUnit = useMemo(() => { return shouldUseDustAmount - ? dustAmountCryptoBaseUnitOrDefault - : bnOrZero(amountCryptoBaseUnit).toFixed() + ? bnOrZero(dustAmountCryptoBaseUnitOrDefault).toFixed(0) + : bnOrZero(amountCryptoBaseUnit).toFixed(0) }, [shouldUseDustAmount, dustAmountCryptoBaseUnitOrDefault, amountCryptoBaseUnit]) const transactionType = useMemo(() => { From b260f734da797d130852b96434afc2fa04533a1a Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Sat, 21 Sep 2024 00:27:51 +0200 Subject: [PATCH 10/25] feat: install --- .yarnrc.yml | 2 +- package.json | 28 ++-- yarn.lock | 464 +++++++++++++++++++++++---------------------------- 3 files changed, 228 insertions(+), 266 deletions(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index 8add129182d..63e1e733135 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,6 +1,6 @@ nodeLinker: node-modules -npmRegistryServer: "http://127.0.0.1:4873/" +npmRegistryServer: "https://registry.npmjs.org" plugins: - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs diff --git a/package.json b/package.json index 66e5e77fa7f..30e1d7aae9d 100644 --- a/package.json +++ b/package.json @@ -91,20 +91,20 @@ "@shapeshiftoss/caip": "workspace:^", "@shapeshiftoss/chain-adapters": "workspace:^", "@shapeshiftoss/errors": "workspace:^", - "@shapeshiftoss/hdwallet-coinbase": "1.55.5-phantom.11", - "@shapeshiftoss/hdwallet-core": "1.55.5-phantom.11", - "@shapeshiftoss/hdwallet-keepkey": "1.55.5-phantom.11", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.55.5-phantom.11", - "@shapeshiftoss/hdwallet-keplr": "1.55.5-phantom.11", - "@shapeshiftoss/hdwallet-ledger": "1.55.5-phantom.11", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.55.5-phantom.11", - "@shapeshiftoss/hdwallet-metamask": "1.55.5-phantom.11", - "@shapeshiftoss/hdwallet-native": "1.55.5-phantom.11", - "@shapeshiftoss/hdwallet-native-vault": "1.55.5-phantom.11", - "@shapeshiftoss/hdwallet-phantom": "1.55.5-phantom.11", - "@shapeshiftoss/hdwallet-shapeshift-multichain": "1.55.5-phantom.11", - "@shapeshiftoss/hdwallet-walletconnectv2": "1.55.5-phantom.11", - "@shapeshiftoss/hdwallet-xdefi": "1.55.5-phantom.11", + "@shapeshiftoss/hdwallet-coinbase": "1.55.6", + "@shapeshiftoss/hdwallet-core": "1.55.6", + "@shapeshiftoss/hdwallet-keepkey": "1.55.6", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.55.6", + "@shapeshiftoss/hdwallet-keplr": "1.55.6", + "@shapeshiftoss/hdwallet-ledger": "1.55.6", + "@shapeshiftoss/hdwallet-ledger-webusb": "1.55.6", + "@shapeshiftoss/hdwallet-metamask": "1.55.6", + "@shapeshiftoss/hdwallet-native": "1.55.6", + "@shapeshiftoss/hdwallet-native-vault": "1.55.6", + "@shapeshiftoss/hdwallet-phantom": "1.55.6", + "@shapeshiftoss/hdwallet-shapeshift-multichain": "1.55.6", + "@shapeshiftoss/hdwallet-walletconnectv2": "1.55.6", + "@shapeshiftoss/hdwallet-xdefi": "1.55.6", "@shapeshiftoss/swapper": "workspace:^", "@shapeshiftoss/types": "workspace:^", "@shapeshiftoss/unchained-client": "workspace:^", diff --git a/yarn.lock b/yarn.lock index 6cd141d7865..bbdc0080cf8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8106,12 +8106,14 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/cryptoassets@npm:^11.0.0": - version: 11.0.0 - resolution: "@ledgerhq/cryptoassets@npm:11.0.0" +"@ledgerhq/cryptoassets@npm:^13.4.0": + version: 13.4.0 + resolution: "@ledgerhq/cryptoassets@npm:13.4.0" dependencies: + axios: 1.7.3 + bs58check: ^2.1.2 invariant: 2 - checksum: dc81640f46f4fc97aeac3f7ea5a7d2d9d14acea9a6542a3606cdfd1d6b221c533d98d6008c27e5a17a781a7ffe612e82b0778aabf0388cd96d100fe9f4b5f6e2 + checksum: 150e967fcf76a868cc44065fd71ca77ffd1e6728e73e9ed14b2092eef8a55be2fbc70b7c9cd54f0babc340ff12a28312d5fd52e64805ccc7f095c1066ad25ebd languageName: node linkType: hard @@ -8196,19 +8198,30 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/domain-service@npm:^1.1.12": - version: 1.1.12 - resolution: "@ledgerhq/domain-service@npm:1.1.12" +"@ledgerhq/devices@npm:^8.4.3": + version: 8.4.3 + resolution: "@ledgerhq/devices@npm:8.4.3" dependencies: - "@ledgerhq/cryptoassets": ^11.0.0 - "@ledgerhq/errors": ^6.14.0 - "@ledgerhq/logs": ^6.10.1 - "@ledgerhq/types-live": ^6.41.0 - axios: ^1.3.4 + "@ledgerhq/errors": ^6.19.0 + "@ledgerhq/logs": ^6.12.0 + rxjs: ^7.8.1 + semver: ^7.3.5 + checksum: 7f40b8ed88efb51115c6520e9a61bf78137cfe9de09b686f8039606b5a747394dcf14079243bd92126700bab7bd8b67683a747435a5b0d197894d9cdeaf6240a + languageName: node + linkType: hard + +"@ledgerhq/domain-service@npm:^1.2.4": + version: 1.2.4 + resolution: "@ledgerhq/domain-service@npm:1.2.4" + dependencies: + "@ledgerhq/errors": ^6.19.0 + "@ledgerhq/logs": ^6.12.0 + "@ledgerhq/types-live": ^6.51.0 + axios: 1.7.3 eip55: ^2.1.1 - react: ^17.0.2 - react-dom: ^17.0.2 - checksum: 5f8d2e58e7bd78f2fce5d8f85e4484cd363bc18636d584eee6272739a7ff0af2bb747c71c7b5c5585538099e1820da3d5bce8ceab411844bf1d223e1f76729a9 + react: ^18.2.0 + react-dom: ^18.2.0 + checksum: b2d8fb700d4b8b668adf55768c848f6b6ec013609e5c27cd69be9470a0cc035f575c7a3648c981c2288d1b6ad7b3f06c2d5f6c6bd3f7f780e649da9df32b2e43 languageName: node linkType: hard @@ -8247,16 +8260,23 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/evm-tools@npm:^1.0.8": - version: 1.0.8 - resolution: "@ledgerhq/evm-tools@npm:1.0.8" +"@ledgerhq/errors@npm:^6.19.0": + version: 6.19.0 + resolution: "@ledgerhq/errors@npm:6.19.0" + checksum: 0d7f6152c670a114689c36c6cbc1639298ecb702088e2a413fa9932b798f8caebeefb17d9c131db057de5f1ca80e4600ef5b51683398af61d882688714338254 + languageName: node + linkType: hard + +"@ledgerhq/evm-tools@npm:^1.2.1": + version: 1.2.1 + resolution: "@ledgerhq/evm-tools@npm:1.2.1" dependencies: - "@ledgerhq/cryptoassets": ^11.0.0 - "@ledgerhq/live-env": ^0.6.0 - "@ledgerhq/live-network": ^1.1.7 - crypto-js: 4.1.1 + "@ledgerhq/cryptoassets": ^13.4.0 + "@ledgerhq/live-env": ^2.3.0 + axios: 1.7.3 + crypto-js: 4.2.0 ethers: 5.7.2 - checksum: 28a2f11890267dc3c8c31b2f68dca3f99d1ded5903158b7f969311a7853f67b285d5a08aa0a80a8bf50280640d3ec951d688ee43c1fdc1ea4ab8505c242ffc04 + checksum: e8330ed7f26ccedad8d9b574e126b814f2be7bd6b1190370715c29ec932ca5cb2f86f5d22cbbb7d3290b9f781ba7c5f153f029acfded302f77807daa363c7112 languageName: node linkType: hard @@ -8293,12 +8313,12 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/hw-app-btc@npm:^10.0.8": - version: 10.0.8 - resolution: "@ledgerhq/hw-app-btc@npm:10.0.8" +"@ledgerhq/hw-app-btc@npm:^10.4.1": + version: 10.4.2 + resolution: "@ledgerhq/hw-app-btc@npm:10.4.2" dependencies: - "@ledgerhq/hw-transport": ^6.28.8 - "@ledgerhq/logs": ^6.10.1 + "@ledgerhq/hw-transport": ^6.31.3 + "@ledgerhq/logs": ^6.12.0 bip32-path: ^0.4.2 bitcoinjs-lib: ^5.2.0 bs58: ^4.0.1 @@ -8309,7 +8329,7 @@ __metadata: sha.js: 2 tiny-secp256k1: 1.1.6 varuint-bitcoin: 1.1.2 - checksum: e4ba9e1add1db21dada63f5d69ced5fe634c68e18d7f053007a089074ad167b8c5bca6b1822d82516929844114b362617f2a2d1a852bb22ed8b4a2ae6a763ff1 + checksum: 4e195297074bcf2059f30bb60ae27718b33c29acdc9202dc26f5f3f85661f920e1dad287576e8cc2ad6f08b5c1b126a432dd5c2b42356a015841833a37f084ae languageName: node linkType: hard @@ -8351,23 +8371,24 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/hw-app-eth@npm:^6.9.0": - version: 6.34.7 - resolution: "@ledgerhq/hw-app-eth@npm:6.34.7" +"@ledgerhq/hw-app-eth@npm:^6.38.0": + version: 6.38.1 + resolution: "@ledgerhq/hw-app-eth@npm:6.38.1" dependencies: "@ethersproject/abi": ^5.5.0 "@ethersproject/rlp": ^5.5.0 - "@ledgerhq/cryptoassets": ^11.0.0 - "@ledgerhq/domain-service": ^1.1.12 - "@ledgerhq/errors": ^6.14.0 - "@ledgerhq/evm-tools": ^1.0.8 - "@ledgerhq/hw-transport": ^6.28.8 - "@ledgerhq/hw-transport-mocker": ^6.27.19 - "@ledgerhq/logs": ^6.10.1 - "@ledgerhq/types-live": ^6.41.0 - axios: ^1.3.4 + "@ledgerhq/cryptoassets": ^13.4.0 + "@ledgerhq/domain-service": ^1.2.4 + "@ledgerhq/errors": ^6.19.0 + "@ledgerhq/evm-tools": ^1.2.1 + "@ledgerhq/hw-transport": ^6.31.3 + "@ledgerhq/hw-transport-mocker": ^6.29.3 + "@ledgerhq/logs": ^6.12.0 + "@ledgerhq/types-live": ^6.51.0 + axios: 1.7.3 bignumber.js: ^9.1.2 - checksum: 98bc2becd9edcad7734792c3294e2209d6bb4e1fba365cc301104f41ac293520b966a01dc904fc692289a6d44c73f1a0f53a72c76f246b03509e88e4ecb198ac + semver: ^7.3.5 + checksum: 59af820ec420eab41eb4d4c9ba936d07a3ede484d340d327e02658565f0d187b9897ac19d182e6acbc251544247ee0054bba455073b261b5dc2809b69bab35c8 languageName: node linkType: hard @@ -8458,13 +8479,14 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/hw-transport-mocker@npm:^6.27.19": - version: 6.27.19 - resolution: "@ledgerhq/hw-transport-mocker@npm:6.27.19" +"@ledgerhq/hw-transport-mocker@npm:^6.29.3": + version: 6.29.3 + resolution: "@ledgerhq/hw-transport-mocker@npm:6.29.3" dependencies: - "@ledgerhq/hw-transport": ^6.28.8 - "@ledgerhq/logs": ^6.10.1 - checksum: f235f3263fa0366a923334d931d8fe24779cbbda33beb7f799356f11e18fb7cce29df1228964ed18bccdf511f9d0ac2077147aca8caf820c0bb1fa0a7887fb01 + "@ledgerhq/hw-transport": ^6.31.3 + "@ledgerhq/logs": ^6.12.0 + rxjs: ^7.8.1 + checksum: a82a8da7936358fb67e64f090e0b23540e8228ce3087857c3beb5a1ef39fb0463f0e32c025da23a58787069e9a0640a7feb8b8686d516eae56896000cbffdb34 languageName: node linkType: hard @@ -8492,18 +8514,6 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/hw-transport-webusb@npm:^6.7.0": - version: 6.27.19 - resolution: "@ledgerhq/hw-transport-webusb@npm:6.27.19" - dependencies: - "@ledgerhq/devices": ^8.0.7 - "@ledgerhq/errors": ^6.14.0 - "@ledgerhq/hw-transport": ^6.28.8 - "@ledgerhq/logs": ^6.10.1 - checksum: 166c3f42e9000ad38ad2a1f0636dccbf03851d065f5d2914016ead60564f63c812c59e1a9b03692322c3f73320466670cfe72c5694606b83aee0b80a856443ba - languageName: node - linkType: hard - "@ledgerhq/hw-transport@npm:6.24.1": version: 6.24.1 resolution: "@ledgerhq/hw-transport@npm:6.24.1" @@ -8526,7 +8536,7 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/hw-transport@npm:^6.24.1, @ledgerhq/hw-transport@npm:^6.27.6, @ledgerhq/hw-transport@npm:^6.28.8, @ledgerhq/hw-transport@npm:^6.7.0": +"@ledgerhq/hw-transport@npm:^6.24.1, @ledgerhq/hw-transport@npm:^6.27.6": version: 6.28.8 resolution: "@ledgerhq/hw-transport@npm:6.28.8" dependencies: @@ -8561,6 +8571,18 @@ __metadata: languageName: node linkType: hard +"@ledgerhq/hw-transport@npm:^6.31.3": + version: 6.31.3 + resolution: "@ledgerhq/hw-transport@npm:6.31.3" + dependencies: + "@ledgerhq/devices": ^8.4.3 + "@ledgerhq/errors": ^6.19.0 + "@ledgerhq/logs": ^6.12.0 + events: ^3.3.0 + checksum: 2c4340a4857765f6a80008596e81ca6c6e9ef5e81e6fb055a3c33edae1f1da629167f9a538eca4c2052e8900c45c32a386c97f1e76af340575415c57cca5ff87 + languageName: node + linkType: hard + "@ledgerhq/hw-transport@npm:~5.11.0": version: 5.11.0 resolution: "@ledgerhq/hw-transport@npm:5.11.0" @@ -8697,38 +8719,13 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/live-env@npm:^0.6.0": - version: 0.6.0 - resolution: "@ledgerhq/live-env@npm:0.6.0" +"@ledgerhq/live-env@npm:^2.3.0": + version: 2.3.0 + resolution: "@ledgerhq/live-env@npm:2.3.0" dependencies: - rxjs: ^6.6.7 + rxjs: ^7.8.1 utility-types: ^3.10.0 - checksum: 1833d07a42e9bd22aa889ae507544bcaefd1a8423d73feaa252ffb0039b9fbf7ca788547923b517e5b843c1aa21665f4f517aaa84ab062e7f267594494bb6a8f - languageName: node - linkType: hard - -"@ledgerhq/live-network@npm:^1.1.7": - version: 1.1.7 - resolution: "@ledgerhq/live-network@npm:1.1.7" - dependencies: - "@ledgerhq/errors": ^6.14.0 - "@ledgerhq/live-env": ^0.6.0 - "@ledgerhq/live-promise": ^0.0.1 - "@ledgerhq/logs": ^6.10.1 - "@types/node": ^20.2.5 - axios: 0.26.1 - invariant: ^2.2.2 - lru-cache: ^7.14.1 - checksum: f82c80e284cf47e4e19c3ed84cad6745ba89fd11d83610764a4d7668c99e262f00ca21e0fa8e0122dd5c6fdb78db8d85eb3a7e1a3bf2d79eec3238a926b3c286 - languageName: node - linkType: hard - -"@ledgerhq/live-promise@npm:^0.0.1": - version: 0.0.1 - resolution: "@ledgerhq/live-promise@npm:0.0.1" - dependencies: - "@ledgerhq/logs": ^6.10.1 - checksum: 7bfbab505d45646b57e2b35468a6226bcdbbaca37a89685d92f9b38726d1da236fa9db24863060ded9160caacb52b67c127bd5ddcc05c629e13f8f90a9e09473 + checksum: da90ad707792be4c37c7d9fbc2535e8c4f26fba142ad6ee0b6d3ff8d2b455ba4b6a3ba84d8975530cf8487f8cf59a0630f728c4e91f01aa856381a37524c8873 languageName: node linkType: hard @@ -8760,13 +8757,13 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/types-live@npm:^6.41.0": - version: 6.41.0 - resolution: "@ledgerhq/types-live@npm:6.41.0" +"@ledgerhq/types-live@npm:^6.51.0": + version: 6.51.0 + resolution: "@ledgerhq/types-live@npm:6.51.0" dependencies: bignumber.js: ^9.1.2 - rxjs: 6 - checksum: 5b24a10eda21d0819844e6ebbd4b6d4e9abee831ad9d7458a5cb553c2a0fa39a7680c1246ca64ce352113e36783ad928a40bda1150e11ffaf0079f03a78c73f4 + rxjs: ^7.8.1 + checksum: 87426204a48223ec9f876de19579bd6f9a66eb10c86418cabc692511e0671c54ea94621349637722ff40b0f1bc973d12f4ded74c014739c932cb0da77280e18e languageName: node linkType: hard @@ -11270,15 +11267,15 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-coinbase@npm:1.55.5-phantom.11": - version: 1.55.5-phantom.11 - resolution: "@shapeshiftoss/hdwallet-coinbase@npm:1.55.5-phantom.11" +"@shapeshiftoss/hdwallet-coinbase@npm:1.55.6": + version: 1.55.6 + resolution: "@shapeshiftoss/hdwallet-coinbase@npm:1.55.6" dependencies: "@coinbase/wallet-sdk": ^3.6.6 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-core": 1.55.6 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: a8dc78d4743e07f0e476b0587bf17c4633ee4e8ddf81132c56b083d387c27c80255249078a6e56f11003490cc8a2595f260aa214ba80ba7ed7e795fe7641cae6 + checksum: 1b9201e405c0f3b12d52f3784ed045ded2933cc8c56c3227dad344fd940a56f3de1f3c85296d1af6b8403fd3330fefd97da88fb4f3e41b39f9857efcb7cc8e02 languageName: node linkType: hard @@ -11294,20 +11291,6 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-core@npm:1.54.2": - version: 1.54.2 - resolution: "@shapeshiftoss/hdwallet-core@npm:1.54.2" - dependencies: - "@shapeshiftoss/proto-tx-builder": ^0.8.0 - eip-712: ^1.0.0 - eventemitter2: ^5.0.1 - lodash: ^4.17.21 - rxjs: ^6.4.0 - type-assertions: ^1.1.0 - checksum: c24df90a31fb6bb1398bfd327f3b4c239200a56cbe52615851b4b3a9c918bb0bd850f3d34209b76cb074eeaa4409f3b724ca32ee96b0078a28015286df45d397 - languageName: node - linkType: hard - "@shapeshiftoss/hdwallet-core@npm:1.55.1, @shapeshiftoss/hdwallet-core@npm:^1.55.1": version: 1.55.1 resolution: "@shapeshiftoss/hdwallet-core@npm:1.55.1" @@ -11322,40 +11305,42 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-core@npm:1.55.5-phantom.11, @shapeshiftoss/hdwallet-core@npm:^1.55.5-phantom.11": - version: 1.55.5-phantom.11 - resolution: "@shapeshiftoss/hdwallet-core@npm:1.55.5-phantom.11" +"@shapeshiftoss/hdwallet-core@npm:1.55.6": + version: 1.55.6 + resolution: "@shapeshiftoss/hdwallet-core@npm:1.55.6" dependencies: + "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 "@shapeshiftoss/proto-tx-builder": ^0.8.0 eip-712: ^1.0.0 + ethers: 5.7.2 eventemitter2: ^5.0.1 lodash: ^4.17.21 rxjs: ^6.4.0 type-assertions: ^1.1.0 - checksum: cccd56ed40638e375584a3326802ed8e9abd5d9a524b8f7af322503274ea8b1a11bc8ea1c67cff2ac16d9582b2c57ec135b6e5e93d39721011d7187341d73bac + checksum: 5a652ef6b4ce2157aa822dd45c55805e362e115d4e47077edb9d92200ab155c6cdacf06ee3b5bf86e47f592c4c16f885bf85ccd59ada9642ed18a98f649a9576 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.5-phantom.11": - version: 1.55.5-phantom.11 - resolution: "@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.5-phantom.11" +"@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.6": + version: 1.55.6 + resolution: "@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.6" dependencies: - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 - "@shapeshiftoss/hdwallet-keepkey": ^1.55.5-phantom.11 - checksum: 1dfe1c5e813387cbdf210933bc50970189065645ac8677f4de7725e032e8473b4ba841278a1b8ce005cb17dc9126add62838696ad7d688f123d718f710077572 + "@shapeshiftoss/hdwallet-core": 1.55.6 + "@shapeshiftoss/hdwallet-keepkey": 1.55.6 + checksum: e219ff8fb4903912bb3fc92c501b449a12e4d85a0ff4b595399b7ce7cf7194ecc5c1ce6c28fb2a80de336640453728262d76ec8230e525f0a3251d74cfb7ef26 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keepkey@npm:1.55.5-phantom.11, @shapeshiftoss/hdwallet-keepkey@npm:^1.55.5-phantom.11": - version: 1.55.5-phantom.11 - resolution: "@shapeshiftoss/hdwallet-keepkey@npm:1.55.5-phantom.11" +"@shapeshiftoss/hdwallet-keepkey@npm:1.55.6": + version: 1.55.6 + resolution: "@shapeshiftoss/hdwallet-keepkey@npm:1.55.6" dependencies: "@ethereumjs/common": ^2.4.0 "@ethereumjs/tx": ^3.3.0 "@keepkey/device-protocol": ^7.12.2 "@metamask/eth-sig-util": ^7.0.0 "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-core": 1.55.6 "@shapeshiftoss/proto-tx-builder": ^0.8.0 bignumber.js: ^9.0.1 bnb-javascript-sdk-nobroadcast: ^2.16.14 @@ -11367,51 +11352,51 @@ __metadata: p-lazy: ^3.1.0 semver: ^7.3.8 tiny-secp256k1: ^1.1.6 - checksum: fabcaf21c7a171c7b93588fc881017c003a133f796e0d457676eedb880737683fa3acd83f649e2dd83528212a7be8ea055c31c8a220df308e4bc2d9243649b7a + checksum: 638efbe277544b701f5951c1de9e37953d5b088cdaad5874f6a121ef4a4a4b59266316a61dbe4ea29986725cae7c7004bb5a0e61726cd14b278c563018de1d87 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keplr@npm:1.55.5-phantom.11": - version: 1.55.5-phantom.11 - resolution: "@shapeshiftoss/hdwallet-keplr@npm:1.55.5-phantom.11" +"@shapeshiftoss/hdwallet-keplr@npm:1.55.6": + version: 1.55.6 + resolution: "@shapeshiftoss/hdwallet-keplr@npm:1.55.6" dependencies: "@shapeshiftoss/caip": 8.15.0 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-core": 1.55.6 "@shapeshiftoss/proto-tx-builder": ^0.8.0 "@shapeshiftoss/types": 3.1.3 base64-js: ^1.5.1 lodash: ^4.17.21 - checksum: f031397e60d06b185408a8134ff929ed5f1c8dff68e1b01f9f428efce872e254c315a3d1a7dac42482b801e3c66778c00675eee69e2462debed3f42e99f4ef94 + checksum: a85a98e276218af1bcac790ad398ce1e18ce7233d3babac896e4304f8f4632c7e5305485cffdf2d2c8bdf0dd171af779074ce1d694fdf6226094cf89cda425ac languageName: node linkType: hard -"@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.5-phantom.11": - version: 1.55.5-phantom.11 - resolution: "@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.5-phantom.11" +"@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.6": + version: 1.55.6 + resolution: "@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.6" dependencies: - "@ledgerhq/hw-app-btc": ^10.0.8 - "@ledgerhq/hw-app-eth": ^6.9.0 - "@ledgerhq/hw-transport": ^6.7.0 - "@ledgerhq/hw-transport-webusb": ^6.7.0 + "@ledgerhq/hw-app-btc": ^10.4.1 + "@ledgerhq/hw-app-eth": ^6.38.0 + "@ledgerhq/hw-transport": ^6.31.2 + "@ledgerhq/hw-transport-webusb": ^6.29.2 "@ledgerhq/live-common": ^21.8.2 "@ledgerhq/logs": ^6.10.1 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 - "@shapeshiftoss/hdwallet-ledger": ^1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-core": 1.55.6 + "@shapeshiftoss/hdwallet-ledger": 1.55.6 "@types/w3c-web-usb": ^1.0.4 p-queue: ^7.4.1 - checksum: 1558a37279821884752b87be4b4089a6a8afb0f4f7ba4ec437376a096a0c18394e99fe3806fc76cf2fccd598d14ec86a4adce90fa3b9ee34115306c1487977d1 + checksum: 5f0993bf6bc29cc8c08e35df55ad8b87cd89212c4a8f140523e81f5b0efae9771f3854e80a7fe2a65e53546e67bac281663c9162ecf9f53749aa5ad8ab8051cc languageName: node linkType: hard -"@shapeshiftoss/hdwallet-ledger@npm:1.55.5-phantom.11, @shapeshiftoss/hdwallet-ledger@npm:^1.55.5-phantom.11": - version: 1.55.5-phantom.11 - resolution: "@shapeshiftoss/hdwallet-ledger@npm:1.55.5-phantom.11" +"@shapeshiftoss/hdwallet-ledger@npm:1.55.6": + version: 1.55.6 + resolution: "@shapeshiftoss/hdwallet-ledger@npm:1.55.6" dependencies: "@ethereumjs/common": ^2.4.0 "@ethereumjs/tx": ^3.3.0 "@ledgerhq/hw-app-cosmos": ^6.29.1 "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-core": 1.55.6 base64-js: ^1.5.1 bchaddrjs: ^0.4.4 bitcoinjs-message: ^2.0.0 @@ -11419,28 +11404,28 @@ __metadata: ethereumjs-tx: 1.3.7 ethereumjs-util: ^6.1.0 lodash: ^4.17.21 - checksum: 87af6fabd154e9e495e75e8e5a7ba9eaf00c8a9e22b7792eafbdfc0de98c78064f7fe0d2efb3b2e04c5fc2b819307eec2e148aef39fc9d7f292a8ff1e7b1cf60 + checksum: e8c13f5822b7f3176494df47d1cbaede16a0d98a04ded40e74ffc9f4d78c793ab7b7711315f85242dc87b36fe7ab28a36ed4c413a5f1c4949d0850629e27a8ef languageName: node linkType: hard -"@shapeshiftoss/hdwallet-metamask@npm:1.55.5-phantom.11": - version: 1.55.5-phantom.11 - resolution: "@shapeshiftoss/hdwallet-metamask@npm:1.55.5-phantom.11" +"@shapeshiftoss/hdwallet-metamask@npm:1.55.6": + version: 1.55.6 + resolution: "@shapeshiftoss/hdwallet-metamask@npm:1.55.6" dependencies: "@metamask/detect-provider": ^1.2.0 "@metamask/onboarding": ^1.0.1 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-core": 1.55.6 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: 56136b584169f10e6eeaa734d9cab2fb89380e204ef2a361af1a975f87ebe044f54f8dee61ce71c8247eda709c52837745beb1a547dd694f34663e14f7ac3ce6 + checksum: c0e564b5503dd26f554a06130812c1564dd8f92eecf30a80d005f691f689caaf4427bd35190dd34e56fbbcf088f48739e45bdaab255ee3d33f032f6c86ac0947 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-native-vault@npm:1.55.5-phantom.11": - version: 1.55.5-phantom.11 - resolution: "@shapeshiftoss/hdwallet-native-vault@npm:1.55.5-phantom.11" +"@shapeshiftoss/hdwallet-native-vault@npm:1.55.6": + version: 1.55.6 + resolution: "@shapeshiftoss/hdwallet-native-vault@npm:1.55.6" dependencies: - "@shapeshiftoss/hdwallet-native": ^1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-native": 1.55.6 bip39: ^3.0.4 hash-wasm: ^4.11.0 idb-keyval: ^6.0.3 @@ -11449,17 +11434,17 @@ __metadata: type-assertions: ^1.1.0 uuid: ^8.3.2 web-encoding: ^1.1.0 - checksum: 39dbf6b88d27a7688a2e3d35323d04741c41553f9d8492a72b0daf284ac6a53b784732c4a5478acbc26bb54ec7871ed054eb111557331850ed3ef8e8f2a57a1c + checksum: c686778c6a966d9cd30d99b78fff044a06b887ea7af01c6dc76708cc53c3c33572acc95092d75f09ec614e30a9c1ce32d452473ea828e2fef3f77ecb9cf8f50c languageName: node linkType: hard -"@shapeshiftoss/hdwallet-native@npm:1.55.5-phantom.11, @shapeshiftoss/hdwallet-native@npm:^1.55.5-phantom.11": - version: 1.55.5-phantom.11 - resolution: "@shapeshiftoss/hdwallet-native@npm:1.55.5-phantom.11" +"@shapeshiftoss/hdwallet-native@npm:1.55.6": + version: 1.55.6 + resolution: "@shapeshiftoss/hdwallet-native@npm:1.55.6" dependencies: "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 "@shapeshiftoss/fiosdk": 1.2.1-shapeshift.6 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-core": 1.55.6 "@shapeshiftoss/proto-tx-builder": ^0.8.0 "@zxing/text-encoding": ^0.9.0 bchaddrjs: ^0.4.9 @@ -11481,7 +11466,7 @@ __metadata: tendermint-tx-builder: ^1.0.9 tiny-secp256k1: ^1.1.6 web-encoding: ^1.1.0 - checksum: d374fcc4e40832ec5808d54d8bb4f9d0da1971640a330875a19676355669c4478dc54d736bb55ac884188e452858934cb0b7587821c6645881632ff658b55cd2 + checksum: 2ff57f2b2d8db9a1fc3b4285455049475fd082a710a6d645d6e08ee2bd652eb5f87a716f8aadd9eddd87548cb6090b3d0c6fc323969dea998c662a390e270b91 languageName: node linkType: hard @@ -11517,51 +11502,54 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-phantom@npm:1.55.5-phantom.11": - version: 1.55.5-phantom.11 - resolution: "@shapeshiftoss/hdwallet-phantom@npm:1.55.5-phantom.11" +"@shapeshiftoss/hdwallet-phantom@npm:1.55.6": + version: 1.55.6 + resolution: "@shapeshiftoss/hdwallet-phantom@npm:1.55.6" dependencies: - "@shapeshiftoss/hdwallet-core": 1.54.2 + "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 + "@shapeshiftoss/hdwallet-core": 1.55.6 + base64-js: ^1.5.1 + bitcoinjs-message: ^2.0.0 lodash: ^4.17.21 - checksum: 9a14bad137fe7309b7e3bb1f1af12e3c5dd52d37d7ebbf07df9d9007e77e077f6ed3324de8c480c73131e869cd5d6e02be9f73c62a92abc826b72bf1d83b83ad + checksum: 10ef86f7fedec31f55e6e72788cec659db70b39616bd5052837f1f11aa0da9806e28bae1af5d6665e04c2898350698fb2786736a9dc8eff92976450244ae52fd languageName: node linkType: hard -"@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.5-phantom.11": - version: 1.55.5-phantom.11 - resolution: "@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.5-phantom.11" +"@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.6": + version: 1.55.6 + resolution: "@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.6" dependencies: "@metamask/detect-provider": ^1.2.0 "@metamask/onboarding": ^1.0.1 "@shapeshiftoss/common-api": ^9.3.0 - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-core": 1.55.6 "@shapeshiftoss/metamask-snaps-adapter": ^1.0.10 "@shapeshiftoss/metamask-snaps-types": ^1.0.10 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: f201024d54147c6094327098039ceb938c37dadfee30d7d420d2ddea8fa52a88250172be816b34d95bcdc685ed83686fb59184ffaf7f6cd0a5d39440811b8611 + checksum: 05fce1061fc475c961c3a56332a3f0116f341601662901a080ba8e071bbe90f514dd958e333c4e5b038f4f9c0204f9216b50f8db0f0a988d96aa6cdec881c7b5 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.5-phantom.11": - version: 1.55.5-phantom.11 - resolution: "@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.5-phantom.11" +"@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.6": + version: 1.55.6 + resolution: "@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.6" dependencies: - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-core": 1.55.6 "@walletconnect/ethereum-provider": ^2.10.1 "@walletconnect/modal": ^2.6.2 ethers: ^5.6.5 - checksum: 5015c8e95433215e8513b034515099242a63377ca89b000e72578c1e6eeda4a3fc79a470abbbf37f5004c7a597f1a99a89d38ba6ab2deab2d1849983b8529496 + checksum: b4eda7b06e05ae155e8e88ed966a06627dd8a36ef8a2b06fc6ef20cc224a994d83a2d6f69db085faad399f5a9532c8f82414eb2564c8f0c9555f8dc6dedee91d languageName: node linkType: hard -"@shapeshiftoss/hdwallet-xdefi@npm:1.55.5-phantom.11": - version: 1.55.5-phantom.11 - resolution: "@shapeshiftoss/hdwallet-xdefi@npm:1.55.5-phantom.11" +"@shapeshiftoss/hdwallet-xdefi@npm:1.55.6": + version: 1.55.6 + resolution: "@shapeshiftoss/hdwallet-xdefi@npm:1.55.6" dependencies: - "@shapeshiftoss/hdwallet-core": ^1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-core": 1.55.6 lodash: ^4.17.21 - checksum: 1bf1c858470140f36c9b43c67e7bb410c1de6530b9951b904d5a6a3aa79fcee4ddb994aaa187006873676658cb8c2dac49e4e28e1a2f61a467d2edd188e83e15 + checksum: e116fc4e7a06992b6e2514dbff9f892fb7e627c50e8d6a2fee2abc6d566d6be3239a069c4375f467e8e1128772df622accd09f9f30003ada1ef924dfcd4bea57 languageName: node linkType: hard @@ -11756,20 +11744,20 @@ __metadata: "@shapeshiftoss/caip": "workspace:^" "@shapeshiftoss/chain-adapters": "workspace:^" "@shapeshiftoss/errors": "workspace:^" - "@shapeshiftoss/hdwallet-coinbase": 1.55.5-phantom.11 - "@shapeshiftoss/hdwallet-core": 1.55.5-phantom.11 - "@shapeshiftoss/hdwallet-keepkey": 1.55.5-phantom.11 - "@shapeshiftoss/hdwallet-keepkey-webusb": 1.55.5-phantom.11 - "@shapeshiftoss/hdwallet-keplr": 1.55.5-phantom.11 - "@shapeshiftoss/hdwallet-ledger": 1.55.5-phantom.11 - "@shapeshiftoss/hdwallet-ledger-webusb": 1.55.5-phantom.11 - "@shapeshiftoss/hdwallet-metamask": 1.55.5-phantom.11 - "@shapeshiftoss/hdwallet-native": 1.55.5-phantom.11 - "@shapeshiftoss/hdwallet-native-vault": 1.55.5-phantom.11 - "@shapeshiftoss/hdwallet-phantom": 1.55.5-phantom.11 - "@shapeshiftoss/hdwallet-shapeshift-multichain": 1.55.5-phantom.11 - "@shapeshiftoss/hdwallet-walletconnectv2": 1.55.5-phantom.11 - "@shapeshiftoss/hdwallet-xdefi": 1.55.5-phantom.11 + "@shapeshiftoss/hdwallet-coinbase": 1.55.6 + "@shapeshiftoss/hdwallet-core": 1.55.6 + "@shapeshiftoss/hdwallet-keepkey": 1.55.6 + "@shapeshiftoss/hdwallet-keepkey-webusb": 1.55.6 + "@shapeshiftoss/hdwallet-keplr": 1.55.6 + "@shapeshiftoss/hdwallet-ledger": 1.55.6 + "@shapeshiftoss/hdwallet-ledger-webusb": 1.55.6 + "@shapeshiftoss/hdwallet-metamask": 1.55.6 + "@shapeshiftoss/hdwallet-native": 1.55.6 + "@shapeshiftoss/hdwallet-native-vault": 1.55.6 + "@shapeshiftoss/hdwallet-phantom": 1.55.6 + "@shapeshiftoss/hdwallet-shapeshift-multichain": 1.55.6 + "@shapeshiftoss/hdwallet-walletconnectv2": 1.55.6 + "@shapeshiftoss/hdwallet-xdefi": 1.55.6 "@shapeshiftoss/swapper": "workspace:^" "@shapeshiftoss/types": "workspace:^" "@shapeshiftoss/unchained-client": "workspace:^" @@ -13592,7 +13580,7 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:>= 8, @types/node@npm:^20.2.5": +"@types/node@npm:>= 8": version: 20.8.4 resolution: "@types/node@npm:20.8.4" dependencies: @@ -17601,6 +17589,17 @@ __metadata: languageName: node linkType: hard +"axios@npm:1.7.3": + version: 1.7.3 + resolution: "axios@npm:1.7.3" + dependencies: + follow-redirects: ^1.15.6 + form-data: ^4.0.0 + proxy-from-env: ^1.1.0 + checksum: bc304d6da974922342aed7c33155934354429cdc7e1ba9d399ab9ff3ac76103f3697eeedf042a634d43cdae682182bcffd942291db42d2be45b750597cdd5eef + languageName: node + linkType: hard + "axios@npm:^0.21.0, axios@npm:^0.21.1, axios@npm:^0.21.2": version: 0.21.4 resolution: "axios@npm:0.21.4" @@ -17610,17 +17609,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:^1.3.4": - version: 1.5.1 - resolution: "axios@npm:1.5.1" - dependencies: - follow-redirects: ^1.15.0 - form-data: ^4.0.0 - proxy-from-env: ^1.1.0 - checksum: 4444f06601f4ede154183767863d2b8e472b4a6bfc5253597ed6d21899887e1fd0ee2b3de792ac4f8459fe2e359d2aa07c216e45fd8b9e4e0688a6ebf48a5a8d - languageName: node - linkType: hard - "axios@npm:^1.7.4": version: 1.7.4 resolution: "axios@npm:1.7.4" @@ -20453,10 +20441,10 @@ __metadata: languageName: node linkType: hard -"crypto-js@npm:4.1.1, crypto-js@npm:^4.0.0, crypto-js@npm:^4.1.1": - version: 4.1.1 - resolution: "crypto-js@npm:4.1.1" - checksum: b3747c12ee3a7632fab3b3e171ea50f78b182545f0714f6d3e7e2858385f0f4101a15f2517e033802ce9d12ba50a391575ff4638c9de3dd9b2c4bc47768d5425 +"crypto-js@npm:4.2.0": + version: 4.2.0 + resolution: "crypto-js@npm:4.2.0" + checksum: f051666dbc077c8324777f44fbd3aaea2986f198fe85092535130d17026c7c2ccf2d23ee5b29b36f7a4a07312db2fae23c9094b644cc35f7858b1b4fcaf27774 languageName: node linkType: hard @@ -20467,6 +20455,13 @@ __metadata: languageName: node linkType: hard +"crypto-js@npm:^4.0.0, crypto-js@npm:^4.1.1": + version: 4.1.1 + resolution: "crypto-js@npm:4.1.1" + checksum: b3747c12ee3a7632fab3b3e171ea50f78b182545f0714f6d3e7e2858385f0f4101a15f2517e033802ce9d12ba50a391575ff4638c9de3dd9b2c4bc47768d5425 + languageName: node + linkType: hard + "crypto-random-string@npm:^2.0.0": version: 2.0.0 resolution: "crypto-random-string@npm:2.0.0" @@ -24301,7 +24296,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.14.7, follow-redirects@npm:^1.15.0": +"follow-redirects@npm:^1.14.7": version: 1.15.3 resolution: "follow-redirects@npm:1.15.3" peerDependenciesMeta: @@ -28849,7 +28844,7 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^7.14.1, lru-cache@npm:^7.7.1": +"lru-cache@npm:^7.7.1": version: 7.18.3 resolution: "lru-cache@npm:7.18.3" checksum: e550d772384709deea3f141af34b6d4fa392e2e418c1498c078de0ee63670f1f46f5eee746e8ef7e69e1c895af0d4224e62ee33e66a543a14763b0f2e74c1356 @@ -33091,19 +33086,6 @@ pvutils@latest: languageName: node linkType: hard -"react-dom@npm:^17.0.2": - version: 17.0.2 - resolution: "react-dom@npm:17.0.2" - dependencies: - loose-envify: ^1.1.0 - object-assign: ^4.1.1 - scheduler: ^0.20.2 - peerDependencies: - react: 17.0.2 - checksum: 1c1eaa3bca7c7228d24b70932e3d7c99e70d1d04e13bb0843bbf321582bc25d7961d6b8a6978a58a598af2af496d1cedcfb1bf65f6b0960a0a8161cb8dab743c - languageName: node - linkType: hard - "react-dom@patch:react-dom@npm%3A18.2.0#./.yarn/patches/react-dom-npm-18.2.0-dd675bca1c.patch::locator=%40shapeshiftoss%2Fweb%40workspace%3A.": version: 18.2.0 resolution: "react-dom@patch:react-dom@npm%3A18.2.0#./.yarn/patches/react-dom-npm-18.2.0-dd675bca1c.patch::version=18.2.0&hash=6969d0&locator=%40shapeshiftoss%2Fweb%40workspace%3A." @@ -33725,16 +33707,6 @@ pvutils@latest: languageName: node linkType: hard -"react@npm:^17.0.2": - version: 17.0.2 - resolution: "react@npm:17.0.2" - dependencies: - loose-envify: ^1.1.0 - object-assign: ^4.1.1 - checksum: b254cc17ce3011788330f7bbf383ab653c6848902d7936a87b09d835d091e3f295f7e9dd1597c6daac5dc80f90e778c8230218ba8ad599f74adcc11e33b9d61b - languageName: node - linkType: hard - "react@npm:^18.2.0": version: 18.2.0 resolution: "react@npm:18.2.0" @@ -34882,7 +34854,7 @@ pvutils@latest: languageName: node linkType: hard -"rxjs@npm:6, rxjs@npm:^6.4.0, rxjs@npm:^6.6.3, rxjs@npm:^6.6.7": +"rxjs@npm:6, rxjs@npm:^6.4.0, rxjs@npm:^6.6.3": version: 6.6.7 resolution: "rxjs@npm:6.6.7" dependencies: @@ -35056,16 +35028,6 @@ pvutils@latest: languageName: node linkType: hard -"scheduler@npm:^0.20.2": - version: 0.20.2 - resolution: "scheduler@npm:0.20.2" - dependencies: - loose-envify: ^1.1.0 - object-assign: ^4.1.1 - checksum: c4b35cf967c8f0d3e65753252d0f260271f81a81e427241295c5a7b783abf4ea9e905f22f815ab66676f5313be0a25f47be582254db8f9241b259213e999b8fc - languageName: node - linkType: hard - "scheduler@npm:^0.23.0": version: 0.23.0 resolution: "scheduler@npm:0.23.0" From 972ff92d66f924406424ef9dbe186399dbd9246c Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Sat, 21 Sep 2024 11:39:47 +0200 Subject: [PATCH 11/25] feat: cleanup --- .../ThorchainSaversManager/Withdraw/components/Withdraw.tsx | 2 +- .../components/RemoveLiquidity/RemoveLiquidityInput.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Withdraw.tsx b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Withdraw.tsx index b116bfa7184..0debc0c911e 100644 --- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Withdraw.tsx +++ b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Withdraw.tsx @@ -210,7 +210,7 @@ export const Withdraw: React.FC = ({ accountId, fromAddress, onNe const { estimatedFeesData, isEstimatedFeesDataLoading, - dustAmountCryptoBaseUnitOrDefault: dustAmountCryptoBaseUnit, + dustAmountCryptoBaseUnit, outboundFeeCryptoBaseUnit, } = useSendThorTx({ assetId, diff --git a/src/pages/ThorChainLP/components/RemoveLiquidity/RemoveLiquidityInput.tsx b/src/pages/ThorChainLP/components/RemoveLiquidity/RemoveLiquidityInput.tsx index 8e4030c0d52..e22c1232665 100644 --- a/src/pages/ThorChainLP/components/RemoveLiquidity/RemoveLiquidityInput.tsx +++ b/src/pages/ThorChainLP/components/RemoveLiquidity/RemoveLiquidityInput.tsx @@ -383,7 +383,7 @@ export const RemoveLiquidityInput: React.FC = ({ estimatedFeesData: estimatedRuneFeesData, isEstimatedFeesDataLoading: isEstimatedRuneFeesDataLoading, isEstimatedFeesDataError: isEstimatedRuneFeesDataError, - dustAmountCryptoBaseUnitOrDefault: runeDustAmountCryptoBaseUnit, + dustAmountCryptoBaseUnit: runeDustAmountCryptoBaseUnit, } = useSendThorTx({ assetId: thorchainAssetId, accountId: positionRuneAccountId ?? null, @@ -416,7 +416,7 @@ export const RemoveLiquidityInput: React.FC = ({ estimatedFeesData: estimatedPoolAssetFeesData, isEstimatedFeesDataLoading: isEstimatedPoolAssetFeesDataLoading, isEstimatedFeesDataError: isEstimatedPoolAssetFeesDataError, - dustAmountCryptoBaseUnitOrDefault: poolAssetFeeAssetDustAmountCryptoBaseUnit, + dustAmountCryptoBaseUnit: poolAssetFeeAssetDustAmountCryptoBaseUnit, outboundFeeCryptoBaseUnit, } = useSendThorTx({ // Asym asset withdraws are the only ones occurring an asset Tx - both sym and asym RUNE side withdraws occur a RUNE Tx instead From 38ec6eda6e884492a1747efc9427572f806caae7 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Sat, 21 Sep 2024 12:19:40 +0200 Subject: [PATCH 12/25] fix: accountsChanged --- src/context/WalletProvider/WalletProvider.tsx | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/src/context/WalletProvider/WalletProvider.tsx b/src/context/WalletProvider/WalletProvider.tsx index 538917b7d10..88e4099aca9 100644 --- a/src/context/WalletProvider/WalletProvider.tsx +++ b/src/context/WalletProvider/WalletProvider.tsx @@ -134,6 +134,7 @@ export const isKeyManagerWithProvider = ( [ KeyManager.XDefi, KeyManager.MetaMask, + KeyManager.Phantom, KeyManager.WalletConnectV2, KeyManager.Coinbase, ].includes(keyManager), @@ -160,6 +161,9 @@ export const getMaybeProvider = async ( if (localWalletType === KeyManager.MetaMask) { return (await detectEthereumProvider()) as MetaMaskLikeProvider } + if (localWalletType === KeyManager.Phantom) { + return (globalThis as any).phantom.ethereum as unknown as MetaMaskLikeProvider + } if (localWalletType === KeyManager.XDefi) { try { return globalThis?.xfi?.ethereum as unknown as MetaMaskLikeProvider @@ -638,6 +642,46 @@ export const WalletProvider = ({ children }: { children: React.ReactNode }): JSX } dispatch({ type: WalletActions.SET_LOCAL_WALLET_LOADING, payload: false }) break + case KeyManager.Phantom: + // Get the adapter again in each switch case to narrow down the adapter type + const phantomAdapter = await getAdapter(localWalletType) + + if (phantomAdapter) { + currentAdapters[localWalletType] = phantomAdapter + dispatch({ type: WalletActions.SET_ADAPTERS, payload: currentAdapters }) + // Fixes issue with wallet `type` being null when the wallet is loaded from state + dispatch({ type: WalletActions.SET_CONNECTOR_TYPE, payload: localWalletType }) + } + + const localPhantomWallet = await phantomAdapter?.pairDevice() + // Set the provider again on refresh to ensure event handlers are properly set + await onProviderChange(KeyManager.Phantom, localPhantomWallet ?? null) + if (localPhantomWallet) { + const { name, icon } = SUPPORTED_WALLETS[KeyManager.Phantom] + try { + await localPhantomWallet.initialize() + const deviceId = await localPhantomWallet.getDeviceID() + dispatch({ + type: WalletActions.SET_WALLET, + payload: { + wallet: localPhantomWallet, + name, + icon, + deviceId, + connectedType: KeyManager.Phantom, + }, + }) + dispatch({ type: WalletActions.SET_IS_LOCKED, payload: false }) + dispatch({ type: WalletActions.SET_IS_CONNECTED, payload: true }) + } catch (e) { + disconnect() + } + } else { + disconnect() + } + dispatch({ type: WalletActions.SET_LOCAL_WALLET_LOADING, payload: false }) + break + case KeyManager.Coinbase: // Get the adapter again in each switch case to narrow down the adapter type const coinbaseAdapter = await getAdapter(localWalletType) From e93cbe060fb59566f9c62dd22850e251dca806a6 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Sat, 21 Sep 2024 12:23:43 +0200 Subject: [PATCH 13/25] chore: improve copies --- src/assets/translations/en/main.json | 10 --------- .../Coinbase/components/Failure.tsx | 2 +- .../Keplr/components/Failure.tsx | 2 +- .../Ledger/components/Failure.tsx | 2 +- .../MetaMask/components/Failure.tsx | 5 +---- .../Phantom/components/Failure.tsx | 4 ++-- .../Phantom/components/SnapInstall.tsx | 21 ------------------- .../Phantom/components/SnapUpdate.tsx | 17 --------------- .../XDEFI/components/Failure.tsx | 2 +- 9 files changed, 7 insertions(+), 58 deletions(-) delete mode 100644 src/context/WalletProvider/Phantom/components/SnapInstall.tsx delete mode 100644 src/context/WalletProvider/Phantom/components/SnapUpdate.tsx diff --git a/src/assets/translations/en/main.json b/src/assets/translations/en/main.json index c7a38747749..1e69d077bf7 100644 --- a/src/assets/translations/en/main.json +++ b/src/assets/translations/en/main.json @@ -1461,7 +1461,6 @@ "button": "Pair" }, "failure": { - "header": "Error", "body": "Unable to connect Keplr wallet" } }, @@ -1501,7 +1500,6 @@ "pairExistingDeviceBody": "Connecting a different Ledger device? Click 'Pair new device' to start fresh." }, "failure": { - "header": "Error", "body": "Unable to connect Ledger wallet" }, "connectWarning": "Before connecting a chain, make sure you have the app open on your device.", @@ -1519,7 +1517,6 @@ "button": "Pair" }, "failure": { - "header": "Error", "body": "Unable to connect MetaMask wallet" }, "redirect": { @@ -1538,10 +1535,6 @@ "header": "Pair Phantom", "body": "Click Pair and login to Phantom from the popup window", "button": "Pair" - }, - "failure": { - "header": "Error", - "body": "Unable to connect Phantom wallet" } }, "metaMaskSnap": { @@ -1599,7 +1592,6 @@ "button": "Pair" }, "failure": { - "header": "Unable to connect Coinbase wallet", "body": "Unable to connect Coinbase wallet" } }, @@ -1614,7 +1606,6 @@ "button": "Pair" }, "failure": { - "header": "Error", "body": "Unable to connect WalletConnect wallet" } }, @@ -1630,7 +1621,6 @@ "button": "Pair" }, "failure": { - "header": "Error", "body": "Unable to connect XDEFI wallet" }, "redirect": { diff --git a/src/context/WalletProvider/Coinbase/components/Failure.tsx b/src/context/WalletProvider/Coinbase/components/Failure.tsx index 1c97dce36fc..efa627684b9 100644 --- a/src/context/WalletProvider/Coinbase/components/Failure.tsx +++ b/src/context/WalletProvider/Coinbase/components/Failure.tsx @@ -3,7 +3,7 @@ import { FailureModal } from 'context/WalletProvider/components/FailureModal' export const CoinbaseFailure = () => { return ( ) diff --git a/src/context/WalletProvider/Keplr/components/Failure.tsx b/src/context/WalletProvider/Keplr/components/Failure.tsx index c90b090ae08..a3e10a4d89b 100644 --- a/src/context/WalletProvider/Keplr/components/Failure.tsx +++ b/src/context/WalletProvider/Keplr/components/Failure.tsx @@ -3,7 +3,7 @@ import { FailureModal } from 'context/WalletProvider/components/FailureModal' export const KeplrFailure = () => { return ( ) diff --git a/src/context/WalletProvider/Ledger/components/Failure.tsx b/src/context/WalletProvider/Ledger/components/Failure.tsx index bbb96c4e968..d3ed626c22e 100644 --- a/src/context/WalletProvider/Ledger/components/Failure.tsx +++ b/src/context/WalletProvider/Ledger/components/Failure.tsx @@ -3,7 +3,7 @@ import { FailureModal } from 'context/WalletProvider/components/FailureModal' export const LedgerFailure = () => { return ( ) diff --git a/src/context/WalletProvider/MetaMask/components/Failure.tsx b/src/context/WalletProvider/MetaMask/components/Failure.tsx index 4cc8c1908fc..e609ef36a87 100644 --- a/src/context/WalletProvider/MetaMask/components/Failure.tsx +++ b/src/context/WalletProvider/MetaMask/components/Failure.tsx @@ -2,9 +2,6 @@ import { FailureModal } from 'context/WalletProvider/components/FailureModal' export const MetaMaskFailure = () => { return ( - + ) } diff --git a/src/context/WalletProvider/Phantom/components/Failure.tsx b/src/context/WalletProvider/Phantom/components/Failure.tsx index 1032f684438..fccac086bd6 100644 --- a/src/context/WalletProvider/Phantom/components/Failure.tsx +++ b/src/context/WalletProvider/Phantom/components/Failure.tsx @@ -3,8 +3,8 @@ import { FailureModal } from 'context/WalletProvider/components/FailureModal' export const PhantomFailure = () => { return ( ) } diff --git a/src/context/WalletProvider/Phantom/components/SnapInstall.tsx b/src/context/WalletProvider/Phantom/components/SnapInstall.tsx deleted file mode 100644 index be3f4769e8f..00000000000 --- a/src/context/WalletProvider/Phantom/components/SnapInstall.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import { useCallback } from 'react' -import { SnapContent } from 'components/Modals/Snaps/SnapContent' -import { WalletActions } from 'context/WalletProvider/actions' -import { useWallet } from 'hooks/useWallet/useWallet' - -export const SnapInstall = () => { - const { dispatch } = useWallet() - - const handleClose = useCallback(() => { - dispatch({ type: WalletActions.SET_WALLET_MODAL, payload: false }) - }, [dispatch]) - - return ( - - ) -} diff --git a/src/context/WalletProvider/Phantom/components/SnapUpdate.tsx b/src/context/WalletProvider/Phantom/components/SnapUpdate.tsx deleted file mode 100644 index fc9f9b4a82b..00000000000 --- a/src/context/WalletProvider/Phantom/components/SnapUpdate.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import { useCallback } from 'react' -import { SnapContent } from 'components/Modals/Snaps/SnapContent' -import { WalletActions } from 'context/WalletProvider/actions' -import { useWallet } from 'hooks/useWallet/useWallet' - -export const SnapUpdate = () => { - const { dispatch } = useWallet() - - const handleClose = useCallback(() => { - dispatch({ type: WalletActions.SET_WALLET_MODAL, payload: false }) - }, [dispatch]) - - return ( - // If we land here, we know the version is incorrect - - ) -} diff --git a/src/context/WalletProvider/XDEFI/components/Failure.tsx b/src/context/WalletProvider/XDEFI/components/Failure.tsx index 1d36059b6e2..3dd553b64bb 100644 --- a/src/context/WalletProvider/XDEFI/components/Failure.tsx +++ b/src/context/WalletProvider/XDEFI/components/Failure.tsx @@ -3,7 +3,7 @@ import { FailureModal } from 'context/WalletProvider/components/FailureModal' export const XDEFIFailure = () => { return ( ) From 0170e3d22847fc5e2d59768ae783e434f86ef8ba Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Sat, 21 Sep 2024 12:25:33 +0200 Subject: [PATCH 14/25] feat: more cleanup --- .../Overview/ThorchainSaversOverview.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Overview/ThorchainSaversOverview.tsx b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Overview/ThorchainSaversOverview.tsx index 113a8ab54be..7d91685c921 100644 --- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Overview/ThorchainSaversOverview.tsx +++ b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Overview/ThorchainSaversOverview.tsx @@ -282,7 +282,12 @@ export const ThorchainSaversOverview: React.FC = ({ label: 'common.deposit', icon: , action: DefiAction.Deposit, - isDisabled: false, + isDisabled: + isFull || + hasPendingTxs || + hasPendingQueries || + isHaltedDeposits || + isDisabledDeposits, toolTip: (() => { if (isDisabledDeposits) return translate('defi.modals.saversVaults.disabledDepositTitle') From 557b335bbae44597e8b95ab81e7a5bd2edfb9a5f Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Sat, 21 Sep 2024 12:27:35 +0200 Subject: [PATCH 15/25] feat: more cleanup --- .../ThorchainSaversManager/Withdraw/components/Confirm.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Confirm.tsx b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Confirm.tsx index 99a6db0c231..20a9157faef 100644 --- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Confirm.tsx +++ b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Confirm.tsx @@ -220,7 +220,6 @@ export const Confirm: React.FC = ({ accountId, onNext }) => { setProtocolFeeCryptoBaseUnit( toBaseUnit(fromThorBaseUnit(protocolFeeCryptoThorBaseUnit), asset.precision), ) - setDustAmountCryptoBaseUnit( bnOrZero(toBaseUnit(fromThorBaseUnit(dust_amount), asset.precision)).toFixed( asset.precision, @@ -249,7 +248,6 @@ export const Confirm: React.FC = ({ accountId, onNext }) => { protocolFeeCryptoBaseUnit, expiry, isRunePool, - feeAsset?.assetId, ]) useEffect(() => { From 7e1d58570697004ecb2914fd485a7dac673acee2 Mon Sep 17 00:00:00 2001 From: kaladinlight <35275952+kaladinlight@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:13:37 -0600 Subject: [PATCH 16/25] narrow utxo chain support for phantom --- .../useWalletSupportsChain/useWalletSupportsChain.ts | 6 +++++- src/lib/account/utxo.ts | 10 +--------- src/state/slices/portfolioSlice/utils/index.ts | 6 +++++- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/hooks/useWalletSupportsChain/useWalletSupportsChain.ts b/src/hooks/useWalletSupportsChain/useWalletSupportsChain.ts index 60b8c59724c..d9a3b378c26 100644 --- a/src/hooks/useWalletSupportsChain/useWalletSupportsChain.ts +++ b/src/hooks/useWalletSupportsChain/useWalletSupportsChain.ts @@ -32,6 +32,7 @@ import { supportsPolygon, supportsThorchain, } from '@shapeshiftoss/hdwallet-core' +import { PhantomHDWallet } from '@shapeshiftoss/hdwallet-phantom' import { isMetaMask } from '@shapeshiftoss/hdwallet-shapeshift-multichain' import { useMemo } from 'react' import { useIsSnapInstalled } from 'hooks/useIsSnapInstalled/useIsSnapInstalled' @@ -78,10 +79,13 @@ export const walletSupportsChain = ({ switch (chainId) { case btcChainId: + return supportsBTC(wallet) case bchChainId: + return supportsBTC(wallet) && !(wallet instanceof PhantomHDWallet) case dogeChainId: + return supportsBTC(wallet) && !(wallet instanceof PhantomHDWallet) case ltcChainId: - return supportsBTC(wallet) + return supportsBTC(wallet) && !(wallet instanceof PhantomHDWallet) case ethChainId: return supportsETH(wallet) case avalancheChainId: diff --git a/src/lib/account/utxo.ts b/src/lib/account/utxo.ts index 1ae12aae001..b35357eafc8 100644 --- a/src/lib/account/utxo.ts +++ b/src/lib/account/utxo.ts @@ -29,15 +29,7 @@ export const deriveUtxoAccountIdsAndMetadata: DeriveAccountIdsAndMetadata = asyn supportedAccountTypes = [UtxoAccountType.SegwitNative] } for (const accountType of supportedAccountTypes) { - const { xpub: pubkey } = await adapter - .getPublicKey(wallet, accountNumber, accountType) - .catch(e => { - console.error( - `Error getting pubkey for chainId: ${chainId} accountType: ${accountType} accountNumber: ${accountNumber}`, - e, - ) - return { xpub: null } - }) + const { xpub: pubkey } = await adapter.getPublicKey(wallet, accountNumber, accountType) if (!pubkey) continue diff --git a/src/state/slices/portfolioSlice/utils/index.ts b/src/state/slices/portfolioSlice/utils/index.ts index 7bceb0a3c45..8a2c8be5e0f 100644 --- a/src/state/slices/portfolioSlice/utils/index.ts +++ b/src/state/slices/portfolioSlice/utils/index.ts @@ -40,6 +40,7 @@ import { supportsPolygon, supportsThorchain, } from '@shapeshiftoss/hdwallet-core' +import { PhantomHDWallet } from '@shapeshiftoss/hdwallet-phantom' import type { KnownChainIds, UtxoChainId } from '@shapeshiftoss/types' import { bech32 } from 'bech32' import cloneDeep from 'lodash/cloneDeep' @@ -296,10 +297,13 @@ export const isAssetSupportedByWallet = (assetId: AssetId, wallet: HDWallet): bo case baseChainId: return supportsBase(wallet) case btcChainId: + return supportsBTC(wallet) case ltcChainId: + return supportsBTC(wallet) && !(wallet instanceof PhantomHDWallet) case dogeChainId: + return supportsBTC(wallet) && !(wallet instanceof PhantomHDWallet) case bchChainId: - return supportsBTC(wallet) + return supportsBTC(wallet) && !(wallet instanceof PhantomHDWallet) case cosmosChainId: return supportsCosmos(wallet) case thorchainChainId: From 2802da7ce920b8493e8dfc37a6986a9a499202b9 Mon Sep 17 00:00:00 2001 From: kaladinlight <35275952+kaladinlight@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:14:33 -0600 Subject: [PATCH 17/25] remove getAccountAddressesWithBalances and update to return pubkey on non xpub based utxo accounts (phantom) --- src/lib/utils/thorchain/index.ts | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/src/lib/utils/thorchain/index.ts b/src/lib/utils/thorchain/index.ts index 3068bfca580..ddb37f47b33 100644 --- a/src/lib/utils/thorchain/index.ts +++ b/src/lib/utils/thorchain/index.ts @@ -16,7 +16,6 @@ import { thorService } from '@shapeshiftoss/swapper/dist/swappers/ThorchainSwapp import type { AccountMetadata, Asset, KnownChainIds } from '@shapeshiftoss/types' import { TxStatus } from '@shapeshiftoss/unchained-client' import axios from 'axios' -import { bech32 } from 'bech32' import { getConfig } from 'config' import dayjs from 'dayjs' import memoize from 'lodash/memoize' @@ -198,9 +197,9 @@ export const getThorchainFromAddress = async ({ } } -const getAccountAddressesWithBalances = async ( - accountId: AccountId, -): Promise<{ address: string; balance: string }[]> => { +// Memoized on accountId, see lodash docs: +// "By default, the first argument provided to the memoized function is used as the map cache key." +export const getAccountAddresses = memoize(async (accountId: AccountId): Promise => { if (isUtxoAccountId(accountId)) { const { chainId, account: pubkey } = fromAccountId(accountId) const adapter = assertGetUtxoChainAdapter(chainId) @@ -209,26 +208,15 @@ const getAccountAddressesWithBalances = async ( chainSpecific: { addresses }, } = await adapter.getAccount(pubkey) - if (!addresses) return [] + if (!addresses) return [pubkey] - return addresses.map(({ pubkey, balance }) => { + return addresses.map(({ pubkey }) => { const address = pubkey.startsWith('bitcoincash') ? pubkey.replace('bitcoincash:', '') : pubkey - - return { address, balance } + return address }) } - // We don't need balances for chain others than UTXOs - return [{ address: fromAccountId(accountId).account, balance: '' }] -} - -// Memoized on accountId, see lodash docs: -// "By default, the first argument provided to the memoized function is used as the map cache key." -export const getAccountAddresses = memoize(async (accountId: AccountId): Promise => { - // Handle the case where the accountId is a pubkey AccountId, not an xpub AccountId - if (isUtxoAccountId(accountId) && bech32.decode(fromAccountId(accountId).account).prefix === 'bc') - return [fromAccountId(accountId).account] - return (await getAccountAddressesWithBalances(accountId)).map(({ address }) => address) + return [fromAccountId(accountId).account] }) // A THOR Tx can either be: From 87fe468f6d2bfa36ad4c25b82865cdb891b02ca4 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 23 Sep 2024 20:29:19 +0200 Subject: [PATCH 18/25] feat: add taproot TODO --- src/state/slices/portfolioSlice/utils/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/state/slices/portfolioSlice/utils/index.ts b/src/state/slices/portfolioSlice/utils/index.ts index 8a2c8be5e0f..40d433cb094 100644 --- a/src/state/slices/portfolioSlice/utils/index.ts +++ b/src/state/slices/portfolioSlice/utils/index.ts @@ -78,6 +78,8 @@ export const accountIdToLabel = (accountId: AccountId): string => { // TODO(0xdef1cafe): translations if (pubkey.startsWith('xpub')) return 'Legacy' if (pubkey.startsWith('ypub')) return 'Segwit' + // TODO(gomes): This assumes bc prefix *is* a SegWit Native address, but this will consider both bc1p (P2WPKH) and bc1q (taproot) as SegWit Native + // which is wrong, but fine for now as we don't support Taproot. if (pubkey.startsWith('zpub') || bech32.decode(pubkey).prefix === 'bc') return 'Segwit Native' return '' case bchChainId: From bef524bca6ac875e97ae3e70e96e2bf5df37f9bb Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 23 Sep 2024 20:31:29 +0200 Subject: [PATCH 19/25] feat: bump hdwallet to latest without polygon support --- package.json | 28 ++++----- yarn.lock | 170 +++++++++++++++++++++++++-------------------------- 2 files changed, 99 insertions(+), 99 deletions(-) diff --git a/package.json b/package.json index 428d25603fa..0b5a7831d5e 100644 --- a/package.json +++ b/package.json @@ -92,20 +92,20 @@ "@shapeshiftoss/caip": "workspace:^", "@shapeshiftoss/chain-adapters": "workspace:^", "@shapeshiftoss/errors": "workspace:^", - "@shapeshiftoss/hdwallet-coinbase": "1.55.6", - "@shapeshiftoss/hdwallet-core": "1.55.6", - "@shapeshiftoss/hdwallet-keepkey": "1.55.6", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.55.6", - "@shapeshiftoss/hdwallet-keplr": "1.55.6", - "@shapeshiftoss/hdwallet-ledger": "1.55.6", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.55.6", - "@shapeshiftoss/hdwallet-metamask": "1.55.6", - "@shapeshiftoss/hdwallet-native": "1.55.6", - "@shapeshiftoss/hdwallet-native-vault": "1.55.6", - "@shapeshiftoss/hdwallet-phantom": "1.55.6", - "@shapeshiftoss/hdwallet-shapeshift-multichain": "1.55.6", - "@shapeshiftoss/hdwallet-walletconnectv2": "1.55.6", - "@shapeshiftoss/hdwallet-xdefi": "1.55.6", + "@shapeshiftoss/hdwallet-coinbase": "1.55.8", + "@shapeshiftoss/hdwallet-core": "1.55.8", + "@shapeshiftoss/hdwallet-keepkey": "1.55.8", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.55.8", + "@shapeshiftoss/hdwallet-keplr": "1.55.8", + "@shapeshiftoss/hdwallet-ledger": "1.55.8", + "@shapeshiftoss/hdwallet-ledger-webusb": "1.55.8", + "@shapeshiftoss/hdwallet-metamask": "1.55.8", + "@shapeshiftoss/hdwallet-native": "1.55.8", + "@shapeshiftoss/hdwallet-native-vault": "1.55.8", + "@shapeshiftoss/hdwallet-phantom": "1.55.8", + "@shapeshiftoss/hdwallet-shapeshift-multichain": "1.55.8", + "@shapeshiftoss/hdwallet-walletconnectv2": "1.55.8", + "@shapeshiftoss/hdwallet-xdefi": "1.55.8", "@shapeshiftoss/swapper": "workspace:^", "@shapeshiftoss/types": "workspace:^", "@shapeshiftoss/unchained-client": "workspace:^", diff --git a/yarn.lock b/yarn.lock index feb55ff91ba..3b688ad4d00 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11267,15 +11267,15 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-coinbase@npm:1.55.6": - version: 1.55.6 - resolution: "@shapeshiftoss/hdwallet-coinbase@npm:1.55.6" +"@shapeshiftoss/hdwallet-coinbase@npm:1.55.8": + version: 1.55.8 + resolution: "@shapeshiftoss/hdwallet-coinbase@npm:1.55.8" dependencies: "@coinbase/wallet-sdk": ^3.6.6 - "@shapeshiftoss/hdwallet-core": 1.55.6 + "@shapeshiftoss/hdwallet-core": 1.55.8 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: 1b9201e405c0f3b12d52f3784ed045ded2933cc8c56c3227dad344fd940a56f3de1f3c85296d1af6b8403fd3330fefd97da88fb4f3e41b39f9857efcb7cc8e02 + checksum: bf97646ffb9593feac04848c9fb7744efde8daf14ca733bb8930a4b63eb434e14e9ebf77a6d07e8fed5d8e4e22bd6448b349ecd10932f3b66cf2df172a5cf5cc languageName: node linkType: hard @@ -11305,9 +11305,9 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-core@npm:1.55.6": - version: 1.55.6 - resolution: "@shapeshiftoss/hdwallet-core@npm:1.55.6" +"@shapeshiftoss/hdwallet-core@npm:1.55.8": + version: 1.55.8 + resolution: "@shapeshiftoss/hdwallet-core@npm:1.55.8" dependencies: "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 "@shapeshiftoss/proto-tx-builder": ^0.8.0 @@ -11317,30 +11317,30 @@ __metadata: lodash: ^4.17.21 rxjs: ^6.4.0 type-assertions: ^1.1.0 - checksum: 5a652ef6b4ce2157aa822dd45c55805e362e115d4e47077edb9d92200ab155c6cdacf06ee3b5bf86e47f592c4c16f885bf85ccd59ada9642ed18a98f649a9576 + checksum: a344ce25617b48a2453bfadbcc827c1091f86259833de925d21b9a300f03fc91e85bb1ecaab62151d3696f80464bbb4219aa7874ae6727609e5be29f97a5acad languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.6": - version: 1.55.6 - resolution: "@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.6" +"@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.8": + version: 1.55.8 + resolution: "@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.8" dependencies: - "@shapeshiftoss/hdwallet-core": 1.55.6 - "@shapeshiftoss/hdwallet-keepkey": 1.55.6 - checksum: e219ff8fb4903912bb3fc92c501b449a12e4d85a0ff4b595399b7ce7cf7194ecc5c1ce6c28fb2a80de336640453728262d76ec8230e525f0a3251d74cfb7ef26 + "@shapeshiftoss/hdwallet-core": 1.55.8 + "@shapeshiftoss/hdwallet-keepkey": 1.55.8 + checksum: d4a11ae797f795cd6658ea15d212f593560650d6fea05c5bf2c00eccc1d92108edf0163b8359c24ff42dd9b7832c513747cccdb8c00434f3da4519d35891fb61 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keepkey@npm:1.55.6": - version: 1.55.6 - resolution: "@shapeshiftoss/hdwallet-keepkey@npm:1.55.6" +"@shapeshiftoss/hdwallet-keepkey@npm:1.55.8": + version: 1.55.8 + resolution: "@shapeshiftoss/hdwallet-keepkey@npm:1.55.8" dependencies: "@ethereumjs/common": ^2.4.0 "@ethereumjs/tx": ^3.3.0 "@keepkey/device-protocol": ^7.12.2 "@metamask/eth-sig-util": ^7.0.0 "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 - "@shapeshiftoss/hdwallet-core": 1.55.6 + "@shapeshiftoss/hdwallet-core": 1.55.8 "@shapeshiftoss/proto-tx-builder": ^0.8.0 bignumber.js: ^9.0.1 bnb-javascript-sdk-nobroadcast: ^2.16.14 @@ -11352,27 +11352,27 @@ __metadata: p-lazy: ^3.1.0 semver: ^7.3.8 tiny-secp256k1: ^1.1.6 - checksum: 638efbe277544b701f5951c1de9e37953d5b088cdaad5874f6a121ef4a4a4b59266316a61dbe4ea29986725cae7c7004bb5a0e61726cd14b278c563018de1d87 + checksum: 5a379f39b793b4f6c8ad8e91048ff5738da9aa8c3044bb7bba6f33ca4c1e5bdade406f27260860e950c1fa3c419819b4e180f28f9193fc9f150f332c8288abb7 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keplr@npm:1.55.6": - version: 1.55.6 - resolution: "@shapeshiftoss/hdwallet-keplr@npm:1.55.6" +"@shapeshiftoss/hdwallet-keplr@npm:1.55.8": + version: 1.55.8 + resolution: "@shapeshiftoss/hdwallet-keplr@npm:1.55.8" dependencies: "@shapeshiftoss/caip": 8.15.0 - "@shapeshiftoss/hdwallet-core": 1.55.6 + "@shapeshiftoss/hdwallet-core": 1.55.8 "@shapeshiftoss/proto-tx-builder": ^0.8.0 "@shapeshiftoss/types": 3.1.3 base64-js: ^1.5.1 lodash: ^4.17.21 - checksum: a85a98e276218af1bcac790ad398ce1e18ce7233d3babac896e4304f8f4632c7e5305485cffdf2d2c8bdf0dd171af779074ce1d694fdf6226094cf89cda425ac + checksum: e3f77be082b339bc894a26b4827c22b9856970e6346a8cca33be844b2d58fc81511ddd36c175e52ffa0795c00c04278aa8ee27d8a1b765db1e13023d221f7344 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.6": - version: 1.55.6 - resolution: "@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.6" +"@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.8": + version: 1.55.8 + resolution: "@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.8" dependencies: "@ledgerhq/hw-app-btc": ^10.4.1 "@ledgerhq/hw-app-eth": ^6.38.0 @@ -11380,23 +11380,23 @@ __metadata: "@ledgerhq/hw-transport-webusb": ^6.29.2 "@ledgerhq/live-common": ^21.8.2 "@ledgerhq/logs": ^6.10.1 - "@shapeshiftoss/hdwallet-core": 1.55.6 - "@shapeshiftoss/hdwallet-ledger": 1.55.6 + "@shapeshiftoss/hdwallet-core": 1.55.8 + "@shapeshiftoss/hdwallet-ledger": 1.55.8 "@types/w3c-web-usb": ^1.0.4 p-queue: ^7.4.1 - checksum: 5f0993bf6bc29cc8c08e35df55ad8b87cd89212c4a8f140523e81f5b0efae9771f3854e80a7fe2a65e53546e67bac281663c9162ecf9f53749aa5ad8ab8051cc + checksum: 2a0640acc4b7f1f9f941aedd841c5c8d81667625e48a5a85f0192039c305906c69bc713d91fc551d89600c4ef6b2c9b9f7e08bc889346b23cba19d51356ca5ba languageName: node linkType: hard -"@shapeshiftoss/hdwallet-ledger@npm:1.55.6": - version: 1.55.6 - resolution: "@shapeshiftoss/hdwallet-ledger@npm:1.55.6" +"@shapeshiftoss/hdwallet-ledger@npm:1.55.8": + version: 1.55.8 + resolution: "@shapeshiftoss/hdwallet-ledger@npm:1.55.8" dependencies: "@ethereumjs/common": ^2.4.0 "@ethereumjs/tx": ^3.3.0 "@ledgerhq/hw-app-cosmos": ^6.29.1 "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 - "@shapeshiftoss/hdwallet-core": 1.55.6 + "@shapeshiftoss/hdwallet-core": 1.55.8 base64-js: ^1.5.1 bchaddrjs: ^0.4.4 bitcoinjs-message: ^2.0.0 @@ -11404,28 +11404,28 @@ __metadata: ethereumjs-tx: 1.3.7 ethereumjs-util: ^6.1.0 lodash: ^4.17.21 - checksum: e8c13f5822b7f3176494df47d1cbaede16a0d98a04ded40e74ffc9f4d78c793ab7b7711315f85242dc87b36fe7ab28a36ed4c413a5f1c4949d0850629e27a8ef + checksum: 0fa4931612f9492ee62d80eb49890e5a6d777808cf46a15ce3066e6ffdb5a4f46a05d892f053f73b3992877f4650573aac2b1388a6fbdee48e45e71ab81b1528 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-metamask@npm:1.55.6": - version: 1.55.6 - resolution: "@shapeshiftoss/hdwallet-metamask@npm:1.55.6" +"@shapeshiftoss/hdwallet-metamask@npm:1.55.8": + version: 1.55.8 + resolution: "@shapeshiftoss/hdwallet-metamask@npm:1.55.8" dependencies: "@metamask/detect-provider": ^1.2.0 "@metamask/onboarding": ^1.0.1 - "@shapeshiftoss/hdwallet-core": 1.55.6 + "@shapeshiftoss/hdwallet-core": 1.55.8 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: c0e564b5503dd26f554a06130812c1564dd8f92eecf30a80d005f691f689caaf4427bd35190dd34e56fbbcf088f48739e45bdaab255ee3d33f032f6c86ac0947 + checksum: be3f9d8c88cf819358e0d11a82a361e46d71635e19de6cb06031359fa9d129ebe82a0883534d016d8dc6f930cfeae86531991008485de7e1770291e2f027ebf1 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-native-vault@npm:1.55.6": - version: 1.55.6 - resolution: "@shapeshiftoss/hdwallet-native-vault@npm:1.55.6" +"@shapeshiftoss/hdwallet-native-vault@npm:1.55.8": + version: 1.55.8 + resolution: "@shapeshiftoss/hdwallet-native-vault@npm:1.55.8" dependencies: - "@shapeshiftoss/hdwallet-native": 1.55.6 + "@shapeshiftoss/hdwallet-native": 1.55.8 bip39: ^3.0.4 hash-wasm: ^4.11.0 idb-keyval: ^6.0.3 @@ -11434,17 +11434,17 @@ __metadata: type-assertions: ^1.1.0 uuid: ^8.3.2 web-encoding: ^1.1.0 - checksum: c686778c6a966d9cd30d99b78fff044a06b887ea7af01c6dc76708cc53c3c33572acc95092d75f09ec614e30a9c1ce32d452473ea828e2fef3f77ecb9cf8f50c + checksum: 5c919aad001ed2495ea8d84a0b87a79f825ae7ba6d336cd1812fddbffc2c2018de36d50416674ed5d4a00ae2e35e986ec0fa8b83f866c83538c0d43b4eb12d26 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-native@npm:1.55.6": - version: 1.55.6 - resolution: "@shapeshiftoss/hdwallet-native@npm:1.55.6" +"@shapeshiftoss/hdwallet-native@npm:1.55.8": + version: 1.55.8 + resolution: "@shapeshiftoss/hdwallet-native@npm:1.55.8" dependencies: "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 "@shapeshiftoss/fiosdk": 1.2.1-shapeshift.6 - "@shapeshiftoss/hdwallet-core": 1.55.6 + "@shapeshiftoss/hdwallet-core": 1.55.8 "@shapeshiftoss/proto-tx-builder": ^0.8.0 "@zxing/text-encoding": ^0.9.0 bchaddrjs: ^0.4.9 @@ -11466,7 +11466,7 @@ __metadata: tendermint-tx-builder: ^1.0.9 tiny-secp256k1: ^1.1.6 web-encoding: ^1.1.0 - checksum: 2ff57f2b2d8db9a1fc3b4285455049475fd082a710a6d645d6e08ee2bd652eb5f87a716f8aadd9eddd87548cb6090b3d0c6fc323969dea998c662a390e270b91 + checksum: 50a2580e36e2e2359768808c6ad242b64388f79b79b85659409b16a0cbb279803f523d794174e0106ba34af34eeee15404b4e3745c805e3990b8b766969a5166 languageName: node linkType: hard @@ -11502,54 +11502,54 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-phantom@npm:1.55.6": - version: 1.55.6 - resolution: "@shapeshiftoss/hdwallet-phantom@npm:1.55.6" +"@shapeshiftoss/hdwallet-phantom@npm:1.55.8": + version: 1.55.8 + resolution: "@shapeshiftoss/hdwallet-phantom@npm:1.55.8" dependencies: "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 - "@shapeshiftoss/hdwallet-core": 1.55.6 + "@shapeshiftoss/hdwallet-core": 1.55.8 base64-js: ^1.5.1 bitcoinjs-message: ^2.0.0 lodash: ^4.17.21 - checksum: 10ef86f7fedec31f55e6e72788cec659db70b39616bd5052837f1f11aa0da9806e28bae1af5d6665e04c2898350698fb2786736a9dc8eff92976450244ae52fd + checksum: 294bec73f6f637408a60aa54eec0cc1a48c33dac4f6d33ef057638ffcc425120e1af39a848b5d675ee0a23643359c64a35d48c3ca40767b1397f95d59f9781e7 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.6": - version: 1.55.6 - resolution: "@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.6" +"@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.8": + version: 1.55.8 + resolution: "@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.8" dependencies: "@metamask/detect-provider": ^1.2.0 "@metamask/onboarding": ^1.0.1 "@shapeshiftoss/common-api": ^9.3.0 - "@shapeshiftoss/hdwallet-core": 1.55.6 + "@shapeshiftoss/hdwallet-core": 1.55.8 "@shapeshiftoss/metamask-snaps-adapter": ^1.0.10 "@shapeshiftoss/metamask-snaps-types": ^1.0.10 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: 05fce1061fc475c961c3a56332a3f0116f341601662901a080ba8e071bbe90f514dd958e333c4e5b038f4f9c0204f9216b50f8db0f0a988d96aa6cdec881c7b5 + checksum: 54a0136c6e8b0aafa08bf6a40db9285706721705bf9e45734b8e1a5fa7ba9014e3f666325cee3d92e5dadd2fe2a0762a3fcc55bf3c8fde8da713b24cf7b09289 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.6": - version: 1.55.6 - resolution: "@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.6" +"@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.8": + version: 1.55.8 + resolution: "@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.8" dependencies: - "@shapeshiftoss/hdwallet-core": 1.55.6 + "@shapeshiftoss/hdwallet-core": 1.55.8 "@walletconnect/ethereum-provider": ^2.10.1 "@walletconnect/modal": ^2.6.2 ethers: ^5.6.5 - checksum: b4eda7b06e05ae155e8e88ed966a06627dd8a36ef8a2b06fc6ef20cc224a994d83a2d6f69db085faad399f5a9532c8f82414eb2564c8f0c9555f8dc6dedee91d + checksum: ec65fa42acc0d1b5b51065ab5e604f62485c25c25492742b1f601168a56c0b0902069fd2660a327c64ac7c98864032b258a7118e1de014063cdcab8e9a23d79a languageName: node linkType: hard -"@shapeshiftoss/hdwallet-xdefi@npm:1.55.6": - version: 1.55.6 - resolution: "@shapeshiftoss/hdwallet-xdefi@npm:1.55.6" +"@shapeshiftoss/hdwallet-xdefi@npm:1.55.8": + version: 1.55.8 + resolution: "@shapeshiftoss/hdwallet-xdefi@npm:1.55.8" dependencies: - "@shapeshiftoss/hdwallet-core": 1.55.6 + "@shapeshiftoss/hdwallet-core": 1.55.8 lodash: ^4.17.21 - checksum: e116fc4e7a06992b6e2514dbff9f892fb7e627c50e8d6a2fee2abc6d566d6be3239a069c4375f467e8e1128772df622accd09f9f30003ada1ef924dfcd4bea57 + checksum: 74cd1e7f5a658d2e7af248a96395f4b17f677e2feaadb11d716f521fc9b3eb2940657ac3bfdb3c9a8401eb79a5c2e7d4133b46c3f7a7832b99af52a53cbc20ab languageName: node linkType: hard @@ -11744,20 +11744,20 @@ __metadata: "@shapeshiftoss/caip": "workspace:^" "@shapeshiftoss/chain-adapters": "workspace:^" "@shapeshiftoss/errors": "workspace:^" - "@shapeshiftoss/hdwallet-coinbase": 1.55.6 - "@shapeshiftoss/hdwallet-core": 1.55.6 - "@shapeshiftoss/hdwallet-keepkey": 1.55.6 - "@shapeshiftoss/hdwallet-keepkey-webusb": 1.55.6 - "@shapeshiftoss/hdwallet-keplr": 1.55.6 - "@shapeshiftoss/hdwallet-ledger": 1.55.6 - "@shapeshiftoss/hdwallet-ledger-webusb": 1.55.6 - "@shapeshiftoss/hdwallet-metamask": 1.55.6 - "@shapeshiftoss/hdwallet-native": 1.55.6 - "@shapeshiftoss/hdwallet-native-vault": 1.55.6 - "@shapeshiftoss/hdwallet-phantom": 1.55.6 - "@shapeshiftoss/hdwallet-shapeshift-multichain": 1.55.6 - "@shapeshiftoss/hdwallet-walletconnectv2": 1.55.6 - "@shapeshiftoss/hdwallet-xdefi": 1.55.6 + "@shapeshiftoss/hdwallet-coinbase": 1.55.8 + "@shapeshiftoss/hdwallet-core": 1.55.8 + "@shapeshiftoss/hdwallet-keepkey": 1.55.8 + "@shapeshiftoss/hdwallet-keepkey-webusb": 1.55.8 + "@shapeshiftoss/hdwallet-keplr": 1.55.8 + "@shapeshiftoss/hdwallet-ledger": 1.55.8 + "@shapeshiftoss/hdwallet-ledger-webusb": 1.55.8 + "@shapeshiftoss/hdwallet-metamask": 1.55.8 + "@shapeshiftoss/hdwallet-native": 1.55.8 + "@shapeshiftoss/hdwallet-native-vault": 1.55.8 + "@shapeshiftoss/hdwallet-phantom": 1.55.8 + "@shapeshiftoss/hdwallet-shapeshift-multichain": 1.55.8 + "@shapeshiftoss/hdwallet-walletconnectv2": 1.55.8 + "@shapeshiftoss/hdwallet-xdefi": 1.55.8 "@shapeshiftoss/swapper": "workspace:^" "@shapeshiftoss/types": "workspace:^" "@shapeshiftoss/unchained-client": "workspace:^" From 6b4467ad9c03f67b97e603f80c52c8bcb9dccddb Mon Sep 17 00:00:00 2001 From: kaladinlight <35275952+kaladinlight@users.noreply.github.com> Date: Mon, 23 Sep 2024 13:42:48 -0600 Subject: [PATCH 20/25] update logic with new unchained response updates --- .../chain-adapters/src/utxo/UtxoBaseAdapter.ts | 17 ++++------------- .../chain-adapters/src/utxo/utxoSelect/index.ts | 8 +------- src/lib/utils/thorchain/index.ts | 2 +- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/packages/chain-adapters/src/utxo/UtxoBaseAdapter.ts b/packages/chain-adapters/src/utxo/UtxoBaseAdapter.ts index eb07c0bcea1..44e65a25e67 100644 --- a/packages/chain-adapters/src/utxo/UtxoBaseAdapter.ts +++ b/packages/chain-adapters/src/utxo/UtxoBaseAdapter.ts @@ -10,7 +10,6 @@ import { BTCOutputAddressType, supportsBTC, } from '@shapeshiftoss/hdwallet-core' -import { PhantomHDWallet } from '@shapeshiftoss/hdwallet-phantom' import type { BIP44Params, UtxoChainId } from '@shapeshiftoss/types' import { KnownChainIds, UtxoAccountType } from '@shapeshiftoss/types' import type * as unchained from '@shapeshiftoss/unchained-client' @@ -324,15 +323,12 @@ export abstract class UtxoBaseAdapter implements IChainAd const signTxInputs: BTCSignTxInput[] = [] for (const input of inputs) { - // TOOD(gomes): v. dangerous, narrow this monkey patch for Phantom only - // if (!input.path) continue - const data = await this.providers.http.getTransaction({ txid: input.txid }) signTxInputs.push({ - // TODO(gomes): v. dangerous, should only be used for phantom since no derivation happens, and assume account 0 address 0 yadi yada - // @ts-ignore - addressNList: input.path ? bip32ToAddressNList(input.path) : undefined, + addressNList: input.path + ? bip32ToAddressNList(input.path) + : toAddressNList({ ...bip44Params }), scriptType: accountTypeToScriptType[accountType], amount: String(input.value), vout: input.vout, @@ -518,12 +514,7 @@ export abstract class UtxoBaseAdapter implements IChainAd const account = await this.getAccount( input.pubKey ?? (await this.getPublicKey(wallet, accountNumber, accountType)).xpub, ) - const addresses = (() => { - // This means the account isn't an xpub account, pub a pubkey as account i.e Phantom, which doesn't expose an xpub - if (wallet instanceof PhantomHDWallet && !account.chainSpecific.addresses && account.pubkey) - return [account.pubkey] - return (account.chainSpecific.addresses ?? []).map(address => address.pubkey) - })() + const addresses = (account.chainSpecific.addresses ?? []).map(address => address.pubkey) const subscriptionId = `${toRootDerivationPath(bip44Params)}/${accountType}` await this.providers.ws.subscribeTxs( diff --git a/packages/chain-adapters/src/utxo/utxoSelect/index.ts b/packages/chain-adapters/src/utxo/utxoSelect/index.ts index d499806d742..d703706c34a 100644 --- a/packages/chain-adapters/src/utxo/utxoSelect/index.ts +++ b/packages/chain-adapters/src/utxo/utxoSelect/index.ts @@ -33,13 +33,7 @@ export const utxoSelect = (input: UTXOSelectInput) => { // If input contains a `from` param, the intent is to only keep the UTXOs from that address // so we can ensure the send address is the one we want // This doesn't do any further checks, so error-handling should be done by the caller e.g `buildSendTransaction` callsites - if ( - !input.from || - // Accommodate for pubkey (not xpub) UTXOs which don't have an address - // Can there ever be a case where a pubkey UTXO also doesn't contain an address and this is a danger for fundus? - (input.from && !utxo.address) || - (input.from && utxo.address === input.from) - ) { + if (!input.from || (input.from && utxo.address === input.from)) { acc.push(sanitizedUtxo) } return acc diff --git a/src/lib/utils/thorchain/index.ts b/src/lib/utils/thorchain/index.ts index ddb37f47b33..5863afdddfc 100644 --- a/src/lib/utils/thorchain/index.ts +++ b/src/lib/utils/thorchain/index.ts @@ -208,7 +208,7 @@ export const getAccountAddresses = memoize(async (accountId: AccountId): Promise chainSpecific: { addresses }, } = await adapter.getAccount(pubkey) - if (!addresses) return [pubkey] + if (!addresses) return [] return addresses.map(({ pubkey }) => { const address = pubkey.startsWith('bitcoincash') ? pubkey.replace('bitcoincash:', '') : pubkey From f29a2038cd801fe30275bc0e34c956bcd93c21d4 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Mon, 23 Sep 2024 21:52:51 +0200 Subject: [PATCH 21/25] feat: bump hdwallet --- package.json | 28 ++++----- yarn.lock | 171 ++++++++++++++++++++++++++------------------------- 2 files changed, 100 insertions(+), 99 deletions(-) diff --git a/package.json b/package.json index 0b5a7831d5e..d077e3e09e3 100644 --- a/package.json +++ b/package.json @@ -92,20 +92,20 @@ "@shapeshiftoss/caip": "workspace:^", "@shapeshiftoss/chain-adapters": "workspace:^", "@shapeshiftoss/errors": "workspace:^", - "@shapeshiftoss/hdwallet-coinbase": "1.55.8", - "@shapeshiftoss/hdwallet-core": "1.55.8", - "@shapeshiftoss/hdwallet-keepkey": "1.55.8", - "@shapeshiftoss/hdwallet-keepkey-webusb": "1.55.8", - "@shapeshiftoss/hdwallet-keplr": "1.55.8", - "@shapeshiftoss/hdwallet-ledger": "1.55.8", - "@shapeshiftoss/hdwallet-ledger-webusb": "1.55.8", - "@shapeshiftoss/hdwallet-metamask": "1.55.8", - "@shapeshiftoss/hdwallet-native": "1.55.8", - "@shapeshiftoss/hdwallet-native-vault": "1.55.8", - "@shapeshiftoss/hdwallet-phantom": "1.55.8", - "@shapeshiftoss/hdwallet-shapeshift-multichain": "1.55.8", - "@shapeshiftoss/hdwallet-walletconnectv2": "1.55.8", - "@shapeshiftoss/hdwallet-xdefi": "1.55.8", + "@shapeshiftoss/hdwallet-coinbase": "1.55.9", + "@shapeshiftoss/hdwallet-core": "1.55.9", + "@shapeshiftoss/hdwallet-keepkey": "1.55.9", + "@shapeshiftoss/hdwallet-keepkey-webusb": "1.55.9", + "@shapeshiftoss/hdwallet-keplr": "1.55.9", + "@shapeshiftoss/hdwallet-ledger": "1.55.9", + "@shapeshiftoss/hdwallet-ledger-webusb": "1.55.9", + "@shapeshiftoss/hdwallet-metamask": "1.55.9", + "@shapeshiftoss/hdwallet-native": "1.55.9", + "@shapeshiftoss/hdwallet-native-vault": "1.55.9", + "@shapeshiftoss/hdwallet-phantom": "1.55.9", + "@shapeshiftoss/hdwallet-shapeshift-multichain": "1.55.9", + "@shapeshiftoss/hdwallet-walletconnectv2": "1.55.9", + "@shapeshiftoss/hdwallet-xdefi": "1.55.9", "@shapeshiftoss/swapper": "workspace:^", "@shapeshiftoss/types": "workspace:^", "@shapeshiftoss/unchained-client": "workspace:^", diff --git a/yarn.lock b/yarn.lock index 3b688ad4d00..7bd0bf1c8eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11267,15 +11267,15 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-coinbase@npm:1.55.8": - version: 1.55.8 - resolution: "@shapeshiftoss/hdwallet-coinbase@npm:1.55.8" +"@shapeshiftoss/hdwallet-coinbase@npm:1.55.9": + version: 1.55.9 + resolution: "@shapeshiftoss/hdwallet-coinbase@npm:1.55.9" dependencies: "@coinbase/wallet-sdk": ^3.6.6 - "@shapeshiftoss/hdwallet-core": 1.55.8 + "@shapeshiftoss/hdwallet-core": 1.55.9 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: bf97646ffb9593feac04848c9fb7744efde8daf14ca733bb8930a4b63eb434e14e9ebf77a6d07e8fed5d8e4e22bd6448b349ecd10932f3b66cf2df172a5cf5cc + checksum: 0d551f0e3a1b0787933aae756ecaca05e61b6a084fb000808ee2950ce44eeeebc45b95490ca370f06004b09784a1e14d4cf1ad574ad8502c7b4f0cba82ac9717 languageName: node linkType: hard @@ -11305,9 +11305,9 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-core@npm:1.55.8": - version: 1.55.8 - resolution: "@shapeshiftoss/hdwallet-core@npm:1.55.8" +"@shapeshiftoss/hdwallet-core@npm:1.55.9": + version: 1.55.9 + resolution: "@shapeshiftoss/hdwallet-core@npm:1.55.9" dependencies: "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 "@shapeshiftoss/proto-tx-builder": ^0.8.0 @@ -11317,30 +11317,30 @@ __metadata: lodash: ^4.17.21 rxjs: ^6.4.0 type-assertions: ^1.1.0 - checksum: a344ce25617b48a2453bfadbcc827c1091f86259833de925d21b9a300f03fc91e85bb1ecaab62151d3696f80464bbb4219aa7874ae6727609e5be29f97a5acad + checksum: e441830860c07518a871513b98d45ac881e2d1a80384d5fbc780c61c181c0f9a0131811633a93096fd4c48581ff2e097351be9bb6078d0821f270d7af24b0849 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.8": - version: 1.55.8 - resolution: "@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.8" +"@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.9": + version: 1.55.9 + resolution: "@shapeshiftoss/hdwallet-keepkey-webusb@npm:1.55.9" dependencies: - "@shapeshiftoss/hdwallet-core": 1.55.8 - "@shapeshiftoss/hdwallet-keepkey": 1.55.8 - checksum: d4a11ae797f795cd6658ea15d212f593560650d6fea05c5bf2c00eccc1d92108edf0163b8359c24ff42dd9b7832c513747cccdb8c00434f3da4519d35891fb61 + "@shapeshiftoss/hdwallet-core": 1.55.9 + "@shapeshiftoss/hdwallet-keepkey": 1.55.9 + checksum: fcb35e56f78390f7f654328943b59dee0cbbdcb0e3a037e8f0359c787c1f4e2dcabc576da3a8e6a9aab199c9108b0d3f72a3bf1b18c53d86ed08f8ba97e7e06b languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keepkey@npm:1.55.8": - version: 1.55.8 - resolution: "@shapeshiftoss/hdwallet-keepkey@npm:1.55.8" +"@shapeshiftoss/hdwallet-keepkey@npm:1.55.9": + version: 1.55.9 + resolution: "@shapeshiftoss/hdwallet-keepkey@npm:1.55.9" dependencies: "@ethereumjs/common": ^2.4.0 "@ethereumjs/tx": ^3.3.0 "@keepkey/device-protocol": ^7.12.2 "@metamask/eth-sig-util": ^7.0.0 "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 - "@shapeshiftoss/hdwallet-core": 1.55.8 + "@shapeshiftoss/hdwallet-core": 1.55.9 "@shapeshiftoss/proto-tx-builder": ^0.8.0 bignumber.js: ^9.0.1 bnb-javascript-sdk-nobroadcast: ^2.16.14 @@ -11352,27 +11352,27 @@ __metadata: p-lazy: ^3.1.0 semver: ^7.3.8 tiny-secp256k1: ^1.1.6 - checksum: 5a379f39b793b4f6c8ad8e91048ff5738da9aa8c3044bb7bba6f33ca4c1e5bdade406f27260860e950c1fa3c419819b4e180f28f9193fc9f150f332c8288abb7 + checksum: 7ea0164111c2bf4eb52067645ff3ee8ff0bcf05b95583b708dfb2f1aa4a07bee5bda5c1b0da7d4cc0abb20e4901998ba5ef78a9d1d99f687420378815a7f54c1 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-keplr@npm:1.55.8": - version: 1.55.8 - resolution: "@shapeshiftoss/hdwallet-keplr@npm:1.55.8" +"@shapeshiftoss/hdwallet-keplr@npm:1.55.9": + version: 1.55.9 + resolution: "@shapeshiftoss/hdwallet-keplr@npm:1.55.9" dependencies: "@shapeshiftoss/caip": 8.15.0 - "@shapeshiftoss/hdwallet-core": 1.55.8 + "@shapeshiftoss/hdwallet-core": 1.55.9 "@shapeshiftoss/proto-tx-builder": ^0.8.0 "@shapeshiftoss/types": 3.1.3 base64-js: ^1.5.1 lodash: ^4.17.21 - checksum: e3f77be082b339bc894a26b4827c22b9856970e6346a8cca33be844b2d58fc81511ddd36c175e52ffa0795c00c04278aa8ee27d8a1b765db1e13023d221f7344 + checksum: 6fc0e10a19d520da7935fae0d3d1b21177a7ede3eb5305143b5a5208e6c86ca4b50f19d9a21afed756e451b244c9cb5cfe44e0fb79ff9ab5ffbba43a0f6b7e91 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.8": - version: 1.55.8 - resolution: "@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.8" +"@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.9": + version: 1.55.9 + resolution: "@shapeshiftoss/hdwallet-ledger-webusb@npm:1.55.9" dependencies: "@ledgerhq/hw-app-btc": ^10.4.1 "@ledgerhq/hw-app-eth": ^6.38.0 @@ -11380,23 +11380,23 @@ __metadata: "@ledgerhq/hw-transport-webusb": ^6.29.2 "@ledgerhq/live-common": ^21.8.2 "@ledgerhq/logs": ^6.10.1 - "@shapeshiftoss/hdwallet-core": 1.55.8 - "@shapeshiftoss/hdwallet-ledger": 1.55.8 + "@shapeshiftoss/hdwallet-core": 1.55.9 + "@shapeshiftoss/hdwallet-ledger": 1.55.9 "@types/w3c-web-usb": ^1.0.4 p-queue: ^7.4.1 - checksum: 2a0640acc4b7f1f9f941aedd841c5c8d81667625e48a5a85f0192039c305906c69bc713d91fc551d89600c4ef6b2c9b9f7e08bc889346b23cba19d51356ca5ba + checksum: aac21bbf07075063da25675f942421093850d1db702323e8e431d514d9c3c243f9d358be552e356e6df82d42ee064a817b0b77fac9612c17abeef24e70e7ff01 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-ledger@npm:1.55.8": - version: 1.55.8 - resolution: "@shapeshiftoss/hdwallet-ledger@npm:1.55.8" +"@shapeshiftoss/hdwallet-ledger@npm:1.55.9": + version: 1.55.9 + resolution: "@shapeshiftoss/hdwallet-ledger@npm:1.55.9" dependencies: "@ethereumjs/common": ^2.4.0 "@ethereumjs/tx": ^3.3.0 "@ledgerhq/hw-app-cosmos": ^6.29.1 "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 - "@shapeshiftoss/hdwallet-core": 1.55.8 + "@shapeshiftoss/hdwallet-core": 1.55.9 base64-js: ^1.5.1 bchaddrjs: ^0.4.4 bitcoinjs-message: ^2.0.0 @@ -11404,28 +11404,28 @@ __metadata: ethereumjs-tx: 1.3.7 ethereumjs-util: ^6.1.0 lodash: ^4.17.21 - checksum: 0fa4931612f9492ee62d80eb49890e5a6d777808cf46a15ce3066e6ffdb5a4f46a05d892f053f73b3992877f4650573aac2b1388a6fbdee48e45e71ab81b1528 + checksum: 944b0277bb41aae5a8318b56f27285e36380cb6a536e4f23d0192a75930ee8c30b3bebbd01719bdf97a5c10fb603f22e1613df375680b4720275bc0ee1b9c41b languageName: node linkType: hard -"@shapeshiftoss/hdwallet-metamask@npm:1.55.8": - version: 1.55.8 - resolution: "@shapeshiftoss/hdwallet-metamask@npm:1.55.8" +"@shapeshiftoss/hdwallet-metamask@npm:1.55.9": + version: 1.55.9 + resolution: "@shapeshiftoss/hdwallet-metamask@npm:1.55.9" dependencies: "@metamask/detect-provider": ^1.2.0 "@metamask/onboarding": ^1.0.1 - "@shapeshiftoss/hdwallet-core": 1.55.8 + "@shapeshiftoss/hdwallet-core": 1.55.9 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: be3f9d8c88cf819358e0d11a82a361e46d71635e19de6cb06031359fa9d129ebe82a0883534d016d8dc6f930cfeae86531991008485de7e1770291e2f027ebf1 + checksum: 2a80175faddf0a4f07ffe85a900d5a2763dfc5f15f2012fd8f168d8d4d02b78f02418a272e4f0cf4e5220f3d8e65f289c980b65bfc7d1f7890428dfb61e0b4f2 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-native-vault@npm:1.55.8": - version: 1.55.8 - resolution: "@shapeshiftoss/hdwallet-native-vault@npm:1.55.8" +"@shapeshiftoss/hdwallet-native-vault@npm:1.55.9": + version: 1.55.9 + resolution: "@shapeshiftoss/hdwallet-native-vault@npm:1.55.9" dependencies: - "@shapeshiftoss/hdwallet-native": 1.55.8 + "@shapeshiftoss/hdwallet-native": 1.55.9 bip39: ^3.0.4 hash-wasm: ^4.11.0 idb-keyval: ^6.0.3 @@ -11434,17 +11434,17 @@ __metadata: type-assertions: ^1.1.0 uuid: ^8.3.2 web-encoding: ^1.1.0 - checksum: 5c919aad001ed2495ea8d84a0b87a79f825ae7ba6d336cd1812fddbffc2c2018de36d50416674ed5d4a00ae2e35e986ec0fa8b83f866c83538c0d43b4eb12d26 + checksum: 1f378982fb3a5368093eb7e6f1221e1e628d7fc3055667d33546b6e31f36d4a9e1255f3d5c9bbf15e02c46b856d07984de408abe4f61ba95b3765c60bb5a0f97 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-native@npm:1.55.8": - version: 1.55.8 - resolution: "@shapeshiftoss/hdwallet-native@npm:1.55.8" +"@shapeshiftoss/hdwallet-native@npm:1.55.9": + version: 1.55.9 + resolution: "@shapeshiftoss/hdwallet-native@npm:1.55.9" dependencies: "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 "@shapeshiftoss/fiosdk": 1.2.1-shapeshift.6 - "@shapeshiftoss/hdwallet-core": 1.55.8 + "@shapeshiftoss/hdwallet-core": 1.55.9 "@shapeshiftoss/proto-tx-builder": ^0.8.0 "@zxing/text-encoding": ^0.9.0 bchaddrjs: ^0.4.9 @@ -11466,7 +11466,7 @@ __metadata: tendermint-tx-builder: ^1.0.9 tiny-secp256k1: ^1.1.6 web-encoding: ^1.1.0 - checksum: 50a2580e36e2e2359768808c6ad242b64388f79b79b85659409b16a0cbb279803f523d794174e0106ba34af34eeee15404b4e3745c805e3990b8b766969a5166 + checksum: a1e54cabc84fa28db420b20cde735a41720c43b14ccbf14108a519eaa637fee97caf48694ea95088eb801a05e1fc75b3d9ec8ccb56924426d822bcef8f810bd9 languageName: node linkType: hard @@ -11502,54 +11502,55 @@ __metadata: languageName: node linkType: hard -"@shapeshiftoss/hdwallet-phantom@npm:1.55.8": - version: 1.55.8 - resolution: "@shapeshiftoss/hdwallet-phantom@npm:1.55.8" +"@shapeshiftoss/hdwallet-phantom@npm:1.55.9": + version: 1.55.9 + resolution: "@shapeshiftoss/hdwallet-phantom@npm:1.55.9" dependencies: "@shapeshiftoss/bitcoinjs-lib": 5.2.0-shapeshift.2 - "@shapeshiftoss/hdwallet-core": 1.55.8 + "@shapeshiftoss/hdwallet-core": 1.55.9 base64-js: ^1.5.1 bitcoinjs-message: ^2.0.0 + ethers: 5.7.2 lodash: ^4.17.21 - checksum: 294bec73f6f637408a60aa54eec0cc1a48c33dac4f6d33ef057638ffcc425120e1af39a848b5d675ee0a23643359c64a35d48c3ca40767b1397f95d59f9781e7 + checksum: db324c2ca0a79a6f499d7e7cbe4d8765849f75f9f5e4abcabd70752415036e4fdaaa75ee9b8d0c992df6cd612469357099f3f05ffb6e8d6df34d4fa5e79c32cf languageName: node linkType: hard -"@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.8": - version: 1.55.8 - resolution: "@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.8" +"@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.9": + version: 1.55.9 + resolution: "@shapeshiftoss/hdwallet-shapeshift-multichain@npm:1.55.9" dependencies: "@metamask/detect-provider": ^1.2.0 "@metamask/onboarding": ^1.0.1 "@shapeshiftoss/common-api": ^9.3.0 - "@shapeshiftoss/hdwallet-core": 1.55.8 + "@shapeshiftoss/hdwallet-core": 1.55.9 "@shapeshiftoss/metamask-snaps-adapter": ^1.0.10 "@shapeshiftoss/metamask-snaps-types": ^1.0.10 eth-rpc-errors: ^4.0.3 lodash: ^4.17.21 - checksum: 54a0136c6e8b0aafa08bf6a40db9285706721705bf9e45734b8e1a5fa7ba9014e3f666325cee3d92e5dadd2fe2a0762a3fcc55bf3c8fde8da713b24cf7b09289 + checksum: eb1b1cd8d0a6724a3218aa0bd009524d828c7ba214b1b52d610fee42685b9af6845bf13db19358b6b52ebe3e8aee13c3d06430c429e33f91a4b03e6b19d99d44 languageName: node linkType: hard -"@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.8": - version: 1.55.8 - resolution: "@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.8" +"@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.9": + version: 1.55.9 + resolution: "@shapeshiftoss/hdwallet-walletconnectv2@npm:1.55.9" dependencies: - "@shapeshiftoss/hdwallet-core": 1.55.8 + "@shapeshiftoss/hdwallet-core": 1.55.9 "@walletconnect/ethereum-provider": ^2.10.1 "@walletconnect/modal": ^2.6.2 ethers: ^5.6.5 - checksum: ec65fa42acc0d1b5b51065ab5e604f62485c25c25492742b1f601168a56c0b0902069fd2660a327c64ac7c98864032b258a7118e1de014063cdcab8e9a23d79a + checksum: bcc771b5e9215f0ac0a2b234ff0400ad927aefc548def9156e18c400b384ec882a464af11d6a52ba0e84fff630b04541937570c98baf5c92b246f9184bc27b3a languageName: node linkType: hard -"@shapeshiftoss/hdwallet-xdefi@npm:1.55.8": - version: 1.55.8 - resolution: "@shapeshiftoss/hdwallet-xdefi@npm:1.55.8" +"@shapeshiftoss/hdwallet-xdefi@npm:1.55.9": + version: 1.55.9 + resolution: "@shapeshiftoss/hdwallet-xdefi@npm:1.55.9" dependencies: - "@shapeshiftoss/hdwallet-core": 1.55.8 + "@shapeshiftoss/hdwallet-core": 1.55.9 lodash: ^4.17.21 - checksum: 74cd1e7f5a658d2e7af248a96395f4b17f677e2feaadb11d716f521fc9b3eb2940657ac3bfdb3c9a8401eb79a5c2e7d4133b46c3f7a7832b99af52a53cbc20ab + checksum: a1c22e0ce75484aef8a20311c1289c04ef18470b45c73da47f29ea019c017d645af0b3f7f76bf79b77c14f1f6b69fffd9373117e98c554d4215701c1349485c5 languageName: node linkType: hard @@ -11744,20 +11745,20 @@ __metadata: "@shapeshiftoss/caip": "workspace:^" "@shapeshiftoss/chain-adapters": "workspace:^" "@shapeshiftoss/errors": "workspace:^" - "@shapeshiftoss/hdwallet-coinbase": 1.55.8 - "@shapeshiftoss/hdwallet-core": 1.55.8 - "@shapeshiftoss/hdwallet-keepkey": 1.55.8 - "@shapeshiftoss/hdwallet-keepkey-webusb": 1.55.8 - "@shapeshiftoss/hdwallet-keplr": 1.55.8 - "@shapeshiftoss/hdwallet-ledger": 1.55.8 - "@shapeshiftoss/hdwallet-ledger-webusb": 1.55.8 - "@shapeshiftoss/hdwallet-metamask": 1.55.8 - "@shapeshiftoss/hdwallet-native": 1.55.8 - "@shapeshiftoss/hdwallet-native-vault": 1.55.8 - "@shapeshiftoss/hdwallet-phantom": 1.55.8 - "@shapeshiftoss/hdwallet-shapeshift-multichain": 1.55.8 - "@shapeshiftoss/hdwallet-walletconnectv2": 1.55.8 - "@shapeshiftoss/hdwallet-xdefi": 1.55.8 + "@shapeshiftoss/hdwallet-coinbase": 1.55.9 + "@shapeshiftoss/hdwallet-core": 1.55.9 + "@shapeshiftoss/hdwallet-keepkey": 1.55.9 + "@shapeshiftoss/hdwallet-keepkey-webusb": 1.55.9 + "@shapeshiftoss/hdwallet-keplr": 1.55.9 + "@shapeshiftoss/hdwallet-ledger": 1.55.9 + "@shapeshiftoss/hdwallet-ledger-webusb": 1.55.9 + "@shapeshiftoss/hdwallet-metamask": 1.55.9 + "@shapeshiftoss/hdwallet-native": 1.55.9 + "@shapeshiftoss/hdwallet-native-vault": 1.55.9 + "@shapeshiftoss/hdwallet-phantom": 1.55.9 + "@shapeshiftoss/hdwallet-shapeshift-multichain": 1.55.9 + "@shapeshiftoss/hdwallet-walletconnectv2": 1.55.9 + "@shapeshiftoss/hdwallet-xdefi": 1.55.9 "@shapeshiftoss/swapper": "workspace:^" "@shapeshiftoss/types": "workspace:^" "@shapeshiftoss/unchained-client": "workspace:^" From 73c99dd004a3855dc618a4d35a31f799fc5a9c33 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 24 Sep 2024 00:25:28 +0200 Subject: [PATCH 22/25] fix: unbork mm --- src/context/WalletProvider/WalletProvider.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/context/WalletProvider/WalletProvider.tsx b/src/context/WalletProvider/WalletProvider.tsx index 88e4099aca9..4af66a9ea55 100644 --- a/src/context/WalletProvider/WalletProvider.tsx +++ b/src/context/WalletProvider/WalletProvider.tsx @@ -162,7 +162,7 @@ export const getMaybeProvider = async ( return (await detectEthereumProvider()) as MetaMaskLikeProvider } if (localWalletType === KeyManager.Phantom) { - return (globalThis as any).phantom.ethereum as unknown as MetaMaskLikeProvider + return (globalThis as any).phantom?.ethereum as unknown as MetaMaskLikeProvider } if (localWalletType === KeyManager.XDefi) { try { From 5bb48bd823c7489eadc722eacc8ae9dd04cbc4b3 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 24 Sep 2024 00:26:12 +0200 Subject: [PATCH 23/25] feat: mm-like providers prompt accounts connection on inactive account change --- src/context/WalletProvider/WalletProvider.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/context/WalletProvider/WalletProvider.tsx b/src/context/WalletProvider/WalletProvider.tsx index 4af66a9ea55..10579fa82e9 100644 --- a/src/context/WalletProvider/WalletProvider.tsx +++ b/src/context/WalletProvider/WalletProvider.tsx @@ -865,13 +865,15 @@ export const WalletProvider = ({ children }: { children: React.ReactNode }): JSX if (_isLocked) { dispatch({ type: WalletActions.SET_IS_LOCKED, payload: true }) // Don't continue execution in case the wallet got locked, set it to locked and abort instead - return } - // Either a change change or a wallet unlock - ensure we set isLocked to false before continuing to avoid bad states - dispatch({ type: WalletActions.SET_IS_LOCKED, payload: false }) + // Either a chain change or a wallet unlock - ensure we set isLocked to false before continuing to avoid bad states + if (!_isLocked) { + dispatch({ type: WalletActions.SET_IS_LOCKED, payload: false }) + } const adapter = await getAdapter(localWalletType) + // Re-pair - which in case of accounts changed means the user will be prompted to connect their current account if they didn't do so const localWallet = await adapter?.pairDevice() if (!localWallet) return From bbdb4553b5f512154c26f9ef948b314eca83d1c8 Mon Sep 17 00:00:00 2001 From: gomes <17035424+gomesalexandre@users.noreply.github.com> Date: Tue, 24 Sep 2024 00:32:22 +0200 Subject: [PATCH 24/25] feat: improve commentaroo --- src/context/WalletProvider/WalletProvider.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/context/WalletProvider/WalletProvider.tsx b/src/context/WalletProvider/WalletProvider.tsx index 10579fa82e9..425e8c3a334 100644 --- a/src/context/WalletProvider/WalletProvider.tsx +++ b/src/context/WalletProvider/WalletProvider.tsx @@ -874,6 +874,8 @@ export const WalletProvider = ({ children }: { children: React.ReactNode }): JSX const adapter = await getAdapter(localWalletType) // Re-pair - which in case of accounts changed means the user will be prompted to connect their current account if they didn't do so + // Note, this isn't guaranteed to work, not all wallets are the same, some (i.e MM) have this weird flow where connecting to an unconnected account + // from a connected account can only be done from the wallet itself and not programmatically const localWallet = await adapter?.pairDevice() if (!localWallet) return From e6ccc040f68d93444868454957adae1b3d322341 Mon Sep 17 00:00:00 2001 From: kaladinlight <35275952+kaladinlight@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:02:26 -0600 Subject: [PATCH 25/25] remove comment --- src/context/WalletProvider/WalletProvider.tsx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/context/WalletProvider/WalletProvider.tsx b/src/context/WalletProvider/WalletProvider.tsx index 425e8c3a334..e086021cbe7 100644 --- a/src/context/WalletProvider/WalletProvider.tsx +++ b/src/context/WalletProvider/WalletProvider.tsx @@ -864,15 +864,13 @@ export const WalletProvider = ({ children }: { children: React.ReactNode }): JSX if (_isLocked) { dispatch({ type: WalletActions.SET_IS_LOCKED, payload: true }) - // Don't continue execution in case the wallet got locked, set it to locked and abort instead - } - - // Either a chain change or a wallet unlock - ensure we set isLocked to false before continuing to avoid bad states - if (!_isLocked) { + } else { + // Either a chain change or a wallet unlock - ensure we set isLocked to false before continuing to avoid bad states dispatch({ type: WalletActions.SET_IS_LOCKED, payload: false }) } const adapter = await getAdapter(localWalletType) + // Re-pair - which in case of accounts changed means the user will be prompted to connect their current account if they didn't do so // Note, this isn't guaranteed to work, not all wallets are the same, some (i.e MM) have this weird flow where connecting to an unconnected account // from a connected account can only be done from the wallet itself and not programmatically