From 793ac215de64cfcb5620464f495203a86b2b0b82 Mon Sep 17 00:00:00 2001
From: Santiago Palladino <santiago@aztecprotocol.com>
Date: Thu, 15 Aug 2024 12:37:16 -0300
Subject: [PATCH] Revert "chore: Ensure bootstrapped networks have no pending
 blocks when proving starts (#7986)"

This reverts commit fb471b3dd0cfc7abeed3668c2e4b62508bef69ac.
---
 .../cli/src/cmds/devnet/bootstrap_network.ts  | 30 ++++++-------------
 .../deploy_protocol_contract.ts               |  2 --
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/yarn-project/cli/src/cmds/devnet/bootstrap_network.ts b/yarn-project/cli/src/cmds/devnet/bootstrap_network.ts
index 51213bae3de..235bf55792a 100644
--- a/yarn-project/cli/src/cmds/devnet/bootstrap_network.ts
+++ b/yarn-project/cli/src/cmds/devnet/bootstrap_network.ts
@@ -35,7 +35,7 @@ export async function bootstrapNetwork(
 
   // setup a one-off account contract
   const account = getSchnorrAccount(pxe, Fr.random(), Fq.random(), Fr.random());
-  const wallet = await account.deploy().getWallet({ proven: true, provenTimeout: 600 });
+  const wallet = await account.deploy().getWallet();
 
   const l1Clients = createL1Clients(
     l1Url,
@@ -143,19 +143,15 @@ 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({ proven: true, provenTimeout: 600 });
-  const bridge = await TokenBridgeContract.deploy(wallet, devCoin.address, l1Portal)
-    .send()
-    .deployed({ proven: true, provenTimeout: 600 });
+  const devCoin = await TokenContract.deploy(wallet, wallet.getAddress(), 'DevCoin', 'DEV', 18).send().deployed();
+  const bridge = await TokenBridgeContract.deploy(wallet, devCoin.address, l1Portal).send().deployed();
 
   await new BatchCall(wallet, [
     devCoin.methods.set_minter(bridge.address, true).request(),
     devCoin.methods.set_admin(bridge.address).request(),
   ])
     .send()
-    .wait({ proven: true, provenTimeout: 600 });
+    .wait();
 
   return {
     token: {
@@ -201,7 +197,7 @@ 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({ proven: true, provenTimeout: 600 });
+  const fpc = await FPCContract.deploy(wallet, tokenAddress).send().deployed();
   const info: ContractDeploymentInfo = {
     address: fpc.address,
     initHash: fpc.instance.initializationHash,
@@ -214,9 +210,7 @@ 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({ proven: true, provenTimeout: 600 });
+  const counter = await CounterContract.deploy(wallet, 1, wallet.getAddress(), wallet.getAddress()).send().deployed();
   const info: ContractDeploymentInfo = {
     address: counter.address,
     initHash: counter.instance.initializationHash,
@@ -255,14 +249,8 @@ async function fundFPC(
 
   // TODO (alexg) remove this once sequencer builds blocks continuously
   // advance the chain
-  await counter.methods
-    .increment(wallet.getAddress(), wallet.getAddress())
-    .send()
-    .wait({ proven: true, provenTimeout: 600 });
-  await counter.methods
-    .increment(wallet.getAddress(), wallet.getAddress())
-    .send()
-    .wait({ proven: true, provenTimeout: 600 });
+  await counter.methods.increment(wallet.getAddress(), wallet.getAddress()).send().wait();
+  await counter.methods.increment(wallet.getAddress(), wallet.getAddress()).send().wait();
 
-  await feeJuiceContract.methods.claim(fpcAddress, amount, secret).send().wait({ proven: true, provenTimeout: 600 });
+  await feeJuiceContract.methods.claim(fpcAddress, amount, secret).send().wait();
 }
diff --git a/yarn-project/cli/src/cmds/infrastructure/deploy_protocol_contract.ts b/yarn-project/cli/src/cmds/infrastructure/deploy_protocol_contract.ts
index 77e8a51a5d4..d0e9f169cc6 100644
--- a/yarn-project/cli/src/cmds/infrastructure/deploy_protocol_contract.ts
+++ b/yarn-project/cli/src/cmds/infrastructure/deploy_protocol_contract.ts
@@ -11,8 +11,6 @@ import {
 const waitOpts: WaitOpts = {
   timeout: 180,
   interval: 1,
-  proven: true,
-  provenTimeout: 600,
 };
 
 export async function deployProtocolContracts(rpcUrl: string, l1ChainId: number, json: boolean, log: LogFn) {