Merge branch 'zkevm' into xiong/cache-tx-sender

.github/scripts/test_resequence.sh

@@ -0,0 +1,165 @@
+#!/bin/bash
+
+get_latest_l2_batch() {
+    local latest_block
+    latest_block=$(cast block latest --rpc-url "$(kurtosis port print cdk-v1 cdk-erigon-sequencer-001 rpc)" | grep "number" | awk '{print $2}')
+
+    local latest_batch
+    latest_batch=$(cast rpc zkevm_batchNumberByBlockNumber "$latest_block" --rpc-url "$(kurtosis port print cdk-v1 cdk-erigon-sequencer-001 rpc)" | sed 's/^"//;s/"$//')
+
+    if [[ -z "$latest_batch" ]]; then
+        echo "Error: Failed to get latest batch number" >&2
+        return 1
+    fi
+
+    latest_batch_dec=$((latest_batch))
+
+    echo "$latest_batch_dec"
+}
+
+get_latest_l1_verified_batch() {
+    current_batch=$(cast logs --rpc-url "$(kurtosis port print cdk-v1 el-1-geth-lighthouse rpc)" --address 0x1Fe038B54aeBf558638CA51C91bC8cCa06609e91 --from-block 0 -j | jq -r '.[] | select(.topics[0] == "0x9c72852172521097ba7e1482e6b44b351323df0155f97f4ea18fcec28e1f5966" or .topics[0] == "0xd1ec3a1216f08b6eff72e169ceb548b782db18a6614852618d86bb19f3f9b0d3") | .topics[1]' | tail -n 1 | sed 's/^0x//')
+    current_batch_dec=$((16#$current_batch))
+    echo "$current_batch_dec"
+}
+
+
+wait_for_l1_batch() {
+    local timeout=$1
+    local batch_type=$2
+    local start_time
+
+    start_time=$(date +%s)
+
+    latest_batch=$(get_latest_l2_batch)
+    if [[ $? -ne 0 ]]; then
+        echo "Error: Failed to get latest batch number" >&2
+        return 1
+    fi
+
+    echo "Waiting for batch $latest_batch to be ${batch_type}..."
+    while true; do
+        current_time=$(date +%s)
+        if [ $((current_time - start_time)) -ge "$timeout" ]; then
+            echo "Timeout reached. Batch $latest_batch was not ${batch_type} within $timeout seconds."
+            return 1
+        fi
+
+        if [ "$batch_type" = "virtual" ]; then
+            current_batch=$(cast logs --rpc-url "$(kurtosis port print cdk-v1 el-1-geth-lighthouse rpc)" --address 0x1Fe038B54aeBf558638CA51C91bC8cCa06609e91 --from-block 0 -j | jq -r '.[] | select(.topics[0] == "0x3e54d0825ed78523037d00a81759237eb436ce774bd546993ee67a1b67b6e766") | .topics[1]' | tail -n 1 | sed 's/^0x//')
+            current_batch=$((16#$current_batch))
+        elif [ "$batch_type" = "verified" ]; then
+            current_batch=$(cast rpc zkevm_verifiedBatchNumber --rpc-url "$(kurtosis port print cdk-v1 cdk-erigon-node-001 rpc)" | sed 's/^"//;s/"$//')
+        else
+            echo "Invalid batch type. Use 'virtual' or 'verified'."
+            return 1
+        fi
+
+        if [[ -z "$current_batch" ]]; then
+            echo "Error: Failed to get current batch number" >&2
+            return 1
+        fi
+
+        current_batch_dec=$((current_batch))
+        echo "Current ${batch_type} batch: $current_batch_dec, Latest batch: $latest_batch"
+        if [ "$current_batch_dec" -ge "$latest_batch" ]; then
+            echo "Batch $latest_batch has been ${batch_type}."
+            return 0
+        fi
+        sleep 10
+    done
+}
+
+stop_cdk_erigon_sequencer() {
+    echo "Stopping cdk-erigon"
+    kurtosis service exec cdk-v1 cdk-erigon-sequencer-001 "pkill -SIGTRAP proc-runner.sh" || true
+    sleep 1
+    kurtosis service exec cdk-v1 cdk-erigon-sequencer-001 "pkill -SIGINT cdk-erigon" || true
+    sleep 30
+}
+
+# Set -e to exit on any command failure
+set -e
+
+stop_cdk_erigon_sequencer
+
+echo "Copying and modifying config"
+kurtosis service exec cdk-v1  cdk-erigon-sequencer-001 'cp \-r /etc/cdk-erigon/ /tmp/ && sed -i '\''s/zkevm\.executor-strict: true/zkevm.executor-strict: false/;s/zkevm\.executor-urls: zkevm-stateless-executor-001:50071/zkevm.executor-urls: ","/;$a zkevm.disable-virtual-counters: true'\'' /tmp/cdk-erigon/config.yaml'
+
+echo "Starting cdk-erigon with modified config"
+kurtosis service exec cdk-v1 cdk-erigon-sequencer-001 "nohup cdk-erigon --pprof=true --pprof.addr 0.0.0.0 --config /tmp/cdk-erigon/config.yaml --datadir /home/erigon/data/dynamic-kurtosis-sequencer > /proc/1/fd/1 2>&1 &"
+
+# Wait for cdk-erigon to start
+sleep 30
+
+echo "Running loadtest using polycli"
+/usr/local/bin/polycli loadtest --rpc-url "$(kurtosis port print cdk-v1 cdk-erigon-node-001 rpc)" --private-key "0x12d7de8621a77640c9241b2595ba78ce443d05e94090365ab3bb5e19df82c625" --verbosity 600 --requests 2000 --rate-limit 500  --mode uniswapv3 --legacy
+
+echo "Waiting for batch virtualization"
+if ! wait_for_l1_batch 600 "virtual"; then
+    echo "Failed to wait for batch virtualization"
+    exit 1
+fi
+
+echo "Stopping cdk node"
+kurtosis service stop cdk-v1 cdk-node-001
+
+stop_cdk_erigon_sequencer
+
+
+# Good batch before counter overflow
+latest_verified_batch=$(get_latest_l1_verified_batch)
+
+# Rollback to the last good batch before the counter overflow on L1
+echo "Rolling back to batch $latest_verified_batch"
+cast send "0x2F50ef6b8e8Ee4E579B17619A92dE3E2ffbD8AD2" "rollbackBatches(address,uint64)" "0x1Fe038B54aeBf558638CA51C91bC8cCa06609e91" "$latest_verified_batch" --private-key "0x12d7de8621a77640c9241b2595ba78ce443d05e94090365ab3bb5e19df82c625" --rpc-url "$(kurtosis port print cdk-v1 el-1-geth-lighthouse rpc)"
+
+echo "Using integration tool to unwind to batch $latest_verified_batch"
+kurtosis service exec cdk-v1 cdk-erigon-sequencer-001 "integration state_stages_zkevm --config=/etc/cdk-erigon/config.yaml --unwind-batch-no=$latest_verified_batch --chain dynamic-kurtosis --datadir /home/erigon/data/dynamic-kurtosis-sequencer"
+
+echo "Starting cdk-erigon with resequencing and counter enabled"
+kurtosis service exec cdk-v1 cdk-erigon-sequencer-001 "timeout 300s cdk-erigon --pprof=true --pprof.addr 0.0.0.0 --config /etc/cdk-erigon/config.yaml --datadir /home/erigon/data/dynamic-kurtosis-sequencer  --zkevm.sequencer-resequence-strict=false --zkevm.sequencer-resequence=true --zkevm.sequencer-resequence-reuse-l1-info-index=true"
+
+stop_cdk_erigon_sequencer
+
+echo "Starting cdk-erigon with normal execution"
+kurtosis service exec cdk-v1 cdk-erigon-sequencer-001 "nohup cdk-erigon --pprof=true --pprof.addr 0.0.0.0 --config /etc/cdk-erigon/config.yaml --datadir /home/erigon/data/dynamic-kurtosis-sequencer > /proc/1/fd/1 2>&1 &"
+
+# Wait for cdk-erigon to start
+sleep 30
+
+echo "Restarting cdk node"
+kurtosis service start cdk-v1 cdk-node-001
+
+echo "Getting latest block number from sequencer"
+latest_block=$(cast block latest --rpc-url "$(kurtosis port print cdk-v1 cdk-erigon-sequencer-001 rpc)" | grep "number" | awk '{print $2}')
+echo "Latest block number from sequencer: $latest_block"
+
+echo "Calculating comparison block number"
+comparison_block=$((latest_block - 10))
+echo "Block number to compare (10 blocks behind): $comparison_block"
+
+echo "Getting block hash from sequencer"
+sequencer_hash=$(cast block $comparison_block --rpc-url "$(kurtosis port print cdk-v1 cdk-erigon-sequencer-001 rpc)" | grep "hash" | awk '{print $2}')
+
+echo "Getting block hash from node"
+node_hash=$(cast block $comparison_block --rpc-url "$(kurtosis port print cdk-v1 cdk-erigon-node-001 rpc)" | grep "hash" | awk '{print $2}')
+
+echo "Sequencer block hash: $sequencer_hash"
+echo "Node block hash: $node_hash"
+
+echo "Comparing block hashes"
+if [ "$sequencer_hash" = "$node_hash" ]; then
+    echo "The block hashes match for block number $comparison_block."
+else
+    echo "The block hashes do not match for block number $comparison_block."
+    exit 1
+fi
+
+echo "Waiting for batch verification"
+if ! wait_for_l1_batch 1200 "verified"; then
+    echo "Failed to wait for batch verification"
+    exit 1
+fi
+
+echo "All steps completed successfully"

.github/workflows/build.yml

@@ -98,8 +98,6 @@ jobs:
     needs: [prepare, build-amd64, build-arm64]
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
@@ -109,8 +107,14 @@ jobs:
           password: ${{ env.DOCKERHUB_TOKEN }}
       - name: Create and push manifest
         run: |
-          docker buildx create --use
-          docker buildx build --push --platform linux/amd64,linux/arm64 --tag ${{ env.IMAGE_NAME }}:${{ needs.prepare.outputs.version }} --file Dockerfile .
+          docker buildx imagetools create \
+            --tag ${{ env.IMAGE_NAME }}:${{ needs.prepare.outputs.version }} \
+            ${{ env.IMAGE_NAME }}:${{ needs.prepare.outputs.version }}-amd64 \
+            ${{ env.IMAGE_NAME }}:${{ needs.prepare.outputs.version }}-arm64
+          
           if [ "${{ needs.prepare.outputs.latest_tag }}" == "true" ]; then
-            docker buildx build --push --platform linux/amd64,linux/arm64 --tag ${{ env.IMAGE_NAME }}:latest --file Dockerfile .
-          fi
+            docker buildx imagetools create \
+              --tag ${{ env.IMAGE_NAME }}:latest \
+              ${{ env.IMAGE_NAME }}:${{ needs.prepare.outputs.version }}-amd64 \
+              ${{ env.IMAGE_NAME }}:${{ needs.prepare.outputs.version }}-arm64
+          fi

.github/workflows/test-resequence.yml

@@ -0,0 +1,93 @@
+name: Resequence test
+on:
+  push:
+    branches:
+      - zkevm
+  pull_request:
+    branches:
+      - zkevm
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+
+jobs:
+  resequence-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout cdk-erigon
+        uses: actions/checkout@v4
+        with:
+          path: cdk-erigon
+
+      - name: Checkout kurtosis-cdk
+        uses: actions/checkout@v4
+        with:
+          repository: 0xPolygon/kurtosis-cdk
+          ref: v0.2.12
+          path: kurtosis-cdk
+
+      - name: Install Kurtosis CDK tools
+        uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+
+      - name: Install yq
+        run: |
+          sudo curl -L https://github.com/mikefarah/yq/releases/download/v4.44.2/yq_linux_amd64 -o /usr/local/bin/yq
+          sudo chmod +x /usr/local/bin/yq
+          /usr/local/bin/yq --version
+      - name: Install polycli
+        run: |
+          tmp_dir=$(mktemp -d) && curl -L https://github.com/0xPolygon/polygon-cli/releases/download/v0.1.48/polycli_v0.1.48_linux_amd64.tar.gz | tar -xz -C "$tmp_dir" && mv "$tmp_dir"/* /usr/local/bin/polycli && rm -rf "$tmp_dir"
+          sudo chmod +x /usr/local/bin/polycli
+          /usr/local/bin/polycli version
+      - name: Build docker image
+        working-directory: ./cdk-erigon
+        run: docker build -t cdk-erigon:local --file Dockerfile .
+
+      - name: Remove unused flags
+        working-directory: ./kurtosis-cdk
+        run: |
+          sed -i '/zkevm.sequencer-batch-seal-time:/d' templates/cdk-erigon/config.yml
+          sed -i '/zkevm.sequencer-non-empty-batch-seal-time:/d' templates/cdk-erigon/config.yml
+          sed -i '/sentry.drop-useless-peers:/d' templates/cdk-erigon/config.yml
+          sed -i '/zkevm.pool-manager-url/d' templates/cdk-erigon/config.yml
+      - name: Configure Kurtosis CDK
+        working-directory: ./kurtosis-cdk
+        run: |
+          /usr/local/bin/yq -i '.args.cdk_erigon_node_image = "cdk-erigon:local"' params.yml
+      - name: Deploy Kurtosis CDK package
+        working-directory: ./kurtosis-cdk
+        run: kurtosis run --enclave cdk-v1 --args-file params.yml --image-download always .
+
+      - name: Test resequence
+        working-directory: ./cdk-erigon
+        run: .github/scripts/test_resequence.sh
+
+      - name: Upload logs
+        uses: actions/upload-artifact@v3
+        with:
+          name: evm-rpc-tests-logs-${{ github.run_id }}
+          path: ./cdk-erigon/logs/evm-rpc-tests.log
+
+      - name: Prepare logs
+        working-directory: ./kurtosis-cdk
+        if: failure()
+        run: |
+          mkdir -p ci_logs
+          cd ci_logs
+          kurtosis service logs cdk-v1 cdk-erigon-node-001 --all > cdk-erigon-node-001.log
+          kurtosis service logs cdk-v1 cdk-erigon-sequencer-001 --all > cdk-erigon-sequencer-001.log
+          kurtosis service logs cdk-v1 zkevm-agglayer-001 --all > zkevm-agglayer-001.log
+          kurtosis service logs cdk-v1 zkevm-prover-001 --all > zkevm-prover-001.log
+          kurtosis service logs cdk-v1 cdk-node-001 --all > cdk-node-001.log
+          kurtosis service logs cdk-v1 zkevm-bridge-service-001 --all > zkevm-bridge-service-001.log
+      - name: Upload logs
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: logs_${{ github.run_id }}
+          path: ./kurtosis-cdk/ci_logs

cmd/acl/README.md

@@ -3,28 +3,42 @@
 In the root of `Erigon` project, use this command to build the commands:
 
 ```shell
-make acl
+    make acl
 ```
 
 It can then be run using the following command
 
 ```shell
-./buid/bin/acl sub-command options...
+    ./buid/bin/acl sub-command options...
 ```
 
 Snapshots supports the following sub commands:
 
-## mode - access list mode
+## data-dir
+
+Examples on how to setup your data-dir
+
+```shell
+    # on sequencer:
+    /Path/Choosen/OnHermezConfig/txpool
+    # example
+    /Users/{$USER}/code/erigon-data/chain/txpool
+    # on default path:
+    /Users/{$USER}/Library/Erigon
+```
+
+## mode - set mode of access list 
 
 This command takes the following form: 
 
 ```shell
-    acl mode <data-dir> <mode>
+    acl mode --datadir=<data-dir> --mode=<mode> 
 ```
 
 ## supported ACL Types
 - `allowlist` - allow list type
 - `blocklist` - block list type
+- `disabled` - doesn't block or allow, everyone is able to do transactions and deploy contracts.
 
 ## supported policies
 - `sendTx` - enables or disables ability of an account to send transactions (deploy contracts transactions not included).
@@ -42,7 +56,7 @@ This command can be used to update an access list in the `acl` data base.
 This command takes the following form: 
 
 ```shell
-    acl update <data-dir> <type> <csv>
+    acl update --datadir=<data-dir> --type=<type> --csv=<path_to_csv>
 ```
 The `update` command will read the `.csv` file provided which should be in format `address,"policy1,policy2"`, and update the defined `acl` in the `db`. Note that the `.csv` file is considered as the final state of policies for given `acl` type for defined addresses, meaning, if an address in the `.csv` file has `sendTx` policy, but in `db` it had `deploy`, after this command, it will have `sendTx` in the `db`, there is no appending. Also, it is worth mentioning that using a `.csv` file user can delete addresses from an `acl` table by leaving policies string as empty `""`. This will tell the command that the user wants to remove an address completely from an `acl`.
 
@@ -53,7 +67,7 @@ This command can be used to add a policy to an account in the specified `acl`.
 This command takes the following form: 
 
 ```shell
-    acl add <data-dir> <type> <address> <policy>
+    acl add --datadir=<data-dir> --type=<type> --address=<address> --policy=<policy>
 ```
 
 The `add` command will add the given policy to an account in given access list table if account is not already added to access list table, or if given account does not have that policy.
@@ -65,8 +79,26 @@ This command can be used to remove a policy from an account in the specified `ac
 This command takes the following form: 
 
 ```shell
-    acl remove <data-dir> <type> <address> <policy>
+    acl remove --datadir=<data-dir> --type=<type> --adress=<address> --policy=<policy>
 ```
 The `remove` command will remove the given policy from an account in given access list table if given account has that policy assigned.
 
+## list - log the information in current acl data-dir
+
+```shell
+    acl list --datadir=<data-dir> --log_count=<number_integer>[optional]
+```
+
+## operating example:
+
+```shell
+    acl list  --datadir=/Users/username_pc_mac/path_to_data/erigon-data/devnet/txpool
+
+    acl add --address=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 --policy=deploy --type=blocklist --datadir=/Users/username_pc_mac/path_to_data/erigon-data/devnet/txpool
+    acl add --address=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 --policy=sendTx --type=blocklist --datadir=/Users/username_pc_mac/path_to_data/erigon-data/devnet/txpool
+
+    acl add --address=0x0921598333Cf3cE5FE2031C056C79aec59EE10b6 --policy=sendTx --type=allowlist --datadir=/Users/username_pc_mac/path_to_data/erigon-data/devnet/txpool
+    acl remove --address=0x0921598333Cf3cE5FE2031C056C79aec59EE10b6 --policy=sendTx --type=allowlist --datadir=/Users/username_pc_mac/path_to_data/erigon-data/devnet/txpool
 
+    acl mode --mode=disabled --datadir=/Users/username_pc_mac/path_to_data/erigon-data/devnet/txpool --log_count=20
+```