From adae14363c29591e01477ce131578189b82430e8 Mon Sep 17 00:00:00 2001 From: Gregorio Juliana Date: Fri, 22 Nov 2024 14:56:20 +0100 Subject: [PATCH] feat: unify anvil versions (#10143) Sandbox was pinned to a very old version. Also a few other places were pinned to other versions. --- aztec-up/bin/docker-compose.sandbox.yml | 16 ++++++++-------- docker-compose.provernet.yml | 5 ++--- yarn-project/aztec/docker-compose.yml | 16 +++++++++------- .../scripts/docker-compose-no-sandbox.yml | 12 +++--------- .../end-to-end/scripts/docker-compose-wallet.yml | 12 +++--------- .../end-to-end/scripts/docker-compose.yml | 12 +++--------- 6 files changed, 28 insertions(+), 45 deletions(-) diff --git a/aztec-up/bin/docker-compose.sandbox.yml b/aztec-up/bin/docker-compose.sandbox.yml index 034be4bd65b..39d6ff20319 100644 --- a/aztec-up/bin/docker-compose.sandbox.yml +++ b/aztec-up/bin/docker-compose.sandbox.yml @@ -1,13 +1,13 @@ services: ethereum: - image: ghcr.io/foundry-rs/foundry@sha256:29ba6e34379e79c342ec02d437beb7929c9e254261e8032b17e187be71a2609f - command: > - ' - [ -n "$$FORK_URL" ] && ARGS="$$ARGS --fork-url $$FORK_URL"; - [ -n "$$FORK_BLOCK_NUMBER" ] && ARGS="$$ARGS --fork-block-number $$FORK_BLOCK_NUMBER"; - echo anvil -p $$ANVIL_PORT --host 0.0.0.0 --chain-id 31337 --silent $$ARGS; - anvil -p $$ANVIL_PORT --host 0.0.0.0 --chain-id 31337 --silent $$ARGS - ' + image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64} + entrypoint: > + sh -c ' + if [ -n "$$FORK_BLOCK_NUMBER" ] && [ -n "$$FORK_URL" ]; then + exec anvil --silent -p "$$ANVIL_PORT" --host 0.0.0.0 --chain-id 31337 --fork-url "$$FORK_URL" --fork-block-number "$$FORK_BLOCK_NUMBER" + else + exec anvil --silent -p "$$ANVIL_PORT" --host 0.0.0.0 --chain-id 31337 + fi' ports: - "${ANVIL_PORT:-8545}:${ANVIL_PORT:-8545}" environment: diff --git a/docker-compose.provernet.yml b/docker-compose.provernet.yml index 57d7d374f35..83e6cd1913f 100644 --- a/docker-compose.provernet.yml +++ b/docker-compose.provernet.yml @@ -6,9 +6,8 @@ services: # Anvil instance that serves as L1 ethereum: - image: ghcr.io/foundry-rs/foundry@sha256:29ba6e34379e79c342ec02d437beb7929c9e254261e8032b17e187be71a2609f - command: > - 'anvil --block-time 12 --host 0.0.0.0 --chain-id 31337 --port 8545 --silent' + image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64} + entrypoint: 'anvil --block-time 12 --silent -p 8545 --host 0.0.0.0 --chain-id 31337' ports: - 8545:8545 diff --git a/yarn-project/aztec/docker-compose.yml b/yarn-project/aztec/docker-compose.yml index 2d554c946c9..c161deb8a2e 100644 --- a/yarn-project/aztec/docker-compose.yml +++ b/yarn-project/aztec/docker-compose.yml @@ -1,18 +1,20 @@ version: '3' services: ethereum: - image: aztecprotocol/foundry-nightly-25f24e677a6a32a62512ad4f561995589ac2c7dc:latest + image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64} entrypoint: > sh -c ' - if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then - exec anvil -p 8545 --host 0.0.0.0 --chain-id 31337 --silent --fork-url "$FORK_URL" --fork-block-number "$FORK_BLOCK_NUMBER" - elif [ -n "$FORK_URL" ]; then - exec anvil -p 8545 --host 0.0.0.0 --chain-id 31337 --silent --fork-url "$FORK_URL" + if [ -n "$$FORK_BLOCK_NUMBER" ] && [ -n "$$FORK_URL" ]; then + exec anvil --silent -p "$$ANVIL_PORT" --host 0.0.0.0 --chain-id 31337 --fork-url "$$FORK_URL" --fork-block-number "$$FORK_BLOCK_NUMBER" else - exec anvil -p 8545 --host 0.0.0.0 --chain-id 31337 --silent + exec anvil --silent -p "$$ANVIL_PORT" --host 0.0.0.0 --chain-id 31337 fi' ports: - - '${SANDBOX_ANVIL_PORT:-8545}:8545' + - "${ANVIL_PORT:-8545}:${ANVIL_PORT:-8545}" + environment: + FORK_URL: + FORK_BLOCK_NUMBER: + ANVIL_PORT: ${ANVIL_PORT:-8545} aztec: image: 'aztecprotocol/aztec:${SANDBOX_VERSION:-latest}' 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 c11eca2414c..26aee913035 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 @@ -3,15 +3,9 @@ services: fork: image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64} pull_policy: always - entrypoint: > - sh -c ' - if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then - exec anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337 --fork-url "$FORK_URL" --fork-block-number "$FORK_BLOCK_NUMBER" - else - exec anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337 - fi' - expose: - - '8545' + entrypoint: 'anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337' + ports: + - 8545:8545 end-to-end: image: aztecprotocol/end-to-end:${AZTEC_DOCKER_TAG:-latest} 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 f896569f7ca..7aa1646aa72 100644 --- a/yarn-project/end-to-end/scripts/docker-compose-wallet.yml +++ b/yarn-project/end-to-end/scripts/docker-compose-wallet.yml @@ -3,15 +3,9 @@ services: fork: image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64} pull_policy: always - entrypoint: > - sh -c ' - if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then - exec anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337 --fork-url "$FORK_URL" --fork-block-number "$FORK_BLOCK_NUMBER" - else - exec anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337 - fi' - expose: - - '8545' + entrypoint: 'anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337' + ports: + - 8545:8545 sandbox: image: aztecprotocol/aztec:${AZTEC_DOCKER_TAG:-latest} diff --git a/yarn-project/end-to-end/scripts/docker-compose.yml b/yarn-project/end-to-end/scripts/docker-compose.yml index 8cc45e5510b..75b9cd0d36f 100644 --- a/yarn-project/end-to-end/scripts/docker-compose.yml +++ b/yarn-project/end-to-end/scripts/docker-compose.yml @@ -3,15 +3,9 @@ services: fork: image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64} pull_policy: always - entrypoint: > - sh -c ' - if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then - exec anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337 --fork-url "$FORK_URL" --fork-block-number "$FORK_BLOCK_NUMBER" - else - exec anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337 - fi' - expose: - - '8545' + entrypoint: 'anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337' + ports: + - 8545:8545 sandbox: image: aztecprotocol/aztec:${AZTEC_DOCKER_TAG:-latest}