@aztec/end-to-end 0.0.1-commit.4d79d1f2d → 0.0.1-commit.4d9804df

package/dest/automine/delivery/onchain_delivery_harness.js

@@ -0,0 +1,141 @@
+import { generateSchnorrAccounts } from '@aztec/accounts/testing';
+import { NO_FROM } from '@aztec/aztec.js/account';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { OnchainDeliveryTestContract } from '@aztec/noir-test-contracts.js/OnchainDeliveryTest';
+import { jest } from '@jest/globals';
+import { AUTOMINE_E2E_OPTS } from '../../fixtures/fixtures.js';
+import { ensureHandshakeRegistryPublished, setup, setupPXEAndGetWallet } from '../../fixtures/setup.js';
+const formatMode = (mode)=>typeof mode === 'string' ? mode : `${mode.events}->${mode.notes}`;
+// Onchain private delivery has two orthogonal axes: the delivery MODE (constrained = nullifier-chained sequence;
+// unconstrained = no nullifier, windowed scan) and the tagging-secret SOURCE, which the wallet's
+// `resolveTaggingSecretStrategy` hook selects. This harness exercises (strategy, mode) cells end to end across two
+// PXEs that share only a node: the sender PXE sends, the recipient PXE discovers purely from onchain logs plus the
+// HandshakeRegistry.
+//
+// Cross-PXE is the meaningful setup: the recipient PXE holds no sender state, so a cell only "discovers" a message if
+// the source truly reached it.
+export function buildMessageDeliveryTest(opts) {
+    const { strategy, mode, senderHook, recipientRegistration, customRequestResponder, additionalTests } = opts;
+    const description = `${strategy} x ${formatMode(mode)}`;
+    describe(description, ()=>{
+        jest.setTimeout(300_000);
+        const eventValues = [
+            10n,
+            20n,
+            30n
+        ];
+        const noteValues = [
+            40n,
+            50n,
+            60n
+        ];
+        let aztecNode;
+        let walletSender;
+        let walletRecipient;
+        let sender;
+        let recipient;
+        let contractSender;
+        let teardownSender;
+        let teardownRecipient;
+        // Discovery results captured in beforeAll, so the assertions in the actual tests below stay pure.
+        // A failure during delivery fails beforeAll loudly instead of being swallowed as an expected red.
+        let discoveredEvents;
+        let readNotes;
+        const { events: eventMode, notes: noteMode } = typeof mode === 'string' ? {
+            events: mode,
+            notes: mode
+        } : mode;
+        const sendEvent = (value)=>eventMode === 'constrained' ? contractSender.methods.emit_event(recipient, value) : contractSender.methods.emit_event_unconstrained(recipient, value);
+        const sendNote = (value)=>noteMode === 'constrained' ? contractSender.methods.emit_note(recipient, value) : contractSender.methods.emit_note_unconstrained(recipient, value);
+        let additionallyFundedAccounts;
+        let recipientAccount;
+        let customRequestCount = 0;
+        beforeAll(async ()=>{
+            // The sender PXE holds the sender and carries this cell's tagging-secret-strategy hook. The recipient is funded
+            // at genesis here but created and deployed on the isolated recipient PXE below, so it carries no sender state
+            // from other cells.
+            ({ aztecNode, additionallyFundedAccounts, wallet: walletSender, accounts: [sender], teardown: teardownSender } = await setup(1, {
+                ...AUTOMINE_E2E_OPTS,
+                additionallyFundedAccounts: await generateSchnorrAccounts(1, 'schnorr'),
+                pxeCreationOptions: {
+                    hooks: {
+                        resolveTaggingSecretStrategy: senderHook,
+                        resolveCustomRequest: async (request)=>{
+                            if (!customRequestResponder) {
+                                throw new Error('A custom request arrived but this test cell has no customRequestResponder configured');
+                            }
+                            if (!recipientAccount) {
+                                throw new Error('A custom request arrived before the recipient wallet was created');
+                            }
+                            customRequestCount++;
+                            const respond = customRequestResponder(walletRecipient, additionallyFundedAccounts[0], await recipientAccount.getCompleteAddress());
+                            return respond(request);
+                        }
+                    }
+                }
+            }));
+            ({ wallet: walletRecipient, teardown: teardownRecipient } = await setupPXEAndGetWallet(aztecNode, aztecNode, {}, undefined, 'pxe-recipient'));
+            recipientAccount = await walletRecipient.createSchnorrAccount(additionallyFundedAccounts[0].secret, additionallyFundedAccounts[0].salt, additionallyFundedAccounts[0].signingKey);
+            await (await recipientAccount.getDeployMethod()).send({
+                from: NO_FROM
+            });
+            recipient = recipientAccount.address;
+            await ensureHandshakeRegistryPublished(walletSender, sender);
+            const { contract: deployed, instance } = await OnchainDeliveryTestContract.deploy(walletSender).send({
+                from: sender
+            });
+            contractSender = deployed;
+            await ensureHandshakeRegistryPublished(walletRecipient, recipient);
+            await walletRecipient.registerContract(instance, OnchainDeliveryTestContract.artifact);
+            await recipientRegistration?.(walletRecipient, recipient, sender);
+            // Constrained sends to one pair are strictly ordered, so deliver one tx at a time. The first send bootstraps the
+            // handshake (when the source is a handshake); the rest reuse it.
+            const blockNumbers = [];
+            for (const value of eventValues){
+                const { receipt } = await sendEvent(value).send({
+                    from: sender
+                });
+                blockNumbers.push(receipt.blockNumber);
+            }
+            for (const value of noteValues){
+                await sendNote(value).send({
+                    from: sender
+                });
+            }
+            await walletRecipient.sync();
+            const events = await walletRecipient.getPrivateEvents(OnchainDeliveryTestContract.events.DeliveryEvent, {
+                contractAddress: contractSender.address,
+                fromBlock: BlockNumber(Math.min(...blockNumbers)),
+                toBlock: BlockNumber(Math.max(...blockNumbers) + 1),
+                scopes: [
+                    recipient
+                ]
+            });
+            discoveredEvents = events.map((e)=>e.event.value);
+            const contractRecipient = OnchainDeliveryTestContract.at(contractSender.address, walletRecipient);
+            const { result } = await contractRecipient.methods.get_note_values(recipient).simulate({
+                from: recipient
+            });
+            readNotes = result.storage.slice(0, Number(result.len));
+        });
+        afterAll(async ()=>{
+            await teardownRecipient();
+            await teardownSender();
+        });
+        it('the recipient PXE discovers the events delivered by the sender PXE', ()=>{
+            expect(discoveredEvents.length).toBe(eventValues.length);
+            for (const value of eventValues){
+                expect(discoveredEvents).toContainEqual(value);
+            }
+        });
+        it('the recipient PXE reads back the notes delivered by the sender PXE', ()=>{
+            expect(readNotes).toEqual(noteValues);
+        });
+        if (customRequestResponder) {
+            it('the custom request hook fires exactly once, on the send that bootstraps the tagging secret', ()=>{
+                expect(customRequestCount).toBe(1);
+            });
+        }
+        additionalTests?.();
+    });
+}

package/dest/automine/token/blacklist_token_contract_test.d.ts

@@ -0,0 +1,49 @@
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { Fr } from '@aztec/aztec.js/fields';
+import type { TxHash } from '@aztec/aztec.js/tx';
+import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
+import { GenericProxyContract } from '@aztec/noir-test-contracts.js/GenericProxy';
+import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
+import { TokenSimulator } from '../../simulators/token_simulator.js';
+import { AutomineTestContext, type AutomineTestOpts } from '../automine_test_context.js';
+export declare class Role {
+    private isAdmin;
+    private isMinter;
+    private isBlacklisted;
+    withAdmin(): this;
+    withMinter(): this;
+    withBlacklisted(): this;
+    toNoirStruct(): {
+        is_admin: boolean;
+        is_minter: boolean;
+        is_blacklisted: boolean;
+    };
+}
+/**
+ * TokenBlacklist-domain harness over the automine topology: extends {@link AutomineTestContext} with a
+ * {@link TokenSimulator}, the {@link Role} helper, the TokenBlacklist deploy plus a bad-account and
+ * authwit proxy, and the role-change-delay warp. Base setup and mint run in {@link setup}.
+ */
+export declare class BlacklistTokenContractTest extends AutomineTestContext {
+    static CHANGE_ROLES_DELAY: number;
+    asset: TokenBlacklistContract;
+    tokenSim: TokenSimulator;
+    badAccount: InvalidAccountContract;
+    authwitProxy: GenericProxyContract;
+    adminAddress: AztecAddress;
+    otherAddress: AztecAddress;
+    blacklistedAddress: AztecAddress;
+    private testName;
+    constructor(testName: string);
+    crossTimestampOfChange(): Promise<void>;
+    /**
+     * Applies base setup:
+     * 1. Add 3 accounts.
+     * 2. Publicly deploy accounts, deploy token contract and a "bad account".
+     */
+    applyBaseSetup(): Promise<void>;
+    setup(opts?: AutomineTestOpts): Promise<void>;
+    addPendingShieldNoteToPXE(contract: TokenBlacklistContract, recipient: AztecAddress, amount: bigint, secretHash: Fr, txHash: TxHash): Promise<void>;
+    applyMint(): Promise<void>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0X3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hdXRvbWluZS90b2tlbi9ibGFja2xpc3RfdG9rZW5fY29udHJhY3RfdGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFekQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTVDLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRWpELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ2pGLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBQ2xGLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBS3RGLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUNyRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsS0FBSyxnQkFBZ0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRXpGLHFCQUFhLElBQUk7SUFDZixPQUFPLENBQUMsT0FBTyxDQUFTO0lBQ3hCLE9BQU8sQ0FBQyxRQUFRLENBQVM7SUFDekIsT0FBTyxDQUFDLGFBQWEsQ0FBUztJQUU5QixTQUFTLFNBR1I7SUFFRCxVQUFVLFNBR1Q7SUFFRCxlQUFlLFNBR2Q7SUFFRCxZQUFZOzs7O01BSVg7Q0FDRjtBQUVEOzs7O0dBSUc7QUFDSCxxQkFBYSwwQkFBMkIsU0FBUSxtQkFBbUI7SUFFakUsTUFBTSxDQUFDLGtCQUFrQixTQUFTO0lBRWxDLEtBQUssRUFBRyxzQkFBc0IsQ0FBQztJQUMvQixRQUFRLEVBQUcsY0FBYyxDQUFDO0lBQzFCLFVBQVUsRUFBRyxzQkFBc0IsQ0FBQztJQUNwQyxZQUFZLEVBQUcsb0JBQW9CLENBQUM7SUFFcEMsWUFBWSxFQUFHLFlBQVksQ0FBQztJQUM1QixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLGtCQUFrQixFQUFHLFlBQVksQ0FBQztJQUVsQyxPQUFPLENBQUMsUUFBUSxDQUFTO0lBRXpCLFlBQVksUUFBUSxFQUFFLE1BQU0sRUFHM0I7SUFFSyxzQkFBc0Isa0JBRTNCO0lBRUQ7Ozs7T0FJRztJQUNHLGNBQWMsa0JBZ0RuQjtJQUVjLEtBQUssQ0FBQyxJQUFJLEdBQUUsZ0JBQXFCLGlCQUsvQztJQUVLLHlCQUF5QixDQUM3QixRQUFRLEVBQUUsc0JBQXNCLEVBQ2hDLFNBQVMsRUFBRSxZQUFZLEVBQ3ZCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsVUFBVSxFQUFFLEVBQUUsRUFDZCxNQUFNLEVBQUUsTUFBTSxpQkFjZjtJQUVLLFNBQVMsa0JBbURkO0NBQ0YifQ==

package/dest/automine/token/blacklist_token_contract_test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"blacklist_token_contract_test.d.ts","sourceRoot":"","sources":["../../../src/automine/token/blacklist_token_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAE5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AAKtF,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,KAAK,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAEzF,qBAAa,IAAI;IACf,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAE9B,SAAS,SAGR;IAED,UAAU,SAGT;IAED,eAAe,SAGd;IAED,YAAY;;;;MAIX;CACF;AAED;;;;GAIG;AACH,qBAAa,0BAA2B,SAAQ,mBAAmB;IAEjE,MAAM,CAAC,kBAAkB,SAAS;IAElC,KAAK,EAAG,sBAAsB,CAAC;IAC/B,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,sBAAsB,CAAC;IACpC,YAAY,EAAG,oBAAoB,CAAC;IAEpC,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,kBAAkB,EAAG,YAAY,CAAC;IAElC,OAAO,CAAC,QAAQ,CAAS;IAEzB,YAAY,QAAQ,EAAE,MAAM,EAG3B;IAEK,sBAAsB,kBAE3B;IAED;;;;OAIG;IACG,cAAc,kBAgDnB;IAEc,KAAK,CAAC,IAAI,GAAE,gBAAqB,iBAK/C;IAEK,yBAAyB,CAC7B,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,EACd,MAAM,EAAE,MAAM,iBAcf;IAEK,SAAS,kBAmDd;CACF"}

package/dest/{e2e_blacklist_token_contract → automine/token}/blacklist_token_contract_test.js

@@ -5,8 +5,9 @@ import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist'
 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 { TokenSimulator } from '../simulators/token_simulator.js';
+import { ensureAuthRegistryPublished } from '../../fixtures/setup.js';
+import { TokenSimulator } from '../../simulators/token_simulator.js';
+import { AutomineTestContext } from '../automine_test_context.js';
 export class Role {
     isAdmin = false;
     isMinter = false;
@@ -33,94 +34,80 @@ export class Role {
         };
     }
 }
-export class BlacklistTokenContractTest {
+/**
+ * TokenBlacklist-domain harness over the automine topology: extends {@link AutomineTestContext} with a
+ * {@link TokenSimulator}, the {@link Role} helper, the TokenBlacklist deploy plus a bad-account and
+ * authwit proxy, and the role-change-delay warp. Base setup and mint run in {@link setup}.
+ */ export class BlacklistTokenContractTest extends AutomineTestContext {
     // This value MUST match the same value that we have in the contract
     static CHANGE_ROLES_DELAY = 86400;
-    context;
-    logger;
-    wallet;
     asset;
     tokenSim;
     badAccount;
-    proxy;
-    cheatCodes;
-    sequencer;
-    aztecNode;
+    authwitProxy;
     adminAddress;
     otherAddress;
     blacklistedAddress;
+    testName;
     constructor(testName){
-        this.logger = createLogger(`e2e:e2e_blacklist_token_contract:${testName}`);
+        super();
+        this.testName = testName;
     }
     async crossTimestampOfChange() {
-        await this.cheatCodes.warpL2TimeAtLeastBy(this.sequencer, this.aztecNode, BlacklistTokenContractTest.CHANGE_ROLES_DELAY);
+        await this.markProvenAndWarp(BlacklistTokenContractTest.CHANGE_ROLES_DELAY);
     }
     /**
    * Applies base setup:
    * 1. Add 3 accounts.
    * 2. Publicly deploy accounts, deploy token contract and a "bad account".
    */ async applyBaseSetup() {
-        // Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
-        jest.setTimeout(120_000);
-        this.logger.info('Deploying 3 accounts');
-        const { deployedAccounts } = await deployAccounts(3, this.logger)({
-            wallet: this.context.wallet,
-            initialFundedAccounts: this.context.initialFundedAccounts
-        });
+        // Bumped from 2 min: pipelined cadence (~24s/dependent-tx) makes the 3-account deploy plus token/bad-account/
+        // proxy deploys exceed the original window.
+        jest.setTimeout(600_000);
         this.cheatCodes = this.context.cheatCodes;
         this.aztecNode = this.context.aztecNodeService;
         this.sequencer = this.context.sequencer;
         this.wallet = this.context.wallet;
-        this.adminAddress = deployedAccounts[0].address;
-        this.otherAddress = deployedAccounts[1].address;
-        this.blacklistedAddress = deployedAccounts[2].address;
+        [this.adminAddress, this.otherAddress, this.blacklistedAddress] = this.context.accounts;
         this.logger.info('Setting up blacklist token contract');
-        // Create the token contract state.
-        this.logger.verbose(`Public deploy accounts...`);
-        await publicDeployAccounts(this.wallet, [
-            this.adminAddress,
-            this.otherAddress,
-            this.blacklistedAddress
-        ]);
+        await ensureAuthRegistryPublished(this.wallet, this.adminAddress);
         this.logger.verbose(`Deploying TokenContract...`);
-        this.asset = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress).send({
+        ({ contract: this.asset } = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress).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...`);
-        this.proxy = await GenericProxyContract.deploy(this.wallet).send({
+        ({ contract: this.authwitProxy } = await GenericProxyContract.deploy(this.wallet).send({
             from: this.adminAddress
-        });
-        this.logger.verbose(`Deployed to ${this.proxy.address}.`);
+        }));
+        this.logger.verbose(`Deployed to ${this.authwitProxy.address}.`);
         await this.crossTimestampOfChange();
         this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
             this.adminAddress,
             this.otherAddress,
             this.blacklistedAddress
         ]);
-        expect(await this.asset.methods.get_roles(this.adminAddress).simulate({
+        expect((await this.asset.methods.get_roles(this.adminAddress).simulate({
             from: this.adminAddress
-        })).toEqual(new Role().withAdmin().toNoirStruct());
+        })).result).toEqual(new Role().withAdmin().toNoirStruct());
     }
-    async setup() {
-        this.logger.info('Setting up fresh context');
-        this.context = await setup(0, {
-            fundSponsoredFPC: true,
-            skipAccountDeployment: true
+    async setup(opts = {}) {
+        await super.setup({
+            numberOfAccounts: 3,
+            ...opts
         });
+        // hydrateFromContext repoints `this.logger` at the context logger; restore the harness-named one.
+        this.logger = createLogger(`e2e:automine:blacklist:${this.testName}`);
         await this.applyBaseSetup();
     }
-    async teardown() {
-        await teardown(this.context);
-    }
     async addPendingShieldNoteToPXE(contract, recipient, amount, secretHash, txHash) {
         const txEffects = await this.aztecNode.getTxEffect(txHash);
         await contract.methods.process_transparent_note(contract.address, amount, secretHash, txHash.hash, txEffects.data.noteHashes, txEffects.data.nullifiers[0], recipient).simulate({
@@ -140,9 +127,9 @@ export class BlacklistTokenContractTest {
             from: this.adminAddress
         });
         await this.crossTimestampOfChange();
-        expect(await this.asset.methods.get_roles(this.adminAddress).simulate({
+        expect((await this.asset.methods.get_roles(this.adminAddress).simulate({
             from: this.adminAddress
-        })).toEqual(adminMinterRole.toNoirStruct());
+        })).result).toEqual(adminMinterRole.toNoirStruct());
         this.logger.verbose(`Minting ${amount} publicly...`);
         await asset.methods.mint_public(this.adminAddress, amount).send({
             from: this.adminAddress
@@ -150,7 +137,7 @@ export class BlacklistTokenContractTest {
         this.logger.verbose(`Minting ${amount} privately...`);
         const secret = Fr.random();
         const secretHash = await computeSecretHash(secret);
-        const receipt = await asset.methods.mint_private(amount, secretHash).send({
+        const { receipt } = await asset.methods.mint_private(amount, secretHash).send({
             from: this.adminAddress
         });
         await this.addPendingShieldNoteToPXE(asset, this.adminAddress, amount, secretHash, receipt.txHash);
@@ -159,18 +146,18 @@ export class BlacklistTokenContractTest {
         });
         this.logger.verbose(`Minting complete.`);
         tokenSim.mintPublic(this.adminAddress, amount);
-        const publicBalance = await asset.methods.balance_of_public(this.adminAddress).simulate({
+        const { result: publicBalance } = await asset.methods.balance_of_public(this.adminAddress).simulate({
             from: this.adminAddress
         });
         this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
         expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(this.adminAddress));
         tokenSim.mintPrivate(this.adminAddress, amount);
-        const privateBalance = await asset.methods.balance_of_private(this.adminAddress).simulate({
+        const { result: privateBalance } = await asset.methods.balance_of_private(this.adminAddress).simulate({
             from: this.adminAddress
         });
         this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
         expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(this.adminAddress));
-        const totalSupply = await asset.methods.total_supply().simulate({
+        const { result: totalSupply } = await asset.methods.total_supply().simulate({
             from: this.adminAddress
         });
         this.logger.verbose(`Total supply: ${totalSupply}`);

package/dest/automine/token/token_contract_test.d.ts

@@ -0,0 +1,40 @@
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+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 { TokenSimulator } from '../../simulators/token_simulator.js';
+import { AutomineTestContext, type AutomineTestOpts } from '../automine_test_context.js';
+/**
+ * Token-domain harness over the automine topology: extends {@link AutomineTestContext} with a
+ * {@link TokenSimulator}, the USDC Token deploy plus a bad-account and authwit proxy, and an optional
+ * mint. Base setup is opt-in via {@link applyBaseSnapshots} (run during `setup()`); {@link applyMint}
+ * is called explicitly after `setup()`.
+ */
+export declare class TokenContractTest extends AutomineTestContext {
+    static TOKEN_NAME: string;
+    static TOKEN_SYMBOL: string;
+    static TOKEN_DECIMALS: bigint;
+    metricsPort?: number;
+    asset: TokenContract;
+    tokenSim: TokenSimulator;
+    node: AztecNode;
+    badAccount: InvalidAccountContract;
+    authwitProxy: GenericProxyContract;
+    adminAddress: AztecAddress;
+    otherAddress: AztecAddress;
+    account2Address: AztecAddress;
+    private shouldApplyBaseSetup;
+    private testName;
+    constructor(testName: string);
+    /**
+     * Registers that base setup should be applied during setup().
+     * Call this before setup() to deploy 3 accounts, publicly deploy accounts, token contract and a "bad account".
+     */
+    applyBaseSnapshots(): void;
+    private applyBaseSetup;
+    setup(opts?: AutomineTestOpts): Promise<void>;
+    /** Mints an initial public and private balance to the admin account. Call after {@link setup}. */
+    applyMint(): Promise<void>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5fY29udHJhY3RfdGVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2F1dG9taW5lL3Rva2VuL3Rva2VuX2NvbnRyYWN0X3Rlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXpELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUMvRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQUNsRixPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQU10RixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDckUsT0FBTyxFQUFFLG1CQUFtQixFQUFFLEtBQUssZ0JBQWdCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUl6Rjs7Ozs7R0FLRztBQUNILHFCQUFhLGlCQUFrQixTQUFRLG1CQUFtQjtJQUN4RCxNQUFNLENBQUMsVUFBVSxTQUFVO0lBQzNCLE1BQU0sQ0FBQyxZQUFZLFNBQVM7SUFDNUIsTUFBTSxDQUFDLGNBQWMsU0FBTztJQUM1QixXQUFXLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDckIsS0FBSyxFQUFHLGFBQWEsQ0FBQztJQUN0QixRQUFRLEVBQUcsY0FBYyxDQUFDO0lBQzFCLElBQUksRUFBRyxTQUFTLENBQUM7SUFFakIsVUFBVSxFQUFHLHNCQUFzQixDQUFDO0lBQ3BDLFlBQVksRUFBRyxvQkFBb0IsQ0FBQztJQUNwQyxZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsZUFBZSxFQUFHLFlBQVksQ0FBQztJQUUvQixPQUFPLENBQUMsb0JBQW9CLENBQVM7SUFDckMsT0FBTyxDQUFDLFFBQVEsQ0FBUztJQUV6QixZQUFZLFFBQVEsRUFBRSxNQUFNLEVBSTNCO0lBRUQ7OztPQUdHO0lBQ0gsa0JBQWtCLFNBRWpCO1lBS2EsY0FBYztJQThDYixLQUFLLENBQUMsSUFBSSxHQUFFLGdCQUFxQixpQkFRL0M7SUFFRCxrR0FBa0c7SUFDNUYsU0FBUyxrQkE4QmQ7Q0FDRiJ9

package/dest/automine/token/token_contract_test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"token_contract_test.d.ts","sourceRoot":"","sources":["../../../src/automine/token/token_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,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;AAMtF,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,KAAK,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAIzF;;;;;GAKG;AACH,qBAAa,iBAAkB,SAAQ,mBAAmB;IACxD,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,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,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,eAAe,EAAG,YAAY,CAAC;IAE/B,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAS;IAEzB,YAAY,QAAQ,EAAE,MAAM,EAI3B;IAED;;;OAGG;IACH,kBAAkB,SAEjB;YAKa,cAAc;IA8Cb,KAAK,CAAC,IAAI,GAAE,gBAAqB,iBAQ/C;IAED,kGAAkG;IAC5F,SAAS,kBA8Bd;CACF"}

package/dest/{e2e_token_contract → automine/token}/token_contract_test.js

@@ -3,30 +3,34 @@ 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 { mintTokensToPrivate } from '../fixtures/token_utils.js';
-import { TokenSimulator } from '../simulators/token_simulator.js';
+import { ensureAuthRegistryPublished } from '../../fixtures/setup.js';
+import { mintTokensToPrivate } from '../../fixtures/token_utils.js';
+import { TokenSimulator } from '../../simulators/token_simulator.js';
+import { AutomineTestContext } from '../automine_test_context.js';
 const { METRICS_PORT: metricsPort } = process.env;
-export class TokenContractTest {
+/**
+ * Token-domain harness over the automine topology: extends {@link AutomineTestContext} with a
+ * {@link TokenSimulator}, the USDC Token deploy plus a bad-account and authwit proxy, and an optional
+ * mint. Base setup is opt-in via {@link applyBaseSnapshots} (run during `setup()`); {@link applyMint}
+ * is called explicitly after `setup()`.
+ */ export class TokenContractTest extends AutomineTestContext {
     static TOKEN_NAME = 'USDC';
     static TOKEN_SYMBOL = 'USD';
     static TOKEN_DECIMALS = 18n;
-    context;
-    logger;
     metricsPort;
     asset;
     tokenSim;
     node;
     badAccount;
-    proxy;
-    wallet;
+    authwitProxy;
     adminAddress;
-    account1Address;
+    otherAddress;
     account2Address;
     shouldApplyBaseSetup = false;
-    shouldApplyMint = false;
+    testName;
     constructor(testName){
-        this.logger = createLogger(`e2e:e2e_token_contract:${testName}`);
+        super();
+        this.testName = testName;
         this.metricsPort = metricsPort ? parseInt(metricsPort) : undefined;
     }
     /**
@@ -36,73 +40,54 @@ export class TokenContractTest {
         this.shouldApplyBaseSetup = true;
     }
     /**
-   * Registers that mint should be applied during setup().
-   * Call this before setup() to mint tokens to the admin account.
-   */ applyMintSnapshot() {
-        this.shouldApplyMint = true;
-    }
-    /**
    * Applies base setup: deploys 3 accounts, publicly deploys accounts, token contract and a "bad account".
    */ async applyBaseSetup() {
         // Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
         jest.setTimeout(120_000);
-        this.logger.info('Applying base setup - deploying 3 accounts');
-        const { deployedAccounts } = await deployAccounts(3, this.logger)({
-            wallet: this.context.wallet,
-            initialFundedAccounts: this.context.initialFundedAccounts
-        });
         this.node = this.context.aztecNodeService;
         this.wallet = this.context.wallet;
-        [this.adminAddress, this.account1Address, this.account2Address] = deployedAccounts.map((acc)=>acc.address);
+        [this.adminAddress, this.otherAddress, this.account2Address] = this.context.accounts;
         this.logger.info('Applying base setup - deploying token contract');
-        this.logger.verbose(`Public deploy accounts...`);
-        await publicDeployAccounts(this.wallet, [
-            this.adminAddress,
-            this.account1Address
-        ]);
+        await ensureAuthRegistryPublished(this.wallet, this.adminAddress);
         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...`);
-        this.proxy = await GenericProxyContract.deploy(this.wallet).send({
+        ({ contract: this.authwitProxy } = await GenericProxyContract.deploy(this.wallet).send({
             from: this.adminAddress
-        });
-        this.logger.verbose(`Deployed to ${this.proxy.address}.`);
+        }));
+        this.logger.verbose(`Deployed to ${this.authwitProxy.address}.`);
         this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
             this.adminAddress,
-            this.account1Address
+            this.otherAddress
         ]);
-        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() {
-        this.context = await setup(0, {
+    async setup(opts = {}) {
+        await super.setup({
+            numberOfAccounts: 3,
             metricsPort: this.metricsPort,
-            fundSponsoredFPC: true,
-            skipAccountDeployment: true
+            ...opts
         });
+        // hydrateFromContext repoints `this.logger` at the context logger; restore the harness-named one.
+        this.logger = createLogger(`e2e:automine:token:${this.testName}`);
         if (this.shouldApplyBaseSetup) {
             await this.applyBaseSetup();
         }
-        if (this.shouldApplyMint) {
-            await this.applyMint();
-        }
-    }
-    async teardown() {
-        await teardown(this.context);
     }
-    async applyMint() {
+    /** Mints an initial public and private balance to the admin account. Call after {@link setup}. */ async applyMint() {
         this.logger.info('Applying mint setup');
         const { asset, adminAddress, tokenSim } = this;
         const amount = 10000n;
@@ -111,7 +96,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}`);
@@ -119,12 +104,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}`);