From dea43ae97b66c45b2a475d1c8a7c8b1a15c60329 Mon Sep 17 00:00:00 2001
From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com>
Date: Thu, 3 Aug 2023 10:28:00 +0000
Subject: [PATCH] fix: update bootstrap compilation order

---
 bootstrap.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 65c7e529d62..43b0c217ffc 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -35,7 +35,6 @@ if [ ! -f ~/.nvm/nvm.sh ]; then
 fi
 
 circuits/cpp/bootstrap.sh
-l1-contracts/bootstrap.sh
 
 if [ "$(uname)" = "Darwin" ]; then
   # works around https://github.com/AztecProtocol/aztec3-packages/issues/158
@@ -49,22 +48,24 @@ cd yarn-project
 yarn install --immutable
 
 # Build the necessary dependencies for noir contracts typegen.
-for DIR in foundation noir-compiler; do
+for DIR in foundation noir-compiler circuits.js; do
   echo "Building $DIR..."
   cd $DIR
   yarn build
   cd ..
 done
 
-cd noir-contracts && ./bootstrap.sh
+# Run remake bindings before building noir contracts or l1 contracts as they depend on files created by it.
+yarn --cwd circuits.js remake-bindings
+yarn --cwd circuits.js remake-constants
+
+(cd noir-contracts && ./bootstrap.sh)
+(cd .. && l1-contracts/bootstrap.sh)
 
 # Until we push .yarn/cache, we still need to install.
-cd ../
 yarn
 # We do not need to build individual packages, yarn build will build the root tsconfig.json
 yarn build
-yarn --cwd circuits.js remake-bindings
-yarn --cwd circuits.js remake-constants
 cd ..
 
 echo