Skip to content

Commit

Permalink
chore: bump foundry (#8868)
Browse files Browse the repository at this point in the history

---------

Co-authored-by: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com>
  • Loading branch information
LHerskind and Maddiaa0 authored Sep 28, 2024
1 parent 4354ae0 commit bfd0b8e
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion barretenberg/sol/scripts/install_foundry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build-images/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ osxcross:
########################################################################################################################
# Build foundry.
foundry-build:
LET FOUNDRY_TAG = de33b6af53005037b463318d2628b5cfcaf39916
LET FOUNDRY_TAG = 25f24e677a6a32a62512ad4f561995589ac2c7dc
FROM +base-build
RUN ulimit -n 65535 \

Check failure on line 91 in build-images/Earthfile

View workflow job for this annotation

GitHub Actions / build-images

Error

The command RUN ulimit -n 65535 && git clone --depth 1 --branch nightly-$FOUNDRY_TAG https://github.com/foundry-rs/foundry.git && cd foundry && cargo build --profile local && mkdir -p /opt/foundry/bin && for t in forge cast anvil chisel; do mv ./target/local/$t /opt/foundry/bin/$t; strip /opt/foundry/bin/$t; done && rm -rf /foundry did not complete successfully. Exit code 101

Check failure on line 91 in build-images/Earthfile

View workflow job for this annotation

GitHub Actions / build-images

Error

The command RUN ulimit -n 65535 && git clone --depth 1 --branch nightly-$FOUNDRY_TAG https://github.com/foundry-rs/foundry.git && cd foundry && cargo build --profile local && mkdir -p /opt/foundry/bin && for t in forge cast anvil chisel; do mv ./target/local/$t /opt/foundry/bin/$t; strip /opt/foundry/bin/$t; done && rm -rf /foundry did not complete successfully. Exit code 101
&& git clone --depth 1 --branch nightly-$FOUNDRY_TAG https://github.com/foundry-rs/foundry.git \
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion iac/mainnet-fork/scripts/install_foundry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 . .
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/aztec/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/end-to-end/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
fork:
image: aztecprotocol/foundry:de33b6af53005037b463318d2628b5cfcaf39916
image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc
pull_policy: always
entrypoint: >
sh -c '
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/end-to-end/scripts/docker-compose-p2p.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/end-to-end/scripts/docker-compose-wallet.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
fork:
image: aztecprotocol/foundry:de33b6af53005037b463318d2628b5cfcaf39916
image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc
pull_policy: always
entrypoint: >
sh -c '
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/end-to-end/scripts/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
fork:
image: aztecprotocol/foundry:de33b6af53005037b463318d2628b5cfcaf39916
image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc
pull_policy: always
entrypoint: >
sh -c '
Expand Down

0 comments on commit bfd0b8e

Please sign in to comment.