feat: enable bridge service (#547)

* Update aggkit bin name

* rename the binary

* Update command to run aggkit without the node suffix

* feat: enable bridge service for aggkit

* network id fixes

* support aggkit and cdk (#549)

* support aggkit and cdk

* debugging

* fix

* minor change

* fix

* fix

* debugging

* debugging

* debugging

* revert back

* debugging

* minor fix

* fix: use zkevm_l2_l1testing_address in monitor-cdk-chain.sh

Signed-off-by: Ji Hwan <jkim@polygon.technology>

* fix: revert monitor-cdk-chain + add nonce flag

Signed-off-by: Ji Hwan <jkim@polygon.technology>

* fix: AggLayerURL param

Signed-off-by: Ji Hwan <jkim@polygon.technology>

* feat: add agglayer_version for cdk-node-config

Signed-off-by: Ji Hwan <jkim@polygon.technology>

* fix

* chore: revert nonce flag in monitor-cdk-chain

Signed-off-by: Ji Hwan <jkim@polygon.technology>

* fix

* fix review comments

* fix

* fix

* fix

* fix

* fix: cdk-node-config fix

Signed-off-by: Ji Hwan <jkim@polygon.technology>

* chore: lint

Signed-off-by: Ji Hwan <jkim@polygon.technology>

* refactor: change agglayer endpoint naming

Signed-off-by: Ji Hwan <jkim@polygon.technology>

* fix

* fix review comments

* fix review comments

* fix review comments

* fix review comments

* chore: cleanup

Signed-off-by: Ji Hwan <jkim@polygon.technology>

* fix review comments

* fix review comments

* fix ci

* fix ci

* fix ci

* fix ci

* fix ci

* fix ci

---------

Signed-off-by: Ji Hwan <jkim@polygon.technology>
Co-authored-by: Victor Castell <0x@vcastellm.xyz>
Co-authored-by: Stefan Negovanović <stefan@ethernal.tech>
Co-authored-by: Ji Hwan <jkim@polygon.technology>

Author: 4 people

cdk_central_environment.star

@@ -8,7 +8,7 @@ cdk_node_package = import_module("./lib/cdk_node.star")
 databases = import_module("./databases.star")
 
 
-def run(plan, args, contract_setup_addresses):
+def run(plan, args, deployment_stages, contract_setup_addresses):
     db_configs = databases.get_db_configs(
         args["deployment_suffix"], args["sequencer_type"]
     )
@@ -101,6 +101,7 @@ def run(plan, args, contract_setup_addresses):
         )
 
     if args["sequencer_type"] == "erigon":
+        agglayer_endpoint = get_agglayer_endpoint(plan, args, deployment_stages)
         # Create the cdk node config.
         node_config_template = read_file(
             src="./templates/trusted-node/cdk-node-config.toml"
@@ -118,6 +119,7 @@ def run(plan, args, contract_setup_addresses):
                         "l1_rpc_url": args["mitm_rpc_url"].get(
                             "cdk-node", args["l1_rpc_url"]
                         ),
+                        "agglayer_endpoint": agglayer_endpoint,
                     }
                     | db_configs
                     | contract_setup_addresses,
@@ -186,3 +188,18 @@ def create_dac_config_artifact(plan, args, db_configs, contract_setup_addresses)
             )
         },
     )
+
+
+# Function to allow cdk-node-config to pick whether to use agglayer_readrpc_port or agglayer_grpc_port depending on whether cdk-node or aggkit-node is being deployed.
+# On aggkit/cdk-node point of view, only the agglayer_image version is important. Both services can work with both grpc/readrpc and this depends on the agglayer version.
+# On Kurtosis point of view, we are checking whether the cdk-node or the aggkit node is being used to filter the grpc/readrpc.
+def get_agglayer_endpoint(plan, args, deployment_stages):
+    if (
+        "0.3" in args["agglayer_image"]
+        and args.get("binary_name") == cdk_node_package.AGGKIT_BINARY_NAME
+    ):
+        return "grpc"
+    elif deployment_stages["deploy_optimism_rollup"]:
+        return "grpc"
+    else:
+        return "readrpc"

input_parser.star

@@ -808,15 +808,6 @@ def args_sanity_check(plan, deployment_stages, args, user_args, op_stack_args):
         if deployment_stages.get("deploy_optimism_rollup", False):
             fail("Gas token is not supported when deploying OP Rollup.")
 
-        # Validate the gas token address.
-        gas_token_address = args.get("gas_token_address", "")
-        if gas_token_address == constants.ZERO_ADDRESS or gas_token_address == "":
-            fail(
-                "Gas token is enabled, but the provided gas token address is either empty or set to the zero address: '{}'.".format(
-                    gas_token_address
-                )
-            )
-
     # CDK Erigon normalcy and strict mode check
     if args["enable_normalcy"] and args["erigon_strict_mode"]:
         fail("normalcy and strict mode cannot be enabled together")

lib/aggkit.star

@@ -52,7 +52,7 @@ def get_aggkit_cmd(args):
     service_command = [
         "cat /etc/aggkit/config.toml && sleep 20 && aggkit run "
         + "--cfg=/etc/aggkit/config.toml "
-        + "--components=aggsender,aggoracle"
+        + "--components=aggsender,aggoracle,bridge"
     ]
 
     return service_command

lib/cdk_node.star

@@ -2,6 +2,8 @@ constants = import_module("../src/package_io/constants.star")
 data_availability_package = import_module("./data_availability.star")
 ports_package = import_module("../src/package_io/ports.star")
 
+AGGKIT_BINARY_NAME = "aggkit"
+
 
 def create_cdk_node_service_config(
     args,
@@ -80,6 +82,8 @@ def get_cdk_node_ports(args):
 
 
 def get_cdk_node_cmd(args):
+    binary_name = args.get("binary_name")
+
     service_command = [
         "sleep 20 && cdk-node run "
         + "--cfg=/etc/cdk/cdk-node-config.toml "
@@ -95,4 +99,13 @@ def get_cdk_node_cmd(args):
             + "--save-config-path=/tmp/ "
             + "--components=aggsender"
         ]
+
+    if binary_name == AGGKIT_BINARY_NAME:
+        service_command = [
+            "sleep 20 && aggkit run "
+            + "--cfg=/etc/cdk/cdk-node-config.toml "
+            + "--save-config-path=/tmp/ "
+            + "--components=aggsender,bridge"
+        ]
+
     return service_command

lib/op_succinct.star

@@ -187,7 +187,7 @@ def get_op_succinct_server_ports(args):
         "server": PortSpec(
             args["op_succinct_server_port"],
             application_protocol="http",
-            wait=None,
+            wait="5m",
         ),
     }
 
@@ -199,12 +199,12 @@ def get_op_succinct_proposer_ports(args):
         "metrics": PortSpec(
             args["op_succinct_proposer_metrics_port"],
             application_protocol="http",
-            wait=None,
+            wait="5m",
         ),
         "rpc": PortSpec(
             args["op_succinct_proposer_rpc_port"],
             application_protocol="http",
-            wait=None,
+            wait="5m",
         ),
     }
 

main.star

@@ -212,10 +212,9 @@ def run(plan, args={}):
                 plan.print("Skipping the deployment of cdk-erigon node")
 
             plan.print("Deploying cdk central/trusted environment")
-            central_environment_args = dict(args)
-            central_environment_args["genesis_artifact"] = genesis_artifact
+            args["genesis_artifact"] = genesis_artifact
             import_module(cdk_central_environment_package).run(
-                plan, central_environment_args, contract_setup_addresses
+                plan, args, deployment_stages, contract_setup_addresses
             )
 
             # Deploy contracts on L2.
@@ -245,10 +244,9 @@ def run(plan, args={}):
     # Deploy AggKit infrastructure + Dedicated Bridge Service
     if deployment_stages.get("deploy_optimism_rollup", False):
         plan.print("Deploying AggKit infrastructure")
-        central_environment_args = dict(args)
         import_module(aggkit_package).run(
             plan,
-            central_environment_args,
+            args,
             contract_setup_addresses,
             sovereign_contract_setup_addresses,
             deployment_stages,

templates/aggkit/aggkit-config.toml

@@ -13,12 +13,12 @@
 PathRWData = "{{.zkevm_path_rw_data}}"
 L1URL="{{.l1_rpc_url}}"
 L2URL="{{.op_el_rpc_url}}"
-# AggLayerURL="{{.agglayer_readrpc_url}}"
 AggLayerURL="{{.agglayer_grpc_url}}"
 
 ForkId = 12
 ContractVersions = "banana"
 IsValidiumMode = false
+NetworkID = {{.zkevm_rollup_id}}
 
 # This is the admin account for now
 L2Coinbase =  "{{.zkevm_l2_sovereignadmin_address}}"
@@ -502,4 +502,4 @@ URL = "{{.op_el_rpc_url}}"
 # Needs to be set to be the sovereign L2 chain id
 # If set to 0, the chain ID will be fetched from the RPC endpoint
 # ------------------------------------------------------------------------------
-L1ChainID = "{{.zkevm_rollup_chain_id}}"
+L1ChainID = "{{.zkevm_rollup_chain_id}}"

templates/cdk-erigon/config.yml

@@ -139,8 +139,6 @@ zkevm.reject-low-gas-price-transactions: false
 zkevm.reject-low-gas-price-transactions: true
 # {{end}}
 
-
-
 # Apply a factor to convert L1 gas prices into L2 gas prices.
 # A value of 1 means no adjustment; values greater than 1 increase L2 costs proportionally.
 # Default: 1

templates/contract-deploy/run-contract-setup.sh

@@ -102,9 +102,9 @@ sed -i 's#http://127.0.0.1:8545#{{.l1_rpc_url}}#' hardhat.config.ts
 printf "[profile.default]\nsrc = 'contracts'\nout = 'out'\nlibs = ['node_modules']\n" > foundry.toml
 
 # Deploy gas token
-# {{if .gas_token_enabled}}
-
-# {{if eq .gas_token_address ""}}
+# shellcheck disable=SC1054,SC1072,SC1083
+{{ if .gas_token_enabled }}
+{{ if eq .gas_token_address "" }}
 echo_ts "Deploying gas token to L1"
 forge create \
     --broadcast \
@@ -119,16 +119,16 @@ jq \
     '.gasTokenAddress = $c[0].deployedTo' \
     /opt/contract-deploy/create_rollup_parameters.json \
     > /opt/zkevm-contracts/deployment/v2/create_rollup_parameters.json
-# {{else}}
+# shellcheck disable=SC1073,SC1009
+{{ else }}
 echo_ts "Using L1 pre-deployed gas token: {{ .gas_token_address }}"
 jq \
     --arg c "{{ .gas_token_address }}" \
     '.gasTokenAddress = $c' \
     /opt/contract-deploy/create_rollup_parameters.json \
     > /opt/zkevm-contracts/deployment/v2/create_rollup_parameters.json
-# {{end}}
-
-# {{end}}
+{{ end }}
+{{ end }}
 
 is_first_rollup=0 # an indicator if this deployment is doing the first setup of the agglayer etc
 if [[ ! -e /opt/zkevm/combined.json ]]; then
@@ -195,9 +195,9 @@ jq '.polygonZkEVML2BridgeAddress = .polygonZkEVMBridgeAddress' combined.json > c
 zkevm_global_exit_root_l2_address=$(jq -r '.genesis[] | select(.contractName == "PolygonZkEVMGlobalExitRootL2 proxy") | .address' /opt/zkevm/genesis.json)
 jq --arg a "$zkevm_global_exit_root_l2_address" '.polygonZkEVMGlobalExitRootL2Address = $a' combined.json > c.json; mv c.json combined.json
 
-# {{if .gas_token_enabled}}
+{{ if .gas_token_enabled }}
 jq --slurpfile cru /opt/zkevm-contracts/deployment/v2/create_rollup_parameters.json '.gasTokenAddress = $cru[0].gasTokenAddress' combined.json > c.json; mv c.json combined.json
-# {{end}}
+{{ end }}
 
 
 # There are a bunch of fields that need to be renamed in order for the

templates/trusted-node/cdk-node-config.toml

@@ -1,10 +1,14 @@
 PathRWData = "{{.zkevm_path_rw_data}}"
 L1URL="{{.l1_rpc_url}}"
 L2URL="http://{{.l2_rpc_name}}{{.deployment_suffix}}:{{.zkevm_rpc_http_port}}"
+{{- if eq .agglayer_endpoint "grpc" }}
+AggLayerURL="{{.agglayer_grpc_url}}"
+{{- else }}
 AggLayerURL="{{.agglayer_readrpc_url}}"
-
+{{- end }}
 ForkId = {{.zkevm_rollup_fork_id}}
 IsValidiumMode = {{.is_cdk_validium}}
+NetworkID = {{.zkevm_rollup_id}}
 
 {{if eq .zkevm_rollup_fork_id "12"}}
 ContractVersions = "banana"
@@ -66,4 +70,3 @@ Outputs = ["stderr"]
 [AggSender]
 CertificateSendInterval = "1m"
 CheckSettledInterval = "5s"
-