Use forked foundry

compose/docker-compose-fixturenet-optimism.yml

@@ -1,3 +1,5 @@
+version: '3.7'
+
 services:
   # Generates and funds the accounts required when setting up the L2 chain (outputs to volume l2_accounts)
   # Creates / updates the configuration for L1 contracts deployment
@@ -8,7 +10,6 @@ services:
     hostname: fixturenet-optimism-contracts
     env_file:
       - ../config/fixturenet-optimism/l1-params.env
-      - ../config/fixturenet-optimism/l2-params.env
     environment:
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
       CERC_L1_CHAIN_ID: ${CERC_L1_CHAIN_ID}
@@ -16,41 +17,15 @@ 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_BLOCK_TIME: ${CERC_L1_BLOCK_TIME}
-      CERC_L2_BLOCK_TIME: ${CERC_L2_BLOCK_TIME}
-      CERC_PROPOSER_AMOUNT: ${CERC_PROPOSER_AMOUNT}
-      CERC_BATCHER_AMOUNT: ${CERC_BATCHER_AMOUNT}
     volumes:
-      - ../config/network/wait-for-it.sh:/wait-for-it.sh
-      - ../config/fixturenet-optimism/optimism-contracts/deploy-contracts.sh:/deploy-contracts.sh
+      - ../config/network/wait-for-it.sh:/app/packages/contracts-bedrock/wait-for-it.sh
+      - ../config/fixturenet-optimism/optimism-contracts/deploy-contracts.sh:/app/packages/contracts-bedrock/deploy-contracts.sh
       - l2_accounts:/l2-accounts
       - l1_deployment:/l1-deployment
       - l2_config:/l2-config
-    entrypoint: ["sh", "-c"]
     # 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"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-
-  l2-config-generation:
-    restart: on-failure
-    image: cerc/optimism-op-node:local
-    depends_on:
-      fixturenet-optimism-contracts:
-        condition: service_completed_successfully
-    env_file:
-      - ../config/fixturenet-optimism/l1-params.env
-    environment:
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_L1_CHAIN_ID: ${CERC_L1_CHAIN_ID}
-      CERC_L1_RPC: ${CERC_L1_RPC}
-    volumes:
-      - ../config/fixturenet-optimism/generate-l2-config.sh:/generate-l2-config.sh
-      - l1_deployment:/l1-deployment:ro
-      - l2_config:/l2-config
-    entrypoint: "bash"
-    command: "/generate-l2-config.sh"
+      "./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"
     extra_hosts:
       - "host.docker.internal:host-gateway"
 
@@ -60,8 +35,8 @@ services:
     image: cerc/optimism-l2geth:local
     hostname: op-geth
     depends_on:
-      l2-config-generation:
-        condition: service_completed_successfully
+      op-node:
+        condition: service_started
     volumes:
       - ../config/fixturenet-optimism/run-op-geth.sh:/run-op-geth.sh
       - l2_config:/l2-config:ro
@@ -88,16 +63,13 @@ services:
     image: cerc/optimism-op-node:local
     hostname: op-node
     depends_on:
-      op-geth:
-        condition: service_healthy
+      fixturenet-optimism-contracts:
+        condition: service_completed_successfully
     env_file:
       - ../config/fixturenet-optimism/l1-params.env
     environment:
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
       CERC_L1_RPC: ${CERC_L1_RPC}
-      CERC_L1_RPC_KIND: ${CERC_L1_RPC_KIND}
-      CERC_L1_BLOCK_TIME: ${CERC_L1_BLOCK_TIME}
-      CERC_L1_BEACON: ${CERC_L1_BEACON}
     volumes:
       - ../config/fixturenet-optimism/run-op-node.sh:/run-op-node.sh
       - l1_deployment:/l1-deployment:ro
@@ -160,7 +132,6 @@ services:
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
       CERC_L1_RPC: ${CERC_L1_RPC}
       CERC_L1_CHAIN_ID: ${CERC_L1_CHAIN_ID}
-      CERC_L1_BLOCK_TIME: ${CERC_L1_BLOCK_TIME}
     volumes:
       - ../config/network/wait-for-it.sh:/wait-for-it.sh
       - ../config/fixturenet-optimism/run-op-proposer.sh:/run-op-proposer.sh

config/fixturenet-optimism/generate-l2-config.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
-
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-CERC_L1_CHAIN_ID="${CERC_L1_CHAIN_ID:-${DEFAULT_CERC_L1_CHAIN_ID}}"
-CERC_L1_RPC="${CERC_L1_RPC:-${DEFAULT_CERC_L1_RPC}}"
-DEPLOYMENT_CONTEXT="$CERC_L1_CHAIN_ID"
-
-deploy_config_file="/l2-config/$DEPLOYMENT_CONTEXT.json"
-l1_deployment_file="/l1-deployment/$DEPLOYMENT_CONTEXT-deploy.json"
-l2_allocs_file="/l2-config/allocs-l2.json"
-genesis_outfile="/l2-config/genesis.json"
-rollup_outfile="/l2-config/rollup.json"
-jwt_file="/l2-config/l2-jwt.txt"
-
-# Create a JWT secret at shared path if not found
-if [ ! -f "$jwt_file" ]; then
-  openssl rand -hex 32 > $jwt_file
-  echo "Generated JWT secret at $jwt_file"
-fi
-
-# Check if genesis.json and rollup.json already exist
-if [ -f "$genesis_outfile" ] && [ -f "$rollup_outfile" ]; then
-  echo "Skipping generation, files already exist: $genesis_outfile, $rollup_outfile"
-  exit 0
-fi
-
-# If files don't exist, proceed with generation
-echo "Generating l2 config files..."
-
-op-node genesis l2 \
-  --deploy-config "$deploy_config_file" \
-  --l1-deployments "$l1_deployment_file" \
-  --l2-allocs "$l2_allocs_file" \
-  --outfile.l2 "$genesis_outfile" \
-  --outfile.rollup "$rollup_outfile" \
-  --l1-rpc "$CERC_L1_RPC"
-
-echo "Generated the l2 config files successfully"
-echo "Exiting"

config/fixturenet-optimism/l1-params.env

@@ -6,16 +6,7 @@ DEFAULT_CERC_L1_RPC="http://fixturenet-eth-geth-1:8545"
 DEFAULT_CERC_L1_HOST="fixturenet-eth-geth-1"
 DEFAULT_CERC_L1_PORT=8545
 
-# Default block time matches L1 fixturenet config.
-DEFAULT_CERC_L1_BLOCK_TIME=3
-# This can optionally be set to a preset for common node providers like Infura, Alchemy, etc.
-# Or, set to "any" to try all available methods.
-DEFAULT_CERC_L1_RPC_KIND=standard
-
 # URL to get CSV with credentials for accounts on L1
 # that are used to send balance to Optimism Proxy contract
 # (enables them to do transactions on L2)
 DEFAULT_CERC_L1_ACCOUNTS_CSV_URL="http://fixturenet-eth-bootnode-geth:9898/accounts.csv"
-DEFAULT_CERC_PROPOSER_AMOUNT="0.2ether"
-DEFAULT_CERC_BATCHER_AMOUNT="0.1ether"
-DEFAULT_CERC_L1_BEACON=http://fixturenet-eth-lighthouse-1:8001

config/fixturenet-optimism/l2-params.env

@@ -1,2 +0,0 @@
-# Default L2 block time. Must be <= L1 block time.
-DEFAULT_CERC_L2_BLOCK_TIME=1

config/fixturenet-optimism/optimism-contracts/deploy-contracts.sh

@@ -9,9 +9,6 @@ CERC_L1_RPC="${CERC_L1_RPC:-${DEFAULT_CERC_L1_RPC}}"
 
 CERC_L1_ACCOUNTS_CSV_URL="${CERC_L1_ACCOUNTS_CSV_URL:-${DEFAULT_CERC_L1_ACCOUNTS_CSV_URL}}"
 
-CERC_PROPOSER_AMOUNT="${CERC_PROPOSER_AMOUNT:-${DEFAULT_CERC_PROPOSER_AMOUNT}}"
-CERC_BATCHER_AMOUNT="${CERC_BATCHER_AMOUNT:-${DEFAULT_CERC_BATCHER_AMOUNT}}"
-
 export DEPLOYMENT_CONTEXT="$CERC_L1_CHAIN_ID"
 # Optional create2 salt for deterministic deployment of contract implementations
 export IMPL_SALT=$(openssl rand -hex 32)
@@ -19,10 +16,10 @@ export IMPL_SALT=$(openssl rand -hex 32)
 echo "Using L1 RPC endpoint ${CERC_L1_RPC}"
 
 # Exit if a deployment already exists (on restarts)
-if [ -f "/l1-deployment/$DEPLOYMENT_CONTEXT-deploy.json" ]; then
-  echo "Deployment directory /l1-deployment/$DEPLOYMENT_CONTEXT-deploy.json, checking OptimismPortal deployment"
+if [ -d "/l1-deployment/$DEPLOYMENT_CONTEXT" ]; then
+  echo "Deployment directory /l1-deployment/$DEPLOYMENT_CONTEXT, checking OptimismPortal deployment"
 
-  OPTIMISM_PORTAL_ADDRESS=$(cat /l1-deployment/$DEPLOYMENT_CONTEXT-deploy.json | jq -r .OptimismPortal)
+  OPTIMISM_PORTAL_ADDRESS=$(cat /l1-deployment/$DEPLOYMENT_CONTEXT/.deploy | jq -r .OptimismPortal)
   contract_code=$(cast code $OPTIMISM_PORTAL_ADDRESS --rpc-url $CERC_L1_RPC)
 
   if [ -z "${contract_code#0x}" ]; then
@@ -71,8 +68,9 @@ if [ -n "$CERC_L1_ADDRESS" ] && [ -n "$CERC_L1_PRIV_KEY" ]; then
 
   echo "Funding accounts."
   wait_for_block 1 300
-  cast send --from $ADMIN --rpc-url $CERC_L1_RPC --value $CERC_PROPOSER_AMOUNT $PROPOSER --private-key $ADMIN_KEY
-  cast send --from $ADMIN --rpc-url $CERC_L1_RPC --value $CERC_BATCHER_AMOUNT $BATCHER --private-key $ADMIN_KEY
+  cast send --from $ADMIN --rpc-url $CERC_L1_RPC --value 5ether $PROPOSER --private-key $ADMIN_KEY
+  cast send --from $ADMIN --rpc-url $CERC_L1_RPC --value 10ether $BATCHER --private-key $ADMIN_KEY
+  cast send --from $ADMIN --rpc-url $CERC_L1_RPC --value 2ether $SEQ --private-key $ADMIN_KEY
 else
   curl -o accounts.csv $CERC_L1_ACCOUNTS_CSV_URL
   # Admin
@@ -119,17 +117,7 @@ if [ -z "$finalized" ]; then
 fi
 
 # Generate the deploy-config/getting-started.json file
-GS_ADMIN_ADDRESS=$ADMIN \
-GS_BATCHER_ADDRESS=$BATCHER \
-GS_PROPOSER_ADDRESS=$PROPOSER \
-GS_SEQUENCER_ADDRESS=$SEQ \
-L1_RPC_URL=$CERC_L1_RPC \
-L1_CHAIN_ID=$CERC_L1_CHAIN_ID \
-L2_CHAIN_ID=42069 \
-L1_BLOCK_TIME=${CERC_L1_BLOCK_TIME:-$DEFAULT_CERC_L1_BLOCK_TIME} \
-L2_BLOCK_TIME=${CERC_L2_BLOCK_TIME:-$DEFAULT_CERC_L2_BLOCK_TIME} \
-GRANITE_TIME_OFFSET=None \
-$config_build_script
+GS_ADMIN_ADDRESS=$ADMIN GS_BATCHER_ADDRESS=$BATCHER GS_PROPOSER_ADDRESS=$PROPOSER GS_SEQUENCER_ADDRESS=$SEQ L1_RPC_URL=$CERC_L1_RPC $config_build_script
 
 echo "Writing deployment config."
 deploy_config_file="deploy-config/$DEPLOYMENT_CONTEXT.json"
@@ -139,6 +127,7 @@ cp deploy-config/getting-started.json $deploy_config_file
 #   1. Update L1 chain id
 #   2. Add missing faultGameWithdrawalDelay field
 #   (see issue: https://github.com/ethereum-optimism/optimism/issues/9773#issuecomment-2080224969)
+echo "$(jq ". += {"l1ChainID": $DEPLOYMENT_CONTEXT, "faultGameWithdrawalDelay": 604800}" $deploy_config_file)" > $deploy_config_file
 
 mkdir -p deployments/$DEPLOYMENT_CONTEXT
 
@@ -158,25 +147,24 @@ if [ "$create2CodeSize" -eq 0 ]; then
 fi
 
 # Create the L2 deployment
-# Writes out artifact to $OPTIMISM_ROOT/packages/contracts-bedrock/deployments/$DEPLOYMENT_CONTEXT-deploy.json
+# Writes out artifact to /app/packages/contracts-bedrock/deployments/$DEPLOYMENT_CONTEXT/.deploy
 echo "Deploying L1 Optimism contracts..."
-DEPLOY_CONFIG_PATH=$deploy_config_file forge script scripts/deploy/Deploy.s.sol:Deploy --private-key $ADMIN_KEY --broadcast --rpc-url $CERC_L1_RPC
+forge script scripts/Deploy.s.sol:Deploy --private-key $ADMIN_KEY --broadcast --rpc-url $CERC_L1_RPC
 echo "Done deploying contracts."
 
 echo "Generating L2 genesis allocs..."
 L2_CHAIN_ID=$(jq ".l2ChainID" $deploy_config_file)
-DEPLOY_CONFIG_PATH=$deploy_config_file \
-CONTRACT_ADDRESSES_PATH=deployments/$DEPLOYMENT_CONTEXT-deploy.json \
-STATE_DUMP_PATH=allocs-l2.json \
-forge script --chain-id $L2_CHAIN_ID scripts/L2Genesis.s.sol:L2Genesis --sig 'runWithStateDump()' --private-key $ADMIN_KEY
-
+CONTRACT_ADDRESSES_PATH=deployments/$DEPLOYMENT_CONTEXT/.deploy forge script --chain-id $L2_CHAIN_ID scripts/L2Genesis.s.sol:L2Genesis --sig 'runWithAllUpgrades()' --private-key $ADMIN_KEY
+echo "{ \"accounts\": $(jq '.' /app/packages/contracts-bedrock/state-dump-$L2_CHAIN_ID.json) }" > allocs-l2.json
 echo "Done."
+
 echo "*************************************"
 
 # Copy files needed by other containers to the appropriate shared volumes
 echo "Copying deployment artifacts volume l1_deployment and deploy-config to volume l2_config"
-cp /opt/optimism/packages/contracts-bedrock/deployments/$DEPLOYMENT_CONTEXT-deploy.json /l1-deployment
-cp /opt/optimism/packages/contracts-bedrock/deploy-config/$DEPLOYMENT_CONTEXT.json /l2-config
+cp -a /app/packages/contracts-bedrock/deployments/$DEPLOYMENT_CONTEXT /l1-deployment
+cp /app/packages/contracts-bedrock/deploy-config/$DEPLOYMENT_CONTEXT.json /l2-config
 cp allocs-l2.json /l2-config
+openssl rand -hex 32 > /l2-config/l2-jwt.txt
 
-echo "Deployment successful, exiting."
+echo "Deployment successful. Exiting"

config/fixturenet-optimism/run-op-batcher.sh

@@ -11,7 +11,7 @@ L2_RPC="http://op-geth:8545"
 ROLLUP_RPC="http://op-node:8547"
 BATCHER_KEY=$(cat /l2-accounts/accounts.json | jq -r .BatcherKey)
 
-exec op-batcher \
+op-batcher \
   --l2-eth-rpc=$L2_RPC \
   --rollup-rpc=$ROLLUP_RPC \
   --poll-interval=1s \

config/fixturenet-optimism/run-op-geth.sh

@@ -26,13 +26,13 @@ fi
 # Initialize geth from our generated L2 genesis file (if not already initialized)
 data_dir="/datadir"
 if [ ! -d "$datadir/geth" ]; then
-  geth init --datadir=$data_dir --state.scheme=hash $l2_genesis_file
+  geth init --datadir=$data_dir $l2_genesis_file
 fi
 
 # Start op-geth
 jwt_file="/l2-config/l2-jwt.txt"
 
-exec geth \
+geth \
   --datadir=$data_dir \
   --http \
   --http.corsdomain="*" \
@@ -45,7 +45,6 @@ exec geth \
   --ws.origins="*" \
   --ws.api=debug,eth,txpool,net,engine \
   --syncmode=full \
-  --state.scheme=hash \
   --gcmode=archive \
   --nodiscover \
   --maxpeers=0 \

config/fixturenet-optimism/run-op-node.sh

@@ -4,37 +4,44 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
 
+CERC_L1_CHAIN_ID="${CERC_L1_CHAIN_ID:-${DEFAULT_CERC_L1_CHAIN_ID}}"
 CERC_L1_RPC="${CERC_L1_RPC:-${DEFAULT_CERC_L1_RPC}}"
-CERC_L1_RPC_KIND="${CERC_L1_RPC_KIND:-${DEFAULT_CERC_L1_RPC_KIND}}"
-CERC_L1_BLOCK_TIME="${CERC_L1_BLOCK_TIME:-$DEFAULT_CERC_L1_BLOCK_TIME}"
-CERC_L1_BEACON="${CERC_L1_BEACON:-${DEFAULT_CERC_L1_BEACON}}"
+DEPLOYMENT_CONTEXT="$CERC_L1_CHAIN_ID"
 
-log_level=INFO
-if [ -n "$CERC_LOG_LEVEL" ]; then
-  log_level="$CERC_LOG_LEVEL"
+deploy_config_file="/l2-config/$DEPLOYMENT_CONTEXT.json"
+l1_deployment_file="/l1-deployment/$DEPLOYMENT_CONTEXT/.deploy"
+l2_allocs_file="/l2-config/allocs-l2.json"
+genesis_outfile="/l2-config/genesis.json"
+rollup_outfile="/l2-config/rollup.json"
+
+# Generate L2 genesis (if not already done)
+if [ ! -f "$genesis_outfile" ] || [ ! -f "$rollup_outfile" ]; then
+  op-node genesis l2 \
+    --deploy-config $deploy_config_file \
+    --l1-deployments $l1_deployment_file \
+    --l2-allocs $l2_allocs_file \
+    --outfile.l2 $genesis_outfile \
+    --outfile.rollup $rollup_outfile \
+    --l1-rpc $CERC_L1_RPC
 fi
 
 # Start op-node
-rollup_config=/l2-config/rollup.json
-seq_key=$(cat /l2-accounts/accounts.json | jq -r .SeqKey)
+SEQ_KEY=$(cat /l2-accounts/accounts.json | jq -r .SeqKey)
 jwt_file=/l2-config/l2-jwt.txt
-l2_auth="http://op-geth:8551"
+L2_AUTH="http://op-geth:8551"
+RPC_KIND=any # this can optionally be set to a preset for common node providers like Infura, Alchemy, etc.
 
-exec op-node \
-  --l2=$l2_auth \
+op-node \
+  --l2=$L2_AUTH \
   --l2.jwt-secret=$jwt_file \
   --sequencer.enabled \
   --sequencer.l1-confs=5 \
   --verifier.l1-confs=4 \
-  --rollup.config=$rollup_config \
+  --rollup.config=$rollup_outfile \
   --rpc.addr=0.0.0.0 \
   --rpc.port=8547 \
   --p2p.disable \
   --rpc.enable-admin \
   --p2p.sequencer.key="${SEQ_KEY#0x}" \
   --l1=$CERC_L1_RPC \
-  --l1.rpckind=$CERC_L1_RPC_KIND \
-  --l1.beacon=$CERC_L1_BEACON \
-  --l1.http-poll-interval="${CERC_L1_BLOCK_TIME}s" \
-  --l1.epoch-poll-interval="$((CERC_L1_BLOCK_TIME * 32))s" \
-  --log.level="$log_level"
+  --l1.rpckind=$RPC_KIND

config/fixturenet-optimism/run-op-proposer.sh

@@ -6,16 +6,15 @@ fi
 
 CERC_L1_RPC="${CERC_L1_RPC:-${DEFAULT_CERC_L1_RPC}}"
 CERC_L1_CHAIN_ID="${CERC_L1_CHAIN_ID:-${DEFAULT_CERC_L1_CHAIN_ID}}"
-CERC_L1_BLOCK_TIME="${CERC_L1_BLOCK_TIME:-${DEFAULT_CERC_L1_BLOCK_TIME}}"
 DEPLOYMENT_CONTEXT="$CERC_L1_CHAIN_ID"
 
 # Start op-proposer
 ROLLUP_RPC="http://op-node:8547"
 PROPOSER_KEY=$(cat /l2-accounts/accounts.json | jq -r .ProposerKey)
-L2OO_ADDR=$(cat /l1-deployment/$DEPLOYMENT_CONTEXT-deploy.json | jq -r .L2OutputOracleProxy)
+L2OO_ADDR=$(cat /l1-deployment/$DEPLOYMENT_CONTEXT/.deploy | jq -r .L2OutputOracleProxy)
 
-exec op-proposer \
-  --poll-interval="${CERC_L1_BLOCK_TIME}s" \
+op-proposer \
+  --poll-interval=12s \
   --rpc.port=8560 \
   --rollup-rpc=$ROLLUP_RPC \
   --l2oo-address="${L2OO_ADDR#0x}" \

container-build/cerc-foundry/build.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build a local version of the foundry-rs/foundry image
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+docker build -t cerc/foundry:local -f ${CERC_REPO_BASE_DIR}/foundry/Dockerfile-debian ${build_command_args} ${CERC_REPO_BASE_DIR}/foundry

container-build/cerc-optimism-contracts/Dockerfile

@@ -0,0 +1,25 @@
+# TODO: Make work for arm64/Apple Silicon
+# FROM ghcr.io/foundry-rs/foundry:nightly-267e14fab654d9ce955dce64c0eb09f01c8538ee
+FROM cerc/foundry:local
+
+# Install node (local foundry is a debian based image)
+RUN apt-get update \
+  && apt-get install -y curl wget \
+  && curl --silent --location https://deb.nodesource.com/setup_18.x | bash - \
+  && apt-get update \
+  && apt-get install -y nodejs git busybox jq \
+  && node -v
+
+# Add corepack for yarn and pnpm
+RUN corepack enable \
+  && yarn --version
+
+WORKDIR /app
+
+# Copy optimism repo contents
+COPY . .
+
+RUN echo "Building optimism" && \
+  pnpm install && pnpm build
+
+WORKDIR /app/packages/contracts-bedrock

container-build/cerc-optimism-contracts/build.sh

@@ -6,10 +6,4 @@ source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 # See: https://stackoverflow.com/a/246128/1701505
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-# The optimism contracts image has dependencies with no aarch64 support, so on aarch64 use an
-# emulated amd64 image
-if [[ $(docker info --format='{{ .Architecture }}') == "aarch64" ]]; then
-  PLATFORM_ARG="--platform linux/amd64"
-fi
-
-docker build -t cerc/optimism-contracts:local -f ${CERC_REPO_BASE_DIR}/optimism/ops/docker/Dockerfile.packages ${build_command_args} ${CERC_REPO_BASE_DIR}/optimism $PLATFORM_ARG
+docker build -t cerc/optimism-contracts:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/optimism

container-build/cerc-optimism-op-batcher/Dockerfile

@@ -6,9 +6,10 @@ RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
 
 # build op-batcher with the shared go.mod & go.sum files
 COPY ./op-batcher /app/op-batcher
+COPY ./op-bindings /app/op-bindings
 COPY ./op-node /app/op-node
 COPY ./op-service /app/op-service
-COPY ./op-alt-da /app/op-alt-da
+COPY ./op-plasma /app/op-plasma
 COPY ./go.mod /app/go.mod
 COPY ./go.sum /app/go.sum
 

container-build/cerc-optimism-op-node/Dockerfile

@@ -8,9 +8,9 @@ RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
 COPY ./op-node /app/op-node
 COPY ./op-chain-ops /app/op-chain-ops
 COPY ./op-service /app/op-service
-COPY ./op-alt-da /app/op-alt-da
+COPY ./op-bindings /app/op-bindings
+COPY ./op-plasma /app/op-plasma
 COPY ./op-conductor /app/op-conductor
-COPY ./packages /app/packages
 COPY ./go.mod /app/go.mod
 COPY ./go.sum /app/go.sum
 COPY ./.git /app/.git

container-build/cerc-optimism-op-proposer/Dockerfile

@@ -6,10 +6,10 @@ RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
 
 # build op-proposer with the shared go.mod & go.sum files
 COPY ./op-proposer /app/op-proposer
+COPY ./op-bindings /app/op-bindings
 COPY ./op-node /app/op-node
 COPY ./op-service /app/op-service
-COPY ./op-alt-da /app/op-alt-da
-COPY ./packages /app/packages
+COPY ./op-plasma /app/op-plasma
 COPY ./go.mod /app/go.mod
 COPY ./go.sum /app/go.sum
 COPY ./.git /app/.git

stack/fixturenet-optimism/README.md

@@ -68,7 +68,7 @@ laconic-so --stack ~/cerc/fixturenet-optimism-stack/stack/fixturenet-optimism de
 
 ### Ports
 
-It is usually necessary to expose certain container ports on one or more of the host's addresses to allow incoming connections.
+It is usually necessary to expose certain container ports on one or more the host's addresses to allow incoming connections.
 Any ports defined in the Docker compose file are exposed by default with random port assignments, bound to "any" interface (IP address 0.0.0.0), but the port mappings can be customized by editing the "spec" file generated by `laconic-so deploy init`.
 
 In addition, a stack-wide port mapping "recipe" can be applied at the time the
@@ -112,15 +112,6 @@ Inside the `fixturenet-eth-deployment` deployment directory, open `config.env` f
 CERC_ALLOW_UNPROTECTED_TXS=true
 ```
 
-Inside the `fixturenet-optimism-deployment` deployment directory, open `config.env` file and set following env variables:
-
-```bash
-# Optional
-# Funding amounts for proposer and batcher accounts on L1
-CERC_PROPOSER_AMOUNT=  # Default 0.2ether
-CERC_BATCHER_AMOUNT=   # Default 0.1ether
-```
-
 ## Start the stack
 
 Start the deployment:
@@ -154,7 +145,7 @@ docker logs -f <CONTAINER_ID>
 
 Send some ETH from the desired account to the `L1StandardBridgeProxy` contract on L1 to test bridging to L2.
 
-We can use the testing account `0xe6CE22afe802CAf5fF7d3845cec8c736ecc8d61F` which is pre-funded and unlocked, and the `cerc/optimism-contracts:local` container to make use of the `cast` cli.
+We can use the testing account `0xe6CE22afe802CAf5fF7d3845cec8c736ecc8d61F` which is pre-funded and unlocked, and the `cerc/foundry:local` container to make use of the `cast` cli.
 
 1. Note the docker network the stack is running on:
 
@@ -173,22 +164,16 @@ We can use the testing account `0xe6CE22afe802CAf5fF7d3845cec8c736ecc8d61F` whic
   ACCOUNT=0xe6CE22afe802CAf5fF7d3845cec8c736ecc8d61F
   ```
 
-  You can create an alias for running `cast` on the network:
-
-  ```bash
-  alias op-cast="docker run --rm --network $NETWORK --entrypoint cast cerc/optimism-contracts:local"
-  ```
-
   If you need to check the L1 chain-id, you can use:
 
   ```bash
-  op-cast chain-id --rpc-url $L1_RPC
+  docker run --rm --network $NETWORK cerc/optimism-contracts:local "cast chain-id --rpc-url $L1_RPC"
   ```
 
 3. Check the account starting balance on L2 (it should be 0):
 
   ```bash
-  op-cast balance $ACCOUNT --rpc-url $L2_RPC
+  docker run --rm --network $NETWORK cerc/optimism-contracts:local "cast balance $ACCOUNT --rpc-url $L2_RPC"
   # 0
   ```
 
@@ -197,8 +182,8 @@ We can use the testing account `0xe6CE22afe802CAf5fF7d3845cec8c736ecc8d61F` whic
   ```bash
   # get the container id for op-node
   NODE_CONTAINER=$(docker ps --filter "name=op-node" -q)
-  # get the bridge contract address
-  BRIDGE=$(docker exec $NODE_CONTAINER cat /l1-deployment/$DEPLOYMENT_CONTEXT-deploy.json | jq -r .L1StandardBridgeProxy)
+  BRIDGE=$(docker exec $NODE_CONTAINER cat /l1-deployment/$DEPLOYMENT_CONTEXT/.deploy | jq -r .L1StandardBridgeProxy)
+
   # get the funded account's pk
   ACCOUNT_PK=$(docker exec $NODE_CONTAINER jq -r '.AdminKey' /l2-accounts/accounts.json)
   ```
@@ -206,15 +191,15 @@ We can use the testing account `0xe6CE22afe802CAf5fF7d3845cec8c736ecc8d61F` whic
 5. Use cast to send some ETH to the bridge contract:
 
   ```bash
-  op-cast send --from $ACCOUNT --value 1ether $BRIDGE --rpc-url $L1_RPC --private-key $ACCOUNT_PK
+  docker run --rm --network $NETWORK cerc/optimism-contracts:local "cast send --from $ACCOUNT --value 1ether $BRIDGE --rpc-url $L1_RPC --private-key $ACCOUNT_PK"
   ```
 
-6. Allow a couple minutes for the bridge to complete.
+6. Allow a couple minutes for the bridge to complete
 
 7. Check the L2 balance again (it should show the bridged funds):
 
   ```bash
-  op-cast balance $ACCOUNT --rpc-url $L2_RPC
+  docker run --rm --network $NETWORK cerc/optimism-contracts:local "cast balance $ACCOUNT --rpc-url $L2_RPC"
   # 1000000000000000000
   ```
 

stack/fixturenet-optimism/l2-only.md

@@ -64,9 +64,6 @@ Inside the deployment directory, open the file `config.env` and add the followin
   CERC_L1_HOST=
   CERC_L1_PORT=
 
-  # External L1 Beacon node endpoint
-  CERC_L1_BEACON=
-
   # URL to get CSV with credentials for accounts on L1
   # that are used to send balance to Optimism Proxy contract
   # (enables them to do transactions on L2)
@@ -77,13 +74,6 @@ Inside the deployment directory, open the file `config.env` and add the followin
   # Other generated accounts will be funded from this account, so it should contain ~20 Eth
   CERC_L1_ADDRESS=
   CERC_L1_PRIV_KEY=
-
-  # Optional
-
-  # Funding amounts for proposer and batcher accounts on L1
-  # (Accounts funded using the Admin account)
-  CERC_PROPOSER_AMOUNT=
-  CERC_BATCHER_AMOUNT=
   ```
 
 * NOTE: If L1 is running on the host machine, use `host.docker.internal` as the hostname to access the host port, or use the `ip a` command to find the IP address of the `docker0` interface (this will usually be something like `172.17.0.1` or `172.18.0.1`)

stack/fixturenet-optimism/stack.yml

@@ -3,10 +3,12 @@ name: fixturenet-optimism
 description: "Optimism Fixturenet"
 repos:
   # L2 (optimism)
-  - github.com/ethereum-optimism/optimism@v1.7.7
-  - github.com/ethereum-optimism/op-geth@v1.101315.2
+  - github.com/cerc-io/foundry@pm-merge-upstream-changes
+  - github.com/ethereum-optimism/optimism@v1.7.4
+  - github.com/ethereum-optimism/op-geth@v1.101311.0
 containers:
   # L2 (optimism)
+  - cerc/foundry
   - cerc/optimism-contracts
   - cerc/optimism-op-node
   - cerc/optimism-l2geth