@aztec/end-to-end 0.0.1-commit.e558bd1c → 0.0.1-commit.e57c76e

package/dest/e2e_token_contract/token_contract_test.d.ts

@@ -2,10 +2,11 @@ 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 { GenericProxyContract } from '@aztec/noir-test-contracts.js/GenericProxy';
 import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
-import type { TestWallet } from '@aztec/test-wallet/server';
-import { type EndToEndContext } from '../fixtures/setup.js';
+import { type EndToEndContext, type SetupOptions } from '../fixtures/setup.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
+import type { TestWallet } from '../test-wallet/test_wallet.js';
 export declare class TokenContractTest {
     static TOKEN_NAME: string;
     static TOKEN_SYMBOL: string;
@@ -17,6 +18,7 @@ export declare class TokenContractTest {
     tokenSim: TokenSimulator;
     node: AztecNode;
     badAccount: InvalidAccountContract;
+    authwitProxy: GenericProxyContract;
     wallet: TestWallet;
     adminAddress: AztecAddress;
     account1Address: AztecAddress;
@@ -35,8 +37,8 @@ export declare class TokenContractTest {
      */
     applyMintSnapshot(): void;
     private applyBaseSetup;
-    setup(): Promise<void>;
+    setup(opts?: Partial<SetupOptions>): Promise<void>;
     teardown(): Promise<void>;
     private applyMint;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5fY29udHJhY3RfdGVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2UyZV90b2tlbl9jb250cmFjdC90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQy9ELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQ3RGLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSTVELE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBeUQsTUFBTSxzQkFBc0IsQ0FBQztBQUVuSCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFJbEUscUJBQWEsaUJBQWlCO0lBQzVCLE1BQU0sQ0FBQyxVQUFVLFNBQVU7SUFDM0IsTUFBTSxDQUFDLFlBQVksU0FBUztJQUM1QixNQUFNLENBQUMsY0FBYyxTQUFPO0lBQzVCLE9BQU8sRUFBRyxlQUFlLENBQUM7SUFDMUIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNyQixLQUFLLEVBQUcsYUFBYSxDQUFDO0lBQ3RCLFFBQVEsRUFBRyxjQUFjLENBQUM7SUFDMUIsSUFBSSxFQUFHLFNBQVMsQ0FBQztJQUVqQixVQUFVLEVBQUcsc0JBQXNCLENBQUM7SUFDcEMsTUFBTSxFQUFHLFVBQVUsQ0FBQztJQUNwQixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLGVBQWUsRUFBRyxZQUFZLENBQUM7SUFDL0IsZUFBZSxFQUFHLFlBQVksQ0FBQztJQUUvQixPQUFPLENBQUMsb0JBQW9CLENBQVM7SUFDckMsT0FBTyxDQUFDLGVBQWUsQ0FBUztJQUVoQyxZQUFZLFFBQVEsRUFBRSxNQUFNLEVBRzNCO0lBRUQ7OztPQUdHO0lBQ0gsa0JBQWtCLFNBRWpCO0lBRUQ7OztPQUdHO0lBQ0gsaUJBQWlCLFNBRWhCO1lBS2EsY0FBYztJQTZDdEIsS0FBSyxrQkFjVjtJQUVLLFFBQVEsa0JBRWI7WUFFYSxTQUFTO0NBMkJ4QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5fY29udHJhY3RfdGVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2UyZV90b2tlbl9jb250cmFjdC90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQy9ELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBQ2xGLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBSXRGLE9BQU8sRUFDTCxLQUFLLGVBQWUsRUFDcEIsS0FBSyxZQUFZLEVBTWxCLE1BQU0sc0JBQXNCLENBQUM7QUFFOUIsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ2xFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBSWhFLHFCQUFhLGlCQUFpQjtJQUM1QixNQUFNLENBQUMsVUFBVSxTQUFVO0lBQzNCLE1BQU0sQ0FBQyxZQUFZLFNBQVM7SUFDNUIsTUFBTSxDQUFDLGNBQWMsU0FBTztJQUM1QixPQUFPLEVBQUcsZUFBZSxDQUFDO0lBQzFCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixXQUFXLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDckIsS0FBSyxFQUFHLGFBQWEsQ0FBQztJQUN0QixRQUFRLEVBQUcsY0FBYyxDQUFDO0lBQzFCLElBQUksRUFBRyxTQUFTLENBQUM7SUFFakIsVUFBVSxFQUFHLHNCQUFzQixDQUFDO0lBQ3BDLFlBQVksRUFBRyxvQkFBb0IsQ0FBQztJQUNwQyxNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsZUFBZSxFQUFHLFlBQVksQ0FBQztJQUMvQixlQUFlLEVBQUcsWUFBWSxDQUFDO0lBRS9CLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBUztJQUNyQyxPQUFPLENBQUMsZUFBZSxDQUFTO0lBRWhDLFlBQVksUUFBUSxFQUFFLE1BQU0sRUFHM0I7SUFFRDs7O09BR0c7SUFDSCxrQkFBa0IsU0FFakI7SUFFRDs7O09BR0c7SUFDSCxpQkFBaUIsU0FFaEI7WUFLYSxjQUFjO0lBeUR0QixLQUFLLENBQUMsSUFBSSxHQUFFLE9BQU8sQ0FBQyxZQUFZLENBQU0saUJBZTNDO0lBRUssUUFBUSxrQkFFYjtZQUVhLFNBQVM7Q0ErQnhCIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_token_contract/token_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,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,EAAE,KAAK,eAAe,EAAyD,MAAM,sBAAsB,CAAC;AAEnH,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,EAAG,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,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,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,eAAe,CAAS;IAEhC,YAAY,QAAQ,EAAE,MAAM,EAG3B;IAED;;;OAGG;IACH,kBAAkB,SAEjB;IAED;;;OAGG;IACH,iBAAiB,SAEhB;YAKa,cAAc;IA6CtB,KAAK,kBAcV;IAEK,QAAQ,kBAEb;YAEa,SAAS;CA2BxB"}
+{"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,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AAItF,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAMlB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAIhE,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,EAAG,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAG,aAAa,CAAC;IACtB,QAAQ,EAAG,cAAc,CAAC;IAC1B,IAAI,EAAG,SAAS,CAAC;IAEjB,UAAU,EAAG,sBAAsB,CAAC;IACpC,YAAY,EAAG,oBAAoB,CAAC;IACpC,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,YAAY,CAAC;IAC5B,eAAe,EAAG,YAAY,CAAC;IAC/B,eAAe,EAAG,YAAY,CAAC;IAE/B,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,eAAe,CAAS;IAEhC,YAAY,QAAQ,EAAE,MAAM,EAG3B;IAED;;;OAGG;IACH,kBAAkB,SAEjB;IAED;;;OAGG;IACH,iBAAiB,SAEhB;YAKa,cAAc;IAyDtB,KAAK,CAAC,IAAI,GAAE,OAAO,CAAC,YAAY,CAAM,iBAe3C;IAEK,QAAQ,kBAEb;YAEa,SAAS;CA+BxB"}

package/dest/e2e_token_contract/token_contract_test.js

@@ -1,8 +1,9 @@
 import { createLogger } from '@aztec/aztec.js/log';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import { GenericProxyContract } from '@aztec/noir-test-contracts.js/GenericProxy';
 import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
 import { jest } from '@jest/globals';
-import { deployAccounts, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
+import { deployAccounts, ensureAuthRegistryPublished, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
 const { METRICS_PORT: metricsPort } = process.env;
@@ -17,6 +18,7 @@ export class TokenContractTest {
     tokenSim;
     node;
     badAccount;
+    authwitProxy;
     wallet;
     adminAddress;
     account1Address;
@@ -53,31 +55,41 @@ export class TokenContractTest {
         this.wallet = this.context.wallet;
         [this.adminAddress, this.account1Address, this.account2Address] = deployedAccounts.map((acc)=>acc.address);
         this.logger.info('Applying base setup - deploying token contract');
+        await ensureAuthRegistryPublished(this.wallet, this.adminAddress);
         this.logger.verbose(`Public deploy accounts...`);
         await publicDeployAccounts(this.wallet, [
             this.adminAddress,
             this.account1Address
         ]);
         this.logger.verbose(`Deploying TokenContract...`);
-        this.asset = await TokenContract.deploy(this.wallet, this.adminAddress, TokenContractTest.TOKEN_NAME, TokenContractTest.TOKEN_SYMBOL, TokenContractTest.TOKEN_DECIMALS).send({
+        ({ contract: this.asset } = await TokenContract.deploy(this.wallet, this.adminAddress, TokenContractTest.TOKEN_NAME, TokenContractTest.TOKEN_SYMBOL, TokenContractTest.TOKEN_DECIMALS).send({
             from: this.adminAddress
-        });
+        }));
         this.logger.verbose(`Token deployed to ${this.asset.address}`);
         this.logger.verbose(`Deploying bad account...`);
-        this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
+        ({ contract: this.badAccount } = await InvalidAccountContract.deploy(this.wallet).send({
             from: this.adminAddress
-        });
+        }));
         this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
+        // Deploy a proxy contract for "on behalf of other" tests. The note owner must be the tx sender
+        // (so their notes are in scope), but msg_sender in the target must differ from the note owner
+        // to trigger authwit validation. The proxy forwards calls so that msg_sender != tx sender.
+        this.logger.verbose(`Deploying generic proxy...`);
+        ({ contract: this.authwitProxy } = await GenericProxyContract.deploy(this.wallet).send({
+            from: this.adminAddress
+        }));
+        this.logger.verbose(`Deployed to ${this.authwitProxy.address}.`);
         this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
             this.adminAddress,
             this.account1Address
         ]);
-        expect(await this.asset.methods.get_admin().simulate({
+        expect((await this.asset.methods.get_admin().simulate({
             from: this.adminAddress
-        })).toBe(this.adminAddress.toBigInt());
+        })).result).toBe(this.adminAddress.toBigInt());
     }
-    async setup() {
+    async setup(opts = {}) {
         this.context = await setup(0, {
+            ...opts,
             metricsPort: this.metricsPort,
             fundSponsoredFPC: true,
             skipAccountDeployment: true
@@ -101,7 +113,7 @@ export class TokenContractTest {
             from: adminAddress
         });
         tokenSim.mintPublic(adminAddress, amount);
-        const publicBalance = await asset.methods.balance_of_public(adminAddress).simulate({
+        const { result: publicBalance } = await asset.methods.balance_of_public(adminAddress).simulate({
             from: adminAddress
         });
         this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
@@ -109,12 +121,12 @@ export class TokenContractTest {
         this.logger.verbose(`Minting ${amount} privately...`);
         await mintTokensToPrivate(asset, adminAddress, adminAddress, amount);
         tokenSim.mintPrivate(adminAddress, amount);
-        const privateBalance = await asset.methods.balance_of_private(adminAddress).simulate({
+        const { result: 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(adminAddress));
-        const totalSupply = await asset.methods.total_supply().simulate({
+        const { result: totalSupply } = await asset.methods.total_supply().simulate({
             from: adminAddress
         });
         this.logger.verbose(`Total supply: ${totalSupply}`);

package/dest/fixtures/authwit_proxy.d.ts

@@ -0,0 +1,15 @@
+import type { ContractFunctionInteraction, SendInteractionOptions, SimulateInteractionOptions } from '@aztec/aztec.js/contracts';
+import type { GenericProxyContract } from '@aztec/noir-test-contracts.js/GenericProxy';
+/**
+ * Sends a contract call through the authwit proxy.
+ * The proxy becomes msg_sender in the target (triggering authwit validation),
+ * while the actual tx sender retains their keys in scope.
+ */
+export declare function sendThroughAuthwitProxy(proxy: GenericProxyContract, action: ContractFunctionInteraction, options: SendInteractionOptions): Promise<import("@aztec/aztec.js/contracts").TxSendResultMined<import("@aztec/stdlib/tx").TxReceipt>>;
+/**
+ * Simulates a contract call through the authwit proxy.
+ * The proxy becomes msg_sender in the target (triggering authwit validation),
+ * while the actual tx sender retains their keys in scope.
+ */
+export declare function simulateThroughAuthwitProxy(proxy: GenericProxyContract, action: ContractFunctionInteraction, options: SimulateInteractionOptions): Promise<import("@aztec/aztec.js/contracts").SimulationResult>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aHdpdF9wcm94eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ZpeHR1cmVzL2F1dGh3aXRfcHJveHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQ1YsMkJBQTJCLEVBQzNCLHNCQUFzQixFQUN0QiwwQkFBMEIsRUFDM0IsTUFBTSwyQkFBMkIsQ0FBQztBQUNuQyxPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBc0J2Rjs7OztHQUlHO0FBQ0gsd0JBQXNCLHVCQUF1QixDQUMzQyxLQUFLLEVBQUUsb0JBQW9CLEVBQzNCLE1BQU0sRUFBRSwyQkFBMkIsRUFDbkMsT0FBTyxFQUFFLHNCQUFzQix3R0FJaEM7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQXNCLDJCQUEyQixDQUMvQyxLQUFLLEVBQUUsb0JBQW9CLEVBQzNCLE1BQU0sRUFBRSwyQkFBMkIsRUFDbkMsT0FBTyxFQUFFLDBCQUEwQixpRUFJcEMifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"authwit_proxy.d.ts","sourceRoot":"","sources":["../../src/fixtures/authwit_proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,2BAA2B,EAC3B,sBAAsB,EACtB,0BAA0B,EAC3B,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAsBvF;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,oBAAoB,EAC3B,MAAM,EAAE,2BAA2B,EACnC,OAAO,EAAE,sBAAsB,wGAIhC;AAED;;;;GAIG;AACH,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,oBAAoB,EAC3B,MAAM,EAAE,2BAA2B,EACnC,OAAO,EAAE,0BAA0B,iEAIpC"}

package/dest/fixtures/authwit_proxy.js

@@ -0,0 +1,34 @@
+/**
+ * Builds a proxy forwarding call from an action, selecting the right forward_private_N method.
+ */ async function buildProxyCall(proxy, action) {
+    const call = await action.getFunctionCall();
+    const argCount = call.args.length;
+    if (argCount === 2) {
+        return proxy.methods.forward_private_2(call.to, call.selector, call.args);
+    } else if (argCount === 3) {
+        return proxy.methods.forward_private_3(call.to, call.selector, call.args);
+    } else if (argCount === 4) {
+        return proxy.methods.forward_private_4(call.to, call.selector, call.args);
+    } else if (argCount === 5) {
+        return proxy.methods.forward_private_5(call.to, call.selector, call.args);
+    } else if (argCount === 6) {
+        return proxy.methods.forward_private_6(call.to, call.selector, call.args);
+    }
+    throw new Error(`No forward_private_${argCount} method on proxy`);
+}
+/**
+ * Sends a contract call through the authwit proxy.
+ * The proxy becomes msg_sender in the target (triggering authwit validation),
+ * while the actual tx sender retains their keys in scope.
+ */ export async function sendThroughAuthwitProxy(proxy, action, options) {
+    const proxyCall = await buildProxyCall(proxy, action);
+    return proxyCall.send(options);
+}
+/**
+ * Simulates a contract call through the authwit proxy.
+ * The proxy becomes msg_sender in the target (triggering authwit validation),
+ * while the actual tx sender retains their keys in scope.
+ */ export async function simulateThroughAuthwitProxy(proxy, action, options) {
+    const proxyCall = await buildProxyCall(proxy, action);
+    return proxyCall.simulate(options);
+}

package/dest/fixtures/e2e_prover_test.d.ts

@@ -3,14 +3,14 @@ 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 { ClientProtocolCircuitVerifier } from '@aztec/bb-prover';
 import type { DeployAztecL1ContractsReturnType } from '@aztec/ethereum/deploy-aztec-l1-contracts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 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 EndToEndContext } from './setup.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.
@@ -35,11 +35,12 @@ export declare class FullProverTest {
     private provenComponents;
     private bbConfigCleanup?;
     private acvmConfigCleanup?;
-    circuitProofVerifier?: ClientProtocolCircuitVerifier;
+    /** Returns the proof verifier from the prover node (for test assertions). */
+    get circuitProofVerifier(): ClientProtocolCircuitVerifier | undefined;
     provenAsset: TokenContract;
     context: EndToEndContext;
-    private proverNode;
-    private simulatedProverNode;
+    private proverAztecNode;
+    private simulatedProverAztecNode;
     l1Contracts: DeployAztecL1ContractsReturnType;
     proverAddress: EthAddress;
     private minNumberOfTxsPerBlock;
@@ -47,9 +48,9 @@ export declare class FullProverTest {
     private realProofs;
     constructor(testName: string, minNumberOfTxsPerBlock: number, coinbase: EthAddress, realProofs?: boolean);
     private applyBaseSetup;
-    setup(): Promise<this>;
+    setup(opts?: Partial<SetupOptions>): Promise<this>;
     private mintFeeJuice;
     teardown(): Promise<void>;
     private applyMint;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZTJlX3Byb3Zlcl90ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZml4dHVyZXMvZTJlX3Byb3Zlcl90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFFTCxLQUFLLDZCQUE2QixFQUduQyxNQUFNLGtCQUFrQixDQUFDO0FBRzFCLE9BQU8sS0FBSyxFQUFFLGdDQUFnQyxFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFJbEcsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBTXZELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUdsRSxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBUXJCLE1BQU0sWUFBWSxDQUFDO0FBT3BCOzs7OztHQUtHO0FBRUgscUJBQWEsY0FBYztJQUN6QixNQUFNLENBQUMsVUFBVSxTQUFVO0lBQzNCLE1BQU0sQ0FBQyxZQUFZLFNBQVM7SUFDNUIsTUFBTSxDQUFDLGNBQWMsU0FBTztJQUM1QixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsTUFBTSxFQUFHLFVBQVUsQ0FBQztJQUNwQixZQUFZLEVBQUcsVUFBVSxDQUFDO0lBQzFCLFFBQVEsRUFBRSxZQUFZLEVBQUUsQ0FBTTtJQUM5QixnQkFBZ0IsRUFBRyxrQkFBa0IsRUFBRSxDQUFDO0lBQ3hDLGVBQWUsRUFBRyxhQUFhLENBQUM7SUFDaEMsdUJBQXVCLEVBQUcsMkJBQTJCLENBQUM7SUFDdEQsUUFBUSxFQUFHLGNBQWMsQ0FBQztJQUMxQixTQUFTLEVBQUcsU0FBUyxDQUFDO0lBQ3RCLGNBQWMsRUFBRyxjQUFjLENBQUM7SUFDaEMsVUFBVSxFQUFHLFVBQVUsQ0FBQztJQUN4QixPQUFPLENBQUMsZ0JBQWdCLENBQXFCO0lBQzdDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBc0I7SUFDOUMsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQXNCO0lBQ2hELG9CQUFvQixDQUFDLEVBQUUsNkJBQTZCLENBQUM7SUFDckQsV0FBVyxFQUFHLGFBQWEsQ0FBQztJQUM1QixPQUFPLEVBQUcsZUFBZSxDQUFDO0lBQzFCLE9BQU8sQ0FBQyxVQUFVLENBQWM7SUFDaEMsT0FBTyxDQUFDLG1CQUFtQixDQUFjO0lBQ2xDLFdBQVcsRUFBRyxnQ0FBZ0MsQ0FBQztJQUMvQyxhQUFhLEVBQUcsVUFBVSxDQUFDO0lBQ2xDLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBUztJQUN2QyxPQUFPLENBQUMsUUFBUSxDQUFhO0lBQzdCLE9BQU8sQ0FBQyxVQUFVLENBQVU7SUFFNUIsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUFFLHNCQUFzQixFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsVUFBVSxFQUFFLFVBQVUsVUFBTyxFQUtwRztZQUthLGNBQWM7SUFxQ3RCLEtBQUssa0JBZ0pWO1lBRWEsWUFBWTtJQVNwQixRQUFRLGtCQWNiO1lBRWEsU0FBUztDQWtDeEIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZTJlX3Byb3Zlcl90ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZml4dHVyZXMvZTJlX3Byb3Zlcl90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sS0FBSyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFdEUsT0FBTyxLQUFLLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUlsRyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMxRSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQU10RSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDbEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRzNELE9BQU8sRUFDTCxLQUFLLGVBQWUsRUFDcEIsS0FBSyxZQUFZLEVBUWxCLE1BQU0sWUFBWSxDQUFDO0FBT3BCOzs7OztHQUtHO0FBRUgscUJBQWEsY0FBYztJQUN6QixNQUFNLENBQUMsVUFBVSxTQUFVO0lBQzNCLE1BQU0sQ0FBQyxZQUFZLFNBQVM7SUFDNUIsTUFBTSxDQUFDLGNBQWMsU0FBTztJQUM1QixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsTUFBTSxFQUFHLFVBQVUsQ0FBQztJQUNwQixZQUFZLEVBQUcsVUFBVSxDQUFDO0lBQzFCLFFBQVEsRUFBRSxZQUFZLEVBQUUsQ0FBTTtJQUM5QixnQkFBZ0IsRUFBRyxrQkFBa0IsRUFBRSxDQUFDO0lBQ3hDLGVBQWUsRUFBRyxhQUFhLENBQUM7SUFDaEMsdUJBQXVCLEVBQUcsMkJBQTJCLENBQUM7SUFDdEQsUUFBUSxFQUFHLGNBQWMsQ0FBQztJQUMxQixTQUFTLEVBQUcsU0FBUyxDQUFDO0lBQ3RCLGNBQWMsRUFBRyxjQUFjLENBQUM7SUFDaEMsVUFBVSxFQUFHLFVBQVUsQ0FBQztJQUN4QixPQUFPLENBQUMsZ0JBQWdCLENBQXFCO0lBQzdDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBc0I7SUFDOUMsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQXNCO0lBQ2hELDZFQUE2RTtJQUM3RSxJQUFJLG9CQUFvQixJQUFJLDZCQUE2QixHQUFHLFNBQVMsQ0FFcEU7SUFDRCxXQUFXLEVBQUcsYUFBYSxDQUFDO0lBQzVCLE9BQU8sRUFBRyxlQUFlLENBQUM7SUFDMUIsT0FBTyxDQUFDLGVBQWUsQ0FBb0I7SUFDM0MsT0FBTyxDQUFDLHdCQUF3QixDQUFvQjtJQUM3QyxXQUFXLEVBQUcsZ0NBQWdDLENBQUM7SUFDL0MsYUFBYSxFQUFHLFVBQVUsQ0FBQztJQUNsQyxPQUFPLENBQUMsc0JBQXNCLENBQVM7SUFDdkMsT0FBTyxDQUFDLFFBQVEsQ0FBYTtJQUM3QixPQUFPLENBQUMsVUFBVSxDQUFVO0lBRTVCLFlBQVksUUFBUSxFQUFFLE1BQU0sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLFVBQVUsRUFBRSxVQUFVLFVBQU8sRUFLcEc7WUFLYSxjQUFjO0lBcUN0QixLQUFLLENBQUMsSUFBSSxHQUFFLE9BQU8sQ0FBQyxZQUFZLENBQU0saUJBd0kzQztZQUVhLFlBQVk7SUFTcEIsUUFBUSxrQkFjYjtZQUVhLFNBQVM7Q0FzQ3hCIn0=

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,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,EACL,KAAK,eAAe,EAQrB,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,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,EAAG,eAAe,CAAC;IAC1B,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,mBAAmB,CAAc;IAClC,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;IAqCtB,KAAK,kBAgJV;YAEa,YAAY;IASpB,QAAQ,kBAcb;YAEa,SAAS;CAkCxB"}
+{"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,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,EAQlB,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,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,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;IAqCtB,KAAK,CAAC,IAAI,GAAE,OAAO,CAAC,YAAY,CAAM,iBAwI3C;YAEa,YAAY;IASpB,QAAQ,kBAcb;YAEa,SAAS;CAsCxB"}

package/dest/fixtures/e2e_prover_test.js

@@ -1,14 +1,11 @@
-import { createArchiver } from '@aztec/archiver';
+import { AztecNodeService } from '@aztec/aztec-node';
 import { EthAddress } from '@aztec/aztec.js/addresses';
 import { createLogger } from '@aztec/aztec.js/log';
-import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
 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';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
-import { createProverNode } from '@aztec/prover-node';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import { getContract } from 'viem';
 import { privateKeyToAddress } from 'viem/accounts';
@@ -39,11 +36,13 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
     provenComponents = [];
     bbConfigCleanup;
     acvmConfigCleanup;
-    circuitProofVerifier;
+    /** Returns the proof verifier from the prover node (for test assertions). */ get circuitProofVerifier() {
+        return this.proverAztecNode?.getProofVerifier();
+    }
     provenAsset;
     context;
-    proverNode;
-    simulatedProverNode;
+    proverAztecNode;
+    simulatedProverAztecNode;
     l1Contracts;
     proverAddress;
     minNumberOfTxsPerBlock;
@@ -70,23 +69,21 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
         await publicDeployAccounts(this.wallet, this.accounts.slice(0, 2));
         this.logger.info('Applying base setup: deploying token contract');
         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: {
-                returnReceipt: true
-            }
+            from: this.accounts[0]
         });
         this.logger.verbose(`Token deployed to ${asset.address}`);
         this.fakeProofsAsset = asset;
         this.fakeProofsAssetInstance = instance;
         this.logger.verbose(`Token contract address: ${this.fakeProofsAsset.address}`);
         this.tokenSim = new TokenSimulator(this.fakeProofsAsset, this.wallet, this.accounts[0], this.logger, this.accounts);
-        expect(await this.fakeProofsAsset.methods.get_admin().simulate({
+        expect((await this.fakeProofsAsset.methods.get_admin().simulate({
             from: this.accounts[0]
-        })).toBe(this.accounts[0].toBigInt());
+        })).result).toBe(this.accounts[0].toBigInt());
     }
-    async setup() {
+    async setup(opts = {}) {
         this.logger.info('Setting up subsystems from fresh');
         this.context = await setup(0, {
+            ...opts,
             startProverNode: true,
             coinbase: this.coinbase,
             fundSponsoredFPC: true,
@@ -102,11 +99,10 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
         });
         // 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;
+        this.simulatedProverAztecNode = this.context.proverNode;
         ({ aztecNode: this.aztecNode, deployL1ContractsValues: this.l1Contracts, cheatCodes: this.cheatCodes } = this.context);
         this.aztecNodeAdmin = this.context.aztecNodeService;
         const config = this.context.aztecNodeConfig;
-        const blobClient = await createBlobClientWithFileStores(config, this.logger);
         // Configure a full prover PXE
         let acvmConfig;
         let bbConfig;
@@ -123,8 +119,6 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
             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...`);
             await this.aztecNodeAdmin.setConfig({
                 realProofs: true,
@@ -132,7 +126,6 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
             });
         } else {
             this.logger.debug(`Configuring the node min txs per block ${this.minNumberOfTxsPerBlock}...`);
-            this.circuitProofVerifier = new TestCircuitVerifier();
             await this.aztecNodeAdmin.setConfig({
                 minTxsPerBlock: this.minNumberOfTxsPerBlock
             });
@@ -159,36 +152,30 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
         this.provenAsset = asset;
         this.provenWallet = provenWallet;
         this.logger.info(`Full prover PXE started`);
-        // Shutdown the current, simulated prover node
+        // Shutdown the current, simulated prover node (by stopping its hosting aztec node)
         this.logger.verbose('Shutting down simulated prover node');
-        await this.simulatedProverNode.stop();
-        // Creating temp store and archiver for fully proven prover node
-        this.logger.verbose('Starting archiver for new prover node');
-        const archiver = await createArchiver({
-            ...this.context.aztecNodeConfig,
-            dataDirectory: undefined
-        }, {
-            blobClient,
-            dateProvider: this.context.dateProvider
-        }, {
-            blockUntilSync: true
-        });
+        await this.simulatedProverAztecNode.stop();
         // The simulated prover node (now shutdown) used private key index 2
         const proverNodePrivateKey = getPrivateKeyFromIndex(2);
+        const proverNodePrivateKeyHex = `0x${proverNodePrivateKey.toString('hex')}`;
         const proverNodeSenderAddress = privateKeyToAddress(new Buffer32(proverNodePrivateKey).toString());
         this.proverAddress = EthAddress.fromString(proverNodeSenderAddress);
         this.logger.verbose(`Funding prover node at ${proverNodeSenderAddress}`);
         await this.mintFeeJuice(proverNodeSenderAddress);
         this.logger.verbose('Starting prover node');
-        const proverConfig = {
-            ...this.context.aztecNodeConfig,
-            txCollectionNodeRpcUrls: [],
+        const sponsoredFPCAddress = await getSponsoredFPCAddress();
+        const { genesis } = await getGenesisValues(this.context.initialFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress), undefined, undefined, this.context.genesis.genesisTimestamp);
+        const proverNodeConfig = {
+            ...config,
+            enableProverNode: true,
+            disableValidator: true,
             dataDirectory: undefined,
+            txCollectionNodeRpcUrls: [],
             proverId: this.proverAddress,
             realProofs: this.realProofs,
             proverAgentCount: 2,
-            publisherPrivateKeys: [
-                new SecretValue(`0x${proverNodePrivateKey.toString('hex')}`)
+            proverPublisherPrivateKeys: [
+                new SecretValue(proverNodePrivateKeyHex)
             ],
             proverNodeMaxPendingJobs: 100,
             proverNodeMaxParallelBlocksPerEpoch: 32,
@@ -198,17 +185,19 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
             txGatheringMaxParallelRequestsPerNode: 100,
             txGatheringTimeoutMs: 24_000,
             proverNodeFailedEpochStore: undefined,
-            proverNodeEpochProvingDelayMs: undefined
+            proverNodeEpochProvingDelayMs: undefined,
+            validatorPrivateKeys: new SecretValue([])
         };
-        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
+        this.proverAztecNode = await AztecNodeService.createAndSync(proverNodeConfig, {
+            dateProvider: this.context.dateProvider,
+            p2pClientDeps: {
+                rpcTxProviders: [
+                    this.aztecNode
+                ]
+            }
         }, {
-            prefilledPublicData
+            genesis
         });
-        await this.proverNode.start();
         this.logger.warn(`Proofs are now enabled`, {
             realProofs: this.realProofs
         });
@@ -235,8 +224,8 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
         for(let i = 0; i < this.provenComponents.length; i++){
             await this.provenComponents[i].teardown();
         }
-        // clean up the full prover node
-        await this.proverNode.stop();
+        // clean up the full prover node (by stopping its hosting aztec node)
+        await this.proverAztecNode.stop();
         await Barretenberg.destroySingleton();
         await this.bbConfigCleanup?.();
         await this.acvmConfigCleanup?.();
@@ -258,18 +247,18 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
         this.logger.info(`Minting complete`);
         const { fakeProofsAsset, accounts: [address], tokenSim } = this;
         tokenSim.mintPublic(address, publicAmount);
-        const publicBalance = await fakeProofsAsset.methods.balance_of_public(address).simulate({
+        const { result: publicBalance } = await fakeProofsAsset.methods.balance_of_public(address).simulate({
             from: address
         });
         this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
         expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(address));
         tokenSim.mintPrivate(address, publicAmount);
-        const privateBalance = await fakeProofsAsset.methods.balance_of_private(address).simulate({
+        const { result: privateBalance } = await fakeProofsAsset.methods.balance_of_private(address).simulate({
             from: address
         });
         this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
         expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(address));
-        const totalSupply = await fakeProofsAsset.methods.total_supply().simulate({
+        const { result: totalSupply } = await fakeProofsAsset.methods.total_supply().simulate({
             from: address
         });
         this.logger.verbose(`Total supply: ${totalSupply}`);

package/dest/fixtures/elu_monitor.d.ts

@@ -0,0 +1,21 @@
+/** Samples event-loop utilization, delay histogram, and heap usage per test, writing columnar text to a file. */
+export declare class EluMonitor {
+    private filePath;
+    private intervalMs;
+    private timer;
+    private lastELU;
+    private histogram;
+    private testName;
+    private testStart;
+    private eluSamples;
+    constructor(filePath: string, intervalMs?: number);
+    /** Begin sampling for a test. Writes a header line and starts the periodic sampler. */
+    startTest(testName: string): void;
+    /** Stop sampling and write a summary line. */
+    stopTest(): void;
+    /** Alias for stopTest — call on process exit to flush any remaining data. */
+    stop(): void;
+    private sample;
+    private writeSummary;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWx1X21vbml0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy9lbHVfbW9uaXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxpSEFBaUg7QUFDakgscUJBQWEsVUFBVTtJQUNyQixPQUFPLENBQUMsUUFBUSxDQUFTO0lBQ3pCLE9BQU8sQ0FBQyxVQUFVLENBQVM7SUFDM0IsT0FBTyxDQUFDLEtBQUssQ0FBNkM7SUFDMUQsT0FBTyxDQUFDLE9BQU8sQ0FBbUM7SUFDbEQsT0FBTyxDQUFDLFNBQVMsQ0FBb0I7SUFDckMsT0FBTyxDQUFDLFFBQVEsQ0FBcUI7SUFDckMsT0FBTyxDQUFDLFNBQVMsQ0FBcUI7SUFDdEMsT0FBTyxDQUFDLFVBQVUsQ0FBZ0I7SUFFbEMsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUFFLFVBQVUsQ0FBQyxFQUFFLE1BQU0sRUFJaEQ7SUFFRCx1RkFBdUY7SUFDdkYsU0FBUyxDQUFDLFFBQVEsRUFBRSxNQUFNLEdBQUcsSUFBSSxDQW1CaEM7SUFFRCw4Q0FBOEM7SUFDOUMsUUFBUSxJQUFJLElBQUksQ0FtQmY7SUFFRCwrRUFBNkU7SUFDN0UsSUFBSSxJQUFJLElBQUksQ0FFWDtJQUVELE9BQU8sQ0FBQyxNQUFNO0lBOEJkLE9BQU8sQ0FBQyxZQUFZO0NBbUJyQiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"elu_monitor.d.ts","sourceRoot":"","sources":["../../src/fixtures/elu_monitor.ts"],"names":[],"mappings":"AAKA,iHAAiH;AACjH,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,KAAK,CAA6C;IAC1D,OAAO,CAAC,OAAO,CAAmC;IAClD,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,QAAQ,CAAqB;IACrC,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,UAAU,CAAgB;IAElC,YAAY,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAIhD;IAED,uFAAuF;IACvF,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAmBhC;IAED,8CAA8C;IAC9C,QAAQ,IAAI,IAAI,CAmBf;IAED,+EAA6E;IAC7E,IAAI,IAAI,IAAI,CAEX;IAED,OAAO,CAAC,MAAM;IA8Bd,OAAO,CAAC,YAAY;CAmBrB"}

package/dest/fixtures/elu_monitor.js

@@ -0,0 +1,102 @@
+import { appendFileSync } from 'node:fs';
+import { monitorEventLoopDelay, performance } from 'node:perf_hooks';
+const NANOS_PER_MS = 1_000_000;
+/** Samples event-loop utilization, delay histogram, and heap usage per test, writing columnar text to a file. */ export class EluMonitor {
+    filePath;
+    intervalMs;
+    timer;
+    lastELU;
+    histogram;
+    testName;
+    testStart;
+    eluSamples = [];
+    constructor(filePath, intervalMs){
+        this.filePath = filePath;
+        this.intervalMs = intervalMs ?? 2000;
+        this.histogram = monitorEventLoopDelay({
+            resolution: 20
+        });
+    }
+    /** Begin sampling for a test. Writes a header line and starts the periodic sampler. */ startTest(testName) {
+        this.stopTest();
+        this.testName = testName;
+        this.testStart = performance.now();
+        this.eluSamples = [];
+        appendFileSync(this.filePath, `\n=== Test: ${testName} ===\n`);
+        appendFileSync(this.filePath, padColumns('TIME', 'ELU', 'EL_DLY_P50', 'EL_DLY_P99', 'EL_DLY_MAX', 'HEAP_MB') + '\n');
+        this.lastELU = performance.eventLoopUtilization();
+        this.histogram.enable();
+        this.timer = setInterval(()=>this.sample(), this.intervalMs);
+        // Allow the process to exit even if the timer is still running.
+        this.timer.unref();
+    }
+    /** Stop sampling and write a summary line. */ stopTest() {
+        if (!this.timer) {
+            return;
+        }
+        // Take a final sample before stopping.
+        this.sample();
+        clearInterval(this.timer);
+        this.timer = undefined;
+        this.histogram.disable();
+        this.histogram.reset();
+        this.writeSummary();
+        this.lastELU = undefined;
+        this.testName = undefined;
+        this.testStart = undefined;
+        this.eluSamples = [];
+    }
+    /** Alias for stopTest — call on process exit to flush any remaining data. */ stop() {
+        this.stopTest();
+    }
+    sample() {
+        const newELU = performance.eventLoopUtilization();
+        const delta = performance.eventLoopUtilization(newELU, this.lastELU);
+        this.lastELU = newELU;
+        const elu = delta.utilization;
+        this.eluSamples.push(elu);
+        const p50 = this.histogram.percentile(50) / NANOS_PER_MS;
+        const p99 = this.histogram.percentile(99) / NANOS_PER_MS;
+        const max = this.histogram.max / NANOS_PER_MS;
+        const heapMb = Math.round(process.memoryUsage().heapUsed / (1024 * 1024));
+        const now = new Date();
+        const time = [
+            now.getHours(),
+            now.getMinutes(),
+            now.getSeconds()
+        ].map((n)=>String(n).padStart(2, '0')).join(':');
+        const line = padColumns(time, elu.toFixed(2), `${p50.toFixed(1)}ms`, `${p99.toFixed(1)}ms`, `${max.toFixed(1)}ms`, String(heapMb));
+        appendFileSync(this.filePath, line + '\n');
+        // Reset histogram so next sample only reflects the new interval.
+        this.histogram.reset();
+    }
+    writeSummary() {
+        if (this.eluSamples.length === 0 || this.testStart === undefined) {
+            return;
+        }
+        const mean = this.eluSamples.reduce((a, b)=>a + b, 0) / this.eluSamples.length;
+        const maxElu = Math.max(...this.eluSamples);
+        const sorted = [
+            ...this.eluSamples
+        ].sort((a, b)=>a - b);
+        const p90Elu = sorted[Math.floor(sorted.length * 0.9)] ?? maxElu;
+        const durationS = ((performance.now() - this.testStart) / 1000).toFixed(1);
+        let summary = `--- Summary: mean_elu=${mean.toFixed(2)} max_elu=${maxElu.toFixed(2)} p90_elu=${p90Elu.toFixed(2)} duration=${durationS}s`;
+        if (maxElu > 0.85) {
+            summary += ' WARNING:ELU>0.85';
+        }
+        summary += ' ---\n';
+        appendFileSync(this.filePath, summary);
+    }
+}
+function padColumns(...cols) {
+    const widths = [
+        11,
+        7,
+        12,
+        12,
+        12,
+        8
+    ];
+    return cols.map((col, i)=>col.padEnd(widths[i] ?? 10)).join('');
+}