@aztec/end-to-end 1.2.1 → 2.0.0-nightly.20250814

package/dest/e2e_epochs/epochs_test.d.ts

@@ -5,15 +5,24 @@ import { RollupContract } from '@aztec/ethereum/contracts';
 import { ChainMonitor, type Delayer } from '@aztec/ethereum/test';
 import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import { ProverNode } from '@aztec/prover-node';
-import type { L2BlockNumber } from '@aztec/stdlib/block';
+import { type SequencerClient, type SequencerEvents } from '@aztec/sequencer-client';
+import type { EthAddress, L2BlockNumber } from '@aztec/stdlib/block';
 import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import { type EndToEndContext, type SetupOptions } from '../fixtures/utils.js';
 export declare const WORLD_STATE_BLOCK_HISTORY = 2;
 export declare const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
 export declare const ARCHIVER_POLL_INTERVAL = 50;
-export type EpochsTestOpts = Partial<Pick<SetupOptions, 'startProverNode' | 'aztecProofSubmissionEpochs' | 'aztecEpochDuration' | 'proverTestDelayMs' | 'l1PublishRetryIntervalMS' | 'txPropagationMaxQueryAttempts' | 'proverNodeConfig' | 'ethereumSlotDuration' | 'aztecSlotDuration' | 'initialValidators' | 'mockGossipSubNetwork' | 'disableAnvilTestWatcher'>> & {
+export declare const DEFAULT_L1_BLOCK_TIME: number;
+export type EpochsTestOpts = Partial<SetupOptions> & {
     numberOfAccounts?: number;
 };
+export type TrackedSequencerEvent = {
+    [K in keyof SequencerEvents]: Parameters<SequencerEvents[K]>[0] & {
+        type: K;
+        sequencerIndex: number;
+        validator: EthAddress;
+    };
+}[keyof SequencerEvents];
 /**
  * Tests building of epochs using fast block times and short epochs.
  * Spawns an aztec node and a prover node with fake proofs.
@@ -45,6 +54,7 @@ export declare class EpochsTestContext {
     createProverNode(): Promise<ProverNode>;
     createNonValidatorNode(opts?: Partial<AztecNodeConfig>): Promise<AztecNodeService>;
     createValidatorNode(privateKeys: `0x${string}`[], opts?: Partial<AztecNodeConfig> & {
+        txDelayerMaxInclusionTimeIntoSlot?: number;
         dontStartSequencer?: boolean;
     }): Promise<AztecNodeService>;
     private createNode;
@@ -68,5 +78,9 @@ export declare class EpochsTestContext {
     }>;
     /** Verifies whether the given block number is found on the aztec node. */
     verifyHistoricBlock(blockNumber: L2BlockNumber, expectedSuccess: boolean): Promise<void>;
+    watchSequencerEvents(sequencers: SequencerClient[], getMetadata?: (i: number) => Record<string, any>): {
+        failEvents: TrackedSequencerEvent[];
+        stateChanges: TrackedSequencerEvent[];
+    };
 }
 //# sourceMappingURL=epochs_test.d.ts.map

package/dest/e2e_epochs/epochs_test.d.ts.map

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

package/dest/e2e_epochs/epochs_test.js

@@ -1,13 +1,14 @@
 import { AztecNodeService } from '@aztec/aztec-node';
-import { Fr, MerkleTreeId, getContractInstanceFromDeployParams, getTimestampRangeForEpoch, retryUntil, sleep } from '@aztec/aztec.js';
+import { Fr, MerkleTreeId, getContractInstanceFromInstantiationParams, getTimestampRangeForEpoch, retryUntil, sleep } from '@aztec/aztec.js';
 import { DefaultL1ContractsConfig, createExtendedL1Client } from '@aztec/ethereum';
 import { RollupContract } from '@aztec/ethereum/contracts';
-import { ChainMonitor, waitUntilL1Timestamp, withDelayer } from '@aztec/ethereum/test';
+import { ChainMonitor, DelayedTxUtils, waitUntilL1Timestamp, withDelayer } from '@aztec/ethereum/test';
 import { SecretValue } from '@aztec/foundation/config';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { withLogNameSuffix } from '@aztec/foundation/log';
 import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import { getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
+import { SequencerState } from '@aztec/sequencer-client';
 import { getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
 import { join } from 'path';
@@ -16,6 +17,7 @@ import { createAndSyncProverNode, getPrivateKeyFromIndex, setup } from '../fixtu
 export const WORLD_STATE_BLOCK_HISTORY = 2;
 export const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
 export const ARCHIVER_POLL_INTERVAL = 50;
+export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
 /**
  * Tests building of epochs using fast block times and short epochs.
  * Spawns an aztec node and a prover node with fake proofs.
@@ -40,7 +42,7 @@ export const ARCHIVER_POLL_INTERVAL = 50;
         return test;
     }
     static getSlotDurations(opts = {}) {
-        const envEthereumSlotDuration = process.env.L1_BLOCK_TIME ? parseInt(process.env.L1_BLOCK_TIME) : 8;
+        const envEthereumSlotDuration = process.env.L1_BLOCK_TIME ? parseInt(process.env.L1_BLOCK_TIME) : DEFAULT_L1_BLOCK_TIME;
         const ethereumSlotDuration = opts.ethereumSlotDuration ?? envEthereumSlotDuration;
         const aztecSlotDuration = opts.aztecSlotDuration ?? ethereumSlotDuration * 2;
         const aztecEpochDuration = opts.aztecEpochDuration ?? 4;
@@ -95,7 +97,7 @@ export const ARCHIVER_POLL_INTERVAL = 50;
         this.l1Client = context.deployL1ContractsValues.l1Client;
         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.monitor = new ChainMonitor(this.rollup, context.dateProvider, 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;
@@ -130,7 +132,9 @@ export const ARCHIVER_POLL_INTERVAL = 50;
                 proverId: Fr.fromString(suffix)
             }, {
                 dataDirectory: join(this.context.config.dataDirectory, randomBytes(8).toString('hex'))
-            }, this.context.aztecNode));
+            }, this.context.aztecNode, undefined, {
+                dateProvider: this.context.dateProvider
+            }));
         this.proverNodes.push(proverNode);
         return proverNode;
     }
@@ -173,6 +177,17 @@ export const ARCHIVER_POLL_INTERVAL = 50;
                 prefilledPublicData: this.context.prefilledPublicData,
                 ...opts
             }));
+        // REFACTOR: We're getting too much into the internals of the sequencer here.
+        // We should have a single method for constructing an aztec node that returns a TestAztecNodeService
+        // which directly exposes the delayer and sets any test config.
+        if (opts.txDelayerMaxInclusionTimeIntoSlot !== undefined) {
+            this.logger.info(`Setting tx delayer max inclusion time into slot to ${opts.txDelayerMaxInclusionTimeIntoSlot} seconds`);
+            const sequencer = node.getSequencer();
+            const publisher = sequencer.sequencer.publisher;
+            const delayed = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, this.L1_BLOCK_TIME_IN_S);
+            delayed.delayer.setMaxInclusionTimeIntoSlot(opts.txDelayerMaxInclusionTimeIntoSlot);
+            publisher.l1TxUtils = delayed;
+        }
         this.nodes.push(node);
         return node;
     }
@@ -227,7 +242,7 @@ export const ARCHIVER_POLL_INTERVAL = 50;
         }
     }
     /** Registers the SpamContract on the given wallet. */ async registerSpamContract(wallet, salt = Fr.ZERO) {
-        const instance = await getContractInstanceFromDeployParams(SpamContract.artifact, {
+        const instance = await getContractInstanceFromInstantiationParams(SpamContract.artifact, {
             constructorArgs: [],
             constructorArtifact: undefined,
             salt,
@@ -243,7 +258,7 @@ export const ARCHIVER_POLL_INTERVAL = 50;
     /** Creates an L1 client using a fresh account with funds from anvil, with a tx delayer already set up. */ async createL1Client() {
         const { client, delayer } = withDelayer(createExtendedL1Client([
             ...this.l1Client.chain.rpcUrls.default.http
-        ], privateKeyToAccount(this.getNextPrivateKey()), this.l1Client.chain), {
+        ], privateKeyToAccount(this.getNextPrivateKey()), this.l1Client.chain), this.context.dateProvider, {
             ethereumSlotDuration: this.L1_BLOCK_TIME_IN_S
         });
         expect(await client.getBalance({
@@ -263,4 +278,47 @@ export const ARCHIVER_POLL_INTERVAL = 50;
         ]).then((_)=>true).catch((_)=>false);
         expect(result).toBe(expectedSuccess);
     }
+    watchSequencerEvents(sequencers, getMetadata = ()=>({})) {
+        const stateChanges = [];
+        const failEvents = [];
+        // Note we do not include the 'tx-count-check-failed' event here, since it is fine if we dont build
+        // due to lack of txs available.
+        const failEventsKeys = [
+            'block-build-failed',
+            'block-publish-failed',
+            'proposer-rollup-check-failed'
+        ];
+        const makeEvent = (i, eventName, args)=>({
+                ...args,
+                type: eventName,
+                sequencerIndex: i + 2,
+                ...getMetadata(i)
+            });
+        sequencers.forEach((sequencer, i)=>{
+            const sequencerIndex = i + 2;
+            sequencer.getSequencer().on('state-changed', (args)=>{
+                const noisyStates = [
+                    SequencerState.IDLE,
+                    SequencerState.PROPOSER_CHECK,
+                    SequencerState.SYNCHRONIZING
+                ];
+                if (!noisyStates.includes(args.newState)) {
+                    const evt = makeEvent(i, 'state-changed', args);
+                    stateChanges.push(evt);
+                    this.logger.verbose(`Sequencer ${sequencerIndex} transitioned from state ${args.oldState} to state ${args.newState}`, evt);
+                }
+            });
+            failEventsKeys.forEach((eventName)=>{
+                sequencer.getSequencer().on(eventName, (args)=>{
+                    const evt = makeEvent(i, eventName, args);
+                    failEvents.push(evt);
+                    this.logger.error(`Failed event ${eventName} from sequencer ${sequencerIndex}`, evt);
+                });
+            });
+        });
+        return {
+            failEvents,
+            stateChanges
+        };
+    }
 }

package/dest/e2e_fees/bridging_race.notest.js

@@ -53,7 +53,9 @@ describe('e2e_fees bridging_race', ()=>{
         const amount = FEE_FUNDING_FOR_TESTER_ACCOUNT;
         const claim = await t.feeJuiceBridgeTestHarness.prepareTokensOnL1(amount, bobsAddress);
         const { claimSecret: secret, messageLeafIndex: index } = claim;
-        await t.feeJuiceContract.methods.claim(bobsAddress, amount, secret, index).send().wait();
+        await t.feeJuiceContract.methods.claim(bobsAddress, amount, secret, index).send({
+            from: bobsAddress
+        }).wait();
         const [balance] = await t.getGasBalanceFn(bobsAddress);
         expect(balance).toEqual(amount);
     });

package/dest/e2e_fees/fees_test.d.ts

@@ -1,6 +1,6 @@
 import { type AccountWallet, type AztecAddress, type AztecNode, type Logger, type PXE } from '@aztec/aztec.js';
-import { CheatCodes } from '@aztec/aztec.js/testing';
-import { type DeployL1ContractsArgs } from '@aztec/ethereum';
+import { CheatCodes } from '@aztec/aztec/testing';
+import { type DeployL1ContractsArgs, RollupContract } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { AppSubscriptionContract } from '@aztec/noir-contracts.js/AppSubscription';
@@ -27,6 +27,7 @@ export declare class FeesTest {
     private numberOfAccounts;
     private snapshotManager;
     private wallets;
+    private accounts;
     logger: Logger;
     pxe: PXE;
     aztecNode: AztecNode;
@@ -39,6 +40,7 @@ export declare class FeesTest {
     coinbase: EthAddress;
     fpcAdmin: AztecAddress;
     gasSettings: GasSettings;
+    rollupContract: RollupContract;
     feeJuiceContract: FeeJuiceContract;
     bananaCoin: BananaCoin;
     bananaFPC: FPCContract;
@@ -66,7 +68,7 @@ export declare class FeesTest {
         sequencerBlockRewards: bigint;
         proverBlockRewards: bigint;
     }>;
-    mintAndBridgeFeeJuice(address: AztecAddress, amount: bigint): Promise<void>;
+    mintAndBridgeFeeJuice(minter: AztecAddress, recipient: 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>;
@@ -78,6 +80,5 @@ export declare class FeesTest {
     applySponsoredFPCSetupSnapshot(): 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

@@ -1 +1 @@
-{"version":3,"file":"fees_test.d.ts","sourceRoot":"","sources":["../../src/e2e_fees/fees_test.ts"],"names":[],"mappings":"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"}
+{"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,17 +1,15 @@
 import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import { createLogger, sleep } from '@aztec/aztec.js';
-import { CheatCodes } from '@aztec/aztec.js/testing';
+import { CheatCodes } from '@aztec/aztec/testing';
 import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
-import { RollupContract, createExtendedL1Client, getPublicClient, l1Artifacts } from '@aztec/ethereum';
+import { RollupContract, createExtendedL1Client } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { TestERC20Abi } from '@aztec/l1-artifacts';
-import { AppSubscriptionContract } from '@aztec/noir-contracts.js/AppSubscription';
 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 } from '@aztec/noir-contracts.js/Token';
-import { CounterContract } from '@aztec/noir-test-contracts.js/Counter';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { GasSettings } from '@aztec/stdlib/gas';
@@ -19,7 +17,7 @@ import { getContract } from 'viem';
 import { MNEMONIC } from '../fixtures/fixtures.js';
 import { createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';
-import { ensureAccountsPubliclyDeployed, getBalancesFn, setupSponsoredFPC } from '../fixtures/utils.js';
+import { ensureAccountContractsPublished, getBalancesFn, setupSponsoredFPC } from '../fixtures/utils.js';
 import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_harness.js';
 const { E2E_DATA_PATH: dataPath } = process.env;
 /**
@@ -35,6 +33,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     numberOfAccounts;
     snapshotManager;
     wallets;
+    accounts;
     logger;
     pxe;
     aztecNode;
@@ -47,6 +46,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     coinbase;
     fpcAdmin;
     gasSettings;
+    rollupContract;
     feeJuiceContract;
     bananaCoin;
     bananaFPC;
@@ -68,6 +68,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     constructor(testName, numberOfAccounts = 3, setupOptions = {}){
         this.numberOfAccounts = numberOfAccounts;
         this.wallets = [];
+        this.accounts = [];
         this.ALICE_INITIAL_BANANAS = BigInt(1e22);
         this.SUBSCRIPTION_AMOUNT = BigInt(1e19);
         this.APP_SPONSORED_TX_GAS_LIMIT = BigInt(10e9);
@@ -88,8 +89,8 @@ 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();
+        this.rollupContract = RollupContract.getFromConfig(context.aztecNodeConfig);
+        this.chainMonitor = new ChainMonitor(this.rollupContract, context.dateProvider, this.logger, 200).start();
         return this;
     }
     async teardown() {
@@ -106,13 +107,8 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         }
     }
     async getBlockRewards() {
-        const rewardDistributor = getContract({
-            address: this.context.deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(),
-            abi: l1Artifacts.rewardDistributor.contractAbi,
-            client: this.context.deployL1ContractsValues.l1Client
-        });
-        const blockReward = await rewardDistributor.read.BLOCK_REWARD();
-        const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(EthAddress.fromString(rewardDistributor.address));
+        const blockReward = await this.rollupContract.getBlockReward();
+        const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(this.context.deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress);
         const toDistribute = balance > blockReward ? blockReward : balance;
         const sequencerBlockRewards = toDistribute / 2n;
         const proverBlockRewards = toDistribute - sequencerBlockRewards;
@@ -121,15 +117,21 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             proverBlockRewards
         };
     }
-    async mintAndBridgeFeeJuice(address, amount) {
-        const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(amount, address);
+    async mintAndBridgeFeeJuice(minter, recipient, amount) {
+        const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(amount, recipient);
         const { claimSecret: secret, messageLeafIndex: index } = claim;
-        await this.feeJuiceContract.methods.claim(address, amount, secret, index).send().wait();
+        await this.feeJuiceContract.methods.claim(recipient, amount, secret, index).send({
+            from: minter
+        }).wait();
     }
     /** Alice mints bananaCoin tokens privately to the target address and redeems them. */ async mintPrivateBananas(amount, address) {
-        const balanceBefore = await this.bananaCoin.methods.balance_of_private(address).simulate();
-        await mintTokensToPrivate(this.bananaCoin, this.aliceWallet, address, amount);
-        const balanceAfter = await this.bananaCoin.methods.balance_of_private(address).simulate();
+        const balanceBefore = await this.bananaCoin.methods.balance_of_private(address).simulate({
+            from: this.aliceAddress
+        });
+        await mintTokensToPrivate(this.bananaCoin, this.aliceAddress, this.aliceWallet, address, amount);
+        const balanceAfter = await this.bananaCoin.methods.balance_of_private(address).simulate({
+            from: this.aliceAddress
+        });
         expect(balanceAfter).toEqual(balanceBefore + amount);
     }
     async applyBaseSnapshots() {
@@ -148,8 +150,9 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             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.accounts = this.wallets.map((w)=>w.getAddress());
             [this.aliceWallet, this.bobWallet] = this.wallets.slice(0, 2);
-            [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.wallets.map((w)=>w.getAddress());
+            [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.accounts;
             // We set Alice as the FPC admin to avoid the need for deployment of another account.
             this.fpcAdmin = this.aliceAddress;
             const canonicalFeeJuice = await getCanonicalFeeJuice();
@@ -158,13 +161,13 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         });
     }
     async applyPublicDeployAccountsSnapshot() {
-        await this.snapshotManager.snapshot('public_deploy_accounts', ()=>ensureAccountsPubliclyDeployed(this.aliceWallet, this.wallets));
+        await this.snapshotManager.snapshot('public_deploy_accounts', ()=>ensureAccountContractsPublished(this.aliceWallet, this.wallets));
     }
     async applySetupFeeJuiceSnapshot() {
         await this.snapshotManager.snapshot('setup_fee_juice', async ()=>{}, 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);
+            this.getGasBalanceFn = getBalancesFn('⛽', this.feeJuiceContract.methods.balance_of_public, this.aliceAddress, this.logger);
             this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
                 aztecNode: context.aztecNode,
                 aztecNodeAdmin: context.aztecNode,
@@ -177,7 +180,9 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     }
     async applyDeployBananaTokenSnapshot() {
         await this.snapshotManager.snapshot('deploy_banana_token', async ()=>{
-            const bananaCoin = await BananaCoin.deploy(this.aliceWallet, this.aliceAddress, 'BC', 'BC', 18n).send().deployed();
+            const bananaCoin = await BananaCoin.deploy(this.aliceWallet, this.aliceAddress, 'BC', 'BC', 18n).send({
+                from: this.aliceAddress
+            }).deployed();
             this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
             return {
                 bananaCoinAddress: bananaCoin.address
@@ -185,18 +190,20 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         }, async ({ bananaCoinAddress })=>{
             this.bananaCoin = await BananaCoin.at(bananaCoinAddress, this.aliceWallet);
             const logger = this.logger;
-            this.getBananaPublicBalanceFn = getBalancesFn('🍌.public', this.bananaCoin.methods.balance_of_public, logger);
-            this.getBananaPrivateBalanceFn = getBalancesFn('🍌.private', this.bananaCoin.methods.balance_of_private, logger);
+            this.getBananaPublicBalanceFn = getBalancesFn('🍌.public', this.bananaCoin.methods.balance_of_public, this.aliceAddress, logger);
+            this.getBananaPrivateBalanceFn = getBalancesFn('🍌.private', this.bananaCoin.methods.balance_of_private, this.aliceAddress, logger);
         });
     }
     async applyFPCSetupSnapshot() {
         await this.snapshotManager.snapshot('fpc_setup', async (context)=>{
             const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-            expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPubliclyDeployed).toBe(true);
+            expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
             const bananaCoin = this.bananaCoin;
-            const bananaFPC = await FPCContract.deploy(this.aliceWallet, bananaCoin.address, this.fpcAdmin).send().deployed();
+            const bananaFPC = await FPCContract.deploy(this.aliceWallet, bananaCoin.address, this.fpcAdmin).send({
+                from: this.aliceAddress
+            }).deployed();
             this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
-            await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(FEE_FUNDING_FOR_TESTER_ACCOUNT, bananaFPC.address);
+            await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(FEE_FUNDING_FOR_TESTER_ACCOUNT, bananaFPC.address, this.aliceAddress);
             return {
                 bananaFPCAddress: bananaFPC.address,
                 feeJuiceAddress: feeJuiceContract.address,
@@ -218,25 +225,18 @@ const { E2E_DATA_PATH: dataPath } = process.env;
                 ]);
             };
             this.getCoinbaseSequencerRewards = async ()=>{
-                const l1Client = createExtendedL1Client(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
-                const rollup = new RollupContract(l1Client, data.rollupAddress);
-                return await rollup.getSequencerRewards(this.coinbase);
+                return await this.rollupContract.getSequencerRewards(this.coinbase);
             };
             this.getProverFee = async (blockNumber)=>{
                 const block = await this.pxe.getBlock(blockNumber);
-                const publicClient = getPublicClient({
-                    l1RpcUrls: context.aztecNodeConfig.l1RpcUrls,
-                    l1ChainId: context.aztecNodeConfig.l1ChainId
-                });
-                const rollup = new RollupContract(publicClient, data.rollupAddress);
                 // @todo @lherskind As we deal with #13601
                 // Right now the value is from `FeeLib.sol`
                 const L1_GAS_PER_EPOCH_VERIFIED = 1000000n;
                 // We round up
                 const mulDiv = (a, b, c)=>a * b / c + (a * b % c > 0n ? 1n : 0n);
-                const { baseFee } = await rollup.getL1FeesAt(block.header.globalVariables.timestamp);
-                const proverCost = mulDiv(mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, await rollup.getEpochDuration()), 1n, await rollup.getManaTarget()) + await rollup.getProvingCostPerMana();
-                const price = await rollup.getFeeAssetPerEth();
+                const { baseFee } = await this.rollupContract.getL1FeesAt(block.header.globalVariables.timestamp);
+                const proverCost = mulDiv(mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, await this.rollupContract.getEpochDuration()), 1n, await this.rollupContract.getManaTarget()) + await this.rollupContract.getProvingCostPerMana();
+                const price = await this.rollupContract.getFeeAssetPerEth();
                 const mana = block.header.totalManaUsed.toBigInt();
                 return mulDiv(mana * proverCost, price, 10n ** 9n);
             };
@@ -245,7 +245,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     async applySponsoredFPCSetupSnapshot() {
         await this.snapshotManager.snapshot('sponsored_fpc_setup', async (context)=>{
             const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-            expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPubliclyDeployed).toBe(true);
+            expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
             const sponsoredFPC = await setupSponsoredFPC(context.pxe);
             this.logger.info(`SponsoredFPC at ${sponsoredFPC.address}`);
             return {
@@ -258,7 +258,9 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     async applyFundAliceWithBananas() {
         await this.snapshotManager.snapshot('fund_alice', async ()=>{
             await this.mintPrivateBananas(this.ALICE_INITIAL_BANANAS, this.aliceAddress);
-            await this.bananaCoin.methods.mint_to_public(this.aliceAddress, this.ALICE_INITIAL_BANANAS).send().wait();
+            await this.bananaCoin.methods.mint_to_public(this.aliceAddress, this.ALICE_INITIAL_BANANAS).send({
+                from: this.aliceAddress
+            }).wait();
         }, ()=>Promise.resolve());
     }
     async applyFundAliceWithPrivateBananas() {
@@ -266,21 +268,4 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             await this.mintPrivateBananas(this.ALICE_INITIAL_BANANAS, this.aliceAddress);
         }, ()=>Promise.resolve());
     }
-    async applySetupSubscription() {
-        await this.snapshotManager.snapshot('setup_subscription', async ()=>{
-            const counterContract = await CounterContract.deploy(this.bobWallet, 0, this.bobAddress).send().deployed();
-            // Deploy subscription contract, that allows subscriptions for SUBSCRIPTION_AMOUNT of bananas
-            const subscriptionContract = await AppSubscriptionContract.deploy(this.bobWallet, counterContract.address, this.bobAddress, this.bananaCoin.address, this.SUBSCRIPTION_AMOUNT, this.APP_SPONSORED_TX_GAS_LIMIT).send().deployed();
-            // Mint some Fee Juice to the subscription contract
-            // Could also use bridgeFromL1ToL2 from the harness, but this is more direct
-            await this.mintAndBridgeFeeJuice(subscriptionContract.address, FEE_FUNDING_FOR_TESTER_ACCOUNT);
-            return {
-                counterContractAddress: counterContract.address,
-                subscriptionContractAddress: subscriptionContract.address
-            };
-        }, async ({ counterContractAddress, subscriptionContractAddress })=>{
-            this.counterContract = await CounterContract.at(counterContractAddress, this.bobWallet);
-            this.subscriptionContract = await AppSubscriptionContract.at(subscriptionContractAddress, this.bobWallet);
-        });
-    }
 }

package/dest/e2e_nested_contract/nested_contract_test.d.ts

@@ -1,4 +1,4 @@
-import { type AccountWallet, type CompleteAddress, type Logger, type PXE } from '@aztec/aztec.js';
+import { type AccountWallet, AztecAddress, type Logger, type PXE } from '@aztec/aztec.js';
 import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
 import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
 import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
@@ -6,8 +6,8 @@ export declare class NestedContractTest {
     private numberOfAccounts;
     private snapshotManager;
     logger: Logger;
-    wallets: AccountWallet[];
-    accounts: CompleteAddress[];
+    wallet: AccountWallet;
+    defaultAccountAddress: AztecAddress;
     pxe: PXE;
     parentContract: ParentContract;
     childContract: ChildContract;

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

@@ -1 +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,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAIzC,qBAAa,kBAAkB;IAY3B,OAAO,CAAC,gBAAgB;IAX1B,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;gBAG5B,QAAQ,EAAE,MAAM,EACR,gBAAgB,SAAI;IAM9B;;;;OAIG;IACG,kBAAkB;IAsBlB,KAAK;IAIL,QAAQ;IAId,QAAQ,GAAI,CAAC,EACX,MAAM,MAAM,EACZ,OAAO,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,UAAS,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B,KAChG,OAAO,CAAC,IAAI,CAAC,CAAwD;IAElE,oBAAoB;CAc3B"}
+{"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,YAAY,EAAE,KAAK,MAAM,EAAE,KAAK,GAAG,EAAgB,MAAM,iBAAiB,CAAC;AACxG,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAIzC,qBAAa,kBAAkB;IAY3B,OAAO,CAAC,gBAAgB;IAX1B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,aAAa,CAAC;IACvB,qBAAqB,EAAG,YAAY,CAAC;IACrC,GAAG,EAAG,GAAG,CAAC;IAEV,cAAc,EAAG,cAAc,CAAC;IAChC,aAAa,EAAG,aAAa,CAAC;gBAG5B,QAAQ,EAAE,MAAM,EACR,gBAAgB,SAAI;IAM9B;;;;OAIG;IACG,kBAAkB;IAuBlB,KAAK;IAIL,QAAQ;IAId,QAAQ,GAAI,CAAC,EACX,MAAM,MAAM,EACZ,OAAO,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,UAAS,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B,KAChG,OAAO,CAAC,IAAI,CAAC,CAAwD;IAElE,oBAAoB;CAkB3B"}

package/dest/e2e_nested_contract/nested_contract_test.js

@@ -8,15 +8,13 @@ export class NestedContractTest {
     numberOfAccounts;
     snapshotManager;
     logger;
-    wallets;
-    accounts;
+    wallet;
+    defaultAccountAddress;
     pxe;
     parentContract;
     childContract;
     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}-${numberOfAccounts}`, dataPath);
@@ -27,14 +25,17 @@ export class NestedContractTest {
    * 2. Publicly deploy accounts
    */ async applyBaseSnapshots() {
         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()}`));
+            const wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
+            wallets.forEach((w, i)=>this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
+            [this.wallet] = wallets;
+            this.defaultAccountAddress = this.wallet.getAddress();
             this.pxe = pxe;
         });
         await this.snapshotManager.snapshot('public_deploy', async ()=>{}, async ()=>{
             this.logger.verbose(`Public deploy accounts...`);
-            await publicDeployAccounts(this.wallets[0], this.accounts.slice(0, 2));
+            await publicDeployAccounts(this.wallet, [
+                this.defaultAccountAddress
+            ]);
         });
     }
     async setup() {
@@ -46,15 +47,19 @@ export class NestedContractTest {
     snapshot;
     async applyManualSnapshots() {
         await this.snapshotManager.snapshot('manual', async ()=>{
-            const parentContract = await ParentContract.deploy(this.wallets[0]).send().deployed();
-            const childContract = await ChildContract.deploy(this.wallets[0]).send().deployed();
+            const parentContract = await ParentContract.deploy(this.wallet).send({
+                from: this.defaultAccountAddress
+            }).deployed();
+            const childContract = await ChildContract.deploy(this.wallet).send({
+                from: this.defaultAccountAddress
+            }).deployed();
             return {
                 parentContractAddress: parentContract.address,
                 childContractAddress: childContract.address
             };
         }, async ({ parentContractAddress, childContractAddress })=>{
-            this.parentContract = await ParentContract.at(parentContractAddress, this.wallets[0]);
-            this.childContract = await ChildContract.at(childContractAddress, this.wallets[0]);
+            this.parentContract = await ParentContract.at(parentContractAddress, this.wallet);
+            this.childContract = await ChildContract.at(childContractAddress, this.wallet);
         });
     }
 }

package/dest/e2e_p2p/p2p_network.d.ts

@@ -1,6 +1,6 @@
 import type { InitialAccountData } from '@aztec/accounts/testing';
 import type { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
-import { type AccountWalletWithSecretKey } from '@aztec/aztec.js';
+import { type AccountWalletWithSecretKey, AztecAddress } from '@aztec/aztec.js';
 import { type Operator, RollupContract, type ViemClient } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { type Logger } from '@aztec/foundation/log';
@@ -19,7 +19,8 @@ export declare const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES: {
 export declare class P2PNetworkTest {
     bootstrapNodeEnr: string;
     bootNodePort: number;
-    private numberOfNodes;
+    numberOfValidators: number;
+    numberOfNodes: number;
     private metricsPort?;
     private snapshotManager;
     baseAccountPrivateKey: `0x${string}`;
@@ -51,12 +52,14 @@ export declare class P2PNetworkTest {
     deployedAccounts: InitialAccountData[];
     prefilledPublicData: PublicDataTreeLeaf[];
     wallet?: AccountWalletWithSecretKey;
+    defaultAccountAddress?: AztecAddress;
     spamContract?: SpamContract;
     bootstrapNode?: BootstrapNode;
-    constructor(testName: string, bootstrapNodeEnr: string, bootNodePort: number, numberOfNodes: number, initialValidatorConfig: AztecNodeConfig, metricsPort?: number | undefined, startProverNode?: boolean, mockZkPassportVerifier?: boolean);
-    static create({ testName, numberOfNodes, basePort, metricsPort, initialConfig, startProverNode, mockZkPassportVerifier, }: {
+    constructor(testName: string, bootstrapNodeEnr: string, bootNodePort: number, numberOfValidators: number, initialValidatorConfig: AztecNodeConfig, numberOfNodes?: number, metricsPort?: number | undefined, startProverNode?: boolean, mockZkPassportVerifier?: boolean);
+    static create({ testName, numberOfNodes, numberOfValidators, basePort, metricsPort, initialConfig, startProverNode, mockZkPassportVerifier, }: {
         testName: string;
         numberOfNodes: number;
+        numberOfValidators: number;
         basePort?: number;
         metricsPort?: number;
         initialConfig?: Partial<AztecNodeConfig>;