update fixturenet-optimism

2023-11-10 20:05:22 +00:00
parent 042b413598
commit 1072fc98c3
18 changed files with 656 additions and 442 deletions
@@ -6,8 +6,8 @@ services:
  # Deploys the L1 smart contracts (outputs to volume l1_deployment)
  fixturenet-optimism-contracts:
    restart: on-failure
-    hostname: fixturenet-optimism-contracts
    image: cerc/optimism-contracts:local
+    hostname: fixturenet-optimism-contracts
    env_file:
      - ../config/fixturenet-optimism/l1-params.env
    environment:
@@ -17,27 +17,49 @@ services:
      CERC_L1_ACCOUNTS_CSV_URL: ${CERC_L1_ACCOUNTS_CSV_URL}
      CERC_L1_ADDRESS: ${CERC_L1_ADDRESS}
      CERC_L1_PRIV_KEY: ${CERC_L1_PRIV_KEY}
-      CERC_L1_ADDRESS_2: ${CERC_L1_ADDRESS_2}
-      CERC_L1_PRIV_KEY_2: ${CERC_L1_PRIV_KEY_2}
-    # Waits for L1 endpoint to be up before running the script
-    command: |
-      "./wait-for-it.sh -h ${CERC_L1_HOST:-$${DEFAULT_CERC_L1_HOST}} -p ${CERC_L1_PORT:-$${DEFAULT_CERC_L1_PORT}} -s -t 60 -- ./run.sh"
    volumes:
      - ../config/network/wait-for-it.sh:/app/packages/contracts-bedrock/wait-for-it.sh
-      - ../config/optimism-contracts/hardhat-tasks/verify-contract-deployment.ts:/app/packages/contracts-bedrock/tasks/verify-contract-deployment.ts
-      - ../config/optimism-contracts/hardhat-tasks/rekey-json.ts:/app/packages/contracts-bedrock/tasks/rekey-json.ts
-      - ../config/optimism-contracts/hardhat-tasks/send-balance.ts:/app/packages/contracts-bedrock/tasks/send-balance.ts
-      - ../config/fixturenet-optimism/optimism-contracts/update-config.js:/app/packages/contracts-bedrock/update-config.js
-      - ../config/fixturenet-optimism/optimism-contracts/run.sh:/app/packages/contracts-bedrock/run.sh
+      - ../config/fixturenet-optimism/optimism-contracts/deploy-contracts.sh:/app/packages/contracts-bedrock/deploy-contracts.sh
      - l2_accounts:/l2-accounts
-      - l1_deployment:/app/packages/contracts-bedrock
+      - l1_deployment:/l1-deployment
+      - l2_config:/l2-config
+    # Waits for L1 endpoint to be up before running the contract deploy script
+    command: |
+      "./wait-for-it.sh -h ${CERC_L1_HOST:-$${DEFAULT_CERC_L1_HOST}} -p ${CERC_L1_PORT:-$${DEFAULT_CERC_L1_PORT}} -s -t 60 -- ./deploy-contracts.sh"
+
+  # Initializes and runs the L2 execution client  (outputs to volume l2_geth_data)
+  op-geth:
+    restart: always
+    image: cerc/optimism-l2geth:local
+    hostname: op-geth
+    depends_on:
+      op-node:
+        condition: service_started
+    volumes:
+      - ../config/fixturenet-optimism/run-op-geth.sh:/run-op-geth.sh
+      - l2_config:/l2-config:ro
+      - l2_accounts:/l2-accounts:ro
+      - l2_geth_data:/datadir
+    entrypoint: "sh"
+    command: "/run-op-geth.sh"
+    ports:
+      - "8545"
+      - "8546"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost:8545"]
+      interval: 30s
+      timeout: 10s
+      retries: 100
+      start_period: 10s
    extra_hosts:
      - "host.docker.internal:host-gateway"

-  # Generates the config files required for L2 (outputs to volume l2_config)
-  op-node-l2-config-gen:
-    restart: on-failure
+  # Runs the L2 consensus client (Sequencer node)
+  # Generates the L2 config files if not already present (outputs to volume l2_config)
+  op-node:
+    restart: always
    image: cerc/optimism-op-node:local
+    hostname: op-node
    depends_on:
      fixturenet-optimism-contracts:
        condition: service_completed_successfully
@@ -47,61 +69,19 @@ services:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
      CERC_L1_RPC: ${CERC_L1_RPC}
    volumes:
-      - ../config/fixturenet-optimism/generate-l2-config.sh:/app/generate-l2-config.sh
-      - l1_deployment:/contracts-bedrock:ro
-      - l2_config:/app
-    command: ["sh", "/app/generate-l2-config.sh"]
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  # Initializes and runs the L2 execution client  (outputs to volume l2_geth_data)
-  op-geth:
-    restart: always
-    image: cerc/optimism-l2geth:local
-    depends_on:
-      op-node-l2-config-gen:
-        condition: service_started
-    volumes:
-      - ../config/fixturenet-optimism/run-op-geth.sh:/run-op-geth.sh
-      - l2_config:/op-node:ro
+      - ../config/fixturenet-optimism/run-op-node.sh:/run-op-node.sh
+      - l1_deployment:/l1-deployment:ro
+      - l2_config:/l2-config
      - l2_accounts:/l2-accounts:ro
-      - l2_geth_data:/datadir
    entrypoint: "sh"
-    command: "/run-op-geth.sh"
+    command: "/run-op-node.sh"
    ports:
-      - "0.0.0.0:8545:8545"
-      - "0.0.0.0:8546:8546"
-    healthcheck:
-      test: ["CMD", "nc", "-vz", "localhost:8545"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 10s
-
-  # Runs the L2 consensus client (Sequencer node)
-  op-node:
-    restart: always
-    image: cerc/optimism-op-node:local
-    depends_on:
-      op-geth:
-        condition: service_healthy
-    env_file:
-      - ../config/fixturenet-optimism/l1-params.env
-    environment:
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_L1_RPC: ${CERC_L1_RPC}
-    volumes:
-      - ../config/fixturenet-optimism/run-op-node.sh:/app/run-op-node.sh
-      - l2_config:/op-node-data:ro
-      - l2_accounts:/l2-accounts:ro
-    command: ["sh", "/app/run-op-node.sh"]
-    ports:
-      - "0.0.0.0:8547:8547"
+      - "8547"
    healthcheck:
      test: ["CMD", "nc", "-vz", "localhost:8547"]
      interval: 30s
      timeout: 10s
-      retries: 10
+      retries: 100
      start_period: 10s
    extra_hosts:
      - "host.docker.internal:host-gateway"
@@ -110,6 +90,7 @@ services:
  op-batcher:
    restart: always
    image: cerc/optimism-op-batcher:local
+    hostname: op-batcher
    depends_on:
      op-node:
        condition: service_healthy
@@ -129,7 +110,7 @@ services:
    command: |
      "/wait-for-it.sh -h ${CERC_L1_HOST:-$${DEFAULT_CERC_L1_HOST}} -p ${CERC_L1_PORT:-$${DEFAULT_CERC_L1_PORT}} -s -t 60 -- /run-op-batcher.sh"
    ports:
-      - "127.0.0.1:8548:8548"
+      - "8548"
    extra_hosts:
      - "host.docker.internal:host-gateway"

@@ -137,25 +118,29 @@ services:
  op-proposer:
    restart: always
    image: cerc/optimism-op-proposer:local
+    hostname: op-proposer
    depends_on:
      op-node:
        condition: service_healthy
+      op-geth:
+        condition: service_healthy
    env_file:
      - ../config/fixturenet-optimism/l1-params.env
    environment:
      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
      CERC_L1_RPC: ${CERC_L1_RPC}
+      CERC_L1_CHAIN_ID: ${CERC_L1_CHAIN_ID}
    volumes:
      - ../config/network/wait-for-it.sh:/wait-for-it.sh
      - ../config/fixturenet-optimism/run-op-proposer.sh:/run-op-proposer.sh
-      - l1_deployment:/contracts-bedrock:ro
+      - l1_deployment:/l1-deployment:ro
      - l2_accounts:/l2-accounts:ro
    entrypoint: ["sh", "-c"]
    # Waits for L1 endpoint to be up before running the proposer
    command: |
      "/wait-for-it.sh -h ${CERC_L1_HOST:-$${DEFAULT_CERC_L1_HOST}} -p ${CERC_L1_PORT:-$${DEFAULT_CERC_L1_PORT}} -s -t 60 -- /run-op-proposer.sh"
    ports:
-      - "127.0.0.1:8560:8560"
+      - "8560"
    extra_hosts:
      - "host.docker.internal:host-gateway"