From 697879a6285eb2f8d81977f330a6f6b027ff3b6c Mon Sep 17 00:00:00 2001 From: Frederic HENG Date: Tue, 3 Feb 2026 16:43:24 +0100 Subject: [PATCH 1/2] feat: update bitcoindevkit dependency --- packages/snap/package.json | 2 +- packages/snap/snap.manifest.json | 2 +- packages/snap/src/config.ts | 2 +- packages/snap/src/entities/account.ts | 2 +- packages/snap/src/entities/chain.ts | 2 +- packages/snap/src/entities/config.ts | 2 +- packages/snap/src/entities/confirmation.ts | 2 +- packages/snap/src/entities/currency.ts | 2 +- packages/snap/src/entities/send-flow.ts | 2 +- packages/snap/src/entities/snap.ts | 2 +- packages/snap/src/entities/transaction.ts | 2 +- packages/snap/src/handlers/AssetsHandler.ts | 2 +- packages/snap/src/handlers/CronHandler.test.ts | 2 +- .../snap/src/handlers/KeyringHandler.test.ts | 6 +++--- packages/snap/src/handlers/KeyringHandler.ts | 2 +- .../src/handlers/KeyringRequestHandler.test.ts | 7 ++++++- packages/snap/src/handlers/RpcHandler.test.ts | 6 +++--- packages/snap/src/handlers/caip.ts | 2 +- packages/snap/src/handlers/icons.ts | 2 +- packages/snap/src/handlers/mappings.test.ts | 6 +++--- packages/snap/src/handlers/mappings.ts | 4 ++-- packages/snap/src/handlers/parsers.ts | 2 +- packages/snap/src/handlers/validation.test.ts | 2 +- packages/snap/src/handlers/validation.ts | 4 ++-- packages/snap/src/infra/BdkAccountAdapter.ts | 4 ++-- packages/snap/src/infra/BdkTxBuilderAdapter.ts | 4 ++-- packages/snap/src/infra/EsploraClientAdapter.ts | 4 ++-- packages/snap/src/infra/SnapClientAdapter.ts | 2 +- .../snap/src/infra/jsx/components/AssetIcon.tsx | 2 +- .../src/infra/jsx/components/AssetIconInline.tsx | 2 +- packages/snap/src/infra/jsx/format.ts | 4 ++-- .../jsx/send-flow/ReviewTransactionView.tsx | 2 +- .../unified-send-flow/UnifiedSendFormView.tsx | 2 +- .../snap/src/store/BdkAccountRepository.test.ts | 6 +++--- packages/snap/src/store/BdkAccountRepository.ts | 4 ++-- .../src/store/JSXConfirmationRepository.test.tsx | 2 +- .../snap/src/use-cases/AccountUseCases.test.ts | 2 +- packages/snap/src/use-cases/AccountUseCases.ts | 2 +- .../snap/src/use-cases/SendFlowUseCases.test.ts | 6 +++--- packages/snap/src/use-cases/SendFlowUseCases.ts | 2 +- yarn.lock | 16 ++++++++-------- 41 files changed, 70 insertions(+), 65 deletions(-) diff --git a/packages/snap/package.json b/packages/snap/package.json index 446f39b6b..eb74ff54a 100644 --- a/packages/snap/package.json +++ b/packages/snap/package.json @@ -35,8 +35,8 @@ "test:integration": "./integration-test/run-integration.sh" }, "devDependencies": { + "@bitcoindevkit/bdk-wallet-web": "^0.2.0", "@jest/globals": "^30.0.5", - "@metamask/bitcoindevkit": "^0.1.13", "@metamask/key-tree": "^10.1.1", "@metamask/keyring-api": "^21.3.0", "@metamask/keyring-snap-sdk": "^7.1.1", diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json index 33f1320ec..868f37611 100644 --- a/packages/snap/snap.manifest.json +++ b/packages/snap/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snap-bitcoin-wallet.git" }, "source": { - "shasum": "vRba/rR8D/OA3+XJO4+chU8zDYgLkdA18wSnehkisn8=", + "shasum": "6mDIoXAmEvcQg3CeW31TZq6xa4hq8blIGWXJLGG4Zuc=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/snap/src/config.ts b/packages/snap/src/config.ts index 1022af748..b2d9bf7bb 100644 --- a/packages/snap/src/config.ts +++ b/packages/snap/src/config.ts @@ -1,6 +1,6 @@ /* eslint-disable no-restricted-globals */ -import type { AddressType } from '@metamask/bitcoindevkit'; +import type { AddressType } from '@bitcoindevkit/bdk-wallet-web'; import { LogLevel, type SnapConfig } from './entities'; diff --git a/packages/snap/src/entities/account.ts b/packages/snap/src/entities/account.ts index f7f30af65..196573a3e 100644 --- a/packages/snap/src/entities/account.ts +++ b/packages/snap/src/entities/account.ts @@ -14,7 +14,7 @@ import type { Amount, ScriptBuf, Address, -} from '@metamask/bitcoindevkit'; +} from '@bitcoindevkit/bdk-wallet-web'; import type { Inscription } from './meta-protocols'; import type { TransactionBuilder } from './transaction'; diff --git a/packages/snap/src/entities/chain.ts b/packages/snap/src/entities/chain.ts index 112f916eb..16128364d 100644 --- a/packages/snap/src/entities/chain.ts +++ b/packages/snap/src/entities/chain.ts @@ -2,7 +2,7 @@ import type { FeeEstimates, Network, Transaction, -} from '@metamask/bitcoindevkit'; +} from '@bitcoindevkit/bdk-wallet-web'; import type { BitcoinAccount } from './account'; diff --git a/packages/snap/src/entities/config.ts b/packages/snap/src/entities/config.ts index ea7e5d59d..cb4f585fc 100644 --- a/packages/snap/src/entities/config.ts +++ b/packages/snap/src/entities/config.ts @@ -1,4 +1,4 @@ -import type { AddressType, Network } from '@metamask/bitcoindevkit'; +import type { AddressType, Network } from '@bitcoindevkit/bdk-wallet-web'; import type { LogLevel } from './logger'; diff --git a/packages/snap/src/entities/confirmation.ts b/packages/snap/src/entities/confirmation.ts index f7f5836bd..b69f492ca 100644 --- a/packages/snap/src/entities/confirmation.ts +++ b/packages/snap/src/entities/confirmation.ts @@ -1,4 +1,4 @@ -import type { Network } from '@metamask/bitcoindevkit'; +import type { Network } from '@bitcoindevkit/bdk-wallet-web'; import type { BitcoinAccount } from './account'; diff --git a/packages/snap/src/entities/currency.ts b/packages/snap/src/entities/currency.ts index 9bf091a65..d3537d253 100644 --- a/packages/snap/src/entities/currency.ts +++ b/packages/snap/src/entities/currency.ts @@ -1,4 +1,4 @@ -import type { Network } from '@metamask/bitcoindevkit'; +import type { Network } from '@bitcoindevkit/bdk-wallet-web'; export enum CurrencyUnit { Bitcoin = 'BTC', diff --git a/packages/snap/src/entities/send-flow.ts b/packages/snap/src/entities/send-flow.ts index f8230c4bb..957d9ea77 100644 --- a/packages/snap/src/entities/send-flow.ts +++ b/packages/snap/src/entities/send-flow.ts @@ -1,4 +1,4 @@ -import type { Network } from '@metamask/bitcoindevkit'; +import type { Network } from '@bitcoindevkit/bdk-wallet-web'; import type { CurrencyRate } from '@metamask/snaps-sdk'; import type { CurrencyUnit } from './currency'; diff --git a/packages/snap/src/entities/snap.ts b/packages/snap/src/entities/snap.ts index 9d8e9f42d..2c254d859 100644 --- a/packages/snap/src/entities/snap.ts +++ b/packages/snap/src/entities/snap.ts @@ -1,4 +1,4 @@ -import type { WalletTx } from '@metamask/bitcoindevkit'; +import type { WalletTx } from '@bitcoindevkit/bdk-wallet-web'; import type { JsonSLIP10Node, SLIP10Node } from '@metamask/key-tree'; import type { ComponentOrElement, diff --git a/packages/snap/src/entities/transaction.ts b/packages/snap/src/entities/transaction.ts index e647523b0..5955b642e 100644 --- a/packages/snap/src/entities/transaction.ts +++ b/packages/snap/src/entities/transaction.ts @@ -1,4 +1,4 @@ -import type { Amount, Psbt, ScriptBuf } from '@metamask/bitcoindevkit'; +import type { Amount, Psbt, ScriptBuf } from '@bitcoindevkit/bdk-wallet-web'; /** * A Bitcoin transaction builder. diff --git a/packages/snap/src/handlers/AssetsHandler.ts b/packages/snap/src/handlers/AssetsHandler.ts index f95a4dc78..704abdae9 100644 --- a/packages/snap/src/handlers/AssetsHandler.ts +++ b/packages/snap/src/handlers/AssetsHandler.ts @@ -1,4 +1,4 @@ -import type { Network } from '@metamask/bitcoindevkit'; +import type { Network } from '@bitcoindevkit/bdk-wallet-web'; import { getCurrentUnixTimestamp } from '@metamask/keyring-snap-sdk'; import type { CaipAssetType, diff --git a/packages/snap/src/handlers/CronHandler.test.ts b/packages/snap/src/handlers/CronHandler.test.ts index d553baa1e..f722c2734 100644 --- a/packages/snap/src/handlers/CronHandler.test.ts +++ b/packages/snap/src/handlers/CronHandler.test.ts @@ -1,4 +1,4 @@ -import type { WalletTx } from '@metamask/bitcoindevkit'; +import type { WalletTx } from '@bitcoindevkit/bdk-wallet-web'; import { getSelectedAccounts } from '@metamask/keyring-snap-sdk'; import type { SnapsProvider, JsonRpcRequest } from '@metamask/snaps-sdk'; import { mock } from 'jest-mock-extended'; diff --git a/packages/snap/src/handlers/KeyringHandler.test.ts b/packages/snap/src/handlers/KeyringHandler.test.ts index b2f0047f5..431f30d43 100644 --- a/packages/snap/src/handlers/KeyringHandler.test.ts +++ b/packages/snap/src/handlers/KeyringHandler.test.ts @@ -7,8 +7,8 @@ import type { WalletTx, AddressType, ScriptBuf, -} from '@metamask/bitcoindevkit'; -import { Address } from '@metamask/bitcoindevkit'; +} from '@bitcoindevkit/bdk-wallet-web'; +import { Address } from '@bitcoindevkit/bdk-wallet-web'; import type { DiscoveredAccount, KeyringResponse, @@ -42,7 +42,7 @@ jest.mock('superstruct', () => ({ // TODO: enable when this is merged: https://github.com/rustwasm/wasm-bindgen/issues/1818 /* eslint-disable @typescript-eslint/naming-convention */ -jest.mock('@metamask/bitcoindevkit', () => { +jest.mock('@bitcoindevkit/bdk-wallet-web', () => { return { Address: { from_script: jest.fn(), diff --git a/packages/snap/src/handlers/KeyringHandler.ts b/packages/snap/src/handlers/KeyringHandler.ts index 14e2b2497..6f60959fa 100644 --- a/packages/snap/src/handlers/KeyringHandler.ts +++ b/packages/snap/src/handlers/KeyringHandler.ts @@ -1,4 +1,4 @@ -import type { AddressType } from '@metamask/bitcoindevkit'; +import type { AddressType } from '@bitcoindevkit/bdk-wallet-web'; import { BtcAccountType, BtcScope, diff --git a/packages/snap/src/handlers/KeyringRequestHandler.test.ts b/packages/snap/src/handlers/KeyringRequestHandler.test.ts index 5394e6889..6870705b4 100644 --- a/packages/snap/src/handlers/KeyringRequestHandler.test.ts +++ b/packages/snap/src/handlers/KeyringRequestHandler.test.ts @@ -1,4 +1,9 @@ -import type { Txid, Psbt, Amount, LocalOutput } from '@metamask/bitcoindevkit'; +import type { + Txid, + Psbt, + Amount, + LocalOutput, +} from '@bitcoindevkit/bdk-wallet-web'; import type { KeyringRequest } from '@metamask/keyring-api'; import { mock } from 'jest-mock-extended'; import { assert } from 'superstruct'; diff --git a/packages/snap/src/handlers/RpcHandler.test.ts b/packages/snap/src/handlers/RpcHandler.test.ts index 0360bc5af..5ba4ecfe6 100644 --- a/packages/snap/src/handlers/RpcHandler.test.ts +++ b/packages/snap/src/handlers/RpcHandler.test.ts @@ -1,5 +1,5 @@ -import { Psbt, Address, Amount } from '@metamask/bitcoindevkit'; -import type { Transaction, Txid } from '@metamask/bitcoindevkit'; +import { Psbt, Address, Amount } from '@bitcoindevkit/bdk-wallet-web'; +import type { Transaction, Txid } from '@bitcoindevkit/bdk-wallet-web'; import type { Transaction as KeyringTransaction } from '@metamask/keyring-api'; import { BtcScope, FeeType } from '@metamask/keyring-api'; import type { JsonRpcRequest } from '@metamask/snaps-sdk'; @@ -15,7 +15,7 @@ import { mapPsbtToTransaction } from './mappings'; const mockPsbt = mock(); // TODO: enable when this is merged: https://github.com/rustwasm/wasm-bindgen/issues/1818 /* eslint-disable @typescript-eslint/naming-convention */ -jest.mock('@metamask/bitcoindevkit', () => ({ +jest.mock('@bitcoindevkit/bdk-wallet-web', () => ({ Psbt: { from_string: jest.fn() }, Address: { from_string: jest.fn(), diff --git a/packages/snap/src/handlers/caip.ts b/packages/snap/src/handlers/caip.ts index 182f0654a..bb494665d 100644 --- a/packages/snap/src/handlers/caip.ts +++ b/packages/snap/src/handlers/caip.ts @@ -1,4 +1,4 @@ -import type { AddressType, Network } from '@metamask/bitcoindevkit'; +import type { AddressType, Network } from '@bitcoindevkit/bdk-wallet-web'; import { BtcAccountType, BtcScope } from '@metamask/keyring-api'; const reverseMapping = < diff --git a/packages/snap/src/handlers/icons.ts b/packages/snap/src/handlers/icons.ts index 636c5714e..0863f8432 100644 --- a/packages/snap/src/handlers/icons.ts +++ b/packages/snap/src/handlers/icons.ts @@ -1,4 +1,4 @@ -import type { Network } from '@metamask/bitcoindevkit'; +import type { Network } from '@bitcoindevkit/bdk-wallet-web'; export const networkToIcon: Record = { bitcoin: diff --git a/packages/snap/src/handlers/mappings.test.ts b/packages/snap/src/handlers/mappings.test.ts index c2dd3b8be..7ba447cf7 100644 --- a/packages/snap/src/handlers/mappings.test.ts +++ b/packages/snap/src/handlers/mappings.test.ts @@ -4,8 +4,8 @@ import type { ScriptBuf, Amount, Txid, -} from '@metamask/bitcoindevkit'; -import { Address } from '@metamask/bitcoindevkit'; +} from '@bitcoindevkit/bdk-wallet-web'; +import { Address } from '@bitcoindevkit/bdk-wallet-web'; import { TransactionStatus, FeeType } from '@metamask/keyring-api'; import { mock } from 'jest-mock-extended'; @@ -15,7 +15,7 @@ import { mapPsbtToTransaction } from './mappings'; // Mock the entire bitcoindevkit module /* eslint-disable @typescript-eslint/naming-convention */ -jest.mock('@metamask/bitcoindevkit', () => ({ +jest.mock('@bitcoindevkit/bdk-wallet-web', () => ({ Address: { from_script: jest.fn(), }, diff --git a/packages/snap/src/handlers/mappings.ts b/packages/snap/src/handlers/mappings.ts index 8eabe7a30..da62b83af 100644 --- a/packages/snap/src/handlers/mappings.ts +++ b/packages/snap/src/handlers/mappings.ts @@ -6,8 +6,8 @@ import type { Transaction, TxOut, WalletTx, -} from '@metamask/bitcoindevkit'; -import { Address } from '@metamask/bitcoindevkit'; +} from '@bitcoindevkit/bdk-wallet-web'; +import { Address } from '@bitcoindevkit/bdk-wallet-web'; import type { DiscoveredAccount, KeyringAccount, diff --git a/packages/snap/src/handlers/parsers.ts b/packages/snap/src/handlers/parsers.ts index 3b96a918a..97b01a4f0 100644 --- a/packages/snap/src/handlers/parsers.ts +++ b/packages/snap/src/handlers/parsers.ts @@ -1,4 +1,4 @@ -import { Psbt } from '@metamask/bitcoindevkit'; +import { Psbt } from '@bitcoindevkit/bdk-wallet-web'; import { FormatError } from '../entities'; diff --git a/packages/snap/src/handlers/validation.test.ts b/packages/snap/src/handlers/validation.test.ts index 5c7a6b7b8..a13086f76 100644 --- a/packages/snap/src/handlers/validation.test.ts +++ b/packages/snap/src/handlers/validation.test.ts @@ -1,7 +1,7 @@ import { parseRewardsMessage } from './validation'; /* eslint-disable @typescript-eslint/naming-convention */ -jest.mock('@metamask/bitcoindevkit', () => ({ +jest.mock('@bitcoindevkit/bdk-wallet-web', () => ({ Address: { from_string: jest.fn(), }, diff --git a/packages/snap/src/handlers/validation.ts b/packages/snap/src/handlers/validation.ts index ccd73a25c..e93e22edd 100644 --- a/packages/snap/src/handlers/validation.ts +++ b/packages/snap/src/handlers/validation.ts @@ -1,5 +1,5 @@ -import type { Network, AddressType } from '@metamask/bitcoindevkit'; -import { Address, Amount } from '@metamask/bitcoindevkit'; +import type { Network, AddressType } from '@bitcoindevkit/bdk-wallet-web'; +import { Address, Amount } from '@bitcoindevkit/bdk-wallet-web'; import { CaipAssetTypeStruct } from '@metamask/utils'; import type { Infer } from 'superstruct'; import { diff --git a/packages/snap/src/infra/BdkAccountAdapter.ts b/packages/snap/src/infra/BdkAccountAdapter.ts index a8c8a86da..6366dd8b5 100644 --- a/packages/snap/src/infra/BdkAccountAdapter.ts +++ b/packages/snap/src/infra/BdkAccountAdapter.ts @@ -15,7 +15,7 @@ import type { Amount, ScriptBuf, Address, -} from '@metamask/bitcoindevkit'; +} from '@bitcoindevkit/bdk-wallet-web'; import { FeeRate, UnconfirmedTx, @@ -23,7 +23,7 @@ import { Txid, Wallet, OutPoint, -} from '@metamask/bitcoindevkit'; +} from '@bitcoindevkit/bdk-wallet-web'; import { AccountCapability, diff --git a/packages/snap/src/infra/BdkTxBuilderAdapter.ts b/packages/snap/src/infra/BdkTxBuilderAdapter.ts index f03d46e3a..d63b44a52 100644 --- a/packages/snap/src/infra/BdkTxBuilderAdapter.ts +++ b/packages/snap/src/infra/BdkTxBuilderAdapter.ts @@ -3,7 +3,7 @@ import type { Psbt, ScriptBuf, TxBuilder, -} from '@metamask/bitcoindevkit'; +} from '@bitcoindevkit/bdk-wallet-web'; import { TxOrdering, OutPoint, @@ -11,7 +11,7 @@ import { Amount, FeeRate, Recipient, -} from '@metamask/bitcoindevkit'; +} from '@bitcoindevkit/bdk-wallet-web'; import { type CodifiedError, diff --git a/packages/snap/src/infra/EsploraClientAdapter.ts b/packages/snap/src/infra/EsploraClientAdapter.ts index 2207af2b8..56c3982f1 100644 --- a/packages/snap/src/infra/EsploraClientAdapter.ts +++ b/packages/snap/src/infra/EsploraClientAdapter.ts @@ -2,8 +2,8 @@ import type { FeeEstimates, Network, Transaction, -} from '@metamask/bitcoindevkit'; -import { EsploraClient } from '@metamask/bitcoindevkit'; +} from '@bitcoindevkit/bdk-wallet-web'; +import { EsploraClient } from '@bitcoindevkit/bdk-wallet-web'; import { type BitcoinAccount, diff --git a/packages/snap/src/infra/SnapClientAdapter.ts b/packages/snap/src/infra/SnapClientAdapter.ts index 3674432c6..b977ffd32 100644 --- a/packages/snap/src/infra/SnapClientAdapter.ts +++ b/packages/snap/src/infra/SnapClientAdapter.ts @@ -1,4 +1,4 @@ -import type { WalletTx } from '@metamask/bitcoindevkit'; +import type { WalletTx } from '@bitcoindevkit/bdk-wallet-web'; import type { JsonSLIP10Node } from '@metamask/key-tree'; import { SLIP10Node } from '@metamask/key-tree'; import { KeyringEvent } from '@metamask/keyring-api'; diff --git a/packages/snap/src/infra/jsx/components/AssetIcon.tsx b/packages/snap/src/infra/jsx/components/AssetIcon.tsx index d5ef52ab1..02749c568 100644 --- a/packages/snap/src/infra/jsx/components/AssetIcon.tsx +++ b/packages/snap/src/infra/jsx/components/AssetIcon.tsx @@ -1,4 +1,4 @@ -import type { Network } from '@metamask/bitcoindevkit'; +import type { Network } from '@bitcoindevkit/bdk-wallet-web'; import type { SnapComponent } from '@metamask/snaps-sdk/jsx'; import { Box, Image } from '@metamask/snaps-sdk/jsx'; diff --git a/packages/snap/src/infra/jsx/components/AssetIconInline.tsx b/packages/snap/src/infra/jsx/components/AssetIconInline.tsx index 5a5422786..b83cc9510 100644 --- a/packages/snap/src/infra/jsx/components/AssetIconInline.tsx +++ b/packages/snap/src/infra/jsx/components/AssetIconInline.tsx @@ -1,4 +1,4 @@ -import type { Network } from '@metamask/bitcoindevkit'; +import type { Network } from '@bitcoindevkit/bdk-wallet-web'; import type { SnapComponent } from '@metamask/snaps-sdk/jsx'; import { Image } from '@metamask/snaps-sdk/jsx'; diff --git a/packages/snap/src/infra/jsx/format.ts b/packages/snap/src/infra/jsx/format.ts index 12ca81015..a58f71e90 100644 --- a/packages/snap/src/infra/jsx/format.ts +++ b/packages/snap/src/infra/jsx/format.ts @@ -1,5 +1,5 @@ -import type { Network } from '@metamask/bitcoindevkit'; -import { Amount, BdkErrorCode } from '@metamask/bitcoindevkit'; +import type { Network } from '@bitcoindevkit/bdk-wallet-web'; +import { Amount, BdkErrorCode } from '@bitcoindevkit/bdk-wallet-web'; import type { CaipAccountId, CurrencyRate } from '@metamask/snaps-sdk'; import type { CurrencyUnit, Messages } from '../../entities'; diff --git a/packages/snap/src/infra/jsx/send-flow/ReviewTransactionView.tsx b/packages/snap/src/infra/jsx/send-flow/ReviewTransactionView.tsx index 793d9fcb7..510940ada 100644 --- a/packages/snap/src/infra/jsx/send-flow/ReviewTransactionView.tsx +++ b/packages/snap/src/infra/jsx/send-flow/ReviewTransactionView.tsx @@ -1,4 +1,4 @@ -import { Psbt } from '@metamask/bitcoindevkit'; +import { Psbt } from '@bitcoindevkit/bdk-wallet-web'; import type { SnapComponent } from '@metamask/snaps-sdk/jsx'; import { Box, diff --git a/packages/snap/src/infra/jsx/unified-send-flow/UnifiedSendFormView.tsx b/packages/snap/src/infra/jsx/unified-send-flow/UnifiedSendFormView.tsx index cc36b6df9..93b3b8177 100644 --- a/packages/snap/src/infra/jsx/unified-send-flow/UnifiedSendFormView.tsx +++ b/packages/snap/src/infra/jsx/unified-send-flow/UnifiedSendFormView.tsx @@ -1,4 +1,4 @@ -import { Psbt } from '@metamask/bitcoindevkit'; +import { Psbt } from '@bitcoindevkit/bdk-wallet-web'; import type { SnapComponent } from '@metamask/snaps-sdk/jsx'; import { Address, diff --git a/packages/snap/src/store/BdkAccountRepository.test.ts b/packages/snap/src/store/BdkAccountRepository.test.ts index eb1317705..3f12cb774 100644 --- a/packages/snap/src/store/BdkAccountRepository.test.ts +++ b/packages/snap/src/store/BdkAccountRepository.test.ts @@ -1,12 +1,12 @@ // TODO: enable when this is merged: https://github.com/rustwasm/wasm-bindgen/issues/1818 /* eslint-disable camelcase */ -import type { DescriptorPair } from '@metamask/bitcoindevkit'; +import type { DescriptorPair } from '@bitcoindevkit/bdk-wallet-web'; import { ChangeSet, xpriv_to_descriptor, xpub_to_descriptor, -} from '@metamask/bitcoindevkit'; +} from '@bitcoindevkit/bdk-wallet-web'; import type { SLIP10Node } from '@metamask/key-tree'; import { mock } from 'jest-mock-extended'; @@ -21,7 +21,7 @@ import { BdkAccountRepository } from './BdkAccountRepository'; // TODO: enable when this is merged: https://github.com/rustwasm/wasm-bindgen/issues/1818 /* eslint-disable @typescript-eslint/naming-convention */ -jest.mock('@metamask/bitcoindevkit', () => { +jest.mock('@bitcoindevkit/bdk-wallet-web', () => { return { ChangeSet: { from_json: jest.fn(), diff --git a/packages/snap/src/store/BdkAccountRepository.ts b/packages/snap/src/store/BdkAccountRepository.ts index 37b5d4442..0f239ecb7 100644 --- a/packages/snap/src/store/BdkAccountRepository.ts +++ b/packages/snap/src/store/BdkAccountRepository.ts @@ -1,13 +1,13 @@ // TODO: enable when this is merged: https://github.com/rustwasm/wasm-bindgen/issues/1818 /* eslint-disable camelcase */ -import type { AddressType, Network } from '@metamask/bitcoindevkit'; +import type { AddressType, Network } from '@bitcoindevkit/bdk-wallet-web'; import { ChangeSet, slip10_to_extended, xpriv_to_descriptor, xpub_to_descriptor, -} from '@metamask/bitcoindevkit'; +} from '@bitcoindevkit/bdk-wallet-web'; import { v4 } from 'uuid'; import { diff --git a/packages/snap/src/store/JSXConfirmationRepository.test.tsx b/packages/snap/src/store/JSXConfirmationRepository.test.tsx index c1e084b10..eb2231042 100644 --- a/packages/snap/src/store/JSXConfirmationRepository.test.tsx +++ b/packages/snap/src/store/JSXConfirmationRepository.test.tsx @@ -1,4 +1,4 @@ -import type { Address } from '@metamask/bitcoindevkit'; +import type { Address } from '@bitcoindevkit/bdk-wallet-web'; import type { GetPreferencesResult } from '@metamask/snaps-sdk'; import { mock } from 'jest-mock-extended'; diff --git a/packages/snap/src/use-cases/AccountUseCases.test.ts b/packages/snap/src/use-cases/AccountUseCases.test.ts index f5c8ae9e4..f40737a10 100644 --- a/packages/snap/src/use-cases/AccountUseCases.test.ts +++ b/packages/snap/src/use-cases/AccountUseCases.test.ts @@ -10,7 +10,7 @@ import type { Network, Psbt, Address, -} from '@metamask/bitcoindevkit'; +} from '@bitcoindevkit/bdk-wallet-web'; import type { JsonSLIP10Node } from '@metamask/key-tree'; import { mock } from 'jest-mock-extended'; diff --git a/packages/snap/src/use-cases/AccountUseCases.ts b/packages/snap/src/use-cases/AccountUseCases.ts index 11d75b91a..f8d5c4508 100644 --- a/packages/snap/src/use-cases/AccountUseCases.ts +++ b/packages/snap/src/use-cases/AccountUseCases.ts @@ -6,7 +6,7 @@ import type { Transaction, Txid, WalletTx, -} from '@metamask/bitcoindevkit'; +} from '@bitcoindevkit/bdk-wallet-web'; import { getCurrentUnixTimestamp } from '@metamask/keyring-snap-sdk'; import { Signer } from 'bip322-js'; import { encode } from 'wif'; diff --git a/packages/snap/src/use-cases/SendFlowUseCases.test.ts b/packages/snap/src/use-cases/SendFlowUseCases.test.ts index 51d261a61..866508e8c 100644 --- a/packages/snap/src/use-cases/SendFlowUseCases.test.ts +++ b/packages/snap/src/use-cases/SendFlowUseCases.test.ts @@ -2,8 +2,8 @@ import type { FeeEstimates, Network, Transaction, -} from '@metamask/bitcoindevkit'; -import { Psbt, Address, Amount } from '@metamask/bitcoindevkit'; +} from '@bitcoindevkit/bdk-wallet-web'; +import { Psbt, Address, Amount } from '@bitcoindevkit/bdk-wallet-web'; import type { GetPreferencesResult } from '@metamask/snaps-sdk'; import { mock } from 'jest-mock-extended'; @@ -32,7 +32,7 @@ import type { AccountUseCases } from './AccountUseCases'; // TODO: enable when this is merged: https://github.com/rustwasm/wasm-bindgen/issues/1818 /* eslint-disable @typescript-eslint/naming-convention */ -jest.mock('@metamask/bitcoindevkit', () => { +jest.mock('@bitcoindevkit/bdk-wallet-web', () => { return { Address: { from_string: jest.fn(), diff --git a/packages/snap/src/use-cases/SendFlowUseCases.ts b/packages/snap/src/use-cases/SendFlowUseCases.ts index 843c3f30b..e5eb7ce9f 100644 --- a/packages/snap/src/use-cases/SendFlowUseCases.ts +++ b/packages/snap/src/use-cases/SendFlowUseCases.ts @@ -4,7 +4,7 @@ import { Amount, Psbt, type Transaction, -} from '@metamask/bitcoindevkit'; +} from '@bitcoindevkit/bdk-wallet-web'; import { getCurrentUnixTimestamp } from '@metamask/keyring-snap-sdk'; import type { CurrencyRate, InputChangeEvent } from '@metamask/snaps-sdk'; diff --git a/yarn.lock b/yarn.lock index a002d088a..b3f069607 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1579,6 +1579,13 @@ __metadata: languageName: node linkType: hard +"@bitcoindevkit/bdk-wallet-web@npm:^0.2.0": + version: 0.2.0 + resolution: "@bitcoindevkit/bdk-wallet-web@npm:0.2.0" + checksum: 10/aa9cf729f1b8ac5da41ff4e6f7fa384f459399fa8d827c2053dddc173ec7131b5daeabfc03af22b881d57fbadb36d31962480e61357dba3cb29f8908a9867a72 + languageName: node + linkType: hard + "@bitcoinerlab/secp256k1@npm:^1.2.0": version: 1.2.0 resolution: "@bitcoinerlab/secp256k1@npm:1.2.0" @@ -2885,8 +2892,8 @@ __metadata: version: 0.0.0-use.local resolution: "@metamask/bitcoin-wallet-snap@workspace:packages/snap" dependencies: + "@bitcoindevkit/bdk-wallet-web": "npm:^0.2.0" "@jest/globals": "npm:^30.0.5" - "@metamask/bitcoindevkit": "npm:^0.1.13" "@metamask/key-tree": "npm:^10.1.1" "@metamask/keyring-api": "npm:^21.3.0" "@metamask/keyring-snap-sdk": "npm:^7.1.1" @@ -2933,13 +2940,6 @@ __metadata: languageName: unknown linkType: soft -"@metamask/bitcoindevkit@npm:^0.1.13": - version: 0.1.13 - resolution: "@metamask/bitcoindevkit@npm:0.1.13" - checksum: 10/650d140df7cf4e86af0102cdfade71d3c56a28999a0f477108018c6240110d9f9b19b5c3582b761c806bfcef9763b4b4b4089c0bcd16f4f41d856fbc38ae6e21 - languageName: node - linkType: hard - "@metamask/controller-utils@npm:^11.16.0, @metamask/controller-utils@npm:^11.17.0": version: 11.18.0 resolution: "@metamask/controller-utils@npm:11.18.0" From 34353f0d0e0e93efe15d146250d4d8efd980c3f6 Mon Sep 17 00:00:00 2001 From: Frederic HENG Date: Tue, 3 Feb 2026 18:49:12 +0100 Subject: [PATCH 2/2] chore: update snap.manifest.json --- packages/snap/snap.manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json index 868f37611..335aa8ec9 100644 --- a/packages/snap/snap.manifest.json +++ b/packages/snap/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snap-bitcoin-wallet.git" }, "source": { - "shasum": "6mDIoXAmEvcQg3CeW31TZq6xa4hq8blIGWXJLGG4Zuc=", + "shasum": "GZ/lj1EdHkXvtnKCFuiHc3lnb5bL9zCOpyMafwnFuZ8=", "location": { "npm": { "filePath": "dist/bundle.js",