From f36d8cfffb5318a959ba0a9f71e27bc47d8e9613 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Tue, 12 Mar 2024 14:50:43 -0400
Subject: [PATCH 1/2] chore: better output in ci_deploy_contracts.sh

This was not really debuggable from our CI log
---
 l1-contracts/scripts/ci_deploy_contracts.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/l1-contracts/scripts/ci_deploy_contracts.sh b/l1-contracts/scripts/ci_deploy_contracts.sh
index e2a4bf74658..1cd775969f3 100755
--- a/l1-contracts/scripts/ci_deploy_contracts.sh
+++ b/l1-contracts/scripts/ci_deploy_contracts.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -euo pipefail
+
 export ETHEREUM_HOST=https://$DEPLOY_TAG-mainnet-fork.aztec.network:8545/$FORK_API_KEY
 
 REPOSITORY="l1-contracts"
@@ -29,7 +31,7 @@ retry docker pull $CLI_IMAGE
 PRIVATE_KEY=${CONTRACT_PUBLISHER_PRIVATE_KEY#0x}
 docker run \
   $CLI_IMAGE \
-  deploy-l1-contracts -u $ETHEREUM_HOST -p $PRIVATE_KEY >./serve/contract_addresses.json
+  deploy-l1-contracts -u $ETHEREUM_HOST -p $PRIVATE_KEY | tee ./serve/contract_addresses.json
 
 ## Result format is:
 # Rollup Address: 0xe33d37702bb94e83ca09e7dc804c9f4c4ab8ee4a
@@ -57,6 +59,9 @@ while IFS= read -r line; do
   elif [[ $line == *"Outbox"* ]]; then
     export TF_VAR_OUTBOX_CONTRACT_ADDRESS=$address
     echo "TF_VAR_OUTBOX_CONTRACT_ADDRESS=$TF_VAR_OUTBOX_CONTRACT_ADDRESS"
+  elif [[ $line == *"Emitter"* ]]; then
+    export TF_VAR_CONTRACT_DEPLOYMENT_EMITTER_ADDRESS=$address
+    echo "TF_VAR_CONTRACT_DEPLOYMENT_EMITTER_ADDRESS=$TF_VAR_CONTRACT_DEPLOYMENT_EMITTER_ADDRESS"
   elif [[ $line == *"Oracle"* ]]; then
     export TF_VAR_AVAILABILITY_ORACLE_CONTRACT_ADDRESS=$address
     echo "TF_VAR_AVAILABILITY_ORACLE_CONTRACT_ADDRESS=$TF_VAR_AVAILABILITY_ORACLE_CONTRACT_ADDRESS"

From c55648604dc3257a202fe3ee35adca9f5161031e Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Tue, 12 Mar 2024 14:52:34 -0400
Subject: [PATCH 2/2] Update ci_deploy_contracts.sh

---
 l1-contracts/scripts/ci_deploy_contracts.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/l1-contracts/scripts/ci_deploy_contracts.sh b/l1-contracts/scripts/ci_deploy_contracts.sh
index 1cd775969f3..8bf5d65b3b1 100755
--- a/l1-contracts/scripts/ci_deploy_contracts.sh
+++ b/l1-contracts/scripts/ci_deploy_contracts.sh
@@ -59,9 +59,6 @@ while IFS= read -r line; do
   elif [[ $line == *"Outbox"* ]]; then
     export TF_VAR_OUTBOX_CONTRACT_ADDRESS=$address
     echo "TF_VAR_OUTBOX_CONTRACT_ADDRESS=$TF_VAR_OUTBOX_CONTRACT_ADDRESS"
-  elif [[ $line == *"Emitter"* ]]; then
-    export TF_VAR_CONTRACT_DEPLOYMENT_EMITTER_ADDRESS=$address
-    echo "TF_VAR_CONTRACT_DEPLOYMENT_EMITTER_ADDRESS=$TF_VAR_CONTRACT_DEPLOYMENT_EMITTER_ADDRESS"
   elif [[ $line == *"Oracle"* ]]; then
     export TF_VAR_AVAILABILITY_ORACLE_CONTRACT_ADDRESS=$address
     echo "TF_VAR_AVAILABILITY_ORACLE_CONTRACT_ADDRESS=$TF_VAR_AVAILABILITY_ORACLE_CONTRACT_ADDRESS"