diff --git a/barretenberg/sol/scripts/install_foundry.sh b/barretenberg/sol/scripts/install_foundry.sh index e5f878288bd..0e5a1cc86d8 100755 --- a/barretenberg/sol/scripts/install_foundry.sh +++ b/barretenberg/sol/scripts/install_foundry.sh @@ -6,7 +6,7 @@ FOUNDRY_BIN_DIR="$FOUNDRY_DIR/bin" BIN_URL="https://raw.githubusercontent.com/foundry-rs/foundry/master/foundryup/foundryup" BIN_PATH="$FOUNDRY_BIN_DIR/foundryup" FOUNDRY_MAN_DIR="$FOUNDRY_DIR/share/man/man1" -FOUNDRY_VERSION="nightly-de33b6af53005037b463318d2628b5cfcaf39916" +FOUNDRY_VERSION="nightly-25f24e677a6a32a62512ad4f561995589ac2c7dc" # Clean rm -rf $FOUNDRY_DIR diff --git a/bootstrap.sh b/bootstrap.sh index 9b6cc7d073b..2378c85ec1e 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -70,12 +70,12 @@ function check_toolchains { fi # Check foundry version. for tool in forge anvil; do - if ! $tool --version 2> /dev/null | grep de33b6a > /dev/null; then + if ! $tool --version 2> /dev/null | grep 25f24e6 > /dev/null; then encourage_dev_container - echo "$tool not in PATH or incorrect version (requires de33b6af53005037b463318d2628b5cfcaf39916)." + echo "$tool not in PATH or incorrect version (requires 25f24e677a6a32a62512ad4f561995589ac2c7dc)." echo "Installation: https://book.getfoundry.sh/getting-started/installation (requires rust 1.75)" echo " curl -L https://foundry.paradigm.xyz | bash" - echo " foundryup -b de33b6af53005037b463318d2628b5cfcaf39916" + echo " foundryup -b 25f24e677a6a32a62512ad4f561995589ac2c7dc" exit 1 fi done diff --git a/build-images/Earthfile b/build-images/Earthfile index da8aeb737c0..0caa85228e0 100644 --- a/build-images/Earthfile +++ b/build-images/Earthfile @@ -86,7 +86,7 @@ osxcross: ######################################################################################################################## # Build foundry. foundry-build: - LET FOUNDRY_TAG = de33b6af53005037b463318d2628b5cfcaf39916 + LET FOUNDRY_TAG = 25f24e677a6a32a62512ad4f561995589ac2c7dc FROM +base-build RUN ulimit -n 65535 \ && git clone --depth 1 --branch nightly-$FOUNDRY_TAG https://github.com/foundry-rs/foundry.git \ @@ -104,7 +104,7 @@ foundry-build: foundry: BUILD +foundry-build - LET FOUNDRY_TAG = de33b6af53005037b463318d2628b5cfcaf39916 + LET FOUNDRY_TAG = 25f24e677a6a32a62512ad4f561995589ac2c7dc ARG TARGETARCH FROM ubuntu:noble COPY +foundry-build/opt/foundry /opt/foundry diff --git a/iac/mainnet-fork/scripts/install_foundry.sh b/iac/mainnet-fork/scripts/install_foundry.sh index e5f878288bd..0e5a1cc86d8 100755 --- a/iac/mainnet-fork/scripts/install_foundry.sh +++ b/iac/mainnet-fork/scripts/install_foundry.sh @@ -6,7 +6,7 @@ FOUNDRY_BIN_DIR="$FOUNDRY_DIR/bin" BIN_URL="https://raw.githubusercontent.com/foundry-rs/foundry/master/foundryup/foundryup" BIN_PATH="$FOUNDRY_BIN_DIR/foundryup" FOUNDRY_MAN_DIR="$FOUNDRY_DIR/share/man/man1" -FOUNDRY_VERSION="nightly-de33b6af53005037b463318d2628b5cfcaf39916" +FOUNDRY_VERSION="nightly-25f24e677a6a32a62512ad4f561995589ac2c7dc" # Clean rm -rf $FOUNDRY_DIR diff --git a/l1-contracts/Dockerfile b/l1-contracts/Dockerfile index fbdf61b0e50..6aafd98bc95 100644 --- a/l1-contracts/Dockerfile +++ b/l1-contracts/Dockerfile @@ -10,7 +10,7 @@ RUN curl -L https://foundry.paradigm.xyz | bash # Set env variables for foundry and venv ENV PATH="${PATH}:/root/.foundry/bin:/root/.venv/bin" -RUN foundryup --version nightly-de33b6af53005037b463318d2628b5cfcaf39916 +RUN foundryup --version nightly-25f24e677a6a32a62512ad4f561995589ac2c7dc WORKDIR /usr/src/l1-contracts COPY . . diff --git a/yarn-project/aztec/docker-compose.yml b/yarn-project/aztec/docker-compose.yml index c6074ecff61..2d554c946c9 100644 --- a/yarn-project/aztec/docker-compose.yml +++ b/yarn-project/aztec/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: ethereum: - image: aztecprotocol/foundry-nightly-de33b6af53005037b463318d2628b5cfcaf3991:latest + image: aztecprotocol/foundry-nightly-25f24e677a6a32a62512ad4f561995589ac2c7dc:latest entrypoint: > sh -c ' if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then diff --git a/yarn-project/end-to-end/Dockerfile b/yarn-project/end-to-end/Dockerfile index 215a0fb1f97..613edc427d3 100644 --- a/yarn-project/end-to-end/Dockerfile +++ b/yarn-project/end-to-end/Dockerfile @@ -39,7 +39,7 @@ RUN rm -rf /usr/src/noir-projects /usr/src/l1-contracts # Anvil. Hacky, but can't be bothered handling foundry image as we're moving to earthly. RUN curl -L https://foundry.paradigm.xyz | bash -RUN /root/.foundry/bin/foundryup --version nightly-de33b6af53005037b463318d2628b5cfcaf39916 && mkdir -p /usr/src/foundry/bin && cp /root/.foundry/bin/anvil /usr/src/foundry/bin/anvil +RUN /root/.foundry/bin/foundryup --version nightly-25f24e677a6a32a62512ad4f561995589ac2c7dc && mkdir -p /usr/src/foundry/bin && cp /root/.foundry/bin/anvil /usr/src/foundry/bin/anvil # Create minimal image. FROM node:18.19.1-slim diff --git a/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml b/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml index 23353de37dc..3e59678e596 100644 --- a/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml +++ b/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml @@ -1,7 +1,7 @@ version: '3' services: fork: - image: aztecprotocol/foundry:de33b6af53005037b463318d2628b5cfcaf39916 + image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc pull_policy: always entrypoint: > sh -c ' diff --git a/yarn-project/end-to-end/scripts/docker-compose-p2p.yml b/yarn-project/end-to-end/scripts/docker-compose-p2p.yml index dd07cd209f2..676c5343962 100644 --- a/yarn-project/end-to-end/scripts/docker-compose-p2p.yml +++ b/yarn-project/end-to-end/scripts/docker-compose-p2p.yml @@ -1,7 +1,7 @@ version: '3' services: fork: - image: aztecprotocol/foundry:de33b6af53005037b463318d2628b5cfcaf39916 + image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc pull_policy: always entrypoint: 'anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337' expose: diff --git a/yarn-project/end-to-end/scripts/docker-compose-wallet.yml b/yarn-project/end-to-end/scripts/docker-compose-wallet.yml index 6c30f54a345..1934edcdf6e 100644 --- a/yarn-project/end-to-end/scripts/docker-compose-wallet.yml +++ b/yarn-project/end-to-end/scripts/docker-compose-wallet.yml @@ -1,7 +1,7 @@ version: '3' services: fork: - image: aztecprotocol/foundry:de33b6af53005037b463318d2628b5cfcaf39916 + image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc pull_policy: always entrypoint: > sh -c ' diff --git a/yarn-project/end-to-end/scripts/docker-compose.yml b/yarn-project/end-to-end/scripts/docker-compose.yml index 3c9e447afbb..273a9bf4d4a 100644 --- a/yarn-project/end-to-end/scripts/docker-compose.yml +++ b/yarn-project/end-to-end/scripts/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: fork: - image: aztecprotocol/foundry:de33b6af53005037b463318d2628b5cfcaf39916 + image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc pull_policy: always entrypoint: > sh -c '