chore: rename unbondingTimelockScript to timelockScript in the input …

…parameter
babylonlabs-io · Jan 7, 2025 · b4a10cb · b4a10cb
1 parent 3433c46
commit b4a10cb
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 9 deletions.
diff --git a/src/staking/index.ts b/src/staking/index.ts
@@ -443,14 +443,24 @@ export class Staking {
     // Reconstruct and validate the slashingOutputIndex
     const slashingOutputIndex = findMatchingTxOutputIndex(
       slashingTx,
-      deriveSlashingOutputAddress(scripts, this.network),
+      deriveSlashingOutputAddress(
+        {
+          timelockScript: scripts.unbondingTimelockScript,
+        },
+        this.network,
+      ),
       this.network,
     )
 
     // Create the withdraw slashed transaction
     try {
       return withdrawSlashingTransaction(
-        scripts,
+        {
+          // Unbonding timelock script is used as the timelock of slashing
+          // is the same as the unbonding timelock.
+          timelockScript: scripts.unbondingTimelockScript,
+          slashingScript: scripts.slashingScript,
+        },
         slashingTx,
         this.stakerInfo.address,
         this.network,

diff --git a/src/staking/transactions.ts b/src/staking/transactions.ts
@@ -251,7 +251,7 @@ export function withdrawTimelockUnbondedTransaction(
  */
 export function withdrawSlashingTransaction(
   scripts: {
-    unbondingTimelockScript: Buffer;
+    timelockScript: Buffer;
     slashingScript: Buffer;
   },
   slashingTx: Transaction,
@@ -264,12 +264,12 @@ export function withdrawSlashingTransaction(
     {
       output: scripts.slashingScript,
     },
-    { output: scripts.unbondingTimelockScript },
+    { output: scripts.timelockScript },
   ];
 
   return withdrawalTransaction(
     {
-      timelockScript: scripts.unbondingTimelockScript,
+      timelockScript: scripts.timelockScript,
     },
     scriptTree,
     slashingTx,

diff --git a/src/utils/staking/index.ts b/src/utils/staking/index.ts
@@ -97,13 +97,13 @@ export const deriveStakingOutputAddress = (
  */
 export const deriveSlashingOutputAddress = (
   scripts: {
-    unbondingTimelockScript: Buffer;
+    timelockScript: Buffer;
   },
   network: networks.Network,
 ) => {
   const slashingOutput = payments.p2tr({
     internalPubkey,
-    scriptTree: { output: scripts.unbondingTimelockScript },
+    scriptTree: { output: scripts.timelockScript },
     network,
   });
 

diff --git a/tests/helper/datagen/base.ts b/tests/helper/datagen/base.ts
@@ -293,6 +293,18 @@ export class StakingDataGenerator {
     }
   };
 
+  /**
+   * Generates a random slashing transaction based on the staking transaction 
+   * and staking scripts
+   * @param network - The network to use
+   * @param stakingScripts - The staking scripts to use
+   * @param stakingTx - The staking transaction to use
+   * @param param - The param used in the staking transaction
+   * @param keyPair - The key pair to use. This is used to sign the slashing 
+   * psbt to derive the transaction.
+   * @param type - The type of slashing to use.
+   * @returns {Object} - A random slashing transaction
+   */
   generateSlashingTransaction = (
     network: bitcoin.networks.Network,
     stakingScripts: StakingScripts,

diff --git a/tests/staking/transactions/withdrawTransaction.test.ts b/tests/staking/transactions/withdrawTransaction.test.ts
@@ -261,12 +261,20 @@ describe.each(testingNetworks)("withdrawTransaction", (
 
         const outputIndex = findMatchingTxOutputIndex(
           slashingTx,
-          deriveSlashingOutputAddress(testData.stakingScripts, network),
+          deriveSlashingOutputAddress(
+            {
+              timelockScript: testData.stakingScripts.unbondingTimelockScript,
+            },
+            network,
+          ),
           network,
         );
 
         const psbt = withdrawSlashingTransaction(
-          testData.stakingScripts,
+          {
+            timelockScript: testData.stakingScripts.unbondingTimelockScript,
+            slashingScript: testData.stakingScripts.slashingScript,
+          },
           slashingTx,
           testData.stakerInfo.address,
           network,