@aztec/end-to-end 0.0.1-fake-c83136db25 → 0.0.1-fake-ceab37513c

package/dest/fixtures/utils.js

@@ -1,11 +1,9 @@
 import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
-import { generateSchnorrAccounts, getInitialTestAccountsData } from '@aztec/accounts/testing';
+import { deployFundedSchnorrAccounts, generateSchnorrAccounts, getDeployedTestAccounts, getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
 import { createArchiver } from '@aztec/archiver';
 import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
-import { BatchCall } from '@aztec/aztec.js/contracts';
+import { BatchCall, createAztecNodeClient, createLogger, createPXEClient, makeFetch, sleep, waitForPXE } from '@aztec/aztec.js';
 import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
-import { createLogger } from '@aztec/aztec.js/log';
-import { createAztecNodeClient, waitForNode } from '@aztec/aztec.js/node';
 import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
 import { createBlobSinkServer } from '@aztec/blob-sink/server';
@@ -19,19 +17,19 @@ import { Fr } from '@aztec/foundation/fields';
 import { tryRmDir } from '@aztec/foundation/fs';
 import { withLogNameSuffix } from '@aztec/foundation/log';
 import { retryUntil } from '@aztec/foundation/retry';
-import { sleep } from '@aztec/foundation/sleep';
-import { DateProvider, TestDateProvider } from '@aztec/foundation/timer';
+import { TestDateProvider } from '@aztec/foundation/timer';
 import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { MockGossipSubNetwork, getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
-import { protocolContractsHash } from '@aztec/protocol-contracts';
+import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import { createProverNode } from '@aztec/prover-node';
-import { getPXEConfig } from '@aztec/pxe/server';
+import { createPXEServiceWithSimulator, getPXEServiceConfig } from '@aztec/pxe/server';
+import { MemoryCircuitRecorder, SimulatorRecorderWrapper, WASMSimulator } from '@aztec/simulator/client';
+import { FileCircuitRecorder } from '@aztec/simulator/testing';
 import { getContractClassFromArtifact, getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
 import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@aztec/telemetry-client';
 import { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
-import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import fs from 'fs/promises';
 import getPort from 'get-port';
@@ -46,8 +44,8 @@ import { getBBConfig } from './get_bb_config.js';
 import { isMetricsLoggingRequested, setupMetricsLogger } from './logging.js';
 export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
 export { startAnvil };
-const { AZTEC_NODE_URL = '' } = process.env;
-const getAztecUrl = ()=>AZTEC_NODE_URL;
+const { PXE_URL = '' } = process.env;
+const getAztecUrl = ()=>PXE_URL;
 let telemetry = undefined;
 function getTelemetryClient(partialConfig = {}) {
     if (!telemetry) {
@@ -74,7 +72,7 @@ export const getPrivateKeyFromIndex = (index)=>{
 export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, chain = foundry)=>{
     const l1Data = await deployL1Contracts(l1RpcUrls, account, chain, logger, {
         vkTreeRoot: getVKTreeRoot(),
-        protocolContractsHash,
+        protocolContractTreeRoot,
         genesisArchiveRoot: args.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
         salt: args.salt,
         initialValidators: args.initialValidators,
@@ -85,30 +83,33 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
     return l1Data;
 };
 /**
- * Sets up Private eXecution Environment (PXE) and returns the corresponding test wallet.
+ * Sets up Private eXecution Environment (PXE).
  * @param aztecNode - An instance of Aztec Node.
- * @param opts - Partial configuration for the PXE.
+ * @param opts - Partial configuration for the PXE service.
  * @param logger - The logger to be used.
  * @param useLogSuffix - Whether to add a randomly generated suffix to the PXE debug logs.
- * @returns A test wallet, logger and teardown function.
- */ export async function setupPXEAndGetWallet(aztecNode, opts = {}, logger = getLogger(), useLogSuffix = false) {
-    const PXEConfig = {
-        ...getPXEConfig(),
+ * @returns Private eXecution Environment (PXE), logger and teardown function.
+ */ export async function setupPXEService(aztecNode, opts = {}, logger = getLogger(), useLogSuffix = false) {
+    const pxeServiceConfig = {
+        ...getPXEServiceConfig(),
         ...opts
     };
     // For tests we only want proving enabled if specifically requested
-    PXEConfig.proverEnabled = !!opts.proverEnabled;
+    pxeServiceConfig.proverEnabled = !!opts.proverEnabled;
     // If no data directory provided, create a temp directory and clean up afterwards
-    const configuredDataDirectory = PXEConfig.dataDirectory;
+    const configuredDataDirectory = pxeServiceConfig.dataDirectory;
     if (!configuredDataDirectory) {
-        PXEConfig.dataDirectory = path.join(tmpdir(), randomBytes(8).toString('hex'));
+        pxeServiceConfig.dataDirectory = path.join(tmpdir(), randomBytes(8).toString('hex'));
     }
-    const teardown = configuredDataDirectory ? ()=>Promise.resolve() : ()=>tryRmDir(PXEConfig.dataDirectory);
-    const wallet = await TestWallet.create(aztecNode, PXEConfig, {
+    const simulator = new WASMSimulator();
+    const recorder = process.env.CIRCUIT_RECORD_DIR ? new FileCircuitRecorder(process.env.CIRCUIT_RECORD_DIR) : new MemoryCircuitRecorder();
+    const simulatorWithRecorder = new SimulatorRecorderWrapper(simulator, recorder);
+    const pxe = await createPXEServiceWithSimulator(aztecNode, simulatorWithRecorder, pxeServiceConfig, {
         useLogSuffix
     });
+    const teardown = configuredDataDirectory ? ()=>Promise.resolve() : ()=>tryRmDir(pxeServiceConfig.dataDirectory);
     return {
-        wallet,
+        pxe,
         logger,
         teardown
     };
@@ -126,40 +127,44 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
     const aztecNodeUrl = getAztecUrl();
     logger.verbose(`Creating Aztec Node client to remote host ${aztecNodeUrl}`);
     const aztecNode = createAztecNodeClient(aztecNodeUrl);
-    await waitForNode(aztecNode, logger);
-    logger.verbose('JSON RPC client connected to Aztec Node');
-    logger.verbose(`Retrieving contract addresses from ${aztecNodeUrl}`);
-    const { l1ContractAddresses, rollupVersion } = await aztecNode.getNodeInfo();
+    logger.verbose(`Creating PXE client to remote host ${PXE_URL}`);
+    const pxeClient = createPXEClient(PXE_URL, {}, makeFetch([
+        1,
+        2,
+        3
+    ], true));
+    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 l1Client = createExtendedL1Client(config.l1RpcUrls, account, foundry);
     const deployL1ContractsValues = {
         l1ContractAddresses,
         l1Client,
         rollupVersion
     };
-    const ethCheatCodes = new EthCheatCodes(config.l1RpcUrls, new DateProvider());
-    const wallet = await TestWallet.create(aztecNode);
-    const cheatCodes = await CheatCodes.create(config.l1RpcUrls, aztecNode, new DateProvider());
+    const ethCheatCodes = new EthCheatCodes(config.l1RpcUrls);
+    const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxeClient);
     const teardown = ()=>Promise.resolve();
-    logger.verbose('Populating wallet from already registered accounts...');
-    const initialFundedAccounts = await getInitialTestAccountsData();
-    if (initialFundedAccounts.length < numberOfAccounts) {
-        throw new Error(`Required ${numberOfAccounts} accounts. Found ${initialFundedAccounts.length}.`);
+    logger.verbose('Constructing available wallets from already registered accounts...');
+    const initialFundedAccounts = await getDeployedTestAccounts(pxeClient);
+    const wallets = await getDeployedTestAccountsWallets(pxeClient);
+    if (wallets.length < numberOfAccounts) {
+        throw new Error(`Required ${numberOfAccounts} accounts. Found ${wallets.length}.`);
     // Deploy new accounts if there's a test that requires more funded accounts in the remote environment.
     }
-    const testAccounts = await Promise.all(initialFundedAccounts.slice(0, numberOfAccounts).map(async (account)=>{
-        const accountManager = await wallet.createSchnorrAccount(account.secret, account.salt, account.signingKey);
-        return accountManager.address;
-    }));
     return {
         aztecNode,
         aztecNodeAdmin: undefined,
         sequencer: undefined,
         proverNode: undefined,
+        pxe: pxeClient,
         deployL1ContractsValues,
         config,
         initialFundedAccounts,
-        wallet,
-        accounts: testAccounts,
+        wallets,
+        wallet: wallets[0],
+        accounts: wallets.slice(0, numberOfAccounts).map((w)=>w.getAddress()),
         logger,
         cheatCodes,
         ethCheatCodes,
@@ -206,8 +211,8 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             if (!isAnvilTestChain(chain.id)) {
                 throw new Error(`No ETHEREUM_HOSTS set but non anvil chain requested`);
             }
-            if (AZTEC_NODE_URL) {
-                throw new Error(`AZTEC_NODE_URL provided but no ETHEREUM_HOSTS set. Refusing to run, please set both variables so tests can deploy L1 contracts to the same Anvil instance`);
+            if (PXE_URL) {
+                throw new Error(`PXE_URL provided but no ETHEREUM_HOSTS set. Refusing to run, please set both variables so tests can deploy L1 contracts to the same Anvil instance`);
             }
             const res = await startAnvil({
                 l1BlockTime: opts.ethereumSlotDuration,
@@ -225,8 +230,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             logger.info(`Logging metrics to ${filename}`);
             setupMetricsLogger(filename);
         }
-        const dateProvider = new TestDateProvider();
-        const ethCheatCodes = new EthCheatCodesWithState(config.l1RpcUrls, dateProvider);
+        const ethCheatCodes = new EthCheatCodesWithState(config.l1RpcUrls);
         if (opts.stateLoad) {
             await ethCheatCodes.loadChainState(opts.stateLoad);
         }
@@ -254,7 +258,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             ];
         }
         config.coinbase = EthAddress.fromString(publisherHdAccount.address);
-        if (AZTEC_NODE_URL) {
+        if (PXE_URL) {
             // we are setting up against a remote environment, l1 contracts are assumed to already be deployed
             return await setupWithRemoteEnvironment(publisherHdAccount, config, logger, numberOfAccounts);
         }
@@ -297,7 +301,6 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
         if (enableAutomine) {
             await ethCheatCodes.setAutomine(false);
             await ethCheatCodes.setIntervalMining(config.ethereumSlotDuration);
-            dateProvider.setTime(await ethCheatCodes.timestamp() * 1000);
         }
         if (opts.l2StartTime) {
             // This should only be used in synching test or when you need to have a stable
@@ -306,7 +309,9 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
                 resetBlockInterval: true
             });
         }
-        const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(config.l1RpcUrls, dateProvider), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.l1Client, dateProvider);
+        const dateProvider = new TestDateProvider();
+        dateProvider.setTime(await ethCheatCodes.timestamp() * 1000);
+        const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(config.l1RpcUrls), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.l1Client, dateProvider);
         if (!opts.disableAnvilTestWatcher) {
             await watcher.start();
         }
@@ -399,31 +404,32 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, config, proverNodeConfig, aztecNode, prefilledPublicData);
         }
         logger.verbose('Creating a pxe...');
-        const { wallet, teardown: pxeTeardown } = await setupPXEAndGetWallet(aztecNode, pxeOpts, logger);
-        const cheatCodes = await CheatCodes.create(config.l1RpcUrls, aztecNode, dateProvider);
+        const { pxe, teardown: pxeTeardown } = await setupPXEService(aztecNode, pxeOpts, logger);
+        const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxe);
         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));
+            await cheatCodes.rollup.advanceToEpoch(await cheatCodes.rollup.getEpoch() + BigInt(config.lagInEpochs + 1), {
+                updateDateProvider: dateProvider
+            });
             await cheatCodes.rollup.setupEpoch();
             await cheatCodes.rollup.debugRollup();
         }
-        let accounts = [];
         // Below we continue with what we described in the long comment on line 571.
+        let accountManagers = [];
         if (numberOfAccounts === 0) {
             logger.info('No accounts are being deployed, waiting for an empty block 1 to be mined');
-            while(await aztecNode.getBlockNumber() === 0){
+            while(await pxe.getBlockNumber() === 0){
                 await sleep(2000);
             }
         } else {
             logger.info(`${numberOfAccounts} accounts are being deployed. Reliably progressing past genesis by setting minTxsPerBlock to 1 and waiting for the accounts to be deployed`);
-            const accountsData = initialFundedAccounts.slice(0, numberOfAccounts);
-            const accountManagers = await deployFundedSchnorrAccounts(wallet, aztecNode, accountsData);
-            accounts = accountManagers.map((accountManager)=>accountManager.address);
+            accountManagers = await deployFundedSchnorrAccounts(pxe, initialFundedAccounts.slice(0, numberOfAccounts));
         }
         // Now we restore the original minTxsPerBlock setting.
         sequencerClient.getSequencer().updateConfig({
             minTxsPerBlock: originalMinTxsPerBlock
         });
+        const wallets = await Promise.all(accountManagers.map((account)=>account.getWallet()));
         if (initialFundedAccounts.length < numberOfAccounts) {
             // TODO: Create (numberOfAccounts - initialFundedAccounts.length) wallets without funds.
             throw new Error(`Unable to deploy ${numberOfAccounts} accounts. Only ${initialFundedAccounts.length} accounts were funded.`);
@@ -461,11 +467,13 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             mockGossipSubNetwork,
             prefilledPublicData,
             proverNode,
+            pxe,
             sequencer: sequencerClient,
             teardown,
             telemetryClient: telemetry,
-            wallet,
-            accounts,
+            wallets,
+            wallet: wallets[0],
+            accounts: wallets.map((w)=>w.getAddress()),
             watcher
         };
     } catch (err) {
@@ -479,28 +487,45 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
  * Use this when you need to make a public call to an account contract, such as for requesting a public authwit.
  * @param sender - Wallet to send the deployment tx.
  * @param accountsToDeploy - Which accounts to publicly deploy.
- */ export async function ensureAccountContractsPublished(wallet, accountsToDeploy) {
+ */ // docs:start:public_deploy_accounts
+export async function ensureAccountContractsPublished(sender, accountsToDeploy) {
     // We have to check whether the accounts are already deployed. This can happen if the test runs against
     // the sandbox and the test accounts exist
-    const accountsAndAddresses = await Promise.all(accountsToDeploy.map(async (address)=>{
+    const accountsAndAddresses = await Promise.all(accountsToDeploy.map(async (account)=>{
+        const address = account.getAddress();
         return {
             address,
-            deployed: (await wallet.getContractMetadata(address)).isContractPublished
+            deployed: (await sender.getContractMetadata(address)).isContractPublished
         };
     }));
-    const instances = (await Promise.all(accountsAndAddresses.filter(({ deployed })=>!deployed).map(({ address })=>wallet.getContractMetadata(address)))).map((contractMetadata)=>contractMetadata.contractInstance);
+    const instances = (await Promise.all(accountsAndAddresses.filter(({ deployed })=>!deployed).map(({ address })=>sender.getContractMetadata(address)))).map((contractMetadata)=>contractMetadata.contractInstance);
     const contractClass = await getContractClassFromArtifact(SchnorrAccountContractArtifact);
-    if (!(await wallet.getContractClassMetadata(contractClass.id, true)).isContractClassPubliclyRegistered) {
-        await (await publishContractClass(wallet, SchnorrAccountContractArtifact)).send({
-            from: accountsToDeploy[0]
+    if (!(await sender.getContractClassMetadata(contractClass.id, true)).isContractClassPubliclyRegistered) {
+        await (await publishContractClass(sender, SchnorrAccountContractArtifact)).send({
+            from: accountsToDeploy[0].getAddress()
         }).wait();
     }
-    const requests = await Promise.all(instances.map(async (instance)=>await publishInstance(wallet, instance)));
-    const batch = new BatchCall(wallet, requests);
+    const requests = await Promise.all(instances.map(async (instance)=>await publishInstance(sender, instance)));
+    const batch = new BatchCall(sender, requests);
     await batch.send({
-        from: accountsToDeploy[0]
+        from: accountsToDeploy[0].getAddress()
     }).wait();
 }
+// docs:end:public_deploy_accounts
+/**
+ * Sets the timestamp of the next block.
+ * @param rpcUrl - rpc url of the blockchain instance to connect to
+ * @param timestamp - the timestamp for the next block
+ */ export async function setNextBlockTimestamp(rpcUrl, timestamp) {
+    const params = `[${timestamp}]`;
+    await fetch(rpcUrl, {
+        body: `{"jsonrpc":"2.0", "method": "evm_setNextBlockTimestamp", "params": ${params}, "id": 1}`,
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    });
+}
 /** Returns the job name for the current test. */ function getJobName() {
     return process.env.JOB_NAME ?? expect.getState().currentTestName?.split(' ')[0].replaceAll('/', '_') ?? 'unknown';
 }
@@ -539,7 +564,7 @@ export async function expectMappingDelta(initialValues, fn, inputs, expectedDiff
     expect(diffs).toEqual(expectedDiffs);
 }
 /**
- * Computes the address of the "canonical" SponsoredFPCContract. This is not a protocol contract
+ * Computes the address of the "canonical" SponosoredFPCContract. This is not a protocol contract
  * but by conventions its address is computed with a salt of 0.
  * @returns The address of the sponsored FPC contract
  */ export function getSponsoredFPCInstance() {
@@ -548,7 +573,7 @@ export async function expectMappingDelta(initialValues, fn, inputs, expectedDiff
     }));
 }
 /**
- * Computes the address of the "canonical" SponsoredFPCContract. This is not a protocol contract
+ * Computes the address of the "canonical" SponosoredFPCContract. This is not a protocol contract
  * but by conventions its address is computed with a salt of 0.
  * @returns The address of the sponsored FPC contract
  */ export async function getSponsoredFPCAddress() {
@@ -557,11 +582,11 @@ export async function expectMappingDelta(initialValues, fn, inputs, expectedDiff
 }
 /**
  * Deploy a sponsored FPC contract to a running instance.
- */ export async function setupSponsoredFPC(wallet) {
+ */ export async function setupSponsoredFPC(pxe) {
     const instance = await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
         salt: new Fr(SPONSORED_FPC_SALT)
     });
-    await wallet.registerContract({
+    await pxe.registerContract({
         instance,
         artifact: SponsoredFPCContract.artifact
     });
@@ -570,9 +595,9 @@ export async function expectMappingDelta(initialValues, fn, inputs, expectedDiff
 }
 /**
  * Registers the SponsoredFPC in this PXE instance
- * @param wallet - The wallet
- */ export async function registerSponsoredFPC(wallet) {
-    await wallet.registerContract({
+ * @param pxe - The pxe client
+ */ export async function registerSponsoredFPC(pxe) {
+    await pxe.registerContract({
         instance: await getSponsoredFPCInstance(),
         artifact: SponsoredFPCContract.artifact
     });

package/dest/fixtures/web3signer.d.ts

@@ -1,5 +1,5 @@
 export declare function createWeb3SignerKeystore(dir: string, ...privateKeys: string[]): Promise<void>;
-export declare function refreshWeb3Signer(url: string, ...expectedAddresses: string[]): Promise<void>;
+export declare function refreshWeb3Signer(url: string): Promise<void>;
 export declare function getWeb3SignerTestKeystoreDir(): string;
 export declare function getWeb3SignerUrl(): string;
 //# sourceMappingURL=web3signer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"web3signer.d.ts","sourceRoot":"","sources":["../../src/fixtures/web3signer.ts"],"names":[],"mappings":"AASA,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,MAAM,EAAE,iBAcnF;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,iBAAiB,EAAE,MAAM,EAAE,iBAoBlF;AAED,wBAAgB,4BAA4B,IAAI,MAAM,CAOrD;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAMzC"}
+{"version":3,"file":"web3signer.d.ts","sourceRoot":"","sources":["../../src/fixtures/web3signer.ts"],"names":[],"mappings":"AAOA,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,MAAM,EAAE,iBAcnF;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,iBAKlD;AAED,wBAAgB,4BAA4B,IAAI,MAAM,CAOrD;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAMzC"}

package/dest/fixtures/web3signer.js

@@ -1,7 +1,5 @@
+import { sleep } from '@aztec/aztec.js';
 import { randomBytes } from '@aztec/foundation/crypto';
-import { retryUntil } from '@aztec/foundation/retry';
-import { sleep } from '@aztec/foundation/sleep';
-import { RemoteSigner } from '@aztec/node-keystore';
 import { mkdirSync } from 'node:fs';
 import { writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
@@ -17,22 +15,13 @@ privateKey: ${pk}`).join('\n---\n');
         flag: 'wx'
     });
 }
-export async function refreshWeb3Signer(url, ...expectedAddresses) {
+export async function refreshWeb3Signer(url) {
     await fetch(new URL('reload', url), {
         method: 'POST'
     });
-    if (expectedAddresses.length > 0) {
-        await retryUntil(async ()=>{
-            try {
-                await RemoteSigner.validateAccess(url, expectedAddresses);
-                return true;
-            } catch  {
-                return false;
-            }
-        }, 'web3signer refresh', 10, 0.5);
-    } else {
-        await sleep(1000);
-    }
+    // give the service a chance to load up the new files
+    // 1s might not be enough if there are a lot of files to scan
+    await sleep(1000);
 }
 export function getWeb3SignerTestKeystoreDir() {
     if (process.env.WEB3_SIGNER_TEST_KEYSTORE_DIR) {

package/dest/quality_of_service/alert_checker.d.ts

@@ -1,4 +1,4 @@
-import type { Logger } from '@aztec/aztec.js/log';
+import type { Logger } from '@aztec/aztec.js';
 export interface AlertConfig {
     alert: string;
     expr: string;

package/dest/quality_of_service/alert_checker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"alert_checker.d.ts","sourceRoot":"","sources":["../../src/quality_of_service/alert_checker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAKlD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAQD,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,CAAC,kBAAkB,CAAM;IAKpE;;;OAGG;IACH,OAAO,CAAC,gBAAgB;YAMV,YAAY;YAqCZ,WAAW;IAqBzB;;;OAGG;IACU,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUhE;;;OAGG;IACU,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAIxE;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IACnC,IAAI,SAAyB;CACvC"}
+{"version":3,"file":"alert_checker.d.ts","sourceRoot":"","sources":["../../src/quality_of_service/alert_checker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAK9C,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAQD,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,CAAC,kBAAkB,CAAM;IAKpE;;;OAGG;IACH,OAAO,CAAC,gBAAgB;YAMV,YAAY;YAqCZ,WAAW;IAqBzB;;;OAGG;IACU,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUhE;;;OAGG;IACU,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAIxE;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IACnC,IAAI,SAAyB;CACvC"}

package/dest/shared/cross_chain_test_harness.d.ts

@@ -1,15 +1,5 @@
-import type { AztecAddress } from '@aztec/aztec.js/addresses';
-import { EthAddress } from '@aztec/aztec.js/addresses';
-import { AuthWitness } from '@aztec/aztec.js/authorization';
-import { type L2AmountClaim, type L2AmountClaimWithRecipient } from '@aztec/aztec.js/ethereum';
-import { Fr } from '@aztec/aztec.js/fields';
-import type { Logger } from '@aztec/aztec.js/log';
-import type { AztecNode } from '@aztec/aztec.js/node';
-import type { SiblingPath } from '@aztec/aztec.js/trees';
-import type { TxReceipt } from '@aztec/aztec.js/tx';
-import type { Wallet } from '@aztec/aztec.js/wallet';
+import { type AccountWallet, AuthWitness, type AztecAddress, type AztecNode, EthAddress, type FieldsOf, Fr, type L2AmountClaim, type L2AmountClaimWithRecipient, type Logger, type PXE, type SiblingPath, type TxReceipt, type Wallet } from '@aztec/aztec.js';
 import { type ExtendedViemWalletClient, type L1ContractAddresses } from '@aztec/ethereum';
-import type { FieldsOf } from '@aztec/foundation/types';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
 import { type Hex } from 'viem';
@@ -62,6 +52,8 @@ export type CrossChainContext = {
 export declare class CrossChainTestHarness {
     /** Aztec node instance. */
     aztecNode: AztecNode;
+    /** Private eXecution Environment (PXE). */
+    pxeService: PXE;
     /** Logger. */
     logger: Logger;
     /** L2 Token contract. */
@@ -78,16 +70,18 @@ export declare class CrossChainTestHarness {
     l1Client: ExtendedViemWalletClient;
     /** Deployment addresses for all L1 contracts */
     readonly l1ContractAddresses: L1ContractAddresses;
-    /** Wallet to simulate and send txs from. */
-    readonly wallet: Wallet;
+    /** Wallet of the owner. */
+    readonly ownerWallet: AccountWallet;
     /** Owner of the l2 token and bridge */
     readonly ownerAddress: AztecAddress;
-    static new(aztecNode: AztecNode, l1Client: ExtendedViemWalletClient, wallet: Wallet, ownerAddress: AztecAddress, logger: Logger, underlyingERC20Address: EthAddress): Promise<CrossChainTestHarness>;
+    static new(aztecNode: AztecNode, pxeService: PXE, l1Client: ExtendedViemWalletClient, wallet: AccountWallet, ownerAddress: AztecAddress, logger: Logger, underlyingERC20Address: EthAddress): Promise<CrossChainTestHarness>;
     private readonly l1TokenManager;
     private readonly l1TokenPortalManager;
     constructor(
     /** Aztec node instance. */
     aztecNode: AztecNode, 
+    /** Private eXecution Environment (PXE). */
+    pxeService: PXE, 
     /** Logger. */
     logger: Logger, 
     /** L2 Token contract. */
@@ -104,8 +98,8 @@ export declare class CrossChainTestHarness {
     l1Client: ExtendedViemWalletClient, 
     /** Deployment addresses for all L1 contracts */
     l1ContractAddresses: L1ContractAddresses, 
-    /** Wallet to simulate and send txs from. */
-    wallet: Wallet, 
+    /** Wallet of the owner. */
+    ownerWallet: AccountWallet, 
     /** Owner of the l2 token and bridge */
     ownerAddress: AztecAddress);
     mintTokensOnL1(amount: bigint): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"cross_chain_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/cross_chain_test_harness.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cross_chain_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/cross_chain_test_harness.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAClB,WAAW,EACX,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,UAAU,EACV,KAAK,QAAQ,EACb,EAAE,EAGF,KAAK,aAAa,EAClB,KAAK,0BAA0B,EAC/B,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,MAAM,EAEZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,mBAAmB,EAAoB,MAAM,iBAAiB,CAAC;AAE5G,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAE3E,OAAO,EAAE,KAAK,GAAG,EAAe,MAAM,MAAM,CAAC;AAK7C;;;;;;;;;GASG;AACH,wBAAsB,0CAA0C,CAC9D,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,wBAAwB,EAClC,qBAAqB,EAAE,UAAU,EACjC,KAAK,EAAE,YAAY,EACnB,sBAAsB,EAAE,UAAU,GACjC,OAAO,CAAC;IACT;;OAEG;IACH,KAAK,EAAE,aAAa,CAAC;IACrB;;OAEG;IACH,MAAM,EAAE,mBAAmB,CAAC;IAC5B;;OAEG;IACH,kBAAkB,EAAE,UAAU,CAAC;IAC/B;;OAEG;IACH,WAAW,EAAE,GAAG,CAAC;IACjB;;OAEG;IACH,eAAe,EAAE,GAAG,CAAC;CACtB,CAAC,CA8CD;AAGD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,UAAU,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF;;;GAGG;AACH,qBAAa,qBAAqB;IA4C9B,2BAA2B;IACpB,SAAS,EAAE,SAAS;IAC3B,2CAA2C;IACpC,UAAU,EAAE,GAAG;IACtB,cAAc;IACP,MAAM,EAAE,MAAM;IAErB,yBAAyB;IAClB,OAAO,EAAE,aAAa;IAC7B,gCAAgC;IACzB,QAAQ,EAAE,mBAAmB;IAEpC,oCAAoC;IAC7B,UAAU,EAAE,UAAU;IAE7B,sBAAsB;IACf,kBAAkB,EAAE,UAAU;IACrC,yCAAyC;IAClC,sBAAsB,EAAE,UAAU;IACzC,qCAAqC;IAC9B,QAAQ,EAAE,wBAAwB;IAEzC,gDAAgD;aAChC,mBAAmB,EAAE,mBAAmB;IAExD,2BAA2B;aACX,WAAW,EAAE,aAAa;IAE1C,uCAAuC;aACvB,YAAY,EAAE,YAAY;WAxE/B,GAAG,CACd,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,GAAG,EACf,QAAQ,EAAE,wBAAwB,EAClC,MAAM,EAAE,aAAa,EACrB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,sBAAsB,EAAE,UAAU,GACjC,OAAO,CAAC,qBAAqB,CAAC;IA+BjC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuB;;IAG1D,2BAA2B;IACpB,SAAS,EAAE,SAAS;IAC3B,2CAA2C;IACpC,UAAU,EAAE,GAAG;IACtB,cAAc;IACP,MAAM,EAAE,MAAM;IAErB,yBAAyB;IAClB,OAAO,EAAE,aAAa;IAC7B,gCAAgC;IACzB,QAAQ,EAAE,mBAAmB;IAEpC,oCAAoC;IAC7B,UAAU,EAAE,UAAU;IAE7B,sBAAsB;IACf,kBAAkB,EAAE,UAAU;IACrC,yCAAyC;IAClC,sBAAsB,EAAE,UAAU;IACzC,qCAAqC;IAC9B,QAAQ,EAAE,wBAAwB;IAEzC,gDAAgD;IAChC,mBAAmB,EAAE,mBAAmB;IAExD,2BAA2B;IACX,WAAW,EAAE,aAAa;IAE1C,uCAAuC;IACvB,YAAY,EAAE,YAAY;IActC,cAAc,CAAC,MAAM,EAAE,MAAM;IAYnC,cAAc,CAAC,OAAO,EAAE,UAAU;IAIlC,wBAAwB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,UAAQ;IAI3D,yBAAyB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,UAAQ;IAItD,oBAAoB,CAAC,MAAM,EAAE,MAAM;IAKnC,qBAAqB,CAAC,MAAM,EAAE,MAAM;IAIpC,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,YAAY;IAQ1E,qCAAqC,CACzC,KAAK,EAAE,IAAI,CAAC,0BAA0B,EAAE,aAAa,GAAG,aAAa,GAAG,kBAAkB,GAAG,WAAW,CAAC;IAUrG,oCAAoC,CACxC,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,GAAG,kBAAkB,CAAC;IAU1E,4BAA4B,CAChC,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,EAAE,YAAU,EAC1B,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IASzB,2BAA2B,CAAC,cAAc,EAAE,MAAM,EAAE,YAAY,GAAE,EAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAS7G,qBAAqB,CAAC,KAAK,EAAE,YAAY;IAIzC,wBAAwB,CAAC,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM;IAMrE,oBAAoB,CAAC,KAAK,EAAE,YAAY;IAIxC,uBAAuB,CAAC,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM;IAKpE,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,GAAE,UAA4B,GAAG,OAAO,CAAC,EAAE,CAAC;IASzG,2BAA2B,CACzB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAAG,MAAM,EAC5B,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC;IAW5B,qBAAqB,CAAC,YAAY,EAAE,MAAM;IAQ1C,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,KAAU;IAQjE;;;;;;OAMG;IACG,qBAAqB,CAAC,OAAO,EAAE,EAAE,GAAG,GAAG;IAS7C,mBAAmB,IAAI,iBAAiB;CAYzC"}

package/dest/shared/cross_chain_test_harness.js

@@ -1,13 +1,12 @@
-import { EthAddress } from '@aztec/aztec.js/addresses';
-import { L1TokenPortalManager } from '@aztec/aztec.js/ethereum';
-import { Fr } from '@aztec/aztec.js/fields';
+// docs:start:cross_chain_test_harness
+import { EthAddress, Fr, L1TokenPortalManager, retryUntil } from '@aztec/aztec.js';
 import { deployL1Contract } from '@aztec/ethereum';
-import { retryUntil } from '@aztec/foundation/retry';
 import { TestERC20Abi, TokenPortalAbi, TokenPortalBytecode } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
 import { getContract } from 'viem';
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';
+// docs:start:deployAndInitializeTokenAndBridgeContracts
 /**
  * Deploy L1 token and portal, initialize portal, deploy a non native l2 token contract, its L2 bridge contract and attach is to the portal.
  * @param wallet - the wallet instance
@@ -76,6 +75,7 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
  * shared between cross chain tests.
  */ export class CrossChainTestHarness {
     aztecNode;
+    pxeService;
     logger;
     l2Token;
     l2Bridge;
@@ -84,21 +84,22 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
     underlyingERC20Address;
     l1Client;
     l1ContractAddresses;
-    wallet;
+    ownerWallet;
     ownerAddress;
-    static async new(aztecNode, l1Client, wallet, ownerAddress, logger, underlyingERC20Address) {
+    static async new(aztecNode, pxeService, l1Client, wallet, ownerAddress, logger, underlyingERC20Address) {
         const ethAccount = EthAddress.fromString((await l1Client.getAddresses())[0]);
-        const l1ContractAddresses = (await aztecNode.getNodeInfo()).l1ContractAddresses;
+        const l1ContractAddresses = (await pxeService.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);
+        const { token, bridge, tokenPortalAddress, underlyingERC20 } = await deployAndInitializeTokenAndBridgeContracts(wallet, l1Client, l1ContractAddresses.registryAddress, wallet.getAddress(), underlyingERC20Address);
         logger.info('Deployed and initialized token, portal and its bridge.');
-        return new CrossChainTestHarness(aztecNode, logger, token, bridge, ethAccount, tokenPortalAddress, underlyingERC20.address, l1Client, l1ContractAddresses, wallet, ownerAddress);
+        return new CrossChainTestHarness(aztecNode, pxeService, logger, token, bridge, ethAccount, tokenPortalAddress, underlyingERC20.address, l1Client, l1ContractAddresses, wallet, ownerAddress);
     }
     l1TokenManager;
     l1TokenPortalManager;
-    constructor(/** Aztec node instance. */ aztecNode, /** Logger. */ logger, /** L2 Token contract. */ l2Token, /** L2 Token bridge contract. */ l2Bridge, /** Eth account to interact with. */ ethAccount, /** Portal address. */ tokenPortalAddress, /** Underlying token for portal tests. */ underlyingERC20Address, /** Viem Extended client instance. */ l1Client, /** Deployment addresses for all L1 contracts */ l1ContractAddresses, /** Wallet to simulate and send txs from. */ wallet, /** Owner of the l2 token and bridge */ ownerAddress){
+    constructor(/** Aztec node instance. */ aztecNode, /** Private eXecution Environment (PXE). */ pxeService, /** Logger. */ logger, /** L2 Token contract. */ l2Token, /** L2 Token bridge contract. */ l2Bridge, /** Eth account to interact with. */ ethAccount, /** Portal address. */ tokenPortalAddress, /** Underlying token for portal tests. */ underlyingERC20Address, /** Viem Extended client instance. */ l1Client, /** Deployment addresses for all L1 contracts */ l1ContractAddresses, /** Wallet of the owner. */ ownerWallet, /** Owner of the l2 token and bridge */ ownerAddress){
         this.aztecNode = aztecNode;
+        this.pxeService = pxeService;
         this.logger = logger;
         this.l2Token = l2Token;
         this.l2Bridge = l2Bridge;
@@ -107,10 +108,11 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
         this.underlyingERC20Address = underlyingERC20Address;
         this.l1Client = l1Client;
         this.l1ContractAddresses = l1ContractAddresses;
-        this.wallet = wallet;
+        this.ownerWallet = ownerWallet;
         this.ownerAddress = ownerAddress;
         this.l1TokenPortalManager = new L1TokenPortalManager(this.tokenPortalAddress, this.underlyingERC20Address, this.l1ContractAddresses.feeAssetHandlerAddress, this.l1ContractAddresses.outboxAddress, this.l1Client, this.logger);
         this.l1TokenManager = this.l1TokenPortalManager.getTokenManager();
+        this.ownerAddress = this.ownerWallet.getAddress();
     }
     async mintTokensOnL1(amount) {
         const contract = getContract({
@@ -144,7 +146,7 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
         }).wait();
     }
     async mintTokensPrivateOnL2(amount) {
-        await mintTokensToPrivate(this.l2Token, this.ownerAddress, this.ownerAddress, amount);
+        await mintTokensToPrivate(this.l2Token, this.ownerAddress, this.ownerWallet, this.ownerAddress, amount);
     }
     async sendL2PublicTransfer(transferAmount, receiverAddress) {
         // send a transfer tx to force through rollup with the message included
@@ -243,4 +245,4 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
             outbox: this.l1ContractAddresses.outboxAddress
         };
     }
-}
+} // docs:end:cross_chain_test_harness

package/dest/shared/gas_portal_test_harness.d.ts

@@ -1,8 +1,4 @@
-import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
-import { L1FeeJuicePortalManager, type L1TokenManager, type L2AmountClaim } from '@aztec/aztec.js/ethereum';
-import type { Logger } from '@aztec/aztec.js/log';
-import type { AztecNode } from '@aztec/aztec.js/node';
-import type { Wallet } from '@aztec/aztec.js/wallet';
+import { type AztecAddress, type AztecNode, EthAddress, L1FeeJuicePortalManager, type L1TokenManager, type L2AmountClaim, type Logger, type PXE, type Wallet } from '@aztec/aztec.js';
 import type { ExtendedViemWalletClient } from '@aztec/ethereum';
 import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
@@ -16,6 +12,7 @@ export interface IGasBridgingTestHarness {
 export interface FeeJuicePortalTestingHarnessFactoryConfig {
     aztecNode: AztecNode;
     aztecNodeAdmin?: AztecNodeAdmin;
+    pxeService: PXE;
     l1Client: ExtendedViemWalletClient;
     wallet: Wallet;
     logger: Logger;
@@ -36,8 +33,8 @@ export declare class GasBridgingTestHarness implements IGasBridgingTestHarness {
     aztecNode: AztecNode;
     /** Aztec node admin interface */
     aztecNodeAdmin: AztecNodeAdmin | undefined;
-    /** Wallet. */
-    wallet: Wallet;
+    /** Private eXecution Environment (PXE). */
+    pxeService: PXE;
     /** Logger. */
     logger: Logger;
     /** L2 Token/Bridge contract. */
@@ -59,8 +56,8 @@ export declare class GasBridgingTestHarness implements IGasBridgingTestHarness {
     aztecNode: AztecNode, 
     /** Aztec node admin interface */
     aztecNodeAdmin: AztecNodeAdmin | undefined, 
-    /** Wallet. */
-    wallet: Wallet, 
+    /** Private eXecution Environment (PXE). */
+    pxeService: PXE, 
     /** Logger. */
     logger: Logger, 
     /** L2 Token/Bridge contract. */