Merge branch 'QA-Test' into pegin-refunds

rsksmart · Nov 13, 2024 · 5b02f5a · 5b02f5a
2 parents 43764e7 + a680ffa
commit 5b02f5a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/contracts/LiquidityBridgeContractV2.sol b/contracts/LiquidityBridgeContractV2.sol
@@ -730,7 +730,7 @@ contract LiquidityBridgeContractV2 is Initializable, OwnableUpgradeable, Reentra
         }
 
         (bool sent,) = quote.lpRskAddress.call{
-                value: quote.value + quote.callFee
+                value: quote.value + quote.callFee + quote.gasFee
             }("");
         require(sent, "LBC050");
 

diff --git a/test/basic.tests.js b/test/basic.tests.js
@@ -992,7 +992,7 @@ contract("LiquidityBridgeContractV2.sol", async (accounts) => {
           web3.eth.getBalance(instance.address),
         ]);
 
-      const [userPegInBalanceBefore, contractBalanceBefore] = await getBalances();
+      const [lpBalanceBeforeDeposit, contractBalanceBefore] = await getBalances();
 
       let quote = utils.getTestPegOutQuote(
         instance.address, //lbc address
@@ -1022,14 +1022,14 @@ contract("LiquidityBridgeContractV2.sol", async (accounts) => {
       await truffleAssertions.eventEmitted(pegOut, "PegOutDeposit");
 
       const btcTx = await utils.generateRawTx(instance, quote, scriptType);
-      const [userPegInBalanceAfter, contractBalanceAfter] = await getBalances();
+      const [lpBalanceAfterDeposit, contractBalanceAfter] = await getBalances();
 
-      expect(userPegInBalanceBefore.toString()).to.be.eq(
-        userPegInBalanceAfter.toString()
+      expect(lpBalanceBeforeDeposit.toString()).to.be.eq(
+        lpBalanceAfterDeposit.toString()
       );
       expect(+contractBalanceAfter).to.be.eq(+contractBalanceBefore + msgValue.toNumber());
 
-      const lpBalanceBefore = await web3.eth.getBalance(
+      const lpBalanceBeforeRefund = await web3.eth.getBalance(
         liquidityProviderRskAddress
       );
       const refund = await instance.refundPegOut(
@@ -1039,19 +1039,19 @@ contract("LiquidityBridgeContractV2.sol", async (accounts) => {
         partialMerkleTree,
         merkleBranchHashes
       );
-      const lpBalanceAfter = await web3.eth.getBalance(
+      const lpBalanceAfterRefund = await web3.eth.getBalance(
         liquidityProviderRskAddress
       );
       const usedInGas = refund.receipt.gasUsed * refund.receipt.effectiveGasPrice;
-      const refundedAmount = quote.value.add(quote.callFee);
+      const refundedAmount = quote.value.add(quote.callFee).add(quote.gasFee);
       truffleAssertions.eventEmitted(refund, "DaoFeeSent", {
         quoteHash: quoteHash,
         amount: quote.productFeeAmount
       });
-      expect(lpBalanceAfter).to.be.a.bignumber.eq(
-        web3.utils.toBN(lpBalanceBefore).add(refundedAmount).sub(web3.utils.toBN(usedInGas))
+      expect(lpBalanceAfterRefund).to.be.a.bignumber.eq(
+        web3.utils.toBN(lpBalanceBeforeRefund).add(refundedAmount).sub(web3.utils.toBN(usedInGas))
       );
-      truffleAssertions.eventEmitted(refund, "PegOutRefunded");
+      truffleAssertions.eventEmitted(refund, "PegOutRefunded", { quoteHash });
     });
   });
 

diff --git a/test/utils/index.js b/test/utils/index.js
@@ -75,7 +75,7 @@ function getTestPegOutQuote(lbcAddress, lpRskAddress, rskRefundAddress, value, b
   }
 
   let valueToTransfer = value || web3.utils.toBN(0);
-  let callFee = web3.utils.toBN(1);
+  const callFee = web3.utils.toBN(2);
   let nonce = 0;
   let agreementTimestamp = 1661788988;
   let expireDate = Math.round(new Date().getTime() / 1000) + 3600;
@@ -86,7 +86,7 @@ function getTestPegOutQuote(lbcAddress, lpRskAddress, rskRefundAddress, value, b
   let transferConfirmations = 10;
   let penaltyFee = web3.utils.toBN(0);
   let productFeeAmount = web3.utils.toBN(1);
-  const gasFee = web3.utils.toBN(1);
+  const gasFee = web3.utils.toBN(42);
 
   let quote = {
     lbcAddress,