Merge branch 'main' into fix/bump-genesis-generator-5.3.2

Author: barnabasbusa

.github/actions/kurtosis-install/action.yaml

@@ -10,7 +10,7 @@ runs:
     - name: Install
       shell: bash
       run: |
-        echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
+        echo "deb [trusted=yes] https://sdk.kurtosis.com/kurtosis-cli-release-artifacts/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
         sudo apt update
         if [ "${{ inputs.version }}" = "latest" ]; then
           sudo apt install kurtosis-cli

.github/tests/ews.yaml

@@ -0,0 +1,19 @@
+participants:
+  - count: 2
+    el_type: reth
+    cl_type: lighthouse
+
+additional_services:
+  - zkboost
+  - dora
+
+zkboost_params:
+  zkvms:
+    - kind: mock
+      proof_type: reth-zisk
+      mock_proving_time_ms: 5000
+      mock_proof_size: 1024
+    - kind: mock
+      proof_type: ethrex-zisk
+      mock_proving_time_ms: 5000
+      mock_proof_size: 1024

.github/tests/zkboost.yaml

@@ -70,7 +70,7 @@ jobs:
           username: ethpandaops
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Kurtosis Assertoor GitHub Action
-        uses: ethpandaops/kurtosis-assertoor-github-action@5932604b244dbd2ddb811516b516a9094f4d2c2f # v1
+        uses: ethpandaops/kurtosis-assertoor-github-action@f64942cbc780df731a731ea9f45765b161d2c8df # v1
         with:
           kurtosis_extra_args: "--image-download always --non-blocking-tasks --verbosity DETAILED"
           ethereum_package_branch: ""

.github/workflows/nightly.yml

@@ -71,7 +71,7 @@ jobs:
           username: ethpandaops
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Kurtosis Assertoor GitHub Action
-        uses: ethpandaops/kurtosis-assertoor-github-action@5932604b244dbd2ddb811516b516a9094f4d2c2f # v1
+        uses: ethpandaops/kurtosis-assertoor-github-action@f64942cbc780df731a731ea9f45765b161d2c8df # v1
         with:
           ethereum_package_url: "."
           ethereum_package_branch: ""

.github/workflows/per-pr.yml

@@ -36,7 +36,7 @@ jobs:
       # run kurtosis test and assertoor
       - name: Run kurtosis testnet
         id: testnet
-        uses: ethpandaops/kurtosis-assertoor-github-action@5932604b244dbd2ddb811516b516a9094f4d2c2f # v1
+        uses: ethpandaops/kurtosis-assertoor-github-action@f64942cbc780df731a731ea9f45765b161d2c8df # v1
         with:
           kurtosis_extra_args: "--image-download always --non-blocking-tasks --verbosity DETAILED"
           kurtosis_backend: "kubernetes"

.github/workflows/run-k8s.yml

@@ -4,7 +4,7 @@ image:
 tasks:
   - name: Setup Kurtosis
     command: |
-      echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
+      echo "deb [trusted=yes] https://sdk.kurtosis.com/kurtosis-cli-release-artifacts/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
       sudo apt update
       sudo apt install kurtosis-cli
       echo -ne '\n' | kurtosis run github.com/fake-package/fake-package-purely-for-analytics || kurtosis clean -a

.gitpod.yml

@@ -952,7 +952,7 @@ additional_services:
   - dora
   - dugtrio
   - erpc
-  - ews
+  - zkboost
   - forkmon
   - forky
   - full_beaconchain_explorer
@@ -1075,18 +1075,33 @@ bootnodoor_params:
   # A list of optional extra args the bootnodoor container should spin up with
   extra_args: []
 
-# Configuration place for execution-witness-sentry (ews) - https://github.com/eth-act/zkboost
-ews_params:
-  # EWS docker image to use
+# Configuration place for zkboost - https://github.com/eth-act/zkboost
+zkboost_params:
+  # zkboost docker image to use
   # Defaults to the latest image
-  image: "ghcr.io/eth-act/zkboost/execution-witness-sentry:latest"
-  # Number of execution witnesses to retain
-  # Defaults to 10
-  retain: 10
-  # Number of proofs to generate
-  # Defaults to 1
-  num_proofs: 1
-  # A list of optional extra env_vars the ews container should spin up with
+  image: "ghcr.io/eth-act/zkboost/zkboost-server:latest"
+  # Timeout in seconds for witness fetching
+  # Defaults to 12
+  witness_timeout_secs: 12
+  # Timeout in seconds for proof generation
+  # Defaults to 12
+  proof_timeout_secs: 12
+  # Number of witnesses to cache
+  # Defaults to 128
+  witness_cache_size: 128
+  # Number of proofs to cache
+  # Defaults to 128
+  proof_cache_size: 128
+  # List of zkVM configurations
+  # Each entry has: kind (mock/external), proof_type, and kind-specific options
+  # Example:
+  # zkvms:
+  #   - kind: mock
+  #     proof_type: reth-zisk
+  #     mock_proving_time_ms: 5000
+  #     mock_proof_size: 1024
+  zkvms: []
+  # A list of optional extra env_vars the zkboost container should spin up with
   env: {}
 
 # Configuration place for tempo tracing backend

README.md

@@ -64,7 +64,7 @@ get_prefunded_accounts = import_module(
 )
 spamoor = import_module("./src/spamoor/spamoor.star")
 slashoor = import_module("./src/slashoor/slashoor_launcher.star")
-ews = import_module("./src/ews/ews_launcher.star")
+zkboost = import_module("./src/zkboost/zkboost_launcher.star")
 
 GRAFANA_USER = "admin"
 GRAFANA_PASSWORD = "admin"
@@ -1018,23 +1018,25 @@ def run(plan, args={}):
                 args_with_right_defaults.additional_services,
             )
             plan.print("Successfully launched slashoor")
-        elif additional_service == "ews":
-            plan.print("Launching execution-witness-sentry")
-            ews_config_template = read_file(static_files.EWS_CONFIG_TEMPLATE_FILEPATH)
-            ews.launch_ews(
+        elif additional_service == "zkboost":
+            plan.print("Launching zkboost")
+            zkboost_config_template = read_file(
+                static_files.ZKBOOST_CONFIG_TEMPLATE_FILEPATH
+            )
+            zkboost.launch_zkboost(
                 plan,
-                ews_config_template,
+                zkboost_config_template,
                 all_participants,
                 args_with_right_defaults.participants,
-                network_params,
-                args_with_right_defaults.ews_params,
+                args_with_right_defaults.zkboost_params,
                 global_node_selectors,
                 global_tolerations,
                 args_with_right_defaults.port_publisher,
                 index,
                 args_with_right_defaults.docker_cache_params,
+                {},
             )
-            plan.print("Successfully launched execution-witness-sentry")
+            plan.print("Successfully launched zkboost")
         else:
             fail("Invalid additional service %s" % (additional_service))
     if launch_prometheus_grafana:

main.star

@@ -154,13 +154,13 @@ def get_config(
         "--rpc-http-enabled=true",
         "--rpc-http-host=0.0.0.0",
         "--rpc-http-port={0}".format(RPC_PORT_NUM),
-        "--rpc-http-api=ADMIN,CLIQUE,ETH,NET,DEBUG,TXPOOL,ENGINE,TRACE,WEB3",
+        "--rpc-http-api=ADMIN,ETH,NET,DEBUG,TXPOOL,ENGINE,TRACE,WEB3",
         "--rpc-http-cors-origins=*",
         "--rpc-http-max-active-connections=300",
         "--rpc-ws-enabled=true",
         "--rpc-ws-host=0.0.0.0",
         "--rpc-ws-port={0}".format(WS_PORT_NUM),
-        "--rpc-ws-api=ADMIN,CLIQUE,ETH,NET,DEBUG,TXPOOL,ENGINE,TRACE,WEB3",
+        "--rpc-ws-api=ADMIN,ETH,NET,DEBUG,TXPOOL,ENGINE,TRACE,WEB3",
         "--p2p-enabled=true",
         "--p2p-host=" + port_publisher.el_nat_exit_ip,
         "--p2p-port={0}".format(discovery_port_tcp),