@aztec/cli 1.2.0 → 2.0.0-nightly.20250813

package/dest/cmds/devnet/bootstrap_network.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap_network.d.ts","sourceRoot":"","sources":["../../../src/cmds/devnet/bootstrap_network.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAqB3D,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EAAE,EAChB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,KAAK,MAAM,EAAE,GAAG,SAAS,EACvC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,QAAQ,EAAE,MAAM,iBAiFjB"}
+{"version":3,"file":"bootstrap_network.d.ts","sourceRoot":"","sources":["../../../src/cmds/devnet/bootstrap_network.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAqB3D,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EAAE,EAChB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,KAAK,MAAM,EAAE,GAAG,SAAS,EACvC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,QAAQ,EAAE,MAAM,iBAkFjB"}

package/dest/cmds/devnet/bootstrap_network.js

@@ -18,17 +18,18 @@ export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey,
     const [accountManager] = await getInitialTestAccountsManagers(pxe);
     await accountManager.register();
     const wallet = await accountManager.getWallet();
+    const defaultAccountAddress = wallet.getAddress();
     const l1Client = createExtendedL1Client(l1Urls, l1PrivateKey ? privateKeyToAccount(l1PrivateKey) : // Note that this account needs to be funded on L1 !
     mnemonicToAccount(l1Mnemonic, {
         addressIndex
     }), createEthereumChain(l1Urls, +l1ChainId).chainInfo);
     const { erc20Address, portalAddress } = await deployERC20(l1Client);
-    const { token, bridge } = await deployToken(wallet, portalAddress);
+    const { token, bridge } = await deployToken(wallet, defaultAccountAddress, portalAddress);
     await initPortal(pxe, l1Client, erc20Address, portalAddress, bridge.address);
     const fpcAdmin = wallet.getAddress();
-    const fpc = await deployFPC(wallet, token.address, fpcAdmin);
-    const counter = await deployCounter(wallet);
-    await fundFPC(pxe, counter.address, wallet, l1Client, fpc.address, debugLog);
+    const fpc = await deployFPC(wallet, defaultAccountAddress, token.address, fpcAdmin);
+    const counter = await deployCounter(wallet, defaultAccountAddress);
+    await fundFPC(pxe, counter.address, wallet, defaultAccountAddress, l1Client, fpc.address, debugLog);
     if (json) {
         log(JSON.stringify({
             devCoinL1: erc20Address.toString(),
@@ -76,10 +77,12 @@ export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey,
  */ async function deployERC20(l1Client) {
     const { TestERC20Abi, TestERC20Bytecode, TokenPortalAbi, TokenPortalBytecode } = await import('@aztec/l1-artifacts');
     const erc20 = {
+        name: 'TestERC20',
         contractAbi: TestERC20Abi,
         contractBytecode: TestERC20Bytecode
     };
     const portal = {
+        name: 'TokenPortal',
         contractAbi: TokenPortalAbi,
         contractBytecode: TokenPortalBytecode
     };
@@ -96,23 +99,27 @@ export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey,
 }
 /**
  * Step 2. Deploy the L2 contracts
- */ async function deployToken(wallet, l1Portal) {
+ */ async function deployToken(wallet, defaultAccountAddress, l1Portal) {
     // 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 } = await import('@aztec/noir-contracts.js/Token');
     // 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 { TokenBridgeContract } = await import('@aztec/noir-contracts.js/TokenBridge');
-    const devCoin = await TokenContract.deploy(wallet, wallet.getAddress(), 'DevCoin', 'DEV', 18).send({
+    const devCoin = await TokenContract.deploy(wallet, defaultAccountAddress, 'DevCoin', 'DEV', 18).send({
+        from: defaultAccountAddress,
         universalDeploy: true
     }).deployed(waitOpts);
     const bridge = await TokenBridgeContract.deploy(wallet, devCoin.address, l1Portal).send({
+        from: defaultAccountAddress,
         universalDeploy: true
     }).deployed(waitOpts);
     await new BatchCall(wallet, [
         devCoin.methods.set_minter(bridge.address, true),
         devCoin.methods.set_admin(bridge.address)
-    ]).send().wait(waitOpts);
+    ]).send({
+        from: defaultAccountAddress
+    }).wait(waitOpts);
     return {
         token: {
             address: devCoin.address,
@@ -145,11 +152,12 @@ export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey,
         hash
     });
 }
-async function deployFPC(wallet, tokenAddress, admin) {
+async function deployFPC(wallet, defaultAccountAddress, tokenAddress, admin) {
     // 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/FPC');
     const fpc = await FPCContract.deploy(wallet, tokenAddress, admin).send({
+        from: defaultAccountAddress,
         universalDeploy: true
     }).deployed(waitOpts);
     const info = {
@@ -159,11 +167,12 @@ async function deployFPC(wallet, tokenAddress, admin) {
     };
     return info;
 }
-async function deployCounter(wallet) {
+async function deployCounter(wallet, defaultAccountAddress) {
     // 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-test-contracts.js/Counter');
-    const counter = await CounterContract.deploy(wallet, 1, wallet.getAddress()).send({
+    const counter = await CounterContract.deploy(wallet, 1, defaultAccountAddress).send({
+        from: defaultAccountAddress,
         universalDeploy: true
     }).deployed(waitOpts);
     const info = {
@@ -174,7 +183,7 @@ async function deployCounter(wallet) {
     return info;
 }
 // NOTE: Disabling for now in order to get devnet running
-async function fundFPC(pxe, counterAddress, wallet, l1Client, fpcAddress, debugLog) {
+async function fundFPC(pxe, counterAddress, wallet, defaultAccountAddress, l1Client, fpcAddress, debugLog) {
     // 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 { FeeJuiceContract } = await import('@aztec/noir-contracts.js/FeeJuice');
@@ -190,10 +199,16 @@ async function fundFPC(pxe, counterAddress, wallet, l1Client, fpcAddress, debugL
     debugLog.info('Incrementing Counter');
     // TODO (alexg) remove this once sequencer builds blocks continuously
     // advance the chain
-    await counter.methods.increment(wallet.getAddress(), wallet.getAddress()).send().wait(waitOpts);
-    await counter.methods.increment(wallet.getAddress(), wallet.getAddress()).send().wait(waitOpts);
+    await counter.methods.increment(wallet.getAddress()).send({
+        from: defaultAccountAddress
+    }).wait(waitOpts);
+    await counter.methods.increment(wallet.getAddress()).send({
+        from: defaultAccountAddress
+    }).wait(waitOpts);
     debugLog.info('Claiming FPC');
-    const receipt = await feeJuiceContract.methods.claim(fpcAddress, claimAmount, claimSecret, messageLeafIndex).send().wait({
+    const receipt = await feeJuiceContract.methods.claim(fpcAddress, claimAmount, claimSecret, messageLeafIndex).send({
+        from: defaultAccountAddress
+    }).wait({
         ...waitOpts
     });
     await waitForProven(pxe, receipt, provenWaitOpts);

package/dest/cmds/infrastructure/sequencers.d.ts

@@ -3,6 +3,7 @@ export declare function sequencers(opts: {
     command: 'list' | 'add' | 'remove' | 'who-next' | 'flush';
     who?: string;
     mnemonic?: string;
+    bn254SecretKey?: bigint;
     rpcUrl: string;
     l1RpcUrls: string[];
     chainId: number;

package/dest/cmds/infrastructure/sequencers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sequencers.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/sequencers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,OAAO,EAAE,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAC;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,KAAK,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;CACrB,iBAwFA"}
+{"version":3,"file":"sequencers.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/sequencers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,OAAO,EAAE,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAC;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,KAAK,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;CACrB,iBAoGA"}

package/dest/cmds/infrastructure/sequencers.js

@@ -1,10 +1,10 @@
-import { createCompatibleClient } from '@aztec/aztec.js';
-import { RollupContract, createEthereumChain, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { Fr, createCompatibleClient } from '@aztec/aztec.js';
+import { GSEContract, RollupContract, createEthereumChain, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 import { createPublicClient, createWalletClient, fallback, getContract, http } from 'viem';
 import { mnemonicToAccount } from 'viem/accounts';
 export async function sequencers(opts) {
-    const { command, who: maybeWho, mnemonic, rpcUrl, l1RpcUrls, chainId, log, debugLogger } = opts;
+    const { command, who: maybeWho, mnemonic, bn254SecretKey, rpcUrl, l1RpcUrls, chainId, log, debugLogger } = opts;
     const client = await createCompatibleClient(rpcUrl, debugLogger);
     const { l1ContractAddresses } = await client.getNodeInfo();
     const chain = createEthereumChain(l1RpcUrls, chainId);
@@ -45,14 +45,18 @@ export async function sequencers(opts) {
             client: walletClient
         });
         const config = getL1ContractsConfigEnvVars();
+        const bn254SecretKeyFieldElement = bn254SecretKey ? new Fr(bn254SecretKey) : Fr.random();
+        const gseAddress = await rollup.getGSE();
+        const gseContract = new GSEContract(publicClient, gseAddress);
+        const registrationTuple = await gseContract.makeRegistrationTuple(bn254SecretKeyFieldElement.toBigInt());
         await Promise.all([
             await stakingAsset.write.mint([
                 walletClient.account.address,
-                config.depositAmount
+                config.activationThreshold
             ], {}),
             await stakingAsset.write.approve([
                 rollup.address,
-                config.depositAmount
+                config.activationThreshold
             ], {})
         ].map((txHash)=>publicClient.waitForTransactionReceipt({
                 hash: txHash
@@ -60,6 +64,9 @@ export async function sequencers(opts) {
         const hash = await writeableRollup.write.deposit([
             who,
             who,
+            registrationTuple.publicKeyInG1,
+            registrationTuple.publicKeyInG2,
+            registrationTuple.proofOfPossession,
             true
         ]);
         await publicClient.waitForTransactionReceipt({

package/dest/cmds/l1/advance_epoch.js

@@ -1,9 +1,9 @@
 import { createPXEClient, makeFetch } from '@aztec/aztec.js';
-import { CheatCodes } from '@aztec/aztec.js/testing';
+import { RollupCheatCodes } from '@aztec/ethereum/test';
 export async function advanceEpoch(l1RpcUrls, rpcUrl, log) {
     const pxe = createPXEClient(rpcUrl, {}, makeFetch([], true));
     const rollupAddress = await pxe.getNodeInfo().then((i)=>i.l1ContractAddresses.rollupAddress);
-    const cheat = CheatCodes.createRollup(l1RpcUrls, {
+    const cheat = RollupCheatCodes.create(l1RpcUrls, {
         rollupAddress
     });
     await cheat.advanceToNextEpoch();

package/dest/cmds/l1/assume_proven_through.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assume_proven_through.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/assume_proven_through.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,mBAAmB,CACvC,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,SAAS,EAAE,MAAM,EAAE,EACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,iBAWX"}
+{"version":3,"file":"assume_proven_through.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/assume_proven_through.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,mBAAmB,CACvC,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,SAAS,EAAE,MAAM,EAAE,EACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,iBAUX"}

package/dest/cmds/l1/assume_proven_through.js

@@ -1,11 +1,10 @@
 import { createPXEClient, makeFetch } from '@aztec/aztec.js';
-import { EthCheatCodes, RollupCheatCodes } from '@aztec/aztec.js/testing';
+import { RollupCheatCodes } from '@aztec/ethereum/test';
 export async function assumeProvenThrough(blockNumberOrLatest, l1RpcUrls, rpcUrl, log) {
     const pxe = createPXEClient(rpcUrl, {}, makeFetch([], true));
     const rollupAddress = await pxe.getNodeInfo().then((i)=>i.l1ContractAddresses.rollupAddress);
     const blockNumber = blockNumberOrLatest ?? await pxe.getBlockNumber();
-    const ethCheatCode = new EthCheatCodes(l1RpcUrls);
-    const rollupCheatCodes = new RollupCheatCodes(ethCheatCode, {
+    const rollupCheatCodes = RollupCheatCodes.create(l1RpcUrls, {
         rollupAddress
     });
     await rollupCheatCodes.markAsProven(blockNumber);

package/dest/cmds/l1/deploy_l1_contracts.d.ts

@@ -1,4 +1,4 @@
-import type { EthAddress } from '@aztec/aztec.js';
+import { type EthAddress } from '@aztec/aztec.js';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 export declare function deployL1Contracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, testAccounts: boolean, sponsoredFPC: boolean, acceleratedTestDeployments: boolean, json: boolean, initialValidators: EthAddress[], realVerifier: boolean, log: LogFn, debugLogger: Logger): Promise<void>;
 //# sourceMappingURL=deploy_l1_contracts.d.ts.map

package/dest/cmds/l1/deploy_l1_contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,0BAA0B,EAAE,OAAO,EACnC,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA0DpB"}
+{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,UAAU,EAAM,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,0BAA0B,EAAE,OAAO,EACnC,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA2DpB"}

package/dest/cmds/l1/deploy_l1_contracts.js

@@ -1,5 +1,7 @@
 import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { Fr } from '@aztec/aztec.js';
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { SecretValue } from '@aztec/foundation/config';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import { deployAztecContracts } from '../../utils/aztec.js';
 import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
@@ -11,13 +13,14 @@ export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic,
     const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
     const initialValidatorOperators = initialValidators.map((a)=>({
             attester: a,
-            withdrawer: a
+            withdrawer: a,
+            bn254SecretKey: new SecretValue(Fr.random().toBigInt())
         }));
     const { l1ContractAddresses } = await deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidatorOperators, genesisArchiveRoot, fundingNeeded, acceleratedTestDeployments, config, realVerifier, debugLogger);
     if (json) {
         log(JSON.stringify(Object.fromEntries(Object.entries(l1ContractAddresses).map(([k, v])=>[
                 k,
-                v.toString()
+                v?.toString() ?? 'Not deployed'
             ])), null, 2));
     } else {
         log(`Rollup Address: ${l1ContractAddresses.rollupAddress.toString()}`);

package/dest/cmds/l1/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAajD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAW3D,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAuiB/E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAajD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAW3D,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WA6iB/E"}

package/dest/cmds/l1/index.js

@@ -95,7 +95,7 @@ export function injectCommands(program, log, debugLogger) {
         const account = generateL1Account();
         log(JSON.stringify(account, null, 2));
     });
-    program.command('add-l1-validator').description('Adds a validator to the L1 rollup contract.').addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use sending the transaction', PRIVATE_KEY).option('-m, --mnemonic <string>', 'The mnemonic to use sending the transaction', 'test test test test test test test test test test test junk').addOption(l1ChainIdOption).option('--attester <address>', 'ethereum address of the attester', parseEthereumAddress).option('--staking-asset-handler <address>', 'ethereum address of the staking asset handler', parseEthereumAddress).option('--proof <buffer>', 'The proof to use for the attestation', (arg)=>Buffer.from(withoutHexPrefix(arg), 'hex')).option('--merkle-proof <string>', 'The merkle proof to use for the attestation (comma separated list of 32 byte buffers)', (arg)=>arg.split(',')).action(async (options)=>{
+    program.command('add-l1-validator').description('Adds a validator to the L1 rollup contract.').addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use sending the transaction', PRIVATE_KEY).option('-m, --mnemonic <string>', 'The mnemonic to use sending the transaction', 'test test test test test test test test test test test junk').addOption(l1ChainIdOption).option('--attester <address>', 'ethereum address of the attester', parseEthereumAddress).option('--bls-secret-key <string>', 'The BN254 scalar field element used as a secret key for BLS signatures. Will be associated with the attester address.', parseBigint).option('--staking-asset-handler <address>', 'ethereum address of the staking asset handler', parseEthereumAddress).option('--proof <buffer>', 'The proof to use for the attestation', (arg)=>Buffer.from(withoutHexPrefix(arg), 'hex')).option('--merkle-proof <string>', 'The merkle proof to use for the attestation (comma separated list of 32 byte buffers)', (arg)=>arg.split(',')).action(async (options)=>{
         const { addL1Validator } = await import('./update_l1_validators.js');
         await addL1Validator({
             rpcUrls: options.l1RpcUrls,
@@ -106,6 +106,7 @@ export function injectCommands(program, log, debugLogger) {
             stakingAssetHandlerAddress: options.stakingAssetHandler,
             merkleProof: options.merkleProof,
             proofParams: options.proof,
+            blsSecretKey: options.blsSecretKey,
             log,
             debugLogger
         });

package/dest/cmds/l1/update_l1_validators.d.ts

@@ -23,7 +23,8 @@ export declare function generateL1Account(): {
     privateKey: `0x${string}`;
     address: `0x${string}`;
 };
-export declare function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, stakingAssetHandlerAddress, merkleProof, proofParams, log, debugLogger, }: StakingAssetHandlerCommandArgs & LoggerArgs & {
+export declare function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, stakingAssetHandlerAddress, merkleProof, proofParams, blsSecretKey, log, debugLogger, }: StakingAssetHandlerCommandArgs & LoggerArgs & {
+    blsSecretKey: bigint;
     attesterAddress: EthAddress;
     proofParams: Buffer;
     merkleProof: string[];

package/dest/cmds/l1/update_l1_validators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update_l1_validators.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/update_l1_validators.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAS3D,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,UAAU,CAAC;IAC1B,iBAAiB,CAAC,EAAE,UAAU,CAAC;CAChC;AAED,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0BAA0B,EAAE,UAAU,CAAC;CACxC;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,KAAK,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,iBAAiB;;;EAQhC;AAED,wBAAsB,cAAc,CAAC,EACnC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,eAAe,EACf,0BAA0B,EAC1B,WAAW,EACX,WAAW,EACX,GAAG,EACH,WAAW,GACZ,EAAE,8BAA8B,GAC/B,UAAU,GAAG;IAAE,eAAe,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAA;CAAE,iBAyCzF;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,gBAAgB,EAAE,UAAU,CAAA;CAAE,iBAiBnE;AAED,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,iBAgBhC;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,OAAO,EACP,aAAa,EACb,SAAS,EACT,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAyBxD;AAED,wBAAsB,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,iBAAiB,GAAG,UAAU,iBAwBzG"}
+{"version":3,"file":"update_l1_validators.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/update_l1_validators.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAS3D,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,UAAU,CAAC;IAC1B,iBAAiB,CAAC,EAAE,UAAU,CAAC;CAChC;AAED,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0BAA0B,EAAE,UAAU,CAAC;CACxC;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,KAAK,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,iBAAiB;;;EAQhC;AAED,wBAAsB,cAAc,CAAC,EACnC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,eAAe,EACf,0BAA0B,EAC1B,WAAW,EACX,WAAW,EACX,YAAY,EACZ,GAAG,EACH,WAAW,GACZ,EAAE,8BAA8B,GAC/B,UAAU,GAAG;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,UAAU,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,iBA4DF;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,gBAAgB,EAAE,UAAU,CAAA;CAAE,iBAiBnE;AAED,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,iBAgBhC;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,OAAO,EACP,aAAa,EACb,SAAS,EACT,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAyBxD;AAED,wBAAsB,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,iBAAiB,GAAG,UAAU,iBAwBzG"}

package/dest/cmds/l1/update_l1_validators.js

@@ -1,4 +1,5 @@
-import { EthCheatCodes, L1TxUtils, RollupContract, createEthereumChain, createExtendedL1Client, getL1ContractsConfigEnvVars, getPublicClient, isAnvilTestChain } from '@aztec/ethereum';
+import { GSEContract, L1TxUtils, RollupContract, createEthereumChain, createExtendedL1Client, getL1ContractsConfigEnvVars, getPublicClient, isAnvilTestChain } from '@aztec/ethereum';
+import { EthCheatCodes } from '@aztec/ethereum/test';
 import { RollupAbi, StakingAssetHandlerAbi } from '@aztec/l1-artifacts';
 import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
 import { encodeFunctionData, formatEther, getContract } from 'viem';
@@ -13,7 +14,7 @@ export function generateL1Account() {
         address: account.address
     };
 }
-export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, stakingAssetHandlerAddress, merkleProof, proofParams, log, debugLogger }) {
+export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, stakingAssetHandlerAddress, merkleProof, proofParams, blsSecretKey, log, debugLogger }) {
     const dualLog = makeDualLog(log, debugLogger);
     const account = getAccount(privateKey, mnemonic);
     const chain = createEthereumChain(rpcUrls, chainId);
@@ -23,8 +24,16 @@ export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, a
         abi: StakingAssetHandlerAbi,
         client: l1Client
     });
-    const rollup = await stakingAssetHandler.read.getRollup();
-    dualLog(`Adding validator ${attesterAddress} to rollup ${rollup.toString()}`);
+    const rollupAddress = await stakingAssetHandler.read.getRollup();
+    dualLog(`Adding validator ${attesterAddress} to rollup ${rollupAddress.toString()}`);
+    const rollup = getContract({
+        address: rollupAddress,
+        abi: RollupAbi,
+        client: l1Client
+    });
+    const gseAddress = await rollup.read.getGSE();
+    const gse = new GSEContract(l1Client, gseAddress);
+    const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
     const l1TxUtils = new L1TxUtils(l1Client, debugLogger);
     const proofParamsObj = ZkPassportProofParams.fromBuffer(proofParams);
     const merkleProofArray = merkleProof.map((proof)=>addLeadingHex(proof));
@@ -36,7 +45,10 @@ export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, a
             args: [
                 attesterAddress.toString(),
                 merkleProofArray,
-                proofParamsObj.toViem()
+                proofParamsObj.toViem(),
+                registrationTuple.publicKeyInG1,
+                registrationTuple.publicKeyInG2,
+                registrationTuple.proofOfPossession
             ]
         }),
         abi: StakingAssetHandlerAbi
@@ -114,7 +126,9 @@ export async function fastForwardEpochs({ rpcUrls, chainId, rollupAddress, numEp
     ]);
     dualLog(`Fast forwarding ${numEpochs} epochs to ${timestamp}`);
     try {
-        await cheatCodes.warp(Number(timestamp));
+        await cheatCodes.warp(Number(timestamp), {
+            resetBlockInterval: true
+        });
         dualLog(`Fast forwarded ${numEpochs} epochs to ${timestamp}`);
     } catch (error) {
         if (error instanceof Error && error.message.includes("is lower than or equal to previous block's timestamp")) {

package/dest/cmds/pxe/get_contract_data.js

@@ -1,7 +1,7 @@
 import { createCompatibleClient } from '@aztec/aztec.js';
 export async function getContractData(rpcUrl, contractAddress, includeBytecode, debugLogger, log) {
     const client = await createCompatibleClient(rpcUrl, debugLogger);
-    const { contractInstance: instance, isContractInitialized: isInitialized, isContractPubliclyDeployed: isPubliclyDeployed } = await client.getContractMetadata(contractAddress);
+    const { contractInstance: instance, isContractInitialized: isInitialized, isContractPublished: isPubliclyDeployed } = await client.getContractMetadata(contractAddress);
     const contractClass = includeBytecode && instance && (await client.getContractClassMetadata(instance?.currentContractClassId)).contractClass;
     const isPrivatelyDeployed = !!instance;
     const initStr = isInitialized ? 'initialized' : 'not initialized';

package/dest/cmds/pxe/get_node_info.js

@@ -30,9 +30,9 @@ export async function getNodeInfo(rpcUrl, pxeRequest, debugLogger, json, log, lo
                 stakingAssetHandler: info.l1ContractAddresses.stakingAssetHandlerAddress?.toString()
             },
             protocolContractAddresses: {
-                classRegisterer: info.protocolContractAddresses.classRegisterer.toString(),
+                classRegistry: info.protocolContractAddresses.classRegistry.toString(),
                 feeJuice: info.protocolContractAddresses.feeJuice.toString(),
-                instanceDeployer: info.protocolContractAddresses.instanceDeployer.toString(),
+                instanceRegistry: info.protocolContractAddresses.instanceRegistry.toString(),
                 multiCallEntrypoint: info.protocolContractAddresses.multiCallEntrypoint.toString()
             }
         });
@@ -57,9 +57,9 @@ export async function getNodeInfo(rpcUrl, pxeRequest, debugLogger, json, log, lo
         log(` FeeAssetHandler Address: ${info.l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
         log(` StakingAssetHandler Address: ${info.l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
         log(`L2 Contract Addresses:`);
-        log(` Class Registerer: ${info.protocolContractAddresses.classRegisterer.toString()}`);
+        log(` Class Registry: ${info.protocolContractAddresses.classRegistry.toString()}`);
         log(` Fee Juice: ${info.protocolContractAddresses.feeJuice.toString()}`);
-        log(` Instance Deployer: ${info.protocolContractAddresses.instanceDeployer.toString()}`);
+        log(` Instance Deployer: ${info.protocolContractAddresses.instanceRegistry.toString()}`);
         log(` MultiCall: ${info.protocolContractAddresses.multiCallEntrypoint.toString()}`);
     }
 }

package/dest/cmds/pxe/get_pxe_info.js

@@ -4,8 +4,8 @@ export async function getPXEInfo(rpcUrl, debugLogger, log) {
     const info = await client.getPXEInfo();
     log(`PXE Version: ${info.pxeVersion}`);
     log(`Protocol Contract Addresses:`);
-    log(` Class Registerer: ${info.protocolContractAddresses.classRegisterer.toString()}`);
+    log(` Class Registry: ${info.protocolContractAddresses.classRegistry.toString()}`);
     log(` Fee Juice: ${info.protocolContractAddresses.feeJuice.toString()}`);
-    log(` Instance Deployer: ${info.protocolContractAddresses.instanceDeployer.toString()}`);
+    log(` Instance Deployer: ${info.protocolContractAddresses.instanceRegistry.toString()}`);
     log(` Multi Call Entrypoint: ${info.protocolContractAddresses.multiCallEntrypoint.toString()}`);
 }

package/dest/utils/aztec.d.ts

@@ -1,7 +1,7 @@
 import { EthAddress, type PXE } from '@aztec/aztec.js';
 import { type ContractArtifact, type FunctionAbi } from '@aztec/aztec.js/abi';
 import { type DeployL1ContractsReturnType, type L1ContractsConfig, type Operator, RollupContract } from '@aztec/ethereum';
-import type { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/fields';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import type { NoirPackageConfig } from '@aztec/foundation/noir';
 /**

package/dest/utils/aztec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EACb,cAAc,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAShE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,0BAA0B,EAAE,OAAO,EACnC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC,CA6BtC;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,CAoCtE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,KAAG,MAK7C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,KAAG,KAAK,MAAM,EAKtD,CAAC;AAOF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE;AAKD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,iBAyB9E"}
+{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EACb,cAAc,EACf,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAShE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,0BAA0B,EAAE,OAAO,EACnC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC,CA6BtC;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,CA6CtE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,KAAG,MAK7C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,KAAG,KAAK,MAAM,EAKtD,CAAC;AAOF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE;AAKD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,iBAyB9E"}

package/dest/utils/aztec.js

@@ -1,5 +1,7 @@
 import { EthAddress } from '@aztec/aztec.js';
 import { FunctionType, getAllFunctionAbis, loadContractArtifact } from '@aztec/aztec.js/abi';
+import { SecretValue } from '@aztec/foundation/config';
+import { Fr } from '@aztec/foundation/fields';
 import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import TOML from '@iarna/toml';
 import { readFile } from 'fs/promises';
@@ -54,11 +56,14 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId
     const client = createExtendedL1Client(rpcUrls, account, chain.chainInfo, undefined, mnemonicIndex);
     if (!initialValidators || initialValidators.length === 0) {
         // initialize the new rollup with Amin's validator address.
-        const amin = EthAddress.fromString('0x3b218d0F26d15B36C715cB06c949210a0d630637');
+        const aminAddressString = '0x3b218d0F26d15B36C715cB06c949210a0d630637';
+        const amin = EthAddress.fromString(aminAddressString);
         initialValidators = [
             {
                 attester: amin,
-                withdrawer: amin
+                withdrawer: amin,
+                // No secrets here. The actual keys are not currently used.
+                bn254SecretKey: new SecretValue(Fr.fromHexString(aminAddressString).toBigInt())
             }
         ];
         logger.info('Initializing new rollup with old attesters', {

package/dest/utils/inspect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../src/utils/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,gBAAgB,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAE3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,wBAAsB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,iBA0B7G;AAED,wBAAsB,SAAS,CAC7B,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,WAAW,CAAA;CAAO,iBAmGrE;AAuCD,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;AAC/D,KAAK,2BAA2B,GAAG,gBAAgB,GAAG;IAAE,OAAO,EAAE,EAAE,CAAA;CAAE,CAAC"}
+{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../src/utils/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,gBAAgB,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAE3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,wBAAsB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,iBA0B7G;AAED,wBAAsB,SAAS,CAC7B,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,WAAW,CAAA;CAAO,iBA8FrE;AAuCD,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;AAC/D,KAAK,2BAA2B,GAAG,gBAAgB,GAAG;IAAE,OAAO,EAAE,EAAE,CAAA;CAAE,CAAC"}

package/dest/utils/inspect.js

@@ -1,6 +1,5 @@
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { siloNullifier } from '@aztec/stdlib/hash';
-import { NoteStatus } from '@aztec/stdlib/note';
 export async function inspectBlock(pxe, blockNumber, log, opts = {}) {
     const block = await pxe.getBlock(blockNumber);
     if (!block) {
@@ -29,13 +28,9 @@ export async function inspectBlock(pxe, blockNumber, log, opts = {}) {
     }
 }
 export async function inspectTx(pxe, txHash, log, opts = {}) {
-    const [receipt, effectsInBlock, getNotes] = await Promise.all([
+    const [receipt, effectsInBlock] = await Promise.all([
         pxe.getTxReceipt(txHash),
-        pxe.getTxEffect(txHash),
-        pxe.getNotes({
-            txHash,
-            status: NoteStatus.ACTIVE_OR_NULLIFIED
-        })
+        pxe.getTxEffect(txHash)
     ]);
     // Base tx data
     log(`Tx ${txHash.toString()}`);
@@ -74,12 +69,9 @@ export async function inspectTx(pxe, txHash, log, opts = {}) {
     const notes = effects.noteHashes;
     if (notes.length > 0) {
         log(' Created notes:');
-        log(`  Total: ${notes.length}. Found: ${getNotes.length}.`);
-        if (getNotes.length) {
-            log('  Found notes:');
-            for (const note of getNotes){
-                inspectNote(note, artifactMap, log);
-            }
+        log(`  Total: ${notes.length}`);
+        for (const note of notes){
+            log(`  Note hash: ${note.toShortString()}`);
         }
     }
     // Nullifiers
@@ -88,10 +80,11 @@ export async function inspectTx(pxe, txHash, log, opts = {}) {
     if (nullifierCount > 0) {
         log(' Nullifiers:');
         for (const nullifier of effects.nullifiers){
-            const [note] = await pxe.getNotes({
-                siloedNullifier: nullifier
-            });
             const deployed = deployNullifiers[nullifier.toString()];
+            const note = deployed ? (await pxe.getNotes({
+                siloedNullifier: nullifier,
+                contractAddress: deployed
+            }))[0] : undefined;
             const initialized = initNullifiers[nullifier.toString()];
             const registered = classNullifiers[nullifier.toString()];
             if (nullifier.toBuffer().equals(txHash.toBuffer())) {
@@ -135,8 +128,8 @@ function toFriendlyAddress(address, artifactMap) {
 }
 async function getKnownNullifiers(pxe, artifactMap) {
     const knownContracts = await pxe.getContracts();
-    const deployerAddress = ProtocolContractAddress.ContractInstanceDeployer;
-    const registererAddress = ProtocolContractAddress.ContractClassRegisterer;
+    const deployerAddress = ProtocolContractAddress.ContractInstanceRegistry;
+    const classRegistryAddress = ProtocolContractAddress.ContractClassRegistry;
     const initNullifiers = {};
     const deployNullifiers = {};
     const classNullifiers = {};
@@ -145,7 +138,7 @@ async function getKnownNullifiers(pxe, artifactMap) {
         deployNullifiers[(await siloNullifier(deployerAddress, contract.toField())).toString()] = contract;
     }
     for (const artifact of Object.values(artifactMap)){
-        classNullifiers[(await siloNullifier(registererAddress, artifact.classId)).toString()] = `${artifact.name}Class<${artifact.classId}>`;
+        classNullifiers[(await siloNullifier(classRegistryAddress, artifact.classId)).toString()] = `${artifact.name}Class<${artifact.classId}>`;
     }
     return {
         initNullifiers,

package/dest/utils/setup_contracts.d.ts

@@ -1,5 +1,5 @@
-import { type PXE, type WaitForProvenOpts } from '@aztec/aztec.js';
+import { AztecAddress, type PXE, type WaitForProvenOpts } from '@aztec/aztec.js';
 import type { LogFn } from '@aztec/foundation/log';
-export declare function getSponsoredFPCAddress(): Promise<import("@aztec/aztec.js").AztecAddress>;
+export declare function getSponsoredFPCAddress(): Promise<AztecAddress>;
 export declare function setupSponsoredFPC(pxe: PXE, log: LogFn, waitOpts?: import("@aztec/aztec.js").WaitOpts, waitForProvenOptions?: WaitForProvenOpts): Promise<void>;
 //# sourceMappingURL=setup_contracts.d.ts.map

package/dest/utils/setup_contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup_contracts.d.ts","sourceRoot":"","sources":["../../src/utils/setup_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,GAAG,EAGR,KAAK,iBAAiB,EAGvB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AASnD,wBAAsB,sBAAsB,oDAM3C;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,KAAK,EACV,QAAQ,qCAAkB,EAC1B,oBAAoB,CAAC,EAAE,iBAAiB,iBAsBzC"}
+{"version":3,"file":"setup_contracts.d.ts","sourceRoot":"","sources":["../../src/utils/setup_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,KAAK,GAAG,EAGR,KAAK,iBAAiB,EAGvB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AASnD,wBAAsB,sBAAsB,0BAM3C;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,KAAK,EACV,QAAQ,qCAAkB,EAC1B,oBAAoB,CAAC,EAAE,iBAAiB,iBAuBzC"}

package/dest/utils/setup_contracts.js

@@ -1,4 +1,4 @@
-import { DefaultWaitOpts, Fr, SignerlessWallet, SponsoredFeePaymentMethod, getContractInstanceFromDeployParams, waitForProven } from '@aztec/aztec.js';
+import { AztecAddress, DefaultWaitOpts, Fr, SignerlessWallet, SponsoredFeePaymentMethod, getContractInstanceFromInstantiationParams, waitForProven } from '@aztec/aztec.js';
 import { SPONSORED_FPC_SALT } from '@aztec/constants';
 import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multicall';
 async function getSponsoredFPCContract() {
@@ -9,7 +9,7 @@ async function getSponsoredFPCContract() {
 }
 export async function getSponsoredFPCAddress() {
     const SponsoredFPCContract = await getSponsoredFPCContract();
-    const sponsoredFPCInstance = await getContractInstanceFromDeployParams(SponsoredFPCContract.artifact, {
+    const sponsoredFPCInstance = await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
         salt: new Fr(SPONSORED_FPC_SALT)
     });
     return sponsoredFPCInstance.address;
@@ -21,6 +21,7 @@ export async function setupSponsoredFPC(pxe, log, waitOpts = DefaultWaitOpts, wa
     const { l1ChainId: chainId, rollupVersion } = await pxe.getNodeInfo();
     const deployer = new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(chainId, rollupVersion));
     const deployTx = SponsoredFPCContract.deploy(deployer).send({
+        from: AztecAddress.ZERO,
         contractAddressSalt: new Fr(SPONSORED_FPC_SALT),
         universalDeploy: true,
         fee: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "1.2.0",
+  "version": "2.0.0-nightly.20250813",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -69,15 +69,16 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "1.2.0",
-    "@aztec/aztec.js": "1.2.0",
-    "@aztec/constants": "1.2.0",
-    "@aztec/entrypoints": "1.2.0",
-    "@aztec/foundation": "1.2.0",
-    "@aztec/l1-artifacts": "1.2.0",
-    "@aztec/p2p": "1.2.0",
-    "@aztec/stdlib": "1.2.0",
-    "@aztec/world-state": "1.2.0",
+    "@aztec/archiver": "2.0.0-nightly.20250813",
+    "@aztec/aztec.js": "2.0.0-nightly.20250813",
+    "@aztec/constants": "2.0.0-nightly.20250813",
+    "@aztec/entrypoints": "2.0.0-nightly.20250813",
+    "@aztec/ethereum": "2.0.0-nightly.20250813",
+    "@aztec/foundation": "2.0.0-nightly.20250813",
+    "@aztec/l1-artifacts": "2.0.0-nightly.20250813",
+    "@aztec/p2p": "2.0.0-nightly.20250813",
+    "@aztec/stdlib": "2.0.0-nightly.20250813",
+    "@aztec/world-state": "2.0.0-nightly.20250813",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
     "commander": "^12.1.0",
@@ -89,9 +90,8 @@
     "viem": "2.23.7"
   },
   "devDependencies": {
-    "@aztec/accounts": "1.2.0",
-    "@aztec/ethereum": "1.2.0",
-    "@aztec/protocol-contracts": "1.2.0",
+    "@aztec/accounts": "2.0.0-nightly.20250813",
+    "@aztec/protocol-contracts": "2.0.0-nightly.20250813",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.chunk": "^4.2.9",
@@ -107,15 +107,15 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@aztec/accounts": "1.2.0",
-    "@aztec/bb-prover": "1.2.0",
-    "@aztec/ethereum": "1.2.0",
-    "@aztec/l1-artifacts": "1.2.0",
-    "@aztec/noir-contracts.js": "1.2.0",
-    "@aztec/noir-protocol-circuits-types": "1.2.0",
-    "@aztec/noir-test-contracts.js": "1.2.0",
-    "@aztec/protocol-contracts": "1.2.0",
-    "@aztec/stdlib": "1.2.0"
+    "@aztec/accounts": "2.0.0-nightly.20250813",
+    "@aztec/bb-prover": "2.0.0-nightly.20250813",
+    "@aztec/ethereum": "2.0.0-nightly.20250813",
+    "@aztec/l1-artifacts": "2.0.0-nightly.20250813",
+    "@aztec/noir-contracts.js": "2.0.0-nightly.20250813",
+    "@aztec/noir-protocol-circuits-types": "2.0.0-nightly.20250813",
+    "@aztec/noir-test-contracts.js": "2.0.0-nightly.20250813",
+    "@aztec/protocol-contracts": "2.0.0-nightly.20250813",
+    "@aztec/stdlib": "2.0.0-nightly.20250813"
   },
   "files": [
     "dest",

package/src/cmds/devnet/bootstrap_network.ts

@@ -60,6 +60,7 @@ export async function bootstrapNetwork(
   await accountManager.register();
 
   const wallet = await accountManager.getWallet();
+  const defaultAccountAddress = wallet.getAddress();
 
   const l1Client = createExtendedL1Client(
     l1Urls,
@@ -73,16 +74,16 @@ export async function bootstrapNetwork(
 
   const { erc20Address, portalAddress } = await deployERC20(l1Client);
 
-  const { token, bridge } = await deployToken(wallet, portalAddress);
+  const { token, bridge } = await deployToken(wallet, defaultAccountAddress, portalAddress);
 
   await initPortal(pxe, l1Client, erc20Address, portalAddress, bridge.address);
 
   const fpcAdmin = wallet.getAddress();
-  const fpc = await deployFPC(wallet, token.address, fpcAdmin);
+  const fpc = await deployFPC(wallet, defaultAccountAddress, token.address, fpcAdmin);
 
-  const counter = await deployCounter(wallet);
+  const counter = await deployCounter(wallet, defaultAccountAddress);
 
-  await fundFPC(pxe, counter.address, wallet, l1Client, fpc.address, debugLog);
+  await fundFPC(pxe, counter.address, wallet, defaultAccountAddress, l1Client, fpc.address, debugLog);
 
   if (json) {
     log(
@@ -140,10 +141,12 @@ async function deployERC20(l1Client: ExtendedViemWalletClient) {
   const { TestERC20Abi, TestERC20Bytecode, TokenPortalAbi, TokenPortalBytecode } = await import('@aztec/l1-artifacts');
 
   const erc20: ContractArtifacts = {
+    name: 'TestERC20',
     contractAbi: TestERC20Abi,
     contractBytecode: TestERC20Bytecode,
   };
   const portal: ContractArtifacts = {
+    name: 'TokenPortal',
     contractAbi: TokenPortalAbi,
     contractBytecode: TokenPortalBytecode,
   };
@@ -166,6 +169,7 @@ async function deployERC20(l1Client: ExtendedViemWalletClient) {
  */
 async function deployToken(
   wallet: Wallet,
+  defaultAccountAddress: AztecAddress,
   l1Portal: EthAddress,
 ): Promise<{ token: ContractDeploymentInfo; bridge: ContractDeploymentInfo }> {
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -174,18 +178,18 @@ 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 { TokenBridgeContract } = await import('@aztec/noir-contracts.js/TokenBridge');
-  const devCoin = await TokenContract.deploy(wallet, wallet.getAddress(), 'DevCoin', 'DEV', 18)
-    .send({ universalDeploy: true })
+  const devCoin = await TokenContract.deploy(wallet, defaultAccountAddress, 'DevCoin', 'DEV', 18)
+    .send({ from: defaultAccountAddress, universalDeploy: true })
     .deployed(waitOpts);
   const bridge = await TokenBridgeContract.deploy(wallet, devCoin.address, l1Portal)
-    .send({ universalDeploy: true })
+    .send({ from: defaultAccountAddress, universalDeploy: true })
     .deployed(waitOpts);
 
   await new BatchCall(wallet, [
     devCoin.methods.set_minter(bridge.address, true),
     devCoin.methods.set_admin(bridge.address),
   ])
-    .send()
+    .send({ from: defaultAccountAddress })
     .wait(waitOpts);
 
   return {
@@ -230,13 +234,16 @@ async function initPortal(
 
 async function deployFPC(
   wallet: Wallet,
+  defaultAccountAddress: AztecAddress,
   tokenAddress: AztecAddress,
   admin: AztecAddress,
 ): 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 { FPCContract } = await import('@aztec/noir-contracts.js/FPC');
-  const fpc = await FPCContract.deploy(wallet, tokenAddress, admin).send({ universalDeploy: true }).deployed(waitOpts);
+  const fpc = await FPCContract.deploy(wallet, tokenAddress, admin)
+    .send({ from: defaultAccountAddress, universalDeploy: true })
+    .deployed(waitOpts);
   const info: ContractDeploymentInfo = {
     address: fpc.address,
     initHash: fpc.instance.initializationHash,
@@ -245,12 +252,12 @@ async function deployFPC(
   return info;
 }
 
-async function deployCounter(wallet: Wallet): Promise<ContractDeploymentInfo> {
+async function deployCounter(wallet: Wallet, defaultAccountAddress: AztecAddress): 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-test-contracts.js/Counter');
-  const counter = await CounterContract.deploy(wallet, 1, wallet.getAddress())
-    .send({ universalDeploy: true })
+  const counter = await CounterContract.deploy(wallet, 1, defaultAccountAddress)
+    .send({ from: defaultAccountAddress, universalDeploy: true })
     .deployed(waitOpts);
   const info: ContractDeploymentInfo = {
     address: counter.address,
@@ -265,6 +272,7 @@ async function fundFPC(
   pxe: PXE,
   counterAddress: AztecAddress,
   wallet: Wallet,
+  defaultAccountAddress: AztecAddress,
   l1Client: ExtendedViemWalletClient,
   fpcAddress: AztecAddress,
   debugLog: Logger,
@@ -297,14 +305,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(waitOpts);
-  await counter.methods.increment(wallet.getAddress(), wallet.getAddress()).send().wait(waitOpts);
+  await counter.methods.increment(wallet.getAddress()).send({ from: defaultAccountAddress }).wait(waitOpts);
+  await counter.methods.increment(wallet.getAddress()).send({ from: defaultAccountAddress }).wait(waitOpts);
 
   debugLog.info('Claiming FPC');
 
   const receipt = await feeJuiceContract.methods
     .claim(fpcAddress, claimAmount, claimSecret, messageLeafIndex)
-    .send()
+    .send({ from: defaultAccountAddress })
     .wait({ ...waitOpts });
 
   await waitForProven(pxe, receipt, provenWaitOpts);

package/src/cmds/infrastructure/sequencers.ts

@@ -1,5 +1,5 @@
-import { createCompatibleClient } from '@aztec/aztec.js';
-import { RollupContract, createEthereumChain, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { Fr, createCompatibleClient } from '@aztec/aztec.js';
+import { GSEContract, RollupContract, createEthereumChain, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 
@@ -10,6 +10,7 @@ export async function sequencers(opts: {
   command: 'list' | 'add' | 'remove' | 'who-next' | 'flush';
   who?: string;
   mnemonic?: string;
+  bn254SecretKey?: bigint;
   rpcUrl: string;
   l1RpcUrls: string[];
   chainId: number;
@@ -17,7 +18,7 @@ export async function sequencers(opts: {
   log: LogFn;
   debugLogger: Logger;
 }) {
-  const { command, who: maybeWho, mnemonic, rpcUrl, l1RpcUrls, chainId, log, debugLogger } = opts;
+  const { command, who: maybeWho, mnemonic, bn254SecretKey, rpcUrl, l1RpcUrls, chainId, log, debugLogger } = opts;
   const client = await createCompatibleClient(rpcUrl, debugLogger);
   const { l1ContractAddresses } = await client.getNodeInfo();
 
@@ -72,14 +73,26 @@ export async function sequencers(opts: {
 
     const config = getL1ContractsConfigEnvVars();
 
+    const bn254SecretKeyFieldElement = bn254SecretKey ? new Fr(bn254SecretKey) : Fr.random();
+    const gseAddress = await rollup.getGSE();
+    const gseContract = new GSEContract(publicClient, gseAddress);
+    const registrationTuple = await gseContract.makeRegistrationTuple(bn254SecretKeyFieldElement.toBigInt());
+
     await Promise.all(
       [
-        await stakingAsset.write.mint([walletClient.account.address, config.depositAmount], {} as any),
-        await stakingAsset.write.approve([rollup.address, config.depositAmount], {} as any),
+        await stakingAsset.write.mint([walletClient.account.address, config.activationThreshold], {} as any),
+        await stakingAsset.write.approve([rollup.address, config.activationThreshold], {} as any),
       ].map(txHash => publicClient.waitForTransactionReceipt({ hash: txHash })),
     );
 
-    const hash = await writeableRollup.write.deposit([who, who, true]);
+    const hash = await writeableRollup.write.deposit([
+      who,
+      who,
+      registrationTuple.publicKeyInG1,
+      registrationTuple.publicKeyInG2,
+      registrationTuple.proofOfPossession,
+      true,
+    ]);
     await publicClient.waitForTransactionReceipt({ hash });
     log(`Added in tx ${hash}`);
   } else if (command === 'flush') {

package/src/cmds/l1/advance_epoch.ts

@@ -1,12 +1,12 @@
 import { createPXEClient, makeFetch } from '@aztec/aztec.js';
-import { CheatCodes } from '@aztec/aztec.js/testing';
+import { RollupCheatCodes } from '@aztec/ethereum/test';
 import type { LogFn } from '@aztec/foundation/log';
 
 export async function advanceEpoch(l1RpcUrls: string[], rpcUrl: string, log: LogFn) {
   const pxe = createPXEClient(rpcUrl, {}, makeFetch([], true));
   const rollupAddress = await pxe.getNodeInfo().then(i => i.l1ContractAddresses.rollupAddress);
 
-  const cheat = CheatCodes.createRollup(l1RpcUrls, { rollupAddress });
+  const cheat = RollupCheatCodes.create(l1RpcUrls, { rollupAddress });
 
   await cheat.advanceToNextEpoch();
   log(`Warped time to advance to next epoch`);

package/src/cmds/l1/assume_proven_through.ts

@@ -1,5 +1,5 @@
 import { createPXEClient, makeFetch } from '@aztec/aztec.js';
-import { EthCheatCodes, RollupCheatCodes } from '@aztec/aztec.js/testing';
+import { RollupCheatCodes } from '@aztec/ethereum/test';
 import type { LogFn } from '@aztec/foundation/log';
 
 export async function assumeProvenThrough(
@@ -12,8 +12,7 @@ export async function assumeProvenThrough(
   const rollupAddress = await pxe.getNodeInfo().then(i => i.l1ContractAddresses.rollupAddress);
   const blockNumber = blockNumberOrLatest ?? (await pxe.getBlockNumber());
 
-  const ethCheatCode = new EthCheatCodes(l1RpcUrls);
-  const rollupCheatCodes = new RollupCheatCodes(ethCheatCode, { rollupAddress });
+  const rollupCheatCodes = RollupCheatCodes.create(l1RpcUrls, { rollupAddress });
 
   await rollupCheatCodes.markAsProven(blockNumber);
   log(`Assumed proven through block ${blockNumber}`);

package/src/cmds/l1/deploy_l1_contracts.ts

@@ -1,6 +1,7 @@
 import { getInitialTestAccounts } from '@aztec/accounts/testing';
-import type { EthAddress } from '@aztec/aztec.js';
-import { type Operator, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { type EthAddress, Fr } from '@aztec/aztec.js';
+import { getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { SecretValue } from '@aztec/foundation/config';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { getGenesisValues } from '@aztec/world-state/testing';
 
@@ -33,7 +34,8 @@ export async function deployL1Contracts(
   const initialValidatorOperators = initialValidators.map(a => ({
     attester: a,
     withdrawer: a,
-  })) as Operator[];
+    bn254SecretKey: new SecretValue(Fr.random().toBigInt()),
+  }));
 
   const { l1ContractAddresses } = await deployAztecContracts(
     rpcUrls,
@@ -54,7 +56,7 @@ export async function deployL1Contracts(
   if (json) {
     log(
       JSON.stringify(
-        Object.fromEntries(Object.entries(l1ContractAddresses).map(([k, v]) => [k, v.toString()])),
+        Object.fromEntries(Object.entries(l1ContractAddresses).map(([k, v]) => [k, v?.toString() ?? 'Not deployed'])),
         null,
         2,
       ),

package/src/cmds/l1/index.ts

@@ -293,6 +293,11 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     )
     .addOption(l1ChainIdOption)
     .option('--attester <address>', 'ethereum address of the attester', parseEthereumAddress)
+    .option(
+      '--bls-secret-key <string>',
+      'The BN254 scalar field element used as a secret key for BLS signatures. Will be associated with the attester address.',
+      parseBigint,
+    )
     .option('--staking-asset-handler <address>', 'ethereum address of the staking asset handler', parseEthereumAddress)
     .option('--proof <buffer>', 'The proof to use for the attestation', arg =>
       Buffer.from(withoutHexPrefix(arg), 'hex'),
@@ -313,6 +318,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
         stakingAssetHandlerAddress: options.stakingAssetHandler,
         merkleProof: options.merkleProof,
         proofParams: options.proof,
+        blsSecretKey: options.blsSecretKey,
         log,
         debugLogger,
       });

package/src/cmds/l1/update_l1_validators.ts

@@ -1,5 +1,5 @@
 import {
-  EthCheatCodes,
+  GSEContract,
   L1TxUtils,
   RollupContract,
   createEthereumChain,
@@ -8,6 +8,7 @@ import {
   getPublicClient,
   isAnvilTestChain,
 } from '@aztec/ethereum';
+import { EthCheatCodes } from '@aztec/ethereum/test';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { RollupAbi, StakingAssetHandlerAbi } from '@aztec/l1-artifacts';
@@ -59,10 +60,16 @@ export async function addL1Validator({
   stakingAssetHandlerAddress,
   merkleProof,
   proofParams,
+  blsSecretKey,
   log,
   debugLogger,
 }: StakingAssetHandlerCommandArgs &
-  LoggerArgs & { attesterAddress: EthAddress; proofParams: Buffer; merkleProof: string[] }) {
+  LoggerArgs & {
+    blsSecretKey: bigint; // scalar field element of BN254
+    attesterAddress: EthAddress;
+    proofParams: Buffer;
+    merkleProof: string[];
+  }) {
   const dualLog = makeDualLog(log, debugLogger);
   const account = getAccount(privateKey, mnemonic);
   const chain = createEthereumChain(rpcUrls, chainId);
@@ -74,8 +81,20 @@ export async function addL1Validator({
     client: l1Client,
   });
 
-  const rollup = await stakingAssetHandler.read.getRollup();
-  dualLog(`Adding validator ${attesterAddress} to rollup ${rollup.toString()}`);
+  const rollupAddress = await stakingAssetHandler.read.getRollup();
+  dualLog(`Adding validator ${attesterAddress} to rollup ${rollupAddress.toString()}`);
+
+  const rollup = getContract({
+    address: rollupAddress,
+    abi: RollupAbi,
+    client: l1Client,
+  });
+
+  const gseAddress = await rollup.read.getGSE();
+
+  const gse = new GSEContract(l1Client, gseAddress);
+
+  const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
 
   const l1TxUtils = new L1TxUtils(l1Client, debugLogger);
   const proofParamsObj = ZkPassportProofParams.fromBuffer(proofParams);
@@ -86,7 +105,14 @@ export async function addL1Validator({
     data: encodeFunctionData({
       abi: StakingAssetHandlerAbi,
       functionName: 'addValidator',
-      args: [attesterAddress.toString(), merkleProofArray, proofParamsObj.toViem()],
+      args: [
+        attesterAddress.toString(),
+        merkleProofArray,
+        proofParamsObj.toViem(),
+        registrationTuple.publicKeyInG1,
+        registrationTuple.publicKeyInG2,
+        registrationTuple.proofOfPossession,
+      ],
     }),
     abi: StakingAssetHandlerAbi,
   });
@@ -181,7 +207,7 @@ export async function fastForwardEpochs({
   const timestamp = await rollup.read.getTimestampForSlot([currentSlot + l2SlotsInEpoch * numEpochs]);
   dualLog(`Fast forwarding ${numEpochs} epochs to ${timestamp}`);
   try {
-    await cheatCodes.warp(Number(timestamp));
+    await cheatCodes.warp(Number(timestamp), { resetBlockInterval: true });
     dualLog(`Fast forwarded ${numEpochs} epochs to ${timestamp}`);
   } catch (error) {
     if (error instanceof Error && error.message.includes("is lower than or equal to previous block's timestamp")) {

package/src/cmds/pxe/get_contract_data.ts

@@ -13,7 +13,7 @@ export async function getContractData(
   const {
     contractInstance: instance,
     isContractInitialized: isInitialized,
-    isContractPubliclyDeployed: isPubliclyDeployed,
+    isContractPublished: isPubliclyDeployed,
   } = await client.getContractMetadata(contractAddress);
   const contractClass =
     includeBytecode &&

package/src/cmds/pxe/get_node_info.ts

@@ -39,9 +39,9 @@ export async function getNodeInfo(
         stakingAssetHandler: info.l1ContractAddresses.stakingAssetHandlerAddress?.toString(),
       },
       protocolContractAddresses: {
-        classRegisterer: info.protocolContractAddresses.classRegisterer.toString(),
+        classRegistry: info.protocolContractAddresses.classRegistry.toString(),
         feeJuice: info.protocolContractAddresses.feeJuice.toString(),
-        instanceDeployer: info.protocolContractAddresses.instanceDeployer.toString(),
+        instanceRegistry: info.protocolContractAddresses.instanceRegistry.toString(),
         multiCallEntrypoint: info.protocolContractAddresses.multiCallEntrypoint.toString(),
       },
     });
@@ -66,9 +66,9 @@ export async function getNodeInfo(
     log(` FeeAssetHandler Address: ${info.l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
     log(` StakingAssetHandler Address: ${info.l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
     log(`L2 Contract Addresses:`);
-    log(` Class Registerer: ${info.protocolContractAddresses.classRegisterer.toString()}`);
+    log(` Class Registry: ${info.protocolContractAddresses.classRegistry.toString()}`);
     log(` Fee Juice: ${info.protocolContractAddresses.feeJuice.toString()}`);
-    log(` Instance Deployer: ${info.protocolContractAddresses.instanceDeployer.toString()}`);
+    log(` Instance Deployer: ${info.protocolContractAddresses.instanceRegistry.toString()}`);
     log(` MultiCall: ${info.protocolContractAddresses.multiCallEntrypoint.toString()}`);
   }
 }

package/src/cmds/pxe/get_pxe_info.ts

@@ -6,8 +6,8 @@ export async function getPXEInfo(rpcUrl: string, debugLogger: Logger, log: LogFn
   const info = await client.getPXEInfo();
   log(`PXE Version: ${info.pxeVersion}`);
   log(`Protocol Contract Addresses:`);
-  log(` Class Registerer: ${info.protocolContractAddresses.classRegisterer.toString()}`);
+  log(` Class Registry: ${info.protocolContractAddresses.classRegistry.toString()}`);
   log(` Fee Juice: ${info.protocolContractAddresses.feeJuice.toString()}`);
-  log(` Instance Deployer: ${info.protocolContractAddresses.instanceDeployer.toString()}`);
+  log(` Instance Deployer: ${info.protocolContractAddresses.instanceRegistry.toString()}`);
   log(` Multi Call Entrypoint: ${info.protocolContractAddresses.multiCallEntrypoint.toString()}`);
 }

package/src/utils/aztec.ts

@@ -12,7 +12,8 @@ import {
   type Operator,
   RollupContract,
 } from '@aztec/ethereum';
-import type { Fr } from '@aztec/foundation/fields';
+import { SecretValue } from '@aztec/foundation/config';
+import { Fr } from '@aztec/foundation/fields';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import type { NoirPackageConfig } from '@aztec/foundation/noir';
 import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
@@ -116,8 +117,17 @@ export async function deployNewRollupContracts(
 
   if (!initialValidators || initialValidators.length === 0) {
     // initialize the new rollup with Amin's validator address.
-    const amin = EthAddress.fromString('0x3b218d0F26d15B36C715cB06c949210a0d630637');
-    initialValidators = [{ attester: amin, withdrawer: amin }];
+    const aminAddressString = '0x3b218d0F26d15B36C715cB06c949210a0d630637';
+    const amin = EthAddress.fromString(aminAddressString);
+
+    initialValidators = [
+      {
+        attester: amin,
+        withdrawer: amin,
+        // No secrets here. The actual keys are not currently used.
+        bn254SecretKey: new SecretValue(Fr.fromHexString(aminAddressString).toBigInt()),
+      },
+    ];
     logger.info('Initializing new rollup with old attesters', { initialValidators });
   }
 

package/src/utils/inspect.ts

@@ -3,7 +3,7 @@ import type { LogFn } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { siloNullifier } from '@aztec/stdlib/hash';
 import type { PXE } from '@aztec/stdlib/interfaces/client';
-import { type ExtendedNote, NoteStatus } from '@aztec/stdlib/note';
+import type { ExtendedNote } from '@aztec/stdlib/note';
 import type { TxHash } from '@aztec/stdlib/tx';
 
 export async function inspectBlock(pxe: PXE, blockNumber: number, log: LogFn, opts: { showTxs?: boolean } = {}) {
@@ -40,11 +40,7 @@ export async function inspectTx(
   log: LogFn,
   opts: { includeBlockInfo?: boolean; artifactMap?: ArtifactMap } = {},
 ) {
-  const [receipt, effectsInBlock, getNotes] = await Promise.all([
-    pxe.getTxReceipt(txHash),
-    pxe.getTxEffect(txHash),
-    pxe.getNotes({ txHash, status: NoteStatus.ACTIVE_OR_NULLIFIED }),
-  ]);
+  const [receipt, effectsInBlock] = await Promise.all([pxe.getTxReceipt(txHash), pxe.getTxEffect(txHash)]);
   // Base tx data
   log(`Tx ${txHash.toString()}`);
   log(` Status: ${receipt.status} ${effectsInBlock ? `(${effectsInBlock.data.revertCode.getDescription()})` : ''}`);
@@ -88,12 +84,9 @@ export async function inspectTx(
   const notes = effects.noteHashes;
   if (notes.length > 0) {
     log(' Created notes:');
-    log(`  Total: ${notes.length}. Found: ${getNotes.length}.`);
-    if (getNotes.length) {
-      log('  Found notes:');
-      for (const note of getNotes) {
-        inspectNote(note, artifactMap, log);
-      }
+    log(`  Total: ${notes.length}`);
+    for (const note of notes) {
+      log(`  Note hash: ${note.toShortString()}`);
     }
   }
 
@@ -103,8 +96,10 @@ export async function inspectTx(
   if (nullifierCount > 0) {
     log(' Nullifiers:');
     for (const nullifier of effects.nullifiers) {
-      const [note] = await pxe.getNotes({ siloedNullifier: nullifier });
       const deployed = deployNullifiers[nullifier.toString()];
+      const note = deployed
+        ? (await pxe.getNotes({ siloedNullifier: nullifier, contractAddress: deployed }))[0]
+        : undefined;
       const initialized = initNullifiers[nullifier.toString()];
       const registered = classNullifiers[nullifier.toString()];
       if (nullifier.toBuffer().equals(txHash.toBuffer())) {
@@ -160,8 +155,8 @@ function toFriendlyAddress(address: AztecAddress, artifactMap: ArtifactMap) {
 
 async function getKnownNullifiers(pxe: PXE, artifactMap: ArtifactMap) {
   const knownContracts = await pxe.getContracts();
-  const deployerAddress = ProtocolContractAddress.ContractInstanceDeployer;
-  const registererAddress = ProtocolContractAddress.ContractClassRegisterer;
+  const deployerAddress = ProtocolContractAddress.ContractInstanceRegistry;
+  const classRegistryAddress = ProtocolContractAddress.ContractClassRegistry;
   const initNullifiers: Record<string, AztecAddress> = {};
   const deployNullifiers: Record<string, AztecAddress> = {};
   const classNullifiers: Record<string, string> = {};
@@ -170,7 +165,7 @@ async function getKnownNullifiers(pxe: PXE, artifactMap: ArtifactMap) {
     deployNullifiers[(await siloNullifier(deployerAddress, contract.toField())).toString()] = contract;
   }
   for (const artifact of Object.values(artifactMap)) {
-    classNullifiers[(await siloNullifier(registererAddress, artifact.classId)).toString()] =
+    classNullifiers[(await siloNullifier(classRegistryAddress, artifact.classId)).toString()] =
       `${artifact.name}Class<${artifact.classId}>`;
   }
   return { initNullifiers, deployNullifiers, classNullifiers };

package/src/utils/setup_contracts.ts

@@ -1,11 +1,12 @@
 import {
+  AztecAddress,
   DefaultWaitOpts,
   Fr,
   type PXE,
   SignerlessWallet,
   SponsoredFeePaymentMethod,
   type WaitForProvenOpts,
-  getContractInstanceFromDeployParams,
+  getContractInstanceFromInstantiationParams,
   waitForProven,
 } from '@aztec/aztec.js';
 import { SPONSORED_FPC_SALT } from '@aztec/constants';
@@ -21,7 +22,7 @@ async function getSponsoredFPCContract() {
 
 export async function getSponsoredFPCAddress() {
   const SponsoredFPCContract = await getSponsoredFPCContract();
-  const sponsoredFPCInstance = await getContractInstanceFromDeployParams(SponsoredFPCContract.artifact, {
+  const sponsoredFPCInstance = await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
     salt: new Fr(SPONSORED_FPC_SALT),
   });
   return sponsoredFPCInstance.address;
@@ -41,6 +42,7 @@ export async function setupSponsoredFPC(
   const deployer = new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(chainId, rollupVersion));
 
   const deployTx = SponsoredFPCContract.deploy(deployer).send({
+    from: AztecAddress.ZERO,
     contractAddressSalt: new Fr(SPONSORED_FPC_SALT),
     universalDeploy: true,
     fee: { paymentMethod },