From dece4de2cae4f26b4889a5ba6240f01e1ba9a53e Mon Sep 17 00:00:00 2001 From: Sebastian Stammler Date: Wed, 14 Aug 2024 15:47:53 +0200 Subject: [PATCH] devnet: enable span batches and use blobs for non-plasma (#11477) --- bedrock-devnet/devnet/__init__.py | 3 ++- ops-bedrock/docker-compose.yml | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bedrock-devnet/devnet/__init__.py b/bedrock-devnet/devnet/__init__.py index fc265c48f690..1df37833e3fb 100644 --- a/bedrock-devnet/devnet/__init__.py +++ b/bedrock-devnet/devnet/__init__.py @@ -269,8 +269,10 @@ def devnet_deploy(paths): if DEVNET_PLASMA: docker_env['PLASMA_ENABLED'] = 'true' + docker_env['DA_TYPE'] = 'calldata' else: docker_env['PLASMA_ENABLED'] = 'false' + docker_env['DA_TYPE'] = 'blobs' if GENERIC_PLASMA: docker_env['PLASMA_GENERIC_DA'] = 'true' @@ -279,7 +281,6 @@ def devnet_deploy(paths): docker_env['PLASMA_GENERIC_DA'] = 'false' docker_env['PLASMA_DA_SERVICE'] = 'false' - # Bring up the rest of the services. log.info('Bringing up `op-node`, `op-proposer` and `op-batcher`.') run_command(['docker', 'compose', 'up', '-d', 'op-node', 'op-proposer', 'op-batcher', 'artifact-server'], cwd=paths.ops_bedrock_dir, env=docker_env) diff --git a/ops-bedrock/docker-compose.yml b/ops-bedrock/docker-compose.yml index 3af8bb7781ac..c3bab7af1bb0 100644 --- a/ops-bedrock/docker-compose.yml +++ b/ops-bedrock/docker-compose.yml @@ -199,13 +199,11 @@ services: OP_BATCHER_PPROF_ENABLED: "true" OP_BATCHER_METRICS_ENABLED: "true" OP_BATCHER_RPC_ENABLE_ADMIN: "true" - OP_BATCHER_BATCH_TYPE: 0 + OP_BATCHER_BATCH_TYPE: 1 OP_BATCHER_PLASMA_ENABLED: "${PLASMA_ENABLED}" OP_BATCHER_PLASMA_DA_SERVICE: "${PLASMA_DA_SERVICE}" OP_BATCHER_PLASMA_DA_SERVER: "http://da-server:3100" - # uncomment to use blobs - # (requires L1 Dencun and L2 Ecotone activation first) - # OP_BATCHER_DATA_AVAILABILITY_TYPE: blobs + OP_BATCHER_DATA_AVAILABILITY_TYPE: "${DA_TYPE}" op-challenger: depends_on: