Skip to content

Commit ee66fb5

Browse files
committed
fix: pass wallet version during creation to determine if onchain or tss
TICKET: WP-6461
1 parent 4c86891 commit ee66fb5

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

modules/express/src/clientRoutes.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import {
2828
TssEcdsaStep1ReturnMessage,
2929
TssEcdsaStep2ReturnMessage,
3030
UnsupportedCoinError,
31+
VerifyAddressOptions,
3132
Wallet,
3233
} from '@bitgo/sdk-core';
3334
import { BitGo, BitGoOptions, Coin, CustomSigningFunction, SignedTransaction, SignedTransactionRequest } from 'bitgo';
@@ -670,7 +671,7 @@ export async function handleV2IsWalletAddress(
670671
const bitgo = req.bitgo;
671672
const coin = bitgo.coin(req.decoded.coin);
672673
const wallet = await coin.wallets().get({ id: req.decoded.id });
673-
return await wallet.baseCoin.isWalletAddress(req.decoded as any);
674+
return await wallet.baseCoin.isWalletAddress(req.decoded as VerifyAddressOptions);
674675
}
675676

676677
/**

modules/sdk-core/src/bitgo/wallet/wallet.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1380,7 +1380,10 @@ export class Wallet implements IWallet {
13801380
newAddress.baseAddress = baseAddress ?? _.get(this._wallet, 'coinSpecific.baseAddress');
13811381
newAddress.format = addressParams.format;
13821382

1383-
const verificationData: VerifyAddressOptions = _.merge({}, newAddress, { rootAddress });
1383+
const verificationData: VerifyAddressOptions = _.merge({}, newAddress, {
1384+
rootAddress,
1385+
walletVersion: _.get(this._wallet, 'coinSpecific.walletVersion'),
1386+
});
13841387

13851388
if (verificationData.error) {
13861389
throw new AddressGenerationError(verificationData.error);

0 commit comments

Comments
 (0)