Skip to content

fix(sdk-core): migrate MPCv2 EdDSA address derivation to BIP32-Ed25519 #9179

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

Merged
Marzooqa merged 1 commit into from
Jul 3, 2026
+36 −27
Merged

fix(sdk-core): migrate MPCv2 EdDSA address derivation to BIP32-Ed25519 #9179

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
12 changes: 3 additions & 9 deletions modules/sdk-core/src/bitgo/utils/tss/addressVerification.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getDerivationPath, deriveUnhardenedMps } from '@bitgo/sdk-lib-mpc';
import { getDerivationPath } from '@bitgo/sdk-lib-mpc';
import { Ecdsa } from '../../../account-lib/mpc';
import { TssVerifyAddressOptions } from '../../baseCoin/iBaseCoin';
import { InvalidAddressError } from '../../errors';
Expand Down Expand Up @@ -87,14 +87,8 @@ export async function deriveMPCWalletAddress(
const prefix = derivedFromParentWithSeed ? getDerivationPath(derivedFromParentWithSeed.toString()) : undefined;
const derivationPath = prefix ? `${prefix}/${index}` : `m/${index}`;

// MPCv2 EdDSA wallets use a different BIP32-Ed25519 derivation formula than MPCv1 wallets.
let derivedPublicKey: string;
if (params.keyCurve === 'ed25519' && params.multisigTypeVersion === 'MPCv2') {
derivedPublicKey = deriveUnhardenedMps(commonKeychain, derivationPath);
} else {
const MPC = params.keyCurve === 'secp256k1' ? new Ecdsa() : await EDDSAMethods.getInitializedMpcInstance();
derivedPublicKey = MPC.deriveUnhardened(commonKeychain, derivationPath);
}
const MPC = params.keyCurve === 'secp256k1' ? new Ecdsa() : await EDDSAMethods.getInitializedMpcInstance();
const derivedPublicKey = MPC.deriveUnhardened(commonKeychain, derivationPath);

// secp256k1 expects 33 bytes; ed25519 expects 32 bytes
const publicKeySize = params.keyCurve === 'secp256k1' ? 33 : 32;
Expand Down
51 changes: 33 additions & 18 deletions modules/sdk-core/test/unit/bitgo/utils/tss/addressVerification.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import * as assert from 'assert';
import 'should';
import { deriveUnhardenedMps, getDerivationPath } from '@bitgo/sdk-lib-mpc';
import { getDerivationPath } from '@bitgo/sdk-lib-mpc';
import { Ecdsa } from '../../../../../src/account-lib/mpc';
import { EDDSAMethods } from '../../../../../src/bitgo/tss';

function getAddressVerificationModule() {
return require('../../../../../src/bitgo/utils/tss/addressVerification');
Expand Down Expand Up @@ -84,10 +85,12 @@ describe('verifyEddsaTssWalletAddress', function () {
const isValidAddress = (addr: string) => addr.length === 64;
const getAddressFromPublicKey = (pk: string) => pk;

describe('MPCv2 wallets (Silence Labs / MPS formula)', function () {
it('verifies a correct address derived with deriveUnhardenedMps at index 0', async function () {
describe('MPCv2 wallets (BIP32-Ed25519 formula)', function () {
it('verifies a correct address at index 0', async function () {
const verifyEddsaTssWalletAddress = getVerifyEddsaTssWalletAddress();
const expectedAddress = deriveUnhardenedMps(TEST_KEYCHAIN, 'm/0').slice(0, 64);
const expectedAddress = (await EDDSAMethods.getInitializedMpcInstance())
.deriveUnhardened(TEST_KEYCHAIN, 'm/0')
.slice(0, 64);

const result = await verifyEddsaTssWalletAddress(
{ address: expectedAddress, keychains, index: 0, multisigTypeVersion: 'MPCv2' },
Expand All @@ -97,9 +100,11 @@ describe('verifyEddsaTssWalletAddress', function () {
result.should.be.true();
});

it('verifies a correct address derived with deriveUnhardenedMps at index 1', async function () {
it('verifies a correct address at index 1', async function () {
const verifyEddsaTssWalletAddress = getVerifyEddsaTssWalletAddress();
const expectedAddress = deriveUnhardenedMps(TEST_KEYCHAIN, 'm/1').slice(0, 64);
const expectedAddress = (await EDDSAMethods.getInitializedMpcInstance())
.deriveUnhardened(TEST_KEYCHAIN, 'm/1')
.slice(0, 64);

const result = await verifyEddsaTssWalletAddress(
{ address: expectedAddress, keychains, index: 1, multisigTypeVersion: 'MPCv2' },
Expand All @@ -111,7 +116,9 @@ describe('verifyEddsaTssWalletAddress', function () {

it('rejects an address derived at a different index', async function () {
const verifyEddsaTssWalletAddress = getVerifyEddsaTssWalletAddress();
const addressFromIndex0 = deriveUnhardenedMps(TEST_KEYCHAIN, 'm/0').slice(0, 64);
const addressFromIndex0 = (await EDDSAMethods.getInitializedMpcInstance())
.deriveUnhardened(TEST_KEYCHAIN, 'm/0')
.slice(0, 64);

const result = await verifyEddsaTssWalletAddress(
{ address: addressFromIndex0, keychains, index: 1, multisigTypeVersion: 'MPCv2' },
Expand All @@ -137,7 +144,9 @@ describe('verifyEddsaTssWalletAddress', function () {
const verifyEddsaTssWalletAddress = getVerifyEddsaTssWalletAddress();
const seed = 'smc-seed-123';
const prefix = getDerivationPath(seed);
const expectedAddress = deriveUnhardenedMps(TEST_KEYCHAIN, `${prefix}/0`).slice(0, 64);
const expectedAddress = (await EDDSAMethods.getInitializedMpcInstance())
.deriveUnhardened(TEST_KEYCHAIN, `${prefix}/0`)
.slice(0, 64);

const result = await verifyEddsaTssWalletAddress(
{
Expand All @@ -157,7 +166,9 @@ describe('verifyEddsaTssWalletAddress', function () {
const verifyEddsaTssWalletAddress = getVerifyEddsaTssWalletAddress();
const seed = 'smc-seed-123';
const prefix = getDerivationPath(seed);
const addressAtIndex1 = deriveUnhardenedMps(TEST_KEYCHAIN, `${prefix}/1`).slice(0, 64);
const addressAtIndex1 = (await EDDSAMethods.getInitializedMpcInstance())
.deriveUnhardened(TEST_KEYCHAIN, `${prefix}/1`)
.slice(0, 64);

const result = await verifyEddsaTssWalletAddress(
{
Expand All @@ -174,16 +185,16 @@ describe('verifyEddsaTssWalletAddress', function () {
});
});

describe('non-MPCv2 wallets (MPCv1 formula)', function () {
it('rejects an MPCv2-derived address when multisigTypeVersion is not set', async function () {
describe('legacy Silence Labs formula', function () {
it('rejects an address derived with the old Silence Labs single-HMAC formula', async function () {
const verifyEddsaTssWalletAddress = getVerifyEddsaTssWalletAddress();
// MPCv2 (Silence Labs) and MPCv1 formulas produce different addresses for the same keychain.
// Without multisigTypeVersion: 'MPCv2', the MPCv1 formula is used, so the MPCv2-derived
// address should not match.
const mpcv2Address = deriveUnhardenedMps(TEST_KEYCHAIN, 'm/0').slice(0, 64);
// The Silence Labs and BIP32-Ed25519 formulas produce different addresses for the same keychain.
// Addresses derived with the old formula no longer verify against the current derivation.
const { deriveUnhardenedMps: deriveSL } = await import('@bitgo/sdk-lib-mpc');
const silenceLabsAddress = deriveSL(TEST_KEYCHAIN, 'm/0').slice(0, 64);

const result = await verifyEddsaTssWalletAddress(
{ address: mpcv2Address, keychains, index: 0 },
{ address: silenceLabsAddress, keychains, index: 0 },
isValidAddress,
getAddressFromPublicKey
);
Expand Down Expand Up @@ -254,7 +265,9 @@ describe('deriveMPCWalletAddress', function () {

it('derives the address and path for the simple m/{index} path', async function () {
const deriveMPCWalletAddress = getDeriveMPCWalletAddress();
const expectedAddress = deriveUnhardenedMps(TEST_KEYCHAIN, 'm/3').slice(0, 64);
const expectedAddress = (await EDDSAMethods.getInitializedMpcInstance())
.deriveUnhardened(TEST_KEYCHAIN, 'm/3')
.slice(0, 64);

const result = await deriveMPCWalletAddress(
{ keychains, index: 3, multisigTypeVersion: 'MPCv2', keyCurve: 'ed25519' },
Expand All @@ -269,7 +282,9 @@ describe('deriveMPCWalletAddress', function () {
const deriveMPCWalletAddress = getDeriveMPCWalletAddress();
const seed = 'smc-seed-123';
const prefix = getDerivationPath(seed);
const expectedAddress = deriveUnhardenedMps(TEST_KEYCHAIN, `${prefix}/0`).slice(0, 64);
const expectedAddress = (await EDDSAMethods.getInitializedMpcInstance())
.deriveUnhardened(TEST_KEYCHAIN, `${prefix}/0`)
.slice(0, 64);

const result = await deriveMPCWalletAddress(
{ keychains, index: 0, multisigTypeVersion: 'MPCv2', derivedFromParentWithSeed: seed, keyCurve: 'ed25519' },
Expand Down
Loading