@aztec/txe 0.0.1-commit.24de95ac → 0.0.1-commit.2606882

package/dest/state_machine/global_variable_builder.js

@@ -1,10 +1,28 @@
-import { GasFees } from '@aztec/stdlib/gas';
+import { times } from '@aztec/foundation/collection';
+import { FEE_ORACLE_LAG, GasFees } from '@aztec/stdlib/gas';
 import { makeGlobalVariables } from '@aztec/stdlib/testing';
-export class TXEGlobalVariablesBuilder {
-    getCurrentBaseFees() {
+/** Simple FeeProvider for TXE that returns zero fees. */ export class TXEFeeProvider {
+    getCurrentMinFees() {
         return Promise.resolve(new GasFees(0, 0));
     }
+    getPredictedMinFees() {
+        return Promise.resolve(times(FEE_ORACLE_LAG, ()=>new GasFees(0, 0)));
+    }
+}
+export class TXEGlobalVariablesBuilder {
     buildGlobalVariables(_blockNumber, _coinbase, _feeRecipient, _slotNumber) {
         return Promise.resolve(makeGlobalVariables());
     }
+    buildCheckpointGlobalVariables(_coinbase, _feeRecipient, _slotNumber, _simulationOverridesPlan) {
+        const vars = makeGlobalVariables();
+        return Promise.resolve({
+            chainId: vars.chainId,
+            version: vars.version,
+            slotNumber: vars.slotNumber,
+            timestamp: vars.timestamp,
+            coinbase: vars.coinbase,
+            feeRecipient: vars.feeRecipient,
+            gasFees: vars.gasFees
+        });
+    }
 }

package/dest/state_machine/index.d.ts

@@ -1,6 +1,6 @@
-import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import { SyncDataProvider } from '@aztec/pxe/server';
-import { type L2Block } from '@aztec/stdlib/block';
+import { type AnchorBlockStore, type ContractStore, ContractSyncService, type NoteStore } from '@aztec/pxe/server';
+import { MessageContextService } from '@aztec/pxe/simulator';
+import { L2Block, type L2TipsProvider } from '@aztec/stdlib/block';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import { TXEArchiver } from './archiver.js';
 import { TXESynchronizer } from './synchronizer.js';
@@ -8,9 +8,13 @@ export declare class TXEStateMachine {
     node: AztecNode;
     synchronizer: TXESynchronizer;
     archiver: TXEArchiver;
-    syncDataProvider: SyncDataProvider;
-    constructor(node: AztecNode, synchronizer: TXESynchronizer, archiver: TXEArchiver, syncDataProvider: SyncDataProvider);
-    static create(db: AztecAsyncKVStore): Promise<TXEStateMachine>;
+    anchorBlockStore: AnchorBlockStore;
+    contractSyncService: ContractSyncService;
+    messageContextService: MessageContextService;
+    constructor(node: AztecNode, synchronizer: TXESynchronizer, archiver: TXEArchiver, anchorBlockStore: AnchorBlockStore, contractSyncService: ContractSyncService, messageContextService: MessageContextService);
+    static create(archiver: TXEArchiver, anchorBlockStore: AnchorBlockStore, contractStore: ContractStore, noteStore: NoteStore): Promise<TXEStateMachine>;
+    /** Returns an {@link L2TipsProvider} backed by this node's chain tips. */
+    get l2TipsProvider(): L2TipsProvider;
     handleL2Block(block: L2Block): Promise<void>;
 }
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdGF0ZV9tYWNoaW5lL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBLE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUFFLEtBQUssYUFBYSxFQUFFLG1CQUFtQixFQUFFLEtBQUssU0FBUyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDbkgsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDN0QsT0FBTyxFQUFFLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRW5FLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR2pFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFJNUMsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBUXBELHFCQUFhLGVBQWU7SUFFakIsSUFBSSxFQUFFLFNBQVM7SUFDZixZQUFZLEVBQUUsZUFBZTtJQUM3QixRQUFRLEVBQUUsV0FBVztJQUNyQixnQkFBZ0IsRUFBRSxnQkFBZ0I7SUFDbEMsbUJBQW1CLEVBQUUsbUJBQW1CO0lBQ3hDLHFCQUFxQixFQUFFLHFCQUFxQjtJQU5yRCxZQUNTLElBQUksRUFBRSxTQUFTLEVBQ2YsWUFBWSxFQUFFLGVBQWUsRUFDN0IsUUFBUSxFQUFFLFdBQVcsRUFDckIsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLG1CQUFtQixFQUFFLG1CQUFtQixFQUN4QyxxQkFBcUIsRUFBRSxxQkFBcUIsRUFDakQ7SUFFSixPQUFvQixNQUFNLENBQ3hCLFFBQVEsRUFBRSxXQUFXLEVBQ3JCLGdCQUFnQixFQUFFLGdCQUFnQixFQUNsQyxhQUFhLEVBQUUsYUFBYSxFQUM1QixTQUFTLEVBQUUsU0FBUyw0QkF5Q3JCO0lBRUQsMEVBQTBFO0lBQzFFLElBQVcsY0FBYyxJQUFJLGNBQWMsQ0FRMUM7SUFFWSxhQUFhLENBQUMsS0FBSyxFQUFFLE9BQU8saUJBeUN4QztDQUNGIn0=

package/dest/state_machine/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/state_machine/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,OAAO,EAAoB,MAAM,qBAAqB,CAAC;AACrE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAKpD,qBAAa,eAAe;IAEjB,IAAI,EAAE,SAAS;IACf,YAAY,EAAE,eAAe;IAC7B,QAAQ,EAAE,WAAW;IACrB,gBAAgB,EAAE,gBAAgB;gBAHlC,IAAI,EAAE,SAAS,EACf,YAAY,EAAE,eAAe,EAC7B,QAAQ,EAAE,WAAW,EACrB,gBAAgB,EAAE,gBAAgB;WAGvB,MAAM,CAAC,EAAE,EAAE,iBAAiB;IAiCnC,aAAa,CAAC,KAAK,EAAE,OAAO;CAiB1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/state_machine/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,aAAa,EAAE,mBAAmB,EAAE,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnH,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAQpD,qBAAa,eAAe;IAEjB,IAAI,EAAE,SAAS;IACf,YAAY,EAAE,eAAe;IAC7B,QAAQ,EAAE,WAAW;IACrB,gBAAgB,EAAE,gBAAgB;IAClC,mBAAmB,EAAE,mBAAmB;IACxC,qBAAqB,EAAE,qBAAqB;IANrD,YACS,IAAI,EAAE,SAAS,EACf,YAAY,EAAE,eAAe,EAC7B,QAAQ,EAAE,WAAW,EACrB,gBAAgB,EAAE,gBAAgB,EAClC,mBAAmB,EAAE,mBAAmB,EACxC,qBAAqB,EAAE,qBAAqB,EACjD;IAEJ,OAAoB,MAAM,CACxB,QAAQ,EAAE,WAAW,EACrB,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,4BAyCrB;IAED,0EAA0E;IAC1E,IAAW,cAAc,IAAI,cAAc,CAQ1C;IAEY,aAAa,CAAC,KAAK,EAAE,OAAO,iBAyCxC;CACF"}

package/dest/state_machine/index.js

@@ -1,51 +1,86 @@
 import { AztecNodeService } from '@aztec/aztec-node';
 import { TestCircuitVerifier } from '@aztec/bb-prover/test';
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
-import { SyncDataProvider } from '@aztec/pxe/server';
-import { PublishedL2Block } from '@aztec/stdlib/block';
-import { getPackageVersion } from '@aztec/stdlib/update-checker';
-import { TXEArchiver } from './archiver.js';
+import { ContractSyncService } from '@aztec/pxe/server';
+import { MessageContextService } from '@aztec/pxe/simulator';
+import { Checkpoint, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { DummyP2P } from './dummy_p2p_client.js';
-import { TXEGlobalVariablesBuilder } from './global_variable_builder.js';
+import { TXEFeeProvider, TXEGlobalVariablesBuilder } from './global_variable_builder.js';
 import { MockEpochCache } from './mock_epoch_cache.js';
 import { TXESynchronizer } from './synchronizer.js';
 const VERSION = 1;
 const CHAIN_ID = 1;
+// Hardcoded so the bundled TXE doesn't try to read stdlib's package.json at a relative path
+// that becomes invalid once bundled
+const PACKAGE_VERSION = 'txe';
 export class TXEStateMachine {
     node;
     synchronizer;
     archiver;
-    syncDataProvider;
-    constructor(node, synchronizer, archiver, syncDataProvider){
+    anchorBlockStore;
+    contractSyncService;
+    messageContextService;
+    constructor(node, synchronizer, archiver, anchorBlockStore, contractSyncService, messageContextService){
         this.node = node;
         this.synchronizer = synchronizer;
         this.archiver = archiver;
-        this.syncDataProvider = syncDataProvider;
+        this.anchorBlockStore = anchorBlockStore;
+        this.contractSyncService = contractSyncService;
+        this.messageContextService = messageContextService;
     }
-    static async create(db) {
-        const archiver = new TXEArchiver(db);
+    static async create(archiver, anchorBlockStore, contractStore, noteStore) {
         const synchronizer = await TXESynchronizer.create();
-        const syncDataProvider = new SyncDataProvider(db);
         const aztecNodeConfig = {};
         const log = createLogger('txe_node');
-        const node = new AztecNodeService(aztecNodeConfig, new DummyP2P(), archiver, archiver, archiver, archiver, synchronizer, undefined, undefined, undefined, undefined, VERSION, CHAIN_ID, new TXEGlobalVariablesBuilder(), new MockEpochCache(), getPackageVersion() ?? '', new TestCircuitVerifier(), undefined, log);
-        return new this(node, synchronizer, archiver, syncDataProvider);
+        const node = new AztecNodeService(aztecNodeConfig, new DummyP2P(), archiver, archiver, archiver, archiver, synchronizer, undefined, undefined, undefined, undefined, async ()=>{}, VERSION, CHAIN_ID, new TXEGlobalVariablesBuilder(), new TXEFeeProvider(), new MockEpochCache(), PACKAGE_VERSION, new TestCircuitVerifier(), new TestCircuitVerifier(), undefined, log);
+        const contractSyncService = new ContractSyncService(node, contractStore, noteStore, createLogger('txe:contract_sync'));
+        const messageContextService = new MessageContextService(node);
+        return new this(node, synchronizer, archiver, anchorBlockStore, contractSyncService, messageContextService);
+    }
+    /** Returns an {@link L2TipsProvider} backed by this node's chain tips. */ get l2TipsProvider() {
+        const node = this.node;
+        return {
+            getL2Tips: async ()=>{
+                const tips = await node.getChainTips();
+                return {
+                    ...tips,
+                    proposedCheckpoint: tips.checkpointed
+                };
+            }
+        };
     }
     async handleL2Block(block) {
+        // Create a checkpoint from the block manually.
+        // TXE uses 1-block-per-checkpoint for testing simplicity, so we can use block number as checkpoint number.
+        // This uses the deprecated fromBlockNumber method intentionally for the TXE testing environment.
+        const checkpointNumber = CheckpointNumber.fromBlockNumber(block.number);
+        const checkpoint = new Checkpoint(block.archive, CheckpointHeader.from({
+            lastArchiveRoot: block.header.lastArchive.root,
+            inHash: Fr.ZERO,
+            blobsHash: Fr.ZERO,
+            blockHeadersHash: Fr.ZERO,
+            epochOutHash: Fr.ZERO,
+            slotNumber: block.header.globalVariables.slotNumber,
+            timestamp: block.header.globalVariables.timestamp,
+            coinbase: block.header.globalVariables.coinbase,
+            feeRecipient: block.header.globalVariables.feeRecipient,
+            gasFees: block.header.globalVariables.gasFees,
+            totalManaUsed: block.header.totalManaUsed
+        }), [
+            block
+        ], checkpointNumber);
+        const publishedCheckpoint = new PublishedCheckpoint(checkpoint, new L1PublishedData(BigInt(block.header.globalVariables.blockNumber), block.header.globalVariables.timestamp, block.header.globalVariables.blockNumber.toString()), []);
+        // Wipe contract sync cache when anchor block changes (mirrors BlockSynchronizer behavior)
+        this.contractSyncService.wipe();
         await Promise.all([
             this.synchronizer.handleL2Block(block),
-            this.archiver.addBlocks([
-                PublishedL2Block.fromFields({
-                    block,
-                    l1: {
-                        blockHash: block.header.globalVariables.blockNumber.toString(),
-                        blockNumber: BigInt(block.header.globalVariables.blockNumber),
-                        timestamp: block.header.globalVariables.timestamp
-                    },
-                    attestations: []
-                })
-            ]),
-            this.syncDataProvider.setHeader(block.getBlockHeader())
+            this.archiver.addCheckpoints([
+                publishedCheckpoint
+            ], undefined),
+            this.anchorBlockStore.setHeader(block.header)
         ]);
     }
 }

package/dest/state_machine/mock_epoch_cache.d.ts

@@ -1,25 +1,42 @@
 import type { EpochAndSlot, EpochCacheInterface, EpochCommitteeInfo, SlotTag } from '@aztec/epoch-cache';
+import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 /**
  * Mock implementation of the EpochCacheInterface used to satisfy dependencies of AztecNodeService.
  * Since in TXE we don't validate transactions, mock suffices here.
  */
 export declare class MockEpochCache implements EpochCacheInterface {
-    getCommittee(): Promise<EpochCommitteeInfo>;
-    getEpochAndSlotNow(): EpochAndSlot;
+    getCommittee(_slot?: SlotTag): Promise<EpochCommitteeInfo>;
+    getSlotNow(): SlotNumber;
+    getTargetSlot(): SlotNumber;
+    getEpochNow(): EpochNumber;
+    getTargetEpoch(): EpochNumber;
+    getEpochAndSlotNow(): EpochAndSlot & {
+        nowMs: bigint;
+    };
     getEpochAndSlotInNextL1Slot(): EpochAndSlot & {
-        now: bigint;
+        nowSeconds: bigint;
+    };
+    getTargetEpochAndSlotInNextL1Slot(): EpochAndSlot & {
+        nowSeconds: bigint;
+    };
+    getProposerIndexEncoding(_epoch: EpochNumber, _slot: SlotNumber, _seed: bigint): `0x${string}`;
+    computeProposerIndex(_slot: SlotNumber, _epoch: EpochNumber, _seed: bigint, _size: bigint): bigint;
+    getCurrentAndNextSlot(): {
+        currentSlot: SlotNumber;
+        nextSlot: SlotNumber;
+    };
+    getTargetAndNextSlot(): {
+        targetSlot: SlotNumber;
+        nextSlot: SlotNumber;
     };
-    getProposerIndexEncoding(_epoch: bigint, _slot: bigint, _seed: bigint): `0x${string}`;
-    computeProposerIndex(_slot: bigint, _epoch: bigint, _seed: bigint, _size: bigint): bigint;
-    getProposerAttesterAddressInCurrentOrNextSlot(): Promise<{
-        currentProposer: EthAddress | undefined;
-        nextProposer: EthAddress | undefined;
-        currentSlot: bigint;
-        nextSlot: bigint;
-    }>;
+    getProposerAttesterAddressInSlot(_slot: SlotNumber): Promise<EthAddress | undefined>;
     isInCommittee(_slot: SlotTag, _validator: EthAddress): Promise<boolean>;
     getRegisteredValidators(): Promise<EthAddress[]>;
     filterInCommittee(_slot: SlotTag, _validators: EthAddress[]): Promise<EthAddress[]>;
+    isEscapeHatchOpen(_epoch: EpochNumber): Promise<boolean>;
+    isEscapeHatchOpenAtSlot(_slot: SlotTag): Promise<boolean>;
+    getL1Constants(): L1RollupConstants;
 }
-//# sourceMappingURL=mock_epoch_cache.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19lcG9jaF9jYWNoZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0YXRlX21hY2hpbmUvbW9ja19lcG9jaF9jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsbUJBQW1CLEVBQUUsa0JBQWtCLEVBQUUsT0FBTyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDekcsT0FBTyxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMxRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxFQUEwQixLQUFLLGlCQUFpQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFN0Y7OztHQUdHO0FBQ0gscUJBQWEsY0FBZSxZQUFXLG1CQUFtQjtJQUN4RCxZQUFZLENBQUMsS0FBSyxHQUFFLE9BQWUsR0FBRyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FPaEU7SUFFRCxVQUFVLElBQUksVUFBVSxDQUV2QjtJQUVELGFBQWEsSUFBSSxVQUFVLENBRTFCO0lBRUQsV0FBVyxJQUFJLFdBQVcsQ0FFekI7SUFFRCxjQUFjLElBQUksV0FBVyxDQUU1QjtJQUVELGtCQUFrQixJQUFJLFlBQVksR0FBRztRQUFFLEtBQUssRUFBRSxNQUFNLENBQUE7S0FBRSxDQU9yRDtJQUVELDJCQUEyQixJQUFJLFlBQVksR0FBRztRQUFFLFVBQVUsRUFBRSxNQUFNLENBQUE7S0FBRSxDQU9uRTtJQUVELGlDQUFpQyxJQUFJLFlBQVksR0FBRztRQUFFLFVBQVUsRUFBRSxNQUFNLENBQUE7S0FBRSxDQUV6RTtJQUVELHdCQUF3QixDQUFDLE1BQU0sRUFBRSxXQUFXLEVBQUUsS0FBSyxFQUFFLFVBQVUsRUFBRSxLQUFLLEVBQUUsTUFBTSxHQUFHLEtBQUssTUFBTSxFQUFFLENBRTdGO0lBRUQsb0JBQW9CLENBQUMsS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxNQUFNLENBRWpHO0lBRUQscUJBQXFCLElBQUk7UUFBRSxXQUFXLEVBQUUsVUFBVSxDQUFDO1FBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQTtLQUFFLENBS3pFO0lBRUQsb0JBQW9CLElBQUk7UUFBRSxVQUFVLEVBQUUsVUFBVSxDQUFDO1FBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQTtLQUFFLENBS3ZFO0lBRUQsZ0NBQWdDLENBQUMsS0FBSyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsVUFBVSxHQUFHLFNBQVMsQ0FBQyxDQUVuRjtJQUVELGFBQWEsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUV0RTtJQUVELHVCQUF1QixJQUFJLE9BQU8sQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUUvQztJQUVELGlCQUFpQixDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUVsRjtJQUVELGlCQUFpQixDQUFDLE1BQU0sRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUV2RDtJQUVELHVCQUF1QixDQUFDLEtBQUssRUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUV4RDtJQUVELGNBQWMsSUFBSSxpQkFBaUIsQ0FFbEM7Q0FDRiJ9

package/dest/state_machine/mock_epoch_cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mock_epoch_cache.d.ts","sourceRoot":"","sources":["../../src/state_machine/mock_epoch_cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACzG,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D;;;GAGG;AACH,qBAAa,cAAe,YAAW,mBAAmB;IACxD,YAAY,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAQ3C,kBAAkB,IAAI,YAAY;IAQlC,2BAA2B,IAAI,YAAY,GAAG;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE;IAS7D,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE;IAIrF,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAIzF,6CAA6C,IAAI,OAAO,CAAC;QACvD,eAAe,EAAE,UAAU,GAAG,SAAS,CAAC;QACxC,YAAY,EAAE,UAAU,GAAG,SAAS,CAAC;QACrC,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IASF,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvE,uBAAuB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAIhD,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CAGpF"}
+{"version":3,"file":"mock_epoch_cache.d.ts","sourceRoot":"","sources":["../../src/state_machine/mock_epoch_cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACzG,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAA0B,KAAK,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAE7F;;;GAGG;AACH,qBAAa,cAAe,YAAW,mBAAmB;IACxD,YAAY,CAAC,KAAK,GAAE,OAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAOhE;IAED,UAAU,IAAI,UAAU,CAEvB;IAED,aAAa,IAAI,UAAU,CAE1B;IAED,WAAW,IAAI,WAAW,CAEzB;IAED,cAAc,IAAI,WAAW,CAE5B;IAED,kBAAkB,IAAI,YAAY,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAOrD;IAED,2BAA2B,IAAI,YAAY,GAAG;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAOnE;IAED,iCAAiC,IAAI,YAAY,GAAG;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAEzE;IAED,wBAAwB,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,CAE7F;IAED,oBAAoB,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAEjG;IAED,qBAAqB,IAAI;QAAE,WAAW,EAAE,UAAU,CAAC;QAAC,QAAQ,EAAE,UAAU,CAAA;KAAE,CAKzE;IAED,oBAAoB,IAAI;QAAE,UAAU,EAAE,UAAU,CAAC;QAAC,QAAQ,EAAE,UAAU,CAAA;KAAE,CAKvE;IAED,gCAAgC,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAEnF;IAED,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAEtE;IAED,uBAAuB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAE/C;IAED,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAElF;IAED,iBAAiB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAEvD;IAED,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAExD;IAED,cAAc,IAAI,iBAAiB,CAElC;CACF"}

package/dest/state_machine/mock_epoch_cache.js

@@ -1,42 +1,68 @@
+import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { EmptyL1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 /**
  * Mock implementation of the EpochCacheInterface used to satisfy dependencies of AztecNodeService.
  * Since in TXE we don't validate transactions, mock suffices here.
  */ export class MockEpochCache {
-    getCommittee() {
+    getCommittee(_slot = 'now') {
         return Promise.resolve({
             committee: undefined,
             seed: 0n,
-            epoch: 0n
+            epoch: EpochNumber.ZERO,
+            isEscapeHatchOpen: false
         });
     }
+    getSlotNow() {
+        return SlotNumber(0);
+    }
+    getTargetSlot() {
+        return SlotNumber(0);
+    }
+    getEpochNow() {
+        return EpochNumber.ZERO;
+    }
+    getTargetEpoch() {
+        return EpochNumber.ZERO;
+    }
     getEpochAndSlotNow() {
         return {
-            epoch: 0n,
-            slot: 0n,
-            ts: 0n
+            epoch: EpochNumber.ZERO,
+            slot: SlotNumber(0),
+            ts: 0n,
+            nowMs: 0n
         };
     }
     getEpochAndSlotInNextL1Slot() {
         return {
-            epoch: 0n,
-            slot: 0n,
+            epoch: EpochNumber.ZERO,
+            slot: SlotNumber(0),
             ts: 0n,
-            now: 0n
+            nowSeconds: 0n
         };
     }
+    getTargetEpochAndSlotInNextL1Slot() {
+        return this.getEpochAndSlotInNextL1Slot();
+    }
     getProposerIndexEncoding(_epoch, _slot, _seed) {
         return '0x00';
     }
     computeProposerIndex(_slot, _epoch, _seed, _size) {
         return 0n;
     }
-    getProposerAttesterAddressInCurrentOrNextSlot() {
-        return Promise.resolve({
-            currentProposer: undefined,
-            nextProposer: undefined,
-            currentSlot: 0n,
-            nextSlot: 0n
-        });
+    getCurrentAndNextSlot() {
+        return {
+            currentSlot: SlotNumber(0),
+            nextSlot: SlotNumber(0)
+        };
+    }
+    getTargetAndNextSlot() {
+        return {
+            targetSlot: SlotNumber(0),
+            nextSlot: SlotNumber(0)
+        };
+    }
+    getProposerAttesterAddressInSlot(_slot) {
+        return Promise.resolve(undefined);
     }
     isInCommittee(_slot, _validator) {
         return Promise.resolve(false);
@@ -47,4 +73,13 @@
     filterInCommittee(_slot, _validators) {
         return Promise.resolve([]);
     }
+    isEscapeHatchOpen(_epoch) {
+        return Promise.resolve(false);
+    }
+    isEscapeHatchOpenAtSlot(_slot) {
+        return Promise.resolve(false);
+    }
+    getL1Constants() {
+        return EmptyL1RollupConstants;
+    }
 }

package/dest/state_machine/synchronizer.d.ts

@@ -1,4 +1,5 @@
-import type { L2Block } from '@aztec/stdlib/block';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import type { BlockHash, L2Block } from '@aztec/stdlib/block';
 import type { MerkleTreeReadOperations, MerkleTreeWriteOperations, SnapshotDataKeys, WorldStateSynchronizer, WorldStateSynchronizerStatus } from '@aztec/stdlib/interfaces/server';
 import { NativeWorldStateService } from '@aztec/world-state/native';
 export declare class TXESynchronizer implements WorldStateSynchronizer {
@@ -8,12 +9,12 @@ export declare class TXESynchronizer implements WorldStateSynchronizer {
     static create(): Promise<TXESynchronizer>;
     handleL2Block(block: L2Block): Promise<void>;
     /**
-     * Forces an immediate sync to an optionally provided minimum block number
+     * Forces an immediate sync to an optionally provided minimum block number.
      * @param targetBlockNumber - The target block number that we must sync to. Will download unproven blocks if needed to reach it.
-     * @param skipThrowIfTargetNotReached - Whether to skip throwing if the target block number is not reached.
+     * @param blockHash - If provided, verifies the block at targetBlockNumber matches this hash.
      * @returns A promise that resolves with the block number the world state was synced to
      */
-    syncImmediate(_minBlockNumber?: number, _skipThrowIfTargetNotReached?: boolean): Promise<number>;
+    syncImmediate(_minBlockNumber?: BlockNumber, _blockHash?: BlockHash): Promise<BlockNumber>;
     /** Returns an instance of MerkleTreeAdminOperations that will not include uncommitted data. */
     getCommitted(): MerkleTreeReadOperations;
     /** Forks the world state at the given block number, defaulting to the latest one. */
@@ -29,4 +30,4 @@ export declare class TXESynchronizer implements WorldStateSynchronizer {
     resumeSync(): void;
     clear(): Promise<void>;
 }
-//# sourceMappingURL=synchronizer.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luY2hyb25pemVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RhdGVfbWFjaGluZS9zeW5jaHJvbml6ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFDVix3QkFBd0IsRUFDeEIseUJBQXlCLEVBQ3pCLGdCQUFnQixFQUNoQixzQkFBc0IsRUFDdEIsNEJBQTRCLEVBQzdCLE1BQU0saUNBQWlDLENBQUM7QUFDekMsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFcEUscUJBQWEsZUFBZ0IsWUFBVyxzQkFBc0I7SUFJekMsdUJBQXVCLEVBQUUsdUJBQXVCO0lBRm5FLE9BQU8sQ0FBQyxXQUFXLENBQW9CO0lBRXZDLFlBQW1CLHVCQUF1QixFQUFFLHVCQUF1QixFQUFJO0lBRXZFLE9BQWEsTUFBTSw2QkFJbEI7SUFFWSxhQUFhLENBQUMsS0FBSyxFQUFFLE9BQU8saUJBT3hDO0lBRUQ7Ozs7O09BS0c7SUFDSSxhQUFhLENBQUMsZUFBZSxDQUFDLEVBQUUsV0FBVyxFQUFFLFVBQVUsQ0FBQyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBRWhHO0lBRUQsK0ZBQStGO0lBQ3hGLFlBQVksSUFBSSx3QkFBd0IsQ0FFOUM7SUFFRCxxRkFBcUY7SUFDOUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMseUJBQXlCLENBQUMsQ0FFOUQ7SUFFRCx1RkFBdUY7SUFDaEYsV0FBVyxDQUFDLFdBQVcsRUFBRSxNQUFNLEdBQUcsd0JBQXdCLENBRWhFO0lBRUQseUNBQXlDO0lBQ2xDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE9BQU8sQ0FBQyxFQUFFLE9BQU8sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsRUFBRSxVQUFVLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUVsSDtJQUVNLEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBRTVCO0lBRU0sTUFBTSxJQUFJLE9BQU8sQ0FBQyw0QkFBNEIsQ0FBQyxDQUVyRDtJQUVNLElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBRTNCO0lBRU0sUUFBUSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFL0I7SUFFTSxVQUFVLElBQUksSUFBSSxDQUV4QjtJQUVNLEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBRTVCO0NBQ0YifQ==

package/dest/state_machine/synchronizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"synchronizer.d.ts","sourceRoot":"","sources":["../../src/state_machine/synchronizer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EACV,wBAAwB,EACxB,yBAAyB,EACzB,gBAAgB,EAChB,sBAAsB,EACtB,4BAA4B,EAC7B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,qBAAa,eAAgB,YAAW,sBAAsB;IAIzC,uBAAuB,EAAE,uBAAuB;IAFnE,OAAO,CAAC,WAAW,CAAK;gBAEL,uBAAuB,EAAE,uBAAuB;WAEtD,MAAM;IAMN,aAAa,CAAC,KAAK,EAAE,OAAO;IASzC;;;;;OAKG;IACI,aAAa,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,4BAA4B,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAIvG,+FAA+F;IACxF,YAAY,IAAI,wBAAwB;IAI/C,qFAAqF;IAC9E,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAI/D,uFAAuF;IAChF,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,wBAAwB;IAIjE,yCAAyC;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC;IAI5G,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,MAAM,IAAI,OAAO,CAAC,4BAA4B,CAAC;IAI/C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,UAAU,IAAI,IAAI;IAIlB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG9B"}
+{"version":3,"file":"synchronizer.d.ts","sourceRoot":"","sources":["../../src/state_machine/synchronizer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,KAAK,EACV,wBAAwB,EACxB,yBAAyB,EACzB,gBAAgB,EAChB,sBAAsB,EACtB,4BAA4B,EAC7B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,qBAAa,eAAgB,YAAW,sBAAsB;IAIzC,uBAAuB,EAAE,uBAAuB;IAFnE,OAAO,CAAC,WAAW,CAAoB;IAEvC,YAAmB,uBAAuB,EAAE,uBAAuB,EAAI;IAEvE,OAAa,MAAM,6BAIlB;IAEY,aAAa,CAAC,KAAK,EAAE,OAAO,iBAOxC;IAED;;;;;OAKG;IACI,aAAa,CAAC,eAAe,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAEhG;IAED,+FAA+F;IACxF,YAAY,IAAI,wBAAwB,CAE9C;IAED,qFAAqF;IAC9E,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAE9D;IAED,uFAAuF;IAChF,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,wBAAwB,CAEhE;IAED,yCAAyC;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC,CAElH;IAEM,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAE5B;IAEM,MAAM,IAAI,OAAO,CAAC,4BAA4B,CAAC,CAErD;IAEM,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAE3B;IAEM,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAE/B;IAEM,UAAU,IAAI,IAAI,CAExB;IAEM,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAE5B;CACF"}

package/dest/state_machine/synchronizer.js

@@ -1,5 +1,6 @@
 import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { NativeWorldStateService } from '@aztec/world-state/native';
 export class TXESynchronizer {
     nativeWorldStateService;
@@ -7,10 +8,10 @@ export class TXESynchronizer {
     blockNumber;
     constructor(nativeWorldStateService){
         this.nativeWorldStateService = nativeWorldStateService;
-        this.blockNumber = 0;
+        this.blockNumber = BlockNumber.ZERO;
     }
     static async create() {
-        const nativeWorldStateService = await NativeWorldStateService.tmp();
+        const nativeWorldStateService = await NativeWorldStateService.ephemeral();
         return new this(nativeWorldStateService);
     }
     async handleL2Block(block) {
@@ -18,21 +19,21 @@ export class TXESynchronizer {
         this.blockNumber = block.header.globalVariables.blockNumber;
     }
     /**
-   * Forces an immediate sync to an optionally provided minimum block number
+   * Forces an immediate sync to an optionally provided minimum block number.
    * @param targetBlockNumber - The target block number that we must sync to. Will download unproven blocks if needed to reach it.
-   * @param skipThrowIfTargetNotReached - Whether to skip throwing if the target block number is not reached.
+   * @param blockHash - If provided, verifies the block at targetBlockNumber matches this hash.
    * @returns A promise that resolves with the block number the world state was synced to
-   */ syncImmediate(_minBlockNumber, _skipThrowIfTargetNotReached) {
+   */ syncImmediate(_minBlockNumber, _blockHash) {
         return Promise.resolve(this.blockNumber);
     }
     /** Returns an instance of MerkleTreeAdminOperations that will not include uncommitted data. */ getCommitted() {
         return this.nativeWorldStateService.getCommitted();
     }
     /** Forks the world state at the given block number, defaulting to the latest one. */ fork(block) {
-        return this.nativeWorldStateService.fork(block);
+        return this.nativeWorldStateService.fork(block ? BlockNumber(block) : undefined);
     }
     /** Gets a handle that allows reading the state as it was at the given block number. */ getSnapshot(blockNumber) {
-        return this.nativeWorldStateService.getSnapshot(blockNumber);
+        return this.nativeWorldStateService.getSnapshot(BlockNumber(blockNumber));
     }
     /** Backups the db to the target path. */ backupTo(dstPath, compact) {
         return this.nativeWorldStateService.backupTo(dstPath, compact);

package/dest/txe_session.d.ts

@@ -1,18 +1,19 @@
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { type Logger } from '@aztec/foundation/log';
 import { KeyStore } from '@aztec/key-store';
-import type { ProtocolContract } from '@aztec/protocol-contracts';
-import { AddressDataProvider, PXEOracleInterface } from '@aztec/pxe/server';
-import { type IPrivateExecutionOracle, type IUtilityExecutionOracle } from '@aztec/pxe/simulator';
+import type { AztecAsyncKVStore } from '@aztec/kv-store';
+import { AddressStore, CapsuleStore, ContractStore, JobCoordinator, NoteStore, PrivateEventStore, RecipientTaggingStore, SenderAddressBookStore, SenderTaggingStore } from '@aztec/pxe/server';
+import { type IMiscOracle, type IPrivateExecutionOracle, type IUtilityExecutionOracle, Option } from '@aztec/pxe/simulator';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { GasSettings } from '@aztec/stdlib/gas';
 import { PrivateContextInputs } from '@aztec/stdlib/kernel';
-import type { UInt32 } from '@aztec/stdlib/types';
 import type { IAvmExecutionOracle, ITxeExecutionOracle } from './oracle/interfaces.js';
 import { RPCTranslator } from './rpc_translator.js';
 import { TXEStateMachine } from './state_machine/index.js';
-import type { ForeignCallArgs, ForeignCallResult } from './util/encoding.js';
-import { TXEAccountDataProvider } from './util/txe_account_data_provider.js';
-import { TXEContractDataProvider } from './util/txe_contract_data_provider.js';
+import type { ForeignCallArgs, ForeignCallResult } from './utils/encoding.js';
+import { TXEAccountStore } from './utils/txe_account_store.js';
+import type { TXEArtifactResolver } from './utils/txe_artifact_resolver.js';
 type MethodNames<T> = {
     [K in keyof T]: T[K] extends (...args: any[]) => any ? K : never;
 }[keyof T];
@@ -22,10 +23,44 @@ type MethodNames<T> = {
  */
 export type TXEOracleFunctionName = Exclude<MethodNames<RPCTranslator>, 'constructor' | 'handlerAsMisc' | 'handlerAsUtility' | 'handlerAsPrivate' | 'handlerAsAvm' | 'handlerAsTxe'>;
 export interface TXESessionStateHandler {
+    /** Records the TXE oracle version reported by the Noir test code for diagnostics. */
+    setTxeOracleVersion(major: number, minor: number): void;
     enterTopLevelState(): Promise<void>;
-    enterPublicState(contractAddress?: AztecAddress): Promise<void>;
-    enterPrivateState(contractAddress?: AztecAddress, anchorBlockNumber?: UInt32): Promise<PrivateContextInputs>;
-    enterUtilityState(contractAddress?: AztecAddress): Promise<void>;
+    enterPublicState(contractAddress: Option<AztecAddress>): Promise<void>;
+    enterPrivateState(contractAddress: Option<AztecAddress>, anchorBlockNumber: Option<BlockNumber>, gasSettings: GasSettings): Promise<PrivateContextInputs>;
+    enterUtilityState(contractAddress: Option<AztecAddress>): Promise<void>;
+    cycleJob(): Promise<string>;
+    getCurrentJob(): string;
+    /**
+     * Runs an executor-style top-level call (private/public call, utility execution) with last-call tracking.
+     */
+    withTopLevelCallTracking<T>(work: () => Promise<{
+        result: T;
+        txHash?: Fr;
+    }>): Promise<T>;
+    /**
+     * Captures a raw offchain effect payload for consumption from test environment. Called by the `emit_offchain_effect`
+     * oracle handler whenever a contract function emits an offchain message, at any call depth.
+     */
+    recordOffchainEffect(data: Fr[]): void;
+    /**
+     * Returns the raw offchain effect payloads emitted by the last top-level call. Each payload follows the protocol
+     * convention documented on `OFFCHAIN_MESSAGE_IDENTIFIER`, i.e. `[identifier, recipient, ...ciphertext]`. Decoding into
+     * `OffchainMessage` structs happens on the Noir side of the test helper. Marks the buffer as queried so the
+     * unqueried-messages warning doesn't fire on the next reset.
+     */
+    getLastCallOffchainEffects(): {
+        effects: Fr[][];
+    };
+    /**
+     * Returns the context of the last top-level call: its tx hash (`Fr.ZERO` if the call was tx-less) and the anchor
+     * block timestamp captured at the start of the call. Does *not* mark the buffer as queried — context reads are
+     * metadata, not effect consumption.
+     */
+    getLastCallContext(): {
+        txHash: Fr;
+        anchorBlockTimestamp: bigint;
+    };
 }
 /**
  * A `TXESession` corresponds to a Noir `#[test]` function, and handles all of its oracle calls, stores test-specific
@@ -33,20 +68,39 @@ export interface TXESessionStateHandler {
  */
 export declare class TXESession implements TXESessionStateHandler {
     private logger;
+    private sessionStore;
     private stateMachine;
     private oracleHandler;
-    private contractDataProvider;
+    private contractStore;
+    private noteStore;
     private keyStore;
-    private addressDataProvider;
-    private accountDataProvider;
+    private addressStore;
+    private accountStore;
+    private senderTaggingStore;
+    private recipientTaggingStore;
+    private senderAddressBookStore;
+    private capsuleStore;
+    private privateEventStore;
+    private jobCoordinator;
+    private currentJobId;
     private chainId;
     private version;
     private nextBlockTimestamp;
-    private pxeOracleInterface;
+    private readonly artifactResolver;
+    private readonly rootPath;
+    private readonly packageName;
     private state;
     private authwits;
-    constructor(logger: Logger, stateMachine: TXEStateMachine, oracleHandler: IUtilityExecutionOracle | IPrivateExecutionOracle | IAvmExecutionOracle | ITxeExecutionOracle, contractDataProvider: TXEContractDataProvider, keyStore: KeyStore, addressDataProvider: AddressDataProvider, accountDataProvider: TXEAccountDataProvider, chainId: Fr, version: Fr, nextBlockTimestamp: bigint, pxeOracleInterface: PXEOracleInterface);
-    static init(protocolContracts: ProtocolContract[]): Promise<TXESession>;
+    private lastCallInfo;
+    private txeOracleVersion;
+    private disposed;
+    constructor(logger: Logger, sessionStore: AztecAsyncKVStore, stateMachine: TXEStateMachine, oracleHandler: IMiscOracle | IUtilityExecutionOracle | IPrivateExecutionOracle | IAvmExecutionOracle | ITxeExecutionOracle, contractStore: ContractStore, noteStore: NoteStore, keyStore: KeyStore, addressStore: AddressStore, accountStore: TXEAccountStore, senderTaggingStore: SenderTaggingStore, recipientTaggingStore: RecipientTaggingStore, senderAddressBookStore: SenderAddressBookStore, capsuleStore: CapsuleStore, privateEventStore: PrivateEventStore, jobCoordinator: JobCoordinator, currentJobId: string, chainId: Fr, version: Fr, nextBlockTimestamp: bigint, artifactResolver: TXEArtifactResolver, rootPath: string, packageName: string);
+    /**
+     * Closes the per-session `txe-session` LMDB and the `NativeWorldStateService` .
+     * Called via IPC when the dispatcher detects the end of a test. Idempotent.
+     */
+    dispose(): Promise<void>;
+    static init(contractStore: ContractStore, artifactResolver: TXEArtifactResolver, rootPath: string, packageName: string): Promise<TXESession>;
     /**
      * Processes an oracle function invoked by the Noir test associated to this session.
      * @param functionName The name of the oracle.
@@ -54,14 +108,33 @@ export declare class TXESession implements TXESessionStateHandler {
      * @returns The oracle return values.
      */
     processFunction(functionName: TXEOracleFunctionName, inputs: ForeignCallArgs): Promise<ForeignCallResult>;
+    getCurrentJob(): string;
+    /** Commits the current job and begins a new one. Returns the new job ID. */
+    cycleJob(): Promise<string>;
+    private resetLastCall;
+    recordOffchainEffect(data: Fr[]): void;
+    private setLastCallContext;
+    withTopLevelCallTracking<T>(work: () => Promise<{
+        result: T;
+        txHash?: Fr;
+    }>): Promise<T>;
+    getLastCallOffchainEffects(): {
+        effects: Fr[][];
+    };
+    getLastCallContext(): {
+        txHash: Fr;
+        anchorBlockTimestamp: bigint;
+    };
+    setTxeOracleVersion(major: number, minor: number): void;
     enterTopLevelState(): Promise<void>;
-    enterPrivateState(contractAddress?: AztecAddress, anchorBlockNumber?: UInt32): Promise<PrivateContextInputs>;
-    enterPublicState(contractAddress?: AztecAddress): Promise<void>;
-    enterUtilityState(contractAddress?: AztecAddress): Promise<void>;
+    enterPrivateState(contractAddressOpt: Option<AztecAddress>, anchorBlockNumberOpt: Option<BlockNumber>, gasSettings: GasSettings): Promise<PrivateContextInputs>;
+    enterPublicState(contractAddressOpt: Option<AztecAddress>): Promise<void>;
+    enterUtilityState(contractAddressOpt: Option<AztecAddress>): Promise<void>;
     private exitTopLevelState;
     private exitPrivateState;
     private exitPublicState;
     private exitUtilityContext;
+    private utilityExecutorForContractSync;
 }
 export {};
-//# sourceMappingURL=txe_session.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX3Nlc3Npb24uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90eGVfc2Vzc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUV6RCxPQUFPLEVBQ0wsWUFBWSxFQUdaLFlBQVksRUFDWixhQUFhLEVBQ2IsY0FBYyxFQUVkLFNBQVMsRUFDVCxpQkFBaUIsRUFDakIscUJBQXFCLEVBQ3JCLHNCQUFzQixFQUN0QixrQkFBa0IsRUFDbkIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEVBSUwsS0FBSyxXQUFXLEVBQ2hCLEtBQUssdUJBQXVCLEVBQzVCLEtBQUssdUJBQXVCLEVBQzVCLE1BQU0sRUFHUCxNQUFNLHNCQUFzQixDQUFDO0FBWTlCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVyRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQU81RCxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBS3ZGLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVwRCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFM0QsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLGlCQUFpQixFQUFFLE1B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