@aztec/end-to-end 0.0.0-test.1 → 0.0.1-fake-c83136db25

package/dest/e2e_p2p/shared.js

@@ -1,39 +1,183 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { TxStatus } from '@aztec/aztec.js';
-import { createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe/server';
+import { getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import { TxStatus } from '@aztec/aztec.js/tx';
+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 { 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, spamContract, numTxs, opts = {})=>{
+export const submitComplexTxsTo = async (logger, from, spamContract, numTxs, opts = {})=>{
     const txs = [];
     const seed = 1234n;
     const spamCount = 15;
     for(let i = 0; i < numTxs; i++){
         const tx = spamContract.methods.spam(seed + BigInt(i * spamCount), spamCount, !!opts.callPublic).send({
-            skipPublicSimulation: true
+            from
         });
         const txHash = await tx.getTxHash();
-        logger.info(`Tx sent with hash ${txHash}`);
+        logger.info(`Tx sent with hash ${txHash.toString()}`);
         const receipt = await tx.getReceipt();
         expect(receipt).toEqual(expect.objectContaining({
             status: TxStatus.PENDING,
             error: ''
         }));
-        logger.info(`Receipt received for ${txHash}`);
+        logger.info(`Receipt received for ${txHash.toString()}`);
         txs.push(tx);
     }
     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();
-    const pxeService = await createPXEService(node, rpcConfig, 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
-    };
+    rpcConfig.proverEnabled = false;
+    const wallet = await TestWallet.create(node, {
+        ...getPXEConfig(),
+        proverEnabled: false
+    }, {
+        useLogSuffix: true
+    });
+    const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
+    return submitTxsTo(wallet, fundedAccountManager.address, numTxs, logger);
 };
+export async function prepareTransactions(logger, node, numTxs, fundedAccount) {
+    const rpcConfig = getRpcConfig();
+    rpcConfig.proverEnabled = false;
+    const wallet = await TestWallet.create(node, {
+        ...getPXEConfig(),
+        proverEnabled: false
+    }, {
+        useLogSuffix: true
+    });
+    const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
+    const testContractInstance = await getContractInstanceFromInstantiationParams(TestContractArtifact, {
+        salt: Fr.random()
+    });
+    await wallet.registerContract(testContractInstance, TestContractArtifact);
+    const contract = await 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;
+    });
+}
+export function awaitProposalExecution(slashingProposer, timeoutSeconds, logger) {
+    return new Promise((resolve, reject)=>{
+        const timeout = setTimeout(()=>{
+            logger.warn(`Timed out waiting for proposal execution`);
+            reject(new Error(`Timeout waiting for proposal execution after ${timeoutSeconds}s`));
+        }, timeoutSeconds * 1000);
+        if (slashingProposer.type === 'empire') {
+            const unwatch = slashingProposer.listenToPayloadSubmitted((args)=>{
+                logger.warn(`Proposal ${args.payload} from round ${args.round} executed`);
+                clearTimeout(timeout);
+                unwatch();
+                resolve(args.round);
+            });
+        } else if (slashingProposer.type === 'tally') {
+            const unwatch = slashingProposer.listenToRoundExecuted((args)=>{
+                logger.warn(`Slash from round ${args.round} executed`);
+                clearTimeout(timeout);
+                unwatch();
+                resolve(args.round);
+            });
+        } else {
+            clearTimeout(timeout);
+            reject(new Error(`Unknown slashing proposer type: ${slashingProposer.type}`));
+        }
+    });
+}
+export async function awaitCommitteeExists({ rollup, logger }) {
+    logger.info(`Waiting for committee to be set`);
+    let committee;
+    await retryUntil(async ()=>{
+        committee = await rollup.getCurrentEpochCommittee();
+        return committee && committee.length > 0;
+    }, 'non-empty committee', 60);
+    return committee;
+}
+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 >= targetOffenseCount) {
+            return offenses;
+        }
+    }, 'non-empty offenses', timeoutSeconds);
+    logger.info(`Hit ${offenses.length} offenses on rounds ${unique(offenses.map((o)=>getRoundForOffense(o, {
+            slashingRoundSize,
+            epochDuration
+        })))}`, {
+        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, aztecEpochDuration, logger, offenseEpoch }) {
+    if (!slashingProposer) {
+        throw new Error('No slashing proposer configured. Cannot test slashing.');
+    }
+    await cheatCodes.debugRollup();
+    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 = await cheatCodes.getEpoch() + await rollup.getLagInEpochs() + 1n;
+        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;
+        }, 'slash payload created', 120, 1);
+        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(targetEpoch, {
+            offset: -aztecSlotDuration / 2
+        });
+    }
+    const attestersPre = await rollup.getAttesters();
+    expect(attestersPre.length).toBe(committee.length);
+    for (const attester of attestersPre){
+        const attesterInfo = await rollup.getAttesterView(attester);
+        expect(attesterInfo.status).toEqual(1); // Validating
+    }
+    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
+    await cheatCodes.debugRollup();
+    const committeePostSlashing = await rollup.getCurrentEpochCommittee();
+    expect(committeePostSlashing?.length).toBe(attestersPre.length);
+    const attestersPostSlashing = await rollup.getAttesters();
+    expect(attestersPostSlashing.length).toBe(0);
+    for (const attester of attestersPre){
+        const attesterInfo = await rollup.getAttesterView(attester);
+        expect(attesterInfo.status).toEqual(2); // Living
+    }
+    logger.info(`Advancing to check current committee`);
+    await cheatCodes.debugRollup();
+    await cheatCodes.advanceToEpoch(await cheatCodes.getEpoch() + await rollup.getLagInEpochs() + 1n);
+    await cheatCodes.debugRollup();
+    const committeeNextEpoch = await rollup.getCurrentEpochCommittee();
+    // The committee should be undefined, since the validator set is empty
+    // and the tests currently using this helper always set a target committee size.
+    expect(committeeNextEpoch).toBeUndefined();
+    const attestersNextEpoch = await rollup.getAttesters();
+    expect(attestersNextEpoch.length).toBe(0);
+}

package/dest/e2e_token_contract/token_contract_test.d.ts

@@ -1,6 +1,9 @@
-import { type AccountWallet, type CompleteAddress, type Logger } from '@aztec/aztec.js';
-import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
+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 {
@@ -9,11 +12,14 @@ export declare class TokenContractTest {
     static TOKEN_DECIMALS: bigint;
     private snapshotManager;
     logger: Logger;
-    wallets: AccountWallet[];
-    accounts: CompleteAddress[];
     asset: TokenContract;
     tokenSim: TokenSimulator;
-    badAccount: DocsExampleContract;
+    node: AztecNode;
+    badAccount: InvalidAccountContract;
+    wallet: TestWallet;
+    adminAddress: AztecAddress;
+    account1Address: AztecAddress;
+    account2Address: AztecAddress;
     constructor(testName: string);
     /**
      * Adds two state shifts to snapshot manager.

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,KAAK,eAAe,EAAE,KAAK,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AACtG,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAI/D,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,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,KAAK,EAAG,aAAa,CAAC;IACtB,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,mBAAmB,CAAC;gBAErB,QAAQ,EAAE,MAAM;IAO5B;;;;OAIG;IACG,kBAAkB;IAgElB,KAAK;IAIX,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAIR,iBAAiB;CAyCxB"}
+{"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;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/e2e_token_contract/token_contract_test.js

@@ -1,7 +1,6 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { createLogger } from '@aztec/aztec.js';
-import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
+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';
 import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';
@@ -13,11 +12,14 @@ export class TokenContractTest {
     static TOKEN_DECIMALS = 18n;
     snapshotManager;
     logger;
-    wallets = [];
-    accounts = [];
     asset;
     tokenSim;
+    node;
     badAccount;
+    wallet;
+    adminAddress;
+    account1Address;
+    account2Address;
     constructor(testName){
         this.logger = createLogger(`e2e:e2e_token_contract:${testName}`);
         this.snapshotManager = createSnapshotManager(`e2e_token_contract/${testName}`, dataPath, {
@@ -31,20 +33,29 @@ 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 })=>{
-            this.wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
-            this.accounts = this.wallets.map((w)=>w.getCompleteAddress());
+        await this.snapshotManager.snapshot('3_accounts', deployAccounts(3, this.logger), ({ deployedAccounts }, { wallet, aztecNode })=>{
+            this.node = aztecNode;
+            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.wallets[0], this.accounts.slice(0, 2));
+            await publicDeployAccounts(this.wallet, [
+                this.adminAddress,
+                this.account1Address
+            ]);
             this.logger.verbose(`Deploying TokenContract...`);
-            const asset = await TokenContract.deploy(this.wallets[0], this.accounts[0], TokenContractTest.TOKEN_NAME, TokenContractTest.TOKEN_SYMBOL, TokenContractTest.TOKEN_DECIMALS).send().deployed();
+            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 DocsExampleContract.deploy(this.wallets[0]).send().deployed();
+            this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
+                from: this.adminAddress
+            }).deployed();
             this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
             return {
                 tokenContractAddress: asset.address,
@@ -52,12 +63,17 @@ export class TokenContractTest {
             };
         }, async ({ tokenContractAddress, badAccountAddress })=>{
             // Restore the token contract state.
-            this.asset = await TokenContract.at(tokenContractAddress, this.wallets[0]);
+            this.asset = await TokenContract.at(tokenContractAddress, this.wallet);
             this.logger.verbose(`Token contract address: ${this.asset.address}`);
-            this.tokenSim = new TokenSimulator(this.asset, this.wallets[0], this.logger, this.accounts.map((a)=>a.address));
-            this.badAccount = await DocsExampleContract.at(badAccountAddress, this.wallets[0]);
+            this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
+                this.adminAddress,
+                this.account1Address
+            ]);
+            this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.wallet);
             this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
-            expect(await this.asset.methods.get_admin().simulate()).toBe(this.accounts[0].address.toBigInt());
+            expect(await this.asset.methods.get_admin().simulate({
+                from: this.adminAddress
+            })).toBe(this.adminAddress.toBigInt());
         });
     // TokenContract.artifact.functions.forEach(fn => {
     //   const sig = decodeFunctionSignature(fn.name, fn.parameters);
@@ -73,27 +89,35 @@ export class TokenContractTest {
     }
     async applyMintSnapshot() {
         await this.snapshotManager.snapshot('mint', async ()=>{
-            const { asset, wallets } = this;
+            const { asset, adminAddress } = this;
             const amount = 10000n;
             this.logger.verbose(`Minting ${amount} publicly...`);
-            await asset.methods.mint_to_public(wallets[0].getAddress(), amount).send().wait();
+            await asset.methods.mint_to_public(adminAddress, amount).send({
+                from: adminAddress
+            }).wait();
             this.logger.verbose(`Minting ${amount} privately...`);
-            await mintTokensToPrivate(asset, wallets[0], wallets[0].getAddress(), amount);
+            await mintTokensToPrivate(asset, adminAddress, adminAddress, amount);
             this.logger.verbose(`Minting complete.`);
             return {
                 amount
             };
         }, async ({ amount })=>{
-            const { asset, accounts: [{ address }], tokenSim } = this;
-            tokenSim.mintPublic(address, amount);
-            const publicBalance = await asset.methods.balance_of_public(address).simulate();
+            const { asset, adminAddress, tokenSim } = this;
+            tokenSim.mintPublic(adminAddress, amount);
+            const publicBalance = await asset.methods.balance_of_public(adminAddress).simulate({
+                from: adminAddress
+            });
             this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
-            expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(address));
-            tokenSim.mintPrivate(address, amount);
-            const privateBalance = await asset.methods.balance_of_private(address).simulate();
+            expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(adminAddress));
+            tokenSim.mintPrivate(adminAddress, amount);
+            const privateBalance = await asset.methods.balance_of_private(adminAddress).simulate({
+                from: adminAddress
+            });
             this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
-            expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(address));
-            const totalSupply = await asset.methods.total_supply().simulate();
+            expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(adminAddress));
+            const totalSupply = await asset.methods.total_supply().simulate({
+                from: adminAddress
+            });
             this.logger.verbose(`Total supply: ${totalSupply}`);
             expect(totalSupply).toEqual(tokenSim.totalSupply);
             return Promise.resolve();

package/dest/{e2e_prover → fixtures}/e2e_prover_test.d.ts

@@ -1,11 +1,16 @@
 import type { InitialAccountData } from '@aztec/accounts/testing';
-import { type AccountWalletWithSecretKey, type AztecNode, type CheatCodes, type CompleteAddress, type DeployL1ContractsReturnType, 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 { TokenContract } from '@aztec/noir-contracts.js/Token';
-import type { PXEService } from '@aztec/pxe/server';
-import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
+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';
 /**
  * Largely taken from the e2e_token_contract test file. We deploy 2 accounts and a token contract.
  * However, we then setup a second PXE with a full prover instance.
@@ -20,20 +25,21 @@ 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;
     tokenSim: TokenSimulator;
     aztecNode: AztecNode;
-    pxe: PXEService;
+    aztecNodeAdmin: AztecNodeAdmin;
     cheatCodes: CheatCodes;
     blobSink: BlobSinkServer;
     private provenComponents;
     private bbConfigCleanup?;
     private acvmConfigCleanup?;
     circuitProofVerifier?: ClientProtocolCircuitVerifier;
-    provenAssets: TokenContract[];
+    provenAsset: TokenContract;
     private context;
     private proverNode;
     private simulatedProverNode;
@@ -47,10 +53,9 @@ export declare class FullProverTest {
      */
     applyBaseSnapshots(): Promise<void>;
     setup(): Promise<this>;
-    private mintL1ERC20;
+    private mintFeeJuice;
     snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
     teardown(): Promise<void>;
     applyMintSnapshot(): Promise<void>;
-    deployVerifier(): Promise<void>;
 }
 //# sourceMappingURL=e2e_prover_test.d.ts.map

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

@@ -0,0 +1 @@
+{"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;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,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,QAAQ,EAAG,cAAc,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAChC,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,WAAW,EAAG,aAAa,CAAC;IAC5B,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;IAsDlB,KAAK;YA6IG,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;CA8CxB"}