Merge pull request #656 from 0xPolygon/atanmarko/integrate-sp1-5

jhkimqd · web-flow · commit 87824d969b6e · 2025-06-19T22:33:30.000+09:00
feat: update components to sp1-sdk 5.0
diff --git a/.github/workflows/kurtosis-deploy.yml b/.github/workflows/kurtosis-deploy.yml
@@ -44,8 +44,40 @@ jobs:
 
       - name: Run bridge tests
         run: |
-          kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "bats --filter 'bridge native ETH from L1 to L2' tests/agglayer/bridges.bats"
-          kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "bats --filter 'bridge native ETH from L2 to L1' tests/agglayer/bridges.bats"
+          kurtosis service stop ${{ env.ENCLAVE_NAME }} bridge-spammer-001
+          kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "export CLAIM_WAIT_DURATION=20m && bats --filter 'bridge native ETH from L1 to L2' tests/agglayer/bridges.bats"
+          kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "export CLAIM_WAIT_DURATION=20m && bats --filter 'bridge native ETH from L2 to L1' tests/agglayer/bridges.bats"
+          kurtosis service start ${{ env.ENCLAVE_NAME }} bridge-spammer-001
+
+      - name: Check for error logs in aggkit service
+        working-directory: .github/scripts
+        run: |
+          LOGS=$(kurtosis service logs ${{ env.ENCLAVE_NAME }} aggkit-001 2>&1)
+          echo "$LOGS"
+          if [[ -z "$LOGS" ]]; then
+            echo "Error: No logs found for aggkit service! Service may not be functioning."
+            exit 1  # Fail the workflow if logs are empty
+          elif echo "$LOGS" | grep "ERRO\|FATA\|panic"; then
+            echo "Critical errors found in container logs!"
+            exit 1  # Fail the workflow if errors are found
+          else
+            echo "No errors found in logs."
+          fi
+      
+      - name: Check for error logs in agglayer service
+        working-directory: .github/scripts
+        run: |
+          LOGS=$(kurtosis service logs ${{ env.ENCLAVE_NAME }} agglayer 2>&1)
+          echo "$LOGS"
+          if [[ -z "$LOGS" ]]; then
+            echo "Error: No logs found for agglayer service! Service may not be functioning."
+            exit 1  # Fail the workflow if logs are empty
+          elif echo "$LOGS" | grep -i "error\|exception\|failed\|fatal"; then
+            echo "Errors found in container logs!"
+            exit 1  # Fail the workflow if errors are found
+          else
+            echo "No errors found in logs."
+          fi
 
       - name: Post kurtosis run
         if: always()
@@ -155,8 +187,8 @@ jobs:
 
       - name: Run bridge tests
         run: |
-          kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "bats --filter 'bridge native ETH from L1 to L2' tests/agglayer/bridges.bats"
-          kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "bats --filter 'bridge native ETH from L2 to L1' tests/agglayer/bridges.bats"
+          kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "export CLAIM_WAIT_DURATION=20m && bats --filter 'bridge native ETH from L1 to L2' tests/agglayer/bridges.bats"
+          kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "export CLAIM_WAIT_DURATION=20m && bats --filter 'bridge native ETH from L2 to L1' tests/agglayer/bridges.bats"
 
       - name: Post kurtosis run
         if: always()
@@ -281,8 +313,8 @@ jobs:
 
       - name: Run bridge tests
         run: |
-          kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "bats --filter 'bridge native ETH from L1 to L2' tests/agglayer/bridges.bats"
-          kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "bats --filter 'bridge native ETH from L2 to L1' tests/agglayer/bridges.bats"
+          kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "export CLAIM_WAIT_DURATION=20m && bats --filter 'bridge native ETH from L1 to L2' tests/agglayer/bridges.bats"
+          kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "export CLAIM_WAIT_DURATION=20m && bats --filter 'bridge native ETH from L2 to L1' tests/agglayer/bridges.bats"
 
       - name: Post kurtosis run
         if: always()
@@ -304,7 +336,10 @@ jobs:
           docker_token: ${{ secrets.DOCKER_TOKEN }}
 
       - name: Kurtosis run
-        run: kurtosis run --enclave=${{ env.ENCLAVE_NAME }} --args-file=./.github/tests/chains/op-succinct.yml .
+        run: |
+          # Add test runner and tx spammer to the args file
+          yq --in-place --yaml-roundtrip '.args.additional_services += ["test_runner"]' ./.github/tests/chains/op-succinct.yml
+          kurtosis run --enclave=${{ env.ENCLAVE_NAME }} --args-file=./.github/tests/chains/op-succinct.yml .
 
       - name: Inspect enclave
         run: kurtosis enclave inspect ${{ env.ENCLAVE_NAME }}
@@ -331,6 +366,11 @@ jobs:
             echo "No errors found in logs."
           fi
 
+      # - name: Run optimistic-mode test
+      #   run: |
+      #     kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "export ENCLAVE_NAME=${{ env.ENCLAVE_NAME }} TIMEOUT=2500 && bats --filter 'Enable OptimisticMode' tests/op/optimistic-mode.bats"
+      #     kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "export ENCLAVE_NAME=${{ env.ENCLAVE_NAME }} TIMEOUT=2500 && bats --filter 'Disable OptimisticMode' tests/op/optimistic-mode.bats"
+
       - name: Post kurtosis run
         if: always()
         uses: ./.github/actions/kurtosis-post-run
diff --git a/aggkit.star b/aggkit.star
@@ -22,6 +22,9 @@ def run(
         )
         (ports, public_ports) = get_aggkit_prover_ports(args)
 
+        # Fetch evm-sketch-genesis-conf artifact
+        evm_sketch_genesis_conf = get_evm_sketch_genesis(plan, args)
+
         prover_env_vars = {
             # TODO one of these values can be deprecated soon 2025-04-15
             "PROPOSER_NETWORK_PRIVATE_KEY": args["sp1_prover_key"],
@@ -40,6 +43,7 @@ def run(
                     "/etc/aggkit": Directory(
                         artifact_names=[
                             aggkit_prover_config_artifact,
+                            evm_sketch_genesis_conf,
                         ]
                     ),
                 },
@@ -274,3 +278,28 @@ def get_agglayer_endpoint(plan, args):
         return "grpc"
     else:
         return "readrpc"
+
+
+# Fetch the parsed .config section of L1 geth genesis.
+def get_evm_sketch_genesis(plan, args):
+    # Upload file to files artifact
+    evm_sketch_genesis_conf_artifact = plan.store_service_files(
+        service_name="temp-contracts",
+        name="evm-sketch-genesis-conf-artifact.json",
+        src="/opt/op-succinct/evm-sketch-genesis.json",
+        description="Storing evm-sketch-genesis.json for evm-sketch-genesis field in aggkit-prover.",
+    )
+
+    # Fetch evm-sketch-genesis-conf artifact
+    evm_sketch_genesis_conf = plan.get_files_artifact(
+        name="evm-sketch-genesis-conf-artifact.json",
+        description="Fetch evm-sketch-genesis-conf-artifact.json files artifact",
+    )
+
+    # Remove temp-contracts service after extracting evm-sketch-genesis
+    plan.remove_service(
+        name="temp-contracts",
+        description="Remove temp-contracts service after extracting evm-sketch-genesis",
+    )
+
+    return evm_sketch_genesis_conf
diff --git a/deploy_zkevm_contracts.star b/deploy_zkevm_contracts.star
@@ -187,6 +187,7 @@ def run(plan, args, deployment_stages, op_stack_args):
             },
             description="Create deploy_op_succinct_contract files artifact",
         )
+
         # Mount op-succinct specific artifacts
         files["/opt/op-succinct/"] = Directory(
             artifact_names=[fetch_rollup_config_artifact]
diff --git a/ethereum.star b/ethereum.star
@@ -63,7 +63,7 @@ def run(plan, args):
             # Enable the Electra hardfork.
             # Note: The electra fork epoch is set to 1 instead of 0 to avoid the following error in the CL node (lighthouse).
             #  Mar 11 11:56:46.595 CRIT Failed to start beacon node             reason: Built-in genesis state SSZ bytes are invalid: OffsetOutOfBounds(522733568)
-            "electra_fork_epoch": 1,
+            "electra_fork_epoch": derive_l1_preset(args),
         },
         "additional_services": args["l1_additional_services"],
         "port_publisher": port_publisher,
@@ -117,3 +117,10 @@ def _wait_for_l1_startup(plan, cl_rpc_url):
         ),
         wait="5m",
     )
+
+
+def derive_l1_preset(args):
+    if args["l1_preset"] == "mainnet":
+        return 0
+    else:
+        return 1
diff --git a/input_parser.star b/input_parser.star
@@ -40,8 +40,8 @@ DEFAULT_DEPLOYMENT_STAGES = {
 
 DEFAULT_IMAGES = {
     "aggkit_image": "ghcr.io/agglayer/aggkit:0.4.0-beta1",  # https://github.com/agglayer/aggkit/pkgs/container/aggkit
-    "agglayer_image": "ghcr.io/agglayer/agglayer:0.3.0-rc.21",  # https://github.com/agglayer/agglayer/pkgs/container/agglayer
-    "aggkit_prover_image": "ghcr.io/agglayer/aggkit-prover:0.1.0-rc.29",  # https://github.com/agglayer/provers/pkgs/container/aggkit-prover
+    "agglayer_image": "ghcr.io/agglayer/agglayer:0.3.4",  # https://github.com/agglayer/agglayer/pkgs/container/agglayer
+    "aggkit_prover_image": "ghcr.io/agglayer/aggkit-prover:1.1.2",  # https://github.com/agglayer/provers/pkgs/container/aggkit-prover
     "cdk_erigon_node_image": "hermeznetwork/cdk-erigon:v2.61.19",  # https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
     "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.5.4-rc1",  # https://github.com/0xpolygon/cdk/pkgs/container/cdk
     "cdk_validium_node_image": "ghcr.io/0xpolygon/cdk-validium-node:0.6.4-cdk.10",  # https://github.com/0xPolygon/cdk-validium-node/pkgs/container/cdk-validium-node/
@@ -52,15 +52,15 @@ DEFAULT_IMAGES = {
     # This image has been built using the following branch: https://github.com/leovct/agglayer-contracts/tree/v10.1.0-rc.3-devtools
     # It includes two fixes, one for proxiedTokensManager param and another one for bridge initialize call.
     # It is not an official release made by the contracts team, thus we label it as a "devtools" image.
-    "zkevm_contracts_image": "jhkimqd/zkevm-contracts:v10.1.0-rc.5-fork.12",
+    "zkevm_contracts_image": "jhkimqd/zkevm-contracts:v10.1.0-sp1.v5-fork.12",  # https://hub.docker.com/layers/jhkimqd/zkevm-contracts/v10.1.0-sp1.v5-fork.12/images/sha256-b3346dbce4f698ff57821c322b66378ea3103e7246596154b0653057d0b02fc8
     "zkevm_da_image": "ghcr.io/0xpolygon/cdk-data-availability:0.0.13",  # https://github.com/0xpolygon/cdk-data-availability/pkgs/container/cdk-data-availability
     "zkevm_node_image": "hermeznetwork/zkevm-node:v0.7.3",  # https://hub.docker.com/r/hermeznetwork/zkevm-node/tags
     "zkevm_pool_manager_image": "hermeznetwork/zkevm-pool-manager:v0.1.2",  # https://hub.docker.com/r/hermeznetwork/zkevm-pool-manager/tags
     "zkevm_prover_image": "hermeznetwork/zkevm-prover:v8.0.0-RC16-fork.12",  # https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags
     "zkevm_sequence_sender_image": "hermeznetwork/zkevm-sequence-sender:v0.2.4",  # https://hub.docker.com/r/hermeznetwork/zkevm-sequence-sender/tags
     "anvil_image": "ghcr.io/foundry-rs/foundry:v1.0.0",  # https://github.com/foundry-rs/foundry/pkgs/container/foundry/versions?filters%5Bversion_type%5D=tagged
     "mitm_image": "mitmproxy/mitmproxy:11.1.3",  # https://hub.docker.com/r/mitmproxy/mitmproxy/tags
-    "op_succinct_proposer_image": "ghcr.io/agglayer/op-succinct/op-succinct:v2.2.1-agglayer",  # https://github.com/agglayer/op-succinct/pkgs/container/op-succinct%2Fop-proposer
+    "op_succinct_proposer_image": "ghcr.io/agglayer/op-succinct/op-succinct:v2.3.1-agglayer",  # https://github.com/agglayer/op-succinct/pkgs/container/op-succinct%2Fop-succinct
     "test_runner_image": "leovct/e2e:9fe80e1",
     "status_checker_image": "ghcr.io/0xpolygon/status-checker:v0.2.4",  # https://github.com/0xPolygon/status-checker/releases
 }
@@ -449,9 +449,9 @@ DEFAULT_OP_STACK_ARGS = {
                 {
                     # OP Rollup configuration
                     "el_type": "op-geth",
-                    "el_image": "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:v1.101503.1",
+                    "el_image": "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:v1.101511.0",
                     "cl_type": "op-node",
-                    "cl_image": "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:v1.13.2",
+                    "cl_image": "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:v1.13.3",
                     "count": 1,
                 },
             ],
@@ -468,6 +468,10 @@ DEFAULT_OP_STACK_ARGS = {
                 "network_id": str(DEFAULT_ROLLUP_ARGS.get("zkevm_rollup_chain_id")),
                 # The blocktime on the OP network
                 "seconds_per_slot": 1,
+                # Isthmus fork
+                # Defaults to None - not activated - decimal value
+                # Offset is in seconds
+                "isthmus_time_offset": 0,
             },
         },
     ],
diff --git a/main.star b/main.star
@@ -3,17 +3,17 @@ input_parser = import_module("./input_parser.star")
 service_package = import_module("./lib/service.star")
 op_succinct_package = import_module("./op_succinct.star")
 deploy_sovereign_contracts_package = import_module("./deploy_sovereign_contracts.star")
+aggkit_package = import_module("./aggkit.star")
+ethereum_package = import_module("./ethereum.star")
 
 # Main service packages.
 additional_services = import_module("./src/additional_services/launcher.star")
 agglayer_package = "./agglayer.star"
 cdk_bridge_infra_package = "./cdk_bridge_infra.star"
 cdk_central_environment_package = "./cdk_central_environment.star"
-aggkit_package = "./aggkit.star"
 cdk_erigon_package = "./cdk_erigon.star"
 databases_package = "./databases.star"
 deploy_zkevm_contracts_package = "./deploy_zkevm_contracts.star"
-ethereum_package = "./ethereum.star"
 anvil_package = "./anvil.star"
 zkevm_pool_manager_package = "./zkevm_pool_manager.star"
 deploy_l2_contracts_package = "./deploy_l2_contracts.star"
@@ -39,12 +39,14 @@ def run(plan, args={}):
         if args.get("l1_engine", "geth") == "anvil":
             import_module(anvil_package).run(plan, args)
         else:
-            import_module(ethereum_package).run(plan, args)
+            ethereum_package.run(plan, args)
     else:
         plan.print("Skipping the deployment of a local L1")
 
     # Extract the fetch-rollup-config binary before starting contracts-001 service.
     if deployment_stages.get("deploy_op_succinct", False):
+        # Extract genesis to feed into evm-sketch-genesis
+        # ethereum_package.extract_genesis_json(plan)
         # Temporarily run op-succinct-proposer service and fetch-rollup-config binary
         # The extract binary will be passed into the contracts-001 service
         op_succinct_package.extract_fetch_rollup_config(plan, args)
@@ -96,6 +98,9 @@ def run(plan, args={}):
             )
 
             if deployment_stages.get("deploy_op_succinct", False):
+                # Extract genesis to feed into evm-sketch-genesis
+                op_succinct_package.create_evm_sketch_genesis(plan, args)
+
                 # Run deploy-op-succinct-contracts.sh script in the contracts-001 service
                 plan.exec(
                     description="Deploying op-succinct contracts",
@@ -270,7 +275,7 @@ def run(plan, args={}):
     # Deploy AggKit infrastructure + Dedicated Bridge Service
     if deployment_stages.get("deploy_optimism_rollup", False):
         plan.print("Deploying AggKit infrastructure")
-        import_module(aggkit_package).run(
+        aggkit_package.run(
             plan,
             args,
             contract_setup_addresses,
diff --git a/op_succinct.star b/op_succinct.star
@@ -37,3 +37,63 @@ def extract_fetch_rollup_config(plan, args):
         wait=None,
         description="Extract fetch-rollup-config from the op-succinct-proposer image to files artifact",
     )
+
+
+def create_evm_sketch_genesis(plan, args):
+    parse_evm_sketch_genesis_artifact = plan.render_templates(
+        name="parse-evm-sketch-genesis.sh",
+        config={
+            "parse-evm-sketch-genesis.sh": struct(
+                template=read_file(
+                    src="./templates/op-succinct/parse-evm-sketch-genesis.sh"
+                ),
+                data=args,
+            ),
+        },
+        description="Create parse-evm-sketch-genesis.sh files artifact",
+    )
+
+    op_geth_genesis = plan.store_service_files(
+        service_name="op-el-1-op-geth-op-node" + args["deployment_suffix"],
+        name="op_geth_genesis.json",
+        src="/network-configs/genesis-" + str(args["zkevm_rollup_chain_id"]) + ".json",
+        description="Storing OP Geth genesis.json for evm-sketch-genesis field in aggkit-prover.",
+    )
+
+    # Add a temporary service using the contracts image
+    temp_service_name = "temp-contracts"
+
+    files = {}
+    files["/opt/op-succinct/"] = Directory(artifact_names=[op_geth_genesis])
+
+    files["/opt/scripts/"] = Directory(
+        artifact_names=[parse_evm_sketch_genesis_artifact]
+    )
+
+    # Create helper service to deploy contracts
+    plan.add_service(
+        name=temp_service_name,
+        config=ServiceConfig(
+            image=args["zkevm_contracts_image"],
+            files=files,
+            # These two lines are only necessary to deploy to any Kubernetes environment (e.g. GKE).
+            entrypoint=["bash", "-c"],
+            cmd=["sleep infinity"],
+            user=User(uid=0, gid=0),  # Run the container as root user.
+        ),
+    )
+
+    # Parse .config section of L1 geth genesis for evm-sketch-genesis input
+    plan.exec(
+        description="Parsing .config section of L1 geth genesis for evm-sketch-genesis input",
+        service_name="temp-contracts",
+        recipe=ExecRecipe(
+            command=[
+                "/bin/bash",
+                "-c",
+                "cp /opt/scripts/parse-evm-sketch-genesis.sh /opt/op-succinct/ && chmod +x {0} && {0}".format(
+                    "/opt/op-succinct/parse-evm-sketch-genesis.sh"
+                ),
+            ]
+        ),
+    )
diff --git a/templates/aggkit/aggkit-config.toml b/templates/aggkit/aggkit-config.toml
diff --git a/templates/bridge-infra/aggkit-prover-config.toml b/templates/bridge-infra/aggkit-prover-config.toml
diff --git a/templates/op-succinct/parse-evm-sketch-genesis.sh b/templates/op-succinct/parse-evm-sketch-genesis.sh

Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,7 @@ def run(plan, args, deployment_stages, op_stack_args):`
`187`	`187`	`},`
`188`	`188`	`description="Create deploy_op_succinct_contract files artifact",`
`189`	`189`	`)`
	`190`	`+`
`190`	`191`	`# Mount op-succinct specific artifacts`
`191`	`192`	`files["/opt/op-succinct/"] = Directory(`
`192`	`193`	`artifact_names=[fetch_rollup_config_artifact]`