wip

sprintertech · Jan 16, 2025 · d251b53 · d251b53
1 parent c4be936
commit d251b53
Show file tree

Hide file tree

Showing 58 changed files with 388 additions and 524 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ data/
 .vscode/
 .env
 artifacts/
+cache
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -1,5 +1,6 @@
 import * as dotenv from "dotenv";
 import type { HardhatUserConfig } from "hardhat/config";
+import "@nomicfoundation/hardhat-viem";
 import "@nomiclabs/hardhat-solhint";
 import "hardhat-chai-matchers-viem";
 import "hardhat-gas-reporter"

diff --git a/package.json b/package.json
@@ -35,12 +35,11 @@
   "author": "Sygma",
   "license": "BUSL-1.1",
   "devDependencies": {
-    "@nomicfoundation/hardhat-chai-matchers": "^2.0.8",
-    "@nomicfoundation/hardhat-ignition": "^0.15.0",
+    "@metamask/eth-sig-util": "^8.1.2",
     "@nomicfoundation/hardhat-ignition-viem": "^0.15.0",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.0",
     "@nomicfoundation/hardhat-verify": "^2.0.0",
-    "@nomicfoundation/hardhat-viem": "^2.0.5",
+    "@nomicfoundation/hardhat-viem": "^2.0.6",
     "@nomiclabs/hardhat-solhint": "^4.0.1",
     "@types/chai": "^5.0.1",
     "@types/chai-as-promised": "^7.1.6",
@@ -54,21 +53,20 @@
     "eslint-plugin-import": "^2.25.2",
     "eslint-plugin-n": "^15.0.0",
     "eslint-plugin-promise": "^6.0.0",
-    "hardhat": "^2.22.15",
+    "ethers": "^6.13.5",
+    "hardhat": "^2.22.18",
     "hardhat-chai-matchers-viem": "^2.0.8",
     "hardhat-gas-reporter": "^2.2.2",
     "prettier": "2.8.1",
     "solhint": "^3.3.7",
     "solidity-coverage": "^0.8.0",
+    "solmate": "^6.8.0",
     "ts-node": ">=8.0.0",
     "typescript": "5.0.3",
     "viem": "^2.13.7"
   },
   "dependencies": {
-    "@metamask/eth-sig-util": "^8.1.1",
     "@openzeppelin/contracts": "4.5.0",
-    "@uniswap/v3-periphery": "^1.4.4",
-    "ethers": "^6.13.4",
-    "solmate": "^6.2.0"
+    "@uniswap/v3-periphery": "^1.4.4"
   }
 }
diff --git a/test/adapters/native/collectFee.test.ts b/test/adapters/native/collectFee.test.ts
@@ -77,6 +77,7 @@ describe("Bridge - [collect fee - native token]", () => {
     // check that correct ETH amount is successfully transferred to the adapter
     const adapterBalanceAfter = await getBalance(NativeTokenTransferGatewayInstance);
     const handlerBalanceAfter = await getBalance(NativeTokenHandlerInstance);
+    console.log("123-0", depositAmount)
     console.log("123-1", transferredAmount)
     console.log("123-2", handlerBalanceBefore)
     console.log("123-3", handlerBalanceAfter)

diff --git a/test/adapters/native/decimalConversion.test.ts b/test/adapters/native/decimalConversion.test.ts
@@ -3,7 +3,7 @@
 
 import hre from "hardhat";
 import {assert, expect} from "chai";
-import {encodeAbiParameters, Hex, keccak256, parseAbiParameters, parseEther, parseUnits, WalletClient,  concat, toHex} from "viem";
+import {encodeAbiParameters, Hex, keccak256, parseAbiParameters, parseEther, parseUnits, WalletClient,  concat, toHex, toBytes} from "viem";
 import {createBtcDepositData, createERCDepositData, deploySourceChainContracts, getBalance, mpcAddress, signTypedProposal, trimPrefix} from "../../helpers";
 import {ContractTypesMap} from "hardhat/types";
 import {loadFixture} from "@nomicfoundation/hardhat-network-helpers";
@@ -18,7 +18,7 @@ describe("Bridge - [decimal conversion - native token]", () => {
   const resourceID = toHex(650, {size:32});
   const btcrecipient = "bc1qs0fcdq73vgurej48yhtupzcv83un2p5qhsje7n";
   const originDecimalPlaces = 8;
-  const originHexDecimalPlaces = toHex(originDecimalPlaces);
+  const originHexDecimalPlaces = toHex(originDecimalPlaces, {size: 1});
   const depositAmount = parseUnits("1", originDecimalPlaces);
   const fee = parseUnits("0.1", originDecimalPlaces);
   const transferredAmount = depositAmount - fee;
@@ -91,9 +91,8 @@ describe("Bridge - [decimal conversion - native token]", () => {
     await BridgeInstance.write.endKeygen([mpcAddress]);
 
     // send ETH to destination adapter for transfers
-
     await depositor.sendTransaction({
-      account: depositor!.account,
+      account: depositor.account!.address,
       to: NativeTokenHandlerInstance.address,
       value: BigInt(1000000000000000000),
       chain: null
@@ -150,7 +149,7 @@ describe("Bridge - [decimal conversion - native token]", () => {
       data: proposalData,
     };
 
-    const proposalSignedData = await signTypedProposal(
+    const proposalSignedData = signTypedProposal(
       BridgeInstance.address,
       [proposal]
     );

diff --git a/test/adapters/native/executeProposal.test.ts b/test/adapters/native/executeProposal.test.ts
@@ -88,10 +88,11 @@ describe("Bridge - [execute proposal - native token]", () => {
     await BridgeInstance.write.endKeygen([mpcAddress]);
 
     // send ETH to destination adapter for transfers
-    await web3.eth.sendTransaction({
-       account: depositor.account,
+    await depositor.sendTransaction({
+       account: depositor.account!.address,
       to: NativeTokenHandlerInstance.address,
-      value: "1000000000000000000"
+      value: BigInt(1000000000000000000),
+      chain: null
     })
   });
 
@@ -107,7 +108,7 @@ describe("Bridge - [execute proposal - native token]", () => {
   });
 
   it("should create and execute executeProposal successfully", async () => {
-    const proposalSignedData = await signTypedProposal(
+    const proposalSignedData = signTypedProposal(
       BridgeInstance.address,
       [proposal]
     );
@@ -145,7 +146,7 @@ describe("Bridge - [execute proposal - native token]", () => {
   });
 
   it("should skip executing proposal if deposit nonce is already used", async () => {
-    const proposalSignedData = await signTypedProposal(
+    const proposalSignedData = signTypedProposal(
       BridgeInstance.address,
       [proposal]
     );
@@ -181,7 +182,7 @@ describe("Bridge - [execute proposal - native token]", () => {
   });
 
   it("executeProposal event should be emitted with expected values", async () => {
-    const proposalSignedData = await signTypedProposal(
+    const proposalSignedData = signTypedProposal(
       BridgeInstance.address,
       [proposal]
     );

diff --git a/test/adapters/native/optionalContractCall/collectFee.test.ts b/test/adapters/native/optionalContractCall/collectFee.test.ts
@@ -38,7 +38,9 @@ describe("Bridge - [collect fee - native token]", () => {
       DefaultMessageReceiverInstance,
       BridgeInstance,
       BasicFeeHandlerInstance,
+      NativeTokenHandlerInstance,
       ERC20MintableInstance,
+      FeeHandlerRouterInstance
     } = await loadFixture(deploySourceChainContracts));
     [
       ,

diff --git a/test/adapters/native/optionalContractCall/decimalConversion.test.ts b/test/adapters/native/optionalContractCall/decimalConversion.test.ts
@@ -127,10 +127,11 @@ describe("Bridge - [decimal conversion - native token]", () => {
     };
 
     // send ETH to destination adapter for transfers
-    await web3.eth.sendTransaction({
-       account: depositor.account,
+    await depositor.sendTransaction({
+      account: depositor.account!.address,
       to: NativeTokenHandlerInstance.address,
-      value: "1000000000000000000"
+      value: BigInt(1000000000000000000),
+      chain: null
     })
 
     // set MPC address to unpause the Bridge
@@ -192,7 +193,7 @@ describe("Bridge - [decimal conversion - native token]", () => {
       data: proposalData,
     };
 
-    const proposalSignedData = await signTypedProposal(
+    const proposalSignedData = signTypedProposal(
       BridgeInstance.address,
       [proposal]
     );

diff --git a/test/adapters/native/optionalContractCall/deposit.test.ts b/test/adapters/native/optionalContractCall/deposit.test.ts
@@ -45,6 +45,9 @@ describe("Bridge - [deposit - native token]", () => {
       BridgeInstance,
       ERC20MintableInstance,
       BasicFeeHandlerInstance,
+      NativeTokenTransferGatewayInstance,
+      NativeTokenHandlerInstance,
+      FeeHandlerRouterInstance
     } = await loadFixture(deploySourceChainContracts));
     [
       ,

diff --git a/test/adapters/native/optionalContractCall/distributeFee.test.ts b/test/adapters/native/optionalContractCall/distributeFee.test.ts
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 import hre from 'hardhat';
-import {concat, encodeAbiParameters, encodeFunctionData, Hex, keccak256, parseAbiParameters, parseEther, parseUnits, toFunctionSelector, toHex, WalletClient, zeroAddress} from "viem";
-import {createBtcDepositData, createGmpDepositData, createMessageCallData, createOptionalContractCallDepositData, createResourceID, deploySourceChainContracts, mpcAddress, trimPrefix} from "../../../helpers";
+import {concat, encodeAbiParameters, encodeFunctionData, formatEther, formatUnits, Hex, keccak256, parseAbiParameters, parseEther, parseUnits, toFunctionSelector, toHex, WalletClient, zeroAddress} from "viem";
+import {createBtcDepositData, createGmpDepositData, createMessageCallData, createOptionalContractCallDepositData, createResourceID, deploySourceChainContracts, getBalance, mpcAddress, trimPrefix} from "../../../helpers";
 import {ContractTypesMap} from 'hardhat/types';
 import {loadFixture} from '@nomicfoundation/hardhat-network-helpers';
 import {assert, expect} from 'chai';
@@ -43,6 +43,8 @@ describe("Native token adapter - [distributeFee]", () => {
       BridgeInstance,
       ERC20MintableInstance,
       BasicFeeHandlerInstance,
+      NativeTokenHandlerInstance,
+      NativeTokenTransferGatewayInstance,
     } = await loadFixture(deploySourceChainContracts));
     [
       ,
@@ -111,11 +113,8 @@ describe("Native token adapter - [distributeFee]", () => {
 
     // check the balance is 0
     assert.equal(
-      web3.utils.fromWei(
-        await getBalance(BridgeInstance.address),
-        "ether"
-      ),
-      "0"
+      await getBalance(BridgeInstance),
+      parseEther("0")
     );
     await NativeTokenTransferGatewayInstance.write.depositToEVMWithMessage([
       destinationDomainID,
@@ -128,25 +127,16 @@ describe("Native token adapter - [distributeFee]", () => {
       }
     );
     assert.equal(
-      web3.utils.fromWei(
-        await getBalance(BridgeInstance.address),
-        "ether"
-      ),
-      "0"
+      await getBalance(BridgeInstance),
+      parseEther("0")
     );
     assert.equal(
-      web3.utils.fromWei(
-        await getBalance(NativeTokenTransferGatewayInstance.address),
-        "ether"
-      ),
-      "0"
+      await getBalance(NativeTokenTransferGatewayInstance),
+      parseEther("0")
     );
     assert.equal(
-      web3.utils.fromWei(
-        await getBalance(NativeTokenHandlerInstance.address),
-        "ether"
-      ),
-      Ethers.utils.formatUnits(transferredAmount)
+      await getBalance(NativeTokenHandlerInstance),
+      parseEther(transferredAmount.toString())
     );
 
     const depositorBalanceBefore = await getBalance(depositor);
@@ -171,8 +161,8 @@ describe("Native token adapter - [distributeFee]", () => {
       payout
     );
 
-    const depositorBalanceAfter = await getBalance(depositor.account!.address);
-    const recipientBalanceAfter = await getBalance(recipient.account!.address);
+    const depositorBalanceAfter = await getBalance(depositor);
+    const recipientBalanceAfter = await getBalance(recipient);
     assert.equal(depositorBalanceAfter, depositorBalanceBefore + payout);
     assert.equal(recipientBalanceAfter, recipientBalanceBefore + payout);
   });
@@ -193,18 +183,12 @@ describe("Native token adapter - [distributeFee]", () => {
     );
 
     assert.equal(
-      web3.utils.fromWei(
-        await getBalance(NativeTokenTransferGatewayInstance.address),
-        "ether"
-      ),
-      "0"
+      await getBalance(NativeTokenTransferGatewayInstance),
+      parseEther("0")
     );
     assert.equal(
-      web3.utils.fromWei(
-        await getBalance(NativeTokenHandlerInstance.address),
-        "ether"
-      ),
-      Ethers.utils.formatUnits(transferredAmount)
+      await getBalance(NativeTokenHandlerInstance),
+      parseEther(transferredAmount.toString())
     );
 
     const payout = parseEther("0.01");
@@ -231,18 +215,12 @@ describe("Native token adapter - [distributeFee]", () => {
     );
 
     assert.equal(
-      web3.utils.fromWei(
-        await getBalance(NativeTokenTransferGatewayInstance.address),
-        "ether"
-      ),
-      "0"
+      await getBalance(NativeTokenTransferGatewayInstance),
+      parseEther("0")
     );
     assert.equal(
-      web3.utils.fromWei(
-        await getBalance(NativeTokenHandlerInstance.address),
-        "ether"
-      ),
-      Ethers.utils.formatUnits(transferredAmount)
+      await getBalance(NativeTokenHandlerInstance),
+      parseEther(transferredAmount.toString())
     );
 
     const payout = parseEther("0.01");

diff --git a/test/adapters/native/optionalContractCall/executeProposal.test.ts b/test/adapters/native/optionalContractCall/executeProposal.test.ts
@@ -48,6 +48,10 @@ describe("Bridge - [execute proposal - native token]", () => {
       BridgeInstance,
       ERC20MintableInstance,
       BasicFeeHandlerInstance,
+      DefaultMessageReceiverInstance,
+      NativeTokenTransferGatewayInstance,
+      NativeTokenHandlerInstance,
+      FeeHandlerRouterInstance
     } = await loadFixture(deploySourceChainContracts));
     [
       ,
@@ -139,7 +143,7 @@ describe("Bridge - [execute proposal - native token]", () => {
   });
 
   it("should create and execute executeProposal with contract call successfully", async () => {
-    const proposalSignedData = await signTypedProposal(
+    const proposalSignedData = signTypedProposal(
       BridgeInstance.address,
       [proposal]
     );
@@ -159,8 +163,8 @@ describe("Bridge - [execute proposal - native token]", () => {
     ).not.to.be.reverted;
 
     const recipientNativeBalanceBefore = await getBalance(recipient);
-    const recipientERC20BalanceBefore = await ERC20MintableInstance.read.balanceOf([recipient]);
-    const defaultReceiverBalanceBefore = await getBalance(DefaultMessageReceiverInstance.address);
+    const recipientERC20BalanceBefore = await ERC20MintableInstance.read.balanceOf([recipient.account!.address]);
+    const defaultReceiverBalanceBefore = await getBalance(DefaultMessageReceiverInstance);
 
     await expect(
       BridgeInstance.write.executeProposal([proposal, proposalSignedData], {
@@ -180,7 +184,7 @@ describe("Bridge - [execute proposal - native token]", () => {
     // check that tokens are transferred to recipient address
     const recipientNativeBalanceAfter = await getBalance(recipient);
     const recipientERC20BalanceAfter = await ERC20MintableInstance.read.balanceOf([recipient.account!.address]);
-    const defaultReceiverBalanceAfter = await getBalance(DefaultMessageReceiverInstance.address);
+    const defaultReceiverBalanceAfter = await getBalance(DefaultMessageReceiverInstance);
 
     assert.strictEqual(
       recipientNativeBalanceBefore + transferredAmount,
@@ -194,7 +198,7 @@ describe("Bridge - [execute proposal - native token]", () => {
   });
 
   it("should skip executing proposal if deposit nonce is already used", async () => {
-    const proposalSignedData = await signTypedProposal(
+    const proposalSignedData = signTypedProposal(
       BridgeInstance.address,
       [proposal]
     );
@@ -234,7 +238,7 @@ describe("Bridge - [execute proposal - native token]", () => {
   });
 
   it("executeProposal event should be emitted with expected values", async () => {
-    const proposalSignedData = await signTypedProposal(
+    const proposalSignedData = signTypedProposal(
       BridgeInstance.address,
       [proposal]
     );
@@ -321,7 +325,7 @@ describe("Bridge - [execute proposal - native token]", () => {
       await DefaultMessageReceiverInstance.read.SYGMA_HANDLER_ROLE(),
       NativeTokenHandlerInstance.address
     ]);
-    const proposalSignedData = await signTypedProposal(
+    const proposalSignedData = signTypedProposal(
       BridgeInstance.address,
       [proposal]
     );
@@ -358,7 +362,7 @@ describe("Bridge - [execute proposal - native token]", () => {
 
   it("should revert if insufficient gas limit left for executing action", async () => {
     const insufficientExecutionGasAmount = BigInt(100000);
-    const proposalSignedData = await signTypedProposal(
+    const proposalSignedData = signTypedProposal(
       BridgeInstance.address,
       [proposal]
     );
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,3 +12,4 @@ data/ @@
     .vscode/
     .env
     artifacts/
+    cache