@aztec/cli 0.82.0 → 0.82.1

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAgD/E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAwD/E"}

package/dest/cmds/infrastructure/index.js

@@ -1,8 +1,8 @@
 import { ETHEREUM_HOSTS, l1ChainIdOption, parseOptionalInteger, pxeOption } from '../../utils/commands.js';
 export function injectCommands(program, log, debugLogger) {
-    program.command('setup-protocol-contracts').description('Bootstrap the blockchain by initializing all the protocol contracts').addOption(pxeOption).option('--testAccounts', 'Deploy funded test accounts.').option('--json', 'Output the contract addresses in JSON format').option('--skipProofWait', "Don't wait for proofs to land.").action(async (options)=>{
+    program.command('setup-protocol-contracts').description('Bootstrap the blockchain by initializing all the protocol contracts').addOption(pxeOption).option('--testAccounts', 'Deploy funded test accounts.').option('--sponsoredFPC', 'Deploy a sponsored FPC.').option('--json', 'Output the contract addresses in JSON format').option('--skipProofWait', "Don't wait for proofs to land.").action(async (options)=>{
         const { setupL2Contracts } = await import('./setup_l2_contract.js');
-        await setupL2Contracts(options.rpcUrl, options.testAccounts, options.json, options.skipProofWait, log);
+        await setupL2Contracts(options.rpcUrl, options.testAccounts, options.sponsoredFPC, options.json, options.skipProofWait, log);
     });
     program.command('sequencers').argument('<command>', 'Command to run: list, add, remove, who-next').argument('[who]', 'Who to add/remove').description('Manages or queries registered sequencers on the L1 rollup contract.').requiredOption('--l1-rpc-urls <string>', 'List of Ethereum host URLs. Chain identifiers localhost and testnet can be used (comma separated)', (arg)=>arg.split(','), [
         ETHEREUM_HOSTS

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

@@ -1,3 +1,3 @@
 import type { LogFn } from '@aztec/foundation/log';
-export declare function setupL2Contracts(rpcUrl: string, testAccounts: boolean, json: boolean, skipProofWait: boolean, log: LogFn): Promise<void>;
+export declare function setupL2Contracts(rpcUrl: string, testAccounts: boolean, sponsoredFPC: boolean, json: boolean, skipProofWait: boolean, log: LogFn): Promise<void>;
 //# sourceMappingURL=setup_l2_contract.d.ts.map

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,iBAsCX"}
+{"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,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,aAAa,EAAE,OAAO,EACtB,GAAG,EAAE,KAAK,iBA2CX"}

package/dest/cmds/infrastructure/setup_l2_contract.js

@@ -2,8 +2,8 @@ import { deployFundedSchnorrAccounts, getInitialTestAccounts } from '@aztec/acco
 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) {
+import { setupCanonicalL2FeeJuice, setupSponsoredFPC } from '../../utils/setup_contracts.js';
+export async function setupL2Contracts(rpcUrl, testAccounts, sponsoredFPC, json, skipProofWait, log) {
     const waitOpts = {
         timeout: 180,
         interval: 1
@@ -34,6 +34,10 @@ export async function setupL2Contracts(rpcUrl, testAccounts, json, skipProofWait
         deployedAccounts = await getInitialTestAccounts();
         await deployFundedSchnorrAccounts(pxe, deployedAccounts, waitOpts);
     }
+    if (sponsoredFPC) {
+        log('setupL2Contracts: Setting up sponsored FPC...');
+        await setupSponsoredFPC(pxe, log, waitOpts, waitForProvenOptions);
+    }
     if (json) {
         const toPrint = {
             ...ProtocolContractAddress

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

@@ -1,4 +1,4 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
 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, acceleratedTestDeployments: boolean, json: boolean, initialValidators: EthAddress[], log: LogFn, debugLogger: Logger): Promise<void>;
+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[], 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":"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"}
+{"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;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,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBAgDpB"}

package/dest/cmds/l1/deploy_l1_contracts.js

@@ -2,10 +2,12 @@ import { getInitialTestAccounts } from '@aztec/accounts/testing';
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import { deployAztecContracts } from '../../utils/aztec.js';
-export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, testAccounts, acceleratedTestDeployments, json, initialValidators, log, debugLogger) {
+import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
+export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, testAccounts, sponsoredFPC, acceleratedTestDeployments, json, initialValidators, log, debugLogger) {
     const config = getL1ContractsConfigEnvVars();
     const initialFundedAccounts = testAccounts ? await getInitialTestAccounts() : [];
-    const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address));
+    const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
+    const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress));
     const { l1ContractAddresses } = await deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, genesisBlockHash, acceleratedTestDeployments, config, debugLogger);
     if (json) {
         log(JSON.stringify(Object.fromEntries(Object.entries(l1ContractAddresses).map(([k, v])=>[

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,WAshB/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,WAwhB/E"}

package/dest/cmds/l1/index.js

@@ -6,10 +6,10 @@ const l1RpcUrlsOption = new Option('--l1-rpc-urls <string>', 'List of Ethereum h
 ]).makeOptionMandatory(true).argParser((arg)=>arg.split(',').map((url)=>url.trim()));
 export function injectCommands(program, log, debugLogger) {
     const { BB_BINARY_PATH, BB_WORKING_DIRECTORY } = process.env;
-    program.command('deploy-l1-contracts').description('Deploys all necessary Ethereum contracts for Aztec.').addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').option('--accelerated-test-deployments', 'Fire and forget deployment transactions, use in testing only', false).action(async (options)=>{
+    program.command('deploy-l1-contracts').description('Deploys all necessary Ethereum contracts for Aztec.').addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').option('--sponsored-fpc', 'Populate genesis state with a testing sponsored FPC contract').option('--accelerated-test-deployments', 'Fire and forget deployment transactions, use in testing only', false).action(async (options)=>{
         const { deployL1Contracts } = await import('./deploy_l1_contracts.js');
         const initialValidators = options.validators?.split(',').map((validator)=>EthAddress.fromString(validator)) || [];
-        await deployL1Contracts(options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.acceleratedTestDeployments, options.json, initialValidators, log, debugLogger);
+        await deployL1Contracts(options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.sponsoredFPC, options.acceleratedTestDeployments, options.json, initialValidators, log, debugLogger);
     });
     program.command('deploy-new-rollup').description('Deploys a new rollup contract and a payload to upgrade the registry with it.').requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress).addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').action(async (options)=>{
         const { deployNewRollup } = await import('./deploy_new_rollup.js');

package/dest/utils/index.d.ts

@@ -2,4 +2,5 @@ export * from './commands.js';
 export * from './aztec.js';
 export * from './encoding.js';
 export * from './github.js';
+export * from './setup_contracts.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC"}

package/dest/utils/index.js

@@ -2,3 +2,4 @@ export * from './commands.js';
 export * from './aztec.js';
 export * from './encoding.js';
 export * from './github.js';
+export * from './setup_contracts.js';

package/dest/{cmds/misc → utils}/setup_contracts.d.ts

@@ -4,4 +4,6 @@ import type { LogFn } from '@aztec/foundation/log';
  * Deploys the contract to pay for gas on L2.
  */
 export declare function setupCanonicalL2FeeJuice(pxe: PXE, feeJuicePortalAddress: EthAddress, log: LogFn, waitOpts?: import("@aztec/aztec.js").WaitOpts, waitForProvenOptions?: WaitForProvenOpts): Promise<void>;
+export declare function getSponsoredFPCAddress(): Promise<import("@aztec/aztec.js").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

@@ -0,0 +1 @@
+{"version":3,"file":"setup_contracts.d.ts","sourceRoot":"","sources":["../../src/utils/setup_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,UAAU,EAGf,KAAK,GAAG,EAGR,KAAK,iBAAiB,EAGvB,MAAM,iBAAiB,CAAC;AAGzB,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;AASD,wBAAsB,sBAAsB,oDAM3C;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,KAAK,EACV,QAAQ,qCAAkB,EAC1B,oBAAoB,CAAC,EAAE,iBAAiB,iBAsBzC"}

package/dest/utils/setup_contracts.js

@@ -0,0 +1,64 @@
+import { DefaultWaitOpts, FeeJuicePaymentMethod, Fr, SignerlessWallet, SponsoredFeePaymentMethod, getContractInstanceFromDeployParams, waitForProven } from '@aztec/aztec.js';
+import { FEE_JUICE_INITIAL_MINT, SPONSORED_FPC_SALT } from '@aztec/constants';
+import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multicall';
+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(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 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);
+        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: ' + portalAddress.toString());
+    }
+}
+async function getSponsoredFPCContract() {
+    // 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 { SponsoredFPCContract } = await import('@aztec/noir-contracts.js/SponsoredFPC');
+    return SponsoredFPCContract;
+}
+export async function getSponsoredFPCAddress() {
+    const SponsoredFPCContract = await getSponsoredFPCContract();
+    const sponsoredFPCInstance = await getContractInstanceFromDeployParams(SponsoredFPCContract.artifact, {
+        salt: new Fr(SPONSORED_FPC_SALT)
+    });
+    return sponsoredFPCInstance.address;
+}
+export async function setupSponsoredFPC(pxe, log, waitOpts = DefaultWaitOpts, waitForProvenOptions) {
+    const SponsoredFPCContract = await getSponsoredFPCContract();
+    const address = await getSponsoredFPCAddress();
+    const paymentMethod = new SponsoredFeePaymentMethod(address);
+    const { l1ChainId: chainId, protocolVersion } = await pxe.getNodeInfo();
+    const deployer = new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(chainId, protocolVersion));
+    const deployTx = SponsoredFPCContract.deploy(deployer).send({
+        contractAddressSalt: new Fr(SPONSORED_FPC_SALT),
+        universalDeploy: true,
+        fee: {
+            paymentMethod
+        }
+    });
+    const deployed = await deployTx.deployed(waitOpts);
+    if (waitForProvenOptions !== undefined) {
+        await waitForProven(pxe, await deployTx.getReceipt(), waitForProvenOptions);
+    }
+    log(`SponsoredFPC: ${deployed.address}`);
+}

package/package.json

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

package/src/cmds/infrastructure/index.ts

@@ -10,11 +10,19 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     .description('Bootstrap the blockchain by initializing all the protocol contracts')
     .addOption(pxeOption)
     .option('--testAccounts', 'Deploy funded test accounts.')
+    .option('--sponsoredFPC', 'Deploy a sponsored FPC.')
     .option('--json', 'Output the contract addresses in JSON format')
     .option('--skipProofWait', "Don't wait for proofs to land.")
     .action(async options => {
       const { setupL2Contracts } = await import('./setup_l2_contract.js');
-      await setupL2Contracts(options.rpcUrl, options.testAccounts, options.json, options.skipProofWait, log);
+      await setupL2Contracts(
+        options.rpcUrl,
+        options.testAccounts,
+        options.sponsoredFPC,
+        options.json,
+        options.skipProofWait,
+        log,
+      );
     });
 
   program

package/src/cmds/infrastructure/setup_l2_contract.ts

@@ -4,11 +4,12 @@ import { jsonStringify } from '@aztec/foundation/json-rpc';
 import type { LogFn } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 
-import { setupCanonicalL2FeeJuice } from '../misc/setup_contracts.js';
+import { setupCanonicalL2FeeJuice, setupSponsoredFPC } from '../../utils/setup_contracts.js';
 
 export async function setupL2Contracts(
   rpcUrl: string,
   testAccounts: boolean,
+  sponsoredFPC: boolean,
   json: boolean,
   skipProofWait: boolean,
   log: LogFn,
@@ -42,6 +43,11 @@ export async function setupL2Contracts(
     await deployFundedSchnorrAccounts(pxe, deployedAccounts, waitOpts);
   }
 
+  if (sponsoredFPC) {
+    log('setupL2Contracts: Setting up sponsored FPC...');
+    await setupSponsoredFPC(pxe, log, waitOpts, waitForProvenOptions);
+  }
+
   if (json) {
     const toPrint: Record<string, AztecAddress> = { ...ProtocolContractAddress };
     deployedAccounts.forEach((a, i) => {

package/src/cmds/l1/deploy_l1_contracts.ts

@@ -5,6 +5,7 @@ import type { LogFn, Logger } from '@aztec/foundation/log';
 import { getGenesisValues } from '@aztec/world-state/testing';
 
 import { deployAztecContracts } from '../../utils/aztec.js';
+import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
 
 export async function deployL1Contracts(
   rpcUrls: string[],
@@ -14,6 +15,7 @@ export async function deployL1Contracts(
   mnemonicIndex: number,
   salt: number | undefined,
   testAccounts: boolean,
+  sponsoredFPC: boolean,
   acceleratedTestDeployments: boolean,
   json: boolean,
   initialValidators: EthAddress[],
@@ -23,7 +25,10 @@ export async function deployL1Contracts(
   const config = getL1ContractsConfigEnvVars();
 
   const initialFundedAccounts = testAccounts ? await getInitialTestAccounts() : [];
-  const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts.map(a => a.address));
+  const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
+  const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(
+    initialFundedAccounts.map(a => a.address).concat(sponsoredFPCAddress),
+  );
 
   const { l1ContractAddresses } = await deployAztecContracts(
     rpcUrls,

package/src/cmds/l1/index.ts

@@ -42,6 +42,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     .option('--salt <number>', 'The optional salt to use in deployment', arg => parseInt(arg))
     .option('--json', 'Output the contract addresses in JSON format')
     .option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts')
+    .option('--sponsored-fpc', 'Populate genesis state with a testing sponsored FPC contract')
     .option('--accelerated-test-deployments', 'Fire and forget deployment transactions, use in testing only', false)
     .action(async options => {
       const { deployL1Contracts } = await import('./deploy_l1_contracts.js');
@@ -56,6 +57,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
         options.mnemonicIndex,
         options.salt,
         options.testAccounts,
+        options.sponsoredFPC,
         options.acceleratedTestDeployments,
         options.json,
         initialValidators,

package/src/utils/index.ts

@@ -2,3 +2,4 @@ export * from './commands.js';
 export * from './aztec.js';
 export * from './encoding.js';
 export * from './github.js';
+export * from './setup_contracts.js';

package/src/{cmds/misc → utils}/setup_contracts.ts

@@ -2,12 +2,16 @@ import {
   DefaultWaitOpts,
   type EthAddress,
   FeeJuicePaymentMethod,
+  Fr,
   type PXE,
   SignerlessWallet,
+  SponsoredFeePaymentMethod,
   type WaitForProvenOpts,
+  getContractInstanceFromDeployParams,
   waitForProven,
 } from '@aztec/aztec.js';
-import { FEE_JUICE_INITIAL_MINT } from '@aztec/constants';
+import { FEE_JUICE_INITIAL_MINT, SPONSORED_FPC_SALT } from '@aztec/constants';
+import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multicall';
 import type { LogFn } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { Gas } from '@aztec/stdlib/gas';
@@ -52,3 +56,46 @@ export async function setupCanonicalL2FeeJuice(
     );
   }
 }
+
+async function getSponsoredFPCContract() {
+  // 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 { SponsoredFPCContract } = await import('@aztec/noir-contracts.js/SponsoredFPC');
+  return SponsoredFPCContract;
+}
+
+export async function getSponsoredFPCAddress() {
+  const SponsoredFPCContract = await getSponsoredFPCContract();
+  const sponsoredFPCInstance = await getContractInstanceFromDeployParams(SponsoredFPCContract.artifact, {
+    salt: new Fr(SPONSORED_FPC_SALT),
+  });
+  return sponsoredFPCInstance.address;
+}
+
+export async function setupSponsoredFPC(
+  pxe: PXE,
+  log: LogFn,
+  waitOpts = DefaultWaitOpts,
+  waitForProvenOptions?: WaitForProvenOpts,
+) {
+  const SponsoredFPCContract = await getSponsoredFPCContract();
+  const address = await getSponsoredFPCAddress();
+  const paymentMethod = new SponsoredFeePaymentMethod(address);
+  const { l1ChainId: chainId, protocolVersion } = await pxe.getNodeInfo();
+
+  const deployer = new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(chainId, protocolVersion));
+
+  const deployTx = SponsoredFPCContract.deploy(deployer).send({
+    contractAddressSalt: new Fr(SPONSORED_FPC_SALT),
+    universalDeploy: true,
+    fee: { paymentMethod },
+  });
+
+  const deployed = await deployTx.deployed(waitOpts);
+
+  if (waitForProvenOptions !== undefined) {
+    await waitForProven(pxe, await deployTx.getReceipt(), waitForProvenOptions);
+  }
+
+  log(`SponsoredFPC: ${deployed.address}`);
+}

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

@@ -1 +0,0 @@
-{"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,31 +0,0 @@
-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(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 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);
-        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: ' + portalAddress.toString());
-    }
-}