Used Hex to represent redeemer output script

keep-network · Nov 8, 2023 · ace3cfd · ace3cfd
1 parent 7fb6402
commit ace3cfd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 24 deletions.
diff --git a/system-tests/test/deposit-redemption.test.ts b/system-tests/test/deposit-redemption.test.ts
@@ -321,7 +321,7 @@ describe("System Test - Deposit and redemption", () => {
 
       context("when redemption is requested", () => {
         let requestedAmount: BigNumber
-        let redeemerOutputScript: string
+        let redeemerOutputScript: Hex
         let redemptionRequest: RedemptionRequest
 
         before("request the redemption", async () => {
@@ -336,14 +336,16 @@ describe("System Test - Deposit and redemption", () => {
             .approveBalance(bridgeAddress, requestedAmount)
 
           // Request redemption to depositor's address.
-          redeemerOutputScript = `0014${BitcoinHashUtils.computeHash160(
-            systemTestsContext.depositorBitcoinKeyPair.publicKey.compressed
-          )}`
+          redeemerOutputScript = Hex.from(
+            `0014${BitcoinHashUtils.computeHash160(
+              systemTestsContext.depositorBitcoinKeyPair.publicKey.compressed
+            )}`
+          )
 
           await depositorBridgeHandle.requestRedemption(
             systemTestsContext.walletBitcoinKeyPair.publicKey.compressed,
             sweepUtxo,
-            Hex.from(redeemerOutputScript),
+            redeemerOutputScript,
             requestedAmount
           )
 
@@ -353,7 +355,7 @@ describe("System Test - Deposit and redemption", () => {
 
           redemptionRequest = await maintainerBridgeHandle.pendingRedemptions(
             systemTestsContext.walletBitcoinKeyPair.publicKey.compressed,
-            Hex.from(redeemerOutputScript)
+            redeemerOutputScript
           )
         })
 
@@ -370,7 +372,7 @@ describe("System Test - Deposit and redemption", () => {
         it("should register the redemption request on the bridge", async () => {
           expect(redemptionRequest.requestedAt).to.be.greaterThan(0)
           expect(redemptionRequest.requestedAmount).to.be.equal(requestedAmount)
-          expect(redemptionRequest.redeemerOutputScript).to.be.equal(
+          expect(redemptionRequest.redeemerOutputScript).to.be.deep.equal(
             redeemerOutputScript
           )
         })
@@ -620,7 +622,7 @@ describe("System Test - Deposit and redemption", () => {
 
       context("when redemption is requested", () => {
         let requestedAmount: BigNumber
-        let redeemerOutputScript: string
+        let redeemerOutputScript: Hex
         let redemptionRequest: RedemptionRequest
 
         before("request the redemption", async () => {
@@ -633,14 +635,16 @@ describe("System Test - Deposit and redemption", () => {
           requestedAmount = tbtcBalanceOfDepositor.div(SATOSHI_MULTIPLIER)
 
           // Request redemption to depositor's address.
-          redeemerOutputScript = `0014${BitcoinHashUtils.computeHash160(
-            systemTestsContext.depositorBitcoinKeyPair.publicKey.compressed
-          )}`
+          redeemerOutputScript = Hex.from(
+            `0014${BitcoinHashUtils.computeHash160(
+              systemTestsContext.depositorBitcoinKeyPair.publicKey.compressed
+            )}`
+          )
 
           await depositorBridgeHandle.requestRedemption(
             systemTestsContext.walletBitcoinKeyPair.publicKey.compressed,
             sweepUtxo,
-            Hex.from(redeemerOutputScript),
+            redeemerOutputScript,
             tbtcBalanceOfDepositor
           )
 
@@ -650,7 +654,7 @@ describe("System Test - Deposit and redemption", () => {
 
           redemptionRequest = await maintainerBridgeHandle.pendingRedemptions(
             systemTestsContext.walletBitcoinKeyPair.publicKey.compressed,
-            Hex.from(redeemerOutputScript)
+            redeemerOutputScript
           )
         })
 
@@ -673,7 +677,7 @@ describe("System Test - Deposit and redemption", () => {
         it("should register the redemption request on the bridge", async () => {
           expect(redemptionRequest.requestedAt).to.be.greaterThan(0)
           expect(redemptionRequest.requestedAmount).to.be.equal(requestedAmount)
-          expect(redemptionRequest.redeemerOutputScript).to.be.equal(
+          expect(redemptionRequest.redeemerOutputScript).to.be.deep.equal(
             redeemerOutputScript
           )
         })

diff --git a/system-tests/test/minting-unminting.test.ts b/system-tests/test/minting-unminting.test.ts
@@ -365,7 +365,7 @@ describe("System Test - Minting and unminting", () => {
 
         context("when unminting is done", () => {
           let unmintedAmount: BigNumber
-          let redeemerOutputScript: string
+          let redeemerOutputScript: Hex
           let redemptionRequest: RedemptionRequest
 
           before("do unminting through TBTC approve-and-call", async () => {
@@ -375,15 +375,14 @@ describe("System Test - Minting and unminting", () => {
             )
 
             // Request redemption to depositor's address.
-            redeemerOutputScript = `0014${BitcoinHashUtils.computeHash160(
-              systemTestsContext.depositorBitcoinKeyPair.publicKey.compressed
-            )}`
+            redeemerOutputScript = Hex.from(
+              `0014${BitcoinHashUtils.computeHash160(
+                systemTestsContext.depositorBitcoinKeyPair.publicKey.compressed
+              )}`
+            )
 
             // Convert the redeemer output script to a byte buffer.
-            const rawRedeemerOutputScript = Buffer.from(
-              redeemerOutputScript,
-              "hex"
-            )
+            const rawRedeemerOutputScript = redeemerOutputScript.toBuffer()
 
             const redemptionData = ethersUtils.defaultAbiCoder.encode(
               ["address", "bytes20", "bytes32", "uint32", "uint64", "bytes"],
@@ -412,7 +411,7 @@ describe("System Test - Minting and unminting", () => {
 
             redemptionRequest = await maintainerBridgeHandle.pendingRedemptions(
               systemTestsContext.walletBitcoinKeyPair.publicKey.compressed,
-              Hex.from(redeemerOutputScript)
+              redeemerOutputScript
             )
           })
 
@@ -434,7 +433,7 @@ describe("System Test - Minting and unminting", () => {
             expect(redemptionRequest.requestedAmount).to.be.equal(
               unmintedAmount.div(satoshiMultiplier)
             )
-            expect(redemptionRequest.redeemerOutputScript).to.be.equal(
+            expect(redemptionRequest.redeemerOutputScript).to.be.deep.equal(
               redeemerOutputScript
             )
           })