@aztec/end-to-end 5.0.0-rc.1 → 5.0.0

package/dest/composed/ha/ha_full_setup.js

@@ -0,0 +1,383 @@
+/**
+ * Shared setup for the docker-compose HA full suite.
+ *
+ * Stands up the complete HA cluster used by `e2e_ha_full.parallel.test.ts` and
+ * `e2e_ha_distribute_work.test.ts`: a bootstrap RPC/P2P node plus NODE_COUNT in-proc
+ * `AztecNodeService` HA peers that share one PostgreSQL slashing-protection DB and a Web3Signer keystore.
+ * Requires the docker-compose HA suite (run_test.sh ha): live Postgres (DATABASE_URL) and Web3Signer
+ * sidecar.
+ *
+ * The suite is split across two files because the "distribute work" test kills nodes as it runs, leaving
+ * the cluster unusable; giving it its own file (its own cluster) removes the previous "must run last"
+ * ordering contract without changing what any test asserts.
+ */ import { createAztecNodeService } from '@aztec/aztec-node';
+import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
+import { NO_WAIT, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import { waitForTx } from '@aztec/aztec.js/node';
+import { GovernanceProposerContract } from '@aztec/ethereum/contracts';
+import { SecretValue } from '@aztec/foundation/config';
+import { withLoggerBindings } from '@aztec/foundation/log/server';
+import { retryUntil } from '@aztec/foundation/retry';
+import { TestContract } from '@aztec/noir-test-contracts.js/Test';
+import { TopicType } from '@aztec/stdlib/p2p';
+import { TxStatus } from '@aztec/stdlib/tx';
+import getPort, { portNumbers } from 'get-port';
+import { mkdtemp, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { Pool } from 'pg';
+import { PIPELINING_SETUP_OPTS } from '../../fixtures/fixtures.js';
+import { cleanupHADatabase, createHADatabaseConfig, createInitialValidatorsFromPrivateKeys, getAddressesFromPrivateKeys, setupHADatabase } from '../../fixtures/ha_setup.js';
+import { getPrivateKeyFromIndex, setup } from '../../fixtures/utils.js';
+import { createWeb3SignerKeystore, getWeb3SignerTestKeystoreDir, getWeb3SignerUrl, refreshWeb3Signer } from '../../fixtures/web3signer.js';
+import { proveInteraction } from '../../test-wallet/utils.js';
+export const NODE_COUNT = 5;
+export const VALIDATOR_COUNT = 4;
+export const COMMITTEE_SIZE = 4;
+// Allocate p2p listen ports from above the OS ephemeral range (Linux default tops out at 60999) so they
+// never collide with an ephemeral socket the OS may already have handed out -- e.g. the in-process prover
+// node (which listens on p2pPort 0) or any outbound connection. The previous fixed 4040x ports sat inside
+// the ephemeral range, so an ephemeral socket occasionally held a node's port at bind time, surfacing as
+// libp2p ERR_NO_VALID_ADDRESSES and aborting beforeAll. get-port also locks each returned port briefly, so
+// concurrent calls within this process never hand back the same one.
+const getFreeP2PPort = ()=>getPort({
+        port: portNumbers(61000, 65535)
+    });
+export async function registerTestContract(wallet) {
+    const instance = await getContractInstanceFromInstantiationParams(TestContract.artifact, {
+        constructorArgs: [],
+        constructorArtifact: undefined,
+        salt: Fr.ZERO,
+        publicKeys: undefined,
+        deployer: undefined
+    });
+    await wallet.registerContract(instance, TestContract.artifact);
+    return TestContract.at(instance.address, wallet);
+}
+export async function submitTriggerTx(wallet, testContract, from) {
+    const tx = await proveInteraction(wallet, testContract.methods.emit_nullifier(Fr.random()), {
+        from
+    });
+    return await tx.send({
+        wait: NO_WAIT
+    });
+}
+export async function waitForTriggerTx(node, txHash) {
+    const receipt = await waitForTx(node, txHash, {
+        waitForStatus: TxStatus.CHECKPOINTED
+    });
+    if (!receipt.blockNumber) {
+        throw new Error('Trigger tx was checkpointed without a block number');
+    }
+    return receipt;
+}
+/**
+ * Owns the full HA cluster lifecycle and the shared helpers the two HA test files drive it with. Each
+ * test file constructs one instance and calls {@link setup} in `beforeAll` / {@link teardown} in
+ * `afterAll`; state fields are populated by {@link setup} and read directly by the tests.
+ */ export class HaFullTestContext {
+    logger;
+    wallet;
+    ownerAddress;
+    testContract;
+    aztecNode;
+    config;
+    accounts;
+    dateProvider;
+    genesis;
+    haNodePools;
+    haNodeServices;
+    haKeystoreDirs;
+    mainPool;
+    databaseConfig;
+    attesterPrivateKeys;
+    attesterAddresses;
+    publisherPrivateKeys;
+    publisherAddresses;
+    web3SignerUrl;
+    deployL1ContractsValues;
+    governanceProposer;
+    /** Per-node initial keystore JSON (all 4 attesters, node's own publisher) for restore after reload test */ initialKeystoreJsons;
+    teardownBootstrap = async ()=>{};
+    haSequencersStarted = false;
+    stoppedHANodeIndexes = new Set();
+    getSignatureContext = ()=>({
+            chainId: this.config.l1ChainId,
+            rollupAddress: this.deployL1ContractsValues.l1ContractAddresses.rollupAddress
+        });
+    startHASequencers = async ()=>{
+        if (this.haSequencersStarted) {
+            return;
+        }
+        await Promise.all(this.haNodeServices.map(async (service, i)=>{
+            this.logger.info(`Starting HA peer node ${i} sequencer`);
+            await service.getSequencer()?.start();
+        }));
+        this.haSequencersStarted = true;
+        this.logger.info('All HA peer sequencers started');
+    };
+    sendTriggerTx = async ()=>{
+        await this.startHASequencers();
+        const txHash = await submitTriggerTx(this.wallet, this.testContract, this.ownerAddress);
+        return await waitForTriggerTx(this.aztecNode, txHash);
+    };
+    stopHANode = async (nodeIndex)=>{
+        if (this.stoppedHANodeIndexes.has(nodeIndex)) {
+            return;
+        }
+        this.logger.info(`Stopping HA peer node ${nodeIndex}`);
+        await this.haNodeServices[nodeIndex].stop();
+        this.stoppedHANodeIndexes.add(nodeIndex);
+    };
+    async setup() {
+        // Check required environment variables
+        if (!process.env.DATABASE_URL) {
+            throw new Error('DATABASE_URL environment variable must be set for HA tests');
+        }
+        this.web3SignerUrl = getWeb3SignerUrl();
+        if (!this.web3SignerUrl) {
+            throw new Error('WEB3_SIGNER_URL environment variable must be set for HA tests');
+        }
+        // Setup database configuration
+        this.databaseConfig = createHADatabaseConfig('ha-full-test');
+        // Connect to database (migrations already run by docker-compose entrypoint)
+        this.mainPool = setupHADatabase(this.databaseConfig.databaseUrl.getValue());
+        this.attesterPrivateKeys = Array.from({
+            length: VALIDATOR_COUNT
+        }, (_, i)=>`0x${getPrivateKeyFromIndex(i).toString('hex')}`);
+        this.publisherPrivateKeys = Array.from({
+            length: NODE_COUNT
+        }, (_, i)=>`0x${getPrivateKeyFromIndex(i + VALIDATOR_COUNT).toString('hex')}`);
+        const web3SignerDir = getWeb3SignerTestKeystoreDir();
+        const allKeys = [
+            ...this.attesterPrivateKeys,
+            ...this.publisherPrivateKeys
+        ];
+        for (const key of allKeys){
+            await createWeb3SignerKeystore(web3SignerDir, key);
+        }
+        this.attesterAddresses = getAddressesFromPrivateKeys(this.attesterPrivateKeys);
+        this.publisherAddresses = getAddressesFromPrivateKeys(this.publisherPrivateKeys);
+        // Refresh Web3Signer to load all the keys (attesters + publishers)
+        await refreshWeb3Signer(this.web3SignerUrl, ...this.attesterAddresses, ...this.publisherAddresses);
+        // Create database pools for HA nodes
+        this.haNodePools = Array.from({
+            length: NODE_COUNT
+        }, ()=>{
+            const pool = new Pool({
+                connectionString: this.databaseConfig.databaseUrl.getValue()
+            });
+            // pg-pool re-emits idle-client errors on the pool; with no listener the emit throws - in production this
+            // crashes the validator process.
+            pool.on('error', (err)=>this.logger?.warn(`HA node pool error: ${err.message}`));
+            return pool;
+        });
+        const initialValidators = createInitialValidatorsFromPrivateKeys(this.attesterPrivateKeys);
+        const bootstrapP2PPort = await getFreeP2PPort();
+        ({ teardown: this.teardownBootstrap, logger: this.logger, wallet: this.wallet, aztecNode: this.aztecNode, config: this.config, accounts: this.accounts, dateProvider: this.dateProvider, deployL1ContractsValues: this.deployL1ContractsValues, genesis: this.genesis } = await setup(// A single default initializerless account, created/funded/registered by setup with no on-chain
+        // deploy tx -- the bootstrap node can't build blocks (disableValidator), so the owner must be usable
+        // without one.
+        1, {
+            ...PIPELINING_SETUP_OPTS,
+            automineL1Setup: true,
+            initialValidators,
+            sequencerPublisherPrivateKeys: [
+                new SecretValue(this.publisherPrivateKeys[0])
+            ],
+            aztecTargetCommitteeSize: COMMITTEE_SIZE,
+            // The full HA docker/Web3Signer stack can still be joining and syncing after the shared
+            // 12s pipelining preset's 2.5s start window has closed. Keep real sequencing, but give
+            // HA validators enough time to pass the enforced build-start gate in CI.
+            aztecSlotDuration: 16,
+            // This suite validates HA coordination on tx-bearing checkpoints. Requiring one tx avoids a startup empty
+            // checkpoint from occupying the shared HA publisher while the trigger tx is still being prepared.
+            minTxsPerBlock: 1,
+            archiverPollingIntervalMS: 200,
+            sequencerPollingIntervalMS: 200,
+            worldStateBlockCheckIntervalMS: 200,
+            blockCheckIntervalMS: 200,
+            startProverNode: true,
+            // The bootstrap node is only an RPC/P2P anchor. HA validators are the first block producers in this suite.
+            disableValidator: true,
+            // Enable P2P for transaction gossip
+            p2pEnabled: true,
+            // Bind the bootstrap node above the ephemeral range too (see getFreeP2PPort), so it can't lose
+            // its port to an ephemeral socket and abort the whole suite before any HA node is created. Set
+            // the broadcast port explicitly to the same value: discv5 otherwise defaults p2pBroadcastPort to
+            // p2pPort by mutating this config object in place, and that mutated value would then leak into the
+            // HA nodes' configs below (built by spreading `config`), making them advertise the wrong port.
+            p2pPort: bootstrapP2PPort,
+            p2pBroadcastPort: bootstrapP2PPort,
+            // Enable slashing for testing governance + slashing vote coordination
+            slasherEnabled: true,
+            slashingRoundSizeInEpochs: 1,
+            slashingQuorum: 17
+        }, {
+            syncChainTip: 'proven'
+        }));
+        this.ownerAddress = this.accounts[0];
+        this.testContract = await registerTestContract(this.wallet);
+        if (!this.dateProvider) {
+            throw new Error('dateProvider must be provided by setup for HA tests');
+        }
+        this.logger.info('Bootstrap node setup complete; funded initializerless account and test contract registered locally');
+        // Get bootstrap node's P2P ENR for HA nodes to connect to
+        const bootstrapNodeEnr = await this.aztecNode.getEncodedEnr();
+        if (!bootstrapNodeEnr) {
+            throw new Error('Failed to get bootstrap node ENR - P2P may not be enabled');
+        }
+        this.logger.info(`Bootstrap node ENR: ${bootstrapNodeEnr}`);
+        // L1 contract wrappers for querying votes
+        this.governanceProposer = new GovernanceProposerContract(this.deployL1ContractsValues.l1Client, this.deployL1ContractsValues.l1ContractAddresses.governanceProposerAddress.toString());
+        this.logger.info('L1 contract wrappers initialized');
+        this.haNodeServices = [];
+        this.haKeystoreDirs = [];
+        this.logger.info(`Starting ${NODE_COUNT} HA peer nodes...`);
+        // Per-node keystore: all attesters but only this node's publisher to avoid nonce conflicts.
+        // When keyStoreDirectory is set the node loads validators/publishers from file only, so we omit them from config.
+        this.initialKeystoreJsons = [];
+        for(let i = 0; i < NODE_COUNT; i++){
+            const nodeId = `${this.databaseConfig.nodeId}-${i + 1}`;
+            this.logger.info(`Starting HA peer node ${i} with nodeId: ${nodeId}`);
+            const keystoreContent = {
+                schemaVersion: 1,
+                validators: [
+                    {
+                        attester: this.attesterAddresses,
+                        feeRecipient: AztecAddress.ZERO.toString(),
+                        coinbase: EthAddress.fromString(this.attesterAddresses[0]).toChecksumString(),
+                        remoteSigner: this.web3SignerUrl,
+                        publisher: [
+                            this.publisherAddresses[i]
+                        ]
+                    }
+                ]
+            };
+            const keystoreJson = JSON.stringify(keystoreContent, null, 2);
+            this.initialKeystoreJsons.push(keystoreJson);
+            const keystoreDir = await mkdtemp(join(tmpdir(), `ha-keystore-${i}-`));
+            this.haKeystoreDirs.push(keystoreDir);
+            await writeFile(join(keystoreDir, 'keystore.json'), keystoreJson);
+            const dataDirectory = this.config.dataDirectory ? `${this.config.dataDirectory}-${i}` : undefined;
+            const nodeP2PPort = await getFreeP2PPort();
+            const nodeConfig = {
+                ...this.config,
+                nodeId,
+                keyStoreDirectory: keystoreDir,
+                // Ensure txs are included in proposals to test full signing path
+                publishTxsWithProposals: true,
+                dataDirectory,
+                databaseUrl: this.databaseConfig.databaseUrl,
+                pollingIntervalMs: this.databaseConfig.pollingIntervalMs,
+                peerSigningTimeoutMs: this.databaseConfig.peerSigningTimeoutMs,
+                maxStuckDutiesAgeMs: this.databaseConfig.maxStuckDutiesAgeMs,
+                haSigningEnabled: true,
+                disableValidator: false,
+                // Enable P2P for transaction and block gossip
+                p2pEnabled: true,
+                // Each HA node gets its own free port above the ephemeral range. Override the broadcast port too:
+                // `...config` carries the bootstrap node's broadcast port (discv5 sets it in place), which would
+                // otherwise make every HA node advertise the bootstrap's port instead of its own.
+                p2pPort: nodeP2PPort,
+                p2pBroadcastPort: nodeP2PPort,
+                // Connect to bootstrap node for tx gossip
+                bootstrapNodes: [
+                    bootstrapNodeEnr
+                ],
+                web3SignerUrl: this.web3SignerUrl
+            };
+            const nodeService = await withLoggerBindings({
+                actor: `HA-${i}`
+            }, async ()=>{
+                return await createAztecNodeService(nodeConfig, {
+                    dateProvider: this.dateProvider
+                }, {
+                    genesis: this.genesis,
+                    dontStartSequencer: true
+                });
+            });
+            this.haNodeServices.push(nodeService);
+            this.logger.info(`HA peer node ${i} started successfully`);
+        }
+        this.logger.info(`All ${NODE_COUNT} HA peer nodes started and coordinating via PostgreSQL database`);
+        this.logger.info('Waiting for HA peer nodes to join the tx gossip mesh');
+        await retryUntil(async ()=>{
+            const meshStates = await Promise.all(this.haNodeServices.map(async (service, nodeIndex)=>{
+                const p2p = service.getP2P();
+                const [peers, txMeshPeerCount] = await Promise.all([
+                    p2p.getPeers(),
+                    p2p.getGossipMeshPeerCount(TopicType.tx)
+                ]);
+                return {
+                    nodeIndex,
+                    peerCount: peers.length,
+                    txMeshPeerCount
+                };
+            }));
+            this.logger.debug('HA tx gossip mesh status', {
+                meshStates
+            });
+            return meshStates.every(({ peerCount, txMeshPeerCount })=>peerCount > 0 && txMeshPeerCount > 0) ? true : undefined;
+        }, 'HA tx gossip mesh readiness', 60, 1);
+        // The owner is an initializerless account, so it needs no deployment tx -- it was funded at genesis
+        // and registered during setup, and is ready to transact as soon as the HA nodes start building blocks.
+        this.logger.info(`Test account ready at ${this.ownerAddress}`);
+    }
+    async teardown() {
+        // Stop all sequencers before tearing down the nodes: a sequencer stop awaits its in-flight
+        // iteration, which can spend tens of seconds finishing a vote or checkpoint publish on L1.
+        // Stops must be awaited fully — jest runs without forceExit, so a node abandoned mid-stop
+        // outlives the test environment and keeps the worker process alive until the CI job timeout.
+        // The dateProvider reset must wait until nodes are stopped: it rewinds the shared clock from
+        // chain time to wall time (minutes apart after the automine deploy burst), and any publisher
+        // deadline armed against the rewound clock would block shutdown until wall time catches up.
+        if (this.haNodeServices) {
+            await Promise.allSettled(this.haNodeServices.map(async (service, i)=>{
+                try {
+                    await service.getSequencer()?.stop();
+                } catch (error) {
+                    this.logger.error(`Failed to stop sequencer of HA peer node ${i}: ${error}`);
+                }
+            }));
+            await Promise.allSettled(this.haNodeServices.map((_, i)=>this.stopHANode(i).catch((error)=>{
+                    this.logger.error(`Failed to stop HA peer node ${i}: ${error}`);
+                })));
+        }
+        this.dateProvider?.reset();
+        // Cleanup HA keystore temp directories
+        if (this.haKeystoreDirs) {
+            for(let i = 0; i < this.haKeystoreDirs.length; i++){
+                try {
+                    await rm(this.haKeystoreDirs[i], {
+                        recursive: true
+                    });
+                } catch (error) {
+                    this.logger.error(`Failed to remove HA keystore dir ${i}: ${error}`);
+                }
+            }
+        }
+        // Cleanup HA resources (database pools, etc.)
+        if (this.haNodePools) {
+            for (const pool of this.haNodePools){
+                try {
+                    await pool.end();
+                } catch (error) {
+                    this.logger.error(`Failed to close HA node pool: ${error}`);
+                }
+            }
+        }
+        await cleanupHADatabase(this.mainPool, this.logger);
+        await this.mainPool.end();
+        // Cleanup bootstrap node and test infrastructure (this cleans up the shared data directory)
+        await this.teardownBootstrap();
+    }
+    /** Clean up database state between tests. */ async resetDutiesTable() {
+        try {
+            await this.mainPool.query('DELETE FROM validator_duties');
+        } catch (error) {
+            // Ignore cleanup errors (table might not exist on first run failure)
+            this.logger?.warn(`Failed to clean up validator_duties: ${error}`);
+        }
+    }
+}

package/dest/composed/web3signer/multi_validator_keystore_utils.d.ts

@@ -0,0 +1,12 @@
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import type { EthPrivateKey } from '@aztec/node-keystore';
+export declare function createJSONRPCSigner(keyLookup: Map<string, EthPrivateKey>, stats: Map<string, number>): import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
+export declare function createKeyFile1(fileName: string, mnemonic: string, validatorIndex: number, publisher1Key: EthPrivateKey, publisher2Key: EthPrivateKey, coinbase: EthAddress, feeRecipient: AztecAddress): Promise<void>;
+export declare function createKeyFile2(fileName: string, validatorKey: EthPrivateKey, publisherMnemonic: string, publisher1Index: number, coinbase: EthAddress, feeRecipient: AztecAddress): Promise<void>;
+export declare function createKeyFile3(fileName: string, validatorAddress: EthAddress, publisher1Key: EthPrivateKey, publisher2Key: EthPrivateKey, coinbase: EthAddress, remoteSignerUrl: string, feeRecipient: AztecAddress): Promise<void>;
+export declare function createKeyFile4(fileName: string, validator1Address: EthAddress, validator2Address: EthAddress, publisher1Index: number, publisher2Key: EthPrivateKey, mnemonic: string, publisher3Key: EthPrivateKey, coinbase1: EthAddress, coinbase2: EthAddress, remoteSignerUrl: string, feeRecipient1: AztecAddress, feeRecipient2: AztecAddress): Promise<void>;
+export declare function createKeyFile5(fileName: string, proverAddress: EthAddress, remoteSignerUrl: string): Promise<void>;
+export declare function createKeyFile6(fileName: string, mnemonic: string, validator1Index: number, coinbase: EthAddress, feeRecipient: AztecAddress): Promise<void>;
+export declare function addressForPrivateKey(privateKey: EthPrivateKey): EthAddress;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXVsdGlfdmFsaWRhdG9yX2tleXN0b3JlX3V0aWxzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tcG9zZWQvd2ViM3NpZ25lci9tdWx0aV92YWxpZGF0b3Jfa2V5c3RvcmVfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXpELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQVcxRCx3QkFBZ0IsbUJBQW1CLENBQUMsU0FBUyxFQUFFLEdBQUcsQ0FBQyxNQUFNLEVBQUUsYUFBYSxDQUFDLEVBQUUsS0FBSyxFQUFFLEdBQUcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLHNHQTBFcEc7QUFHRCx3QkFBc0IsY0FBYyxDQUNsQyxRQUFRLEVBQUUsTUFBTSxFQUNoQixRQUFRLEVBQUUsTUFBTSxFQUNoQixjQUFjLEVBQUUsTUFBTSxFQUN0QixhQUFhLEVBQUUsYUFBYSxFQUM1QixhQUFhLEVBQUUsYUFBYSxFQUM1QixRQUFRLEVBQUUsVUFBVSxFQUNwQixZQUFZLEVBQUUsWUFBWSxpQkFtQjNCO0FBRUQsd0JBQXNCLGNBQWMsQ0FDbEMsUUFBUSxFQUFFLE1BQU0sRUFDaEIsWUFBWSxFQUFFLGFBQWEsRUFDM0IsaUJBQWlCLEVBQUUsTUFBTSxFQUN6QixlQUFlLEVBQUUsTUFBTSxFQUN2QixRQUFRLEVBQUUsVUFBVSxFQUNwQixZQUFZLEVBQUUsWUFBWSxpQkFtQjNCO0FBRUQsd0JBQXNCLGNBQWMsQ0FDbEMsUUFBUSxFQUFFLE1BQU0sRUFDaEIsZ0JBQWdCLEVBQUUsVUFBVSxFQUM1QixhQUFhLEVBQUUsYUFBYSxFQUM1QixhQUFhLEVBQUUsYUFBYSxFQUM1QixRQUFRLEVBQUUsVUFBVSxFQUNwQixlQUFlLEVBQUUsTUFBTSxFQUN2QixZQUFZLEVBQUUsWUFBWSxpQkFpQjNCO0FBRUQsd0JBQXNCLGNBQWMsQ0FDbEMsUUFBUSxFQUFFLE1BQU0sRUFDaEIsaUJBQWlCLEVBQUUsVUFBVSxFQUM3QixpQkFBaUIsRUFBRSxVQUFVLEVBQzdCLGVBQWUsRUFBRSxNQUFNLEVBQ3ZCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLFNBQVMsRUFBRSxVQUFVLEVBQ3JCLFNBQVMsRUFBRSxVQUFVLEVBQ3JCLGVBQWUsRUFBRSxNQUFNLEVBQ3ZCLGFBQWEsRUFBRSxZQUFZLEVBQzNCLGFBQWEsRUFBRSxZQUFZLGlCQTRCNUI7QUFFRCx3QkFBc0IsY0FBYyxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsYUFBYSxFQUFFLFVBQVUsRUFBRSxlQUFlLEVBQUUsTUFBTSxpQkFjeEc7QUFFRCx3QkFBc0IsY0FBYyxDQUNsQyxRQUFRLEVBQUUsTUFBTSxFQUNoQixRQUFRLEVBQUUsTUFBTSxFQUNoQixlQUFlLEVBQUUsTUFBTSxFQUN2QixRQUFRLEVBQUUsVUFBVSxFQUNwQixZQUFZLEVBQUUsWUFBWSxpQkFrQjNCO0FBRUQsd0JBQWdCLG9CQUFvQixDQUFDLFVBQVUsRUFBRSxhQUFhLEdBQUcsVUFBVSxDQUUxRSJ9

package/dest/composed/web3signer/multi_validator_keystore_utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"multi_validator_keystore_utils.d.ts","sourceRoot":"","sources":["../../../src/composed/web3signer/multi_validator_keystore_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAW1D,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,sGA0EpG;AAGD,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,iBAmB3B;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,aAAa,EAC3B,iBAAiB,EAAE,MAAM,EACzB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,iBAmB3B;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,UAAU,EAC5B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,UAAU,EACpB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,YAAY,iBAiB3B;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,UAAU,EAC7B,iBAAiB,EAAE,UAAU,EAC7B,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,UAAU,EACrB,SAAS,EAAE,UAAU,EACrB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,YAAY,EAC3B,aAAa,EAAE,YAAY,iBA4B5B;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,iBAcxG;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,iBAkB3B;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,aAAa,GAAG,UAAU,CAE1E"}

package/dest/fixtures/e2e_prover_test.d.ts

@@ -1,6 +1,5 @@
 import { type InitialAccountData } from '@aztec/accounts/testing';
 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';
@@ -9,19 +8,23 @@ import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import { TokenSimulator } from '../simulators/token_simulator.js';
+import { SingleNodeTestContext, type SingleNodeTestOpts } from '../single-node/single_node_test_context.js';
 import { TestWallet } from '../test-wallet/test_wallet.js';
-import { type EndToEndContext, type SetupOptions } from './setup.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.
  * We configure this instance with all of the accounts and contracts.
  * We then prove and verify transactions created via this full prover PXE.
+ *
+ * The real-prover sub-base of the single-node topology: extends {@link SingleNodeTestContext} so it
+ * reuses the base node tracking / chain monitor / teardown machinery, but builds its environment with
+ * the bespoke prover opts below (real BB, `realVerifier` L1, the snapshot/account + TokenSimulator
+ * harness, and a hand-built prover node) rather than the base's default fake-prover config.
  */
-export declare class FullProverTest {
+export declare class FullProverTest extends SingleNodeTestContext {
     static TOKEN_NAME: string;
     static TOKEN_SYMBOL: string;
     static TOKEN_DECIMALS: bigint;
-    logger: Logger;
     wallet: TestWallet;
     provenWallet: TestWallet;
     accounts: AztecAddress[];
@@ -38,19 +41,19 @@ export declare class FullProverTest {
     /** Returns the proof verifier from the prover node (for test assertions). */
     get circuitProofVerifier(): ClientProtocolCircuitVerifier | undefined;
     provenAsset: TokenContract;
-    context: EndToEndContext;
     private proverAztecNode;
     private simulatedProverAztecNode;
     l1Contracts: DeployAztecL1ContractsReturnType;
     proverAddress: EthAddress;
+    private testName;
     private minNumberOfTxsPerBlock;
     private coinbase;
     private realProofs;
     constructor(testName: string, minNumberOfTxsPerBlock: number, coinbase: EthAddress, realProofs?: boolean);
     private applyBaseSetup;
-    setup(opts?: Partial<SetupOptions>): Promise<this>;
+    setup(opts?: SingleNodeTestOpts): Promise<void>;
     private mintFeeJuice;
     teardown(): Promise<void>;
     private applyMint;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZTJlX3Byb3Zlcl90ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZml4dHVyZXMvZTJlX3Byb3Zlcl90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGtCQUFrQixFQUEyQixNQUFNLHlCQUF5QixDQUFDO0FBRTNGLE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDckUsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRCxPQUFPLEtBQUssRUFBRSw2QkFBNkIsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXRFLE9BQU8sS0FBSyxFQUFFLGdDQUFnQyxFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFJbEcsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFNdEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUczRCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBQ3BCLEtBQUssWUFBWSxFQU1sQixNQUFNLFlBQVksQ0FBQztBQU9wQjs7Ozs7R0FLRztBQUVILHFCQUFhLGNBQWM7SUFDekIsTUFBTSxDQUFDLFVBQVUsU0FBVTtJQUMzQixNQUFNLENBQUMsWUFBWSxTQUFTO0lBQzVCLE1BQU0sQ0FBQyxjQUFjLFNBQU87SUFDNUIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLE1BQU0sRUFBRyxVQUFVLENBQUM7SUFDcEIsWUFBWSxFQUFHLFVBQVUsQ0FBQztJQUMxQixRQUFRLEVBQUUsWUFBWSxFQUFFLENBQU07SUFDOUIsY0FBYyxFQUFHLGtCQUFrQixFQUFFLENBQUM7SUFDdEMsZUFBZSxFQUFHLGFBQWEsQ0FBQztJQUNoQyx1QkFBdUIsRUFBRywyQkFBMkIsQ0FBQztJQUN0RCxRQUFRLEVBQUcsY0FBYyxDQUFDO0lBQzFCLFNBQVMsRUFBRyxTQUFTLENBQUM7SUFDdEIsY0FBYyxFQUFHLGNBQWMsQ0FBQztJQUNoQyxVQUFVLEVBQUcsVUFBVSxDQUFDO0lBQ3hCLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBcUI7SUFDN0MsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFzQjtJQUM5QyxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBc0I7SUFDaEQsNkVBQTZFO0lBQzdFLElBQUksb0JBQW9CLElBQUksNkJBQTZCLEdBQUcsU0FBUyxDQUVwRTtJQUNELFdBQVcsRUFBRyxhQUFhLENBQUM7SUFDNUIsT0FBTyxFQUFHLGVBQWUsQ0FBQztJQUMxQixPQUFPLENBQUMsZUFBZSxDQUFvQjtJQUMzQyxPQUFPLENBQUMsd0JBQXdCLENBQW9CO0lBQzdDLFdBQVcsRUFBRyxnQ0FBZ0MsQ0FBQztJQUMvQyxhQUFhLEVBQUcsVUFBVSxDQUFDO0lBQ2xDLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBUztJQUN2QyxPQUFPLENBQUMsUUFBUSxDQUFhO0lBQzdCLE9BQU8sQ0FBQyxVQUFVLENBQVU7SUFFNUIsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUFFLHNCQUFzQixFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsVUFBVSxFQUFFLFVBQVUsVUFBTyxFQUtwRztZQUthLGNBQWM7SUE4QnRCLEtBQUssQ0FBQyxJQUFJLEdBQUUsT0FBTyxDQUFDLFlBQVksQ0FBTSxpQkE2STNDO1lBRWEsWUFBWTtJQVNwQixRQUFRLGtCQWNiO1lBRWEsU0FBUztDQXNDeEIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZTJlX3Byb3Zlcl90ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZml4dHVyZXMvZTJlX3Byb3Zlcl90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGtCQUFrQixFQUEyQixNQUFNLHlCQUF5QixDQUFDO0FBRTNGLE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFckUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sS0FBSyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFdEUsT0FBTyxLQUFLLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUlsRyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMxRSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQU10RSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDbEUsT0FBTyxFQUFFLHFCQUFxQixFQUFFLEtBQUssa0JBQWtCLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQUM1RyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFXM0Q7Ozs7Ozs7Ozs7R0FVRztBQUVILHFCQUFhLGNBQWUsU0FBUSxxQkFBcUI7SUFDdkQsTUFBTSxDQUFDLFVBQVUsU0FBVTtJQUMzQixNQUFNLENBQUMsWUFBWSxTQUFTO0lBQzVCLE1BQU0sQ0FBQyxjQUFjLFNBQU87SUFDNUIsTUFBTSxFQUFHLFVBQVUsQ0FBQztJQUNwQixZQUFZLEVBQUcsVUFBVSxDQUFDO0lBQzFCLFFBQVEsRUFBRSxZQUFZLEVBQUUsQ0FBTTtJQUM5QixjQUFjLEVBQUcsa0JBQWtCLEVBQUUsQ0FBQztJQUN0QyxlQUFlLEVBQUcsYUFBYSxDQUFDO0lBQ2hDLHVCQUF1QixFQUFHLDJCQUEyQixDQUFDO0lBQ3RELFFBQVEsRUFBRyxjQUFjLENBQUM7SUFDMUIsU0FBUyxFQUFHLFNBQVMsQ0FBQztJQUN0QixjQUFjLEVBQUcsY0FBYyxDQUFDO0lBQ2hDLFVBQVUsRUFBRyxVQUFVLENBQUM7SUFDeEIsT0FBTyxDQUFDLGdCQUFnQixDQUFxQjtJQUM3QyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQXNCO0lBQzlDLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUFzQjtJQUNoRCw2RUFBNkU7SUFDN0UsSUFBSSxvQkFBb0IsSUFBSSw2QkFBNkIsR0FBRyxTQUFTLENBRXBFO0lBQ0QsV0FBVyxFQUFHLGFBQWEsQ0FBQztJQUM1QixPQUFPLENBQUMsZUFBZSxDQUFvQjtJQUMzQyxPQUFPLENBQUMsd0JBQXdCLENBQW9CO0lBQzdDLFdBQVcsRUFBRyxnQ0FBZ0MsQ0FBQztJQUMvQyxhQUFhLEVBQUcsVUFBVSxDQUFDO0lBQ2xDLE9BQU8sQ0FBQyxRQUFRLENBQVM7SUFDekIsT0FBTyxDQUFDLHNCQUFzQixDQUFTO0lBQ3ZDLE9BQU8sQ0FBQyxRQUFRLENBQWE7SUFDN0IsT0FBTyxDQUFDLFVBQVUsQ0FBVTtJQUU1QixZQUFZLFFBQVEsRUFBRSxNQUFNLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxVQUFVLEVBQUUsVUFBVSxVQUFPLEVBT3BHO1lBS2EsY0FBYztJQThCYixLQUFLLENBQUMsSUFBSSxHQUFFLGtCQUF1QixpQkE0SmpEO1lBRWEsWUFBWTtJQVNYLFFBQVEsa0JBZ0J0QjtZQUVhLFNBQVM7Q0FzQ3hCIn0=

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":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA2B,MAAM,yBAAyB,CAAC;AAE3F,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,KAAK,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AAEtE,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAIlG,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAMtE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAMlB,MAAM,YAAY,CAAC;AAOpB;;;;;GAKG;AAEH,qBAAa,cAAc;IACzB,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,UAAU,CAAC;IAC1B,QAAQ,EAAE,YAAY,EAAE,CAAM;IAC9B,cAAc,EAAG,kBAAkB,EAAE,CAAC;IACtC,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,6EAA6E;IAC7E,IAAI,oBAAoB,IAAI,6BAA6B,GAAG,SAAS,CAEpE;IACD,WAAW,EAAG,aAAa,CAAC;IAC5B,OAAO,EAAG,eAAe,CAAC;IAC1B,OAAO,CAAC,eAAe,CAAoB;IAC3C,OAAO,CAAC,wBAAwB,CAAoB;IAC7C,WAAW,EAAG,gCAAgC,CAAC;IAC/C,aAAa,EAAG,UAAU,CAAC;IAClC,OAAO,CAAC,sBAAsB,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAa;IAC7B,OAAO,CAAC,UAAU,CAAU;IAE5B,YAAY,QAAQ,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,UAAO,EAKpG;YAKa,cAAc;IA8BtB,KAAK,CAAC,IAAI,GAAE,OAAO,CAAC,YAAY,CAAM,iBA6I3C;YAEa,YAAY;IASpB,QAAQ,kBAcb;YAEa,SAAS;CAsCxB"}
+{"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/e2e_prover_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA2B,MAAM,yBAAyB,CAAC;AAE3F,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AAEtE,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAIlG,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAMtE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,KAAK,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAC5G,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAW3D;;;;;;;;;;GAUG;AAEH,qBAAa,cAAe,SAAQ,qBAAqB;IACvD,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,UAAU,CAAC;IAC1B,QAAQ,EAAE,YAAY,EAAE,CAAM;IAC9B,cAAc,EAAG,kBAAkB,EAAE,CAAC;IACtC,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,6EAA6E;IAC7E,IAAI,oBAAoB,IAAI,6BAA6B,GAAG,SAAS,CAEpE;IACD,WAAW,EAAG,aAAa,CAAC;IAC5B,OAAO,CAAC,eAAe,CAAoB;IAC3C,OAAO,CAAC,wBAAwB,CAAoB;IAC7C,WAAW,EAAG,gCAAgC,CAAC;IAC/C,aAAa,EAAG,UAAU,CAAC;IAClC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,sBAAsB,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAa;IAC7B,OAAO,CAAC,UAAU,CAAU;IAE5B,YAAY,QAAQ,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,UAAO,EAOpG;YAKa,cAAc;IA8Bb,KAAK,CAAC,IAAI,GAAE,kBAAuB,iBA4JjD;YAEa,YAAY;IASX,QAAQ,kBAgBtB;YAEa,SAAS;CAsCxB"}

package/dest/fixtures/e2e_prover_test.js

@@ -1,5 +1,5 @@
 import { generateSchnorrAccounts } from '@aztec/accounts/testing';
-import { AztecNodeService } from '@aztec/aztec-node';
+import { createAztecNodeService } from '@aztec/aztec-node';
 import { EthAddress } from '@aztec/aztec.js/addresses';
 import { createLogger } from '@aztec/aztec.js/log';
 import { BackendType, Barretenberg } from '@aztec/bb.js';
@@ -11,19 +11,25 @@ import { getGenesisValues } from '@aztec/world-state/testing';
 import { getContract } from 'viem';
 import { privateKeyToAddress } from 'viem/accounts';
 import { TokenSimulator } from '../simulators/token_simulator.js';
+import { SingleNodeTestContext } from '../single-node/single_node_test_context.js';
 import { getACVMConfig } from './get_acvm_config.js';
 import { getBBConfig } from './get_bb_config.js';
-import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setup, setupPXEAndGetWallet, teardown } from './setup.js';
+import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setup, setupPXEAndGetWallet } from './setup.js';
+import { getStandardContractGenesisNullifiers } from './standard_contracts_genesis.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.
  * We configure this instance with all of the accounts and contracts.
  * We then prove and verify transactions created via this full prover PXE.
- */ export class FullProverTest {
+ *
+ * The real-prover sub-base of the single-node topology: extends {@link SingleNodeTestContext} so it
+ * reuses the base node tracking / chain monitor / teardown machinery, but builds its environment with
+ * the bespoke prover opts below (real BB, `realVerifier` L1, the snapshot/account + TokenSimulator
+ * harness, and a hand-built prover node) rather than the base's default fake-prover config.
+ */ export class FullProverTest extends SingleNodeTestContext {
     static TOKEN_NAME = 'USDC';
     static TOKEN_SYMBOL = 'USD';
     static TOKEN_DECIMALS = 18n;
-    logger;
     wallet;
     provenWallet;
     accounts = [];
@@ -41,15 +47,17 @@ import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setup, setupPXEAndGetWa
         return this.proverAztecNode?.getProofVerifier();
     }
     provenAsset;
-    context;
     proverAztecNode;
     simulatedProverAztecNode;
     l1Contracts;
     proverAddress;
+    testName;
     minNumberOfTxsPerBlock;
     coinbase;
     realProofs;
     constructor(testName, minNumberOfTxsPerBlock, coinbase, realProofs = true){
+        super();
+        this.testName = testName;
         this.logger = createLogger(`e2e:full_prover_test:${testName}`);
         this.minNumberOfTxsPerBlock = minNumberOfTxsPerBlock;
         this.coinbase = coinbase;
@@ -80,7 +88,7 @@ import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setup, setupPXEAndGetWa
     }
     async setup(opts = {}) {
         this.logger.info('Setting up subsystems from fresh');
-        this.context = await setup(0, {
+        const context = await setup(0, {
             ...opts,
             startProverNode: true,
             coinbase: this.coinbase,
@@ -90,6 +98,11 @@ import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setup, setupPXEAndGetWa
                 realVerifier: this.realProofs
             }
         });
+        // Reuse the base context machinery (rollup, epoch cache, chain monitor, node tracking, teardown)
+        // over the environment built above. Restore the FullProverTest-named logger afterwards, since
+        // hydrateFromContext repoints `this.logger` at the context logger.
+        await this.hydrateFromContext(context);
+        this.logger = createLogger(`e2e:full_prover_test:${this.testName}`);
         await this.applyBaseSetup();
         await this.applyMint();
         this.logger.info(`Enabling proving`, {
@@ -131,7 +144,7 @@ import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setup, setupPXEAndGetWa
         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, {
+        const { wallet: provenWallet, teardown: provenTeardown } = await setupPXEAndGetWallet(this.aztecNode, this.context.aztecNode, {
             proverEnabled: this.realProofs
         }, undefined, 'pxe-proven');
         this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
@@ -139,8 +152,8 @@ import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setup, setupPXEAndGetWa
         for(let i = 0; i < 2; i++){
             // Mirror the initializerless funded accounts (created via createFundedAccounts) in both wallets so
             // their addresses match the genesis-funded ones.
-            await provenWallet.createSchnorrInitializerlessAccount(this.fundedAccounts[i].secret, this.fundedAccounts[i].salt);
-            await this.wallet.createSchnorrInitializerlessAccount(this.fundedAccounts[i].secret, this.fundedAccounts[i].salt);
+            await provenWallet.createSchnorrInitializerlessAccount(this.fundedAccounts[i].secret, this.fundedAccounts[i].salt, this.fundedAccounts[i].signingKey);
+            await this.wallet.createSchnorrInitializerlessAccount(this.fundedAccounts[i].secret, this.fundedAccounts[i].salt, this.fundedAccounts[i].signingKey);
         }
         const asset = TokenContract.at(this.fakeProofsAsset.address, provenWallet);
         this.provenComponents.push({
@@ -162,7 +175,7 @@ import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setup, setupPXEAndGetWa
         await this.mintFeeJuice(proverNodeSenderAddress);
         this.logger.verbose('Starting prover node');
         const sponsoredFPCAddress = await getSponsoredFPCAddress();
-        const { genesis } = await getGenesisValues(this.context.additionallyFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress), undefined, undefined, this.context.genesis.genesisTimestamp);
+        const { genesis } = await getGenesisValues(this.context.additionallyFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress), undefined, undefined, this.context.genesis.genesisTimestamp, await getStandardContractGenesisNullifiers());
         const proverNodeConfig = {
             ...config,
             enableProverNode: true,
@@ -189,7 +202,7 @@ import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setup, setupPXEAndGetWa
             proverNodeEpochProvingDelayMs: undefined,
             validatorPrivateKeys: new SecretValue([])
         };
-        this.proverAztecNode = await AztecNodeService.createAndSync(proverNodeConfig, {
+        this.proverAztecNode = await createAztecNodeService(proverNodeConfig, {
             dateProvider: this.context.dateProvider,
             p2pClientDeps: {
                 rpcTxProviders: [
@@ -199,10 +212,14 @@ import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setup, setupPXEAndGetWa
         }, {
             genesis
         });
+        // Track the real prover node so the base teardown stops it (the simulated one created by `setup`
+        // was already stopped above).
+        this.proverNodes = [
+            this.proverAztecNode
+        ];
         this.logger.warn(`Proofs are now enabled`, {
             realProofs: this.realProofs
         });
-        return this;
     }
     async mintFeeJuice(recipient) {
         const handlerAddress = this.context.deployL1ContractsValues.l1ContractAddresses.feeAssetHandlerAddress;
@@ -225,12 +242,14 @@ import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setup, setupPXEAndGetWa
         for(let i = 0; i < this.provenComponents.length; i++){
             await this.provenComponents[i].teardown();
         }
-        // clean up the full prover node (by stopping its hosting aztec node)
+        // Stop the prover node before destroying the BB singleton it proves with.
         await this.proverAztecNode.stop();
         await Barretenberg.destroySingleton();
         await this.bbConfigCleanup?.();
         await this.acvmConfigCleanup?.();
-        await teardown(this.context);
+        // Stops the chain monitor, the tracked nodes (main node + the already-stopped prover node, a
+        // safe no-op), and the context.
+        await super.teardown();
     }
     async applyMint() {
         this.logger.info('Applying mint setup');