Merge branch 'main' into slither-only-v2

zeta-chain · Jul 17, 2024 · df1eb0f · df1eb0f
2 parents 0ce2bd8 + 2bbd352
commit df1eb0f
Show file tree

Hide file tree

Showing 99 changed files with 6,788 additions and 48,497 deletions.
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
@@ -27,13 +27,17 @@ jobs:
           node-version: "18"
           registry-url: "https://registry.npmjs.org"
 
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+
       - name: Install Dependencies
         run: yarn install
 
       - name: Test with coverage
-        run: yarn coverage || true
-    
+        run: yarn coverage
+
       - name: Upload coverage reports to Codecov
         uses: codecov/[email protected]
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
+          files: lcov.info
diff --git a/.github/workflows/generated-files.yaml b/.github/workflows/generated-files.yaml
@@ -18,14 +18,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version: "18.0.0"
           registry-url: "https://registry.npmjs.org"
 
       - name: Install dependencies

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -19,14 +19,14 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "18.0.0"
           registry-url: "https://registry.npmjs.org"
 
       - name: Install Foundry
@@ -37,6 +37,9 @@ jobs:
 
       - name: Build project
         run: yarn build
+
+      - name: Test (foundry)
+        run: yarn test:foundry
 
       - name: Test (hardhat)
         run: yarn test
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ tsconfig.tsbuildinfo
 # Coverage
 coverage
 coverage.json
+lcov.info
 
 # Slither
 scripts/slither-results/*

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/openzeppelin-foundry-upgrades"]
+	path = lib/openzeppelin-foundry-upgrades
+	url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades
diff --git a/contracts/prototypes/evm/ERC20CustodyNew.sol b/contracts/prototypes/evm/ERC20CustodyNew.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.7;
+pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "./interfaces.sol";

diff --git a/contracts/prototypes/evm/GatewayEVM.sol b/contracts/prototypes/evm/GatewayEVM.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.7;
+pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
@@ -16,7 +16,10 @@ contract GatewayEVM is Initializable, OwnableUpgradeable, UUPSUpgradeable, IGate
     address public custody;
     address public tssAddress;
 
-    constructor() {}
+    /// @custom:oz-upgrades-unsafe-allow constructor
+    constructor() {
+        _disableInitializers();
+    }
 
     function initialize(address _tssAddress) public initializer {
         __Ownable_init();
@@ -31,7 +34,6 @@ contract GatewayEVM is Initializable, OwnableUpgradeable, UUPSUpgradeable, IGate
 
     function _execute(address destination, bytes calldata data) internal returns (bytes memory) {
         (bool success, bytes memory result) = destination.call{value: msg.value}(data);
-
         if (!success) revert ExecutionFailed();
 
         return result;

diff --git a/contracts/prototypes/evm/GatewayEVMUpgradeTest.sol b/contracts/prototypes/evm/GatewayEVMUpgradeTest.sol
@@ -11,6 +11,7 @@ import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 // NOTE: Purpose of this contract is to test upgrade process, the only difference should be name of Executed event
 // The Gateway contract is the endpoint to call smart contracts on external chains
 // The contract doesn't hold any funds and should never have active allowances
+/// @custom:oz-upgrades-from GatewayEVM
 contract GatewayEVMUpgradeTest is Initializable, OwnableUpgradeable, UUPSUpgradeable {
     using SafeERC20 for IERC20;
 

diff --git a/contracts/prototypes/evm/ReceiverEVM.sol b/contracts/prototypes/evm/ReceiverEVM.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.7;
+pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

diff --git a/contracts/prototypes/evm/TestERC20.sol b/contracts/prototypes/evm/TestERC20.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.7;
+pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 

diff --git a/contracts/prototypes/evm/interfaces.sol b/contracts/prototypes/evm/interfaces.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.7;
+pragma solidity ^0.8.0;
 
 interface IGatewayEVMEvents {
     event Executed(address indexed destination, uint256 value, bytes data);

diff --git a/contracts/prototypes/test/GatewayEVM.t.sol b/contracts/prototypes/test/GatewayEVM.t.sol
diff --git a/contracts/prototypes/test/GatewayEVMZEVM.t.sol b/contracts/prototypes/test/GatewayEVMZEVM.t.sol
diff --git a/echidna.yaml b/echidna.yaml
@@ -3,4 +3,5 @@ cryticArgs: ['--solc-remaps', '@=node_modules/@']
 testMode: "assertion"
 testLimit: 50000  
 seqLen: 10000 
-allContracts: false
+allContracts: false
+balanceAddr: 0x1043561a8829300000 
diff --git a/foundry.toml b/foundry.toml
@@ -2,8 +2,14 @@
 src = 'contracts'
 out = 'out'
 libs = ['node_modules', 'lib']
-test = 'test'
+test = 'testFoundry'
 cache_path  = 'cache_forge'
 no-match-contract = '.*EchidnaTest$'
 optimizer = true
-optimizer_runs = 10_000
+optimizer_runs = 10_000
+ffi = true
+ast = true
+build_info = true
+extra_output = ["storageLayout"]
+fs_permissions = [{ access = "read", path = "out"}]
+evm_version = "london"
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -44,6 +44,7 @@ const config: HardhatUserConfig = {
   },
   networks: {
     ...getHardhatConfigNetworks(),
+    hardhat: {},
   },
   solidity: {
     compilers: [

diff --git a/lib/openzeppelin-foundry-upgrades b/lib/openzeppelin-foundry-upgrades
diff --git a/lib/types.ts b/lib/types.ts
@@ -1,42 +1,4 @@
-export type ParamSymbol =
-  | "BNB.BSC"
-  | "BTC.BTC"
-  | "ETH.ETH"
-  | "gETH"
-  | "MATIC.AMOY"
-  | "sETH.SEPOLIA"
-  | "tBNB"
-  | "tBTC"
-  | "tMATIC"
-  | "USDC.BSC"
-  | "USDC.ETH"
-  | "USDC.SEPOLIA"
-  | "USDC"
-  | "USDT.BSC"
-  | "USDT.ETH";
-export type ParamChainName =
-  | "amoy_testnet"
-  | "bsc_mainnet"
-  | "bsc_testnet"
-  | "btc_mainnet"
-  | "btc_testnet"
-  | "eth_mainnet"
-  | "sepolia_testnet"
-  | "zeta_mainnet"
-  | "zeta_testnet";
-export type ParamType =
-  | "connector"
-  | "erc20Custody"
-  | "fungibleModule"
-  | "pauser"
-  | "systemContract"
-  | "tss"
-  | "tssUpdater"
-  | "uniswapV2Factory"
-  | "uniswapV2Router02"
-  | "uniswapV3Factory"
-  | "uniswapV3Router"
-  | "weth9"
-  | "zetaToken"
-  | "zetaTokenConsumerUniV3"
-  | "zrc20";
+export type ParamSymbol = "USDC.BSC" | "USDC.ETH" | "BTC.BTC" | "BNB.BSC" | "USDT.ETH" | "USDT.BSC" | "ETH.ETH" | "sETH.SEPOLIA" | "USDC" | "gETH" | "tMATIC" | "tBTC" | "MATIC.AMOY" | "USDC.SEPOLIA" | "tBNB";
+export type ParamChainName = "eth_mainnet" | "bsc_mainnet" | "zeta_mainnet" | "btc_mainnet" | "bsc_testnet" | "zeta_testnet" | "btc_testnet" | "amoy_testnet" | "sepolia_testnet";
+export type ParamType = "connector" | "erc20Custody" | "pauser" | "tss" | "tssUpdater" | "uniswapV2Factory" | "uniswapV2Router02" | "uniswapV3Factory" | "uniswapV3Router" | "weth9" | "zetaToken" | "fungibleModule" | "systemContract" | "zrc20" | "zetaTokenConsumerUniV3";
+