@aztec/end-to-end 3.0.0-nightly.20250919 → 3.0.0-nightly.20250921

package/dest/bench/client_flows/client_flows_benchmark.js

@@ -172,7 +172,7 @@ export class ClientFlowsBenchmark {
                     prover: this.proxyLogger.createLogger('pxe:bb:wasm:bundle:proxied')
                 }
             });
-            this.userWallet = new TestWallet(this.userPXE);
+            this.userWallet = new TestWallet(this.userPXE, this.aztecNode);
         });
     }
     async applySetupFeeJuiceSnapshot() {

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

@@ -136,10 +136,10 @@ export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
         const proverNodePrivateKey = this.getNextPrivateKey();
         const suffix = (this.proverNodes.length + 1).toString();
         const proverNode = await withLogNameSuffix(suffix, ()=>createAndSyncProverNode(proverNodePrivateKey, {
-                ...this.context.config,
-                proverId: EthAddress.fromNumber(parseInt(suffix, 10))
+                ...this.context.config
             }, {
-                dataDirectory: join(this.context.config.dataDirectory, randomBytes(8).toString('hex'))
+                dataDirectory: join(this.context.config.dataDirectory, randomBytes(8).toString('hex')),
+                proverId: EthAddress.fromNumber(parseInt(suffix, 10))
             }, this.context.aztecNode, undefined, {
                 dateProvider: this.context.dateProvider
             }));

package/dest/e2e_p2p/shared.js

@@ -33,7 +33,7 @@ export const createPXEServiceAndSubmitTransactions = async (logger, node, numTxs
     const pxeService = await createPXEService(node, rpcConfig, {
         useLogSuffix: true
     });
-    const wallet = new TestWallet(pxeService);
+    const wallet = new TestWallet(pxeService, node);
     const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
     const txs = await submitTxsTo(wallet, fundedAccountManager.getAddress(), numTxs, logger);
     return {
@@ -48,7 +48,7 @@ export async function createPXEServiceAndPrepareTransactions(logger, node, numTx
     const pxe = await createPXEService(node, rpcConfig, {
         useLogSuffix: true
     });
-    const wallet = new TestWallet(pxe);
+    const wallet = new TestWallet(pxe, node);
     const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
     const testContractInstance = await getContractInstanceFromInstantiationParams(TestContractArtifact, {
         salt: Fr.random()

package/dest/fixtures/e2e_prover_test.js

@@ -153,7 +153,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             }, undefined, true);
             this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
             await result.pxe.registerContract(this.fakeProofsAsset);
-            const provenWallet = new TestWallet(result.pxe);
+            const provenWallet = new TestWallet(result.pxe, this.aztecNode);
             for(let i = 0; i < 2; i++){
                 await provenWallet.createSchnorrAccount(this.deployedAccounts[i].secret, this.deployedAccounts[i].salt);
                 await this.wallet.createSchnorrAccount(this.deployedAccounts[i].secret, this.deployedAccounts[i].salt);

package/dest/fixtures/snapshot_manager.js

@@ -331,7 +331,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     // Only enable proving if specifically requested.
     pxeConfig.proverEnabled = !!opts.realProofs;
     const pxe = await createPXEService(aztecNode, pxeConfig);
-    const wallet = new TestWallet(pxe);
+    const wallet = new TestWallet(pxe, aztecNode);
     const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe, aztecNode);
     if (statePath) {
         writeFileSync(`${statePath}/aztec_node_config.json`, JSON.stringify(aztecNodeConfig, resolver));
@@ -430,7 +430,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     const pxeConfig = getPXEServiceConfig();
     pxeConfig.dataDirectory = statePath;
     const pxe = await createPXEService(aztecNode, pxeConfig);
-    const wallet = new TestWallet(pxe);
+    const wallet = new TestWallet(pxe, aztecNode);
     const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe, aztecNode);
     return {
         aztecNodeConfig,

package/dest/fixtures/utils.js

@@ -137,7 +137,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
     await waitForPXE(pxeClient, logger);
     logger.verbose('JSON RPC client connected to PXE');
     logger.verbose(`Retrieving contract addresses from ${PXE_URL}`);
-    const { l1ContractAddresses, rollupVersion } = await pxeClient.getNodeInfo();
+    const { l1ContractAddresses, rollupVersion } = await aztecNode.getNodeInfo();
     const l1Client = createExtendedL1Client(config.l1RpcUrls, account, foundry);
     const deployL1ContractsValues = {
         l1ContractAddresses,
@@ -149,7 +149,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
     const teardown = ()=>Promise.resolve();
     logger.verbose('Populating wallet from already registered accounts...');
     const initialFundedAccounts = await getDeployedTestAccounts(pxeClient);
-    const wallet = new TestWallet(pxeClient);
+    const wallet = new TestWallet(pxeClient, aztecNode);
     if (initialFundedAccounts.length < numberOfAccounts) {
         throw new Error(`Required ${numberOfAccounts} accounts. Found ${initialFundedAccounts.length}.`);
     // Deploy new accounts if there's a test that requires more funded accounts in the remote environment.
@@ -419,7 +419,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             await cheatCodes.rollup.setupEpoch();
             await cheatCodes.rollup.debugRollup();
         }
-        const wallet = new TestWallet(pxe);
+        const wallet = new TestWallet(pxe, aztecNode);
         let accounts = [];
         // Below we continue with what we described in the long comment on line 571.
         if (numberOfAccounts === 0) {

package/dest/shared/cross_chain_test_harness.js

@@ -88,7 +88,7 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
     ownerAddress;
     static async new(aztecNode, pxeService, l1Client, wallet, ownerAddress, logger, underlyingERC20Address) {
         const ethAccount = EthAddress.fromString((await l1Client.getAddresses())[0]);
-        const l1ContractAddresses = (await pxeService.getNodeInfo()).l1ContractAddresses;
+        const l1ContractAddresses = (await aztecNode.getNodeInfo()).l1ContractAddresses;
         // Deploy and initialize all required contracts
         logger.info('Deploying and initializing token, portal and its bridge...');
         const { token, bridge, tokenPortalAddress, underlyingERC20 } = await deployAndInitializeTokenAndBridgeContracts(wallet, l1Client, l1ContractAddresses.registryAddress, ownerAddress, underlyingERC20Address);

package/dest/shared/gas_portal_test_harness.js

@@ -9,7 +9,7 @@ export class FeeJuicePortalTestingHarnessFactory {
     async createReal() {
         const { aztecNode, aztecNodeAdmin, pxeService, l1Client, wallet, logger } = this.config;
         const ethAccount = EthAddress.fromString((await l1Client.getAddresses())[0]);
-        const l1ContractAddresses = (await pxeService.getNodeInfo()).l1ContractAddresses;
+        const l1ContractAddresses = (await aztecNode.getNodeInfo()).l1ContractAddresses;
         const feeJuiceAddress = l1ContractAddresses.feeJuiceAddress;
         const feeJuicePortalAddress = l1ContractAddresses.feeJuicePortalAddress;
         if (feeJuiceAddress.isZero() || feeJuicePortalAddress.isZero()) {

package/dest/shared/uniswap_l1_l2.js

@@ -72,7 +72,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             uniswapL2Contract = await UniswapContract.deploy(wallet, uniswapPortalAddress).send({
                 from: ownerAddress
             }).deployed();
-            const registryAddress = (await pxe.getNodeInfo()).l1ContractAddresses.registryAddress;
+            const registryAddress = (await aztecNode.getNodeInfo()).l1ContractAddresses.registryAddress;
             await uniswapPortal.write.initialize([
                 registryAddress.toString(),
                 uniswapL2Contract.address.toString()

package/dest/spartan/setup_test_wallets.d.ts

@@ -1,9 +1,10 @@
-import { type AztecAddress, type FeePaymentMethod, type PXE } from '@aztec/aztec.js';
+import { type AztecAddress, type AztecNode, type FeePaymentMethod, type PXE } from '@aztec/aztec.js';
 import type { Logger } from '@aztec/foundation/log';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TestWallet } from '@aztec/test-wallet';
 export interface TestAccounts {
     pxe: PXE;
+    aztecNode: AztecNode;
     wallet: TestWallet;
     accounts: AztecAddress[];
     tokenContract: TokenContract;
@@ -12,8 +13,8 @@ export interface TestAccounts {
     recipientAddress: AztecAddress;
     tokenAddress: AztecAddress;
 }
-export declare function setupTestAccountsWithTokens(pxeUrl: string, mintAmount: bigint, logger: Logger): Promise<TestAccounts>;
-export declare function deploySponsoredTestAccounts(pxe: PXE, mintAmount: bigint, logger: Logger, numberOfFundedWallets?: number): Promise<TestAccounts>;
+export declare function setupTestAccountsWithTokens(pxeUrl: string, nodeUrl: string, mintAmount: bigint, logger: Logger): Promise<TestAccounts>;
+export declare function deploySponsoredTestAccounts(pxe: PXE, aztecNode: AztecNode, mintAmount: bigint, logger: Logger, numberOfFundedWallets?: number): Promise<TestAccounts>;
 export declare function deployTestAccountsWithTokens(pxeUrl: string, nodeUrl: string, l1RpcUrls: string[], mnemonicOrPrivateKey: string, mintAmount: bigint, logger: Logger, numberOfFundedWallets?: number): Promise<TestAccounts>;
 export declare function performTransfers({ testAccounts, rounds, transferAmount, logger, feePaymentMethod, }: {
     testAccounts: TestAccounts;

package/dest/spartan/setup_test_wallets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup_test_wallets.d.ts","sourceRoot":"","sources":["../../src/spartan/setup_test_wallets.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,YAAY,EAGjB,KAAK,gBAAgB,EAGrB,KAAK,GAAG,EAMT,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAMhD,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,GAAG,CAAC;IACT,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;IAC7B,iBAAiB,EAAE,YAAY,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,YAAY,CAAC;IAC/B,YAAY,EAAE,YAAY,CAAC;CAC5B;AAMD,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,CAAC,CA6BvB;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,GACxB,OAAO,CAAC,YAAY,CAAC,CAqCvB;AAED,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,EACnB,oBAAoB,EAAE,MAAM,EAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,GACxB,OAAO,CAAC,YAAY,CAAC,CAiDvB;AA+ED,wBAAsB,gBAAgB,CAAC,EACrC,YAAY,EACZ,MAAM,EACN,cAAc,EACd,MAAM,EACN,gBAAgB,GACjB,EAAE;IACD,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,iBAiBA;AAED,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,OAAO,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAmBrD"}
+{"version":3,"file":"setup_test_wallets.d.ts","sourceRoot":"","sources":["../../src/spartan/setup_test_wallets.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,SAAS,EAEd,KAAK,gBAAgB,EAGrB,KAAK,GAAG,EAMT,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAMhD,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;IAC7B,iBAAiB,EAAE,YAAY,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,YAAY,CAAC;IAC/B,YAAY,EAAE,YAAY,CAAC;CAC5B;AAMD,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,CAAC,CA+BvB;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,GACxB,OAAO,CAAC,YAAY,CAAC,CAsCvB;AAED,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,EACnB,oBAAoB,EAAE,MAAM,EAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,SAAI,GACxB,OAAO,CAAC,YAAY,CAAC,CAkDvB;AAgFD,wBAAsB,gBAAgB,CAAC,EACrC,YAAY,EACZ,MAAM,EACN,cAAc,EACd,MAAM,EACN,gBAAgB,GACjB,EAAE;IACD,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,iBAiBA;AAED,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,OAAO,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAmBrD"}

package/dest/spartan/setup_test_wallets.js

@@ -10,16 +10,18 @@ import { getSponsoredFPCAddress, registerSponsoredFPC } from '../fixtures/utils.
 const TOKEN_NAME = 'USDC';
 const TOKEN_SYMBOL = 'USD';
 const TOKEN_DECIMALS = 18n;
-export async function setupTestAccountsWithTokens(pxeUrl, mintAmount, logger) {
+export async function setupTestAccountsWithTokens(pxeUrl, nodeUrl, mintAmount, logger) {
     const ACCOUNT_COUNT = 1; // TODO fix this to allow for 16 wallets again
     const pxe = await createCompatibleClient(pxeUrl, logger);
-    const wallet = new TestWallet(pxe);
+    const aztecNode = createAztecNodeClient(nodeUrl);
+    const wallet = new TestWallet(pxe, aztecNode);
     const [recipientAccount, ...accounts] = (await getDeployedTestAccounts(pxe)).slice(0, ACCOUNT_COUNT + 1);
     const tokenAdmin = accounts[0];
     const tokenAddress = await deployTokenAndMint(wallet, accounts.map((acc)=>acc.address), tokenAdmin.address, mintAmount, undefined, logger);
     const tokenContract = await TokenContract.at(tokenAddress, wallet);
     return {
         pxe,
+        aztecNode,
         accounts: accounts.map((acc)=>acc.address),
         wallet,
         tokenAdminAddress: tokenAdmin.address,
@@ -29,8 +31,8 @@ export async function setupTestAccountsWithTokens(pxeUrl, mintAmount, logger) {
         recipientAddress: recipientAccount.address
     };
 }
-export async function deploySponsoredTestAccounts(pxe, mintAmount, logger, numberOfFundedWallets = 1) {
-    const wallet = new TestWallet(pxe);
+export async function deploySponsoredTestAccounts(pxe, aztecNode, mintAmount, logger, numberOfFundedWallets = 1) {
+    const wallet = new TestWallet(pxe, aztecNode);
     const [recipient, ...funded] = await generateSchnorrAccounts(numberOfFundedWallets + 1);
     const recipientAccount = await wallet.createSchnorrAccount(recipient.secret, recipient.salt);
     const fundedAccounts = await Promise.all(funded.map((a)=>wallet.createSchnorrAccount(a.secret, a.salt)));
@@ -51,6 +53,7 @@ export async function deploySponsoredTestAccounts(pxe, mintAmount, logger, numbe
     const tokenContract = await TokenContract.at(tokenAddress, wallet);
     return {
         pxe,
+        aztecNode,
         wallet,
         accounts: fundedAccounts.map((acc)=>acc.getAddress()),
         tokenAdminAddress: tokenAdmin.getAddress(),
@@ -62,16 +65,16 @@ export async function deploySponsoredTestAccounts(pxe, mintAmount, logger, numbe
 }
 export async function deployTestAccountsWithTokens(pxeUrl, nodeUrl, l1RpcUrls, mnemonicOrPrivateKey, mintAmount, logger, numberOfFundedWallets = 1) {
     const pxe = await createCompatibleClient(pxeUrl, logger);
-    const node = createAztecNodeClient(nodeUrl);
-    const wallet = new TestWallet(pxe);
+    const aztecNode = createAztecNodeClient(nodeUrl);
+    const wallet = new TestWallet(pxe, aztecNode);
     const [recipient, ...funded] = await generateSchnorrAccounts(numberOfFundedWallets + 1);
     const recipientAccount = await wallet.createSchnorrAccount(recipient.secret, recipient.salt);
     const fundedAccounts = await Promise.all(funded.map((a)=>wallet.createSchnorrAccount(a.secret, a.salt)));
-    const claims = await Promise.all(fundedAccounts.map((a)=>bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, node, a.getAddress(), undefined, logger)));
+    const claims = await Promise.all(fundedAccounts.map((a)=>bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, aztecNode, a.getAddress(), undefined, logger)));
     // Progress by 3 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
-    await advanceL2Block(node);
-    await advanceL2Block(node);
-    await advanceL2Block(node);
+    await advanceL2Block(aztecNode);
+    await advanceL2Block(aztecNode);
+    await advanceL2Block(aztecNode);
     await Promise.all(fundedAccounts.map(async (a, i)=>{
         const paymentMethod = new FeeJuicePaymentMethodWithClaim(a.getAddress(), claims[i]);
         await a.deploy({
@@ -86,6 +89,7 @@ export async function deployTestAccountsWithTokens(pxeUrl, nodeUrl, l1RpcUrls, m
     const tokenContract = await TokenContract.at(tokenAddress, wallet);
     return {
         pxe,
+        aztecNode,
         wallet,
         accounts: fundedAccounts.map((acc)=>acc.getAddress()),
         tokenAdminAddress: tokenAdmin.getAddress(),
@@ -95,21 +99,21 @@ export async function deployTestAccountsWithTokens(pxeUrl, nodeUrl, l1RpcUrls, m
         recipientAddress: recipientAccount.getAddress()
     };
 }
-async function bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, node, recipient, amount, log) {
-    const { l1ChainId } = await pxe.getNodeInfo();
+async function bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, aztecNode, recipient, amount, log) {
+    const { l1ChainId } = await aztecNode.getNodeInfo();
     const chain = createEthereumChain(l1RpcUrls, l1ChainId);
     const l1Client = createExtendedL1Client(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
     // docs:start:bridge_fee_juice
-    const portal = await L1FeeJuicePortalManager.new(pxe, l1Client, log);
+    const portal = await L1FeeJuicePortalManager.new(aztecNode, l1Client, log);
     const claim = await portal.bridgeTokensPublic(recipient, amount, true);
     // docs:end:bridge_fee_juice
-    const isSynced = async ()=>await node.getL1ToL2MessageBlock(Fr.fromHexString(claim.messageHash)) !== undefined;
+    const isSynced = async ()=>await aztecNode.getL1ToL2MessageBlock(Fr.fromHexString(claim.messageHash)) !== undefined;
     await retryUntil(isSynced, `message ${claim.messageHash} sync`, 24, 0.5);
     log.info(`Created a claim for ${amount} L1 fee juice to ${recipient}.`, claim);
     return claim;
 }
-async function advanceL2Block(node, nodeAdmin) {
-    const initialBlockNumber = await node.getBlockNumber();
+async function advanceL2Block(aztecNode, nodeAdmin) {
+    const initialBlockNumber = await aztecNode.getBlockNumber();
     let minTxsPerBlock = undefined;
     if (nodeAdmin) {
         ({ minTxsPerBlock } = await nodeAdmin.getConfig());
@@ -117,7 +121,7 @@ async function advanceL2Block(node, nodeAdmin) {
             minTxsPerBlock: 0
         }); // Set to 0 to ensure we can advance the block
     }
-    await retryUntil(async ()=>await node.getBlockNumber() >= initialBlockNumber + 1);
+    await retryUntil(async ()=>await aztecNode.getBlockNumber() >= initialBlockNumber + 1);
     if (nodeAdmin && minTxsPerBlock !== undefined) {
         await nodeAdmin.setConfig({
             minTxsPerBlock

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "3.0.0-nightly.20250919",
+  "version": "3.0.0-nightly.20250921",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -25,42 +25,42 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20250919",
-    "@aztec/archiver": "3.0.0-nightly.20250919",
-    "@aztec/aztec": "3.0.0-nightly.20250919",
-    "@aztec/aztec-node": "3.0.0-nightly.20250919",
-    "@aztec/aztec.js": "3.0.0-nightly.20250919",
-    "@aztec/bb-prover": "3.0.0-nightly.20250919",
-    "@aztec/blob-lib": "3.0.0-nightly.20250919",
-    "@aztec/blob-sink": "3.0.0-nightly.20250919",
-    "@aztec/bot": "3.0.0-nightly.20250919",
-    "@aztec/cli": "3.0.0-nightly.20250919",
-    "@aztec/constants": "3.0.0-nightly.20250919",
-    "@aztec/entrypoints": "3.0.0-nightly.20250919",
-    "@aztec/epoch-cache": "3.0.0-nightly.20250919",
-    "@aztec/ethereum": "3.0.0-nightly.20250919",
-    "@aztec/foundation": "3.0.0-nightly.20250919",
-    "@aztec/kv-store": "3.0.0-nightly.20250919",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20250919",
-    "@aztec/merkle-tree": "3.0.0-nightly.20250919",
-    "@aztec/node-keystore": "3.0.0-nightly.20250919",
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20250919",
-    "@aztec/noir-noirc_abi": "3.0.0-nightly.20250919",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250919",
-    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20250919",
-    "@aztec/p2p": "3.0.0-nightly.20250919",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20250919",
-    "@aztec/prover-client": "3.0.0-nightly.20250919",
-    "@aztec/prover-node": "3.0.0-nightly.20250919",
-    "@aztec/pxe": "3.0.0-nightly.20250919",
-    "@aztec/sequencer-client": "3.0.0-nightly.20250919",
-    "@aztec/simulator": "3.0.0-nightly.20250919",
-    "@aztec/slasher": "3.0.0-nightly.20250919",
-    "@aztec/stdlib": "3.0.0-nightly.20250919",
-    "@aztec/telemetry-client": "3.0.0-nightly.20250919",
-    "@aztec/test-wallet": "3.0.0-nightly.20250919",
-    "@aztec/validator-client": "3.0.0-nightly.20250919",
-    "@aztec/world-state": "3.0.0-nightly.20250919",
+    "@aztec/accounts": "3.0.0-nightly.20250921",
+    "@aztec/archiver": "3.0.0-nightly.20250921",
+    "@aztec/aztec": "3.0.0-nightly.20250921",
+    "@aztec/aztec-node": "3.0.0-nightly.20250921",
+    "@aztec/aztec.js": "3.0.0-nightly.20250921",
+    "@aztec/bb-prover": "3.0.0-nightly.20250921",
+    "@aztec/blob-lib": "3.0.0-nightly.20250921",
+    "@aztec/blob-sink": "3.0.0-nightly.20250921",
+    "@aztec/bot": "3.0.0-nightly.20250921",
+    "@aztec/cli": "3.0.0-nightly.20250921",
+    "@aztec/constants": "3.0.0-nightly.20250921",
+    "@aztec/entrypoints": "3.0.0-nightly.20250921",
+    "@aztec/epoch-cache": "3.0.0-nightly.20250921",
+    "@aztec/ethereum": "3.0.0-nightly.20250921",
+    "@aztec/foundation": "3.0.0-nightly.20250921",
+    "@aztec/kv-store": "3.0.0-nightly.20250921",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20250921",
+    "@aztec/merkle-tree": "3.0.0-nightly.20250921",
+    "@aztec/node-keystore": "3.0.0-nightly.20250921",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20250921",
+    "@aztec/noir-noirc_abi": "3.0.0-nightly.20250921",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250921",
+    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20250921",
+    "@aztec/p2p": "3.0.0-nightly.20250921",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20250921",
+    "@aztec/prover-client": "3.0.0-nightly.20250921",
+    "@aztec/prover-node": "3.0.0-nightly.20250921",
+    "@aztec/pxe": "3.0.0-nightly.20250921",
+    "@aztec/sequencer-client": "3.0.0-nightly.20250921",
+    "@aztec/simulator": "3.0.0-nightly.20250921",
+    "@aztec/slasher": "3.0.0-nightly.20250921",
+    "@aztec/stdlib": "3.0.0-nightly.20250921",
+    "@aztec/telemetry-client": "3.0.0-nightly.20250921",
+    "@aztec/test-wallet": "3.0.0-nightly.20250921",
+    "@aztec/validator-client": "3.0.0-nightly.20250921",
+    "@aztec/world-state": "3.0.0-nightly.20250921",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -229,7 +229,7 @@ export class ClientFlowsBenchmark {
             prover: this.proxyLogger.createLogger('pxe:bb:wasm:bundle:proxied'),
           },
         });
-        this.userWallet = new TestWallet(this.userPXE);
+        this.userWallet = new TestWallet(this.userPXE, this.aztecNode);
       },
     );
   }

package/src/e2e_epochs/epochs_test.ts

@@ -194,8 +194,11 @@ export class EpochsTestContext {
     const proverNode = await withLogNameSuffix(suffix, () =>
       createAndSyncProverNode(
         proverNodePrivateKey,
-        { ...this.context.config, proverId: EthAddress.fromNumber(parseInt(suffix, 10)) },
-        { dataDirectory: join(this.context.config.dataDirectory!, randomBytes(8).toString('hex')) },
+        { ...this.context.config },
+        {
+          dataDirectory: join(this.context.config.dataDirectory!, randomBytes(8).toString('hex')),
+          proverId: EthAddress.fromNumber(parseInt(suffix, 10)),
+        },
         this.context.aztecNode,
         undefined,
         { dateProvider: this.context.dateProvider },

package/src/e2e_p2p/shared.ts

@@ -65,7 +65,7 @@ export const createPXEServiceAndSubmitTransactions = async (
   const rpcConfig = getRpcConfig();
   rpcConfig.proverEnabled = false;
   const pxeService = await createPXEService(node, rpcConfig, { useLogSuffix: true });
-  const wallet = new TestWallet(pxeService);
+  const wallet = new TestWallet(pxeService, node);
   const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
   const txs = await submitTxsTo(wallet, fundedAccountManager.getAddress(), numTxs, logger);
   return { txs, pxeService, node };
@@ -81,7 +81,7 @@ export async function createPXEServiceAndPrepareTransactions(
   rpcConfig.proverEnabled = false;
   const pxe = await createPXEService(node, rpcConfig, { useLogSuffix: true });
 
-  const wallet = new TestWallet(pxe);
+  const wallet = new TestWallet(pxe, node);
   const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
 
   const testContractInstance = await getContractInstanceFromInstantiationParams(TestContractArtifact, {

package/src/fixtures/e2e_prover_test.ts

@@ -224,7 +224,7 @@ export class FullProverTest {
       this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
       await result.pxe.registerContract(this.fakeProofsAsset);
 
-      const provenWallet = new TestWallet(result.pxe);
+      const provenWallet = new TestWallet(result.pxe, this.aztecNode);
 
       for (let i = 0; i < 2; i++) {
         await provenWallet.createSchnorrAccount(this.deployedAccounts[i].secret, this.deployedAccounts[i].salt);

package/src/fixtures/snapshot_manager.ts

@@ -448,7 +448,7 @@ async function setupFromFresh(
   // Only enable proving if specifically requested.
   pxeConfig.proverEnabled = !!opts.realProofs;
   const pxe = await createPXEService(aztecNode, pxeConfig);
-  const wallet = new TestWallet(pxe);
+  const wallet = new TestWallet(pxe, aztecNode);
   const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe, aztecNode);
 
   if (statePath) {
@@ -577,7 +577,7 @@ async function setupFromState(statePath: string, logger: Logger): Promise<Subsys
   const pxeConfig = getPXEServiceConfig();
   pxeConfig.dataDirectory = statePath;
   const pxe = await createPXEService(aztecNode, pxeConfig);
-  const wallet = new TestWallet(pxe);
+  const wallet = new TestWallet(pxe, aztecNode);
   const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe, aztecNode);
 
   return {

package/src/fixtures/utils.ts

@@ -226,7 +226,7 @@ async function setupWithRemoteEnvironment(
   await waitForPXE(pxeClient, logger);
   logger.verbose('JSON RPC client connected to PXE');
   logger.verbose(`Retrieving contract addresses from ${PXE_URL}`);
-  const { l1ContractAddresses, rollupVersion } = await pxeClient.getNodeInfo();
+  const { l1ContractAddresses, rollupVersion } = await aztecNode.getNodeInfo();
 
   const l1Client = createExtendedL1Client(config.l1RpcUrls, account, foundry);
 
@@ -241,7 +241,7 @@ async function setupWithRemoteEnvironment(
 
   logger.verbose('Populating wallet from already registered accounts...');
   const initialFundedAccounts = await getDeployedTestAccounts(pxeClient);
-  const wallet = new TestWallet(pxeClient);
+  const wallet = new TestWallet(pxeClient, aztecNode);
 
   if (initialFundedAccounts.length < numberOfAccounts) {
     throw new Error(`Required ${numberOfAccounts} accounts. Found ${initialFundedAccounts.length}.`);
@@ -670,7 +670,7 @@ export async function setup(
       await cheatCodes.rollup.setupEpoch();
       await cheatCodes.rollup.debugRollup();
     }
-    const wallet = new TestWallet(pxe);
+    const wallet = new TestWallet(pxe, aztecNode);
     let accounts: AztecAddress[] = [];
     // Below we continue with what we described in the long comment on line 571.
     if (numberOfAccounts === 0) {

package/src/shared/cross_chain_test_harness.ts

@@ -139,7 +139,7 @@ export class CrossChainTestHarness {
     underlyingERC20Address: EthAddress,
   ): Promise<CrossChainTestHarness> {
     const ethAccount = EthAddress.fromString((await l1Client.getAddresses())[0]);
-    const l1ContractAddresses = (await pxeService.getNodeInfo()).l1ContractAddresses;
+    const l1ContractAddresses = (await aztecNode.getNodeInfo()).l1ContractAddresses;
 
     // Deploy and initialize all required contracts
     logger.info('Deploying and initializing token, portal and its bridge...');

package/src/shared/gas_portal_test_harness.ts

@@ -41,7 +41,7 @@ export class FeeJuicePortalTestingHarnessFactory {
     const { aztecNode, aztecNodeAdmin, pxeService, l1Client, wallet, logger } = this.config;
 
     const ethAccount = EthAddress.fromString((await l1Client.getAddresses())[0]);
-    const l1ContractAddresses = (await pxeService.getNodeInfo()).l1ContractAddresses;
+    const l1ContractAddresses = (await aztecNode.getNodeInfo()).l1ContractAddresses;
 
     const feeJuiceAddress = l1ContractAddresses.feeJuiceAddress;
     const feeJuicePortalAddress = l1ContractAddresses.feeJuicePortalAddress;

package/src/shared/uniswap_l1_l2.ts

@@ -155,7 +155,7 @@ export const uniswapL1L2TestSuite = (
         .send({ from: ownerAddress })
         .deployed();
 
-      const registryAddress = (await pxe.getNodeInfo()).l1ContractAddresses.registryAddress;
+      const registryAddress = (await aztecNode.getNodeInfo()).l1ContractAddresses.registryAddress;
 
       await uniswapPortal.write.initialize(
         [registryAddress.toString(), uniswapL2Contract.address.toString()],

package/src/spartan/setup_test_wallets.ts

@@ -26,6 +26,7 @@ import { getSponsoredFPCAddress, registerSponsoredFPC } from '../fixtures/utils.
 
 export interface TestAccounts {
   pxe: PXE;
+  aztecNode: AztecNode;
   wallet: TestWallet;
   accounts: AztecAddress[];
   tokenContract: TokenContract;
@@ -41,13 +42,15 @@ const TOKEN_DECIMALS = 18n;
 
 export async function setupTestAccountsWithTokens(
   pxeUrl: string,
+  nodeUrl: string,
   mintAmount: bigint,
   logger: Logger,
 ): Promise<TestAccounts> {
   const ACCOUNT_COUNT = 1; // TODO fix this to allow for 16 wallets again
 
   const pxe = await createCompatibleClient(pxeUrl, logger);
-  const wallet = new TestWallet(pxe);
+  const aztecNode = createAztecNodeClient(nodeUrl);
+  const wallet = new TestWallet(pxe, aztecNode);
 
   const [recipientAccount, ...accounts] = (await getDeployedTestAccounts(pxe)).slice(0, ACCOUNT_COUNT + 1);
 
@@ -64,6 +67,7 @@ export async function setupTestAccountsWithTokens(
 
   return {
     pxe,
+    aztecNode,
     accounts: accounts.map(acc => acc.address),
     wallet,
     tokenAdminAddress: tokenAdmin.address,
@@ -76,11 +80,12 @@ export async function setupTestAccountsWithTokens(
 
 export async function deploySponsoredTestAccounts(
   pxe: PXE,
+  aztecNode: AztecNode,
   mintAmount: bigint,
   logger: Logger,
   numberOfFundedWallets = 1,
 ): Promise<TestAccounts> {
-  const wallet = new TestWallet(pxe);
+  const wallet = new TestWallet(pxe, aztecNode);
   const [recipient, ...funded] = await generateSchnorrAccounts(numberOfFundedWallets + 1);
   const recipientAccount = await wallet.createSchnorrAccount(recipient.secret, recipient.salt);
   const fundedAccounts = await Promise.all(funded.map(a => wallet.createSchnorrAccount(a.secret, a.salt)));
@@ -108,6 +113,7 @@ export async function deploySponsoredTestAccounts(
 
   return {
     pxe,
+    aztecNode,
     wallet,
     accounts: fundedAccounts.map(acc => acc.getAddress()),
     tokenAdminAddress: tokenAdmin.getAddress(),
@@ -128,8 +134,8 @@ export async function deployTestAccountsWithTokens(
   numberOfFundedWallets = 1,
 ): Promise<TestAccounts> {
   const pxe = await createCompatibleClient(pxeUrl, logger);
-  const node = createAztecNodeClient(nodeUrl);
-  const wallet = new TestWallet(pxe);
+  const aztecNode = createAztecNodeClient(nodeUrl);
+  const wallet = new TestWallet(pxe, aztecNode);
 
   const [recipient, ...funded] = await generateSchnorrAccounts(numberOfFundedWallets + 1);
   const recipientAccount = await wallet.createSchnorrAccount(recipient.secret, recipient.salt);
@@ -137,14 +143,14 @@ export async function deployTestAccountsWithTokens(
 
   const claims = await Promise.all(
     fundedAccounts.map(a =>
-      bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, node, a.getAddress(), undefined, logger),
+      bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, aztecNode, a.getAddress(), undefined, logger),
     ),
   );
 
   // Progress by 3 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
-  await advanceL2Block(node);
-  await advanceL2Block(node);
-  await advanceL2Block(node);
+  await advanceL2Block(aztecNode);
+  await advanceL2Block(aztecNode);
+  await advanceL2Block(aztecNode);
 
   await Promise.all(
     fundedAccounts.map(async (a, i) => {
@@ -167,6 +173,7 @@ export async function deployTestAccountsWithTokens(
 
   return {
     pxe,
+    aztecNode,
     wallet,
     accounts: fundedAccounts.map(acc => acc.getAddress()),
     tokenAdminAddress: tokenAdmin.getAddress(),
@@ -181,29 +188,30 @@ async function bridgeL1FeeJuice(
   l1RpcUrls: string[],
   mnemonicOrPrivateKey: string,
   pxe: PXE,
-  node: AztecNode,
+  aztecNode: AztecNode,
   recipient: AztecAddress,
   amount: bigint | undefined,
   log: Logger,
 ) {
-  const { l1ChainId } = await pxe.getNodeInfo();
+  const { l1ChainId } = await aztecNode.getNodeInfo();
   const chain = createEthereumChain(l1RpcUrls, l1ChainId);
   const l1Client = createExtendedL1Client(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
 
   // docs:start:bridge_fee_juice
-  const portal = await L1FeeJuicePortalManager.new(pxe, l1Client, log);
+  const portal = await L1FeeJuicePortalManager.new(aztecNode, l1Client, log);
   const claim = await portal.bridgeTokensPublic(recipient, amount, true /* mint */);
   // docs:end:bridge_fee_juice
 
-  const isSynced = async () => (await node.getL1ToL2MessageBlock(Fr.fromHexString(claim.messageHash))) !== undefined;
+  const isSynced = async () =>
+    (await aztecNode.getL1ToL2MessageBlock(Fr.fromHexString(claim.messageHash))) !== undefined;
   await retryUntil(isSynced, `message ${claim.messageHash} sync`, 24, 0.5);
 
   log.info(`Created a claim for ${amount} L1 fee juice to ${recipient}.`, claim);
   return claim;
 }
 
-async function advanceL2Block(node: AztecNode, nodeAdmin?: AztecNodeAdmin) {
-  const initialBlockNumber = await node.getBlockNumber();
+async function advanceL2Block(aztecNode: AztecNode, nodeAdmin?: AztecNodeAdmin) {
+  const initialBlockNumber = await aztecNode.getBlockNumber();
 
   let minTxsPerBlock = undefined;
   if (nodeAdmin) {
@@ -211,7 +219,7 @@ async function advanceL2Block(node: AztecNode, nodeAdmin?: AztecNodeAdmin) {
     await nodeAdmin.setConfig({ minTxsPerBlock: 0 }); // Set to 0 to ensure we can advance the block
   }
 
-  await retryUntil(async () => (await node.getBlockNumber()) >= initialBlockNumber + 1);
+  await retryUntil(async () => (await aztecNode.getBlockNumber()) >= initialBlockNumber + 1);
 
   if (nodeAdmin && minTxsPerBlock !== undefined) {
     await nodeAdmin.setConfig({ minTxsPerBlock });