Use forked foundry

compose/docker-compose-fixturenet-optimism.yml

@@ -29,33 +29,14 @@ services:
     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"
-
   # 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:
-      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
@@ -82,8 +63,8 @@ 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:

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

@@ -1,36 +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"
-
-# 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/optimism-contracts/deploy-contracts.sh

@@ -16,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 [ -d "/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
@@ -117,16 +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=12 \
-L2_BLOCK_TIME=2 \
-$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"
@@ -136,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
 
@@ -155,24 +147,22 @@ if [ "$create2CodeSize" -eq 0 ]; then
 fi
 
 # Create the L2 deployment
-# Writes out artifact to /app/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.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 \
-forge script --chain-id $L2_CHAIN_ID scripts/L2Genesis.s.sol:L2Genesis --sig 'runWithAllUpgrades()' --private-key $ADMIN_KEY
-
-cp /app/packages/contracts-bedrock/state-dump-$L2_CHAIN_ID.json allocs-l2.json
+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 /app/packages/contracts-bedrock/deployments/$DEPLOYMENT_CONTEXT-deploy.json /l1-deployment
+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

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

@@ -9,11 +9,22 @@ 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"
+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
 SEQ_KEY=$(cat /l2-accounts/accounts.json | jq -r .SeqKey)
 jwt_file=/l2-config/l2-jwt.txt
@@ -33,5 +44,4 @@ op-node \
   --rpc.enable-admin \
   --p2p.sequencer.key="${SEQ_KEY#0x}" \
   --l1=$CERC_L1_RPC \
-  --l1.rpckind=$RPC_KIND \
-  --l1.beacon=http://fixturenet-eth-lighthouse-1:8001
+  --l1.rpckind=$RPC_KIND

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

@@ -11,7 +11,7 @@ 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)
 
 op-proposer \
   --poll-interval=12s \

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

@@ -1,16 +1,17 @@
 # TODO: Make work for arm64/Apple Silicon
-FROM ghcr.io/foundry-rs/foundry:nightly-c4a984fbf2c48b793c8cd53af84f56009dd1070c
+# FROM ghcr.io/foundry-rs/foundry:nightly-267e14fab654d9ce955dce64c0eb09f01c8538ee
+FROM cerc/foundry:local
 
-RUN apk update
-
-# Install node (use edge repo to get latest version)
-RUN apk add --update --no-cache curl wget bash git busybox jq openssl \
-  && apk add nodejs --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main --allow-untrusted \
-  && apk add npm \
+# 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 npm install -g corepack && corepack enable \
+RUN corepack enable \
   && yarn --version
 
 WORKDIR /app

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

@@ -6,6 +6,7 @@ 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-plasma /app/op-plasma

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

@@ -8,6 +8,7 @@ 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-bindings /app/op-bindings
 COPY ./op-plasma /app/op-plasma
 COPY ./op-conductor /app/op-conductor
 COPY ./go.mod /app/go.mod

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

@@ -6,6 +6,7 @@ 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-plasma /app/op-plasma

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