fix(sdk-coin-sol): migrate recover() and recoverCloseATA() to BIP32-Ed25519

Replace Silence Labs single-HMAC formula (deriveUnhardenedMps) with
Eddsa.deriveUnhardened for MPCv2 account ID derivation in recover() and
recoverCloseATA(). Update consolidation test fixtures that exercise
recover() via recoverConsolidations().

Ticket: WCI-644

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: Marzooqa

modules/sdk-coin-sol/src/sol.ts

@@ -1267,13 +1267,8 @@ export class Sol extends BaseCoin {
     const index = params.index || 0;
     const currPath = params.seed ? getDerivationPath(params.seed) + `/${index}` : `m/${index}`;
 
-    let accountId: string;
-    if (isMpcV2) {
-      accountId = deriveUnhardenedMps(bitgoKey, currPath).slice(0, 64);
-    } else {
-      const MPC = await EDDSAMethods.getInitializedMpcInstance();
-      accountId = MPC.deriveUnhardened(bitgoKey, currPath).slice(0, 64);
-    }
+    const MPC = await EDDSAMethods.getInitializedMpcInstance();
+    const accountId = MPC.deriveUnhardened(bitgoKey, currPath).slice(0, 64);
     const bs58EncodedPublicKey = new SolKeyPair({ pub: accountId }).getAddress();
 
     balance = await this.getAccountBalance(bs58EncodedPublicKey, params.apiKey);
@@ -1559,13 +1554,8 @@ export class Sol extends BaseCoin {
     const index = params.index || 0;
     const currPath = params.seed ? getDerivationPath(params.seed) + `/${index}` : `m/${index}`;
 
-    let accountId: string;
-    if (isMpcV2) {
-      accountId = deriveUnhardenedMps(bitgoKey, currPath).slice(0, 64);
-    } else {
-      const MPC = await EDDSAMethods.getInitializedMpcInstance();
-      accountId = MPC.deriveUnhardened(bitgoKey, currPath).slice(0, 64);
-    }
+    const MPC = await EDDSAMethods.getInitializedMpcInstance();
+    const accountId = MPC.deriveUnhardened(bitgoKey, currPath).slice(0, 64);
     const bs58EncodedPublicKey = new SolKeyPair({ pub: accountId }).getAddress();
 
     const accountBalance = await this.getAccountBalance(bs58EncodedPublicKey);

modules/sdk-coin-sol/test/unit/sol.ts

@@ -23,7 +23,7 @@ import {
   Wallet,
   WalletCoinSpecific,
 } from '@bitgo/sdk-core';
-import { deriveUnhardenedMps, MPSUtil } from '@bitgo/sdk-lib-mpc';
+import { MPSUtil } from '@bitgo/sdk-lib-mpc';
 import { TestBitGo, TestBitGoAPI } from '@bitgo/sdk-test';
 import { coins } from '@bitgo/statics';
 import {
@@ -3064,19 +3064,20 @@ describe('SOL:', function () {
       mpcV2UserKey = encrypt(walletPassphrase, userDkg.getReducedKeyShare().toString('base64'));
       mpcV2BackupKey = encrypt(walletPassphrase, backupDkg.getReducedKeyShare().toString('base64'));
       mpcV2CommonKeyChain = userDkg.getCommonKeychain();
+      const mpc = await EDDSAMethods.getInitializedMpcInstance();
       mpcV2WalletAddress = new KeyPair({
-        pub: deriveUnhardenedMps(mpcV2CommonKeyChain, 'm/0').slice(0, 64),
+        pub: mpc.deriveUnhardened(mpcV2CommonKeyChain, 'm/0').slice(0, 64),
       }).getAddress();
       mismatchedBitgoKey = otherUserDkg.getCommonKeychain();
       mismatchedWalletAddress = new KeyPair({
-        pub: deriveUnhardenedMps(mismatchedBitgoKey, 'm/0').slice(0, 64),
+        pub: mpc.deriveUnhardened(mismatchedBitgoKey, 'm/0').slice(0, 64),
       }).getAddress();
 
       mpcV2TokenUserKey = encrypt(walletPassphrase, tokenUserDkg.getReducedKeyShare().toString('base64'));
       mpcV2TokenBackupKey = encrypt(walletPassphrase, tokenBackupDkg.getReducedKeyShare().toString('base64'));
       mpcV2TokenCommonKeyChain = tokenUserDkg.getCommonKeychain();
       mpcV2TokenWalletAddress = new KeyPair({
-        pub: deriveUnhardenedMps(mpcV2TokenCommonKeyChain, 'm/0').slice(0, 64),
+        pub: mpc.deriveUnhardened(mpcV2TokenCommonKeyChain, 'm/0').slice(0, 64),
       }).getAddress();
 
       mpcV2RecoverParams = {
@@ -3959,20 +3960,21 @@ describe('SOL:', function () {
       mpcV2UserKey = encrypt(walletPassphrase, userDkg.getReducedKeyShare().toString('base64'));
       mpcV2BackupKey = encrypt(walletPassphrase, backupDkg.getReducedKeyShare().toString('base64'));
       mpcV2CommonKeyChain = userDkg.getCommonKeychain();
+      const mpc = await EDDSAMethods.getInitializedMpcInstance();
 
-      mpcV2Address1 = new KeyPair({ pub: deriveUnhardenedMps(mpcV2CommonKeyChain, 'm/1').slice(0, 64) }).getAddress();
-      mpcV2Address2 = new KeyPair({ pub: deriveUnhardenedMps(mpcV2CommonKeyChain, 'm/2').slice(0, 64) }).getAddress();
-      mpcV2Address3 = new KeyPair({ pub: deriveUnhardenedMps(mpcV2CommonKeyChain, 'm/3').slice(0, 64) }).getAddress();
+      mpcV2Address1 = new KeyPair({ pub: mpc.deriveUnhardened(mpcV2CommonKeyChain, 'm/1').slice(0, 64) }).getAddress();
+      mpcV2Address2 = new KeyPair({ pub: mpc.deriveUnhardened(mpcV2CommonKeyChain, 'm/2').slice(0, 64) }).getAddress();
+      mpcV2Address3 = new KeyPair({ pub: mpc.deriveUnhardened(mpcV2CommonKeyChain, 'm/3').slice(0, 64) }).getAddress();
 
       mpcV2TokenUserKey = encrypt(walletPassphrase, tokenUserDkg.getReducedKeyShare().toString('base64'));
       mpcV2TokenBackupKey = encrypt(walletPassphrase, tokenBackupDkg.getReducedKeyShare().toString('base64'));
       mpcV2TokenCommonKeyChain = tokenUserDkg.getCommonKeychain();
 
       mpcV2TokenBaseAddress = new KeyPair({
-        pub: deriveUnhardenedMps(mpcV2TokenCommonKeyChain, 'm/0').slice(0, 64),
+        pub: mpc.deriveUnhardened(mpcV2TokenCommonKeyChain, 'm/0').slice(0, 64),
       }).getAddress();
       mpcV2TokenAddress1 = new KeyPair({
-        pub: deriveUnhardenedMps(mpcV2TokenCommonKeyChain, 'm/1').slice(0, 64),
+        pub: mpc.deriveUnhardened(mpcV2TokenCommonKeyChain, 'm/1').slice(0, 64),
       }).getAddress();
     });
 
@@ -4105,7 +4107,7 @@ describe('SOL:', function () {
           .resolves(testData.SolResponses.getAccountBalanceResponseNoFunds);
       }
       const mpcV2Address4 = new KeyPair({
-        pub: deriveUnhardenedMps(mpcV2CommonKeyChain, 'm/4').slice(0, 64),
+        pub: (await EDDSAMethods.getInitializedMpcInstance()).deriveUnhardened(mpcV2CommonKeyChain, 'm/4').slice(0, 64),
       }).getAddress();
       callBack
         .withArgs({ payload: { id: '1', jsonrpc: '2.0', method: 'getBalance', params: [mpcV2Address4] } })