@aztec/end-to-end 4.0.0-nightly.20250907 → 4.0.0-nightly.20260108

package/dest/e2e_p2p/shared.js

@@ -1,9 +1,14 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { Fr, TxStatus, getContractInstanceFromInstantiationParams, retryUntil } from '@aztec/aztec.js';
+import { getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import { TxStatus } from '@aztec/aztec.js/tx';
+import { EpochNumber } from '@aztec/foundation/branded-types';
 import { timesAsync, unique } from '@aztec/foundation/collection';
+import { retryUntil } from '@aztec/foundation/retry';
+import { pluralize } from '@aztec/foundation/string';
 import { TestContract, TestContractArtifact } from '@aztec/noir-test-contracts.js/Test';
-import { createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe/server';
+import { getPXEConfig, getPXEConfig as getRpcConfig } from '@aztec/pxe/server';
 import { getRoundForOffense } from '@aztec/slasher';
+import { TestWallet, proveInteraction } from '@aztec/test-wallet/server';
 import { submitTxsTo } from '../shared/submit-transactions.js';
 // submits a set of transactions to the provided Private eXecution Environment (PXE)
 export const submitComplexTxsTo = async (logger, from, spamContract, numTxs, opts = {})=>{
@@ -26,51 +31,42 @@ export const submitComplexTxsTo = async (logger, from, spamContract, numTxs, opt
     }
     return txs;
 };
-// creates an instance of the PXE and submit a given number of transactions to it.
-export const createPXEServiceAndSubmitTransactions = async (logger, node, numTxs, fundedAccount)=>{
+// creates a wallet and submit a given number of transactions through it.
+export const submitTransactions = async (logger, node, numTxs, fundedAccount)=>{
     const rpcConfig = getRpcConfig();
     rpcConfig.proverEnabled = false;
-    const pxeService = await createPXEService(node, rpcConfig, {
+    const wallet = await TestWallet.create(node, {
+        ...getPXEConfig(),
+        proverEnabled: false
+    }, {
         useLogSuffix: true
     });
-    const account = await getSchnorrAccount(pxeService, fundedAccount.secret, fundedAccount.signingKey, fundedAccount.salt);
-    await account.register();
-    const wallet = await account.getWallet();
-    const txs = await submitTxsTo(pxeService, numTxs, wallet, logger);
-    return {
-        txs,
-        pxeService,
-        node
-    };
+    const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
+    return submitTxsTo(wallet, fundedAccountManager.address, numTxs, logger);
 };
-export async function createPXEServiceAndPrepareTransactions(logger, node, numTxs, fundedAccount) {
+export async function prepareTransactions(logger, node, numTxs, fundedAccount) {
     const rpcConfig = getRpcConfig();
     rpcConfig.proverEnabled = false;
-    const pxe = await createPXEService(node, rpcConfig, {
+    const wallet = await TestWallet.create(node, {
+        ...getPXEConfig(),
+        proverEnabled: false
+    }, {
         useLogSuffix: true
     });
-    const account = await getSchnorrAccount(pxe, fundedAccount.secret, fundedAccount.signingKey, fundedAccount.salt);
-    await account.register();
-    const wallet = await account.getWallet();
-    const testContractInstance = await getContractInstanceFromInstantiationParams(TestContractArtifact, {});
-    await wallet.registerContract({
-        instance: testContractInstance,
-        artifact: TestContractArtifact
+    const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
+    const testContractInstance = await getContractInstanceFromInstantiationParams(TestContractArtifact, {
+        salt: Fr.random()
     });
-    const contract = await TestContract.at(testContractInstance.address, wallet);
-    const txs = await timesAsync(numTxs, async ()=>{
-        const tx = await contract.methods.emit_nullifier(Fr.random()).prove({
-            from: account.getAddress()
+    await wallet.registerContract(testContractInstance, TestContractArtifact);
+    const contract = TestContract.at(testContractInstance.address, wallet);
+    return timesAsync(numTxs, async ()=>{
+        const tx = await proveInteraction(wallet, contract.methods.emit_nullifier(Fr.random()), {
+            from: fundedAccountManager.address
         });
         const txHash = tx.getTxHash();
         logger.info(`Tx prepared with hash ${txHash}`);
         return tx;
     });
-    return {
-        txs,
-        pxeService: pxe,
-        node
-    };
 }
 export function awaitProposalExecution(slashingProposer, timeoutSeconds, logger) {
     return new Promise((resolve, reject)=>{
@@ -105,39 +101,38 @@ export async function awaitCommitteeExists({ rollup, logger }) {
         committee = await rollup.getCurrentEpochCommittee();
         return committee && committee.length > 0;
     }, 'non-empty committee', 60);
-    return committee;
+    return committee.map((c)=>c.toString());
 }
-export async function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSize, epochDuration }) {
-    logger.info(`Waiting for an offense to be detected`);
+export async function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSize, epochDuration, waitUntilOffenseCount, timeoutSeconds = 120 }) {
+    const targetOffenseCount = waitUntilOffenseCount ?? 1;
+    logger.warn(`Waiting for ${pluralize('offense', targetOffenseCount)} to be detected`);
     const offenses = await retryUntil(async ()=>{
         const offenses = await nodeAdmin.getSlashOffenses('all');
-        if (offenses.length > 0) {
+        if (offenses.length >= targetOffenseCount) {
             return offenses;
         }
-    }, 'non-empty offenses', 60);
+    }, 'non-empty offenses', timeoutSeconds);
     logger.info(`Hit ${offenses.length} offenses on rounds ${unique(offenses.map((o)=>getRoundForOffense(o, {
             slashingRoundSize,
             epochDuration
-        })))}`, offenses);
+        })))}`, {
+        offenses
+    });
     return offenses;
 }
 /**
  * Await the committee to be slashed out of the validator set.
  * Currently assumes that the committee is the same size as the validator set.
- */ export async function awaitCommitteeKicked({ rollup, cheatCodes, committee, slashFactory, slashingProposer, slashingRoundSize, aztecSlotDuration, logger, dateProvider }) {
+ */ export async function awaitCommitteeKicked({ rollup, cheatCodes, committee, slashFactory, slashingProposer, slashingRoundSize, aztecSlotDuration, aztecEpochDuration, logger, offenseEpoch }) {
     if (!slashingProposer) {
         throw new Error('No slashing proposer configured. Cannot test slashing.');
     }
-    logger.info(`Advancing epochs so we start slashing`);
     await cheatCodes.debugRollup();
-    await cheatCodes.advanceToNextEpoch({
-        updateDateProvider: dateProvider
-    });
-    await cheatCodes.advanceToNextEpoch({
-        updateDateProvider: dateProvider
-    });
-    // Await for the slash payload to be created if empire (no payload is created on tally until execution time)
     if (slashingProposer.type === 'empire') {
+        // Await for the slash payload to be created if empire (no payload is created on tally until execution time)
+        const targetEpoch = EpochNumber(await cheatCodes.getEpoch() + await rollup.getLagInEpochsForValidatorSet() + 1);
+        logger.info(`Advancing to epoch ${targetEpoch} so we start slashing`);
+        await cheatCodes.advanceToEpoch(targetEpoch);
         const slashPayloadEvents = await retryUntil(async ()=>{
             const events = await slashFactory.getSlashPayloadCreatedEvents();
             return events.length > 0 ? events : undefined;
@@ -145,6 +140,17 @@ export async function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSiz
         expect(slashPayloadEvents.length).toBe(1);
         // The uniqueness check is needed since a validator may be slashed more than once on the same round (eg because they let two epochs be pruned)
         expect(unique(slashPayloadEvents[0].slashes.map((slash)=>slash.validator.toString()))).toHaveLength(committee.length);
+    } else {
+        // Use the slash offset to ensure we are in the right epoch for tally
+        const slashOffsetInRounds = await slashingProposer.getSlashOffsetInRounds();
+        const slashingRoundSizeInEpochs = slashingRoundSize / aztecEpochDuration;
+        const slashingOffsetInEpochs = Number(slashOffsetInRounds) * slashingRoundSizeInEpochs;
+        const firstEpochInOffenseRound = offenseEpoch - offenseEpoch % slashingRoundSizeInEpochs;
+        const targetEpoch = firstEpochInOffenseRound + slashingOffsetInEpochs;
+        logger.info(`Advancing to epoch ${targetEpoch} so we start slashing`);
+        await cheatCodes.advanceToEpoch(EpochNumber(targetEpoch), {
+            offset: -aztecSlotDuration / 2
+        });
     }
     const attestersPre = await rollup.getAttesters();
     expect(attestersPre.length).toBe(committee.length);
@@ -152,7 +158,7 @@ export async function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSiz
         const attesterInfo = await rollup.getAttesterView(attester);
         expect(attesterInfo.status).toEqual(1); // Validating
     }
-    const timeout = slashingRoundSize * 2 * aztecSlotDuration;
+    const timeout = slashingRoundSize * 2 * aztecSlotDuration + 30;
     logger.info(`Waiting for slash to be executed (timeout ${timeout}s)`);
     await awaitProposalExecution(slashingProposer, timeout, logger);
     // The attesters should still form the committee but they should be reduced to the "living" status
@@ -165,14 +171,9 @@ export async function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSiz
         const attesterInfo = await rollup.getAttesterView(attester);
         expect(attesterInfo.status).toEqual(2); // Living
     }
-    logger.info(`Advancing two epochs to check current committee`);
+    logger.info(`Advancing to check current committee`);
     await cheatCodes.debugRollup();
-    await cheatCodes.advanceToNextEpoch({
-        updateDateProvider: dateProvider
-    });
-    await cheatCodes.advanceToNextEpoch({
-        updateDateProvider: dateProvider
-    });
+    await cheatCodes.advanceToEpoch(EpochNumber(await cheatCodes.getEpoch() + await rollup.getLagInEpochsForValidatorSet() + 1));
     await cheatCodes.debugRollup();
     const committeeNextEpoch = await rollup.getCurrentEpochCommittee();
     // The committee should be undefined, since the validator set is empty

package/dest/e2e_token_contract/token_contract_test.d.ts

@@ -1,6 +1,9 @@
-import { type AccountWallet, AztecAddress, type AztecNode, type Logger } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { type Logger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
+import type { TestWallet } from '@aztec/test-wallet/server';
 import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
 export declare class TokenContractTest {
@@ -13,11 +16,9 @@ export declare class TokenContractTest {
     tokenSim: TokenSimulator;
     node: AztecNode;
     badAccount: InvalidAccountContract;
-    admin: AccountWallet;
+    wallet: TestWallet;
     adminAddress: AztecAddress;
-    account1: AccountWallet;
     account1Address: AztecAddress;
-    account2: AccountWallet;
     account2Address: AztecAddress;
     constructor(testName: string);
     /**
@@ -31,4 +32,4 @@ export declare class TokenContractTest {
     teardown(): Promise<void>;
     applyMintSnapshot(): Promise<void>;
 }
-//# sourceMappingURL=token_contract_test.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5fY29udHJhY3RfdGVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2UyZV90b2tlbl9jb250cmFjdC90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQy9ELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQ3RGLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSTVELE9BQU8sRUFFTCxLQUFLLGlCQUFpQixFQUl2QixNQUFNLGlDQUFpQyxDQUFDO0FBRXpDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUlsRSxxQkFBYSxpQkFBaUI7SUFDNUIsTUFBTSxDQUFDLFVBQVUsU0FBVTtJQUMzQixNQUFNLENBQUMsWUFBWSxTQUFTO0lBQzVCLE1BQU0sQ0FBQyxjQUFjLFNBQU87SUFDNUIsT0FBTyxDQUFDLGVBQWUsQ0FBbUI7SUFDMUMsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLEtBQUssRUFBRyxhQUFhLENBQUM7SUFDdEIsUUFBUSxFQUFHLGNBQWMsQ0FBQztJQUMxQixJQUFJLEVBQUcsU0FBUyxDQUFDO0lBRWpCLFVBQVUsRUFBRyxzQkFBc0IsQ0FBQztJQUNwQyxNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsZUFBZSxFQUFHLFlBQVksQ0FBQztJQUMvQixlQUFlLEVBQUcsWUFBWSxDQUFDO0lBRS9CLFlBQVksUUFBUSxFQUFFLE1BQU0sRUFLM0I7SUFFRDs7OztPQUlHO0lBQ0csa0JBQWtCLGtCQWdFdkI7SUFFSyxLQUFLLGtCQUVWO0lBRUQsUUFBUSxHQUFJLENBQUMsOEpBSTJEO0lBRWxFLFFBQVEsa0JBRWI7SUFFSyxpQkFBaUIsa0JBb0N0QjtDQUNGIn0=

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":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,YAAY,EAAE,KAAK,SAAS,EAAE,KAAK,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AAC9G,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,KAAK,EAAG,aAAa,CAAC;IACtB,YAAY,EAAG,YAAY,CAAC;IAC5B,QAAQ,EAAG,aAAa,CAAC;IACzB,eAAe,EAAG,YAAY,CAAC;IAC/B,QAAQ,EAAG,aAAa,CAAC;IACzB,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,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI5D,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;IAE/B,YAAY,QAAQ,EAAE,MAAM,EAK3B;IAED;;;;OAIG;IACG,kBAAkB,kBAgEvB;IAEK,KAAK,kBAEV;IAED,QAAQ,GAAI,CAAC,8JAI2D;IAElE,QAAQ,kBAEb;IAEK,iBAAiB,kBAoCtB;CACF"}

package/dest/e2e_token_contract/token_contract_test.js

@@ -1,5 +1,4 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { createLogger } from '@aztec/aztec.js';
+import { createLogger } from '@aztec/aztec.js/log';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
 import { jest } from '@jest/globals';
@@ -17,11 +16,9 @@ export class TokenContractTest {
     tokenSim;
     node;
     badAccount;
-    admin;
+    wallet;
     adminAddress;
-    account1;
     account1Address;
-    account2;
     account2Address;
     constructor(testName){
         this.logger = createLogger(`e2e:e2e_token_contract:${testName}`);
@@ -36,27 +33,27 @@ export class TokenContractTest {
    */ async applyBaseSnapshots() {
         // Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
         jest.setTimeout(120_000);
-        await this.snapshotManager.snapshot('3_accounts', deployAccounts(3, this.logger), async ({ deployedAccounts }, { pxe, aztecNode })=>{
+        await this.snapshotManager.snapshot('3_accounts', deployAccounts(3, this.logger), ({ deployedAccounts }, { wallet, aztecNode })=>{
             this.node = aztecNode;
-            const wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
-            [this.admin, this.account1, this.account2] = wallets;
-            [this.adminAddress, this.account1Address, this.account2Address] = wallets.map((w)=>w.getAddress());
+            this.wallet = wallet;
+            [this.adminAddress, this.account1Address, this.account2Address] = deployedAccounts.map((acc)=>acc.address);
+            return Promise.resolve();
         });
         await this.snapshotManager.snapshot('e2e_token_contract', async ()=>{
             // Create the token contract state.
             // Move this account thing to addAccounts above?
             this.logger.verbose(`Public deploy accounts...`);
-            await publicDeployAccounts(this.admin, [
+            await publicDeployAccounts(this.wallet, [
                 this.adminAddress,
                 this.account1Address
             ]);
             this.logger.verbose(`Deploying TokenContract...`);
-            const asset = await TokenContract.deploy(this.admin, this.adminAddress, TokenContractTest.TOKEN_NAME, TokenContractTest.TOKEN_SYMBOL, TokenContractTest.TOKEN_DECIMALS).send({
+            const asset = await TokenContract.deploy(this.wallet, this.adminAddress, TokenContractTest.TOKEN_NAME, TokenContractTest.TOKEN_SYMBOL, TokenContractTest.TOKEN_DECIMALS).send({
                 from: this.adminAddress
             }).deployed();
             this.logger.verbose(`Token deployed to ${asset.address}`);
             this.logger.verbose(`Deploying bad account...`);
-            this.badAccount = await InvalidAccountContract.deploy(this.admin).send({
+            this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
                 from: this.adminAddress
             }).deployed();
             this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
@@ -66,13 +63,13 @@ export class TokenContractTest {
             };
         }, async ({ tokenContractAddress, badAccountAddress })=>{
             // Restore the token contract state.
-            this.asset = await TokenContract.at(tokenContractAddress, this.admin);
+            this.asset = TokenContract.at(tokenContractAddress, this.wallet);
             this.logger.verbose(`Token contract address: ${this.asset.address}`);
-            this.tokenSim = new TokenSimulator(this.asset, this.admin, this.adminAddress, this.logger, [
+            this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
                 this.adminAddress,
                 this.account1Address
             ]);
-            this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.admin);
+            this.badAccount = InvalidAccountContract.at(badAccountAddress, this.wallet);
             this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
             expect(await this.asset.methods.get_admin().simulate({
                 from: this.adminAddress
@@ -92,14 +89,14 @@ export class TokenContractTest {
     }
     async applyMintSnapshot() {
         await this.snapshotManager.snapshot('mint', async ()=>{
-            const { asset, admin, adminAddress } = this;
+            const { asset, adminAddress } = this;
             const amount = 10000n;
             this.logger.verbose(`Minting ${amount} publicly...`);
             await asset.methods.mint_to_public(adminAddress, amount).send({
                 from: adminAddress
             }).wait();
             this.logger.verbose(`Minting ${amount} privately...`);
-            await mintTokensToPrivate(asset, adminAddress, admin, adminAddress, amount);
+            await mintTokensToPrivate(asset, adminAddress, adminAddress, amount);
             this.logger.verbose(`Minting complete.`);
             return {
                 amount

package/dest/fixtures/e2e_prover_test.d.ts

@@ -1,12 +1,14 @@
 import type { InitialAccountData } from '@aztec/accounts/testing';
-import { type AccountWalletWithSecretKey, type AztecNode, type CompleteAddress, EthAddress, type Logger } from '@aztec/aztec.js';
+import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
+import { type Logger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
 import { CheatCodes } from '@aztec/aztec/testing';
 import { type ClientProtocolCircuitVerifier } from '@aztec/bb-prover';
-import type { BlobSinkServer } from '@aztec/blob-sink/server';
-import type { DeployL1ContractsReturnType } from '@aztec/ethereum';
+import type { DeployAztecL1ContractsReturnType } from '@aztec/ethereum/deploy-aztec-l1-contracts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
-import type { PXEService } from '@aztec/pxe/server';
+import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import { TestWallet } from '@aztec/test-wallet/server';
 import { TokenSimulator } from '../simulators/token_simulator.js';
 import { type SubsystemsContext } from './snapshot_manager.js';
 /**
@@ -23,25 +25,25 @@ export declare class FullProverTest {
     static TOKEN_DECIMALS: bigint;
     private snapshotManager;
     logger: Logger;
+    wallet: TestWallet;
+    provenWallet: TestWallet;
+    accounts: AztecAddress[];
     deployedAccounts: InitialAccountData[];
-    wallets: AccountWalletWithSecretKey[];
-    accounts: CompleteAddress[];
     fakeProofsAsset: TokenContract;
+    fakeProofsAssetInstance: ContractInstanceWithAddress;
     tokenSim: TokenSimulator;
     aztecNode: AztecNode;
     aztecNodeAdmin: AztecNodeAdmin;
-    pxe: PXEService;
     cheatCodes: CheatCodes;
-    blobSink: BlobSinkServer;
     private provenComponents;
     private bbConfigCleanup?;
     private acvmConfigCleanup?;
     circuitProofVerifier?: ClientProtocolCircuitVerifier;
-    provenAssets: TokenContract[];
+    provenAsset: TokenContract;
     private context;
     private proverNode;
     private simulatedProverNode;
-    l1Contracts: DeployL1ContractsReturnType;
+    l1Contracts: DeployAztecL1ContractsReturnType;
     proverAddress: EthAddress;
     constructor(testName: string, minNumberOfTxsPerBlock: number, coinbase: EthAddress, realProofs?: boolean);
     /**
@@ -56,4 +58,4 @@ export declare class FullProverTest {
     teardown(): Promise<void>;
     applyMintSnapshot(): Promise<void>;
 }
-//# sourceMappingURL=e2e_prover_test.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZTJlX3Byb3Zlcl90ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZml4dHVyZXMvZTJlX3Byb3Zlcl90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFFTCxLQUFLLDZCQUE2QixFQUduQyxNQUFNLGtCQUFrQixDQUFDO0FBRzFCLE9BQU8sS0FBSyxFQUFFLGdDQUFnQyxFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFJbEcsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBTXZELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUdsRSxPQUFPLEVBRUwsS0FBSyxpQkFBaUIsRUFJdkIsTUFBTSx1QkFBdUIsQ0FBQztBQVUvQjs7Ozs7R0FLRztBQUVILHFCQUFhLGNBQWM7SUE2QnZCLE9BQU8sQ0FBQyxzQkFBc0I7SUFFOUIsT0FBTyxDQUFDLFVBQVU7SUE5QnBCLE1BQU0sQ0FBQyxVQUFVLFNBQVU7SUFDM0IsTUFBTSxDQUFDLFlBQVksU0FBUztJQUM1QixNQUFNLENBQUMsY0FBYyxTQUFPO0lBQzVCLE9BQU8sQ0FBQyxlQUFlLENBQW1CO0lBQzFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLFlBQVksRUFBRyxVQUFVLENBQUM7SUFDMUIsUUFBUSxFQUFFLFlBQVksRUFBRSxDQUFNO0lBQzlCLGdCQUFnQixFQUFHLGtCQUFrQixFQUFFLENBQUM7SUFDeEMsZUFBZSxFQUFHLGFBQWEsQ0FBQztJQUNoQyx1QkFBdUIsRUFBRywyQkFBMkIsQ0FBQztJQUN0RCxRQUFRLEVBQUcsY0FBYyxDQUFDO0lBQzFCLFNBQVMsRUFBRyxTQUFTLENBQUM7SUFDdEIsY0FBYyxFQUFHLGNBQWMsQ0FBQztJQUNoQyxVQUFVLEVBQUcsVUFBVSxDQUFDO0lBQ3hCLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBcUI7SUFDN0MsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFzQjtJQUM5QyxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBc0I7SUFDaEQsb0JBQW9CLENBQUMsRUFBRSw2QkFBNkIsQ0FBQztJQUNyRCxXQUFXLEVBQUcsYUFBYSxDQUFDO0lBQzVCLE9BQU8sQ0FBQyxPQUFPLENBQXFCO0lBQ3BDLE9BQU8sQ0FBQyxVQUFVLENBQWM7SUFDaEMsT0FBTyxDQUFDLG1CQUFtQixDQUFjO0lBQ2xDLFdBQVcsRUFBRyxnQ0FBZ0MsQ0FBQztJQUMvQyxhQUFhLEVBQUcsVUFBVSxDQUFDO0lBRWxDLFlBQ0UsUUFBUSxFQUFFLE1BQU0sRUFDUixzQkFBc0IsRUFBRSxNQUFNLEVBQ3RDLFFBQVEsRUFBRSxVQUFVLEVBQ1osVUFBVSxVQUFPLEVBVzFCO0lBRUQ7Ozs7T0FJRztJQUNHLGtCQUFrQixrQkFxRHZCO0lBRUssS0FBSyxrQkFvSVY7WUFFYSxZQUFZO0lBUzFCLFFBQVEsR0FBSSxDQUFDLDhKQUkyRDtJQUVsRSxRQUFRLGtCQWNiO0lBRUssaUJBQWlCLGtCQTZDdEI7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/e2e_prover_test.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,UAAU,EACV,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAEL,KAAK,6BAA6B,EAGnC,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAInE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAMtE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAGlE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,uBAAuB,CAAC;AAU/B;;;;;GAKG;AAEH,qBAAa,cAAc;IA6BvB,OAAO,CAAC,sBAAsB;IAE9B,OAAO,CAAC,UAAU;IA9BpB,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,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC5C,OAAO,EAAE,0BAA0B,EAAE,CAAM;IAC3C,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,eAAe,EAAG,aAAa,CAAC;IAChC,QAAQ,EAAG,cAAc,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAChC,GAAG,EAAG,UAAU,CAAC;IACjB,UAAU,EAAG,UAAU,CAAC;IACxB,QAAQ,EAAG,cAAc,CAAC;IAC1B,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAChD,oBAAoB,CAAC,EAAE,6BAA6B,CAAC;IACrD,YAAY,EAAE,aAAa,EAAE,CAAM;IACnC,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,mBAAmB,CAAc;IAClC,WAAW,EAAG,2BAA2B,CAAC;IAC1C,aAAa,EAAG,UAAU,CAAC;gBAGhC,QAAQ,EAAE,MAAM,EACR,sBAAsB,EAAE,MAAM,EACtC,QAAQ,EAAE,UAAU,EACZ,UAAU,UAAO;IAa3B;;;;OAIG;IACG,kBAAkB;IAwDlB,KAAK;YAiKG,YAAY;IAS1B,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;IAeR,iBAAiB;CAiDxB"}
+{"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/e2e_prover_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAEL,KAAK,6BAA6B,EAGnC,MAAM,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAIlG,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAMvD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAGlE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,uBAAuB,CAAC;AAU/B;;;;;GAKG;AAEH,qBAAa,cAAc;IA6BvB,OAAO,CAAC,sBAAsB;IAE9B,OAAO,CAAC,UAAU;IA9BpB,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,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,UAAU,CAAC;IAC1B,QAAQ,EAAE,YAAY,EAAE,CAAM;IAC9B,gBAAgB,EAAG,kBAAkB,EAAE,CAAC;IACxC,eAAe,EAAG,aAAa,CAAC;IAChC,uBAAuB,EAAG,2BAA2B,CAAC;IACtD,QAAQ,EAAG,cAAc,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAChC,UAAU,EAAG,UAAU,CAAC;IACxB,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAChD,oBAAoB,CAAC,EAAE,6BAA6B,CAAC;IACrD,WAAW,EAAG,aAAa,CAAC;IAC5B,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,mBAAmB,CAAc;IAClC,WAAW,EAAG,gCAAgC,CAAC;IAC/C,aAAa,EAAG,UAAU,CAAC;IAElC,YACE,QAAQ,EAAE,MAAM,EACR,sBAAsB,EAAE,MAAM,EACtC,QAAQ,EAAE,UAAU,EACZ,UAAU,UAAO,EAW1B;IAED;;;;OAIG;IACG,kBAAkB,kBAqDvB;IAEK,KAAK,kBAoIV;YAEa,YAAY;IAS1B,QAAQ,GAAI,CAAC,8JAI2D;IAElE,QAAQ,kBAcb;IAEK,iBAAiB,kBA6CtB;CACF"}

package/dest/fixtures/e2e_prover_test.js

@@ -1,8 +1,9 @@
-import { SchnorrAccountContractArtifact, getSchnorrAccount, getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
 import { createArchiver } from '@aztec/archiver';
-import { EthAddress, createLogger } from '@aztec/aztec.js';
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import { createLogger } from '@aztec/aztec.js/log';
 import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
-import { createBlobSinkClient } from '@aztec/blob-sink/client';
+import { BackendType, Barretenberg } from '@aztec/bb.js';
+import { createBlobClientWithFileStores } from '@aztec/blob-client/client';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { SecretValue } from '@aztec/foundation/config';
 import { FeeAssetHandlerAbi } from '@aztec/l1-artifacts';
@@ -15,7 +16,7 @@ import { TokenSimulator } from '../simulators/token_simulator.js';
 import { getACVMConfig } from './get_acvm_config.js';
 import { getBBConfig } from './get_bb_config.js';
 import { createSnapshotManager, deployAccounts, publicDeployAccounts } from './snapshot_manager.js';
-import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setupPXEService } from './utils.js';
+import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setupPXEAndGetWallet } from './utils.js';
 const { E2E_DATA_PATH: dataPath } = process.env;
 /**
  * Largely taken from the e2e_token_contract test file. We deploy 2 accounts and a token contract.
@@ -30,21 +31,21 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     static TOKEN_DECIMALS = 18n;
     snapshotManager;
     logger;
-    deployedAccounts;
-    wallets;
+    wallet;
+    provenWallet;
     accounts;
+    deployedAccounts;
     fakeProofsAsset;
+    fakeProofsAssetInstance;
     tokenSim;
     aztecNode;
     aztecNodeAdmin;
-    pxe;
     cheatCodes;
-    blobSink;
     provenComponents;
     bbConfigCleanup;
     acvmConfigCleanup;
     circuitProofVerifier;
-    provenAssets;
+    provenAsset;
     context;
     proverNode;
     simulatedProverNode;
@@ -53,16 +54,12 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     constructor(testName, minNumberOfTxsPerBlock, coinbase, realProofs = true){
         this.minNumberOfTxsPerBlock = minNumberOfTxsPerBlock;
         this.realProofs = realProofs;
-        this.deployedAccounts = [];
-        this.wallets = [];
         this.accounts = [];
         this.provenComponents = [];
-        this.provenAssets = [];
         this.snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
         this.logger = createLogger(`e2e:full_prover_test:${testName}`);
         this.snapshotManager = createSnapshotManager(`full_prover_integration/${testName}`, dataPath, {
             startProverNode: true,
-            fundRewardDistributor: true,
             coinbase
         }, {
             realVerifier: realProofs
@@ -73,33 +70,35 @@ const { E2E_DATA_PATH: dataPath } = process.env;
    * 1. Add 2 accounts.
    * 2. Publicly deploy accounts, deploy token contract
    */ async applyBaseSnapshots() {
-        await this.snapshotManager.snapshot('2_accounts', deployAccounts(2, this.logger), async ({ deployedAccounts }, { pxe })=>{
+        await this.snapshotManager.snapshot('2_accounts', deployAccounts(2, this.logger), ({ deployedAccounts }, { wallet })=>{
             this.deployedAccounts = deployedAccounts;
-            this.wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWalletWithSecretKey(pxe, a.secret, a.signingKey, a.salt)));
-            this.accounts = this.wallets.map((w)=>w.getCompleteAddress());
-            this.wallets.forEach((w, i)=>this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
+            this.accounts = deployedAccounts.map((a)=>a.address);
+            this.wallet = wallet;
+            return Promise.resolve();
         });
         await this.snapshotManager.snapshot('client_prover_integration', async ()=>{
             // Create the token contract state.
             // Move this account thing to addAccounts above?
             this.logger.verbose(`Public deploy accounts...`);
-            await publicDeployAccounts(this.wallets[0], this.accounts.slice(0, 2));
+            await publicDeployAccounts(this.wallet, this.accounts.slice(0, 2));
             this.logger.verbose(`Deploying TokenContract...`);
-            const asset = await TokenContract.deploy(this.wallets[0], this.accounts[0], FullProverTest.TOKEN_NAME, FullProverTest.TOKEN_SYMBOL, FullProverTest.TOKEN_DECIMALS).send({
-                from: this.wallets[0].getAddress()
-            }).deployed();
+            const { contract: asset, instance } = await TokenContract.deploy(this.wallet, this.accounts[0], FullProverTest.TOKEN_NAME, FullProverTest.TOKEN_SYMBOL, FullProverTest.TOKEN_DECIMALS).send({
+                from: this.accounts[0]
+            }).wait();
             this.logger.verbose(`Token deployed to ${asset.address}`);
             return {
-                tokenContractAddress: asset.address
+                tokenContractAddress: asset.address,
+                tokenContractInstance: instance
             };
-        }, async ({ tokenContractAddress })=>{
+        }, async ({ tokenContractAddress, tokenContractInstance })=>{
             // Restore the token contract state.
-            this.fakeProofsAsset = await TokenContract.at(tokenContractAddress, this.wallets[0]);
+            this.fakeProofsAsset = TokenContract.at(tokenContractAddress, this.wallet);
+            this.fakeProofsAssetInstance = tokenContractInstance;
             this.logger.verbose(`Token contract address: ${this.fakeProofsAsset.address}`);
-            this.tokenSim = new TokenSimulator(this.fakeProofsAsset, this.wallets[0], this.wallets[0].getAddress(), this.logger, this.accounts.map((a)=>a.address));
+            this.tokenSim = new TokenSimulator(this.fakeProofsAsset, this.wallet, this.accounts[0], this.logger, this.accounts);
             expect(await this.fakeProofsAsset.methods.get_admin().simulate({
-                from: this.accounts[0].address
-            })).toBe(this.accounts[0].address.toBigInt());
+                from: this.accounts[0]
+            })).toBe(this.accounts[0].toBigInt());
         });
     }
     async setup() {
@@ -107,11 +106,10 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         // We don't wish to mark as proven automatically, so we set the flag to false
         this.context.watcher.setIsMarkingAsProven(false);
         this.simulatedProverNode = this.context.proverNode;
-        ({ pxe: this.pxe, aztecNode: this.aztecNode, deployL1ContractsValues: this.l1Contracts, cheatCodes: this.cheatCodes, blobSink: this.blobSink } = this.context);
+        ({ aztecNode: this.aztecNode, deployL1ContractsValues: this.l1Contracts, cheatCodes: this.cheatCodes } = this.context);
         this.aztecNodeAdmin = this.context.aztecNode;
-        const blobSinkClient = createBlobSinkClient({
-            blobSinkUrl: `http://localhost:${this.blobSink.port}`
-        });
+        const config = this.context.aztecNodeConfig;
+        const blobClient = await createBlobClientWithFileStores(config, this.logger);
         // Configure a full prover PXE
         let acvmConfig;
         let bbConfig;
@@ -125,9 +123,9 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             }
             this.acvmConfigCleanup = acvmConfig.cleanup;
             this.bbConfigCleanup = bbConfig.cleanup;
-            if (!bbConfig?.bbWorkingDirectory || !bbConfig?.bbBinaryPath) {
-                throw new Error(`Test must be run with BB native configuration`);
-            }
+            await Barretenberg.initSingleton({
+                backend: BackendType.NativeUnixSocket
+            });
             const verifier = await BBCircuitVerifier.new(bbConfig);
             this.circuitProofVerifier = new QueuedIVCVerifier(bbConfig, verifier);
             this.logger.debug(`Configuring the node for real proofs...`);
@@ -147,31 +145,22 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         this.logger.verbose(`Marking current block as proven`);
         await this.context.cheatCodes.rollup.markAsProven();
         this.logger.verbose(`Main setup completed, initializing full prover PXE, Node, and Prover Node`);
+        const { wallet: provenWallet, teardown: provenTeardown } = await setupPXEAndGetWallet(this.aztecNode, {
+            proverEnabled: this.realProofs
+        }, undefined, true);
+        this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
+        await provenWallet.registerContract(this.fakeProofsAssetInstance, TokenContract.artifact);
         for(let i = 0; i < 2; i++){
-            const result = await setupPXEService(this.aztecNode, {
-                proverEnabled: this.realProofs,
-                bbBinaryPath: bbConfig?.bbBinaryPath,
-                bbWorkingDirectory: bbConfig?.bbWorkingDirectory
-            }, undefined, true);
-            this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
-            await result.pxe.registerContract(this.fakeProofsAsset);
-            for(let i = 0; i < 2; i++){
-                await result.pxe.registerAccount(this.deployedAccounts[i].secret, this.wallets[i].getCompleteAddress().partialAddress);
-                await this.pxe.registerAccount(this.deployedAccounts[i].secret, this.wallets[i].getCompleteAddress().partialAddress);
-            }
-            const account = await getSchnorrAccount(result.pxe, this.deployedAccounts[0].secret, this.deployedAccounts[0].signingKey, this.deployedAccounts[0].salt);
-            await result.pxe.registerContract({
-                instance: account.getInstance(),
-                artifact: SchnorrAccountContractArtifact
-            });
-            const provenWallet = await account.getWallet();
-            const asset = await TokenContract.at(this.fakeProofsAsset.address, provenWallet);
-            this.provenComponents.push({
-                pxe: result.pxe,
-                teardown: result.teardown
-            });
-            this.provenAssets.push(asset);
+            await provenWallet.createSchnorrAccount(this.deployedAccounts[i].secret, this.deployedAccounts[i].salt);
+            await this.wallet.createSchnorrAccount(this.deployedAccounts[i].secret, this.deployedAccounts[i].salt);
         }
+        const asset = TokenContract.at(this.fakeProofsAsset.address, provenWallet);
+        this.provenComponents.push({
+            wallet: provenWallet,
+            teardown: provenTeardown
+        });
+        this.provenAsset = asset;
+        this.provenWallet = provenWallet;
         this.logger.info(`Full prover PXE started`);
         // Shutdown the current, simulated prover node
         this.logger.verbose('Shutting down simulated prover node');
@@ -182,7 +171,8 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             ...this.context.aztecNodeConfig,
             dataDirectory: undefined
         }, {
-            blobSinkClient
+            blobClient,
+            dateProvider: this.context.dateProvider
         }, {
             blockUntilSync: true
         });
@@ -210,14 +200,14 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             txGatheringBatchSize: 10,
             txGatheringMaxParallelRequestsPerNode: 100,
             txGatheringTimeoutMs: 24_000,
-            proverNodeFailedEpochStore: undefined
+            proverNodeFailedEpochStore: undefined,
+            proverNodeEpochProvingDelayMs: undefined
         };
         const sponsoredFPCAddress = await getSponsoredFPCAddress();
         const { prefilledPublicData } = await getGenesisValues(this.context.initialFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress));
         this.proverNode = await createProverNode(proverConfig, {
             aztecNodeTxProvider: this.aztecNode,
-            archiver: archiver,
-            blobSinkClient
+            archiver: archiver
         }, {
             prefilledPublicData
         });
@@ -250,6 +240,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         }
         // clean up the full prover node
         await this.proverNode.stop();
+        await Barretenberg.destroySingleton();
         await this.bbConfigCleanup?.();
         await this.acvmConfigCleanup?.();
     }
@@ -259,19 +250,19 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             const privateAmount = 10000n;
             const publicAmount = 10000n;
             this.logger.verbose(`Minting ${privateAmount + publicAmount} publicly...`);
-            await asset.methods.mint_to_public(accounts[0].address, privateAmount + publicAmount).send({
-                from: accounts[0].address
+            await asset.methods.mint_to_public(accounts[0], privateAmount + publicAmount).send({
+                from: accounts[0]
             }).wait();
             this.logger.verbose(`Transferring ${privateAmount} to private...`);
-            await asset.methods.transfer_to_private(accounts[0].address, privateAmount).send({
-                from: accounts[0].address
+            await asset.methods.transfer_to_private(accounts[0], privateAmount).send({
+                from: accounts[0]
             }).wait();
             this.logger.verbose(`Minting complete.`);
             return {
                 amount: publicAmount
             };
         }, async ({ amount })=>{
-            const { fakeProofsAsset: asset, accounts: [{ address }], tokenSim } = this;
+            const { fakeProofsAsset: asset, accounts: [address], tokenSim } = this;
             tokenSim.mintPublic(address, amount);
             const publicBalance = await asset.methods.balance_of_public(address).simulate({
                 from: address