Skip to content

fix(master-express): forward walletPubs in consolidateUnspents and accelerate #200

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.

Sign up for GitHub

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

Open
bitgo-ai-agent-dev wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(master-express): forward walletPubs in consolidateUnspents and accelerate #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4028d79
fix(mbe): forward walletPubs in consolidateUnspents and accelerate
pranavjain97 May 7, 2026
8935385
test(mbe): add keychain nocks for walletPubs fetch in handler tests
pranavjain97 May 7, 2026
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
190 changes: 190 additions & 0 deletions src/__tests__/api/master/accelerate.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ describe('POST /api/v1/:coin/advancedwallet/:walletId/accelerate', () => {
type: 'independent',
};

const mockBitgoKeychain = {
id: 'bitgo-key-id',
pub: 'xpub661MyMwAqRbcHtYNxRNuEtDFmPMRzBVPDfBXNu2RUBVFNz8MnWQgkrMZCNB',
type: 'bitgo',
};

before(() => {
nock.disableNetConnect();
nock.enableNetConnect('127.0.0.1');
Expand Down Expand Up @@ -68,11 +74,26 @@ describe('POST /api/v1/:coin/advancedwallet/:walletId/accelerate', () => {
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockWalletData);

// Signing keychain fetched by getWalletAndSigningKeychain
const keychainGetNock = nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/user-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockUserKeychain);

// All 3 keychains fetched for walletPubs
nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/user-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockUserKeychain);
nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/backup-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockBackupKeychain);
nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/bitgo-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockBitgoKeychain);

const accelerateTransactionStub = sinon
.stub(Wallet.prototype, 'accelerateTransaction')
.resolves({
Expand Down Expand Up @@ -117,11 +138,26 @@ describe('POST /api/v1/:coin/advancedwallet/:walletId/accelerate', () => {
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockWalletData);

// Signing keychain fetched by getWalletAndSigningKeychain
const keychainGetNock = nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/backup-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockBackupKeychain);

// All 3 keychains fetched for walletPubs
nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/user-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockUserKeychain);
nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/backup-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockBackupKeychain);
nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/bitgo-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockBitgoKeychain);

const accelerateTransactionStub = sinon
.stub(Wallet.prototype, 'accelerateTransaction')
.resolves({
Expand Down Expand Up @@ -157,11 +193,26 @@ describe('POST /api/v1/:coin/advancedwallet/:walletId/accelerate', () => {
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockWalletData);

// Signing keychain fetched by getWalletAndSigningKeychain
const keychainGetNock = nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/user-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockUserKeychain);

// All 3 keychains fetched for walletPubs
nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/user-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockUserKeychain);
nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/backup-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockBackupKeychain);
nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/bitgo-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockBitgoKeychain);

const accelerateTransactionStub = sinon
.stub(Wallet.prototype, 'accelerateTransaction')
.resolves({
Expand Down Expand Up @@ -324,11 +375,26 @@ describe('POST /api/v1/:coin/advancedwallet/:walletId/accelerate', () => {
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockWalletData);

// Signing keychain fetched by getWalletAndSigningKeychain
const keychainGetNock = nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/user-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockUserKeychain);

// All 3 keychains fetched for walletPubs
nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/user-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockUserKeychain);
nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/backup-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockBackupKeychain);
nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/bitgo-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockBitgoKeychain);

const accelerateTransactionStub = sinon
.stub(Wallet.prototype, 'accelerateTransaction')
.rejects(new Error('Insufficient funds for acceleration'));
Expand Down Expand Up @@ -408,4 +474,128 @@ describe('POST /api/v1/:coin/advancedwallet/:walletId/accelerate', () => {
response.body.should.have.property('error', 'Internal Server Error');
response.body.should.have.property('details');
});

it('should pass walletPubs (all 3 xpubs) to AWM for UTXO signing', async () => {
nock(bitgoApiUrl)
.get(`/api/v2/${coin}/wallet/${walletId}`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockWalletData);

// Signing keychain (user) — fetched once by getWalletAndSigningKeychain
nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/user-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockUserKeychain);

// All 3 keychains fetched for walletPubs
nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/user-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockUserKeychain);

nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/backup-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockBackupKeychain);

nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/bitgo-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockBitgoKeychain);

let capturedSignBody: any;
const awmSignNock = nock(advancedWalletManagerUrl)
.post(`/api/${coin}/multisig/sign`, (body) => {
capturedSignBody = body;
return true;
})
.reply(200, {
halfSigned: { txHex: 'signed-tx-hex' },
source: 'user',
pub: mockUserKeychain.pub,
});

// Stub accelerateTransaction to call customSigningFunction so the AWM request is made
sinon.stub(Wallet.prototype, 'accelerateTransaction').callsFake(async (params: any) => {
await params.customSigningFunction({ txPrebuild: { txHex: 'prebuilt-tx' } });
return { txid: 'accelerated-tx-id', tx: '0100000001abcdef...', status: 'signed' };
});

const response = await agent
.post(`/api/v1/${coin}/advancedwallet/${walletId}/accelerate`)
.set('Authorization', `Bearer ${accessToken}`)
.send({
pubkey: mockUserKeychain.pub,
source: 'user',
cpfpTxIds: ['b8a828b98dbf32d9fd1875cbace9640ceb8c82626716b4a64203fdc79bb46d26'],
cpfpFeeRate: 50,
});

response.status.should.equal(200);
awmSignNock.done();
capturedSignBody.should.have.property('walletPubs');
capturedSignBody.walletPubs.should.deepEqual([
mockUserKeychain.pub,
mockBackupKeychain.pub,
mockBitgoKeychain.pub,
]);
});

it('should omit walletPubs from AWM request when any keychain is missing a pub', async () => {
nock(bitgoApiUrl)
.get(`/api/v2/${coin}/wallet/${walletId}`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockWalletData);

nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/user-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockUserKeychain);

nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/user-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockUserKeychain);

nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/backup-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, { id: 'backup-key-id' }); // no pub

nock(bitgoApiUrl)
.get(`/api/v2/${coin}/key/bitgo-key-id`)
.matchHeader('authorization', `Bearer ${accessToken}`)
.reply(200, mockBitgoKeychain);

let capturedSignBody: any;
const awmSignNock = nock(advancedWalletManagerUrl)
.post(`/api/${coin}/multisig/sign`, (body) => {
capturedSignBody = body;
return true;
})
.reply(200, {
halfSigned: { txHex: 'signed-tx-hex' },
source: 'user',
pub: mockUserKeychain.pub,
});

sinon.stub(Wallet.prototype, 'accelerateTransaction').callsFake(async (params: any) => {
await params.customSigningFunction({ txPrebuild: { txHex: 'prebuilt-tx' } });
return { txid: 'accelerated-tx-id', tx: '0100000001abcdef...', status: 'signed' };
});

const response = await agent
.post(`/api/v1/${coin}/advancedwallet/${walletId}/accelerate`)
.set('Authorization', `Bearer ${accessToken}`)
.send({
pubkey: mockUserKeychain.pub,
source: 'user',
cpfpTxIds: ['b8a828b98dbf32d9fd1875cbace9640ceb8c82626716b4a64203fdc79bb46d26'],
cpfpFeeRate: 50,
});

response.status.should.equal(200);
awmSignNock.done();
capturedSignBody.should.not.have.property('walletPubs');
});
});
Loading
Loading