Merge branch 'main' into jihwan/resequence-docs

0xPolygon · Oct 24, 2024 · fdaf166 · fdaf166
2 parents a421fd7 + cecf43b
commit fdaf166
Show file tree

Hide file tree

Showing 30 changed files with 772 additions and 327 deletions.
diff --git a/.github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml b/.github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml
@@ -1,8 +1,8 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.2-fork.11
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:acceptance-2.0.0-beta26-0f01107
-  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11-RC1
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.3-fork.11
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
   additional_services:
     - tx_spammer
   data_availability_mode: rollup

diff --git a/.github/tests/combinations/fork11-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork11-new-cdk-stack-cdk-validium.yml
@@ -1,8 +1,8 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.2-fork.11
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:acceptance-2.0.0-beta26-0f01107
-  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11-RC1
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.3-fork.11
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
   additional_services:
     - tx_spammer
   data_availability_mode: cdk-validium

diff --git a/.github/tests/combinations/fork11-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork11-new-cdk-stack-rollup.yml
@@ -1,8 +1,8 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.2-fork.11
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:acceptance-2.0.0-beta26-0f01107
-  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11-RC1
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.3-fork.11
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
   additional_services:
     - tx_spammer
   data_availability_mode: rollup

diff --git a/.github/tests/combinations/fork12-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork12-new-cdk-stack-cdk-validium.yml
@@ -1,7 +1,7 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.4-fork.12
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC12-fork.12
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC13-fork.12
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
   additional_services:
     - tx_spammer
   data_availability_mode: cdk-validium

diff --git a/.github/tests/combinations/fork12-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork12-new-cdk-stack-rollup.yml
@@ -1,7 +1,7 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.4-fork.12
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC12-fork.12
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC13-fork.12
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
   additional_services:
     - tx_spammer
   data_availability_mode: rollup

diff --git a/.github/tests/combinations/fork9-legacy-zkevm-stack-cdk-validium.yml b/.github/tests/combinations/fork9-legacy-zkevm-stack-cdk-validium.yml
@@ -1,8 +1,8 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.6
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
-  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   additional_services:
     - pless_zkevm_node

diff --git a/.github/tests/combinations/fork9-legacy-zkevm-stack-rollup.yml b/.github/tests/combinations/fork9-legacy-zkevm-stack-rollup.yml
@@ -1,8 +1,8 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.6
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
-  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   additional_services:
     - pless_zkevm_node

diff --git a/.github/tests/combinations/fork9-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork9-new-cdk-stack-cdk-validium.yml
@@ -1,8 +1,8 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.6
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
-  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   additional_services:
     - pless_zkevm_node

diff --git a/.github/tests/combinations/fork9-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork9-new-cdk-stack-rollup.yml
@@ -1,8 +1,8 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.6
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
-  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   additional_services:
     - pless_zkevm_node

diff --git a/.github/tests/external-l1/deploy-cdk-to-sepolia.yml b/.github/tests/external-l1/deploy-cdk-to-sepolia.yml
@@ -0,0 +1,43 @@
+deployment_stages:
+  # Disable local L1.
+  deploy_l1: false
+
+args:
+  ## L1 Config
+  l1_chain_id: 11155111
+  # TODO: Create another mnemonic seed phrase for running the contract deployment on L1.
+  l1_preallocated_mnemonic: CHANGE_ME
+  # TODO: Adjust the amount of ETH you want to spend on this deployment.
+  l1_funding_amount: 5ether
+  # TODO: Configure the L1 RPC URLs to be valid Sepolia endpoints.
+  l1_rpc_url: CHANGE_ME
+  l1_ws_url: CHANGE_ME
+
+  ## L2 Config
+  # TODO: Create a new mnemonic seed phrase to derive L2 application keys.
+  zkevm_l2_sequencer_address: CHANGE_ME
+  zkevm_l2_sequencer_private_key: CHANGE_ME
+
+  zkevm_l2_aggregator_address: CHANGE_ME
+  zkevm_l2_aggregator_private_key: CHANGE_ME
+
+  zkevm_l2_claimtxmanager_address: CHANGE_ME
+  zkevm_l2_claimtxmanager_private_key: CHANGE_ME
+
+  zkevm_l2_timelock_address: CHANGE_ME
+  zkevm_l2_timelock_private_key: CHANGE_ME
+
+  zkevm_l2_admin_address: CHANGE_ME
+  zkevm_l2_admin_private_key: CHANGE_ME
+
+  zkevm_l2_loadtest_address: CHANGE_ME
+  zkevm_l2_loadtest_private_key: CHANGE_ME
+
+  zkevm_l2_agglayer_address: CHANGE_ME
+  zkevm_l2_agglayer_private_key: CHANGE_ME
+
+  zkevm_l2_dac_address: CHANGE_ME
+  zkevm_l2_dac_private_key: CHANGE_ME
+
+  zkevm_l2_proofsigner_address: CHANGE_ME
+  zkevm_l2_proofsigner_private_key: CHANGE_ME
diff --git a/.github/tests/external-l1/deploy-local-l1.yml b/.github/tests/external-l1/deploy-local-l1.yml
@@ -0,0 +1,8 @@
+deployment_stages:
+  deploy_l1: true
+  deploy_zkevm_contracts_on_l1: false
+  deploy_databases: false
+  deploy_cdk_central_environment: false
+  deploy_cdk_bridge_infra: false
+  deploy_agglayer: false
+  deploy_cdk_erigon_node: false
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -22,6 +22,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        # This step will only execute if the necessary secrets are available, preventing failures
+        # on pull requests from forked repositories.
+        if: ${{ env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN }}
+        env:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Install Kurtosis CDK tools
         uses: ./.github/actions/setup-kurtosis-cdk
 
@@ -81,6 +93,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        # This step will only execute if the necessary secrets are available, preventing failures
+        # on pull requests from forked repositories.
+        if: ${{ env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN }}
+        env:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Install Kurtosis CDK tools
         uses: ./.github/actions/setup-kurtosis-cdk
 
@@ -149,6 +173,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        # This step will only execute if the necessary secrets are available, preventing failures
+        # on pull requests from forked repositories.
+        if: ${{ env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN }}
+        env:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Install Kurtosis CDK tools
         uses: ./.github/actions/setup-kurtosis-cdk
 
@@ -240,6 +276,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        # This step will only execute if the necessary secrets are available, preventing failures
+        # on pull requests from forked repositories.
+        if: ${{ env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN }}
+        env:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Install Kurtosis CDK tools
         uses: ./.github/actions/setup-kurtosis-cdk
 
@@ -266,16 +314,6 @@ jobs:
       - name: Inspect enclave
         run: kurtosis enclave inspect ${{ env.ENCLAVE_NAME }}
 
-      - name: Check if there is any stopped service
-        run: |
-          if kurtosis enclave inspect ${{ env.ENCLAVE_NAME }} | grep STOPPED ; then
-            echo "It looks like there is a stopped service in the enclave. Something must have halted"
-            kurtosis enclave inspect ${{ env.ENCLAVE_NAME }}
-            kurtosis enclave inspect ${{ env.ENCLAVE_NAME }} --full-uuids | grep STOPPED | awk '{print $2 "--" $1}' \
-              | while read -r container; do echo "Printing logs for $container"; docker logs --tail 50 "$container"; done
-            exit 1
-          fi
-
       - name: Monitor verified batches of the first L2 chain (CDK Erigon Permissionless RPC)
         working-directory: .github/scripts
         run: |
@@ -300,3 +338,52 @@ jobs:
         with:
           name: dump_attach_ckds_${{ github.run_id }}
           path: ./dump
+
+  deploy_to_external_l1:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        # This step will only execute if the necessary secrets are available, preventing failures
+        # on pull requests from forked repositories.
+        if: ${{ env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN }}
+        env:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Install Kurtosis CDK tools
+        uses: ./.github/actions/setup-kurtosis-cdk
+
+      - name: Deploy L1 chain
+        run: kurtosis run --enclave=${{ env.ENCLAVE_NAME }} --args-file=./.github/tests/external-l1/deploy-local-l1.yml .
+
+      - name: Deploy to local L1 chain
+        run: |
+          kurtosis run --enclave=${{ env.ENCLAVE_NAME }} . '{"deployment_stages": {"deploy_l1": false}}'
+      
+      - name: Inspect enclave
+        run: kurtosis enclave inspect ${{ env.ENCLAVE_NAME }}
+
+      - name: Monitor verified batches
+        working-directory: .github/scripts
+        run: |
+          ./monitor-verified-batches.sh \
+            --enclave ${{ env.ENCLAVE_NAME }} \
+            --rpc-url "$(kurtosis port print ${{ env.ENCLAVE_NAME }} cdk-erigon-node-001 rpc)"
+
+      - name: Dump enclave logs
+        if: failure()
+        run: kurtosis dump ./dump
+
+      - name: Upload logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: dump_attach_ckds_${{ github.run_id }}
+          path: ./dump
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ env:
   KURTOSIS_VERSION: 0.90.1
 
 jobs:
-  check:
+  lint:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
@@ -51,3 +51,28 @@ jobs:
 
       - name: Run shellcheck
         run: find . -type f -name '*.sh' | sort | xargs -I {} shellcheck {}
+
+  check-test-combinations:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install yq
+        run: |
+          pip3 install yq
+          yq --version
+
+      - name: Generate test combinations
+        working-directory: .github/tests
+        run: ./combine-ymls.sh
+
+      - name: Check if test combinations are up to date
+        run: |
+          if [[ -n $(git status --porcelain) ]]; then
+            echo "❌ Error: Test combinations are not up to date. Please run \`./combine-ymls.sh\`."
+            git status --porcelain
+            git diff
+            exit 1
+          else
+            echo "✅ Test combinations are up to date."
+          fi
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -16,19 +16,35 @@ env:
 jobs:
   # Deploy a standalone zkevm permisionless node against Cardona Sepolia Tesnet.
   cardona-sepolia-testnet-pless-zkevm-node:
-    #if: github.repository == '0xPolygon/kurtosis-cdk' # Prevent this job to run on forks.
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        # This step will only execute if the necessary secrets are available, preventing failures
+        # on pull requests from forked repositories.
+        if: ${{ env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN }}
+        env:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Install Kurtosis CDK tools
         uses: ./.github/actions/setup-kurtosis-cdk
 
       - name: Deploy the permisionless node
         run: |
           yq -Y --in-place '.args.l1_rpc_url = "${{ secrets.ALCHEMY_SEPOLIA_RPC_URL }}"' ./.github/tests/pless-zkevm-node/cardona-sepolia-testnet-pless-zkevm-node.yml
           kurtosis run --enclave=${{ env.ENCLAVE_NAME }} --args-file=./.github/tests/pless-zkevm-node/cardona-sepolia-testnet-pless-zkevm-node.yml --show-enclave-inspect=false .
+        # This step will only execute if the necessary secrets are available, preventing failures
+        # on pull requests from forked repositories.
+        if: ${{ env.ALCHEMY_SEPOLIA_RPC_URL}}
+        env:
+          ALCHEMY_SEPOLIA_RPC_URL: ${{ secrets.ALCHEMY_SEPOLIA_RPC_URL }}
 
       - name: Inspect enclave
         run: kurtosis enclave inspect ${{ env.ENCLAVE_NAME }}