From 895cd5ca2a4b470c966a1f4a20162a5adec2ef84 Mon Sep 17 00:00:00 2001
From: sklppy88 <esau@aztecprotocol.com>
Date: Fri, 16 Aug 2024 10:07:35 +0000
Subject: [PATCH] correct bootstrap

---
 .../cli/src/cmds/devnet/bootstrap_network.ts     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/yarn-project/cli/src/cmds/devnet/bootstrap_network.ts b/yarn-project/cli/src/cmds/devnet/bootstrap_network.ts
index 235bf55792a..ee819bada8a 100644
--- a/yarn-project/cli/src/cmds/devnet/bootstrap_network.ts
+++ b/yarn-project/cli/src/cmds/devnet/bootstrap_network.ts
@@ -143,8 +143,12 @@ async function deployToken(
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore - Importing noir-contracts.js even in devDeps results in a circular dependency error. Need to ignore because this line doesn't cause an error in a dev environment
   const { TokenContract, TokenBridgeContract } = await import('@aztec/noir-contracts.js');
-  const devCoin = await TokenContract.deploy(wallet, wallet.getAddress(), 'DevCoin', 'DEV', 18).send().deployed();
-  const bridge = await TokenBridgeContract.deploy(wallet, devCoin.address, l1Portal).send().deployed();
+  const devCoin = await TokenContract.deploy(wallet, wallet.getAddress(), 'DevCoin', 'DEV', 18).send({
+    universalDeploy: true,
+  }).deployed();
+  const bridge = await TokenBridgeContract.deploy(wallet, devCoin.address, l1Portal).send({
+    universalDeploy: true,
+  }).deployed();
 
   await new BatchCall(wallet, [
     devCoin.methods.set_minter(bridge.address, true).request(),
@@ -197,7 +201,9 @@ async function deployFPC(wallet: Wallet, tokenAddress: AztecAddress): Promise<Co
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore - Importing noir-contracts.js even in devDeps results in a circular dependency error. Need to ignore because this line doesn't cause an error in a dev environment
   const { FPCContract } = await import('@aztec/noir-contracts.js');
-  const fpc = await FPCContract.deploy(wallet, tokenAddress).send().deployed();
+  const fpc = await FPCContract.deploy(wallet, tokenAddress).send({
+    universalDeploy: true,
+  }).deployed();
   const info: ContractDeploymentInfo = {
     address: fpc.address,
     initHash: fpc.instance.initializationHash,
@@ -210,7 +216,9 @@ async function deployCounter(wallet: Wallet): Promise<ContractDeploymentInfo> {
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore - Importing noir-contracts.js even in devDeps results in a circular dependency error. Need to ignore because this line doesn't cause an error in a dev environment
   const { CounterContract } = await import('@aztec/noir-contracts.js');
-  const counter = await CounterContract.deploy(wallet, 1, wallet.getAddress(), wallet.getAddress()).send().deployed();
+  const counter = await CounterContract.deploy(wallet, 1, wallet.getAddress(), wallet.getAddress()).send({
+    universalDeploy: true,
+  }).deployed();
   const info: ContractDeploymentInfo = {
     address: counter.address,
     initHash: counter.instance.initializationHash,