fix: handling of config options

README.md

@@ -233,6 +233,13 @@ optimism_package:
         # Offset is in seconds
         interop_time_offset: ""
 
+        # Whether to fund dev accounts on L2
+        # Defaults to True
+        fund_dev_accounts: true
+
+        # The Docker image that should be used for the batcher; leave blank to use the default op-batcher image
+        batcher_image: ""
+
 
       # Additional services to run alongside the network
       # Defaults to []

network_params.yaml

@@ -37,6 +37,8 @@ optimism_package:
         granite_time_offset: ""
         holocene_time_offset: ""
         interop_time_offset: ""
+        fund_dev_accounts: true
+        batcher_image: ""
       additional_services: []
   op_contract_deployer_params:
     image: mslipper/op-deployer:latest

src/contracts/contract_deployer.star

@@ -40,6 +40,16 @@ def deploy_contracts(
         ),
     )
 
+    intent_updates = [
+        ("string", "contractArtifactsURL", optimism_args.op_contract_deployer_params.artifacts_url),
+    ] + [
+        ("int", "chains.[{0}].deployOverrides.l2BlockTime".format(index), str(chain.network_params.seconds_per_slot))
+        for index, chain in enumerate(optimism_args.chains)
+    ] + [
+        ("bool", "chains.[{0}].deployOverrides.fundDevAccounts".format(index), "true" if chain.network_params.fund_dev_accounts else "false")
+        for index, chain in enumerate(optimism_args.chains)
+    ]
+
     op_deployer_configure = plan.run_sh(
         name="op-deployer-configure",
         description="Configure L2 contract deployments",
@@ -55,10 +65,10 @@ def deploy_contracts(
         },
         run=" && ".join(
             [
-                "cat /network-data/intent.toml | dasel put -r toml -t string -v '{0}' 'contractArtifactsURL' > /network-data/.intent.toml".format(
-                    optimism_args.op_contract_deployer_params.artifacts_url
-                ),
-                "mv /network-data/.intent.toml /network-data/intent.toml",
+                "cat /network-data/intent.toml | dasel put -r toml -t {0} -v '{2}' '{1}' -o /network-data/intent.toml".format(
+                    t, k, v
+                )
+                for t, k, v in intent_updates
             ]
         ),
     )

src/el/op-besu/op_besu_launcher.star

@@ -222,6 +222,7 @@ def get_config(
             )
         )
 
+    cmd += participant.el_extra_params
     cmd_str = " ".join(cmd)
 
     files = {

src/el/op-erigon/op_erigon_launcher.star

@@ -211,6 +211,7 @@ def get_config(
             )
         )
 
+    cmd += participant.el_extra_params
     cmd_str = " ".join(cmd)
     if launcher.network not in ethereum_package_constants.PUBLIC_NETWORKS:
         subcommand_strs = [

src/el/op-geth/op_geth_launcher.star

@@ -226,6 +226,7 @@ def get_config(
             )
         )
 
+    cmd += participant.el_extra_params
     cmd_str = " ".join(cmd)
     if launcher.network not in ethereum_package_constants.PUBLIC_NETWORKS:
         subcommand_strs = [

src/el/op-nethermind/op_nethermind_launcher.star

@@ -225,6 +225,8 @@ def get_config(
                 constants.EL_TYPE.op_nethermind + "_volume_size"
             ],
         )
+
+    cmd += participant.el_extra_params
     env_vars = participant.el_extra_env_vars
     config_args = {
         "image": participant.el_image,

src/el/op-reth/op_reth_launcher.star

@@ -223,6 +223,7 @@ def get_config(
             ],
         )
 
+    cmd += participant.el_extra_params
     env_vars = participant.el_extra_env_vars
     config_args = {
         "image": participant.el_image,

src/l2.star

@@ -23,10 +23,6 @@ def launch_l2(
 ):
     network_params = l2_args.network_params
 
-    l2_config_env_vars = {}
-    l2_config_env_vars["L2_CHAIN_ID"] = str(network_params.network_id)
-    l2_config_env_vars["L2_BLOCK_TIME"] = str(network_params.seconds_per_slot)
-
     plan.print("Deploying L2 with name {0}".format(network_params.name))
     jwt_file = plan.upload_files(
         src=ethereum_package_static_files.JWT_PATH_FILEPATH,

src/package_io/input_parser.star

@@ -86,6 +86,8 @@ def input_parser(plan, input_args):
                         "holocene_time_offset"
                     ],
                     interop_time_offset=result["network_params"]["interop_time_offset"],
+                    fund_dev_accounts=result["network_params"]["fund_dev_accounts"],
+                    batcher_image=result["network_params"]["batcher_image"],
                 ),
                 additional_services=result["additional_services"],
             )
@@ -202,6 +204,8 @@ def default_network_params():
         "granite_time_offset": None,
         "holocene_time_offset": None,
         "interop_time_offset": None,
+        "fund_dev_accounts": True,
+        "batcher_image": "",
     }
 
 

src/package_io/sanity_check.star

@@ -40,6 +40,8 @@ SUBCATEGORY_PARAMS = {
         "granite_time_offset",
         "holocene_time_offset",
         "interop_time_offset",
+        "fund_dev_accounts",
+        "batcher_image",
     ],
 }
 

src/participant_network.star

@@ -66,10 +66,12 @@ def launch_participant_network(
         ".privateKey",
     )
 
+    op_batcher_image = network_params.batcher_image if network_params.batcher_image != "" else input_parser.DEFAULT_BATCHER_IMAGES["op-batcher"]
+
     op_batcher_launcher.launch(
         plan,
         "op-batcher-{0}".format(l2_services_suffix),
-        input_parser.DEFAULT_BATCHER_IMAGES["op-batcher"],
+        op_batcher_image,
         all_el_contexts[0],
         all_cl_contexts[0],
         l1_config_env_vars,