Merge pull request #636 from 0xPolygon/atanmarko/integrate-mock-proposer

feat: switch to op-succinct-proposer v2.2.x

Author: jhkimqd

.github/tests/chains/op-succinct-real-prover.yml

@@ -13,7 +13,7 @@ args:
   aggkit_prover_primary_prover: "network-prover"
   consensus_contract_type: fep
   pp_vkey_hash: "0x00e60517ac96bf6255d81083269e72c14ad006e5f336f852f7ee3efb91b966be"
-  aggchain_vkey_hash: "0x6b649aca1ba2be1e509a1cce39f7f0a1601bfcf90f0a27104970669c22df59d5"
+  aggchain_vkey_hash: "0x1e82b1193be48c5c6ba14dda2bcc29ab4d3dc3a2379198ac1f8571040d0a7a4d"
   # aggkit_prover_image: "ghcr.io/agglayer/aggkit-prover:feat-rust-proposer"
   # false = network
   # Using the network provers will use the real SP1 verifier contract which is also deployed together in the Kurtosis devnet.

.github/tests/chains/op-succinct.yml

@@ -13,8 +13,7 @@ args:
   sp1_prover_key: "0xbcdf20249abf0ed6d944c0288fad489e33f66b3960d9e6229c1cd214ed3bbe31"
   consensus_contract_type: fep
   pp_vkey_hash: "0x00e60517ac96bf6255d81083269e72c14ad006e5f336f852f7ee3efb91b966be"
-  aggchain_vkey_hash: "0x6b649aca1ba2be1e509a1cce39f7f0a1601bfcf90f0a27104970669c22df59d5"
-  # aggkit_prover_image: "ghcr.io/agglayer/aggkit-prover:feat-rust-proposer"
+  aggchain_vkey_hash: "0x1e82b1193be48c5c6ba14dda2bcc29ab4d3dc3a2379198ac1f8571040d0a7a4d"
   # true = mock
   # false = network
   # Using the network provers will use the real SP1 verifier contract which is also deployed together in the Kurtosis devnet.

.github/tests/chains/op2.yml

@@ -9,7 +9,7 @@ args:
   zkevm_rollup_id: 2
   consensus_contract_type: pessimistic
   pp_vkey_hash: "0x00e60517ac96bf6255d81083269e72c14ad006e5f336f852f7ee3efb91b966be"
-  aggchain_vkey_hash: "0x6b649aca1ba2be1e509a1cce39f7f0a1601bfcf90f0a27104970669c22df59d5"
+  aggchain_vkey_hash: "0x1e82b1193be48c5c6ba14dda2bcc29ab4d3dc3a2379198ac1f8571040d0a7a4d"
   # OP Stack EL RPC URL. Will be dynamically updated by args_sanity_check().
   op_el_rpc_url: "http://op-el-1-op-geth-op-node-002:8545"
   # OP Stack CL Node URL. Will be dynamically updated by args_sanity_check().

.github/tests/nightly/op-rollup/op-default.yml

@@ -6,7 +6,7 @@ args:
   consensus_contract_type: pessimistic
   zkevm_rollup_chain_id: 2151908
   pp_vkey_hash: "0x00e60517ac96bf6255d81083269e72c14ad006e5f336f852f7ee3efb91b966be"
-  aggchain_vkey_hash: "0x6b649aca1ba2be1e509a1cce39f7f0a1601bfcf90f0a27104970669c22df59d5"
+  aggchain_vkey_hash: "0x1e82b1193be48c5c6ba14dda2bcc29ab4d3dc3a2379198ac1f8571040d0a7a4d"
   # Arbitrary key for the SP1 prover. Replace with a valid SPN key if you want to use the network provers.
   # cast wallet private-key --mnemonic "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete"
   sp1_prover_key: "0xbcdf20249abf0ed6d944c0288fad489e33f66b3960d9e6229c1cd214ed3bbe31"

.github/workflows/deploy.yml

@@ -298,7 +298,7 @@ jobs:
           enclave_name: ${{ env.ENCLAVE_NAME }}
           args_filename: deploy-to-external-l1
 
-  run-with-cdk-op-geth-succinct:
+  run-with-op-succinct:
     runs-on: ubuntu-latest
     timeout-minutes: 40
     steps:
@@ -321,7 +321,10 @@ jobs:
         run: |
           LOGS=$(kurtosis service logs ${{ env.ENCLAVE_NAME }} op-succinct-proposer-001 2>&1)
           echo "$LOGS"
-          if echo "$LOGS" | grep -i "error\|exception\|failed\|fatal"; then
+          if [[ -z "$LOGS" ]]; then
+            echo "Error: No logs found for op-succinct-proposer 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

agglayer.star

@@ -203,7 +203,7 @@ def get_agglayer_ports(args):
         )
         if args["agglayer_admin_port"] != 0:
             ports["aglr-admin"] = PortSpec(
-                args["agglayer_admin_port"], application_protocol="grpc"
+                args["agglayer_admin_port"], application_protocol="http"
             )
     public_ports = ports_package.get_public_ports(ports, "agglayer_start_port", args)
     return (ports, public_ports)

deploy_zkevm_contracts.star

@@ -147,16 +147,48 @@ def run(plan, args, deployment_stages, op_stack_args):
         )
         artifacts.append(artifact)
 
+    # Base files artifacts to mount regardless of deployment type
+    files = {
+        "/opt/zkevm": Directory(persistent_key="zkevm-artifacts"),
+        "/opt/contract-deploy/": Directory(artifact_names=artifacts),
+    }
+    # Create op-succinct artifacts
+    if deployment_stages.get("deploy_op_succinct", False):
+        fetch_rollup_config_artifact = plan.get_files_artifact(
+            name="fetch-rollup-config",
+            description="Get fetch-rollup-config files artifact",
+        )
+        deploy_op_succinct_contract_artifact = plan.render_templates(
+            name="deploy-op-succinct-contracts.sh",
+            config={
+                "deploy-op-succinct-contracts.sh": struct(
+                    template=read_file(
+                        src="./templates/op-succinct/deploy-op-succinct-contracts.sh"
+                    ),
+                    data=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]
+        )
+        files["/opt/scripts/"] = Directory(
+            artifact_names=[deploy_op_succinct_contract_artifact]
+        )
+        service_files = files
+    else:
+        # No op-succinct specific artifacts mounted
+        service_files = files
+
     # Create helper service to deploy contracts
     contracts_service_name = "contracts" + args["deployment_suffix"]
     plan.add_service(
         name=contracts_service_name,
         config=ServiceConfig(
             image=args["zkevm_contracts_image"],
-            files={
-                "/opt/zkevm": Directory(persistent_key="zkevm-artifacts"),
-                "/opt/contract-deploy/": Directory(artifact_names=artifacts),
-            },
+            files=service_files,
             # These two lines are only necessary to deploy to any Kubernetes environment (e.g. GKE).
             entrypoint=["bash", "-c"],
             cmd=["sleep infinity"],

input_parser.star

@@ -39,9 +39,9 @@ DEFAULT_DEPLOYMENT_STAGES = {
 }
 
 DEFAULT_IMAGES = {
-    "aggkit_image": "ghcr.io/agglayer/aggkit:0.3.0-beta2",  # https://github.com/agglayer/aggkit/pkgs/container/aggkit
-    "agglayer_image": "ghcr.io/agglayer/agglayer:0.3.0-rc.20",  # https://github.com/agglayer/agglayer/pkgs/container/agglayer
-    "aggkit_prover_image": "ghcr.io/agglayer/aggkit-prover:0.1.0-rc.27",  # https://github.com/agglayer/provers/pkgs/container/aggkit-prover
+    "aggkit_image": "ghcr.io/agglayer/aggkit:0.3.0-beta6",  # 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
     "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,16 +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": "leovct/zkevm-contracts:v10.1.0-rc.3-devtools-fork.12",
+    "zkevm_contracts_image": "jhkimqd/zkevm-contracts:v10.1.0-rc.5-fork.12",
     "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_contract_deployer_image": "jhkimqd/op-succinct-contract-deployer:v2.1.3-agglayer",  # https://hub.docker.com/r/jhkimqd/op-succinct-contract-deployer
-    "op_succinct_proposer_image": "ghcr.io/agglayer/op-succinct/op-succinct:v2.1.6-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.2.1-agglayer",  # https://github.com/agglayer/op-succinct/pkgs/container/op-succinct%2Fop-proposer
     "test_runner_image": "leovct/e2e:78df008-cdk",
 }
 

lib/op_succinct.star

@@ -1,50 +1,8 @@
-ARTIFACTS = [
-    {
-        "name": "deploy-op-succinct-contracts.sh",
-        "file": "../templates/op-succinct/deploy-op-succinct-contracts.sh",
-    },
-    {
-        "name": "deploy-l2oo.sh",
-        "file": "../templates/op-succinct/deploy-l2oo.sh",
-    },
-]
-
-
-def create_op_succinct_contract_deployer_service_config(
-    plan,
-    args,
-):
-    artifact_paths = list(ARTIFACTS)
-    artifacts = []
-    for artifact_cfg in artifact_paths:
-        template = read_file(src=artifact_cfg["file"])
-        artifact = plan.render_templates(
-            name=artifact_cfg["name"],
-            config={artifact_cfg["name"]: struct(template=template, data=args)},
-        )
-        artifacts.append(artifact)
-
-    op_succinct_name = "op-succinct-contract-deployer" + args["deployment_suffix"]
-    op_succinct_contract_deployer_service_config = ServiceConfig(
-        image=args["op_succinct_contract_deployer_image"],
-        files={
-            "/opt/scripts/": Directory(
-                artifact_names=[
-                    artifacts[0],
-                    artifacts[1],
-                ],
-            ),
-        },
-    )
-
-    return {op_succinct_name: op_succinct_contract_deployer_service_config}
-
-
 # The VERIFIER_ADDRESS, L2OO_ADDRESS will need to be dynamically parsed from the output of the contract deployer
 # NETWORK_PRIVATE_KEY must be from user input
 def create_op_succinct_proposer_service_config(
+    plan,
     args,
-    op_succinct_env_vars,
     db_artifact,
 ):
     op_succinct_name = "op-succinct-proposer" + args["deployment_suffix"]
@@ -61,10 +19,8 @@ def create_op_succinct_proposer_service_config(
         "VERIFIER_ADDRESS": args["agglayer_gateway_address"],
         "AGG_PROOF_MODE": args["op_succinct_agg_proof_mode"],
         "L2OO_ADDRESS": args["zkevm_rollup_address"],
-        "OP_SUCCINCT_MOCK": op_succinct_env_vars["op_succinct_mock"],
-        "AGGLAYER": op_succinct_env_vars[
-            "op_succinct_agglayer"
-        ],  # agglayer/op-succinct specific.
+        "OP_SUCCINCT_MOCK": args["op_succinct_mock"],
+        "AGGLAYER": args["op_succinct_agglayer"],  # agglayer/op-succinct specific.
         "GRPC_ADDRESS": "0.0.0.0:"
         + str(args["op_succinct_proposer_grpc_port"]),  # agglayer/op-succinct specific.
         "NETWORK_PRIVATE_KEY": args["sp1_prover_key"],
@@ -83,6 +39,9 @@ def create_op_succinct_proposer_service_config(
         # "SAFE_DB_FALLBACK": False, # Default: false. Whether to fallback to timestamp-based L1 head estimation even though SafeDB is not activated for op-node. When false, proposer will panic if SafeDB is not available. It is by default false since using the fallback mechanism will result in higher proving cost.
         # "SIGNER_URL": "", # URL for the Web3Signer. Note: This takes precedence over the `PRIVATE_KEY` environment variable.
         # "SIGNER_ADDRESS": "", # Address of the account that will be posting output roots to L1. Note: Only set this if the signer is a Web3Signer. Note: Required if `SIGNER_URL` is set.
+        "RUST_LOG": args[
+            "global_log_level"
+        ],  # Kurtosis CDK specific. Required to see logs in the op-succinct-proposer after https://github.com/agglayer/op-succinct/commit/892085405a65a2b1c245beca3dcb9d9f5626af0e commit
     }
 
     op_succinct_proposer_service_config = ServiceConfig(
@@ -107,12 +66,12 @@ def get_op_succinct_proposer_ports(args):
         "prometheus": PortSpec(
             args["op_succinct_proposer_metrics_port"],
             application_protocol="http",
-            wait="5m",
+            wait="60s",
         ),
         "grpc": PortSpec(
             args["op_succinct_proposer_grpc_port"],
             application_protocol="grpc",
-            wait="10m",
+            wait="60s",
         ),
     }
 

lib/service.star

@@ -81,8 +81,7 @@ def get_sovereign_contract_setup_addresses(plan, args):
         command=["/bin/sh", "-c", "cat /opt/zkevm-contracts/sovereign-rollup-out.json"],
         extract=extract,
     )
-    service_name = "contracts"
-    service_name += args["deployment_suffix"]
+    service_name = "contracts" + args["deployment_suffix"]
     result = plan.exec(
         description="Getting contract setup addresses from {} service".format(
             service_name
@@ -124,7 +123,7 @@ def get_op_succinct_env_vars(plan, args):
         command=["/bin/sh", "-c", "cat /opt/op-succinct/op-succinct-env-vars.json"],
         extract=extract,
     )
-    service_name = "op-succinct-contract-deployer" + args["deployment_suffix"]
+    service_name = "contracts" + args["deployment_suffix"]
     result = plan.exec(
         description="Getting op-succinct environment variables from {} service".format(
             service_name
@@ -203,8 +202,7 @@ def get_op_succinct_l2oo_config(plan, args):
         ],
         extract=extract,
     )
-    service_name = "op-succinct-contract-deployer"
-    service_name += args["deployment_suffix"]
+    service_name = "contracts" + args["deployment_suffix"]
     result = plan.exec(
         description="Reading the opsuccinctl2ooconfig JSON file from {} service".format(
             service_name