fix: latest op-geth + fixed broken op-succint deployments

Signed-off-by: Ji Hwan <jkim@polygon.technology>
0xPolygon · Feb 22, 2025 · 6c04fc8 · 6c04fc8
1 parent 895615d
commit 6c04fc8
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 61 deletions.
diff --git a/.github/tests/chains/op-succinct.yml b/.github/tests/chains/op-succinct.yml
@@ -7,20 +7,25 @@ args:
   agglayer_prover_sp1_key: null
   agglayer_prover_primary_prover: "mock-prover"
   consensus_contract_type: pessimistic
+  op_succinct_contract_deployer_image: "jhkimqd/op-succinct-contract-deployer:v0.0.3" # https://hub.docker.com/r/jhkimqd/op-succinct-contract-deployer
+  op_succinct_server_image: "jhkimqd/op-succinct-server:v0.0.3" # https://hub.docker.com/r/jhkimqd/op-succinct-server
+  op_succinct_proposer_image: "jhkimqd/op-succinct-proposer:v0.0.3" # https://hub.docker.com/r/jhkimqd/op-succinct-proposer
 
 optimism_package:
   chains:
     - participants:
         - el_type: op-geth
-          el_image: "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:v1.101411.3"
+          el_image: "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:latest"
           cl_type: op-node
-          cl_image: "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:v1.10.1"
+          cl_image: "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:develop"
           count: 1
       batcher_params:
-        image: "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-batcher:v1.10.0"
+        image: "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-batcher:develop"
       proposer_params:
-        image: "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-proposer:v1.9.5"
+        image: "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-proposer:develop"
   op_contract_deployer_params:
-    image: "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-deployer:v0.0.11"
-    l1_artifacts_locator: "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-c193a1863182092bc6cb723e523e8313a0f4b6e9c9636513927f1db74c047c15.tar.gz"
-    l2_artifacts_locator: "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-c193a1863182092bc6cb723e523e8313a0f4b6e9c9636513927f1db74c047c15.tar.gz"
+    image: "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-deployer:v0.0.12"
+    l1_artifacts_locator: "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-fffcbb0ebf7f83311791534a41e65ef90df47797f9ca8f86941452f597f7128c.tar.gz"
+    l2_artifacts_locator: "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-fffcbb0ebf7f83311791534a41e65ef90df47797f9ca8f86941452f597f7128c.tar.gz"
+  observability:
+    enabled: false
diff --git a/aggkit.star b/aggkit.star
@@ -110,6 +110,7 @@ def create_bridge_config_artifact(
                     "zkevm_bridge_grpc_port": args["zkevm_bridge_grpc_port"],
                     "zkevm_bridge_rpc_port": args["zkevm_bridge_rpc_port"],
                     "zkevm_rpc_http_port": args["zkevm_rpc_http_port"],
+                    "zkevm_bridge_metrics_port": args["zkevm_bridge_metrics_port"],
                 }
                 | contract_setup_addresses
                 | sovereign_contract_setup_addresses

diff --git a/input_parser.star b/input_parser.star
@@ -54,9 +54,9 @@ DEFAULT_IMAGES = {
     "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:v0.0.2",  # https://hub.docker.com/r/jhkimqd/op-succinct-contract-deployer
-    "op_succinct_server_image": "jhkimqd/op-succinct-server:v0.0.2",  # https://hub.docker.com/r/jhkimqd/op-succinct-server
-    "op_succinct_proposer_image": "jhkimqd/op-succinct-proposer:v0.0.2",  # https://hub.docker.com/r/jhkimqd/op-succinct-proposer
+    "op_succinct_contract_deployer_image": "jhkimqd/op-succinct-contract-deployer:v0.0.3",  # https://hub.docker.com/r/jhkimqd/op-succinct-contract-deployer
+    "op_succinct_server_image": "jhkimqd/op-succinct-server:v0.0.3",  # https://hub.docker.com/r/jhkimqd/op-succinct-server
+    "op_succinct_proposer_image": "jhkimqd/op-succinct-proposer:v0.0.3",  # https://hub.docker.com/r/jhkimqd/op-succinct-proposer
 }
 
 DEFAULT_PORTS = {
@@ -684,55 +684,6 @@ def args_sanity_check(plan, deployment_stages, args, op_stack_args):
             fail(
                 "OP Succinct requires a valid SPN key. Change the agglayer_prover_sp1_key"
             )
-        if (
-            op_stack_args.get("optimism_package")
-            .get("chains")[0]
-            .get("participants")[0]
-            .get("el_image")
-            != "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:v1.101411.3"
-        ):
-            fail(
-                "OP Succinct requires el_image to be set to us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:v1.101411.3"
-            )
-        if (
-            op_stack_args.get("optimism_package")
-            .get("chains")[0]
-            .get("participants")[0]
-            .get("cl_image")
-            != "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:v1.10.1"
-        ):
-            fail(
-                "OP Succinct requires cl_image to be set to us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:v1.10.1"
-            )
-        if (
-            op_stack_args.get("optimism_package")
-            .get("chains")[0]
-            .get("batcher_params")
-            .get("image")
-            != "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-batcher:v1.10.0"
-        ):
-            fail(
-                "OP Succinct requires batcher_params.image to be set to us-docker.pkg.dev/oplabs-tools-artifacts/images/op-batcher:v1.10.0"
-            )
-        if (
-            op_stack_args.get("optimism_package")
-            .get("chains")[0]
-            .get("proposer_params")
-            .get("image")
-            != "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-proposer:v1.9.5"
-        ):
-            fail(
-                "OP Succinct requires proposer_params.image to be set to us-docker.pkg.dev/oplabs-tools-artifacts/images/op-proposer:v1.9.5"
-            )
-        if (
-            op_stack_args.get("optimism_package")
-            .get("op_contract_deployer_params")
-            .get("image")
-            != "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-deployer:v0.0.11"
-        ):
-            fail(
-                "OP Succinct requires op_contract_deployer_params.image to be set to us-docker.pkg.dev/oplabs-tools-artifacts/images/op-deployer:v0.0.11"
-            )
 
     # OP rollup check L1 blocktime >= L2 blocktime
     if deployment_stages.get("deploy_optimism_rollup", False):

diff --git a/templates/op-succinct/deploy-op-succinct-contracts.sh b/templates/op-succinct/deploy-op-succinct-contracts.sh
@@ -31,9 +31,11 @@ L2OO_ADDRESS=""
 OP_SUCCINCT_MOCK="true"
 EOF
 
+# Fix broken justfile paths
+sed -i 's|script/|script/validity/|g' /opt/op-succinct/justfile
 
 # Update import ISemver which wouldn't run otherwise
-sed -i 's|import {ISemver} from "src/universal/interfaces/ISemver.sol";|import {ISemver} from "@optimism/src/universal/interfaces/ISemver.sol";|' /opt/op-succinct/contracts/src/fp/OPSuccinctFaultDisputeGame.sol
+# sed -i 's|import {ISemver} from "src/universal/interfaces/ISemver.sol";|import {ISemver} from "@optimism/src/universal/interfaces/ISemver.sol";|' /opt/op-succinct/contracts/src/fp/OPSuccinctFaultDisputeGame.sol
 
 # Deploy the mock-verifier and save the address to the verifier_address.out
 just deploy-mock-verifier | grep -oP '0x[a-fA-F0-9]{40}' | xargs -I {} echo "VERIFIER_ADDRESS=\"{}\"" > /opt/op-succinct/verifier_address.out

diff --git a/templates/sovereign-rollup/sovereign-bridge-config.toml b/templates/sovereign-rollup/sovereign-bridge-config.toml
@@ -56,4 +56,9 @@ FrequencyToMonitorTxs = "5s"
 PrivateKey = {Path = "/etc/zkevm/claimtx.keystore", Password = "{{.zkevm_l2_keystore_password}}"}
 Enabled = true
 RetryInterval = "1s"
-RetryNumber = 10
+RetryNumber = 10
+
+[Metrics]
+Enabled = true
+Host = "0.0.0.0"
+Port = "{{.zkevm_bridge_metrics_port}}"