Skip to content

feat: support bitcoin #15263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions app/core/SnapKeyring/MultichainWalletSnapClient.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import Engine from '../Engine';
import { Sender } from '@metamask/keyring-snap-client';
import { SnapKeyring } from '@metamask/eth-snap-keyring';
import { BtcScope, SolScope } from '@metamask/keyring-api';
import { BITCOIN_WALLET_SNAP_ID } from './BitcoinWalletSnap';

jest.mock('../Engine', () => ({
controllerMessenger: {
Expand Down Expand Up @@ -292,6 +293,33 @@ describe('Wallet Client Implementations', () => {
const bitcoinClient = new BitcoinWalletSnapClient(mockSnapKeyringOptions);
expect(bitcoinClient.getScope()).toEqual(BtcScope.Mainnet);
});

it('adds synchronize parameter to createAccount', async () => {
const mockOptions = {
scope: BtcScope.Mainnet,
accountNameSuggestion: 'Bitcoin Account 1',
entropySource: 'test-entropy',
};

const mockKeyring = {
createAccount: jest.fn(),
};

(Engine.controllerMessenger.call as jest.Mock).mockImplementationOnce(
async (_, __, callback) => {
await callback({ keyring: mockKeyring });
},
);

const bitcoinClient = new BitcoinWalletSnapClient(mockSnapKeyringOptions);
await bitcoinClient.createAccount(mockOptions);

expect(mockKeyring.createAccount).toHaveBeenCalledWith(
BITCOIN_WALLET_SNAP_ID,
{ ...mockOptions, synchronize: true },
mockSnapKeyringOptions,
);
});
});

describe('SolanaWalletSnapClient', () => {
Expand Down
11 changes: 11 additions & 0 deletions app/core/SnapKeyring/MultichainWalletSnapClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export const WALLET_SNAP_MAP = {

export interface MultichainWalletSnapOptions {
scope: CaipChainId;
synchronize?: boolean;
///: BEGIN:ONLY_INCLUDE_IF(multi-srp)
entropySource?: string;
accountNameSuggestion?: string;
Expand Down Expand Up @@ -253,6 +254,16 @@ export class BitcoinWalletSnapClient extends MultichainWalletSnapClient {
protected getSnapSender(): Sender {
return new BitcoinWalletSnapSender();
}

async createAccount(
options: MultichainWalletSnapOptions,
snapKeyringOptions?: SnapKeyringOptions,
) {
return super.createAccount(
{ ...options, synchronize: true },
snapKeyringOptions,
);
}
}

export class SolanaWalletSnapClient extends MultichainWalletSnapClient {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"@metamask/approval-controller": "^7.1.3",
"@metamask/assets-controllers": "^61.0.0",
"@metamask/base-controller": "^8.0.0",
"@metamask/bitcoin-wallet-snap": "^0.9.0",
"@metamask/bitcoin-wallet-snap": "^0.12.1",
"@metamask/bridge-controller": "^21.0.0",
"@metamask/bridge-status-controller": "^18.0.0",
"@metamask/chain-agnostic-permission": "^0.3.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4765,10 +4765,10 @@
"@metamask/utils" "^11.2.0"
immer "^9.0.6"

"@metamask/bitcoin-wallet-snap@^0.9.0":
version "0.9.0"
resolved "https://registry.yarnpkg.com/@metamask/bitcoin-wallet-snap/-/bitcoin-wallet-snap-0.9.0.tgz#47014c75c1e1ed84fef57177901f458fd2b6510a"
integrity sha512-983twhfOfSCQljT+eV8JLcV0bqGVMObXnEy8TOFAkwwRW2I1ZsVRAfylbGiSwxlhxLntcpLqVu0Sj29xNyA06Q==
"@metamask/bitcoin-wallet-snap@^0.12.1":
version "0.12.1"
resolved "https://registry.yarnpkg.com/@metamask/bitcoin-wallet-snap/-/bitcoin-wallet-snap-0.12.1.tgz#2b60ac613992e97302a9898b3d4030395b2b2123"
integrity sha512-8gsN7a5OyRMg6c0jw0tDrqePHjFv9uHi36eL2PdTMUYU9J3dL/t9cOWe/3RPSwu7tw/tMNXyM4mzwZvq7Kxs2Q==

"@metamask/bridge-controller@^21.0.0":
version "21.0.0"
Expand Down
Loading