Skip to content

chore: Merge devnet to master #8044

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

Merged
PhilWindle merged 2 commits into from
Aug 16, 2024
Merged

chore: Merge devnet to master #8044

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91efec3
fix: devnet bootstrap use universal deploy (#8036)
sklppy88 Aug 16, 2024
30444e3
Merge branch 'master' into pw/devnet-to-master
PhilWindle Aug 16, 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
10 changes: 6 additions & 4 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 @@ -144,10 +144,10 @@ async function deployToken(
// @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()
.send({ universalDeploy: true })
.deployed({ proven: true, provenTimeout: 600 });
const bridge = await TokenBridgeContract.deploy(wallet, devCoin.address, l1Portal)
.send()
.send({ universalDeploy: true })
.deployed({ proven: true, provenTimeout: 600 });

await new BatchCall(wallet, [
Expand Down Expand Up @@ -201,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({ proven: true, provenTimeout: 600 });
const fpc = await FPCContract.deploy(wallet, tokenAddress)
.send({ universalDeploy: true })
.deployed({ proven: true, provenTimeout: 600 });
const info: ContractDeploymentInfo = {
address: fpc.address,
initHash: fpc.instance.initializationHash,
Expand All @@ -215,7 +217,7 @@ async function deployCounter(wallet: Wallet): Promise<ContractDeploymentInfo> {
// @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()
.send({ universalDeploy: true })
.deployed({ proven: true, provenTimeout: 600 });
const info: ContractDeploymentInfo = {
address: counter.address,
Expand Down