Skip to content

fix(sdk-core): remove ECDSA guard on tssSettings fetch in generateCustodialMpcWallet #9247

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

Draft
bitgo-ai-agent-dev wants to merge 1 commit into
base: master
Choose a base branch
from
+43 −3
Draft

fix(sdk-core): remove ECDSA guard on tssSettings fetch in generateCustodialMpcWallet #9247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 38 additions & 1 deletion modules/bitgo/test/v2/unit/wallets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,10 @@ describe('V2 Wallets:', function () {
type: 'custodial',
};

nock('https://bitgo.fakeurl')
.get('/api/v2/tss/settings')
.reply(200, { coinSettings: { sol: { walletCreationSettings: {} } } });

const walletNock = nock('https://bitgo.fakeurl')
.post('/api/v2/tsol/wallet/add')
.times(1)
Expand Down Expand Up @@ -1420,11 +1424,12 @@ describe('V2 Wallets:', function () {
sol: {
walletCreationSettings: {
multiSigTypeVersion: 'MPCv2',
custodialMultiSigTypeVersion: 'MPCv2',
},
},
},
};
nock('https://bitgo.fakeurl').get(`/api/v2/tss/settings`).times(2).reply(200, tssSettings);
nock('https://bitgo.fakeurl').get(`/api/v2/tss/settings`).times(3).reply(200, tssSettings);
});

afterEach(function () {
Expand Down Expand Up @@ -1534,6 +1539,38 @@ describe('V2 Wallets:', function () {
assert.ok(response.encryptedWalletPassphrase);
assert.ok(response.wallet);
});

it('should create a new tsol TSS EdDSA MPCv2 custodial wallet', async function () {
const keys = ['1', '2', '3'];
const testCoin = bitgo.coin('tsol');

const walletParams: GenerateWalletOptions = {
label: 'tss eddsa mpcv2 custodial wallet',
multisigType: 'tss',
enterprise: 'enterprise',
type: 'custodial',
};

const walletNock = nock('https://bitgo.fakeurl')
.post('/api/v2/tsol/wallet/add')
.times(1)
.reply(200, { ...walletParams, keys });

const wallets = new Wallets(bitgo, testCoin);

const res = await wallets.generateWallet(walletParams);
if (!isWalletWithKeychains(res)) {
throw new Error('wallet missing required keychains');
}
res.wallet.label().should.equal(walletParams.label);
should.equal(res.wallet.type(), walletParams.type);
res.wallet.multisigType().should.equal(walletParams.multisigType);
res.userKeychain.id.should.equal(keys[0]);
res.backupKeychain.id.should.equal(keys[1]);
res.bitgoKeychain.id.should.equal(keys[2]);

walletNock.isDone().should.be.true();
});
});

describe('Sharing', () => {
Expand Down
7 changes: 5 additions & 2 deletions modules/sdk-core/src/bitgo/wallet/wallets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2013,13 +2013,16 @@ export class Wallets implements IWallets {
const reqId = new RequestTracer();
this.bitgo.setRequestTracer(reqId);

if (multisigType === 'tss' && this.baseCoin.getMPCAlgorithm() === 'ecdsa') {
if (multisigType === 'tss') {
const tssSettings: TssSettings = await this.bitgo
.get(this.bitgo.microservicesUrl('/api/v2/tss/settings'))
.result();
const multisigTypeVersion =
tssSettings.coinSettings[this.baseCoin.getFamily()]?.walletCreationSettings?.custodialMultiSigTypeVersion;
walletVersion = this.determineEcdsaMpcWalletVersion(walletVersion, multisigTypeVersion);

if (this.baseCoin.getMPCAlgorithm() === 'ecdsa') {
walletVersion = this.determineEcdsaMpcWalletVersion(walletVersion, multisigTypeVersion);
}
}

const finalWalletParams = {
Expand Down
Loading