feat: deploy multiple op l2s

kurtosis.yml

@@ -1 +1 @@
-name: "github.com/ethpandaops/optimism-package"
+name: "github.com/tedim52/optimism-package"

main.star

@@ -1,14 +1,40 @@
-input_parser = import_module("./src/package_io/input_parser.star")
 ethereum_package = import_module("github.com/kurtosis-tech/ethereum-package/main.star")
 contract_deployer = import_module("./src/contracts/contract_deployer.star")
 static_files = import_module(
     "github.com/kurtosis-tech/ethereum-package/src/static_files/static_files.star"
 )
-participant_network = import_module("./src/participant_network.star")
-blockscout = import_module("./src/blockscout/blockscout_launcher.star")
+l2_launcher = import_module("./src/l2.star")
 
+def run(plan, args={}): 
+    """Deploy Optimism L2s on an Ethereum L1.
 
-def get_l1_stuff(all_l1_participants, l1_network_params):
+    Args:
+        args(yaml): Configures other aspects of the environment.
+    Returns:
+        Full Optimism L2s. 
+    """
+    plan.print("Parsing the L1 input args")
+    ethereum_args = args["l1"]
+
+    # Deploy the L1
+    plan.print("Deploying a local L1")
+    l1 = ethereum_package.run(plan, ethereum_args)
+
+    # Get L1 info
+    all_l1_participants = l1.all_participants
+    l1_network_params = l1.network_params
+    l1_priv_key = l1.pre_funded_accounts[12].private_key  # reserved for L2 contract deployers
+    l1_config_env_vars = get_l1_config(all_l1_participants, l1_network_params)
+
+    # Deploy Create2 Factory contract (only need to do this once for multiple l2s)
+    contract_deployer.deploy_factory_contract(plan, l1_priv_key, l1_config_env_vars)
+
+    # Deploy L2s
+    for l2_num, l2_args in enumerate(args["l2s"]):
+        plan.print("deploying l2 with name {0}".format(l2_args["name"]))
+        l2_launcher.launch_l2(plan, l2_args, l1_config_env_vars, l1_priv_key, all_l1_participants[0].el_context)
+
+def get_l1_config(all_l1_participants, l1_network_params):
     env_vars = {}
     env_vars["L1_RPC_KIND"] = "any"
     env_vars["WEB3_RPC_URL"] = str(all_l1_participants[0].el_context.rpc_http_url)
@@ -30,94 +56,3 @@ def get_l1_stuff(all_l1_participants, l1_network_params):
     return env_vars
 
 
-def run(plan, args={}):
-    """Deploy a Optimism L2 with a local L1.
-
-    Args:
-        args(yaml): Configures other aspects of the environment.
-    Returns:
-        A full deployment of Optimism L2
-    """
-
-    # Parse the values for the args
-    plan.print("Parsing the L1 input args")
-
-    ethereum_args = args["ethereum_package"]
-
-    # Deploy the L1
-    plan.print("Deploying a local L1")
-    l1 = ethereum_package.run(plan, ethereum_args)
-    all_l1_participants = l1.all_participants
-    l1_network_params = l1.network_params
-    l1_priv_key = l1.pre_funded_accounts[
-        12
-    ].private_key  # reserved for L2 contract deployer
-    # Deploy L2 smart contracts
-    # Parse the values for the args
-    plan.print("Parsing the L2 input args")
-    optimism_args = args["optimism_package"]
-
-    l1_config_env_vars = get_l1_stuff(all_l1_participants, l1_network_params)
-
-    args_with_right_defaults = input_parser.input_parser(plan, optimism_args)
-    network_params = args_with_right_defaults.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)
-
-    (
-        el_cl_data,
-        gs_private_keys,
-        l2oo_address,
-        l1_bridge_address,
-        blockscout_env_variables,
-    ) = contract_deployer.launch_contract_deployer(
-        plan,
-        l1_priv_key,
-        l1_config_env_vars,
-        l2_config_env_vars,
-    )
-
-    # Deploy the L2
-    plan.print("Deploying a local L2")
-
-    jwt_file = plan.upload_files(
-        src=static_files.JWT_PATH_FILEPATH,
-        name="op_jwt_file",
-    )
-
-    all_l2_participants = participant_network.launch_participant_network(
-        plan,
-        args_with_right_defaults.participants,
-        jwt_file,
-        network_params,
-        el_cl_data,
-        gs_private_keys,
-        l1_config_env_vars,
-        l2oo_address,
-    )
-
-    all_el_contexts = []
-    all_cl_contexts = []
-    for participant in all_l2_participants:
-        all_el_contexts.append(participant.el_context)
-        all_cl_contexts.append(participant.cl_context)
-
-    for additional_service in args_with_right_defaults.additional_services:
-        if additional_service == "blockscout":
-            plan.print("Launching op-blockscout")
-            blockscout_launcher = blockscout.launch_blockscout(
-                plan,
-                all_l1_participants[0].el_context,  # first L1 EL url,
-                l2oo_address,
-                blockscout_env_variables,
-            )
-            plan.print("Successfully launched op-blockscout")
-
-    plan.print(all_l2_participants)
-    plan.print(
-        "Begin your L2 adventures by depositing some L1 Kurtosis ETH to: {0}".format(
-            l1_bridge_address
-        )
-    )

network_params.yaml

@@ -1,16 +1,23 @@
-optimism_package:
-  participants:
-    - el_type: op-geth
-    - el_type: op-reth
-  additional_services:
-   - blockscout
-ethereum_package:
+l1:
   participants:
     - el_type: geth
     - el_type: reth
   network_params:
     preset: minimal
-  additional_services:
-    - dora
+l2s:
+  - name: "rollup_two"
+    participants:
+    - el_type: op-geth
+    additional_services:
+    - blockscout
+    network_params:
+      preset: minimal
+      network_id: "3151909"
+  - name: "rollup_one"
+    participants:
+    - el_type: op-geth
+    network_params:
+      preset: minimal
+      network_id: "3151910"
+    additional_services:
     - blockscout
-

src/blockscout/blockscout_launcher.star

@@ -42,22 +42,22 @@ VERIF_USED_PORTS = {
     )
 }
 
-
 def launch_blockscout(
     plan,
+    network_id, 
     el_context,
     l2oo_address,
     additional_env_vars,
 ):
     postgres_output = postgres.run(
         plan,
-        service_name="{0}-postgres".format(SERVICE_NAME_BLOCKSCOUT),
+        service_name="{0}-{1}-postgres".format(SERVICE_NAME_BLOCKSCOUT, network_id),
         database="blockscout",
         extra_configs=["max_connections=1000"],
     )
 
     config_verif = get_config_verif()
-    verif_service_name = "{}-verif".format(SERVICE_NAME_BLOCKSCOUT)
+    verif_service_name = "{0}-{1}-verif".format(SERVICE_NAME_BLOCKSCOUT, network_id)
     verif_service = plan.add_service(verif_service_name, config_verif)
     verif_url = "http://{}:{}/api".format(
         verif_service.hostname, verif_service.ports["http"].number
@@ -70,7 +70,7 @@ def launch_blockscout(
         l2oo_address,
         additional_env_vars,
     )
-    blockscout_service = plan.add_service(SERVICE_NAME_BLOCKSCOUT, config_backend)
+    blockscout_service = plan.add_service("{0}-{1}".format(SERVICE_NAME_BLOCKSCOUT, network_id) , config_backend)
     plan.print(blockscout_service)
 
     blockscout_url = "http://{}:{}".format(

src/contracts/contract_deployer.star

@@ -1,12 +1,57 @@
 IMAGE = "ethpandaops/optimism-contract-deployer:latest"
 
 ENVRC_PATH = "/workspace/optimism/.envrc"
-
 FACTORY_DEPLOYER_ADDRESS = "0x3fAB184622Dc19b6109349B94811493BF2a45362"
+# raw tx data for deploying Create2Factory contract to L1
 FACTORY_DEPLOYER_CODE = "0xf8a58085174876e800830186a08080b853604580600e600039806000f350fe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf31ba02222222222222222222222222222222222222222222222222222222222222222a02222222222222222222222222222222222222222222222222222222222222222"
 
+def deploy_factory_contract(
+    plan,
+    priv_key,
+    l1_config_env_vars,
+):
+    factory_deployment_result = plan.run_sh(
+        description="Deploying L2 factory contract to L1 (will take a second, need to wait for L1 to finalize)",
+        image=IMAGE,
+        env_vars={
+            "WEB3_PRIVATE_KEY": str(priv_key),
+            "FUND_VALUE": "10",
+            "DEPLOY_CONFIG_PATH": "/workspace/optimism/packages/contracts-bedrock/deploy-config/getting-started.json",
+            "DEPLOYMENT_CONTEXT": "getting-started",
+        }
+        | l1_config_env_vars,
+        run=" && ".join([
+            "./packages/contracts-bedrock/scripts/getting-started/wallets.sh >> {0}".format(
+                ENVRC_PATH
+            ),
+            "sed -i '1d' {0}".format(
+                ENVRC_PATH
+            ),  # Remove the first line (not commented out)
+            "echo 'export IMPL_SALT=$(openssl rand -hex 32)' >> {0}".format(
+                ENVRC_PATH
+            ),
+            ". {0}".format(ENVRC_PATH),
+            "mkdir -p /network-configs",
+            "web3 transfer $FUND_VALUE to $GS_ADMIN_ADDRESS",  # Fund Admin
+            "sleep 3",
+            "web3 transfer $FUND_VALUE to $GS_BATCHER_ADDRESS",  # Fund Batcher
+            "sleep 3",
+            "web3 transfer $FUND_VALUE to $GS_PROPOSER_ADDRESS",  # Fund Proposer
+            "sleep 3",
+            "web3 transfer $FUND_VALUE to {0}".format(
+                FACTORY_DEPLOYER_ADDRESS
+            ),  # Fund Factory deployer
+            "sleep 3",
+            # sleep till chain is finalized
+            "while true; do sleep 3; echo 'Chain is not yet finalized...'; if [ \"$(curl -s $CL_RPC_URL/eth/v1/beacon/states/head/finality_checkpoints | jq -r '.data.finalized.epoch')\" != \"0\" ]; then echo 'Chain is finalized!'; break; fi; done",
+            "cast publish --rpc-url $L1_RPC_URL {0}".format(FACTORY_DEPLOYER_CODE),
+            "sleep 10",
+            "cast codesize {0} --rpc-url $L1_RPC_URL".format(FACTORY_DEPLOYER_ADDRESS),
+        ]),
+        wait="2000s",
+    )
 
-def launch_contract_deployer(
+def deploy_l2_contracts(
     plan,
     priv_key,
     l1_config_env_vars,
@@ -47,14 +92,11 @@ def launch_contract_deployer(
                 "sleep 3",
                 "web3 transfer $FUND_VALUE to {0}".format(
                     FACTORY_DEPLOYER_ADDRESS
-                ),  # Fund Factory deployer
+                ),
                 "sleep 3",
-                # sleep till chain is finalized
-                "while true; do sleep 3; echo 'Chain is not yet finalized...'; if [ \"$(curl -s $CL_RPC_URL/eth/v1/beacon/states/head/finality_checkpoints | jq -r '.data.finalized.epoch')\" != \"0\" ]; then echo 'Chain is finalized!'; break; fi; done",
                 "cd /workspace/optimism/packages/contracts-bedrock",
                 "./scripts/getting-started/config.sh",
-                "cast publish --rpc-url $L1_RPC_URL {0}".format(FACTORY_DEPLOYER_CODE),
-                "sleep 12",
+                "sleep 5",
                 "forge script scripts/Deploy.s.sol:Deploy --private-key $GS_ADMIN_PRIVATE_KEY --broadcast --rpc-url $L1_RPC_URL",
                 "sleep 3",
                 "CONTRACT_ADDRESSES_PATH=$DEPLOYMENT_OUTFILE forge script scripts/L2Genesis.s.sol:L2Genesis --sig 'runWithStateDump()' --chain-id $L2_CHAIN_ID",

src/el_cl_launcher.star

@@ -84,8 +84,8 @@ def launch(
         # Zero-pad the index using the calculated zfill value
         index_str = shared_utils.zfill_custom(index + 1, len(str(len(participants))))
 
-        el_service_name = "op-el-{0}-{1}-{2}".format(index_str, el_type, cl_type)
-        cl_service_name = "op-cl-{0}-{1}-{2}".format(index_str, cl_type, el_type)
+        el_service_name = "op-el-{0}-{1}-{2}-{3}".format(index_str, el_type, cl_type, network_params.network_id)
+        cl_service_name = "op-cl-{0}-{1}-{2}-{3}".format(index_str, cl_type, el_type, network_params.network_id)
 
         el_context = el_launch_method(
             plan,

src/l2.star

@@ -0,0 +1,73 @@
+participant_network = import_module("./participant_network.star")
+blockscout = import_module("./blockscout/blockscout_launcher.star")
+contract_deployer = import_module("./contracts/contract_deployer.star")
+input_parser = import_module("./package_io/input_parser.star")
+static_files = import_module(
+    "github.com/kurtosis-tech/ethereum-package/src/static_files/static_files.star"
+)
+
+def launch_l2(plan, l2_args, l1_config, l1_priv_key, l1_bootnode_context):
+    # Deploy L2 smart contracts
+    # Parse the values for the args
+    plan.print("Parsing the L2 input args")
+    args_with_right_defaults = input_parser.input_parser(plan, l2_args)
+    network_params = args_with_right_defaults.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)
+
+    (
+        el_cl_data,
+        gs_private_keys,
+        l2oo_address,
+        l1_bridge_address,
+        blockscout_env_variables,
+    ) = contract_deployer.deploy_l2_contracts(
+        plan,
+        l1_priv_key, # get private key of contract deployer for this l2
+        l1_config,
+        l2_config_env_vars,
+    )
+
+    # Deploy the L2
+    plan.print("Deploying a local L2")
+    jwt_file = plan.upload_files(
+        src=static_files.JWT_PATH_FILEPATH,
+        name="op_jwt_file-{0}".format(network_params.network_id),
+    )
+
+    all_l2_participants = participant_network.launch_participant_network(
+        plan,
+        args_with_right_defaults.participants,
+        jwt_file,
+        network_params,
+        el_cl_data,
+        gs_private_keys,
+        l1_config,
+        l2oo_address,
+    )
+
+    all_el_contexts = []
+    all_cl_contexts = []
+    for participant in all_l2_participants:
+        all_el_contexts.append(participant.el_context)
+        all_cl_contexts.append(participant.cl_context)
+
+    for additional_service in args_with_right_defaults.additional_services:
+        if additional_service == "blockscout":
+            plan.print("Launching op-blockscout")
+            blockscout_launcher = blockscout.launch_blockscout(
+                plan,
+                network_params.network_id,
+                l1_bootnode_context, # first l1 EL url
+                l2oo_address,
+                blockscout_env_variables,
+            )
+            plan.print("Successfully launched op-blockscout")
+
+    plan.print(all_l2_participants)
+    plan.print(
+        "Begin your L2 adventures by depositing some L1 Kurtosis ETH to: {0}".format(
+            l1_bridge_address
+        )
+    )

src/participant_network.star

@@ -48,7 +48,7 @@ def launch_participant_network(
 
     op_batcher_launcher.launch(
         plan,
-        "op-batcher",
+        "op-batcher-{0}".format(network_params.network_id),
         input_parser.DEFAULT_BATCHER_IMAGES["op-batcher"],
         all_el_contexts[0],
         all_cl_contexts[0],
@@ -58,7 +58,7 @@ def launch_participant_network(
 
     op_proposer_launcher.launch(
         plan,
-        "op-proposer",
+        "op-proposer-{0}".format(network_params.network_id),
         input_parser.DEFAULT_PROPOSER_IMAGES["op-proposer"],
         all_cl_contexts[0],
         l1_config_env_vars,