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
70 changes: 69 additions & 1 deletion modules/sdk-coin-bsc/test/unit/bsc.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import 'should';

import * as sinon from 'sinon';
import { TestBitGo, TestBitGoAPI } from '@bitgo/sdk-test';
import { BitGoAPI } from '@bitgo/sdk-api';
import { TransactionType, Wallet } from '@bitgo/sdk-core';
import { EcdsaUtils, IWallet, TransactionType, TssSignTxRequestParamsWithPrv, Wallet } from '@bitgo/sdk-core';
import { FeeMarketEIP1559Transaction, Transaction as LegacyTransaction } from '@ethereumjs/tx';
import { RLP } from '@ethereumjs/rlp';
import { bufArrToArr } from 'ethereumjs-util';
Expand Down Expand Up @@ -283,6 +284,73 @@ describe('Native BNB', function () {
/EIP-1559 not enabled on Common/
);
});

it('MPCv1 signRequestBase rejects a tampered signableHex end-to-end (WCI-2239)', async function () {
const coin = bitgo.coin('tbsc') as Tbsc;
sinon.stub(coin, 'verifyTransaction').resolves(undefined);
const wallet = new Wallet(bitgo, coin, { coinSpecific: { baseAddress: recipientAddress } });
const utils = new EcdsaUtils(bitgo, coin, wallet as unknown as IWallet);
const benignSerializedTxHex = await buildSerializedTxHex(recipientAddress);
const tamperedSignableHex = deriveSignableHex(await buildSerializedTxHex(wrongAddress), coin);
const txRequest = {
txRequestId: 'wci-2239-test',
apiVersion: 'full',
walletId: wallet.id(),
transactions: [
{
unsignedTx: {
derivationPath: 'm/0',
serializedTxHex: benignSerializedTxHex,
signableHex: tamperedSignableHex,
},
},
],
};
const params = {
txRequest,
txParams: { recipients: [{ address: recipientAddress, amount: transferAmount }] },
prv: JSON.stringify({ pShare: { i: 1 }, backupNShare: 'fake' }),
reqId: { inc: sinon.stub(), toString: () => 'req' } as any,
} as unknown as TssSignTxRequestParamsWithPrv;
await utils
.signTxRequest(params)
.should.be.rejectedWith('signableHex is inconsistent with serializedTxHex: possible server tampering');
});

it('MPCv1 signRequestBase passes a consistent signableHex end-to-end (WCI-2239)', async function () {
const coin = bitgo.coin('tbsc') as Tbsc;
sinon.stub(coin, 'verifyTransaction').resolves(undefined);
const wallet = new Wallet(bitgo, coin, { coinSpecific: { baseAddress: recipientAddress } });
const utils = new EcdsaUtils(bitgo, coin, wallet as unknown as IWallet);
const benignSerializedTxHex = await buildSerializedTxHex(recipientAddress);
const signableHex = deriveSignableHex(benignSerializedTxHex, coin);
sinon.stub(utils, 'getOfflineSignerPaillierModulus').throws(new Error('SENTINEL_PAST_CONSISTENCY'));
const txRequest = {
txRequestId: 'wci-2239-test',
apiVersion: 'full',
walletId: wallet.id(),
transactions: [
{
unsignedTx: {
derivationPath: 'm/0',
serializedTxHex: benignSerializedTxHex,
signableHex,
},
},
],
};
const params = {
txRequest,
txParams: { recipients: [{ address: recipientAddress, amount: transferAmount }] },
prv: JSON.stringify({ pShare: { i: 1 }, backupNShare: 'fake' }),
reqId: { inc: sinon.stub(), toString: () => 'req' } as any,
} as unknown as TssSignTxRequestParamsWithPrv;
await utils.signTxRequest(params).should.be.rejectedWith(/SENTINEL_PAST_CONSISTENCY/);
});

after(function () {
sinon.restore();
});
});
});
});
4 changes: 4 additions & 0 deletions modules/sdk-core/src/bitgo/utils/tss/ecdsa/ecdsa.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ import { BaseEcdsaUtils } from './base';
import { EncryptionVersion, IRequestTracer } from '../../../../api';
import { resolveEffectiveTxParams } from '../recipientUtils';
import { shouldVerifyWithSerializedTxHex } from '../serializedTxHexVerify';
import { isCoinWithSignableConsistency } from '../signableConsistency';

const encryptNShare = ECDSAMethods.encryptNShare;

Expand Down Expand Up @@ -1075,6 +1076,9 @@ export class EcdsaUtils extends BaseEcdsaUtils {
wallet: this.wallet,
walletType: this.wallet.multisigType(),
});
if (shouldVerifyWithSerializedTxHex(this.baseCoin) && isCoinWithSignableConsistency(this.baseCoin)) {
this.baseCoin.assertSignableConsistency(unsignedTx.serializedTxHex, unsignedTx.signableHex);
}
} else {
await this.baseCoin.verifyTransaction({
txPrebuild: { txHex: unsignedTx.signableHex },
Expand Down
133 changes: 133 additions & 0 deletions modules/sdk-core/test/unit/bitgo/utils/tss/ecdsa/ecdsa.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
import * as assert from 'assert';
import * as sinon from 'sinon';
import { CoinFeature } from '@bitgo/statics';
import {
BitGoBase,
EcdsaUtils,
IBaseCoin,
IRequestTracer,
IWallet,
TssSignTxRequestParamsWithPrv,
TxRequest,
} from '../../../../../../src';
import { InvalidTransactionError } from '../../../../../../src/bitgo/errors';

/**
* Regression tests for WCI-2239: the ECDSA MPCv1 signing path verified
* serializedTxHex and signed signableHex without binding the two fields for
* TSS_VERIFY_USE_SERIALIZED_TX_HEX coins (BSC/XDC). signRequestBase must call
* baseCoin.assertSignableConsistency(serializedTxHex, signableHex) after
* verifyTransaction, matching the MPCv2 path.
*/

const serializedTxHex = 'f86c808504a817c80082520894' + '00'.repeat(20) + '80808080';
const signableHex = 'f86c808504a817c80082520894' + '11'.repeat(20) + '80808080';

const unsignedTx = {
derivationPath: 'm/0',
serializedTxHex,
signableHex,
};

const txRequest = {
txRequestId: 'wci-2239-test',
apiVersion: 'full',
walletId: '62fe536a6b4cf70007acb48c0e7bb0b0',
transactions: [
{
unsignedTx,
},
],
} as unknown as TxRequest;

const params: TssSignTxRequestParamsWithPrv = {
txRequest,
txParams: { recipients: [{ address: '0x' + '00'.repeat(20), amount: '1000' }] },
prv: JSON.stringify({ pShare: { i: 1 }, backupNShare: 'fake' }),
reqId: { inc: sinon.stub(), toString: () => 'req' } as unknown as IRequestTracer,
};

function makeUtils(mockCoin: unknown): EcdsaUtils {
const mockBg = {
getEnv: sinon.stub().returns('test'),
setRequestTracer: sinon.stub(),
} as unknown as BitGoBase;
const mockWallet = {
id: sinon.stub().returns('62fe536a6b4cf70007acb48c0e7bb0b0'),
multisigType: sinon.stub().returns('tss'),
coinSpecific: sinon.stub().returns({}),
} as unknown as IWallet;
return new EcdsaUtils(mockBg, mockCoin as IBaseCoin, mockWallet);
}

describe('EcdsaUtils.signRequestBase - signableHex consistency (WCI-2239)', function () {
afterEach(function () {
sinon.restore();
});

it('calls assertSignableConsistency with (serializedTxHex, signableHex) for TSS_VERIFY_USE_SERIALIZED_TX_HEX coins', async function () {
const consistencySpy = sinon.spy();
const mockCoin = {
getConfig: sinon.stub().returns({ features: [CoinFeature.TSS_VERIFY_USE_SERIALIZED_TX_HEX] }),
verifyTransaction: sinon.stub().resolves(),
assertSignableConsistency: consistencySpy,
getChain: sinon.stub().returns('tbsc'),
};
const utils = makeUtils(mockCoin);
sinon.stub(utils, 'getOfflineSignerPaillierModulus').throws(new Error('SENTINEL_PAST_CONSISTENCY'));

await assert.rejects(utils.signTxRequest(params), /SENTINEL_PAST_CONSISTENCY/);

assert.strictEqual(consistencySpy.callCount, 1);
assert.deepStrictEqual(consistencySpy.firstCall.args, [unsignedTx.serializedTxHex, unsignedTx.signableHex]);
});

it('aborts before any share production when assertSignableConsistency throws', async function () {
const mockCoin = {
getConfig: sinon.stub().returns({ features: [CoinFeature.TSS_VERIFY_USE_SERIALIZED_TX_HEX] }),
verifyTransaction: sinon.stub().resolves(),
assertSignableConsistency: sinon
.stub()
.throws(
new InvalidTransactionError('signableHex is inconsistent with serializedTxHex: possible server tampering')
),
getChain: sinon.stub().returns('tbsc'),
};
const utils = makeUtils(mockCoin);
const paillierSpy = sinon.spy(utils, 'getOfflineSignerPaillierModulus');

await assert.rejects(utils.signTxRequest(params), /possible server tampering/);

assert.strictEqual(paillierSpy.callCount, 0);
});

it('skips the check for coins without the TSS_VERIFY_USE_SERIALIZED_TX_HEX feature', async function () {
const consistencySpy = sinon.spy();
const verifyTransactionStub = sinon.stub().resolves();
const mockCoin = {
getConfig: sinon.stub().returns({ family: 'eth' }),
verifyTransaction: verifyTransactionStub,
assertSignableConsistency: consistencySpy,
getChain: sinon.stub().returns('teth'),
};
const utils = makeUtils(mockCoin);
sinon.stub(utils, 'getOfflineSignerPaillierModulus').throws(new Error('SENTINEL_PAST_CONSISTENCY'));

await assert.rejects(utils.signTxRequest(params), /SENTINEL_PAST_CONSISTENCY/);

assert.strictEqual(consistencySpy.callCount, 0);
assert.strictEqual(verifyTransactionStub.firstCall.args[0].txPrebuild.txHex, signableHex);
});

it('does not crash for flag coins without assertSignableConsistency (ICP shape)', async function () {
const mockCoin = {
getConfig: sinon.stub().returns({ features: [CoinFeature.TSS_VERIFY_USE_SERIALIZED_TX_HEX] }),
verifyTransaction: sinon.stub().resolves(),
getChain: sinon.stub().returns('ticp'),
};
const utils = makeUtils(mockCoin);
sinon.stub(utils, 'getOfflineSignerPaillierModulus').throws(new Error('SENTINEL_PAST_CONSISTENCY'));

await assert.rejects(utils.signTxRequest(params), /SENTINEL_PAST_CONSISTENCY/);
});
});
Loading