From 83f16ee1ef3e839d2a8d36071981d327050a1812 Mon Sep 17 00:00:00 2001
From: thunkar <gregojquiros@gmail.com>
Date: Fri, 22 Nov 2024 12:52:27 +0000
Subject: [PATCH 1/4] unmessify

---
 aztec-up/bin/docker-compose.sandbox.yml | 22 +++++++++-------------
 docker-compose.provernet.yml            |  2 +-
 yarn-project/aztec/docker-compose.yml   |  4 ++--
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/aztec-up/bin/docker-compose.sandbox.yml b/aztec-up/bin/docker-compose.sandbox.yml
index 034be4bd65bd..cf0835332883 100644
--- a/aztec-up/bin/docker-compose.sandbox.yml
+++ b/aztec-up/bin/docker-compose.sandbox.yml
@@ -1,19 +1,15 @@
 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 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'
     ports:
-      - "${ANVIL_PORT:-8545}:${ANVIL_PORT:-8545}"
-    environment:
-      FORK_URL:
-      FORK_BLOCK_NUMBER:
-      ANVIL_PORT: ${ANVIL_PORT:-8545}
+      - 8545:8545
 
   aztec:
     image: "aztecprotocol/aztec"
diff --git a/docker-compose.provernet.yml b/docker-compose.provernet.yml
index 57d7d374f35e..215524fb04d0 100644
--- a/docker-compose.provernet.yml
+++ b/docker-compose.provernet.yml
@@ -6,7 +6,7 @@ services:
 
   # Anvil instance that serves as L1
   ethereum:
-    image: ghcr.io/foundry-rs/foundry@sha256:29ba6e34379e79c342ec02d437beb7929c9e254261e8032b17e187be71a2609f
+    image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64}
     command: >
       'anvil --block-time 12 --host 0.0.0.0 --chain-id 31337 --port 8545 --silent'
     ports:
diff --git a/yarn-project/aztec/docker-compose.yml b/yarn-project/aztec/docker-compose.yml
index 2d554c946c93..f349a8db9545 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-25f24e677a6a32a62512ad4f561995589ac2c7dc:latest
+    image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64}
     entrypoint: >
       sh -c '
       if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then
@@ -12,7 +12,7 @@ services:
         exec anvil -p 8545 --host 0.0.0.0 --chain-id 31337 --silent
       fi'
     ports:
-      - '${SANDBOX_ANVIL_PORT:-8545}:8545'
+      - 8545:8545
 
   aztec:
     image: 'aztecprotocol/aztec:${SANDBOX_VERSION:-latest}'

From c8d2181f295c4b06e18c1a165a8ce454b6bc3633 Mon Sep 17 00:00:00 2001
From: thunkar <gregojquiros@gmail.com>
Date: Fri, 22 Nov 2024 13:06:54 +0000
Subject: [PATCH 2/4] unify env variable usage

---
 aztec-up/bin/docker-compose.sandbox.yml             | 12 ++++++++----
 yarn-project/aztec/docker-compose.yml               | 12 ++----------
 .../scripts/docker-compose-no-sandbox.yml           | 13 ++++---------
 .../end-to-end/scripts/docker-compose-wallet.yml    | 13 ++++---------
 yarn-project/end-to-end/scripts/docker-compose.yml  | 13 ++++---------
 5 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/aztec-up/bin/docker-compose.sandbox.yml b/aztec-up/bin/docker-compose.sandbox.yml
index cf0835332883..39d6ff203199 100644
--- a/aztec-up/bin/docker-compose.sandbox.yml
+++ b/aztec-up/bin/docker-compose.sandbox.yml
@@ -3,13 +3,17 @@ services:
     image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64}
     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"
+      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 8545 --host 0.0.0.0 --chain-id 31337
+        exec anvil --silent -p "$$ANVIL_PORT" --host 0.0.0.0 --chain-id 31337
       fi'
     ports:
-      - 8545:8545
+      - "${ANVIL_PORT:-8545}:${ANVIL_PORT:-8545}"
+    environment:
+      FORK_URL:
+      FORK_BLOCK_NUMBER:
+      ANVIL_PORT: ${ANVIL_PORT:-8545}
 
   aztec:
     image: "aztecprotocol/aztec"
diff --git a/yarn-project/aztec/docker-compose.yml b/yarn-project/aztec/docker-compose.yml
index f349a8db9545..934404c351b7 100644
--- a/yarn-project/aztec/docker-compose.yml
+++ b/yarn-project/aztec/docker-compose.yml
@@ -2,18 +2,10 @@ version: '3'
 services:
   ethereum:
     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"
-      else
-        exec anvil -p 8545 --host 0.0.0.0 --chain-id 31337 --silent
-      fi'
+    command: >
+      'anvil --host 0.0.0.0 --chain-id 31337 --port 8545 --silent'
     ports:
       - 8545:8545
-
   aztec:
     image: 'aztecprotocol/aztec:${SANDBOX_VERSION:-latest}'
     ports:
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 c11eca2414c4..9b453b24537b 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,10 @@ 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'
+    command: >
+      'anvil --host 0.0.0.0 --chain-id 31337 --port 8545 --silent'
+    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 f896569f7cac..667b486297ba 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,10 @@ 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'
+    command: >
+      'anvil --host 0.0.0.0 --chain-id 31337 --port 8545 --silent'
+    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 8cc45e5510b8..b8b7e7a5d91a 100644
--- a/yarn-project/end-to-end/scripts/docker-compose.yml
+++ b/yarn-project/end-to-end/scripts/docker-compose.yml
@@ -3,15 +3,10 @@ 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'
+    command: >
+      'anvil --host 0.0.0.0 --chain-id 31337 --port 8545 --silent'
+    ports:
+      - 8545:8545
 
   sandbox:
     image: aztecprotocol/aztec:${AZTEC_DOCKER_TAG:-latest}

From 47cb13255dfddbbb8cb544437076186dc4f83546 Mon Sep 17 00:00:00 2001
From: thunkar <gregojquiros@gmail.com>
Date: Fri, 22 Nov 2024 13:09:47 +0000
Subject: [PATCH 3/4] Added configurable env to docker-compose

---
 yarn-project/aztec/docker-compose.yml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/yarn-project/aztec/docker-compose.yml b/yarn-project/aztec/docker-compose.yml
index 934404c351b7..c161deb8a2ef 100644
--- a/yarn-project/aztec/docker-compose.yml
+++ b/yarn-project/aztec/docker-compose.yml
@@ -2,10 +2,20 @@ version: '3'
 services:
   ethereum:
     image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64}
-    command: >
-      'anvil --host 0.0.0.0 --chain-id 31337 --port 8545 --silent'
+    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:
-      - 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}'
     ports:

From 027890cffa6d8510d4319d0743a12e9ba75a30fc Mon Sep 17 00:00:00 2001
From: thunkar <gregojquiros@gmail.com>
Date: Fri, 22 Nov 2024 13:21:14 +0000
Subject: [PATCH 4/4] ffs

---
 docker-compose.provernet.yml                                  | 3 +--
 yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml | 3 +--
 yarn-project/end-to-end/scripts/docker-compose-wallet.yml     | 3 +--
 yarn-project/end-to-end/scripts/docker-compose.yml            | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/docker-compose.provernet.yml b/docker-compose.provernet.yml
index 215524fb04d0..83e6cd1913fe 100644
--- a/docker-compose.provernet.yml
+++ b/docker-compose.provernet.yml
@@ -7,8 +7,7 @@ services:
   # Anvil instance that serves as L1
   ethereum:
     image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64}
-    command: >
-      'anvil --block-time 12 --host 0.0.0.0 --chain-id 31337 --port 8545 --silent'
+    entrypoint: 'anvil --block-time 12 --silent -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 9b453b24537b..26aee9130358 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,8 +3,7 @@ services:
   fork:
     image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64}
     pull_policy: always
-    command: >
-      'anvil --host 0.0.0.0 --chain-id 31337 --port 8545 --silent'
+    entrypoint: 'anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337'
     ports:
       - 8545:8545
 
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 667b486297ba..7aa1646aa727 100644
--- a/yarn-project/end-to-end/scripts/docker-compose-wallet.yml
+++ b/yarn-project/end-to-end/scripts/docker-compose-wallet.yml
@@ -3,8 +3,7 @@ services:
   fork:
     image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64}
     pull_policy: always
-    command: >
-      'anvil --host 0.0.0.0 --chain-id 31337 --port 8545 --silent'
+    entrypoint: 'anvil --silent -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 b8b7e7a5d91a..75b9cd0d36ff 100644
--- a/yarn-project/end-to-end/scripts/docker-compose.yml
+++ b/yarn-project/end-to-end/scripts/docker-compose.yml
@@ -3,8 +3,7 @@ services:
   fork:
     image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64}
     pull_policy: always
-    command: >
-      'anvil --host 0.0.0.0 --chain-id 31337 --port 8545 --silent'
+    entrypoint: 'anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337'
     ports:
       - 8545:8545