Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Ensure bootstrapped networks have no pending blocks when proving starts #7986

Merged
merged 2 commits into from
Aug 14, 2024
Merged

chore: Ensure bootstrapped networks have no pending blocks when proving starts #7986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
213196d
Wait for bootstrap network to prove
PhilWindle Aug 14, 2024
5926f19
Wait for protocol contract to prove
PhilWindle Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions yarn-project/cli/src/cmds/devnet/bootstrap_network.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
const wallet = await account.deploy().getWallet({ proven: true, provenTimeout: 600 });

const l1Clients = createL1Clients(
l1Url,
Expand Down Expand Up @@ -143,15 +143,19 @@ 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()
.deployed({ proven: true, provenTimeout: 600 });
const bridge = await TokenBridgeContract.deploy(wallet, devCoin.address, l1Portal)
.send()
.deployed({ proven: true, provenTimeout: 600 });

await new BatchCall(wallet, [
devCoin.methods.set_minter(bridge.address, true).request(),
devCoin.methods.set_admin(bridge.address).request(),
])
.send()
.wait();
.wait({ proven: true, provenTimeout: 600 });

return {
token: {
Expand Down Expand Up @@ -197,7 +201,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();
const fpc = await FPCContract.deploy(wallet, tokenAddress).send().deployed({ proven: true, provenTimeout: 600 });
const info: ContractDeploymentInfo = {
address: fpc.address,
initHash: fpc.instance.initializationHash,
Expand All @@ -210,7 +214,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()
.deployed({ proven: true, provenTimeout: 600 });
const info: ContractDeploymentInfo = {
address: counter.address,
initHash: counter.instance.initializationHash,
Expand Down Expand Up @@ -249,8 +255,14 @@ 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();
await counter.methods.increment(wallet.getAddress(), wallet.getAddress()).send().wait();
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 feeJuiceContract.methods.claim(fpcAddress, amount, secret).send().wait();
await feeJuiceContract.methods.claim(fpcAddress, amount, secret).send().wait({ proven: true, provenTimeout: 600 });
}
2 changes: 2 additions & 0 deletions yarn-project/cli/src/cmds/infrastructure/deploy_protocol_contract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import {
const waitOpts: WaitOpts = {
timeout: 180,
interval: 1,
proven: true,
provenTimeout: 600,
};

export async function deployProtocolContracts(rpcUrl: string, l1ChainId: number, json: boolean, log: LogFn) {
Expand Down
Loading