@aztec/end-to-end 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2 → 0.77.0-testnet-ignition.17

package/dest/e2e_epochs/epochs_test.js

@@ -0,0 +1,155 @@
+import { AztecNodeService } from '@aztec/aztec-node';
+import { Fr, getTimestampRangeForEpoch, retryUntil, sleep } from '@aztec/aztec.js';
+import { ChainMonitor } from '@aztec/aztec.js/ethereum';
+import { RollupContract } from '@aztec/ethereum/contracts';
+import { waitUntilL1Timestamp } from '@aztec/ethereum/test';
+import { randomBytes } from '@aztec/foundation/crypto';
+import { withLogNameSuffix } from '@aztec/foundation/log';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+import { join } from 'path';
+import { createAndSyncProverNode, getPrivateKeyFromIndex, setup } from '../fixtures/utils.js';
+// This can be lowered to as much as 2s in non-CI
+export const L1_BLOCK_TIME_IN_S = process.env.L1_BLOCK_TIME ? parseInt(process.env.L1_BLOCK_TIME) : 8;
+export const EPOCH_DURATION_IN_L2_SLOTS = 4;
+export const L2_SLOT_DURATION_IN_L1_SLOTS = 2;
+export const WORLD_STATE_BLOCK_HISTORY = 2;
+export const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
+export const ARCHIVER_POLL_INTERVAL = 50;
+/**
+ * Tests building of epochs using fast block times and short epochs.
+ * Spawns an aztec node and a prover node with fake proofs.
+ * Sequencer is allowed to build empty blocks.
+ */ export class EpochsTestContext {
+    context;
+    l1Client;
+    rollup;
+    constants;
+    logger;
+    monitor;
+    proverDelayer;
+    sequencerDelayer;
+    proverNodes = [];
+    nodes = [];
+    static async setup(opts = {}) {
+        const test = new EpochsTestContext();
+        await test.setup(opts);
+        return test;
+    }
+    async setup(opts = {}) {
+        // Set up system without any account nor protocol contracts
+        // and with faster block times and shorter epochs.
+        const context = await setup(0, {
+            checkIntervalMs: 50,
+            archiverPollingIntervalMS: ARCHIVER_POLL_INTERVAL,
+            worldStateBlockCheckIntervalMS: WORLD_STATE_BLOCK_CHECK_INTERVAL,
+            skipProtocolContracts: true,
+            salt: 1,
+            aztecEpochDuration: EPOCH_DURATION_IN_L2_SLOTS,
+            aztecSlotDuration: L1_BLOCK_TIME_IN_S * L2_SLOT_DURATION_IN_L1_SLOTS,
+            ethereumSlotDuration: L1_BLOCK_TIME_IN_S,
+            aztecProofSubmissionWindow: EPOCH_DURATION_IN_L2_SLOTS * 2 - 1,
+            minTxsPerBlock: 0,
+            realProofs: false,
+            startProverNode: true,
+            // We use numeric incremental prover ids for simplicity, but we can switch to
+            // using the prover's eth address if the proverId is used for something in the rollup contract
+            proverId: Fr.fromString('1'),
+            // This must be enough so that the tx from the prover is delayed properly,
+            // but not so much to hang the sequencer and timeout the teardown
+            txPropagationMaxQueryAttempts: 12,
+            worldStateBlockHistory: WORLD_STATE_BLOCK_HISTORY,
+            ...opts
+        });
+        this.context = context;
+        this.proverNodes = context.proverNode ? [
+            context.proverNode
+        ] : [];
+        this.nodes = context.aztecNode ? [
+            context.aztecNode
+        ] : [];
+        this.logger = context.logger;
+        this.l1Client = context.deployL1ContractsValues.publicClient;
+        this.rollup = RollupContract.getFromConfig(context.config);
+        // Loop that tracks L1 and L2 block numbers and logs whenever there's a new one.
+        this.monitor = new ChainMonitor(this.rollup, this.logger).start();
+        // This is hideous.
+        // We ought to have a definite reference to the l1TxUtils that we're using in both places, provided by the test context.
+        this.proverDelayer = context.proverNode ? context.proverNode.publisher.l1TxUtils.delayer : undefined;
+        this.sequencerDelayer = context.sequencer.sequencer.publisher.l1TxUtils.delayer;
+        if (context.proverNode && !this.proverDelayer || !this.sequencerDelayer) {
+            throw new Error(`Could not find prover or sequencer delayer`);
+        }
+        // Constants used for time calculation
+        this.constants = {
+            epochDuration: EPOCH_DURATION_IN_L2_SLOTS,
+            slotDuration: L1_BLOCK_TIME_IN_S * L2_SLOT_DURATION_IN_L1_SLOTS,
+            l1StartBlock: await this.rollup.getL1StartBlock(),
+            l1GenesisTime: await this.rollup.getL1GenesisTime(),
+            ethereumSlotDuration: L1_BLOCK_TIME_IN_S
+        };
+        this.logger.info(`L2 genesis at L1 block ${this.constants.l1StartBlock} (timestamp ${this.constants.l1GenesisTime})`);
+    }
+    async teardown() {
+        this.monitor.stop();
+        await Promise.all(this.proverNodes.map((node)=>node.stop()));
+        await Promise.all(this.nodes.map((node)=>node.stop()));
+        await this.context.teardown();
+    }
+    async createProverNode() {
+        this.logger.warn('Creating and syncing a simulated prover node...');
+        const proverNodePrivateKey = this.getNextPrivateKey();
+        const suffix = (this.proverNodes.length + 1).toString();
+        const proverNode = await withLogNameSuffix(suffix, ()=>createAndSyncProverNode(proverNodePrivateKey, {
+                ...this.context.config,
+                proverId: Fr.fromString(suffix)
+            }, this.context.aztecNode, join(this.context.config.dataDirectory, randomBytes(8).toString('hex'))));
+        this.proverNodes.push(proverNode);
+        return proverNode;
+    }
+    async createNonValidatorNode() {
+        this.logger.warn('Creating and syncing a node without a validator...');
+        const suffix = (this.nodes.length + 1).toString();
+        const node = await withLogNameSuffix(suffix, ()=>AztecNodeService.createAndSync({
+                ...this.context.config,
+                disableValidator: true,
+                dataDirectory: join(this.context.config.dataDirectory, randomBytes(8).toString('hex'))
+            }));
+        this.nodes.push(node);
+        return node;
+    }
+    getNextPrivateKey() {
+        const key = getPrivateKeyFromIndex(this.nodes.length + this.proverNodes.length + 1);
+        return `0x${key.toString('hex')}`;
+    }
+    /** Waits until the epoch begins (ie until the immediately previous L1 block is mined). */ async waitUntilEpochStarts(epoch) {
+        const [start] = getTimestampRangeForEpoch(BigInt(epoch), this.constants);
+        this.logger.info(`Waiting until L1 timestamp ${start} is reached as the start of epoch ${epoch}`);
+        await waitUntilL1Timestamp(this.l1Client, start - BigInt(L1_BLOCK_TIME_IN_S));
+        return start;
+    }
+    /** Waits until the given L2 block number is mined. */ async waitUntilL2BlockNumber(target, timeout = 60) {
+        await retryUntil(()=>Promise.resolve(target === this.monitor.l2BlockNumber), `Wait until L2 block ${target}`, timeout, 0.1);
+    }
+    /** Waits until the given L2 block number is marked as proven. */ async waitUntilProvenL2BlockNumber(t, timeout = 60) {
+        await retryUntil(()=>Promise.resolve(t === this.monitor.l2ProvenBlockNumber), `Wait proven L2 block ${t}`, timeout, 0.1);
+    }
+    /** Waits for the aztec node to sync to the target block number. */ async waitForNodeToSync(blockNumber, type) {
+        const waitTime = ARCHIVER_POLL_INTERVAL + WORLD_STATE_BLOCK_CHECK_INTERVAL;
+        let synched = false;
+        while(!synched){
+            await sleep(waitTime);
+            const syncState = await this.context.aztecNode.getWorldStateSyncStatus();
+            if (type === 'finalised') {
+                synched = syncState.finalisedBlockNumber >= blockNumber;
+            } else {
+                synched = syncState.oldestHistoricBlockNumber >= blockNumber;
+            }
+        }
+    }
+    /** Verifies whether the given block number is found on the aztec node. */ async verifyHistoricBlock(blockNumber, expectedSuccess) {
+        const result = await this.context.aztecNode.findBlockNumbersForIndexes(blockNumber, MerkleTreeId.NULLIFIER_TREE, [
+            0n
+        ]).then((_)=>true).catch((_)=>false);
+        expect(result).toBe(expectedSuccess);
+    }
+}

package/dest/e2e_fees/fees_test.d.ts

@@ -0,0 +1,73 @@
+import { type AccountWallet, type AztecAddress, type AztecNode, ChainMonitor, CheatCodes, type Logger, type PXE } from '@aztec/aztec.js';
+import { type DeployL1ContractsArgs } from '@aztec/ethereum';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { AppSubscriptionContract } from '@aztec/noir-contracts.js/AppSubscription';
+import { CounterContract } from '@aztec/noir-contracts.js/Counter';
+import { FPCContract } from '@aztec/noir-contracts.js/FPC';
+import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
+import { TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token';
+import { GasSettings } from '@aztec/stdlib/gas';
+import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
+import { type BalancesFn, type SetupOptions } from '../fixtures/utils.js';
+import { type GasBridgingTestHarness } from '../shared/gas_portal_test_harness.js';
+/**
+ * Test fixture for testing fees. Provides the following snapshots:
+ * InitialAccounts: Initializes 3 Schnorr account contracts.
+ * PublicDeployAccounts: Deploys the accounts publicly.
+ * DeployFeeJuice: Deploys the Fee Juice contract.
+ * FPCSetup: Deploys BananaCoin and FPC contracts, and bridges gas from L1.
+ * FundAlice: Mints private and public bananas to Alice.
+ * SetupSubscription: Deploys a counter contract and a subscription contract, and mints Fee Juice to the subscription contract.
+ */
+export declare class FeesTest {
+    private numberOfAccounts;
+    private snapshotManager;
+    private wallets;
+    logger: Logger;
+    pxe: PXE;
+    aztecNode: AztecNode;
+    cheatCodes: CheatCodes;
+    aliceWallet: AccountWallet;
+    aliceAddress: AztecAddress;
+    bobWallet: AccountWallet;
+    bobAddress: AztecAddress;
+    sequencerAddress: AztecAddress;
+    coinbase: EthAddress;
+    fpcAdmin: AztecAddress;
+    gasSettings: GasSettings;
+    feeJuiceContract: FeeJuiceContract;
+    bananaCoin: BananaCoin;
+    bananaFPC: FPCContract;
+    counterContract: CounterContract;
+    subscriptionContract: AppSubscriptionContract;
+    feeJuiceBridgeTestHarness: GasBridgingTestHarness;
+    context: SubsystemsContext;
+    chainMonitor: ChainMonitor;
+    getCoinbaseBalance: () => Promise<bigint>;
+    getCoinbaseSequencerRewards: () => Promise<bigint>;
+    getGasBalanceFn: BalancesFn;
+    getBananaPublicBalanceFn: BalancesFn;
+    getBananaPrivateBalanceFn: BalancesFn;
+    getProverFee: (blockNumber: number) => Promise<bigint>;
+    readonly ALICE_INITIAL_BANANAS: bigint;
+    readonly SUBSCRIPTION_AMOUNT: bigint;
+    readonly APP_SPONSORED_TX_GAS_LIMIT: bigint;
+    constructor(testName: string, numberOfAccounts?: number, setupOptions?: Partial<SetupOptions & DeployL1ContractsArgs>);
+    setup(): Promise<this>;
+    teardown(): Promise<void>;
+    setIsMarkingAsProven(b: boolean): void;
+    catchUpProvenChain(): Promise<void>;
+    mintAndBridgeFeeJuice(address: AztecAddress, amount: bigint): Promise<void>;
+    /** Alice mints bananaCoin tokens privately to the target address and redeems them. */
+    mintPrivateBananas(amount: bigint, address: AztecAddress): Promise<void>;
+    applyBaseSnapshots(): Promise<void>;
+    applyInitialAccountsSnapshot(): Promise<void>;
+    applyPublicDeployAccountsSnapshot(): Promise<void>;
+    applySetupFeeJuiceSnapshot(): Promise<void>;
+    applyDeployBananaTokenSnapshot(): Promise<void>;
+    applyFPCSetupSnapshot(): Promise<void>;
+    applyFundAliceWithBananas(): Promise<void>;
+    applyFundAliceWithPrivateBananas(): Promise<void>;
+    applySetupSubscription(): Promise<void>;
+}
+//# sourceMappingURL=fees_test.d.ts.map

package/dest/e2e_fees/fees_test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fees_test.d.ts","sourceRoot":"","sources":["../../src/e2e_fees/fees_test.ts"],"names":[],"mappings":"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"}

package/dest/e2e_fees/fees_test.js

@@ -1,9 +1,9 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { CheatCodes, SignerlessWallet, createLogger, sleep } from '@aztec/aztec.js';
-import { DefaultMultiCallEntrypoint } from '@aztec/aztec.js/entrypoint';
-import { EthAddress, FEE_FUNDING_FOR_TESTER_ACCOUNT, GasSettings, computePartialAddress } from '@aztec/circuits.js';
-import { createL1Clients } from '@aztec/ethereum';
-import { TestERC20Abi } from '@aztec/l1-artifacts';
+import { getSchnorrWallet } from '@aztec/accounts/schnorr';
+import { ChainMonitor, CheatCodes, createLogger, sleep } from '@aztec/aztec.js';
+import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
+import { RollupContract, createL1Clients } from '@aztec/ethereum';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 import { AppSubscriptionContract } from '@aztec/noir-contracts.js/AppSubscription';
 import { CounterContract } from '@aztec/noir-contracts.js/Counter';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
@@ -11,9 +11,11 @@ import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
 import { TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
+import { computePartialAddress } from '@aztec/stdlib/contract';
+import { GasSettings } from '@aztec/stdlib/gas';
 import { getContract } from 'viem';
 import { MNEMONIC } from '../fixtures/fixtures.js';
-import { addAccounts, createSnapshotManager } from '../fixtures/snapshot_manager.js';
+import { createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';
 import { ensureAccountsPubliclyDeployed, getBalancesFn, setupCanonicalFeeJuice } from '../fixtures/utils.js';
 import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_harness.js';
@@ -27,8 +29,9 @@ const { E2E_DATA_PATH: dataPath } = process.env;
  * FundAlice: Mints private and public bananas to Alice.
  * SetupSubscription: Deploys a counter contract and a subscription contract, and mints Fee Juice to the subscription contract.
  */ export class FeesTest {
+    numberOfAccounts;
     snapshotManager;
-    wallets = [];
+    wallets;
     logger;
     pxe;
     aztecNode;
@@ -47,16 +50,33 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     counterContract;
     subscriptionContract;
     feeJuiceBridgeTestHarness;
+    context;
+    chainMonitor;
     getCoinbaseBalance;
+    getCoinbaseSequencerRewards;
     getGasBalanceFn;
     getBananaPublicBalanceFn;
     getBananaPrivateBalanceFn;
-    ALICE_INITIAL_BANANAS = BigInt(1e22);
-    SUBSCRIPTION_AMOUNT = BigInt(1e19);
-    APP_SPONSORED_TX_GAS_LIMIT = BigInt(10e9);
-    constructor(testName){
+    getProverFee;
+    ALICE_INITIAL_BANANAS;
+    SUBSCRIPTION_AMOUNT;
+    APP_SPONSORED_TX_GAS_LIMIT;
+    constructor(testName, numberOfAccounts = 3, setupOptions = {}){
+        this.numberOfAccounts = numberOfAccounts;
+        this.wallets = [];
+        this.ALICE_INITIAL_BANANAS = BigInt(1e22);
+        this.SUBSCRIPTION_AMOUNT = BigInt(1e19);
+        this.APP_SPONSORED_TX_GAS_LIMIT = BigInt(10e9);
+        if (!numberOfAccounts) {
+            throw new Error('There must be at least 1 initial account.');
+        }
         this.logger = createLogger(`e2e:e2e_fees:${testName}`);
-        this.snapshotManager = createSnapshotManager(`e2e_fees/${testName}`, dataPath);
+        this.snapshotManager = createSnapshotManager(`e2e_fees/${testName}-${numberOfAccounts}`, dataPath, {
+            startProverNode: true,
+            ...setupOptions
+        }, {
+            ...setupOptions
+        });
     }
     async setup() {
         const context = await this.snapshotManager.setup();
@@ -64,11 +84,17 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             feeRecipient: this.sequencerAddress,
             coinbase: this.coinbase
         });
+        const rollupContract = RollupContract.getFromConfig(context.aztecNodeConfig);
+        this.chainMonitor = new ChainMonitor(rollupContract, this.logger, 200).start();
         return this;
     }
     async teardown() {
+        this.chainMonitor.stop();
         await this.snapshotManager.teardown();
     }
+    setIsMarkingAsProven(b) {
+        this.context.watcher.setIsMarkingAsProven(b);
+    }
     async catchUpProvenChain() {
         const bn = await this.aztecNode.getBlockNumber();
         while(await this.aztecNode.getProvenBlockNumber() < bn){
@@ -93,16 +119,14 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         await this.applyDeployBananaTokenSnapshot();
     }
     async applyInitialAccountsSnapshot() {
-        await this.snapshotManager.snapshot('initial_accounts', addAccounts(3, this.logger), async ({ accountKeys }, { pxe, aztecNode, aztecNodeConfig })=>{
+        await this.snapshotManager.snapshot('initial_accounts', deployAccounts(this.numberOfAccounts, this.logger), async ({ deployedAccounts }, { pxe, aztecNode, aztecNodeConfig })=>{
             this.pxe = pxe;
             this.aztecNode = aztecNode;
             this.gasSettings = GasSettings.default({
                 maxFeesPerGas: (await this.aztecNode.getCurrentBaseFees()).mul(2)
             });
-            this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrl, pxe);
-            const accountManagers = await Promise.all(accountKeys.map((ak)=>getSchnorrAccount(pxe, ak[0], ak[1], 1)));
-            await Promise.all(accountManagers.map((a)=>a.register()));
-            this.wallets = await Promise.all(accountManagers.map((a)=>a.getWallet()));
+            this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
+            this.wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
             this.wallets.forEach((w, i)=>this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
             [this.aliceWallet, this.bobWallet] = this.wallets.slice(0, 2);
             [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.wallets.map((w)=>w.getAddress());
@@ -110,13 +134,12 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             this.fpcAdmin = this.aliceAddress;
             const canonicalFeeJuice = await getCanonicalFeeJuice();
             this.feeJuiceContract = await FeeJuiceContract.at(canonicalFeeJuice.address, this.aliceWallet);
-            const bobInstance = (await this.bobWallet.getContractMetadata(this.bobAddress)).contractInstance;
-            if (!bobInstance) {
-                throw new Error('Bob instance not found');
+            if (this.numberOfAccounts > 1) {
+                const bobInstance = (await this.bobWallet.getContractMetadata(this.bobAddress)).contractInstance;
+                await this.aliceWallet.registerAccount(deployedAccounts[1].secret, await computePartialAddress(bobInstance));
             }
-            await this.aliceWallet.registerAccount(accountKeys[1][0], await computePartialAddress(bobInstance));
             this.coinbase = EthAddress.random();
-            const { publicClient, walletClient } = createL1Clients(aztecNodeConfig.l1RpcUrl, MNEMONIC);
+            const { publicClient, walletClient } = createL1Clients(aztecNodeConfig.l1RpcUrls, MNEMONIC);
             this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
                 aztecNode: aztecNode,
                 pxeService: pxe,
@@ -132,11 +155,12 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     }
     async applySetupFeeJuiceSnapshot() {
         await this.snapshotManager.snapshot('setup_fee_juice', async (context)=>{
-            await setupCanonicalFeeJuice(new SignerlessWallet(context.pxe, new DefaultMultiCallEntrypoint(context.aztecNodeConfig.l1ChainId, context.aztecNodeConfig.version)));
+            await setupCanonicalFeeJuice(context.pxe);
         }, async (_data, context)=>{
+            this.context = context;
             this.feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.aliceWallet);
             this.getGasBalanceFn = getBalancesFn('⛽', this.feeJuiceContract.methods.balance_of_public, this.logger);
-            const { publicClient, walletClient } = createL1Clients(context.aztecNodeConfig.l1RpcUrl, MNEMONIC);
+            const { publicClient, walletClient } = createL1Clients(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
             this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
                 aztecNode: context.aztecNode,
                 pxeService: context.pxe,
@@ -169,7 +193,8 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             return {
                 bananaFPCAddress: bananaFPC.address,
                 feeJuiceAddress: feeJuiceContract.address,
-                l1FeeJuiceAddress: this.feeJuiceBridgeTestHarness.l1FeeJuiceAddress
+                l1FeeJuiceAddress: this.feeJuiceBridgeTestHarness.l1FeeJuiceAddress,
+                rollupAddress: context.deployL1ContractsValues.l1ContractAddresses.rollupAddress
             };
         }, async (data, context)=>{
             const bananaFPC = await FPCContract.at(data.bananaFPCAddress, this.aliceWallet);
@@ -178,7 +203,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             this.getBananaPublicBalanceFn = getBalancesFn('🍌.public', this.bananaCoin.methods.balance_of_public, logger);
             this.getBananaPrivateBalanceFn = getBalancesFn('🍌.private', this.bananaCoin.methods.balance_of_private, logger);
             this.getCoinbaseBalance = async ()=>{
-                const { walletClient } = createL1Clients(context.aztecNodeConfig.l1RpcUrl, MNEMONIC);
+                const { walletClient } = createL1Clients(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
                 const gasL1 = getContract({
                     address: data.l1FeeJuiceAddress.toString(),
                     abi: TestERC20Abi,
@@ -188,6 +213,29 @@ const { E2E_DATA_PATH: dataPath } = process.env;
                     this.coinbase.toString()
                 ]);
             };
+            this.getCoinbaseSequencerRewards = async ()=>{
+                const { walletClient } = createL1Clients(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+                const rollup = getContract({
+                    address: data.rollupAddress.toString(),
+                    abi: RollupAbi,
+                    client: walletClient
+                });
+                return await rollup.read.getSequencerRewards([
+                    this.coinbase.toString()
+                ]);
+            };
+            this.getProverFee = async (blockNumber)=>{
+                const { walletClient } = createL1Clients(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+                const rollup = getContract({
+                    address: data.rollupAddress.toString(),
+                    abi: RollupAbi,
+                    client: walletClient
+                });
+                const provingCostPerMana = await rollup.read.getProvingCostPerManaInFeeAsset();
+                const block = await this.pxe.getBlock(blockNumber);
+                const mana = block.header.totalManaUsed.toBigInt();
+                return mana * provingCostPerMana;
+            };
         });
     }
     async applyFundAliceWithBananas() {
@@ -201,11 +249,6 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             await this.mintPrivateBananas(this.ALICE_INITIAL_BANANAS, this.aliceAddress);
         }, ()=>Promise.resolve());
     }
-    async applyFundAliceWithFeeJuice() {
-        await this.snapshotManager.snapshot('fund_alice_with_fee_juice', async ()=>{
-            await this.mintAndBridgeFeeJuice(this.aliceAddress, FEE_FUNDING_FOR_TESTER_ACCOUNT);
-        }, ()=>Promise.resolve());
-    }
     async applySetupSubscription() {
         await this.snapshotManager.snapshot('setup_subscription', async ()=>{
             const counterContract = await CounterContract.deploy(this.bobWallet, 0, this.bobAddress).send().deployed();

package/dest/e2e_nested_contract/nested_contract_test.d.ts

@@ -0,0 +1,26 @@
+import { type AccountWallet, type CompleteAddress, type Logger, type PXE } from '@aztec/aztec.js';
+import { ChildContract } from '@aztec/noir-contracts.js/Child';
+import { ParentContract } from '@aztec/noir-contracts.js/Parent';
+import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
+export declare class NestedContractTest {
+    private numberOfAccounts;
+    private snapshotManager;
+    logger: Logger;
+    wallets: AccountWallet[];
+    accounts: CompleteAddress[];
+    pxe: PXE;
+    parentContract: ParentContract;
+    childContract: ChildContract;
+    constructor(testName: string, numberOfAccounts?: number);
+    /**
+     * Adds two state shifts to snapshot manager.
+     * 1. Add 3 accounts.
+     * 2. Publicly deploy accounts
+     */
+    applyBaseSnapshots(): Promise<void>;
+    setup(): Promise<void>;
+    teardown(): Promise<void>;
+    snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
+    applyManualSnapshots(): Promise<void>;
+}
+//# sourceMappingURL=nested_contract_test.d.ts.map

package/dest/e2e_nested_contract/nested_contract_test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nested_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_nested_contract/nested_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAE,KAAK,GAAG,EAAgB,MAAM,iBAAiB,CAAC;AAChH,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAIzC,qBAAa,kBAAkB;IAUC,OAAO,CAAC,gBAAgB;IATtD,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,GAAG,EAAG,GAAG,CAAC;IAEV,cAAc,EAAG,cAAc,CAAC;IAChC,aAAa,EAAG,aAAa,CAAC;gBAElB,QAAQ,EAAE,MAAM,EAAU,gBAAgB,SAAI;IAK1D;;;;OAIG;IACG,kBAAkB;IAsBlB,KAAK;IAIL,QAAQ;IAId,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,oBAAoB;CAc3B"}

package/dest/e2e_nested_contract/nested_contract_test.js

@@ -1,31 +1,33 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
+import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import { createLogger } from '@aztec/aztec.js';
 import { ChildContract } from '@aztec/noir-contracts.js/Child';
 import { ParentContract } from '@aztec/noir-contracts.js/Parent';
-import { addAccounts, createSnapshotManager, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
+import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
 const { E2E_DATA_PATH: dataPath } = process.env;
 export class NestedContractTest {
+    numberOfAccounts;
     snapshotManager;
     logger;
-    wallets = [];
-    accounts = [];
+    wallets;
+    accounts;
     pxe;
     parentContract;
     childContract;
-    constructor(testName){
+    constructor(testName, numberOfAccounts = 1){
+        this.numberOfAccounts = numberOfAccounts;
+        this.wallets = [];
+        this.accounts = [];
+        this.snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
         this.logger = createLogger(`e2e:e2e_nested_contract:${testName}`);
-        this.snapshotManager = createSnapshotManager(`e2e_nested_contract/${testName}`, dataPath);
+        this.snapshotManager = createSnapshotManager(`e2e_nested_contract/${testName}-${numberOfAccounts}`, dataPath);
     }
     /**
    * Adds two state shifts to snapshot manager.
    * 1. Add 3 accounts.
    * 2. Publicly deploy accounts
    */ async applyBaseSnapshots() {
-        await this.snapshotManager.snapshot('3_accounts', addAccounts(3, this.logger), async ({ accountKeys }, { pxe })=>{
-            this.wallets = await Promise.all(accountKeys.map(async (ak)=>{
-                const account = await getSchnorrAccount(pxe, ak[0], ak[1], 1);
-                return account.getWallet();
-            }));
+        await this.snapshotManager.snapshot('accounts', deployAccounts(this.numberOfAccounts, this.logger), async ({ deployedAccounts }, { pxe })=>{
+            this.wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
             this.accounts = await pxe.getRegisteredAccounts();
             this.wallets.forEach((w, i)=>this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
             this.pxe = pxe;
@@ -41,7 +43,7 @@ export class NestedContractTest {
     async teardown() {
         await this.snapshotManager.teardown();
     }
-    snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
+    snapshot;
     async applyManualSnapshots() {
         await this.snapshotManager.snapshot('manual', async ()=>{
             const parentContract = await ParentContract.deploy(this.wallets[0]).send().deployed();

package/dest/e2e_p2p/p2p_network.d.ts

@@ -0,0 +1,61 @@
+import type { InitialAccountData } from '@aztec/accounts/testing';
+import type { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
+import type { AccountWalletWithSecretKey } from '@aztec/aztec.js';
+import { ChainMonitor } from '@aztec/aztec.js/ethereum';
+import { type Logger } from '@aztec/foundation/log';
+import { SpamContract } from '@aztec/noir-contracts.js/Spam';
+import type { BootstrapNode } from '@aztec/p2p/bootstrap';
+import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
+import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
+export declare const WAIT_FOR_TX_TIMEOUT: number;
+export declare const SHORTENED_BLOCK_TIME_CONFIG: {
+    aztecSlotDuration: number;
+    ethereumSlotDuration: number;
+};
+export declare class P2PNetworkTest {
+    bootstrapNodeEnr: string;
+    bootNodePort: number;
+    private numberOfNodes;
+    private metricsPort?;
+    private snapshotManager;
+    private baseAccount;
+    logger: Logger;
+    monitor: ChainMonitor;
+    ctx: SubsystemsContext;
+    attesterPrivateKeys: `0x${string}`[];
+    attesterPublicKeys: string[];
+    proposerPrivateKeys: `0x${string}`[];
+    peerIdPrivateKeys: string[];
+    deployedAccounts: InitialAccountData[];
+    prefilledPublicData: PublicDataTreeLeaf[];
+    wallet?: AccountWalletWithSecretKey;
+    spamContract?: SpamContract;
+    bootstrapNode?: BootstrapNode;
+    private cleanupInterval;
+    private gasUtils;
+    constructor(testName: string, bootstrapNodeEnr: string, bootNodePort: number, numberOfNodes: number, initialValidatorConfig: AztecNodeConfig, metricsPort?: number | undefined);
+    static create({ testName, numberOfNodes, basePort, metricsPort, initialConfig, }: {
+        testName: string;
+        numberOfNodes: number;
+        basePort?: number;
+        metricsPort?: number;
+        initialConfig?: Partial<AztecNodeConfig>;
+    }): Promise<P2PNetworkTest>;
+    get fundedAccount(): InitialAccountData;
+    /**
+     * Start a loop to sync the mock system time with the L1 block time
+     */
+    startSyncMockSystemTimeInterval(): void;
+    /**
+     * When using fake timers, we need to keep the system and anvil clocks in sync.
+     */
+    syncMockSystemTime(): Promise<void>;
+    applyBaseSnapshots(): Promise<void>;
+    setupAccount(): Promise<void>;
+    deploySpamContract(): Promise<void>;
+    removeInitialNode(): Promise<void>;
+    setup(): Promise<void>;
+    stopNodes(nodes: AztecNodeService[]): Promise<void>;
+    teardown(): Promise<void>;
+}
+//# sourceMappingURL=p2p_network.d.ts.map

package/dest/e2e_p2p/p2p_network.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAIxD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAa9D,OAAO,EAEL,KAAK,iBAAiB,EAGvB,MAAM,iCAAiC,CAAC;AAOzC,eAAO,MAAM,mBAAmB,QAA0C,CAAC;AAE3E,eAAO,MAAM,2BAA2B;;;CAGvC,CAAC;AAEF,qBAAa,cAAc;IA2BhB,gBAAgB,EAAE,MAAM;IACxB,YAAY,EAAE,MAAM;IAC3B,OAAO,CAAC,aAAa;IAGrB,OAAO,CAAC,WAAW,CAAC;IA/BtB,OAAO,CAAC,eAAe,CAAmB;IAC1C,OAAO,CAAC,WAAW,CAAC;IAEb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAG,YAAY,CAAC;IAEvB,GAAG,EAAG,iBAAiB,CAAC;IACxB,mBAAmB,EAAE,KAAK,MAAM,EAAE,EAAE,CAAM;IAC1C,kBAAkB,EAAE,MAAM,EAAE,CAAM;IAClC,mBAAmB,EAAE,KAAK,MAAM,EAAE,EAAE,CAAM;IAC1C,iBAAiB,EAAE,MAAM,EAAE,CAAM;IAEjC,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC5C,mBAAmB,EAAE,kBAAkB,EAAE,CAAM;IAE/C,MAAM,CAAC,EAAE,0BAA0B,CAAC;IACpC,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B,aAAa,CAAC,EAAE,aAAa,CAAC;IAErC,OAAO,CAAC,eAAe,CAAyC;IAEhE,OAAO,CAAC,QAAQ,CAA6C;gBAG3D,QAAQ,EAAE,MAAM,EACT,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EAC7B,sBAAsB,EAAE,eAAe,EAE/B,WAAW,CAAC,oBAAQ;WAmCjB,MAAM,CAAC,EAClB,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,WAAW,EACX,aAAa,GACd,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;KAC1C;IAcD,IAAI,aAAa,uBAKhB;IAED;;OAEG;IACI,+BAA+B;IAMtC;;OAEG;IACU,kBAAkB;IAczB,kBAAkB;IA8FlB,YAAY;IAYZ,kBAAkB;IAoBlB,iBAAiB;IAsBjB,KAAK;IA0BL,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE;IAanC,QAAQ;CAQf"}