refactor(Test): verifiers refactor

rsksmart · Apr 16, 2024 · e6a7d5c · e6a7d5c
1 parent e440f3c
commit e6a7d5c
Show file tree

Hide file tree

Showing 8 changed files with 227 additions and 396 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/scripts/GasEstimation.ts b/scripts/GasEstimation.ts
@@ -16,7 +16,6 @@ import {
   ContractReceipt,
   Wallet,
   constants,
-  utils,
 } from 'ethers';
 import {
   createSmartWalletFactory,
@@ -28,6 +27,7 @@ import {
   SupportedSmartWallet,
   SupportedSmartWalletName,
   getSmartWalletAddress,
+  addSwapHash,
 } from '../test/utils/TestUtils';
 import { TestSwap, TestVerifierEverythingAccepted } from 'typechain-types';
 import { Penalizer, RelayHub } from '@rsksmart/rif-relay-contracts';
@@ -170,23 +170,20 @@ async function executeSwapWithoutRelay(swap: TestSwap) {
 
   const claimedValue = ethers.utils.parseEther('0.5');
   const timelock = 500;
-  const preimageHash = utils.soliditySha256(['bytes32'], [constants.HashZero]);
-
-  const hash = await swap.hashValues(
-    preimageHash,
-    claimedValue,
-    senderAccount.address,
-    constants.AddressZero,
-    timelock
-  );
-
-  await swap.addSwap(hash);
+  const refundAddress = Wallet.createRandom().address;
+  await addSwapHash({
+    swap,
+    amount: CLAIMED_AMOUNT,
+    claimAddress: senderAccount.address,
+    refundAddress,
+    external: true,
+  });
 
   const claimTx = await swap['claim(bytes32,uint256,address,address,uint256)'](
     constants.HashZero,
     claimedValue,
     senderAccount.address,
-    constants.AddressZero,
+    refundAddress,
     timelock
   );
 
@@ -385,18 +382,6 @@ async function estimateRelayCost(fees = NO_FEES, payment: Payment = 'erc20') {
     },
   };
 
-  const {
-    smartWalletTokenBalance: smartWalletInitialBalance,
-    relayWorkerTokenBalance: workerInitialBalance,
-    relayWorkerRBTCBalance: workerInitialBalanceRBTC,
-    ownerRBTCBalance: ownerInitialBalanceRBTC,
-  } = await getBalances({
-    owner,
-    smartWalletAddress: smartWallet.address,
-    token,
-    relayWorker,
-  });
-
   const transferReceiver = ethers.Wallet.createRandom();
 
   const { data, to, gas } = await getDestinationContractCallParams(
@@ -421,6 +406,18 @@ async function estimateRelayCost(fees = NO_FEES, payment: Payment = 'erc20') {
     owner
   );
 
+  const {
+    smartWalletTokenBalance: smartWalletInitialBalance,
+    relayWorkerTokenBalance: workerInitialBalance,
+    relayWorkerRBTCBalance: workerInitialBalanceRBTC,
+    ownerRBTCBalance: ownerInitialBalanceRBTC,
+  } = await getBalances({
+    owner,
+    smartWalletAddress: smartWallet.address,
+    token,
+    relayWorker,
+  });
+
   const relayCallResult = await relayHub
     .connect(relayWorker)
     .relayCall(completeReq, signature, {
@@ -694,22 +691,13 @@ async function getExecutionParameters(
   swap: TestSwap,
   swAddress: string
 ): Promise<DestinationContractCallParams> {
-  const timelock = 500;
-  const preimageHash = utils.soliditySha256(['bytes32'], [constants.HashZero]);
-
-  const encodedFunction = swap.interface.encodeFunctionData(
-    'claim(bytes32,uint256,address,uint256)',
-    [constants.HashZero, CLAIMED_AMOUNT, constants.AddressZero, timelock]
-  );
-
-  const hash = await swap.hashValues(
-    preimageHash,
-    CLAIMED_AMOUNT,
-    swAddress,
-    constants.AddressZero,
-    timelock
-  );
-  await swap.addSwap(hash);
+  const encodedFunction = await addSwapHash({
+    swap,
+    amount: CLAIMED_AMOUNT,
+    claimAddress: swAddress,
+    refundAddress: Wallet.createRandom().address,
+    external: true,
+  });
 
   const estimatedDestinationCallGasCorrected =
     await getEstimatedGasWithCorrection(

diff --git a/test/RelayHub.test.ts b/test/RelayHub.test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { ethers } from 'hardhat';
-import { BigNumber, Wallet, constants, providers, utils } from 'ethers';
+import { BigNumber, Wallet, constants, providers } from 'ethers';
 import {
   UtilToken,
   SmartWalletFactory,
@@ -39,6 +39,7 @@ import {
   evmMineMany,
   deployRelayHub,
   deployContract,
+  addSwapHash,
 } from './utils/TestUtils';
 import { RelayWorkersAddedEvent } from 'typechain-types/@rsksmart/rif-relay-contracts/contracts/RelayHub';
 
@@ -1006,32 +1007,13 @@ describe('RelayHub', function () {
             constants.AddressZero,
             nextWalletIndex
           );
-
           claimedValue = ethers.utils.parseEther('0.5');
-          const refundAddress = Wallet.createRandom().address;
-          const timelock = 500;
-          const preimageHash = utils.soliditySha256(
-            ['bytes32'],
-            [constants.HashZero]
-          );
-          data = swap.interface.encodeFunctionData(
-            'claim(bytes32,uint256,address,address,uint256)',
-            [
-              constants.HashZero,
-              claimedValue,
-              smartWalletAddress,
-              refundAddress,
-              timelock,
-            ]
-          );
-          const hash = await swap.hashValues(
-            preimageHash,
-            claimedValue,
-            smartWalletAddress,
-            refundAddress,
-            timelock
-          );
-          await swap.addSwap(hash);
+          data = await addSwapHash({
+            swap,
+            amount: claimedValue,
+            claimAddress: smartWalletAddress,
+            refundAddress: Wallet.createRandom().address,
+          });
         });
 
         it('should fail if revert from destination contract', async function () {
@@ -1223,9 +1205,6 @@ describe('RelayHub', function () {
         let minimalBoltzFactory: MinimalBoltzSmartWalletFactory;
         let claimedValue: BigNumber;
         let smartWalletAddress: string;
-        const timelock = 500;
-        let refundAddress: string;
-        let preimageHash: string;
 
         beforeEach(async function () {
           const smartWalletTemplate =
@@ -1248,42 +1227,24 @@ describe('RelayHub', function () {
             constants.AddressZero,
             nextWalletIndex
           );
-
-          refundAddress = Wallet.createRandom().address;
           claimedValue = ethers.utils.parseEther('0.5');
-          preimageHash = utils.soliditySha256(
-            ['bytes32'],
-            [constants.HashZero]
-          );
-          data = swap.interface.encodeFunctionData(
-            'claim(bytes32,uint256,address,address,uint256)',
-            [
-              constants.HashZero,
-              claimedValue,
-              smartWalletAddress,
-              refundAddress,
-              timelock,
-            ]
-          );
-          const hash = await swap.hashValues(
-            preimageHash,
-            claimedValue,
-            smartWalletAddress,
-            refundAddress,
-            timelock
-          );
-          await swap.addSwap(hash);
+          data = await addSwapHash({
+            swap,
+            amount: claimedValue,
+            claimAddress: smartWalletAddress,
+            refundAddress: Wallet.createRandom().address,
+          });
         });
 
         it('should fail if revert from destination contract', async function () {
           data = swap.interface.encodeFunctionData(
             'claim(bytes32,uint256,address,address,uint256)',
             [
-              preimageHash,
+              constants.HashZero,
               ethers.utils.parseEther('2'),
               smartWalletAddress,
-              refundAddress,
-              timelock,
+              constants.AddressZero,
+              500,
             ]
           );
 

diff --git a/test/relayclient/RelayClient.test.ts b/test/relayclient/RelayClient.test.ts
@@ -1,5 +1,6 @@
 import { expect } from 'chai';
 import {
+  addSwapHash,
   assertLog,
   createSmartWalletFactory,
   createSupportedSmartWallet,
@@ -29,7 +30,7 @@ import {
   HttpClient,
   HttpWrapper,
 } from '@rsksmart/rif-relay-client';
-import { constants, utils, Wallet } from 'ethers';
+import { constants, Wallet } from 'ethers';
 import { ethers } from 'hardhat';
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 import { loadConfiguration } from '../relayserver/ServerTestUtils';
@@ -560,31 +561,13 @@ describe('RelayClient', function () {
             constants.AddressZero,
             nextWalletIndex
           );
-          const refundAddress = Wallet.createRandom().address;
           const claimedValue = ethers.utils.parseEther('0.5');
-          const preimageHash = utils.soliditySha256(
-            ['bytes32'],
-            [constants.HashZero]
-          );
-          const timelock = 500;
-          data = swap.interface.encodeFunctionData(
-            'claim(bytes32,uint256,address,address,uint256)',
-            [
-              constants.HashZero,
-              claimedValue,
-              smartWalletAddress,
-              refundAddress,
-              timelock,
-            ]
-          );
-          const hash = await swap.hashValues(
-            preimageHash,
-            claimedValue,
-            smartWalletAddress,
-            refundAddress,
-            timelock
-          );
-          await swap.addSwap(hash);
+          data = await addSwapHash({
+            swap,
+            amount: claimedValue,
+            claimAddress: smartWalletAddress,
+            refundAddress: Wallet.createRandom().address,
+          });
         });
 
         it('without tokenGas', async function () {