diff --git a/modules/sdk-coin-sol/src/sol.ts b/modules/sdk-coin-sol/src/sol.ts index 3df581a441..3d63446113 100644 --- a/modules/sdk-coin-sol/src/sol.ts +++ b/modules/sdk-coin-sol/src/sol.ts @@ -61,7 +61,7 @@ import { UnexpectedAddressError, EDDSAUtils, } from '@bitgo/sdk-core'; -import { auditEddsaPrivateKey, deriveUnhardenedMps, getDerivationPath } from '@bitgo/sdk-lib-mpc'; +import { auditEddsaPrivateKey, getDerivationPath } from '@bitgo/sdk-lib-mpc'; import { BaseNetwork, CoinFamily, coins, SolCoin, BaseCoin as StaticsBaseCoin } from '@bitgo/statics'; import { KeyPair as SolKeyPair, @@ -1705,9 +1705,9 @@ export class Sol extends BaseCoin { const index = params.index || 0; const currPath = params.seed ? getDerivationPath(params.seed) + `/${index}` : `m/${index}`; - const accountId = isMpcV2 - ? deriveUnhardenedMps(bitgoKey, currPath).slice(0, 64) - : (await EDDSAMethods.getInitializedMpcInstance()).deriveUnhardened(bitgoKey, currPath).slice(0, 64); + const accountId = (await EDDSAMethods.getInitializedMpcInstance()) + .deriveUnhardened(bitgoKey, currPath) + .slice(0, 64); const bs58EncodedPublicKey = new SolKeyPair({ pub: accountId }).getAddress(); const blockhash = await this.getBlockhash(params.apiKey); @@ -1826,9 +1826,9 @@ export class Sol extends BaseCoin { const baseAddressPath = params.seed ? getDerivationPath(params.seed) + `/${baseAddressIndex}` : `m/${baseAddressIndex}`; - const baseAccountId = isMpcV2 - ? deriveUnhardenedMps(bitgoKey, baseAddressPath).slice(0, 64) - : (await EDDSAMethods.getInitializedMpcInstance()).deriveUnhardened(bitgoKey, baseAddressPath).slice(0, 64); + const baseAccountId = (await EDDSAMethods.getInitializedMpcInstance()) + .deriveUnhardened(bitgoKey, baseAddressPath) + .slice(0, 64); const baseAddress = new SolKeyPair({ pub: baseAccountId }).getAddress(); let durableNoncePubKeysIndex = 0; diff --git a/modules/sdk-coin-sol/test/unit/sol.ts b/modules/sdk-coin-sol/test/unit/sol.ts index da2588d916..feb57764e4 100644 --- a/modules/sdk-coin-sol/test/unit/sol.ts +++ b/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 { @@ -3971,7 +3971,7 @@ describe('SOL:', function () { 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: mpc.deriveUnhardened(mpcV2TokenCommonKeyChain, 'm/1').slice(0, 64),