Merge pull request #5320 from BitGo/SC-818-fix-sdk-for-btc-unstaking-signing

Sc 818 fix sdk for btc unstaking signing

Author: ewangbitgo

modules/sdk-core/src/bitgo/staking/stakingWallet.ts

@@ -178,15 +178,20 @@ export class StakingWallet implements IStakingWallet {
     stakingPrebuildTransaction: StakingPrebuildTransactionResult
   ): Promise<StakingSignedTransaction> {
     const reqId = new RequestTracer();
-    const keychain = await this.wallet.baseCoin.keychains().getKeysForSigning({
+    const isBtcUndelegate =
+      this.wallet.baseCoin.getFamily() === 'btc' &&
+      stakingPrebuildTransaction.transaction.transactionType.toLowerCase() === 'undelegate_withdraw';
+    const wallet = isBtcUndelegate
+      ? await this.getDescriptorWallet(stakingPrebuildTransaction.transaction)
+      : await this.getWalletForBuildingAndSigning();
+
+    const keychain = await wallet.baseCoin.keychains().getKeysForSigning({
       wallet: this.wallet,
       reqId: reqId,
     });
     return {
       transaction: stakingPrebuildTransaction.transaction,
-      signed: await (
-        await this.getWalletForBuildingAndSigning()
-      ).signTransaction({
+      signed: await wallet.signTransaction({
         txPrebuild: stakingPrebuildTransaction.result,
         walletPassphrase: signOptions.walletPassphrase,
         keychain: keychain[0],

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

@@ -1,6 +1,7 @@
 /**
  * @prettier
  */
+import * as t from 'io-ts';
 import assert from 'assert';
 import { BigNumber } from 'bignumber.js';
 import * as _ from 'lodash';
@@ -1935,6 +1936,7 @@ export class Wallet implements IWallet {
     return this.baseCoin.signTransaction({
       ...signTransactionParams,
       prv: this.getUserPrv(presign as GetUserPrvOptions),
+      wallet: this,
     });
   }
 
@@ -3643,7 +3645,7 @@ export class Wallet implements IWallet {
     return postWithCodec(
       this.bitgo,
       this.baseCoin.url('/wallet/' + this.id() + '/tx/send'),
-      TxSendBody,
+      t.intersection([TxSendBody, t.partial({ locktime: t.number })]),
       whitelistedParams
     ).result();
   }