chore: add wip, refactor test utils

Author: DefiCake

packages/solidity-contracts/test/messagesOutgoingV2.test.ts

@@ -3,6 +3,7 @@ import chai from 'chai';
 import type { Provider } from 'ethers';
 import {
   MaxUint256,
+  Wallet,
   hexlify,
   parseEther,
   randomBytes,
@@ -11,11 +12,14 @@ import {
 import { deployments, ethers, upgrades } from 'hardhat';
 
 import { randomBytes32 } from '../protocol/utils';
-import type { FuelChainState, FuelMessagePortalV2 } from '../typechain';
+import {
+  FuelMessagePortalV2__factory,
+  type FuelChainState,
+  type FuelMessagePortalV2,
+  FuelChainState__factory,
+} from '../typechain';
 import type { MessageTester } from '../typechain/MessageTester';
 
-import {} from '@openzeppelin/hardhat-upgrades';
-
 import { addressToB256 } from './utils/addressConversion';
 
 const { expect } = chai;
@@ -79,6 +83,11 @@ describe('FuelMessagesPortalV2 - Outgoing messages', async () => {
         await fuelMessagePortalDeployment.getAddress()
       ).connect(fuelMessagePortalDeployment.runner) as FuelMessagePortalV2;
 
+      const wallet = Wallet.createRandom().connect(deployer.provider);
+      FuelChainState__factory.connect(
+        await fuelMessagePortal.getAddress(),
+        wallet
+      );
       const messageTester = (await ethers
         .getContractFactory('MessageTester', deployer)
         .then(async (factory) =>

packages/test-utils/package.json

@@ -17,15 +17,12 @@
   },
   "peerDependencies": {
     "fuels": "0.71.1",
-    "ethers": ">=5.7.2"
+    "ethers": "6.11.0"
   },
   "devDependencies": {
     "@fuel-bridge/fungible-token": "workspace:*",
     "@fuel-bridge/message-predicates": "workspace:*",
     "@fuel-bridge/solidity-contracts": "workspace:*",
-    "@ethersproject/abi": "^5.7.0",
-    "@ethersproject/bytes": "^5.7.0",
-    "@ethersproject/providers": "^5.7.0",
     "dotenv": "^16.0.3",
     "typescript": "^5.1.6"
   }

packages/test-utils/src/utils/ethers/getOrDeployERC721Contract.ts

@@ -13,16 +13,17 @@ export async function getOrDeployERC721Contract(env: TestEnvironment) {
   if (!ethTestNft) {
     debug(`Creating ERC-721 token contract to test with...`);
     const eth_tokenFactory = new NFT__factory(ethDeployer);
-    ethTestNft = await eth_tokenFactory.deploy();
-    await ethTestNft.deployed();
+    ethTestNft = await eth_tokenFactory
+      .deploy()
+      .then((tx) => tx.waitForDeployment());
+
     debug(
-      `Ethereum ERC-721 token contract created at address ${ethTestNft.address}.`
+      `Ethereum ERC-721 token contract created at address ${await ethTestNft.getAddress()}.`
     );
   }
   ethTestNft = ethTestNft.connect(ethAcct);
-  const ethTestTokenAddress = ethTestNft.address;
   debug(
-    `Testing with Ethereum ERC-721 token contract at ${ethTestTokenAddress}.`
+    `Testing with Ethereum ERC-721 token contract at ${await ethTestNft.getAddress()}.`
   );
 
   return ethTestNft;

packages/test-utils/src/utils/setup.ts

@@ -1,6 +1,5 @@
 /// @dev The Fuel testing setup.
 /// A set of useful helper methods for setting up the integration test environment.
-import type { Provider as EthProvider } from '@ethersproject/providers';
 import type {
   FuelChainState,
   FuelMessagePortal,
@@ -14,8 +13,8 @@ import {
   FuelERC721Gateway__factory,
 } from '@fuel-bridge/solidity-contracts/typechain';
 import * as dotenv from 'dotenv';
-import type { Wallet as EthSigner } from 'ethers';
-import { ethers } from 'ethers';
+import type { Signer as EthSigner, Provider as EthProvider } from 'ethers';
+import { JsonRpcProvider, ethers, formatEther, parseEther } from 'ethers';
 import type { WalletUnlocked as FuelWallet } from 'fuels';
 import { Wallet, Provider as FuelProvider } from 'fuels';
 
@@ -148,9 +147,8 @@ export async function setupEnvironment(
   }
 
   // Create provider and signers from http_ethereum_client
-  const eth_provider = new ethers.providers.JsonRpcProvider(
-    http_ethereum_client
-  );
+  const eth_provider = new JsonRpcProvider(http_ethereum_client);
+
   try {
     await eth_provider.getBlockNumber();
   } catch (e) {
@@ -161,29 +159,29 @@ export async function setupEnvironment(
     );
   }
   const eth_deployer = new ethers.Wallet(pk_eth_deployer, eth_provider);
-  const eth_deployerBalance = await eth_deployer.getBalance();
-  if (eth_deployerBalance.lt(ethers.utils.parseEther('5'))) {
+  const eth_deployerBalance = await eth_provider.getBalance(eth_deployer);
+  if (eth_deployerBalance < parseEther('5')) {
     throw new Error(
       'Ethereum deployer balance is very low (' +
-        ethers.utils.formatEther(eth_deployerBalance) +
+        formatEther(eth_deployerBalance) +
         'ETH)'
     );
   }
   const eth_signer1 = new ethers.Wallet(pk_eth_signer1, eth_provider);
-  const eth_signer1Balance = await eth_signer1.getBalance();
-  if (eth_signer1Balance.lt(ethers.utils.parseEther('1'))) {
+  const eth_signer1Balance = await eth_provider.getBalance(eth_signer1);
+  if (eth_signer1Balance < parseEther('1')) {
     const tx = await eth_deployer.sendTransaction({
       to: await eth_signer1.getAddress(),
-      value: ethers.utils.parseEther('1'),
+      value: parseEther('1'),
     });
     await tx.wait();
   }
   const eth_signer2 = new ethers.Wallet(pk_eth_signer2, eth_provider);
-  const eth_signer2Balance = await eth_signer2.getBalance();
-  if (eth_signer2Balance.lt(ethers.utils.parseEther('1'))) {
+  const eth_signer2Balance = await eth_provider.getBalance(eth_signer2);
+  if (eth_signer2Balance < parseEther('1')) {
     const tx = await eth_deployer.sendTransaction({
       to: await eth_signer2.getAddress(),
-      value: ethers.utils.parseEther('1'),
+      value: parseEther('1'),
     });
     await tx.wait();
   }
@@ -245,6 +243,7 @@ export async function setupEnvironment(
   }
 
   // Connect existing contracts
+
   const eth_fuelChainState: FuelChainState = FuelChainState__factory.connect(
     eth_fuelChainStateAddress,
     eth_deployer