feat(utxo-staking): update @bitgo/babylonlabs-io-btc-staking-ts to 2.3.4

Updated interfaces to match latest vendor library changes:
- Removed `signingStep` parameter from `signMessage`
- Updated `signPsbt` to take options with action name
- Changed `finalityProviderPkNoCoordHex` to `finalityProviderPksNoCoordHex`
- Added `channel` parameter to delegation message functions

Issue: BTC-2143

Co-authored-by: llm-git <[email protected]>

Author: OttoAllmendinger

modules/utxo-staking/package.json

@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "@babylonlabs-io/babylon-proto-ts": "1.0.0",
-    "@bitgo/babylonlabs-io-btc-staking-ts": "^1.2.0",
+    "@bitgo/babylonlabs-io-btc-staking-ts": "^2.3.4",
     "@bitgo/unspents": "^0.48.3",
     "@bitgo/utxo-core": "^1.11.0",
     "@bitgo/utxo-lib": "^11.6.1",

modules/utxo-staking/src/babylon/delegationMessage.ts

@@ -148,36 +148,30 @@ export function getBtcProviderForECKey(
 
   return {
     /**
-     * @param signingStep
      * @param message
      * @param type
      * @returns Base64 encoded string
      */
-    async signMessage(
-      signingStep: vendor.SigningStep,
-      message: string,
-      type: 'ecdsa' | 'bip322-simple'
-    ): Promise<string> {
-      assert(signingStep === 'proof-of-possession');
+    async signMessage(message: string, type: 'ecdsa' | 'bip322-simple'): Promise<string> {
       switch (type) {
         case 'ecdsa':
           return toBase64(stakerKey.sign(Buffer.from(message, 'hex')));
         case 'bip322-simple':
           return toBase64(signBip322Simple(message));
         default:
-          throw new Error(`unexpected signing step: ${signingStep}`);
+          throw new Error(`unexpected type: ${type}`);
       }
     },
 
-    async signPsbt(signingStep: vendor.SigningStep, psbtHex: string): Promise<string> {
+    async signPsbt(psbtHex: string, options: vendor.SignPsbtOptions): Promise<string> {
       const psbt = bitcoinjslib.Psbt.fromHex(psbtHex);
-      switch (signingStep) {
-        case 'staking-slashing':
+      switch (options.action.name) {
+        case 'sign-btc-slashing-transaction':
           return signWithDescriptor(psbt, descriptorBuilder.getStakingDescriptor(), stakerKey).toHex();
-        case 'unbonding-slashing':
+        case 'sign-btc-unbonding-slashing-transaction':
           return signWithDescriptor(psbt, descriptorBuilder.getUnbondingDescriptor(), stakerKey).toHex();
         default:
-          throw new Error(`unexpected signing step: ${signingStep}`);
+          throw new Error(`unexpected signing step: ${options.action.name}`);
       }
     },
   };
@@ -225,7 +219,7 @@ export function createStaking(
     toBitcoinJsNetwork(network),
     stakerBtcInfo,
     params,
-    stakingInput.finalityProviderPkNoCoordHex,
+    stakingInput.finalityProviderPksNoCoordHex,
     stakingInput.stakingTimelock
   );
 }
@@ -265,6 +259,7 @@ export function toStakingTransaction(tx: TransactionLike): bitcoinjslib.Transact
  * The difference is that here we are returning an _unsigned_ delegation message.
  */
 export async function createDelegationMessageWithTransaction(
+  channel: 'delegation:create' | 'delegation:register',
   manager: vendor.BabylonBtcStakingManager,
   staking: vendor.Staking,
   stakingAmountSat: number,
@@ -276,10 +271,11 @@ export async function createDelegationMessageWithTransaction(
   }
   // Create delegation message without including inclusion proof
   return manager.createBtcDelegationMsg(
+    channel,
     staking,
     {
       stakingTimelock: staking.stakingTimelock,
-      finalityProviderPkNoCoordHex: staking.finalityProviderPkNoCoordHex,
+      finalityProviderPksNoCoordHex: staking.finalityProviderPksNoCoordHex,
       stakingAmountSat,
     },
     toStakingTransaction(transaction),
@@ -298,6 +294,7 @@ export async function createUnsignedPreStakeRegistrationBabylonTransactionWithBt
   inputUTXOs: vendor.UTXO[],
   feeRateSatB: number,
   babylonAddress: string,
+  channel: 'delegation:create' | 'delegation:register',
   stakingParams: vendor.VersionedStakingParams[] = getStakingParams(network)
 ): Promise<Result> {
   if (inputUTXOs.length === 0) {
@@ -308,6 +305,7 @@ export async function createUnsignedPreStakeRegistrationBabylonTransactionWithBt
   // Create unsigned staking transaction
   const { transaction } = staking.createStakingTransaction(stakingInput.stakingAmountSat, inputUTXOs, feeRateSatB);
   const unsignedDelegationMsg = await createDelegationMessageWithTransaction(
+    channel,
     manager,
     staking,
     stakingInput.stakingAmountSat,

modules/utxo-staking/src/babylon/stakingManager.ts

@@ -40,7 +40,6 @@ class BitGoStakingManager extends vendor.BabylonBtcStakingManager {
     sigType: BTCSigType
   ): Promise<ProofOfPossessionBTC> {
     const signedBabylonAddress = await this.btcProvider.signMessage(
-      vendor.SigningStep.PROOF_OF_POSSESSION,
       bech32Address,
       sigType === BTCSigType.BIP322 ? 'bip322-simple' : 'ecdsa'
     );

modules/utxo-staking/src/babylon/stakingParams.ts

@@ -126,8 +126,8 @@ export function getDescriptorProviderForStakingParams(
   stakingParams: DescriptorStakingParams
 ): BabylonDescriptorBuilder {
   const userKey = Buffer.from(stakerBtcInfo.publicKeyNoCoordHex, 'hex');
-  const finalityProviderKey = Buffer.from(stakingInput.finalityProviderPkNoCoordHex, 'hex');
-  return getDescriptorBuilderForParams(userKey, [finalityProviderKey], stakingInput.stakingTimelock, stakingParams);
+  const finalityProviderKeys = stakingInput.finalityProviderPksNoCoordHex.map((pk) => Buffer.from(pk, 'hex'));
+  return getDescriptorBuilderForParams(userKey, finalityProviderKeys, stakingInput.stakingTimelock, stakingParams);
 }
 
 export function getTestnetDescriptorBuilder(

modules/utxo-staking/test/unit/babylon/transactions.ts

@@ -359,7 +359,7 @@ function describeWithKeys(
           bitcoinjslib.networks.bitcoin,
           toStakerInfo(stakerKey, changeAddress),
           stakingParams,
-          getXOnlyPubkey(finalityProvider).toString('hex'),
+          [getXOnlyPubkey(finalityProvider).toString('hex')],
           stakingParams.minStakingTimeBlocks
         );
 

modules/utxo-staking/test/unit/babylon/vendor.utils.ts

@@ -39,14 +39,15 @@ export async function getBitGoUtxoStakingMsgCreateBtcDelegation(
       publicKeyNoCoordHex: getXOnlyPubkey(stakerKey).toString('hex'),
     },
     {
-      finalityProviderPkNoCoordHex: getXOnlyPubkey(finalityProvider).toString('hex'),
+      finalityProviderPksNoCoordHex: [getXOnlyPubkey(finalityProvider).toString('hex')],
       stakingAmountSat: amount,
       stakingTimelock: getBabylonParamByBtcHeight(blockHeight, stakingParams).minStakingTimeBlocks,
     },
     800_000,
     [utxo],
     feeRateSatB,
     toBech32(Buffer.from('test'), 0, 'bbn'),
+    'delegation:create',
     stakingParams
   );
 }
@@ -64,7 +65,7 @@ export async function getVendorMsgCreateBtcDelegation(
   blockHeight: number
 ): Promise<Result> {
   const babylonProvider: vendor.BabylonProvider = {
-    async signTransaction(signingStep, msg) {
+    async signTransaction(msg) {
       // return unsigned payload
       return babylonProtobuf.btcstakingtx.MsgCreateBTCDelegation.encode(
         msg.value as babylonProtobuf.btcstakingtx.MsgCreateBTCDelegation
@@ -84,7 +85,7 @@ export async function getVendorMsgCreateBtcDelegation(
       publicKeyNoCoordHex: getXOnlyPubkey(stakerKey).toString('hex'),
     },
     {
-      finalityProviderPkNoCoordHex: getXOnlyPubkey(finalityProvider).toString('hex'),
+      finalityProviderPksNoCoordHex: [getXOnlyPubkey(finalityProvider).toString('hex')],
       stakingAmountSat: amount,
       stakingTimelock: getBabylonParamByBtcHeight(blockHeight, stakingParams).minStakingTimeBlocks,
     },