From 01dbde3239535dcb7092d16079519ad9a7a77a9f Mon Sep 17 00:00:00 2001
From: Prathamesh Musale <prathamesh.musale0@gmail.com>
Date: Mon, 6 May 2024 17:17:59 +0530
Subject: [PATCH] Use forked foundry

---
 container-build/cerc-foundry/build.sh           |  4 ++++
 .../cerc-optimism-contracts/Dockerfile          | 17 +++++++++--------
 stack/fixturenet-optimism/stack.yml             |  2 ++
 3 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100755 container-build/cerc-foundry/build.sh

diff --git a/container-build/cerc-foundry/build.sh b/container-build/cerc-foundry/build.sh
new file mode 100755
index 0000000..f80276e
--- /dev/null
+++ b/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
diff --git a/container-build/cerc-optimism-contracts/Dockerfile b/container-build/cerc-optimism-contracts/Dockerfile
index 49e7bdf..4449068 100644
--- a/container-build/cerc-optimism-contracts/Dockerfile
+++ b/container-build/cerc-optimism-contracts/Dockerfile
@@ -1,16 +1,17 @@
 # TODO: Make work for arm64/Apple Silicon
-FROM ghcr.io/foundry-rs/foundry:nightly-267e14fab654d9ce955dce64c0eb09f01c8538ee
+# 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
diff --git a/stack/fixturenet-optimism/stack.yml b/stack/fixturenet-optimism/stack.yml
index 0ee05f3..ea455e2 100644
--- a/stack/fixturenet-optimism/stack.yml
+++ b/stack/fixturenet-optimism/stack.yml
@@ -3,10 +3,12 @@ name: fixturenet-optimism
 description: "Optimism Fixturenet"
 repos:
   # L2 (optimism)
+  - 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