@aztec/cli 0.81.0 → 0.82.0

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":"AAqBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAiB3D,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,iBA4EjB"}
+{"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,iBA4EjB"}

package/dest/cmds/devnet/bootstrap_network.js

@@ -1,11 +1,13 @@
 import { getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
-import { BatchCall, Fr, L1FeeJuicePortalManager, createCompatibleClient, retryUntil } from '@aztec/aztec.js';
-import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
+import { BatchCall, Fr, L1FeeJuicePortalManager, createCompatibleClient, retryUntil, waitForProven } from '@aztec/aztec.js';
 import { createEthereumChain, createL1Clients, deployL1Contract } from '@aztec/ethereum';
 import { getContract } from 'viem';
 import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 const waitOpts = {
     timeout: 120,
+    interval: 1
+};
+const provenWaitOpts = {
     provenTimeout: 4800,
     interval: 1
 };
@@ -22,7 +24,7 @@ export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey,
     const fpcAdmin = wallet.getAddress();
     const fpc = await deployFPC(wallet, token.address, fpcAdmin);
     const counter = await deployCounter(wallet);
-    await fundFPC(counter.address, wallet, l1Clients, fpc.address, debugLog);
+    await fundFPC(pxe, counter.address, wallet, l1Clients, fpc.address, debugLog);
     if (json) {
         log(JSON.stringify({
             devCoinL1: erc20Address.toString(),
@@ -168,7 +170,7 @@ async function deployCounter(wallet) {
     return info;
 }
 // NOTE: Disabling for now in order to get devnet running
-async function fundFPC(counterAddress, wallet, l1Clients, fpcAddress, debugLog) {
+async function fundFPC(pxe, counterAddress, wallet, l1Clients, 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');
@@ -178,9 +180,8 @@ async function fundFPC(counterAddress, wallet, l1Clients, fpcAddress, debugLog)
     const { protocolContractAddresses: { feeJuice } } = await wallet.getPXEInfo();
     const feeJuiceContract = await FeeJuiceContract.at(feeJuice, wallet);
     const feeJuicePortal = await L1FeeJuicePortalManager.new(wallet, l1Clients.publicClient, l1Clients.walletClient, debugLog);
-    const amount = FEE_FUNDING_FOR_TESTER_ACCOUNT;
-    const { claimAmount, claimSecret, messageLeafIndex, messageHash } = await feeJuicePortal.bridgeTokensPublic(fpcAddress, amount, true);
-    await retryUntil(async ()=>await wallet.isL1ToL2MessageSynced(Fr.fromHexString(messageHash)), 'message sync', 600, 1);
+    const { claimAmount, claimSecret, messageLeafIndex, messageHash } = await feeJuicePortal.bridgeTokensPublic(fpcAddress, undefined, true);
+    await retryUntil(async ()=>await pxe.isL1ToL2MessageSynced(Fr.fromHexString(messageHash)), 'message sync', 600, 1);
     const counter = await CounterContract.at(counterAddress, wallet);
     debugLog.info('Incrementing Counter');
     // TODO (alexg) remove this once sequencer builds blocks continuously
@@ -188,9 +189,9 @@ async function fundFPC(counterAddress, wallet, l1Clients, fpcAddress, debugLog)
     await counter.methods.increment(wallet.getAddress(), wallet.getAddress()).send().wait(waitOpts);
     await counter.methods.increment(wallet.getAddress(), wallet.getAddress()).send().wait(waitOpts);
     debugLog.info('Claiming FPC');
-    await feeJuiceContract.methods.claim(fpcAddress, claimAmount, claimSecret, messageLeafIndex).send().wait({
-        ...waitOpts,
-        proven: true
+    const receipt = await feeJuiceContract.methods.claim(fpcAddress, claimAmount, claimSecret, messageLeafIndex).send().wait({
+        ...waitOpts
     });
+    await waitForProven(pxe, receipt, provenWaitOpts);
     debugLog.info('Finished claiming FPC');
 }

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,CAAC;IAChD,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,iBAoFA"}
+{"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,CAAC;IAChD,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,iBAgFA"}

package/dest/cmds/infrastructure/sequencers.js

@@ -1,5 +1,5 @@
 import { createCompatibleClient } from '@aztec/aztec.js';
-import { createEthereumChain, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { 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';
@@ -17,11 +17,7 @@ export async function sequencers(opts) {
         chain: chain.chainInfo,
         transport: fallback(l1RpcUrls.map((url)=>http(url)))
     }) : undefined;
-    const rollup = getContract({
-        address: l1ContractAddresses.rollupAddress.toString(),
-        abi: RollupAbi,
-        client: publicClient
-    });
+    const rollup = new RollupContract(publicClient, l1ContractAddresses.rollupAddress);
     const writeableRollup = walletClient ? getContract({
         address: l1ContractAddresses.rollupAddress.toString(),
         abi: RollupAbi,
@@ -29,7 +25,7 @@ export async function sequencers(opts) {
     }) : undefined;
     const who = maybeWho ?? walletClient?.account.address.toString();
     if (command === 'list') {
-        const sequencers = await rollup.read.getAttesters();
+        const sequencers = await rollup.getAttesters();
         if (sequencers.length === 0) {
             log(`No sequencers registered on rollup`);
         } else {
@@ -44,7 +40,7 @@ export async function sequencers(opts) {
         }
         log(`Adding ${who} as sequencer`);
         const stakingAsset = getContract({
-            address: await rollup.read.getStakingAsset(),
+            address: await rollup.getStakingAsset(),
             abi: TestERC20Abi,
             client: walletClient
         });
@@ -85,7 +81,7 @@ export async function sequencers(opts) {
         });
         log(`Removed in tx ${hash}`);
     } else if (command === 'who-next') {
-        const next = await rollup.read.getCurrentProposer();
+        const next = await rollup.getCurrentProposer();
         log(`Sequencer expected to build is ${next}`);
     } else {
         throw new Error(`Unknown command ${command}`);

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

@@ -1 +1 @@
-{"version":3,"file":"setup_l2_contract.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/setup_l2_contract.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAKnD,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,aAAa,EAAE,OAAO,EACtB,GAAG,EAAE,KAAK,iBAiCX"}
+{"version":3,"file":"setup_l2_contract.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/setup_l2_contract.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAKnD,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,aAAa,EAAE,OAAO,EACtB,GAAG,EAAE,KAAK,iBAsCX"}

package/dest/cmds/infrastructure/setup_l2_contract.js

@@ -1,16 +1,20 @@
 import { deployFundedSchnorrAccounts, getInitialTestAccounts } from '@aztec/accounts/testing';
-import { SignerlessWallet, createPXEClient, makeFetch } from '@aztec/aztec.js';
+import { createPXEClient, makeFetch } from '@aztec/aztec.js';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { setupCanonicalL2FeeJuice } from '../misc/setup_contracts.js';
 export async function setupL2Contracts(rpcUrl, testAccounts, json, skipProofWait, log) {
     const waitOpts = {
         timeout: 180,
-        interval: 1,
-        proven: !skipProofWait,
-        provenTimeout: 600
+        interval: 1
     };
+    const waitForProvenOptions = !skipProofWait ? {
+        provenTimeout: 600
+    } : undefined;
     log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
+    if (waitForProvenOptions) {
+        log('setupL2Contracts: Wait for proven options' + jsonStringify(waitForProvenOptions));
+    }
     log('setupL2Contracts: Creating PXE client...');
     const pxe = createPXEClient(rpcUrl, {}, makeFetch([
         1,
@@ -19,12 +23,11 @@ export async function setupL2Contracts(rpcUrl, testAccounts, json, skipProofWait
         1,
         1
     ], false));
-    const wallet = new SignerlessWallet(pxe);
     log('setupL2Contracts: Getting fee juice portal address...');
     // Deploy Fee Juice
-    const feeJuicePortalAddress = (await wallet.getNodeInfo()).l1ContractAddresses.feeJuicePortalAddress;
+    const feeJuicePortalAddress = (await pxe.getNodeInfo()).l1ContractAddresses.feeJuicePortalAddress;
     log('setupL2Contracts: Setting up fee juice portal...');
-    await setupCanonicalL2FeeJuice(wallet, feeJuicePortalAddress, waitOpts, log);
+    await setupCanonicalL2FeeJuice(pxe, feeJuicePortalAddress, log, waitOpts, waitForProvenOptions);
     let deployedAccounts = [];
     if (testAccounts) {
         log('setupL2Contracts: Deploying test accounts...');

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

@@ -1,4 +1,4 @@
 import { type AztecAddress, type EthAddress } from '@aztec/aztec.js';
 import type { LogFn, Logger } from '@aztec/foundation/log';
-export declare function bridgeERC20(amount: bigint, recipient: AztecAddress, l1RpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, tokenAddress: EthAddress, portalAddress: EthAddress, privateTransfer: boolean, mint: boolean, json: boolean, log: LogFn, debugLogger: Logger): Promise<void>;
+export declare function bridgeERC20(amount: bigint, recipient: AztecAddress, l1RpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, tokenAddress: EthAddress, handlerAddress: EthAddress | undefined, portalAddress: EthAddress, privateTransfer: boolean, mint: boolean, json: boolean, log: LogFn, debugLogger: Logger): Promise<void>;
 //# sourceMappingURL=bridge_erc20.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"bridge_erc20.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/bridge_erc20.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,UAAU,EAAqC,MAAM,iBAAiB,CAAC;AAExG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY,EACvB,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,UAAU,EACxB,aAAa,EAAE,UAAU,EACzB,eAAe,EAAE,OAAO,EACxB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBAgCpB"}
+{"version":3,"file":"bridge_erc20.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/bridge_erc20.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,UAAU,EAAqC,MAAM,iBAAiB,CAAC;AAExG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY,EACvB,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,UAAU,EACxB,cAAc,EAAE,UAAU,GAAG,SAAS,EACtC,aAAa,EAAE,UAAU,EACzB,eAAe,EAAE,OAAO,EACxB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBAuCpB"}

package/dest/cmds/l1/bridge_erc20.js

@@ -1,12 +1,12 @@
 import { L1ToL2TokenPortalManager } from '@aztec/aztec.js';
 import { createEthereumChain, createL1Clients } from '@aztec/ethereum';
 import { prettyPrintJSON } from '../../utils/commands.js';
-export async function bridgeERC20(amount, recipient, l1RpcUrls, chainId, privateKey, mnemonic, tokenAddress, portalAddress, privateTransfer, mint, json, log, debugLogger) {
+export async function bridgeERC20(amount, recipient, l1RpcUrls, chainId, privateKey, mnemonic, tokenAddress, handlerAddress, portalAddress, privateTransfer, mint, json, log, debugLogger) {
     // Prepare L1 client
     const chain = createEthereumChain(l1RpcUrls, chainId);
     const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
     // Setup portal manager
-    const manager = new L1ToL2TokenPortalManager(portalAddress, tokenAddress, publicClient, walletClient, debugLogger);
+    const manager = new L1ToL2TokenPortalManager(portalAddress, tokenAddress, handlerAddress, publicClient, walletClient, debugLogger);
     let claimSecret;
     let messageHash;
     if (privateTransfer) {

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":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAK3D,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,0BAA0B,EAAE,OAAO,EACnC,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA4CpB"}
+{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAK3D,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,0BAA0B,EAAE,OAAO,EACnC,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA6CpB"}

package/dest/cmds/l1/deploy_l1_contracts.js

@@ -25,5 +25,6 @@ export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic,
         log(`GovernanceProposer Address: ${l1ContractAddresses.governanceProposerAddress.toString()}`);
         log(`Governance Address: ${l1ContractAddresses.governanceAddress.toString()}`);
         log(`SlashFactory Address: ${l1ContractAddresses.slashFactoryAddress?.toString()}`);
+        log(`FeeAssetHandler Address: ${l1ContractAddresses.feeAssetHandlerAddress?.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;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAsBjD,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAohB/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;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAsBjD,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAshB/E"}

package/dest/cmds/l1/index.js

@@ -164,9 +164,9 @@ export function injectCommands(program, log, debugLogger) {
             await deployUltraHonkVerifier(options.rollupAddress?.toString(), options.l1RpcUrls, options.l1ChainId, options.l1PrivateKey, options.mnemonic, options.rpcUrl, options.bb, options.bbWorkingDir, log, debugLogger);
         }
     });
-    program.command('bridge-erc20').description('Bridges ERC20 tokens to L2.').argument('<amount>', 'The amount of Fee Juice to mint and bridge.', parseBigint).argument('<recipient>', 'Aztec address of the recipient.', parseAztecAddress).addOption(l1RpcUrlsOption).option('-m, --mnemonic <string>', 'The mnemonic to use for deriving the Ethereum address that will mint and bridge', 'test test test test test test test test test test test junk').option('--mint', 'Mint the tokens on L1', false).option('--private', 'If the bridge should use the private flow', false).addOption(l1ChainIdOption).requiredOption('-t, --token <string>', 'The address of the token to bridge', parseEthereumAddress).requiredOption('-p, --portal <string>', 'The address of the portal contract', parseEthereumAddress).option('--l1-private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--json', 'Output the claim in JSON format').action(async (amount, recipient, options)=>{
+    program.command('bridge-erc20').description('Bridges ERC20 tokens to L2.').argument('<amount>', 'The amount of Fee Juice to mint and bridge.', parseBigint).argument('<recipient>', 'Aztec address of the recipient.', parseAztecAddress).addOption(l1RpcUrlsOption).option('-m, --mnemonic <string>', 'The mnemonic to use for deriving the Ethereum address that will mint and bridge', 'test test test test test test test test test test test junk').option('--mint', 'Mint the tokens on L1', false).option('--private', 'If the bridge should use the private flow', false).addOption(l1ChainIdOption).requiredOption('-t, --token <string>', 'The address of the token to bridge', parseEthereumAddress).requiredOption('-p, --portal <string>', 'The address of the portal contract', parseEthereumAddress).option('-f, --faucet <string>', 'The address of the faucet contract (only used if minting)', parseEthereumAddress).option('--l1-private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--json', 'Output the claim in JSON format').action(async (amount, recipient, options)=>{
         const { bridgeERC20 } = await import('./bridge_erc20.js');
-        await bridgeERC20(amount, recipient, options.l1RpcUrls, options.l1ChainId, options.l1PrivateKey, options.mnemonic, options.token, options.portal, options.private, options.mint, options.json, log, debugLogger);
+        await bridgeERC20(amount, recipient, options.l1RpcUrls, options.l1ChainId, options.l1PrivateKey, options.mnemonic, options.token, options.faucet, options.portal, options.private, options.mint, options.json, log, debugLogger);
     });
     program.command('create-l1-account').option('--json', 'Output the account in JSON format').action(async (options)=>{
         const { createL1Account } = await import('./create_l1_account.js');

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":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,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,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,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,gBAAgB,EAAE,UAAU,CAAA;CAAE,iBA+CnE;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,iBAcnE;AAED,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,iBAchC;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,iBA4BzG"}
+{"version":3,"file":"update_l1_validators.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/update_l1_validators.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,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,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,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,gBAAgB,EAAE,UAAU,CAAA;CAAE,iBA+CnE;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,iBAcnE;AAED,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,iBAchC;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,4 @@
-import { EthCheatCodes, createEthereumChain, getExpectedAddress, getL1ContractsConfigEnvVars, isAnvilTestChain } from '@aztec/ethereum';
+import { EthCheatCodes, RollupContract, createEthereumChain, getExpectedAddress, getL1ContractsConfigEnvVars, isAnvilTestChain } from '@aztec/ethereum';
 import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 import { createPublicClient, createWalletClient, fallback, getContract, http } from 'viem';
 import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
@@ -132,31 +132,25 @@ export async function fastForwardEpochs({ rpcUrls, chainId, rollupAddress, numEp
 export async function debugRollup({ rpcUrls, chainId, rollupAddress, log }) {
     const config = getL1ContractsConfigEnvVars();
     const publicClient = getPublicClient(rpcUrls, chainId);
-    const rollup = getContract({
-        address: rollupAddress.toString(),
-        abi: RollupAbi,
-        client: publicClient
-    });
-    const pendingNum = await rollup.read.getPendingBlockNumber();
+    const rollup = new RollupContract(publicClient, rollupAddress);
+    const pendingNum = await rollup.getBlockNumber();
     log(`Pending block num: ${pendingNum}`);
-    const provenNum = await rollup.read.getProvenBlockNumber();
+    const provenNum = await rollup.getProvenBlockNumber();
     log(`Proven block num: ${provenNum}`);
-    const validators = await rollup.read.getAttesters();
+    const validators = await rollup.getAttesters();
     log(`Validators: ${validators.map((v)=>v.toString()).join(', ')}`);
-    const committee = await rollup.read.getCurrentEpochCommittee();
+    const committee = await rollup.getCurrentEpochCommittee();
     log(`Committee: ${committee.map((v)=>v.toString()).join(', ')}`);
-    const archive = await rollup.read.archive();
+    const archive = await rollup.archive();
     log(`Archive: ${archive}`);
-    const epochNum = await rollup.read.getCurrentEpoch();
+    const epochNum = await rollup.getEpochNumber();
     log(`Current epoch: ${epochNum}`);
-    const slot = await rollup.read.getCurrentSlot();
+    const slot = await rollup.getSlotNumber();
     log(`Current slot: ${slot}`);
-    const proposerDuringPrevL1Block = await rollup.read.getCurrentProposer();
+    const proposerDuringPrevL1Block = await rollup.getCurrentProposer();
     log(`Proposer during previous L1 block: ${proposerDuringPrevL1Block}`);
     const nextBlockTS = BigInt((await publicClient.getBlock()).timestamp + BigInt(config.ethereumSlotDuration));
-    const proposer = await rollup.read.getProposerAt([
-        nextBlockTS
-    ]);
+    const proposer = await rollup.getProposerAt(nextBlockTS);
     log(`Proposer NOW: ${proposer.toString()}`);
 }
 function makeDualLog(log, debugLogger) {

package/dest/cmds/misc/setup_contracts.d.ts

@@ -1,7 +1,7 @@
-import { type EthAddress, type Wallet } from '@aztec/aztec.js';
+import { type EthAddress, type PXE, type WaitForProvenOpts } from '@aztec/aztec.js';
 import type { LogFn } from '@aztec/foundation/log';
 /**
  * Deploys the contract to pay for gas on L2.
  */
-export declare function setupCanonicalL2FeeJuice(deployer: Wallet, feeJuicePortalAddress: EthAddress, waitOpts: import("@aztec/aztec.js").WaitOpts | undefined, log: LogFn): Promise<void>;
+export declare function setupCanonicalL2FeeJuice(pxe: PXE, feeJuicePortalAddress: EthAddress, log: LogFn, waitOpts?: import("@aztec/aztec.js").WaitOpts, waitForProvenOptions?: WaitForProvenOpts): Promise<void>;
 //# sourceMappingURL=setup_contracts.d.ts.map

package/dest/cmds/misc/setup_contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/setup_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,UAAU,EAAyB,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEvG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,MAAM,EAChB,qBAAqB,EAAE,UAAU,EACjC,QAAQ,gDAAkB,EAC1B,GAAG,EAAE,KAAK,iBA0BX"}
+{"version":3,"file":"setup_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/setup_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,UAAU,EAEf,KAAK,GAAG,EAER,KAAK,iBAAiB,EAEvB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,qBAAqB,EAAE,UAAU,EACjC,GAAG,EAAE,KAAK,EACV,QAAQ,qCAAkB,EAC1B,oBAAoB,CAAC,EAAE,iBAAiB,iBA+BzC"}

package/dest/cmds/misc/setup_contracts.js

@@ -1,19 +1,20 @@
-import { DefaultWaitOpts, FeeJuicePaymentMethod } from '@aztec/aztec.js';
+import { DefaultWaitOpts, FeeJuicePaymentMethod, SignerlessWallet, waitForProven } from '@aztec/aztec.js';
 import { FEE_JUICE_INITIAL_MINT } from '@aztec/constants';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { Gas } from '@aztec/stdlib/gas';
 /**
  * Deploys the contract to pay for gas on L2.
- */ export async function setupCanonicalL2FeeJuice(deployer, feeJuicePortalAddress, waitOpts = DefaultWaitOpts, log) {
+ */ export async function setupCanonicalL2FeeJuice(pxe, feeJuicePortalAddress, log, waitOpts = DefaultWaitOpts, waitForProvenOptions) {
     // 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');
+    const deployer = new SignerlessWallet(pxe);
     const feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, deployer);
-    const portalAddress = await deployer.getPublicStorageAt(feeJuiceContract.address, feeJuiceContract.artifact.storageLayout.portal_address.slot);
+    const portalAddress = await pxe.getPublicStorageAt(feeJuiceContract.address, feeJuiceContract.artifact.storageLayout.portal_address.slot);
     if (portalAddress.isZero()) {
         log('setupCanonicalL2FeeJuice: Calling initialize on fee juice contract...');
         const paymentMethod = new FeeJuicePaymentMethod(ProtocolContractAddress.FeeJuice);
-        await feeJuiceContract.methods.initialize(feeJuicePortalAddress, FEE_JUICE_INITIAL_MINT).send({
+        const receipt = await feeJuiceContract.methods.initialize(feeJuicePortalAddress, FEE_JUICE_INITIAL_MINT).send({
             fee: {
                 paymentMethod,
                 gasSettings: {
@@ -21,6 +22,9 @@ import { Gas } from '@aztec/stdlib/gas';
                 }
             }
         }).wait(waitOpts);
+        if (waitForProvenOptions !== undefined) {
+            await waitForProven(pxe, receipt, waitForProvenOptions);
+        }
     } else {
         log('setupCanonicalL2FeeJuice: Fee juice contract already initialized. Fee Juice Portal address: ' + portalAddress.toString());
     }

package/dest/cmds/pxe/get_node_info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get_node_info.d.ts","sourceRoot":"","sources":["../../../src/cmds/pxe/get_node_info.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,OAAO,EACnB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,iBA6D/B"}
+{"version":3,"file":"get_node_info.d.ts","sourceRoot":"","sources":["../../../src/cmds/pxe/get_node_info.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,OAAO,EACnB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,iBA8D/B"}

package/dest/cmds/pxe/get_node_info.js

@@ -25,7 +25,8 @@ export async function getNodeInfo(rpcUrl, pxeRequest, debugLogger, json, log, lo
                 rewardDistributor: info.l1ContractAddresses.rewardDistributorAddress.toString(),
                 governanceProposer: info.l1ContractAddresses.governanceProposerAddress.toString(),
                 governance: info.l1ContractAddresses.governanceAddress.toString(),
-                slashFactory: info.l1ContractAddresses.slashFactoryAddress?.toString()
+                slashFactory: info.l1ContractAddresses.slashFactoryAddress?.toString(),
+                feeAssetHandler: info.l1ContractAddresses.feeAssetHandlerAddress?.toString()
             },
             protocolContractAddresses: {
                 classRegisterer: info.protocolContractAddresses.classRegisterer.toString(),
@@ -52,6 +53,7 @@ export async function getNodeInfo(rpcUrl, pxeRequest, debugLogger, json, log, lo
         log(` GovernanceProposer Address: ${info.l1ContractAddresses.governanceProposerAddress.toString()}`);
         log(` Governance Address: ${info.l1ContractAddresses.governanceAddress.toString()}`);
         log(` SlashFactory Address: ${info.l1ContractAddresses.slashFactoryAddress?.toString()}`);
+        log(` FeeAssetHandler Address: ${info.l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
         log(`L2 Contract Addresses:`);
         log(` Class Registerer: ${info.protocolContractAddresses.classRegisterer.toString()}`);
         log(` Fee Juice: ${info.protocolContractAddresses.feeJuice.toString()}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "0.81.0",
+  "version": "0.82.0",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -67,14 +67,14 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.81.0",
-    "@aztec/aztec.js": "0.81.0",
-    "@aztec/constants": "0.81.0",
-    "@aztec/foundation": "0.81.0",
-    "@aztec/l1-artifacts": "0.81.0",
-    "@aztec/p2p": "0.81.0",
-    "@aztec/stdlib": "0.81.0",
-    "@aztec/world-state": "0.81.0",
+    "@aztec/archiver": "0.82.0",
+    "@aztec/aztec.js": "0.82.0",
+    "@aztec/constants": "0.82.0",
+    "@aztec/foundation": "0.82.0",
+    "@aztec/l1-artifacts": "0.82.0",
+    "@aztec/p2p": "0.82.0",
+    "@aztec/stdlib": "0.82.0",
+    "@aztec/world-state": "0.82.0",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
     "commander": "^12.1.0",
@@ -86,9 +86,9 @@
     "viem": "2.23.7"
   },
   "devDependencies": {
-    "@aztec/accounts": "0.81.0",
-    "@aztec/ethereum": "0.81.0",
-    "@aztec/protocol-contracts": "0.81.0",
+    "@aztec/accounts": "0.82.0",
+    "@aztec/ethereum": "0.82.0",
+    "@aztec/protocol-contracts": "0.82.0",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/lodash.chunk": "^4.2.9",
@@ -104,14 +104,14 @@
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "@aztec/accounts": "0.81.0",
-    "@aztec/bb-prover": "0.81.0",
-    "@aztec/ethereum": "0.81.0",
-    "@aztec/l1-artifacts": "0.81.0",
-    "@aztec/noir-contracts.js": "0.81.0",
-    "@aztec/noir-protocol-circuits-types": "0.81.0",
-    "@aztec/protocol-contracts": "0.81.0",
-    "@aztec/stdlib": "0.81.0"
+    "@aztec/accounts": "0.82.0",
+    "@aztec/bb-prover": "0.82.0",
+    "@aztec/ethereum": "0.82.0",
+    "@aztec/l1-artifacts": "0.82.0",
+    "@aztec/noir-contracts.js": "0.82.0",
+    "@aztec/noir-protocol-circuits-types": "0.82.0",
+    "@aztec/protocol-contracts": "0.82.0",
+    "@aztec/stdlib": "0.82.0"
   },
   "files": [
     "dest",

package/src/cmds/devnet/bootstrap_network.ts

@@ -6,12 +6,13 @@ import {
   Fr,
   L1FeeJuicePortalManager,
   type PXE,
+  type WaitForProvenOpts,
   type WaitOpts,
   type Wallet,
   createCompatibleClient,
   retryUntil,
+  waitForProven,
 } from '@aztec/aztec.js';
-import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
 import {
   type ContractArtifacts,
   type L1Clients,
@@ -32,6 +33,10 @@ type ContractDeploymentInfo = {
 
 const waitOpts: WaitOpts = {
   timeout: 120,
+  interval: 1,
+};
+
+const provenWaitOpts: WaitForProvenOpts = {
   provenTimeout: 4800,
   interval: 1,
 };
@@ -72,7 +77,7 @@ export async function bootstrapNetwork(
 
   const counter = await deployCounter(wallet);
 
-  await fundFPC(counter.address, wallet, l1Clients, fpc.address, debugLog);
+  await fundFPC(pxe, counter.address, wallet, l1Clients, fpc.address, debugLog);
 
   if (json) {
     log(
@@ -259,6 +264,7 @@ async function deployCounter(wallet: Wallet): Promise<ContractDeploymentInfo> {
 
 // NOTE: Disabling for now in order to get devnet running
 async function fundFPC(
+  pxe: PXE,
   counterAddress: AztecAddress,
   wallet: Wallet,
   l1Clients: L1Clients,
@@ -284,19 +290,13 @@ async function fundFPC(
     debugLog,
   );
 
-  const amount = FEE_FUNDING_FOR_TESTER_ACCOUNT;
   const { claimAmount, claimSecret, messageLeafIndex, messageHash } = await feeJuicePortal.bridgeTokensPublic(
     fpcAddress,
-    amount,
+    undefined,
     true,
   );
 
-  await retryUntil(
-    async () => await wallet.isL1ToL2MessageSynced(Fr.fromHexString(messageHash)),
-    'message sync',
-    600,
-    1,
-  );
+  await retryUntil(async () => await pxe.isL1ToL2MessageSynced(Fr.fromHexString(messageHash)), 'message sync', 600, 1);
 
   const counter = await CounterContract.at(counterAddress, wallet);
 
@@ -309,10 +309,12 @@ async function fundFPC(
 
   debugLog.info('Claiming FPC');
 
-  await feeJuiceContract.methods
+  const receipt = await feeJuiceContract.methods
     .claim(fpcAddress, claimAmount, claimSecret, messageLeafIndex)
     .send()
-    .wait({ ...waitOpts, proven: true });
+    .wait({ ...waitOpts });
+
+  await waitForProven(pxe, receipt, provenWaitOpts);
 
   debugLog.info('Finished claiming FPC');
 }

package/src/cmds/infrastructure/sequencers.ts

@@ -1,5 +1,5 @@
 import { createCompatibleClient } from '@aztec/aztec.js';
-import { createEthereumChain, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { RollupContract, createEthereumChain, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 
@@ -35,11 +35,7 @@ export async function sequencers(opts: {
       })
     : undefined;
 
-  const rollup = getContract({
-    address: l1ContractAddresses.rollupAddress.toString(),
-    abi: RollupAbi,
-    client: publicClient,
-  });
+  const rollup = new RollupContract(publicClient, l1ContractAddresses.rollupAddress);
 
   const writeableRollup = walletClient
     ? getContract({
@@ -52,7 +48,7 @@ export async function sequencers(opts: {
   const who = (maybeWho as `0x{string}`) ?? walletClient?.account.address.toString();
 
   if (command === 'list') {
-    const sequencers = await rollup.read.getAttesters();
+    const sequencers = await rollup.getAttesters();
     if (sequencers.length === 0) {
       log(`No sequencers registered on rollup`);
     } else {
@@ -69,7 +65,7 @@ export async function sequencers(opts: {
     log(`Adding ${who} as sequencer`);
 
     const stakingAsset = getContract({
-      address: await rollup.read.getStakingAsset(),
+      address: await rollup.getStakingAsset(),
       abi: TestERC20Abi,
       client: walletClient,
     });
@@ -95,7 +91,7 @@ export async function sequencers(opts: {
     await publicClient.waitForTransactionReceipt({ hash });
     log(`Removed in tx ${hash}`);
   } else if (command === 'who-next') {
-    const next = await rollup.read.getCurrentProposer();
+    const next = await rollup.getCurrentProposer();
     log(`Sequencer expected to build is ${next}`);
   } else {
     throw new Error(`Unknown command ${command}`);

package/src/cmds/infrastructure/setup_l2_contract.ts

@@ -1,5 +1,5 @@
 import { type InitialAccountData, deployFundedSchnorrAccounts, getInitialTestAccounts } from '@aztec/accounts/testing';
-import { type AztecAddress, SignerlessWallet, type WaitOpts, createPXEClient, makeFetch } from '@aztec/aztec.js';
+import { type AztecAddress, type WaitForProvenOpts, type WaitOpts, createPXEClient, makeFetch } from '@aztec/aztec.js';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import type { LogFn } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
@@ -16,19 +16,24 @@ export async function setupL2Contracts(
   const waitOpts: WaitOpts = {
     timeout: 180,
     interval: 1,
-    proven: !skipProofWait,
-    provenTimeout: 600,
   };
+  const waitForProvenOptions: WaitForProvenOpts | undefined = !skipProofWait
+    ? {
+        provenTimeout: 600,
+      }
+    : undefined;
   log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
+  if (waitForProvenOptions) {
+    log('setupL2Contracts: Wait for proven options' + jsonStringify(waitForProvenOptions));
+  }
   log('setupL2Contracts: Creating PXE client...');
   const pxe = createPXEClient(rpcUrl, {}, makeFetch([1, 1, 1, 1, 1], false));
-  const wallet = new SignerlessWallet(pxe);
 
   log('setupL2Contracts: Getting fee juice portal address...');
   // Deploy Fee Juice
-  const feeJuicePortalAddress = (await wallet.getNodeInfo()).l1ContractAddresses.feeJuicePortalAddress;
+  const feeJuicePortalAddress = (await pxe.getNodeInfo()).l1ContractAddresses.feeJuicePortalAddress;
   log('setupL2Contracts: Setting up fee juice portal...');
-  await setupCanonicalL2FeeJuice(wallet, feeJuicePortalAddress, waitOpts, log);
+  await setupCanonicalL2FeeJuice(pxe, feeJuicePortalAddress, log, waitOpts, waitForProvenOptions);
 
   let deployedAccounts: InitialAccountData[] = [];
   if (testAccounts) {

package/src/cmds/l1/bridge_erc20.ts

@@ -12,6 +12,7 @@ export async function bridgeERC20(
   privateKey: string | undefined,
   mnemonic: string,
   tokenAddress: EthAddress,
+  handlerAddress: EthAddress | undefined,
   portalAddress: EthAddress,
   privateTransfer: boolean,
   mint: boolean,
@@ -24,7 +25,14 @@ export async function bridgeERC20(
   const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
 
   // Setup portal manager
-  const manager = new L1ToL2TokenPortalManager(portalAddress, tokenAddress, publicClient, walletClient, debugLogger);
+  const manager = new L1ToL2TokenPortalManager(
+    portalAddress,
+    tokenAddress,
+    handlerAddress,
+    publicClient,
+    walletClient,
+    debugLogger,
+  );
   let claimSecret: Fr;
   let messageHash: `0x${string}`;
   if (privateTransfer) {

package/src/cmds/l1/deploy_l1_contracts.ts

@@ -61,5 +61,6 @@ export async function deployL1Contracts(
     log(`GovernanceProposer Address: ${l1ContractAddresses.governanceProposerAddress.toString()}`);
     log(`Governance Address: ${l1ContractAddresses.governanceAddress.toString()}`);
     log(`SlashFactory Address: ${l1ContractAddresses.slashFactoryAddress?.toString()}`);
+    log(`FeeAssetHandler Address: ${l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
   }
 }

package/src/cmds/l1/index.ts

@@ -457,6 +457,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     .addOption(l1ChainIdOption)
     .requiredOption('-t, --token <string>', 'The address of the token to bridge', parseEthereumAddress)
     .requiredOption('-p, --portal <string>', 'The address of the portal contract', parseEthereumAddress)
+    .option('-f, --faucet <string>', 'The address of the faucet contract (only used if minting)', parseEthereumAddress)
     .option('--l1-private-key <string>', 'The private key to use for deployment', PRIVATE_KEY)
     .option('--json', 'Output the claim in JSON format')
     .action(async (amount, recipient, options) => {
@@ -469,6 +470,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
         options.l1PrivateKey,
         options.mnemonic,
         options.token,
+        options.faucet,
         options.portal,
         options.private,
         options.mint,

package/src/cmds/l1/update_l1_validators.ts

@@ -1,5 +1,6 @@
 import {
   EthCheatCodes,
+  RollupContract,
   createEthereumChain,
   getExpectedAddress,
   getL1ContractsConfigEnvVars,
@@ -181,30 +182,26 @@ export async function fastForwardEpochs({
 export async function debugRollup({ rpcUrls, chainId, rollupAddress, log }: RollupCommandArgs & LoggerArgs) {
   const config = getL1ContractsConfigEnvVars();
   const publicClient = getPublicClient(rpcUrls, chainId);
-  const rollup = getContract({
-    address: rollupAddress.toString(),
-    abi: RollupAbi,
-    client: publicClient,
-  });
+  const rollup = new RollupContract(publicClient, rollupAddress);
 
-  const pendingNum = await rollup.read.getPendingBlockNumber();
+  const pendingNum = await rollup.getBlockNumber();
   log(`Pending block num: ${pendingNum}`);
-  const provenNum = await rollup.read.getProvenBlockNumber();
+  const provenNum = await rollup.getProvenBlockNumber();
   log(`Proven block num: ${provenNum}`);
-  const validators = await rollup.read.getAttesters();
+  const validators = await rollup.getAttesters();
   log(`Validators: ${validators.map(v => v.toString()).join(', ')}`);
-  const committee = await rollup.read.getCurrentEpochCommittee();
+  const committee = await rollup.getCurrentEpochCommittee();
   log(`Committee: ${committee.map(v => v.toString()).join(', ')}`);
-  const archive = await rollup.read.archive();
+  const archive = await rollup.archive();
   log(`Archive: ${archive}`);
-  const epochNum = await rollup.read.getCurrentEpoch();
+  const epochNum = await rollup.getEpochNumber();
   log(`Current epoch: ${epochNum}`);
-  const slot = await rollup.read.getCurrentSlot();
+  const slot = await rollup.getSlotNumber();
   log(`Current slot: ${slot}`);
-  const proposerDuringPrevL1Block = await rollup.read.getCurrentProposer();
+  const proposerDuringPrevL1Block = await rollup.getCurrentProposer();
   log(`Proposer during previous L1 block: ${proposerDuringPrevL1Block}`);
   const nextBlockTS = BigInt((await publicClient.getBlock()).timestamp + BigInt(config.ethereumSlotDuration));
-  const proposer = await rollup.read.getProposerAt([nextBlockTS]);
+  const proposer = await rollup.getProposerAt(nextBlockTS);
   log(`Proposer NOW: ${proposer.toString()}`);
 }
 

package/src/cmds/misc/setup_contracts.ts

@@ -1,4 +1,12 @@
-import { DefaultWaitOpts, type EthAddress, FeeJuicePaymentMethod, type Wallet } from '@aztec/aztec.js';
+import {
+  DefaultWaitOpts,
+  type EthAddress,
+  FeeJuicePaymentMethod,
+  type PXE,
+  SignerlessWallet,
+  type WaitForProvenOpts,
+  waitForProven,
+} from '@aztec/aztec.js';
 import { FEE_JUICE_INITIAL_MINT } from '@aztec/constants';
 import type { LogFn } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
@@ -8,18 +16,21 @@ import { Gas } from '@aztec/stdlib/gas';
  * Deploys the contract to pay for gas on L2.
  */
 export async function setupCanonicalL2FeeJuice(
-  deployer: Wallet,
+  pxe: PXE,
   feeJuicePortalAddress: EthAddress,
-  waitOpts = DefaultWaitOpts,
   log: LogFn,
+  waitOpts = DefaultWaitOpts,
+  waitForProvenOptions?: WaitForProvenOpts,
 ) {
   // 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');
 
+  const deployer = new SignerlessWallet(pxe);
+
   const feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, deployer);
 
-  const portalAddress = await deployer.getPublicStorageAt(
+  const portalAddress = await pxe.getPublicStorageAt(
     feeJuiceContract.address,
     feeJuiceContract.artifact.storageLayout.portal_address.slot,
   );
@@ -27,10 +38,13 @@ export async function setupCanonicalL2FeeJuice(
   if (portalAddress.isZero()) {
     log('setupCanonicalL2FeeJuice: Calling initialize on fee juice contract...');
     const paymentMethod = new FeeJuicePaymentMethod(ProtocolContractAddress.FeeJuice);
-    await feeJuiceContract.methods
+    const receipt = await feeJuiceContract.methods
       .initialize(feeJuicePortalAddress, FEE_JUICE_INITIAL_MINT)
       .send({ fee: { paymentMethod, gasSettings: { teardownGasLimits: Gas.empty() } } })
       .wait(waitOpts);
+    if (waitForProvenOptions !== undefined) {
+      await waitForProven(pxe, receipt, waitForProvenOptions);
+    }
   } else {
     log(
       'setupCanonicalL2FeeJuice: Fee juice contract already initialized. Fee Juice Portal address: ' +

package/src/cmds/pxe/get_node_info.ts

@@ -35,6 +35,7 @@ export async function getNodeInfo(
         governanceProposer: info.l1ContractAddresses.governanceProposerAddress.toString(),
         governance: info.l1ContractAddresses.governanceAddress.toString(),
         slashFactory: info.l1ContractAddresses.slashFactoryAddress?.toString(),
+        feeAssetHandler: info.l1ContractAddresses.feeAssetHandlerAddress?.toString(),
       },
       protocolContractAddresses: {
         classRegisterer: info.protocolContractAddresses.classRegisterer.toString(),
@@ -61,7 +62,7 @@ export async function getNodeInfo(
     log(` GovernanceProposer Address: ${info.l1ContractAddresses.governanceProposerAddress.toString()}`);
     log(` Governance Address: ${info.l1ContractAddresses.governanceAddress.toString()}`);
     log(` SlashFactory Address: ${info.l1ContractAddresses.slashFactoryAddress?.toString()}`);
-
+    log(` FeeAssetHandler Address: ${info.l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
     log(`L2 Contract Addresses:`);
     log(` Class Registerer: ${info.protocolContractAddresses.classRegisterer.toString()}`);
     log(` Fee Juice: ${info.protocolContractAddresses.feeJuice.toString()}`);