From a07087db3c2d6bf516cdb740c51a05613d259e98 Mon Sep 17 00:00:00 2001
From: spypsy <spypsy@outlook.com>
Date: Wed, 18 Oct 2023 17:40:27 +0000
Subject: [PATCH] Run canary tests using sandbox docker-compose.yml

---
 yarn-project/aztec-sandbox/README.md          |  7 +++-
 .../aztec-sandbox/docker-compose-fork.yml     | 21 -----------
 .../canary/scripts/docker-compose-browser.yml | 31 ++--------------
 .../scripts/docker-compose-e2e-sandbox.yml    | 36 -------------------
 .../canary/scripts/docker-compose.yml         | 33 ++---------------
 yarn-project/canary/scripts/run_tests         |  9 ++---
 6 files changed, 14 insertions(+), 123 deletions(-)
 delete mode 100644 yarn-project/aztec-sandbox/docker-compose-fork.yml
 delete mode 100644 yarn-project/canary/scripts/docker-compose-e2e-sandbox.yml

diff --git a/yarn-project/aztec-sandbox/README.md b/yarn-project/aztec-sandbox/README.md
index 91b65563598..02d5daf51bb 100644
--- a/yarn-project/aztec-sandbox/README.md
+++ b/yarn-project/aztec-sandbox/README.md
@@ -46,7 +46,12 @@ From the `aztec-sandbox` directory, you can run the two existing examples:
   - `yarn run:example:token`
 - An L1 / L2 uniswap token trade.
   - `yarn run:example:uniswap`
-  - To run this example, you need to use the `docker-compose-fork.yml` configuration.
+  - To run this example, you need to set the following vars:
+
+```
+export FORK_BLOCK_NUMBER=17514288
+export FORK_URL=<YOUR_RPC_URL e.g. https://mainnet.infura.io/v3/API_KEY>
+```
 
 ## Publishing
 
diff --git a/yarn-project/aztec-sandbox/docker-compose-fork.yml b/yarn-project/aztec-sandbox/docker-compose-fork.yml
deleted file mode 100644
index 69660298029..00000000000
--- a/yarn-project/aztec-sandbox/docker-compose-fork.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-version: '3'
-services:
-  fork:
-    image: ghcr.io/foundry-rs/foundry:nightly-a44aa13cfc23491ba32aaedc093e9488c1a6db43
-    entrypoint: 'anvil --fork-url https://mainnet.infura.io/v3/9928b52099854248b3a096be07a6b23c --host 0.0.0.0 --fork-block-number 17514288 --chain-id 31337'
-    ports:
-      - '8545:8545'
-
-  rpc-server:
-    image: aztecprotocol/aztec-sandbox:latest
-    ports:
-      - '8080:8080'
-    environment:
-      DEBUG: 'aztec:*'
-      ETHEREUM_HOST: http://fork:8545
-      CHAIN_ID: 31337
-      ARCHIVER_POLLING_INTERVAL_MS: 50
-      P2P_BLOCK_CHECK_INTERVAL_MS: 50
-      SEQ_TX_POLLING_INTERVAL_MS: 50
-      WS_BLOCK_CHECK_INTERVAL_MS: 50
-      ARCHIVER_VIEM_POLLING_INTERVAL_MS: 500
diff --git a/yarn-project/canary/scripts/docker-compose-browser.yml b/yarn-project/canary/scripts/docker-compose-browser.yml
index 6e9429371ab..98d8a7d9625 100644
--- a/yarn-project/canary/scripts/docker-compose-browser.yml
+++ b/yarn-project/canary/scripts/docker-compose-browser.yml
@@ -1,36 +1,9 @@
 version: '3'
 services:
-  fork:
-    image: ghcr.io/foundry-rs/foundry:nightly-a44aa13cfc23491ba32aaedc093e9488c1a6db43
-    entrypoint: >
-      sh -c '
-      if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then
-        exec anvil -p 8545 --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
-      fi'
-    ports:
-      - '8545:8545'
-
-  sandbox:
-    image: aztecprotocol/aztec-sandbox:canary
-    environment:
-      DEBUG: 'aztec:*'
-      ETHEREUM_HOST: http://fork:8545
-      CHAIN_ID: 31337
-      ARCHIVER_POLLING_INTERVAL_MS: 50
-      P2P_BLOCK_CHECK_INTERVAL_MS: 50
-      SEQ_TX_POLLING_INTERVAL_MS: 50
-      WS_BLOCK_CHECK_INTERVAL_MS: 50
-      PXE_BLOCK_POLLING_INTERVAL_MS: 50
-      ARCHIVER_VIEM_POLLING_INTERVAL_MS: 500
-    ports:
-      - '8080:8080'
-
   canary:
     image: aztecprotocol/canary:latest
     environment:
-      ETHEREUM_HOST: http://fork:8545
+      ETHEREUM_HOST: http://ethereum:8545
       CHAIN_ID: 31337
-      PXE_URL: http://sandbox:8080
+      PXE_URL: http://aztec:8080
     command: ['./scripts/start_e2e_ci_browser.sh', './src/aztec_js_browser.test.ts']
diff --git a/yarn-project/canary/scripts/docker-compose-e2e-sandbox.yml b/yarn-project/canary/scripts/docker-compose-e2e-sandbox.yml
deleted file mode 100644
index e9d8f75c5b3..00000000000
--- a/yarn-project/canary/scripts/docker-compose-e2e-sandbox.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-version: '3'
-services:
-  fork:
-    image: ghcr.io/foundry-rs/foundry:nightly-a44aa13cfc23491ba32aaedc093e9488c1a6db43
-    entrypoint: >
-      sh -c '
-      if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then
-        exec anvil -p 8545 --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
-      fi'
-    ports:
-      - '8545:8545'
-
-  sandbox:
-    image: aztecprotocol/sandbox:latest
-    environment:
-      DEBUG: 'aztec:*'
-      ETHEREUM_HOST: http://fork:8545
-      CHAIN_ID: 31337
-      ARCHIVER_POLLING_INTERVAL_MS: 50
-      P2P_BLOCK_CHECK_INTERVAL_MS: 50
-      SEQ_TX_POLLING_INTERVAL_MS: 50
-      WS_BLOCK_CHECK_INTERVAL_MS: 50
-      PXE_BLOCK_POLLING_INTERVAL_MS: 50
-      ARCHIVER_VIEM_POLLING_INTERVAL_MS: 500
-    ports:
-      - '8080:8080'
-
-  canary:
-    image: aztecprotocol/canary:latest
-    environment:
-      ETHEREUM_HOST: http://fork:8545
-      CHAIN_ID: 31337
-      PXE_URL: http://sandbox:8080
-    command: ${TEST:-./src/e2e_deploy_contract.test.ts}
diff --git a/yarn-project/canary/scripts/docker-compose.yml b/yarn-project/canary/scripts/docker-compose.yml
index 06a2c094a19..74a28452a07 100644
--- a/yarn-project/canary/scripts/docker-compose.yml
+++ b/yarn-project/canary/scripts/docker-compose.yml
@@ -1,36 +1,9 @@
 version: '3'
 services:
-  fork:
-    image: ghcr.io/foundry-rs/foundry:nightly-a44aa13cfc23491ba32aaedc093e9488c1a6db43
-    entrypoint: >
-      sh -c '
-      if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then
-        exec anvil -p 8545 --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
-      fi'
-    ports:
-      - '8545:8545'
-
-  sandbox:
-    image: aztecprotocol/aztec-sandbox:canary
-    environment:
-      DEBUG: 'aztec:*'
-      ETHEREUM_HOST: http://fork:8545
-      CHAIN_ID: 31337
-      ARCHIVER_POLLING_INTERVAL_MS: 50
-      P2P_BLOCK_CHECK_INTERVAL_MS: 50
-      SEQ_TX_POLLING_INTERVAL_MS: 50
-      WS_BLOCK_CHECK_INTERVAL_MS: 50
-      PXE_BLOCK_POLLING_INTERVAL_MS: 50
-      ARCHIVER_VIEM_POLLING_INTERVAL_MS: 500
-    ports:
-      - '8080:8080'
-
   canary:
     image: aztecprotocol/canary:latest
     environment:
-      ETHEREUM_HOST: http://fork:8545
+      ETHEREUM_HOST: http://ethereum:8545
       CHAIN_ID: 31337
-      PXE_URL: http://sandbox:8080
-    command: ${TEST:-./src/uniswap_trade_on_l1_from_l2.test.ts}
+      PXE_URL: http://aztec:8080
+    command: ${TEST:-./src/cli.test.ts}
diff --git a/yarn-project/canary/scripts/run_tests b/yarn-project/canary/scripts/run_tests
index 5ed4d4609c1..6ea4c000880 100755
--- a/yarn-project/canary/scripts/run_tests
+++ b/yarn-project/canary/scripts/run_tests
@@ -22,9 +22,6 @@ IMAGE_URI=$(calculate_image_uri $IMAGE)
 retry docker pull $IMAGE_URI
 retry docker tag $IMAGE_URI aztecprotocol/canary:latest
 
-SANDBOX_IMAGE_URI=$(calculate_image_uri aztec-sandbox)
-retry docker pull $SANDBOX_IMAGE_URI
-retry docker tag $SANDBOX_IMAGE_URI aztecprotocol/sandbox:latest
-
-docker-compose -f $COMPOSE_FILE rm -f
-docker-compose -f $COMPOSE_FILE up --exit-code-from canary
+export SANDBOX_VERSION=canary
+docker-compose -f ../../aztec-sandbox/docker-compose.yml -f $COMPOSE_FILE rm -f
+docker-compose -f ../../aztec-sandbox/docker-compose.yml -f $COMPOSE_FILE up --exit-code-from canary