@aztec/end-to-end 0.82.3 → 0.83.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "0.82.3",
+  "version": "0.83.0",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -26,37 +26,37 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "0.82.3",
-    "@aztec/archiver": "0.82.3",
-    "@aztec/aztec": "0.82.3",
-    "@aztec/aztec-node": "0.82.3",
-    "@aztec/aztec.js": "0.82.3",
-    "@aztec/bb-prover": "0.82.3",
-    "@aztec/blob-lib": "0.82.3",
-    "@aztec/blob-sink": "0.82.3",
-    "@aztec/bot": "0.82.3",
-    "@aztec/constants": "0.82.3",
-    "@aztec/entrypoints": "0.82.3",
-    "@aztec/epoch-cache": "0.82.3",
-    "@aztec/ethereum": "0.82.3",
-    "@aztec/foundation": "0.82.3",
-    "@aztec/kv-store": "0.82.3",
-    "@aztec/l1-artifacts": "0.82.3",
-    "@aztec/merkle-tree": "0.82.3",
-    "@aztec/noir-contracts.js": "0.82.3",
-    "@aztec/noir-noirc_abi": "0.82.3",
-    "@aztec/noir-protocol-circuits-types": "0.82.3",
-    "@aztec/p2p": "0.82.3",
-    "@aztec/protocol-contracts": "0.82.3",
-    "@aztec/prover-client": "0.82.3",
-    "@aztec/prover-node": "0.82.3",
-    "@aztec/pxe": "0.82.3",
-    "@aztec/sequencer-client": "0.82.3",
-    "@aztec/simulator": "0.82.3",
-    "@aztec/stdlib": "0.82.3",
-    "@aztec/telemetry-client": "0.82.3",
-    "@aztec/validator-client": "0.82.3",
-    "@aztec/world-state": "0.82.3",
+    "@aztec/accounts": "0.83.0",
+    "@aztec/archiver": "0.83.0",
+    "@aztec/aztec": "0.83.0",
+    "@aztec/aztec-node": "0.83.0",
+    "@aztec/aztec.js": "0.83.0",
+    "@aztec/bb-prover": "0.83.0",
+    "@aztec/blob-lib": "0.83.0",
+    "@aztec/blob-sink": "0.83.0",
+    "@aztec/bot": "0.83.0",
+    "@aztec/constants": "0.83.0",
+    "@aztec/entrypoints": "0.83.0",
+    "@aztec/epoch-cache": "0.83.0",
+    "@aztec/ethereum": "0.83.0",
+    "@aztec/foundation": "0.83.0",
+    "@aztec/kv-store": "0.83.0",
+    "@aztec/l1-artifacts": "0.83.0",
+    "@aztec/merkle-tree": "0.83.0",
+    "@aztec/noir-contracts.js": "0.83.0",
+    "@aztec/noir-noirc_abi": "0.83.0",
+    "@aztec/noir-protocol-circuits-types": "0.83.0",
+    "@aztec/p2p": "0.83.0",
+    "@aztec/protocol-contracts": "0.83.0",
+    "@aztec/prover-client": "0.83.0",
+    "@aztec/prover-node": "0.83.0",
+    "@aztec/pxe": "0.83.0",
+    "@aztec/sequencer-client": "0.83.0",
+    "@aztec/simulator": "0.83.0",
+    "@aztec/stdlib": "0.83.0",
+    "@aztec/telemetry-client": "0.83.0",
+    "@aztec/validator-client": "0.83.0",
+    "@aztec/world-state": "0.83.0",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^29.5.0",
     "@msgpack/msgpack": "^3.0.0-beta2",

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -4,9 +4,14 @@ import {
   type AccountWallet,
   AztecAddress,
   type AztecNode,
+  FeeJuicePaymentMethod,
   FeeJuicePaymentMethodWithClaim,
+  type FeePaymentMethod,
   type Logger,
   type PXE,
+  PrivateFeePaymentMethod,
+  SponsoredFeePaymentMethod,
+  type Wallet,
   createLogger,
 } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec.js/testing';
@@ -21,6 +26,7 @@ import { TestERC20Bytecode } from '@aztec/l1-artifacts/TestERC20Bytecode';
 import { AMMContract } from '@aztec/noir-contracts.js/AMM';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
 import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
+import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 import { TokenContract as BananaCoin, TokenContract } from '@aztec/noir-contracts.js/Token';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
@@ -35,16 +41,19 @@ import {
   deployAccounts,
 } from '../../fixtures/snapshot_manager.js';
 import { mintTokensToPrivate } from '../../fixtures/token_utils.js';
-import { type SetupOptions, setupCanonicalFeeJuice } from '../../fixtures/utils.js';
+import { type SetupOptions, setupSponsoredFPC } from '../../fixtures/utils.js';
 import { CrossChainTestHarness } from '../../shared/cross_chain_test_harness.js';
 import {
   FeeJuicePortalTestingHarnessFactory,
   type GasBridgingTestHarness,
 } from '../../shared/gas_portal_test_harness.js';
+import { type ClientFlowsConfig, FULL_FLOWS_CONFIG, KEY_FLOWS_CONFIG } from './config.js';
 
-const { E2E_DATA_PATH: dataPath } = process.env;
+const { E2E_DATA_PATH: dataPath, BENCHMARK_CONFIG } = process.env;
 
 export type AccountType = 'ecdsar1' | 'schnorr';
+export type FeePaymentMethodGetter = (wallet: Wallet) => Promise<FeePaymentMethod>;
+export type BenchmarkingFeePaymentMethod = 'bridged_fee_juice' | 'private_fpc' | 'sponsored_fpc' | 'fee_juice';
 
 export class ClientFlowsBenchmark {
   private snapshotManager: ISnapshotManager;
@@ -76,10 +85,42 @@ export class ClientFlowsBenchmark {
   public amm!: AMMContract;
   // Liquidity token for AMM
   public liquidityToken!: TokenContract;
+  // Sponsored FPC contract
+  public sponsoredFPC!: SponsoredFPCContract;
 
   // PXE used by the benchmarking user. It can be set up with client-side proving enabled
   public userPXE!: PXE;
 
+  public paymentMethods: Record<BenchmarkingFeePaymentMethod, { forWallet: FeePaymentMethodGetter; circuits: number }> =
+    {
+      // eslint-disable-next-line camelcase
+      bridged_fee_juice: {
+        forWallet: this.getBridgedFeeJuicePaymentMethodForWallet.bind(this),
+        circuits: 2, // FeeJuice claim + kernel inner
+      },
+      // eslint-disable-next-line camelcase
+      private_fpc: {
+        forWallet: this.getPrivateFPCPaymentMethodForWallet.bind(this),
+        circuits:
+          2 + // FPC entrypoint + kernel inner
+          2 + // BananaCoin transfer_to_public + kernel inner
+          2 + // Account verify_private_authwit + kernel inner
+          2, // BananaCoin prepare_private_balance_increase + kernel inner
+      },
+      // eslint-disable-next-line camelcase
+      sponsored_fpc: {
+        forWallet: this.getSponsoredFPCPaymentMethodForWallet.bind(this),
+        circuits: 2, // Sponsored FPC sponsor_unconditionally + kernel inner
+      },
+      // eslint-disable-next-line camelcase
+      fee_juice: {
+        forWallet: this.getFeeJuicePaymentMethodForWallet.bind(this),
+        circuits: 0,
+      },
+    };
+
+  public config: ClientFlowsConfig;
+
   constructor(testName?: string, setupOptions: Partial<SetupOptions & DeployL1ContractsArgs> = {}) {
     this.logger = createLogger(`bench:client_flows${testName ? `:${testName}` : ''}`);
     this.snapshotManager = createSnapshotManager(
@@ -88,6 +129,7 @@ export class ClientFlowsBenchmark {
       { startProverNode: true, ...setupOptions },
       { ...setupOptions },
     );
+    this.config = BENCHMARK_CONFIG === 'key_flows' ? KEY_FLOWS_CONFIG : FULL_FLOWS_CONFIG;
   }
 
   async setup() {
@@ -182,9 +224,7 @@ export class ClientFlowsBenchmark {
   async applySetupFeeJuiceSnapshot() {
     await this.snapshotManager.snapshot(
       'setup_fee_juice',
-      async context => {
-        await setupCanonicalFeeJuice(context.pxe);
-      },
+      async () => {},
       async (_data, context) => {
         this.context = context;
 
@@ -259,6 +299,20 @@ export class ClientFlowsBenchmark {
     );
   }
 
+  async applyDeploySponsoredFPCSnapshot() {
+    await this.snapshotManager.snapshot(
+      'deploy_sponsored_fpc',
+      async () => {
+        const sponsoredFPC = await setupSponsoredFPC(this.pxe);
+        this.logger.info(`SponsoredFPC deployed at ${sponsoredFPC.address}`);
+        return { sponsoredFPCAddress: sponsoredFPC.address };
+      },
+      async ({ sponsoredFPCAddress }) => {
+        this.sponsoredFPC = await SponsoredFPCContract.at(sponsoredFPCAddress, this.adminWallet);
+      },
+    );
+  }
+
   public async createCrossChainTestHarness(owner: AccountWallet) {
     const { publicClient, walletClient } = createL1Clients(this.context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
 
@@ -328,4 +382,24 @@ export class ClientFlowsBenchmark {
       },
     );
   }
+
+  public async getBridgedFeeJuicePaymentMethodForWallet(wallet: Wallet) {
+    const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(
+      FEE_FUNDING_FOR_TESTER_ACCOUNT,
+      wallet.getAddress(),
+    );
+    return new FeeJuicePaymentMethodWithClaim(wallet, claim);
+  }
+
+  public getPrivateFPCPaymentMethodForWallet(wallet: Wallet) {
+    return Promise.resolve(new PrivateFeePaymentMethod(this.bananaFPC.address, wallet));
+  }
+
+  public getSponsoredFPCPaymentMethodForWallet(_wallet: Wallet) {
+    return Promise.resolve(new SponsoredFeePaymentMethod(this.sponsoredFPC.address));
+  }
+
+  public getFeeJuicePaymentMethodForWallet(wallet: Wallet) {
+    return Promise.resolve(new FeeJuicePaymentMethod(wallet.getAddress()));
+  }
 }

package/src/bench/client_flows/config.ts

@@ -0,0 +1,53 @@
+import type { AccountType, BenchmarkingFeePaymentMethod } from './client_flows_benchmark.js';
+
+export type ClientFlowConfig = {
+  accounts: AccountType[];
+  feePaymentMethods: BenchmarkingFeePaymentMethod[];
+  recursions?: number[];
+};
+
+type ClientFlows = 'deployments' | 'transfers' | 'bridging' | 'amm';
+
+export type ClientFlowsConfig = {
+  [key in ClientFlows]: ClientFlowConfig;
+};
+
+export const KEY_FLOWS_CONFIG: ClientFlowsConfig = {
+  deployments: {
+    accounts: ['ecdsar1', 'schnorr'],
+    feePaymentMethods: ['sponsored_fpc'],
+  },
+  amm: {
+    accounts: ['ecdsar1'],
+    feePaymentMethods: ['sponsored_fpc'],
+  },
+  bridging: {
+    accounts: ['ecdsar1'],
+    feePaymentMethods: ['sponsored_fpc'],
+  },
+  transfers: {
+    accounts: ['ecdsar1', 'schnorr'],
+    feePaymentMethods: ['sponsored_fpc', 'fee_juice'],
+    recursions: [1],
+  },
+};
+
+export const FULL_FLOWS_CONFIG: ClientFlowsConfig = {
+  deployments: {
+    accounts: ['ecdsar1', 'schnorr'],
+    feePaymentMethods: ['bridged_fee_juice', 'sponsored_fpc'],
+  },
+  amm: {
+    accounts: ['ecdsar1', 'schnorr'],
+    feePaymentMethods: ['sponsored_fpc', 'private_fpc'],
+  },
+  bridging: {
+    accounts: ['ecdsar1', 'schnorr'],
+    feePaymentMethods: ['sponsored_fpc', 'private_fpc'],
+  },
+  transfers: {
+    accounts: ['ecdsar1', 'schnorr'],
+    feePaymentMethods: ['sponsored_fpc', 'private_fpc'],
+    recursions: [0, 1, 2],
+  },
+};

package/src/bench/client_flows/data_extractor.ts

@@ -163,7 +163,6 @@ async function main() {
       bytecode: acirStack[i],
       witness: witnessStack[i],
     }));
-    let minimumTrace: StructuredTrace | undefined;
     let stats: { duration: number; eventName: string; proofSize: number } | undefined;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let error: any | undefined;
@@ -179,10 +178,11 @@ async function main() {
     await writeFile(join(ivcFolder, flow, 'logs.json'), JSON.stringify(currentLogs, null, 2));
 
     if (!error) {
-      minimumTrace = getMinimumTrace(currentLogs, proverType);
       stats = currentLogs[0].data as { duration: number; eventName: string; proofSize: number };
     }
 
+    const minimumTrace = getMinimumTrace(currentLogs, proverType);
+
     const steps = executionSteps.reduce<Step[]>((acc, step, i) => {
       const previousAccGateCount = i === 0 ? 0 : acc[i - 1].accGateCount!;
       return [

package/src/bench/utils.ts

@@ -160,7 +160,7 @@ export async function createNewPXE(
   startingBlock: number = INITIAL_L2_BLOCK_NUM,
 ): Promise<PXEService> {
   const l1Contracts = await node.getL1ContractAddresses();
-  const { l1ChainId, protocolVersion } = await node.getNodeInfo();
+  const { l1ChainId, rollupVersion } = await node.getNodeInfo();
   const pxeConfig = {
     l2StartingBlock: startingBlock,
     l2BlockPollingIntervalMS: 100,
@@ -168,7 +168,7 @@ export async function createNewPXE(
     dataStoreMapSizeKB: 1024 * 1024,
     l1Contracts,
     l1ChainId,
-    version: protocolVersion,
+    rollupVersion,
   } as PXEServiceConfig;
   const pxe = await createPXEService(node, pxeConfig);
   await pxe.registerContract(contract);

package/src/e2e_fees/fees_test.ts

@@ -39,7 +39,6 @@ import {
   type SetupOptions,
   ensureAccountsPubliclyDeployed,
   getBalancesFn,
-  setupCanonicalFeeJuice,
   setupSponsoredFPC,
 } from '../fixtures/utils.js';
 import { FeeJuicePortalTestingHarnessFactory, type GasBridgingTestHarness } from '../shared/gas_portal_test_harness.js';
@@ -198,9 +197,7 @@ export class FeesTest {
   async applySetupFeeJuiceSnapshot() {
     await this.snapshotManager.snapshot(
       'setup_fee_juice',
-      async context => {
-        await setupCanonicalFeeJuice(context.pxe);
-      },
+      async () => {},
       async (_data, context) => {
         this.context = context;
 

package/src/e2e_p2p/p2p_network.ts

@@ -97,9 +97,10 @@ export class P2PNetworkTest {
           initialValidatorConfig.aztecProofSubmissionWindow ?? l1ContractsConfig.aztecProofSubmissionWindow,
         salt: 420,
         metricsPort: metricsPort,
-        numberOfInitialFundedAccounts: 1,
+        numberOfInitialFundedAccounts: 2,
       },
       {
+        ...initialValidatorConfig,
         aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
         ethereumSlotDuration: initialValidatorConfig.ethereumSlotDuration ?? l1ContractsConfig.ethereumSlotDuration,
         aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,

package/src/fixtures/l1_to_l2_messaging.ts

@@ -1,4 +1,9 @@
-import type { L1ContractAddresses, ViemPublicClient, ViemWalletClient } from '@aztec/ethereum';
+import {
+  type L1ContractAddresses,
+  RollupContract,
+  type ViemPublicClient,
+  type ViemWalletClient,
+} from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
 import { InboxAbi } from '@aztec/l1-artifacts';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -11,7 +16,7 @@ export async function sendL1ToL2Message(
   ctx: {
     walletClient: ViemWalletClient;
     publicClient: ViemPublicClient;
-    l1ContractAddresses: Pick<L1ContractAddresses, 'inboxAddress'>;
+    l1ContractAddresses: Pick<L1ContractAddresses, 'inboxAddress' | 'rollupAddress'>;
   },
 ) {
   const inbox = getContract({
@@ -21,7 +26,11 @@ export async function sendL1ToL2Message(
   });
 
   const { recipient, content, secretHash } = message;
-  const version = 1;
+
+  const version = await new RollupContract(
+    ctx.publicClient,
+    ctx.l1ContractAddresses.rollupAddress.toString(),
+  ).getVersion();
 
   // We inject the message to Inbox
   const txHash = await inbox.write.sendL2Message([

package/src/fixtures/setup_l1_contracts.ts

@@ -1,7 +1,7 @@
 import type { Logger } from '@aztec/aztec.js';
 import { type DeployL1ContractsArgs, type L1ContractsConfig, deployL1Contracts } from '@aztec/ethereum';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 
 import type { HDAccount, PrivateKeyAccount } from 'viem';
 import { foundry } from 'viem/chains';
@@ -16,7 +16,6 @@ export const setupL1Contracts = async (
     L1ContractsConfig,
 ) => {
   const l1Data = await deployL1Contracts([l1RpcUrl], account, foundry, logger, {
-    l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice.toField(),
     vkTreeRoot: getVKTreeRoot(),
     protocolContractTreeRoot,
     salt: undefined,

package/src/fixtures/snapshot_manager.ts

@@ -308,6 +308,9 @@ async function setupFromFresh(
   aztecNodeConfig.peerCheckIntervalMS = TEST_PEER_CHECK_INTERVAL_MS;
   // Only enable proving if specifically requested.
   aztecNodeConfig.realProofs = !!opts.realProofs;
+  // Only enforce the time table if requested
+  aztecNodeConfig.enforceTimeTable = !!opts.enforceTimeTable;
+  aztecNodeConfig.listenAddress = '127.0.0.1';
 
   // Create a temp directory for all ephemeral state and cleanup afterwards
   const directoryToCleanup = path.join(tmpdir(), randomBytes(8).toString('hex'));
@@ -317,7 +320,7 @@ async function setupFromFresh(
   } else {
     aztecNodeConfig.dataDirectory = statePath;
   }
-  aztecNodeConfig.blobSinkUrl = `http://localhost:${blobSinkPort}`;
+  aztecNodeConfig.blobSinkUrl = `http://127.0.0.1:${blobSinkPort}`;
 
   // Start anvil. We go via a wrapper script to ensure if the parent dies, anvil dies.
   logger.verbose('Starting anvil...');
@@ -345,7 +348,7 @@ async function setupFromFresh(
 
   const initialFundedAccounts = await generateSchnorrAccounts(numberOfInitialFundedAccounts);
   const sponsoredFPCAddress = await getSponsoredFPCAddress();
-  const { genesisArchiveRoot, genesisBlockHash, prefilledPublicData } = await getGenesisValues(
+  const { genesisArchiveRoot, genesisBlockHash, prefilledPublicData, fundingNeeded } = await getGenesisValues(
     initialFundedAccounts.map(a => a.address).concat(sponsoredFPCAddress),
     opts.initialAccountFeeJuice,
   );
@@ -354,6 +357,7 @@ async function setupFromFresh(
     ...getL1ContractsConfigEnvVars(),
     genesisArchiveRoot,
     genesisBlockHash,
+    feeJuicePortalInitialBalance: fundingNeeded,
     salt: opts.salt,
     ...deployL1ContractsArgs,
     initialValidators: opts.initialValidators,
@@ -490,6 +494,7 @@ async function setupFromState(statePath: string, logger: Logger): Promise<Subsys
   );
   aztecNodeConfig.dataDirectory = statePath;
   aztecNodeConfig.blobSinkUrl = `http://127.0.0.1:${blobSinkPort}`;
+  aztecNodeConfig.listenAddress = '127.0.0.1';
 
   const initialFundedAccounts: InitialAccountData[] =
     JSON.parse(readFileSync(`${statePath}/accounts.json`, 'utf-8'), reviver) || [];