Updated deposit submitting

keep-network · Oct 26, 2023 · 80f360e · 80f360e
1 parent c65cefc
commit 80f360e
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 5 deletions.
diff --git a/system-tests/test/deposit-redemption.test.ts b/system-tests/test/deposit-redemption.test.ts
@@ -4,8 +4,10 @@ import {
   ElectrumClient,
   EthereumBridge,
   BitcoinTransactionHash,
+  BitcoinNetwork,
 } from "@keep-network/tbtc-v2.ts/dist/src"
-import { computeHash160 } from "@keep-network/tbtc-v2.ts/dist/src/bitcoin"
+import { computeHash160, createAddressFromPublicKey } from "@keep-network/tbtc-v2.ts/dist/src/bitcoin"
+import { Hex } from "@keep-network/tbtc-v2.ts/dist/src/hex"
 import { BigNumber, constants, Contract } from "ethers"
 import chai, { expect } from "chai"
 import { submitDepositTransaction } from "@keep-network/tbtc-v2.ts/dist/src/deposit"
@@ -137,11 +139,23 @@ describe("System Test - Deposit and redemption", () => {
         Generated deposit data:
         ${JSON.stringify(deposit)}
       `)
+
+      const depositorBitcoinAddress = createAddressFromPublicKey(
+        Hex.from(systemTestsContext.depositorBitcoinKeyPair.publicKey.compressed),
+        BitcoinNetwork.Testnet,
+      )
+      const fee = BigNumber.from(1500)
+      const depositorUtxos = await electrumClient.findAllUnspentTransactionOutputs(
+        depositorBitcoinAddress
+      )
+
       ;({ depositUtxo } = await submitDepositTransaction(
         deposit,
         systemTestsContext.depositorBitcoinKeyPair.wif,
         electrumClient,
-        true
+        true,
+        depositorUtxos,
+        fee
       ))
 
       console.log(`
@@ -408,11 +422,23 @@ describe("System Test - Deposit and redemption", () => {
         Generated deposit data:
         ${JSON.stringify(deposit)}
       `)
+
+      const depositorBitcoinAddress = createAddressFromPublicKey(
+        Hex.from(systemTestsContext.depositorBitcoinKeyPair.publicKey.compressed),
+        BitcoinNetwork.Testnet,
+      )
+      const fee = BigNumber.from(1500)
+      const depositorUtxos = await electrumClient.findAllUnspentTransactionOutputs(
+        depositorBitcoinAddress
+      )
+
       ;({ depositUtxo } = await submitDepositTransaction(
         deposit,
         systemTestsContext.depositorBitcoinKeyPair.wif,
         electrumClient,
-        true
+        true,
+        depositorUtxos,
+        fee
       ))
 
       console.log(`

diff --git a/system-tests/test/minting-unminting.test.ts b/system-tests/test/minting-unminting.test.ts
@@ -5,8 +5,10 @@ import {
   EthereumAddress,
   EthereumBridge,
   BitcoinTransactionHash,
+  BitcoinNetwork,
 } from "@keep-network/tbtc-v2.ts/dist/src"
-import { computeHash160 } from "@keep-network/tbtc-v2.ts/dist/src/bitcoin"
+import { computeHash160, createAddressFromPublicKey } from "@keep-network/tbtc-v2.ts/dist/src/bitcoin"
+import { Hex } from "@keep-network/tbtc-v2.ts/dist/src/hex"
 import { BigNumber, constants, Contract, utils as ethersUtils } from "ethers"
 import chai, { expect } from "chai"
 import { submitDepositTransaction } from "@keep-network/tbtc-v2.ts/dist/src/deposit"
@@ -140,11 +142,23 @@ describe("System Test - Minting and unminting", () => {
         Generated deposit data:
         ${JSON.stringify(deposit)}
       `)
+
+        const depositorBitcoinAddress = createAddressFromPublicKey(
+          Hex.from(systemTestsContext.depositorBitcoinKeyPair.publicKey.compressed),
+          BitcoinNetwork.Testnet,
+        )
+        const fee = BigNumber.from(1500)
+        const depositorUtxos = await electrumClient.findAllUnspentTransactionOutputs(
+          depositorBitcoinAddress
+        )
+
         ;({ depositUtxo } = await submitDepositTransaction(
           deposit,
           systemTestsContext.depositorBitcoinKeyPair.wif,
           electrumClient,
-          true
+          true,
+          depositorUtxos,
+          fee
         ))
 
         console.log(`