Merge pull request #3 from agglayer/preallocs

feat: preallocs for deployer

Author: xavier-romero

kurtosis.yml

@@ -1,4 +1,4 @@
-name: github.com/ethpandaops/optimism-package
+name: github.com/agglayer/optimism-package
 description: |
   # Optimism Package
   This is a Kurtosis package for deploying an Optimism Rollup

network_params.yaml

@@ -45,9 +45,9 @@ optimism_package:
       tx_fuzzer_params:
         tx_fuzzer_extra_args: []
   op_contract_deployer_params:
-    image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-deployer:v0.4.0-rc.2
-    l1_artifacts_locator: https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-02024c5a26c16fc1a5c716fff1c46b5bf7f23890d431bb554ddbad60971211d4.tar.gz
-    l2_artifacts_locator: https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-02024c5a26c16fc1a5c716fff1c46b5bf7f23890d431bb554ddbad60971211d4.tar.gz
+    image: xavierromero/op-deployer:20250314
+    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
   global_log_level: "info"
   global_node_selectors: {}
   global_tolerations: []

src/contracts/contract_deployer.star

@@ -281,7 +281,7 @@ def deploy_contracts(
     )
 
     apply_cmds = [
-        "op-deployer apply --l1-rpc-url $L1_RPC_URL --private-key $PRIVATE_KEY --workdir /network-data",
+        "op-deployer apply --l1-rpc-url $L1_RPC_URL --private-key $PRIVATE_KEY --workdir /network-data --predeployed-file /network-data/allocs/predeployed_allocs.json",
     ]
     for chain in optimism_args.chains:
         network_id = chain.network_params.network_id
@@ -296,6 +296,7 @@ def deploy_contracts(
             ]
         )
 
+    allocs_artifact = plan.get_files_artifact(name="predeployed_allocs.json")
     op_deployer_output = plan.run_sh(
         name="op-deployer-apply",
         description="Apply L2 contract deployments",
@@ -313,6 +314,7 @@ def deploy_contracts(
         ],
         files={
             "/network-data": op_deployer_configure.files_artifacts[0],
+            "/network-data/allocs": allocs_artifact,
         }
         | contracts_extra_files,
         run=" && ".join(apply_cmds),

src/package_io/input_parser.star

@@ -239,6 +239,7 @@ def input_parser(plan, input_args):
                     extra_params=result["batcher_params"]["extra_params"],
                 ),
                 proposer_params=struct(
+                    enabled=result["proposer_params"]["enabled"],
                     image=result["proposer_params"]["image"],
                     extra_params=result["proposer_params"]["extra_params"],
                     game_type=result["proposer_params"]["game_type"],
@@ -610,6 +611,7 @@ def default_proxyd_params():
 
 def default_proposer_params():
     return {
+        "enabled": True,
         "image": DEFAULT_PROPOSER_IMAGES["op-proposer"],
         "extra_params": [],
         "game_type": 1,
@@ -682,9 +684,9 @@ def default_op_contract_deployer_global_deploy_overrides():
 
 def default_op_contract_deployer_params():
     return {
-        "image": "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-deployer:v0.4.0-rc.2",
-        "l1_artifacts_locator": "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-02024c5a26c16fc1a5c716fff1c46b5bf7f23890d431bb554ddbad60971211d4.tar.gz",
-        "l2_artifacts_locator": "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-02024c5a26c16fc1a5c716fff1c46b5bf7f23890d431bb554ddbad60971211d4.tar.gz",
+        "image": "xavierromero/op-deployer:20250314",
+        "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",
         "global_deploy_overrides": default_op_contract_deployer_global_deploy_overrides(),
     }
 

src/package_io/sanity_check.star

@@ -153,7 +153,21 @@ SUBCATEGORY_PARAMS = {
     ],
     "proxyd_params": ["image", "tag", "extra_params"],
     "batcher_params": ["image", "extra_params"],
-    "proposer_params": ["image", "extra_params", "game_type", "proposal_interval"],
+    "proposer_params": [
+        "enabled",
+        "image",
+        "extra_params",
+        "game_type",
+        "proposal_interval",
+    ],
+    "challenger_params": [
+        "enabled",
+        "image",
+        "extra_params",
+        "cannon_prestate_path",
+        "cannon_prestates_url",
+        "cannon_trace_types",
+    ],
     "mev_params": ["rollup_boost_image", "builder_host", "builder_port"],
     "da_server_params": [
         "enabled",

src/participant_network.star

@@ -107,29 +107,30 @@ def launch_participant_network(
         "state",
         ".opChainDeployments[{0}].DisputeGameFactoryProxy".format(l2_num),
     )
-    proposer_key = util.read_network_config_value(
-        plan,
-        deployment_output,
-        "proposer-{0}".format(network_params.network_id),
-        ".privateKey",
-    )
-    op_proposer_image = (
-        proposer_params.image
-        if proposer_params.image != ""
-        else input_parser.DEFAULT_PROPOSER_IMAGES["op-proposer"]
-    )
-    op_proposer_launcher.launch(
-        plan,
-        "op-proposer-{0}".format(l2_services_suffix),
-        op_proposer_image,
-        all_cl_contexts[0],
-        l1_config_env_vars,
-        proposer_key,
-        game_factory_address,
-        proposer_params,
-        network_params,
-        observability_helper,
-    )
+    if proposer_params.enabled:
+        proposer_key = util.read_network_config_value(
+            plan,
+            deployment_output,
+            "proposer-{0}".format(network_params.network_id),
+            ".privateKey",
+        )
+        op_proposer_image = (
+            proposer_params.image
+            if proposer_params.image != ""
+            else input_parser.DEFAULT_PROPOSER_IMAGES["op-proposer"]
+        )
+        op_proposer_launcher.launch(
+            plan,
+            "op-proposer-{0}".format(l2_services_suffix),
+            op_proposer_image,
+            all_cl_contexts[0],
+            l1_config_env_vars,
+            proposer_key,
+            game_factory_address,
+            proposer_params,
+            network_params,
+            observability_helper,
+        )
 
     return struct(
         name=network_params.name,