From 69bd7dd45af6b197b23c25dc883a1a5485955203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Bene=C5=A1?= Date: Tue, 12 Mar 2024 12:02:50 +0100 Subject: [PATCH] chore: pin foundry (#5151) I tried increasing gas limit of anvil and disabling it altogether (--disable-block-gas-limit flag) but it didn't help. In `forge` there is a `--memory-limit` which is supposed to directly affect this value but this flag is not exposed on anvil. What is weird that the issue occurs when running "empty block" test case in `integration_l1_publisher.test.ts` but it doesn't occur for the bloated one. This makes me think that it probably really is some kind of bug and not just a gas limit issue. What is also weird is that for a [version from 4 days ago](https://github.com/foundry-rs/foundry/releases/tag/nightly-9ec42d6f03bafbd3b9bb8e258ca67d7887b1f2e7) I was getting the error as well. I would not expect this given that the issue started occurring yesterday. I [asked on Foundry support channel](https://t.me/foundry_support/51173) and hopefully we will get some feedback. In the meanwhile I found a version for which all seems to work so I would merge this PR to not waste too much time on this. We can just revert it in the future. --- barretenberg/sol/scripts/install_foundry.sh | 3 ++- iac/mainnet-fork/scripts/install_foundry.sh | 3 ++- l1-contracts/scripts/install_foundry.sh | 3 ++- yarn-project/aztec/docker-compose.yml | 2 +- yarn-project/end-to-end/scripts/docker-compose-anvil.yml | 2 +- yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml | 2 +- yarn-project/end-to-end/scripts/docker-compose-p2p.yml | 2 +- yarn-project/end-to-end/scripts/docker-compose.yml | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/barretenberg/sol/scripts/install_foundry.sh b/barretenberg/sol/scripts/install_foundry.sh index e085beb76d5..e5f878288bd 100755 --- a/barretenberg/sol/scripts/install_foundry.sh +++ b/barretenberg/sol/scripts/install_foundry.sh @@ -6,6 +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" # Clean rm -rf $FOUNDRY_DIR @@ -18,4 +19,4 @@ chmod +x $BIN_PATH export PATH=$FOUNDRY_BIN_DIR:$PATH # Use version. -foundryup +foundryup --version $FOUNDRY_VERSION diff --git a/iac/mainnet-fork/scripts/install_foundry.sh b/iac/mainnet-fork/scripts/install_foundry.sh index 3842f6a4318..e5f878288bd 100755 --- a/iac/mainnet-fork/scripts/install_foundry.sh +++ b/iac/mainnet-fork/scripts/install_foundry.sh @@ -6,6 +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" # Clean rm -rf $FOUNDRY_DIR @@ -18,4 +19,4 @@ chmod +x $BIN_PATH export PATH=$FOUNDRY_BIN_DIR:$PATH # Use version. -foundryup \ No newline at end of file +foundryup --version $FOUNDRY_VERSION diff --git a/l1-contracts/scripts/install_foundry.sh b/l1-contracts/scripts/install_foundry.sh index e085beb76d5..e5f878288bd 100755 --- a/l1-contracts/scripts/install_foundry.sh +++ b/l1-contracts/scripts/install_foundry.sh @@ -6,6 +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" # Clean rm -rf $FOUNDRY_DIR @@ -18,4 +19,4 @@ chmod +x $BIN_PATH export PATH=$FOUNDRY_BIN_DIR:$PATH # Use version. -foundryup +foundryup --version $FOUNDRY_VERSION diff --git a/yarn-project/aztec/docker-compose.yml b/yarn-project/aztec/docker-compose.yml index 84397ba70b7..813431296df 100644 --- a/yarn-project/aztec/docker-compose.yml +++ b/yarn-project/aztec/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: ethereum: - image: ghcr.io/foundry-rs/foundry@sha256:29ba6e34379e79c342ec02d437beb7929c9e254261e8032b17e187be71a2609f + image: ghcr.io/foundry-rs/foundry:nightly-de33b6af53005037b463318d2628b5cfcaf39916 entrypoint: > sh -c ' if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then diff --git a/yarn-project/end-to-end/scripts/docker-compose-anvil.yml b/yarn-project/end-to-end/scripts/docker-compose-anvil.yml index 5e69fbea59d..509949d0f71 100644 --- a/yarn-project/end-to-end/scripts/docker-compose-anvil.yml +++ b/yarn-project/end-to-end/scripts/docker-compose-anvil.yml @@ -1,7 +1,7 @@ version: '3' services: fork: - image: ghcr.io/foundry-rs/foundry:nightly-a44aa13cfc23491ba32aaedc093e9488c1a6db43 + image: ghcr.io/foundry-rs/foundry:nightly-de33b6af53005037b463318d2628b5cfcaf39916 entrypoint: 'anvil -p 8545 --host 0.0.0.0 --chain-id 31337' ports: - '8545:8545' 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 e810a57db3d..db646499b49 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: ghcr.io/foundry-rs/foundry:nightly-a44aa13cfc23491ba32aaedc093e9488c1a6db43 + image: ghcr.io/foundry-rs/foundry:nightly-de33b6af53005037b463318d2628b5cfcaf39916 entrypoint: > sh -c ' if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then 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 50cca540d6c..f61b7bd3d8f 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: ghcr.io/foundry-rs/foundry:nightly-a44aa13cfc23491ba32aaedc093e9488c1a6db43 + image: ghcr.io/foundry-rs/foundry:nightly-de33b6af53005037b463318d2628b5cfcaf39916 entrypoint: 'anvil -p 8545 --host 0.0.0.0 --chain-id 31337' ports: - '8545:8545' diff --git a/yarn-project/end-to-end/scripts/docker-compose.yml b/yarn-project/end-to-end/scripts/docker-compose.yml index 58feb709bc2..0a73d344095 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: ghcr.io/foundry-rs/foundry:nightly-a44aa13cfc23491ba32aaedc093e9488c1a6db43 + image: ghcr.io/foundry-rs/foundry:nightly-de33b6af53005037b463318d2628b5cfcaf39916 entrypoint: > sh -c ' if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then