chore: transfer tests to era test node (#1534)

* chore: transfer tests to era test node --------- Co-authored-by: Marko Arambasic <[email protected]>
matter-labs · Nov 8, 2024 · cf39322 · cf39322
1 parent b00f708
commit cf39322
Show file tree

Hide file tree

Showing 65 changed files with 1,113 additions and 1,126 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -84,20 +84,12 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
           cache: pnpm
+
       - uses: actions/checkout@v3
-        with:
-          repository: matter-labs/local-setup
-          path: local-setup
 
-      - name: Run server
-        run: |
-          cd local-setup
-          ./start.sh &>../server.log &
+      - name: Run Era Test Node
+        uses: dutterbutter/era-test-node-action@latest
 
-      - name: Wait until server is up
-        run: |
-          while ! curl -s -X POST -d '{"jsonrpc":"2.0","method":"net_version","id":1}' -H 'Content-Type: application/json' 0.0.0.0:3050; do sleep 1; done
-      
       - name: Run fixture-projects script
         run: |
             cd e2e
@@ -116,15 +108,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/checkout@v3
-        with:
-          repository: matter-labs/local-setup
-          path: local-setup
-
-      - name: Run server
-        run: |
-          cd local-setup
-          ./start.sh &>../server.log &
+      - name: Run Era Test Node
+        uses: dutterbutter/era-test-node-action@latest
 
       - uses: pnpm/action-setup@v3
 
@@ -138,10 +123,6 @@ jobs:
           pnpm install
           pnpm build
 
-      - name: Wait until server is up
-        run: |
-          while ! curl -s -X POST -d '{"jsonrpc":"2.0","method":"net_version","id":1}' -H 'Content-Type: application/json' 0.0.0.0:3050; do sleep 1; done
-
       - name: Test zksolc example
         run: |
           cd examples/basic-example
@@ -216,11 +197,6 @@ jobs:
           pnpm hardhat compile
           pnpm hardhat deploy-zksync
 
-      - name: Show logs
-        if: always()
-        run: |
-          cat server.log
-
   upgradable:
     strategy:
       matrix:
@@ -232,15 +208,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/checkout@v3
-        with:
-          repository: matter-labs/local-setup
-          path: local-setup
-
-      - name: Run server
-        run: |
-          cd local-setup
-          ./start.sh &>../server.log &
+      - name: Run Era Test Node
+        uses: dutterbutter/era-test-node-action@latest
 
       - uses: pnpm/action-setup@v3
 
@@ -254,10 +223,6 @@ jobs:
           pnpm install
           pnpm build
 
-      - name: Wait until server is up
-        run: |
-          while ! curl -s -X POST -d '{"jsonrpc":"2.0","method":"net_version","id":1}' -H 'Content-Type: application/json' 0.0.0.0:3050; do sleep 1; done
-
       - name: Test zksync upgradable plugin
         run: |
           cd packages/hardhat-zksync-upgradable
@@ -330,15 +295,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/checkout@v3
-        with:
-          repository: matter-labs/local-setup
-          path: local-setup
-
-      - name: Run server
-        run: |
-          cd local-setup
-          ./start.sh &>../server.log &
+      - name: Run Era Test Node
+        uses: dutterbutter/era-test-node-action@latest
 
       - uses: pnpm/action-setup@v3
 
@@ -352,20 +310,11 @@ jobs:
           pnpm install
           pnpm build
 
-      - name: Wait until server is up
-        run: |
-          while ! curl -s -X POST -d '{"jsonrpc":"2.0","method":"net_version","id":1}' -H 'Content-Type: application/json' 0.0.0.0:3050; do sleep 1; done
-
       - name: Test deploy package
         run: |
           cd packages/hardhat-zksync-deploy
           pnpm test
 
-      - name: Show logs
-        if: always()
-        run: |
-          cat server.log
-
   zksync-ethers:
     strategy:
       matrix:
@@ -378,14 +327,9 @@ jobs:
       - uses: actions/checkout@v3
 
       - uses: actions/checkout@v3
-        with:
-          repository: matter-labs/local-setup
-          path: local-setup
 
-      - name: Run server
-        run: |
-          cd local-setup
-          ./start.sh &>../server.log &
+      - name: Run Era Test Node
+        uses: dutterbutter/era-test-node-action@latest
 
       - uses: pnpm/action-setup@v3
 
@@ -399,20 +343,11 @@ jobs:
           pnpm install
           pnpm build
 
-      - name: Wait until server is up
-        run: |
-          while ! curl -s -X POST -d '{"jsonrpc":"2.0","method":"net_version","id":1}' -H 'Content-Type: application/json' 0.0.0.0:3050; do sleep 1; done
-
       - name: Test zksync-ethers example
         run: |
           cd packages/hardhat-zksync-ethers
           pnpm test
 
-      - name: Show logs
-        if: always()
-        run: |
-          cat server.log
-
   node:
     strategy:
       matrix:

diff --git a/e2e/fixture-projects/clean/hardhat.config.ts b/e2e/fixture-projects/clean/hardhat.config.ts
@@ -10,10 +10,16 @@ const config = {
             },
         }
     },
+    defaultNework: 'inMemoryNode',
     networks: {
         hardhat: {
             zksync: true,
         },
+        inMemoryNode: {
+            url: "http://0.0.0.0:8011",
+            ethNetwork: "",
+            zksync: true,
+        },
     },
     // Docker image only works for solidity ^0.8.0.
     // For earlier versions you need to use binary releases of zksolc.

diff --git a/e2e/fixture-projects/clean/preprocess.sh b/e2e/fixture-projects/clean/preprocess.sh
@@ -68,7 +68,7 @@ cat <<EOF > "$SCRIPT_DIR/package.json"
     "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-prettier": "^5.0.1",
     "ethers": "^6.12.2",
-    "zksync-ethers": "^6.8.0",
+    "zksync-ethers": "^6.15.0",
     "hardhat": "^2.22.5",
     "ts-node": "^10.9.2",
     "prettier": "^3.3.0",
@@ -79,7 +79,7 @@ cat <<EOF > "$SCRIPT_DIR/package.json"
   "peerDependencies": {
     "hardhat": "^2.22.5",
     "ethers": "^6.12.2",
-    "zksync-ethers": "^6.8.0"
+    "zksync-ethers": "^6.15.0"
   },
   "prettier": {
     "tabWidth": 4,

diff --git a/e2e/fixture-projects/compatability-check/hardhat.config.ts b/e2e/fixture-projects/compatability-check/hardhat.config.ts
@@ -13,20 +13,16 @@ const config = {
             },
         }
     },
+    defaultNetwork: 'inMemoryNode',
     networks: {
         hardhat: {
             zksync: true,
         },
         inMemoryNode: {
             url: "http://0.0.0.0:8011",
-            ethNetwork: "",
-            zksync: true,
-        },
-        dockerizedNode: {
-            url: "http://0.0.0.0:3050",
             ethNetwork: "http://0.0.0.0:8545",
             zksync: true,
-          },
+        },
     },
     solidity: {
         version: '0.8.17',

diff --git a/e2e/fixture-projects/compatability-check/test.sh b/e2e/fixture-projects/compatability-check/test.sh
@@ -8,16 +8,16 @@ echo "Running compatability-check"
 
 run_test_and_handle_failure "pnpm hardhat compile" 0
 
-pnpm hardhat deploy-zksync:libraries --network dockerizedNode
+pnpm hardhat deploy-zksync:libraries
 
 pnpm hardhat compile
 
-pnpm hardhat deploy-zksync --network dockerizedNode
+pnpm hardhat deploy-zksync
 
 assert_directory_exists "artifacts-zk"
 assert_directory_exists "cache-zk"
 
-pnpm hardhat run scripts/deploy-factory-uups.ts --network dockerizedNode
+pnpm hardhat run scripts/deploy-factory-uups.ts
 
 
 
diff --git a/e2e/fixture-projects/compile-fail/hardhat.config.ts b/e2e/fixture-projects/compile-fail/hardhat.config.ts
@@ -10,10 +10,16 @@ const config = {
             },
         }
     },
+    defaultNetwork: 'inMemoryNode',
     networks: {
         hardhat: {
             zksync: true,
         },
+        inMemoryNode: {
+            url: "http://0.0.0.0:8011",
+            ethNetwork: "",
+            zksync: true,
+        },
     },
     // Docker image only works for solidity ^0.8.0.
     // For earlier versions you need to use binary releases of zksolc.

diff --git a/e2e/fixture-projects/compile-fail/preprocess.sh b/e2e/fixture-projects/compile-fail/preprocess.sh
@@ -68,7 +68,7 @@ cat <<EOF > "$SCRIPT_DIR/package.json"
     "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-prettier": "^5.0.1",
     "ethers": "^6.12.2",
-    "zksync-ethers": "^6.8.0",
+    "zksync-ethers": "^6.15.0",
     "hardhat": "^2.22.5",
     "ts-node": "^10.9.2",
     "prettier": "^3.3.0",
@@ -79,7 +79,7 @@ cat <<EOF > "$SCRIPT_DIR/package.json"
   "peerDependencies": {
     "hardhat": "^2.22.5",
     "ethers": "^6.12.2",
-    "zksync-ethers": "^6.8.0"
+    "zksync-ethers": "^6.15.0"
   },
   "prettier": {
     "tabWidth": 4,

diff --git a/e2e/fixture-projects/mixed/hardhat.config.ts b/e2e/fixture-projects/mixed/hardhat.config.ts
@@ -17,6 +17,7 @@ const config: HardhatUserConfig = {
             },
         }
     },
+    defaultNetwork: 'inMemoryNode',
     networks: {
         hardhat: {
             zksync: true,

diff --git a/e2e/fixture-projects/mixed/preprocess.sh b/e2e/fixture-projects/mixed/preprocess.sh
@@ -42,12 +42,12 @@ cat <<EOF > "$SCRIPT_DIR/package.json"
       "@matterlabs/hardhat-zksync-solc": "1.1.4",
       "@matterlabs/hardhat-zksync-node":"1.0.2",
       "@matterlabs/hardhat-zksync-upgradable":"1.3.1",
-      "@matterlabs/hardhat-zksync-vyper": "1.0.8",
+      "@matterlabs/hardhat-zksync-vyper": "1.1.1",
       "@nomiclabs/hardhat-vyper": "^3.0.5",
       "chalk": "4.1.2",
       "hardhat": "^2.22.5",
       "ethers": "^6.12.2",
-      "zksync-ethers": "^6.8.0",
+      "zksync-ethers": "^6.15.0",
       "@matterlabs/zksync-contracts": "^0.6.1",
       "@openzeppelin/contracts": "^4.9.2",
       "@openzeppelin/contracts-upgradeable": "^4.9.2"

diff --git a/e2e/fixture-projects/mixed/test.sh b/e2e/fixture-projects/mixed/test.sh
@@ -18,18 +18,18 @@ assert_directory_exists "artifacts-zk/contracts/Constant.sol"
 assert_directory_not_empty "artifacts-zk"
 assert_directory_not_empty "cache-zk"
 
-DEPLOY_GREETER_OUTPUT=$(pnpm hardhat run scripts/deploy-greeter.ts --network dockerizedNode)
+DEPLOY_GREETER_OUTPUT=$(pnpm hardhat run scripts/deploy-greeter.ts)
 
 check_log_value "$DEPLOY_GREETER_OUTPUT" "Successful greeting from the contract"
 
-DEPLOY_BOX_OUTPUT=$(pnpm hardhat run scripts/deploy-box-proxy.ts --network dockerizedNode)
+DEPLOY_BOX_OUTPUT=$(pnpm hardhat run scripts/deploy-box-proxy.ts)
 
 check_log_value "$DEPLOY_BOX_OUTPUT" "Box value is:  42n"
 
-UPGRADE_BOX_OUTPUT=$(pnpm hardhat run scripts/upgrade-box.ts --network dockerizedNode)
+UPGRADE_BOX_OUTPUT=$(pnpm hardhat run scripts/upgrade-box.ts)
 
 check_log_value "$UPGRADE_BOX_OUTPUT" "Successfully upgraded Box to BoxV2"
 
-DEPLOY_VOTING_OUTPUT=$(pnpm hardhat deploy-zksync --network dockerizedNode)
+DEPLOY_VOTING_OUTPUT=$(pnpm hardhat deploy-zksync)
 
 check_log_value "$DEPLOY_VOTING_OUTPUT" "Voting sucessfull!"
diff --git a/e2e/fixture-projects/node/hardhat.config.ts b/e2e/fixture-projects/node/hardhat.config.ts
@@ -13,16 +13,10 @@ const config: HardhatUserConfig = {
             },
         }
     },
-    defaultNetwork:'inMemoryNode',
     networks: {
         hardhat: {
             zksync: true,
         },
-        inMemoryNode: {
-            url: "http://0.0.0.0:8011",
-            ethNetwork: "",
-            zksync: true,
-        },
     },
     solidity: {
         version: '0.8.17',

diff --git a/e2e/fixture-projects/node/preprocess.sh b/e2e/fixture-projects/node/preprocess.sh
@@ -45,6 +45,7 @@ cat <<EOF > "$SCRIPT_DIR/package.json"
   ],
   "dependencies": {
     "@matterlabs/hardhat-zksync-solc": "^1.1.4",
+    "@matterlabs/hardhat-zksync-node": "^1.1.1",
     "axios": "^1.7.2",
     "chalk": "^4.1.2",
     "fs-extra": "^11.2.0",
@@ -74,12 +75,14 @@ cat <<EOF > "$SCRIPT_DIR/package.json"
     "rimraf": "^5.0.7",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.0",
-    "zksync-ethers": "^6.8.0",
+    "zksync-ethers": "^6.15.0",
+    "ethers": "^6.12.2",
     "c8": "^9.1.0"
   },
   "peerDependencies": {
     "hardhat": "^2.22.5",
-    "zksync-ethers": "^6.8.0"
+    "zksync-ethers": "^6.15.0",
+    "ethers": "^6.12.2"
   },
   "prettier": {
     "tabWidth": 4,

diff --git a/e2e/fixture-projects/node/test.sh b/e2e/fixture-projects/node/test.sh
@@ -6,12 +6,6 @@ set -e
 
 echo "Running node"
 
-# Kill any existing process on port 8011
-kill_process_on_port 8011
-
-pnpm add @matterlabs/[email protected]
-pnpm add [email protected]
-
 pnpm hardhat node-zksync &
 
 sleep 3