Skip to content
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
41 changes: 41 additions & 0 deletions modules/bitgo/test/v2/unit/wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import * as sinon from 'sinon';
import '../lib/asserts';
import nock = require('nock');
import * as _ from 'lodash';
import * as assert from 'assert';

import {
BaseTssUtils,
Expand Down Expand Up @@ -2543,6 +2544,46 @@ describe('V2 Wallet:', function () {
sandbox.verifyAndRestore();
});

it('should preserve tss txPrebuild buildParams when presign replaces the txPrebuild', async function () {
const recipients = [
{
address: '6DadkZcx9JZgeQUDbHh12cmqCpaqehmVxv6sGy49jrah',
amount: '1000',
},
];
const buildParams = {
recipients,
type: 'transfer',
};

sandbox.stub(tsol, 'presignTransaction').callsFake(async (presignParams) => {
return {
...presignParams,
txPrebuild: {
txRequestId: 'id',
txHex: 'refreshed-tx-hex',
},
};
});
const signTxRequest = sandbox.stub(TssUtils.prototype, 'signTxRequest').resolves(txRequest);

await tssSolWallet.signTransaction({
txPrebuild: {
txRequestId: 'id',
txHex: 'original-tx-hex',
buildParams,
},
prv: 'user-prv',
});

signTxRequest.should.have.been.calledOnce();
const firstSignTxRequestCall = signTxRequest.firstCall;
assert.ok(firstSignTxRequestCall);
const signTxRequestParams = firstSignTxRequestCall.args[0];
assert.ok(signTxRequestParams);
should(signTxRequestParams.txParams).deepEqual(buildParams);
});

describe('preBuildAndSignTransaction', async function () {
const params = {
walletPassphrase: 'passphrase12345',
Expand Down
13 changes: 13 additions & 0 deletions modules/sdk-core/src/bitgo/wallet/wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2235,6 +2235,19 @@ export class Wallet implements IWallet {
tssUtils: this.tssUtils,
});

if (
this.multisigType() === 'tss' &&
this.multisigTypeVersion() === 'MPCv2' &&
this.baseCoin.getMPCAlgorithm() === 'eddsa' &&
typeof params.txPrebuild === 'object' &&
typeof presign.txPrebuild === 'object' &&
params.txPrebuild.buildParams &&
!presign.txPrebuild.buildParams
) {
// Sol presign hook refreshes txPrebuild, but buildParams is SDK-local intent metadata.
presign.txPrebuild.buildParams = params.txPrebuild.buildParams;
}

if (this.multisigType() === 'tss') {
return this.signTransactionTss({
...presign,
Expand Down
Loading