cleanup and improve test ci

.github/workflows/test.yaml

@@ -35,6 +35,14 @@ jobs:
       - name: Install Dependencies
         run: yarn install
 
-      - name: Test
+      - name: Test (hardhat)
         run: yarn test
+
+      - name: Test v2 (hardhat)
+        run: yarn test:prototypes
+
+      - name: Test v2 (forge)
+        run: yarn test:forge
+
+
 

contracts/zevm/ZRC20.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.7;
 import "./interfaces/IZRC20.sol";
+import "./interfaces/ISystem.sol";
 
 /**
  * @dev Custom errors for ZRC20

contracts/zevm/ZRC20New.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.7;
 import "./interfaces/IZRC20.sol";
+import "./interfaces/ISystem.sol";
 
 /**
  * @dev Custom errors for ZRC20

contracts/zevm/interfaces/IZRC20.sol

@@ -1,23 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.7;
 
-/**
- * @dev Interfaces of SystemContract and ZRC20 to make easier to import.
- */
-interface ISystem {
-    function FUNGIBLE_MODULE_ADDRESS() external view returns (address);
-
-    function wZetaContractAddress() external view returns (address);
-
-    function uniswapv2FactoryAddress() external view returns (address);
-
-    function gasPriceByChainId(uint256 chainID) external view returns (uint256);
-
-    function gasCoinZRC20ByChainId(uint256 chainID) external view returns (address);
-
-    function gasZetaPoolByChainId(uint256 chainID) external view returns (address);
-}
-
 interface IZRC20 {
     function totalSupply() external view returns (uint256);
 

package.json

@@ -90,6 +90,7 @@
     "prepublishOnly": "yarn build",
     "test": "npx hardhat test",
     "test:prototypes": "yarn compile && npx hardhat test test/prototypes/*",
+    "test:forge": "forge test -vvv",
     "tsc:watch": "npx tsc --watch",
     "worker": "npx hardhat run scripts/worker.ts --network localhost"
   },