@aztec/end-to-end 3.0.0-nightly.20250918 → 3.0.0-nightly.20250920

package/dest/bench/client_flows/client_flows_benchmark.js

@@ -154,7 +154,7 @@ export class ClientFlowsBenchmark {
             this.pxe = pxe;
             this.adminWallet = wallet;
             this.aztecNode = aztecNode;
-            this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
+            this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe, aztecNode);
             this.adminAddress = adminAddress;
             this.sequencerAddress = sequencerAddress;
             const canonicalFeeJuice = await getCanonicalFeeJuice();
@@ -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_blacklist_token_contract/blacklist_token_contract_test.js

@@ -120,7 +120,7 @@ export class BlacklistTokenContractTest {
         await this.snapshotManager.teardown();
     }
     async addPendingShieldNoteToPXE(contract, recipient, amount, secretHash, txHash) {
-        const txEffects = await this.pxe.getTxEffect(txHash);
+        const txEffects = await this.aztecNode.getTxEffect(txHash);
         await contract.methods.deliver_transparent_note(contract.address, amount, secretHash, txHash.hash, txEffects.data.noteHashes, txEffects.data.nullifiers[0], recipient).simulate({
             from: recipient
         });

package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js

@@ -45,7 +45,7 @@ export class CrossChainMessagingTest {
         this.aztecNode = this.ctx.aztecNode;
         this.pxe = this.ctx.pxe;
         this.aztecNodeConfig = this.ctx.aztecNodeConfig;
-        this.cheatCodes = await CheatCodes.create(this.aztecNodeConfig.l1RpcUrls, this.pxe);
+        this.cheatCodes = await CheatCodes.create(this.aztecNodeConfig.l1RpcUrls, this.pxe, this.aztecNode);
         this.deployL1ContractsValues = this.ctx.deployL1ContractsValues;
         this.aztecNodeAdmin = this.ctx.aztecNode;
     }

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_fees/fees_test.js

@@ -143,7 +143,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             this.gasSettings = GasSettings.default({
                 maxFeesPerGas: (await this.aztecNode.getCurrentBaseFees()).mul(2)
             });
-            this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
+            this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe, aztecNode);
             this.accounts = deployedAccounts.map((a)=>a.address);
             this.accounts.forEach((a, i)=>this.logger.verbose(`Account ${i} address: ${a}`));
             [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.accounts.slice(0, 3);
@@ -230,7 +230,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
                 return await this.rollupContract.getSequencerRewards(this.coinbase);
             };
             this.getProverFee = async (blockNumber)=>{
-                const block = await this.pxe.getBlock(blockNumber);
+                const block = await this.aztecNode.getBlock(blockNumber);
                 // @todo @lherskind As we deal with #13601
                 // Right now the value is from `FeeLib.sol`
                 const L1_GAS_PER_EPOCH_VERIFIED = 1000000n;

package/dest/e2e_nested_contract/nested_contract_test.d.ts

@@ -1,4 +1,4 @@
-import { AztecAddress, type Logger, type PXE, type Wallet } from '@aztec/aztec.js';
+import { AztecAddress, type AztecNode, type Logger, type PXE, type Wallet } 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';
@@ -9,6 +9,7 @@ export declare class NestedContractTest {
     wallet: Wallet;
     defaultAccountAddress: AztecAddress;
     pxe: PXE;
+    aztecNode: AztecNode;
     parentContract: ParentContract;
     childContract: ChildContract;
     constructor(testName: string, numberOfAccounts?: number);

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":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,MAAM,EAAE,KAAK,GAAG,EAAE,KAAK,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AACjG,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,MAAM,CAAC;IAChB,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;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;CAkB3B"}
+{"version":3,"file":"nested_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_nested_contract/nested_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,SAAS,EAAE,KAAK,MAAM,EAAE,KAAK,GAAG,EAAE,KAAK,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AACjH,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;IAa3B,OAAO,CAAC,gBAAgB;IAZ1B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,MAAM,CAAC;IAChB,qBAAqB,EAAG,YAAY,CAAC;IACrC,GAAG,EAAG,GAAG,CAAC;IACV,SAAS,EAAG,SAAS,CAAC;IAEtB,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

@@ -10,6 +10,7 @@ export class NestedContractTest {
     wallet;
     defaultAccountAddress;
     pxe;
+    aztecNode;
     parentContract;
     childContract;
     constructor(testName, numberOfAccounts = 1){
@@ -23,10 +24,11 @@ export class NestedContractTest {
    * 1. Add 3 accounts.
    * 2. Publicly deploy accounts
    */ async applyBaseSnapshots() {
-        await this.snapshotManager.snapshot('accounts', deployAccounts(this.numberOfAccounts, this.logger), ({ deployedAccounts }, { pxe, wallet })=>{
+        await this.snapshotManager.snapshot('accounts', deployAccounts(this.numberOfAccounts, this.logger), ({ deployedAccounts }, { pxe, wallet, aztecNode })=>{
             this.wallet = wallet;
             [{ address: this.defaultAccountAddress }] = deployedAccounts;
             this.pxe = pxe;
+            this.aztecNode = aztecNode;
             return Promise.resolve();
         });
         await this.snapshotManager.snapshot('public_deploy', async ()=>{}, async ()=>{

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/e2e_token_contract/token_contract_test.d.ts

@@ -1,6 +1,7 @@
-import { AztecAddress, type AztecNode, type Logger, type Wallet } from '@aztec/aztec.js';
+import { AztecAddress, type AztecNode, type Logger } from '@aztec/aztec.js';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
+import type { TestWallet } from '@aztec/test-wallet';
 import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
 export declare class TokenContractTest {
@@ -13,7 +14,7 @@ export declare class TokenContractTest {
     tokenSim: TokenSimulator;
     node: AztecNode;
     badAccount: InvalidAccountContract;
-    wallet: Wallet;
+    wallet: TestWallet;
     adminAddress: AztecAddress;
     account1Address: AztecAddress;
     account2Address: AztecAddress;

package/dest/e2e_token_contract/token_contract_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_token_contract/token_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,SAAS,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AACvG,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AAItF,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAG,aAAa,CAAC;IACtB,QAAQ,EAAG,cAAc,CAAC;IAC1B,IAAI,EAAG,SAAS,CAAC;IAEjB,UAAU,EAAG,sBAAsB,CAAC;IACpC,MAAM,EAAG,MAAM,CAAC;IAChB,YAAY,EAAG,YAAY,CAAC;IAC5B,eAAe,EAAG,YAAY,CAAC;IAC/B,eAAe,EAAG,YAAY,CAAC;gBAEnB,QAAQ,EAAE,MAAM;IAO5B;;;;OAIG;IACG,kBAAkB;IAkElB,KAAK;IAIX,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,QAAQ;IAIR,iBAAiB;CAqCxB"}
+{"version":3,"file":"token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_token_contract/token_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,SAAS,EAAE,KAAK,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AAC1F,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIrD,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAG,aAAa,CAAC;IACtB,QAAQ,EAAG,cAAc,CAAC;IAC1B,IAAI,EAAG,SAAS,CAAC;IAEjB,UAAU,EAAG,sBAAsB,CAAC;IACpC,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,YAAY,CAAC;IAC5B,eAAe,EAAG,YAAY,CAAC;IAC/B,eAAe,EAAG,YAAY,CAAC;gBAEnB,QAAQ,EAAE,MAAM;IAO5B;;;;OAIG;IACG,kBAAkB;IAkElB,KAAK;IAIX,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,QAAQ;IAIR,iBAAiB;CAqCxB"}

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.d.ts

@@ -1,6 +1,6 @@
 import { type InitialAccountData } from '@aztec/accounts/testing';
 import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
-import { type AztecAddress, type AztecNode, type Logger, type PXE, type Wallet } from '@aztec/aztec.js';
+import { type AztecAddress, type AztecNode, type Logger, type Wallet } from '@aztec/aztec.js';
 import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
 import { type BlobSinkServer } from '@aztec/blob-sink/server';
 import { type DeployL1ContractsArgs, type DeployL1ContractsReturnType } from '@aztec/ethereum';
@@ -87,8 +87,8 @@ export declare const deployAccounts: (numberOfAccounts: number, logger: Logger)
  * @param sender - Wallet to send the deployment tx.
  * @param accountsToDeploy - Which accounts to publicly deploy.
  * @param waitUntilProven - Whether to wait for the tx to be proven.
- * @param pxeOrNode - PXE or AztecNode to wait for proven.
+ * @param node - AztecNode used to wait for proven tx.
  */
-export declare function publicDeployAccounts(wallet: Wallet, accountsToDeploy: AztecAddress[], waitUntilProven?: boolean, pxeOrNode?: PXE | AztecNode): Promise<void>;
+export declare function publicDeployAccounts(wallet: Wallet, accountsToDeploy: AztecAddress[], waitUntilProven?: boolean, node?: AztecNode): Promise<void>;
 export {};
 //# sourceMappingURL=snapshot_manager.d.ts.map

package/dest/fixtures/snapshot_manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot_manager.d.ts","sourceRoot":"","sources":["../../src/fixtures/snapshot_manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"snapshot_manager.d.ts","sourceRoot":"","sources":["../../src/fixtures/snapshot_manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,kBAAkB,EAA2B,MAAM,yBAAyB,CAAC;AAC3F,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,SAAS,EAId,KAAK,MAAM,EACX,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,KAAK,cAAc,EAAwB,MAAM,yBAAyB,CAAC;AACpF,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,EAIjC,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,KAAK,UAAU,EAAyC,MAAM,mBAAmB,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAezC,OAAO,EACL,KAAK,YAAY,EAKlB,MAAM,YAAY,CAAC;AAGpB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,gBAAgB,CAAC;IAC5B,eAAe,EAAE,eAAe,CAAC;IACjC,GAAG,EAAE,UAAU,CAAC;IAChB,MAAM,EAAE,UAAU,CAAC;IACnB,uBAAuB,EAAE,2BAA2B,CAAC;IACrD,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,OAAO,EAAE,gBAAgB,CAAC;IAC1B,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,EAAE,eAAe,CAAC;IAC3B,YAAY,EAAE,gBAAgB,CAAC;IAC/B,QAAQ,EAAE,cAAc,CAAC;IACzB,qBAAqB,EAAE,kBAAkB,EAAE,CAAC;IAC5C,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AASF,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,GAAE,OAAO,CAAC,YAAY,CAAM,EAClC,qBAAqB,GAAE,OAAO,CAAC,qBAAqB,CAEnD,yCAKF;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,CAAC,EACR,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,GACvE,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB,KAAK,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEpC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,qIAAqI;AACrI,cAAM,mBAAoB,YAAW,gBAAgB;IAMjD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,qBAAqB;IAN/B,OAAO,CAAC,OAAO,CAAC,CAAoB;IACpC,OAAO,CAAC,MAAM,CAAS;gBAGrB,QAAQ,EAAE,MAAM,EACR,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,qBAAqB,GAAE,OAAO,CAAC,qBAAqB,CAAM;IAMvD,QAAQ,CAAC,CAAC,EACrB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,OAAO,GAAE,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B;IAYtF,KAAK;IAOL,QAAQ;CAItB;AAED;;;GAGG;AACH,cAAM,eAAgB,YAAW,gBAAgB;IAQ7C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,qBAAqB;IAT/B,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,OAAO,CAAC,CAAoB;IACpC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,MAAM,CAAS;gBAGrB,QAAQ,EAAE,MAAM,EACR,QAAQ,EAAE,MAAM,EAChB,MAAM,GAAE,OAAO,CAAC,YAAY,CAAM,EAClC,qBAAqB,GAAE,OAAO,CAAC,qBAAqB,CAAM;IAMvD,QAAQ,CAAC,CAAC,EACrB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,OAAO,GAAE,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B;IA4CnG;;;;OAIG;IACU,KAAK;IA0BlB;;OAEG;IACU,QAAQ;CAKtB;AAuVD;;;GAGG;AACH,eAAO,MAAM,cAAc,GACxB,kBAAkB,MAAM,EAAE,QAAQ,MAAM,MAClC,mCAAmC;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,qBAAqB,EAAE,kBAAkB,EAAE,CAAA;CAAE;;EAsB5G,CAAC;AAEJ;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,YAAY,EAAE,EAChC,eAAe,UAAQ,EACvB,IAAI,CAAC,EAAE,SAAS,iBAwBjB"}

package/dest/fixtures/snapshot_manager.js

@@ -331,8 +331,8 @@ 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 cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, 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));
         writeFileSync(`${statePath}/accounts.json`, JSON.stringify(initialFundedAccounts, resolver));
@@ -430,8 +430,8 @@ 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 cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
+    const wallet = new TestWallet(pxe, aztecNode);
+    const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe, aztecNode);
     return {
         aztecNodeConfig,
         anvil,
@@ -481,8 +481,8 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
  * @param sender - Wallet to send the deployment tx.
  * @param accountsToDeploy - Which accounts to publicly deploy.
  * @param waitUntilProven - Whether to wait for the tx to be proven.
- * @param pxeOrNode - PXE or AztecNode to wait for proven.
- */ export async function publicDeployAccounts(wallet, accountsToDeploy, waitUntilProven = false, pxeOrNode) {
+ * @param node - AztecNode used to wait for proven tx.
+ */ export async function publicDeployAccounts(wallet, accountsToDeploy, waitUntilProven = false, node) {
     const instances = (await Promise.all(accountsToDeploy.map((account)=>wallet.getContractMetadata(account)))).map((metadata)=>metadata.contractInstance);
     const contractClass = await getContractClassFromArtifact(SchnorrAccountContractArtifact);
     const alreadyRegistered = (await wallet.getContractClassMetadata(contractClass.id)).isContractClassPubliclyRegistered;
@@ -497,10 +497,10 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         from: accountsToDeploy[0]
     }).wait();
     if (waitUntilProven) {
-        if (!pxeOrNode) {
-            throw new Error('Need to provide a PXE or AztecNode to wait for proven.');
+        if (!node) {
+            throw new Error('Need to provide an AztecNode to wait for proven.');
         } else {
-            await waitForProven(pxeOrNode, txReceipt);
+            await waitForProven(node, txReceipt);
         }
     }
 }

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,
@@ -145,11 +145,11 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
         rollupVersion
     };
     const ethCheatCodes = new EthCheatCodes(config.l1RpcUrls);
-    const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxeClient);
+    const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxeClient, aztecNode);
     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.
@@ -410,7 +410,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
         }
         logger.verbose('Creating a pxe...');
         const { pxe, teardown: pxeTeardown } = await setupPXEService(aztecNode, pxeOpts, logger);
-        const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxe);
+        const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxe, aztecNode);
         if (opts.aztecTargetCommitteeSize && opts.aztecTargetCommitteeSize > 0 || opts.initialValidators && opts.initialValidators.length > 0) {
             // We need to advance such that the committee is set up.
             await cheatCodes.rollup.advanceToEpoch(await cheatCodes.rollup.getEpoch() + BigInt(config.lagInEpochs + 1), {
@@ -419,12 +419,12 @@ 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) {
             logger.info('No accounts are being deployed, waiting for an empty block 1 to be mined');
-            while(await pxe.getBlockNumber() === 0){
+            while(await aztecNode.getBlockNumber() === 0){
                 await sleep(2000);
             }
         } else {

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.d.ts

@@ -1,6 +1,7 @@
-import { AztecAddress, type AztecNode, type Logger, type PXE, type Wallet } from '@aztec/aztec.js';
+import { AztecAddress, type AztecNode, type Logger, type PXE } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec/testing';
 import { type DeployL1ContractsReturnType, type ExtendedViemWalletClient } from '@aztec/ethereum';
+import type { TestWallet } from '@aztec/test-wallet';
 /** Objects to be returned by the uniswap setup function */
 export type UniswapSetupContext = {
     /** Aztec Node instance */
@@ -12,7 +13,7 @@ export type UniswapSetupContext = {
     /** The L1 wallet client, extended with public actions. */
     l1Client: ExtendedViemWalletClient;
     /** The wallet. */
-    wallet: Wallet;
+    wallet: TestWallet;
     /** The owner address. */
     ownerAddress: AztecAddress;
     /** The sponsor wallet. */

package/dest/shared/uniswap_l1_l2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uniswap_l1_l2.d.ts","sourceRoot":"","sources":["../../src/shared/uniswap_l1_l2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,KAAK,SAAS,EAGd,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,EAI9B,MAAM,iBAAiB,CAAC;AAuBzB,2DAA2D;AAC3D,MAAM,MAAM,mBAAmB,GAAG;IAChC,0BAA0B;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,+CAA+C;IAC/C,GAAG,EAAE,GAAG,CAAC;IACT,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,QAAQ,EAAE,wBAAwB,CAAC;IACnC,kBAAkB;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,yBAAyB;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,0BAA0B;IAC1B,cAAc,EAAE,YAAY,CAAC;IAC7B,OAAO;IACP,uBAAuB,EAAE,2BAA2B,CAAC;IACrD,4BAA4B;IAC5B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAGF,eAAO,MAAM,oBAAoB,GAC/B,OAAO,MAAM,OAAO,CAAC,mBAAmB,CAAC,EACzC,SAAS,MAAM,OAAO,CAAC,IAAI,CAAC,EAC5B,gCAAkC,SAk+BnC,CAAC"}
+{"version":3,"file":"uniswap_l1_l2.d.ts","sourceRoot":"","sources":["../../src/shared/uniswap_l1_l2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,KAAK,SAAS,EAGd,KAAK,MAAM,EACX,KAAK,GAAG,EAGT,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,EAI9B,MAAM,iBAAiB,CAAC;AAMzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAkBrD,2DAA2D;AAC3D,MAAM,MAAM,mBAAmB,GAAG;IAChC,0BAA0B;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,+CAA+C;IAC/C,GAAG,EAAE,GAAG,CAAC;IACT,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,QAAQ,EAAE,wBAAwB,CAAC;IACnC,kBAAkB;IAClB,MAAM,EAAE,UAAU,CAAC;IACnB,yBAAyB;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,0BAA0B;IAC1B,cAAc,EAAE,YAAY,CAAC;IAC7B,OAAO;IACP,uBAAuB,EAAE,2BAA2B,CAAC;IACrD,4BAA4B;IAC5B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAGF,eAAO,MAAM,oBAAoB,GAC/B,OAAO,MAAM,OAAO,CAAC,mBAAmB,CAAC,EACzC,SAAS,MAAM,OAAO,CAAC,IAAI,CAAC,EAC5B,gCAAkC,SAo+BnC,CAAC"}

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()
@@ -439,11 +439,8 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             const nonceForWETHTransferToPublicApproval = new Fr(2n);
             const expectedMessageHash = await computeAuthWitMessageHash({
                 caller: uniswapL2Contract.address,
-                action: wethCrossChainHarness.l2Token.methods.transfer_to_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferToPublicApproval)
-            }, {
-                chainId: new Fr(await aztecNode.getChainId()),
-                version: new Fr(await aztecNode.getVersion())
-            });
+                call: await wethCrossChainHarness.l2Token.methods.transfer_to_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferToPublicApproval).getFunctionCall()
+            }, await wallet.getChainInfo());
             await expect(uniswapL2Contract.methods.swap_private(wethCrossChainHarness.l2Token.address, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferToPublicApproval, uniswapFeeTier, minimumOutputAmount, Fr.random(), ownerEthAddress).simulate({
                 from: ownerAddress
             })).rejects.toThrow(`Unknown auth witness for message hash ${expectedMessageHash.toString()}`);
@@ -478,9 +475,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 caller: uniswapL2Contract.address,
                 action: wethCrossChainHarness.l2Token.methods.transfer_in_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferApproval)
             }, true);
-            await validateActionInteraction.send({
-                from: ownerAddress
-            }).wait();
+            await validateActionInteraction.send().wait();
             // No approval to call `swap` but should work even without it:
             const [_, secretHashForDepositingSwappedDai] = await generateClaimSecret();
             await uniswapL2Contract.methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferApproval, uniswapFeeTier, minimumOutputAmount, ownerAddress, secretHashForDepositingSwappedDai, ownerEthAddress, Fr.ZERO).send({
@@ -500,9 +495,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 caller: approvedUser,
                 action
             }, true);
-            await validateActionInteraction.send({
-                from: ownerAddress
-            }).wait();
+            await validateActionInteraction.send().wait();
             await expect(action.simulate({
                 from: sponsorAddress
             })).rejects.toThrow(/unauthorized/);
@@ -514,9 +507,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 caller: uniswapL2Contract.address,
                 action: wethCrossChainHarness.l2Token.methods.transfer_in_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferApproval)
             }, true);
-            await validateActionInteraction.send({
-                from: ownerAddress
-            }).wait();
+            await validateActionInteraction.send().wait();
             await expect(uniswapL2Contract.methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, new Fr(420), uniswapFeeTier, minimumOutputAmount, ownerAddress, Fr.random(), ownerEthAddress, Fr.ZERO).simulate({
                 from: ownerAddress
             })).rejects.toThrow(/unauthorized/);
@@ -622,9 +613,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 caller: uniswapL2Contract.address,
                 action: wethCrossChainHarness.l2Token.methods.transfer_in_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferApproval)
             }, true);
-            await validateActionInteraction.send({
-                from: ownerAddress
-            }).wait();
+            await validateActionInteraction.send().wait();
             // Call swap_public on L2
             const secretHashForDepositingSwappedDai = Fr.random();
             const withdrawReceipt = await uniswapL2Contract.methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferApproval, uniswapFeeTier, minimumOutputAmount, ownerAddress, secretHashForDepositingSwappedDai, ownerEthAddress, Fr.ZERO).send({

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,CA+CvB;AA8ED,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, 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, 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 pxe.isL1ToL2MessageSynced(Fr.fromHexString(claim.messageHash));
+    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.20250918",
+  "version": "3.0.0-nightly.20250920",
   "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.20250918",
-    "@aztec/archiver": "3.0.0-nightly.20250918",
-    "@aztec/aztec": "3.0.0-nightly.20250918",
-    "@aztec/aztec-node": "3.0.0-nightly.20250918",
-    "@aztec/aztec.js": "3.0.0-nightly.20250918",
-    "@aztec/bb-prover": "3.0.0-nightly.20250918",
-    "@aztec/blob-lib": "3.0.0-nightly.20250918",
-    "@aztec/blob-sink": "3.0.0-nightly.20250918",
-    "@aztec/bot": "3.0.0-nightly.20250918",
-    "@aztec/cli": "3.0.0-nightly.20250918",
-    "@aztec/constants": "3.0.0-nightly.20250918",
-    "@aztec/entrypoints": "3.0.0-nightly.20250918",
-    "@aztec/epoch-cache": "3.0.0-nightly.20250918",
-    "@aztec/ethereum": "3.0.0-nightly.20250918",
-    "@aztec/foundation": "3.0.0-nightly.20250918",
-    "@aztec/kv-store": "3.0.0-nightly.20250918",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20250918",
-    "@aztec/merkle-tree": "3.0.0-nightly.20250918",
-    "@aztec/node-keystore": "3.0.0-nightly.20250918",
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20250918",
-    "@aztec/noir-noirc_abi": "3.0.0-nightly.20250918",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250918",
-    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20250918",
-    "@aztec/p2p": "3.0.0-nightly.20250918",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20250918",
-    "@aztec/prover-client": "3.0.0-nightly.20250918",
-    "@aztec/prover-node": "3.0.0-nightly.20250918",
-    "@aztec/pxe": "3.0.0-nightly.20250918",
-    "@aztec/sequencer-client": "3.0.0-nightly.20250918",
-    "@aztec/simulator": "3.0.0-nightly.20250918",
-    "@aztec/slasher": "3.0.0-nightly.20250918",
-    "@aztec/stdlib": "3.0.0-nightly.20250918",
-    "@aztec/telemetry-client": "3.0.0-nightly.20250918",
-    "@aztec/test-wallet": "3.0.0-nightly.20250918",
-    "@aztec/validator-client": "3.0.0-nightly.20250918",
-    "@aztec/world-state": "3.0.0-nightly.20250918",
+    "@aztec/accounts": "3.0.0-nightly.20250920",
+    "@aztec/archiver": "3.0.0-nightly.20250920",
+    "@aztec/aztec": "3.0.0-nightly.20250920",
+    "@aztec/aztec-node": "3.0.0-nightly.20250920",
+    "@aztec/aztec.js": "3.0.0-nightly.20250920",
+    "@aztec/bb-prover": "3.0.0-nightly.20250920",
+    "@aztec/blob-lib": "3.0.0-nightly.20250920",
+    "@aztec/blob-sink": "3.0.0-nightly.20250920",
+    "@aztec/bot": "3.0.0-nightly.20250920",
+    "@aztec/cli": "3.0.0-nightly.20250920",
+    "@aztec/constants": "3.0.0-nightly.20250920",
+    "@aztec/entrypoints": "3.0.0-nightly.20250920",
+    "@aztec/epoch-cache": "3.0.0-nightly.20250920",
+    "@aztec/ethereum": "3.0.0-nightly.20250920",
+    "@aztec/foundation": "3.0.0-nightly.20250920",
+    "@aztec/kv-store": "3.0.0-nightly.20250920",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20250920",
+    "@aztec/merkle-tree": "3.0.0-nightly.20250920",
+    "@aztec/node-keystore": "3.0.0-nightly.20250920",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20250920",
+    "@aztec/noir-noirc_abi": "3.0.0-nightly.20250920",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250920",
+    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20250920",
+    "@aztec/p2p": "3.0.0-nightly.20250920",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20250920",
+    "@aztec/prover-client": "3.0.0-nightly.20250920",
+    "@aztec/prover-node": "3.0.0-nightly.20250920",
+    "@aztec/pxe": "3.0.0-nightly.20250920",
+    "@aztec/sequencer-client": "3.0.0-nightly.20250920",
+    "@aztec/simulator": "3.0.0-nightly.20250920",
+    "@aztec/slasher": "3.0.0-nightly.20250920",
+    "@aztec/stdlib": "3.0.0-nightly.20250920",
+    "@aztec/telemetry-client": "3.0.0-nightly.20250920",
+    "@aztec/test-wallet": "3.0.0-nightly.20250920",
+    "@aztec/validator-client": "3.0.0-nightly.20250920",
+    "@aztec/world-state": "3.0.0-nightly.20250920",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -207,7 +207,7 @@ export class ClientFlowsBenchmark {
         this.pxe = pxe;
         this.adminWallet = wallet;
         this.aztecNode = aztecNode;
-        this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
+        this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe, aztecNode);
 
         this.adminAddress = adminAddress;
         this.sequencerAddress = sequencerAddress;
@@ -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_blacklist_token_contract/blacklist_token_contract_test.ts

@@ -178,7 +178,7 @@ export class BlacklistTokenContractTest {
     secretHash: Fr,
     txHash: TxHash,
   ) {
-    const txEffects = await this.pxe.getTxEffect(txHash);
+    const txEffects = await this.aztecNode.getTxEffect(txHash);
     await contract.methods
       .deliver_transparent_note(
         contract.address,

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -72,7 +72,7 @@ export class CrossChainMessagingTest {
     this.aztecNode = this.ctx.aztecNode;
     this.pxe = this.ctx.pxe;
     this.aztecNodeConfig = this.ctx.aztecNodeConfig;
-    this.cheatCodes = await CheatCodes.create(this.aztecNodeConfig.l1RpcUrls, this.pxe);
+    this.cheatCodes = await CheatCodes.create(this.aztecNodeConfig.l1RpcUrls, this.pxe, this.aztecNode);
     this.deployL1ContractsValues = this.ctx.deployL1ContractsValues;
     this.aztecNodeAdmin = this.ctx.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_fees/fees_test.ts

@@ -188,7 +188,7 @@ export class FeesTest {
         this.wallet = wallet;
         this.aztecNode = aztecNode;
         this.gasSettings = GasSettings.default({ maxFeesPerGas: (await this.aztecNode.getCurrentBaseFees()).mul(2) });
-        this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
+        this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe, aztecNode);
         this.accounts = deployedAccounts.map(a => a.address);
         this.accounts.forEach((a, i) => this.logger.verbose(`Account ${i} address: ${a}`));
         [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.accounts.slice(0, 3);
@@ -318,7 +318,7 @@ export class FeesTest {
         };
 
         this.getProverFee = async (blockNumber: number) => {
-          const block = await this.pxe.getBlock(blockNumber);
+          const block = await this.aztecNode.getBlock(blockNumber);
 
           // @todo @lherskind As we deal with #13601
           // Right now the value is from `FeeLib.sol`

package/src/e2e_nested_contract/nested_contract_test.ts

@@ -1,4 +1,4 @@
-import { AztecAddress, type Logger, type PXE, type Wallet, createLogger } from '@aztec/aztec.js';
+import { AztecAddress, type AztecNode, type Logger, type PXE, type Wallet, createLogger } from '@aztec/aztec.js';
 import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
 import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
 
@@ -18,6 +18,7 @@ export class NestedContractTest {
   wallet!: Wallet;
   defaultAccountAddress!: AztecAddress;
   pxe!: PXE;
+  aztecNode!: AztecNode;
 
   parentContract!: ParentContract;
   childContract!: ChildContract;
@@ -39,10 +40,11 @@ export class NestedContractTest {
     await this.snapshotManager.snapshot(
       'accounts',
       deployAccounts(this.numberOfAccounts, this.logger),
-      ({ deployedAccounts }, { pxe, wallet }) => {
+      ({ deployedAccounts }, { pxe, wallet, aztecNode }) => {
         this.wallet = wallet;
         [{ address: this.defaultAccountAddress }] = deployedAccounts;
         this.pxe = pxe;
+        this.aztecNode = aztecNode;
         return Promise.resolve();
       },
     );

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/e2e_token_contract/token_contract_test.ts

@@ -1,6 +1,7 @@
-import { AztecAddress, type AztecNode, type Logger, type Wallet, createLogger } from '@aztec/aztec.js';
+import { AztecAddress, type AztecNode, type Logger, createLogger } from '@aztec/aztec.js';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
+import type { TestWallet } from '@aztec/test-wallet';
 
 import { jest } from '@jest/globals';
 
@@ -27,7 +28,7 @@ export class TokenContractTest {
   node!: AztecNode;
 
   badAccount!: InvalidAccountContract;
-  wallet!: Wallet;
+  wallet!: TestWallet;
   adminAddress!: AztecAddress;
   account1Address!: AztecAddress;
   account2Address!: AztecAddress;

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

@@ -8,7 +8,6 @@ import {
   type ContractFunctionInteraction,
   EthAddress,
   type Logger,
-  type PXE,
   type Wallet,
   getContractClassFromArtifact,
   waitForProven,
@@ -449,8 +448,8 @@ 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 cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, 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));
@@ -578,8 +577,8 @@ 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 cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
+  const wallet = new TestWallet(pxe, aztecNode);
+  const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe, aztecNode);
 
   return {
     aztecNodeConfig,
@@ -641,13 +640,13 @@ export const deployAccounts =
  * @param sender - Wallet to send the deployment tx.
  * @param accountsToDeploy - Which accounts to publicly deploy.
  * @param waitUntilProven - Whether to wait for the tx to be proven.
- * @param pxeOrNode - PXE or AztecNode to wait for proven.
+ * @param node - AztecNode used to wait for proven tx.
  */
 export async function publicDeployAccounts(
   wallet: Wallet,
   accountsToDeploy: AztecAddress[],
   waitUntilProven = false,
-  pxeOrNode?: PXE | AztecNode,
+  node?: AztecNode,
 ) {
   const instances = (await Promise.all(accountsToDeploy.map(account => wallet.getContractMetadata(account)))).map(
     metadata => metadata.contractInstance,
@@ -665,10 +664,10 @@ export async function publicDeployAccounts(
 
   const txReceipt = await batch.send({ from: accountsToDeploy[0] }).wait();
   if (waitUntilProven) {
-    if (!pxeOrNode) {
-      throw new Error('Need to provide a PXE or AztecNode to wait for proven.');
+    if (!node) {
+      throw new Error('Need to provide an AztecNode to wait for proven.');
     } else {
-      await waitForProven(pxeOrNode, txReceipt);
+      await waitForProven(node, txReceipt);
     }
   }
 }

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);
 
@@ -236,12 +236,12 @@ async function setupWithRemoteEnvironment(
     rollupVersion,
   };
   const ethCheatCodes = new EthCheatCodes(config.l1RpcUrls);
-  const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxeClient!);
+  const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxeClient!, aztecNode);
   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}.`);
@@ -657,7 +657,7 @@ export async function setup(
     logger.verbose('Creating a pxe...');
     const { pxe, teardown: pxeTeardown } = await setupPXEService(aztecNode!, pxeOpts, logger);
 
-    const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxe!);
+    const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxe!, aztecNode);
 
     if (
       (opts.aztecTargetCommitteeSize && opts.aztecTargetCommitteeSize > 0) ||
@@ -670,12 +670,12 @@ 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) {
       logger.info('No accounts are being deployed, waiting for an empty block 1 to be mined');
-      while ((await pxe.getBlockNumber()) === 0) {
+      while ((await aztecNode.getBlockNumber()) === 0) {
         await sleep(2000);
       }
     } else {

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

@@ -5,7 +5,6 @@ import {
   Fr,
   type Logger,
   type PXE,
-  type Wallet,
   computeAuthWitMessageHash,
   generateClaimSecret,
 } from '@aztec/aztec.js';
@@ -22,6 +21,7 @@ import { InboxAbi, UniswapPortalAbi, UniswapPortalBytecode } from '@aztec/l1-art
 import { UniswapContract } from '@aztec/noir-contracts.js/Uniswap';
 import { computeL2ToL1MessageHash } from '@aztec/stdlib/hash';
 import { computeL2ToL1MembershipWitness } from '@aztec/stdlib/messaging';
+import type { TestWallet } from '@aztec/test-wallet';
 
 import { jest } from '@jest/globals';
 import { type GetContractReturnType, getContract, parseEther, toFunctionSelector } from 'viem';
@@ -50,7 +50,7 @@ export type UniswapSetupContext = {
   /** The L1 wallet client, extended with public actions. */
   l1Client: ExtendedViemWalletClient;
   /** The wallet. */
-  wallet: Wallet;
+  wallet: TestWallet;
   /** The owner address. */
   ownerAddress: AztecAddress;
   /** The sponsor wallet. */
@@ -80,7 +80,7 @@ export const uniswapL1L2TestSuite = (
 
     let l1Client: ExtendedViemWalletClient;
 
-    let wallet: Wallet;
+    let wallet: TestWallet;
     let ownerAddress: AztecAddress;
     let ownerEthAddress: EthAddress;
     // does transactions on behalf of owner on Aztec:
@@ -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()],
@@ -614,14 +614,16 @@ export const uniswapL1L2TestSuite = (
       const expectedMessageHash = await computeAuthWitMessageHash(
         {
           caller: uniswapL2Contract.address,
-          action: wethCrossChainHarness.l2Token.methods.transfer_to_public(
-            ownerAddress,
-            uniswapL2Contract.address,
-            wethAmountToBridge,
-            nonceForWETHTransferToPublicApproval,
-          ),
+          call: await wethCrossChainHarness.l2Token.methods
+            .transfer_to_public(
+              ownerAddress,
+              uniswapL2Contract.address,
+              wethAmountToBridge,
+              nonceForWETHTransferToPublicApproval,
+            )
+            .getFunctionCall(),
         },
-        { chainId: new Fr(await aztecNode.getChainId()), version: new Fr(await aztecNode.getVersion()) },
+        await wallet.getChainInfo(),
       );
 
       await expect(
@@ -699,7 +701,7 @@ export const uniswapL1L2TestSuite = (
         },
         true,
       );
-      await validateActionInteraction.send({ from: ownerAddress }).wait();
+      await validateActionInteraction.send().wait();
 
       // No approval to call `swap` but should work even without it:
       const [_, secretHashForDepositingSwappedDai] = await generateClaimSecret();
@@ -749,7 +751,7 @@ export const uniswapL1L2TestSuite = (
         { caller: approvedUser, action },
         true,
       );
-      await validateActionInteraction.send({ from: ownerAddress }).wait();
+      await validateActionInteraction.send().wait();
 
       await expect(action.simulate({ from: sponsorAddress })).rejects.toThrow(/unauthorized/);
     });
@@ -771,7 +773,7 @@ export const uniswapL1L2TestSuite = (
         },
         true,
       );
-      await validateActionInteraction.send({ from: ownerAddress }).wait();
+      await validateActionInteraction.send().wait();
 
       await expect(
         uniswapL2Contract.methods
@@ -942,7 +944,7 @@ export const uniswapL1L2TestSuite = (
         },
         true,
       );
-      await validateActionInteraction.send({ from: ownerAddress }).wait();
+      await validateActionInteraction.send().wait();
 
       // Call swap_public on L2
       const secretHashForDepositingSwappedDai = Fr.random();

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,21 +134,23 @@ 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);
   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, a.getAddress(), undefined, logger)),
+    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) => {
@@ -165,6 +173,7 @@ export async function deployTestAccountsWithTokens(
 
   return {
     pxe,
+    aztecNode,
     wallet,
     accounts: fundedAccounts.map(acc => acc.getAddress()),
     tokenAdminAddress: tokenAdmin.getAddress(),
@@ -179,28 +188,30 @@ async function bridgeL1FeeJuice(
   l1RpcUrls: string[],
   mnemonicOrPrivateKey: string,
   pxe: PXE,
+  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 pxe.isL1ToL2MessageSynced(Fr.fromHexString(claim.messageHash));
+  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) {
@@ -208,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 });