Merge pull request #31 from worldcoin/osiris/pbh-devnet

Osiris/pbh devnet

devnet/Justfile

@@ -6,12 +6,12 @@ default:
 
 # Spawns the devnet
 devnet-up: build
-    # ./clean.sh
     kurtosis run . --args-file network_params.yaml --enclave world-chain
 
 # Stops the devnet **This will prune all docker containers**
 devnet-down:
-    ./clean.sh
+    kurtosis enclave rm -f world-chain
+    kurtosis clean
 
 # Builds and tags the world-chain-builder image
 build:

devnet/network_params.yaml

@@ -1,6 +1,4 @@
 optimism_package:
-  participants:
-    - el_type: world-chain
     # - el_type: op-geth-builder
     # - el_type: op-geth
     # - el_type: op-reth

devnet/src/cl/op-node-builder/op_node_builder_launcher.star

@@ -0,0 +1,198 @@
+shared_utils = import_module(
+    "github.com/ethpandaops/ethereum-package/src/shared_utils/shared_utils.star"
+)
+
+cl_context = import_module(
+    "github.com/ethpandaops/ethereum-package/src/cl/cl_context.star"
+)
+
+cl_node_ready_conditions = import_module(
+    "github.com/ethpandaops/ethereum-package/src/cl/cl_node_ready_conditions.star"
+)
+constants = import_module(
+    "github.com/ethpandaops/ethereum-package/src/package_io/constants.star"
+)
+
+#  ---------------------------------- Beacon client -------------------------------------
+
+# The Docker container runs as the "op-node" user so we can't write to root
+BEACON_DATA_DIRPATH_ON_SERVICE_CONTAINER = "/data/op-node/op-node-beacon-data"
+ROLLUP_CONFIG_MOUNT_PATH_ON_CONTAINER = "/network-configs/rollup.json"
+# Port IDs
+BEACON_TCP_DISCOVERY_PORT_ID = "tcp-discovery"
+BEACON_UDP_DISCOVERY_PORT_ID = "udp-discovery"
+BEACON_HTTP_PORT_ID = "http"
+
+# Port nums
+BEACON_DISCOVERY_PORT_NUM = 9003
+BEACON_HTTP_PORT_NUM = 8547
+
+
+def get_used_ports(discovery_port):
+    used_ports = {
+        BEACON_TCP_DISCOVERY_PORT_ID: shared_utils.new_port_spec(
+            discovery_port, shared_utils.TCP_PROTOCOL, wait=None
+        ),
+        BEACON_UDP_DISCOVERY_PORT_ID: shared_utils.new_port_spec(
+            discovery_port, shared_utils.UDP_PROTOCOL, wait=None
+        ),
+        BEACON_HTTP_PORT_ID: shared_utils.new_port_spec(
+            BEACON_HTTP_PORT_NUM,
+            shared_utils.TCP_PROTOCOL,
+            shared_utils.HTTP_APPLICATION_PROTOCOL,
+        ),
+    }
+    return used_ports
+
+
+ENTRYPOINT_ARGS = ["sh", "-c"]
+
+VERBOSITY_LEVELS = {
+    constants.GLOBAL_LOG_LEVEL.error: "ERROR",
+    constants.GLOBAL_LOG_LEVEL.warn: "WARN",
+    constants.GLOBAL_LOG_LEVEL.info: "INFO",
+    constants.GLOBAL_LOG_LEVEL.debug: "DEBUG",
+    constants.GLOBAL_LOG_LEVEL.trace: "TRACE",
+}
+
+
+def launch(
+    plan,
+    launcher,
+    service_name,
+    image,
+    el_context,
+    existing_cl_clients,
+    l1_config_env_vars,
+    gs_sequencer_private_key,
+    sequencer_enabled,
+):
+    network_name = shared_utils.get_network_name(launcher.network)
+
+    beacon_node_identity_recipe = PostHttpRequestRecipe(
+        endpoint="/",
+        content_type="application/json",
+        body='{"jsonrpc":"2.0","method":"opp2p_self","params":[],"id":1}',
+        port_id=BEACON_HTTP_PORT_ID,
+        extract={
+            "enr": ".result.ENR",
+            "multiaddr": ".result.addresses[0]",
+            "peer_id": ".result.peerID",
+        },
+    )
+
+    config = get_beacon_config(
+        plan,
+        launcher.el_cl_genesis_data,
+        launcher.jwt_file,
+        image,
+        service_name,
+        el_context,
+        existing_cl_clients,
+        l1_config_env_vars,
+        gs_sequencer_private_key,
+        beacon_node_identity_recipe,
+        sequencer_enabled,
+    )
+
+    beacon_service = plan.add_service(service_name, config)
+
+    beacon_http_port = beacon_service.ports[BEACON_HTTP_PORT_ID]
+    beacon_http_url = "http://{0}:{1}".format(
+        beacon_service.ip_address, beacon_http_port.number
+    )
+
+    response = plan.request(
+        recipe=beacon_node_identity_recipe, service_name=service_name
+    )
+
+    beacon_node_enr = response["extract.enr"]
+    beacon_multiaddr = response["extract.multiaddr"]
+    beacon_peer_id = response["extract.peer_id"]
+
+    return cl_context.new_cl_context(
+        client_name="op-node",
+        enr=beacon_node_enr,
+        ip_addr=beacon_service.ip_address,
+        http_port=beacon_http_port.number,
+        beacon_http_url=beacon_http_url,
+        cl_nodes_metrics_info=None,
+        beacon_service_name=service_name,
+        multiaddr=beacon_multiaddr,
+        peer_id=beacon_peer_id,
+    )
+
+
+def get_beacon_config(
+    plan,
+    el_cl_genesis_data,
+    jwt_file,
+    image,
+    service_name,
+    el_context,
+    existing_cl_clients,
+    l1_config_env_vars,
+    gs_sequencer_private_key,
+    beacon_node_identity_recipe,
+    sequencer_enabled,
+):
+    EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(
+        el_context.ip_addr,
+        el_context.engine_rpc_port_num,
+    )
+
+    used_ports = get_used_ports(BEACON_DISCOVERY_PORT_NUM)
+
+    cmd = [
+        "op-node",
+        "--l2={0}".format(EXECUTION_ENGINE_ENDPOINT),
+        "--l2.jwt-secret=" + constants.JWT_MOUNT_PATH_ON_CONTAINER,
+        "--verifier.l1-confs=4",
+        "--rollup.config=" + ROLLUP_CONFIG_MOUNT_PATH_ON_CONTAINER,
+        "--rpc.addr=0.0.0.0",
+        "--rpc.port={0}".format(BEACON_HTTP_PORT_NUM),
+        "--rpc.enable-admin",
+        "--l1={0}".format(l1_config_env_vars["L1_RPC_URL"]),
+        "--l1.rpckind={0}".format(l1_config_env_vars["L1_RPC_KIND"]),
+        "--l1.beacon={0}".format(l1_config_env_vars["CL_RPC_URL"]),
+        "--l1.trustrpc",
+        "--p2p.advertise.ip=" + constants.PRIVATE_IP_ADDRESS_PLACEHOLDER,
+        "--p2p.advertise.tcp={0}".format(BEACON_DISCOVERY_PORT_NUM),
+        "--p2p.advertise.udp={0}".format(BEACON_DISCOVERY_PORT_NUM),
+        "--p2p.listen.ip=0.0.0.0",
+        "--p2p.listen.tcp={0}".format(BEACON_DISCOVERY_PORT_NUM),
+        "--p2p.listen.udp={0}".format(BEACON_DISCOVERY_PORT_NUM),
+        "--p2p.ban.peers=true",
+        "--rpc.enable-admin",
+        "--syncmode=execution-layer",
+    ]
+
+    files = {
+        constants.GENESIS_DATA_MOUNTPOINT_ON_CLIENTS: el_cl_genesis_data,
+        constants.JWT_MOUNTPOINT_ON_CLIENTS: jwt_file,
+    }
+    ports = {}
+    ports.update(used_ports)
+
+    return ServiceConfig(
+        image=image,
+        ports=ports,
+        cmd=cmd,
+        files=files,
+        private_ip_address_placeholder=constants.PRIVATE_IP_ADDRESS_PLACEHOLDER,
+        ready_conditions=ReadyCondition(
+            recipe=beacon_node_identity_recipe,
+            field="code",
+            assertion="==",
+            target_value=200,
+            timeout="1m",
+        ),
+    )
+
+
+def new_op_node_launcher(el_cl_genesis_data, jwt_file, network_params):
+    return struct(
+        el_cl_genesis_data=el_cl_genesis_data,
+        jwt_file=jwt_file,
+        network=network_params.network,
+    )

devnet/src/el/world-chain/world_chain_launcher.star

@@ -169,11 +169,6 @@ def get_config(
         "--port={0}".format(discovery_port),
     ]
 
-    if not sequencer_enabled:
-        cmd.append(
-            "--rollup.sequencer-http={0}".format(sequencer_context.beacon_http_url)
-        )
-
     if len(existing_el_clients) > 0:
         cmd.append(
             "--bootnodes="