@aztec/txe 0.0.1-commit.6d3c34e → 0.0.1-commit.9372f48

package/dest/rpc_translator.js

@@ -1,10 +1,10 @@
 import { Fr, Point } from '@aztec/aztec.js/fields';
 import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX } from '@aztec/constants';
 import { BlockNumber } from '@aztec/foundation/branded-types';
-import { packAsRetrievedNote } from '@aztec/pxe/simulator';
+import { packAsHintedNote } from '@aztec/pxe/simulator';
 import { EventSelector, FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { MerkleTreeId } from '@aztec/stdlib/trees';
+import { BlockHash } from '@aztec/stdlib/block';
 import { addressFromSingle, arrayOfArraysToBoundedVecOfArrays, arrayToBoundedVec, bufferToU8Array, fromArray, fromSingle, fromUintArray, fromUintBoundedVec, toArray, toForeignCallResult, toSingle } from './util/encoding.js';
 const MAX_EVENT_LEN = 12; // This is MAX_MESSAGE_CONTENT_LEN - PRIVATE_EVENT_RESERVED_FIELDS
 const MAX_PRIVATE_EVENTS_PER_TXE_QUERY = 5;
@@ -216,26 +216,26 @@ export class RPCTranslator {
         this.handlerAsMisc().utilityDebugLog(level, message, fields);
         return toForeignCallResult([]);
     }
-    async utilityStorageRead(foreignContractAddress, foreignStartStorageSlot, foreignBlockNumber, foreignNumberOfElements) {
+    async utilityStorageRead(foreignBlockHash, foreignContractAddress, foreignStartStorageSlot, foreignNumberOfElements) {
+        const blockHash = new BlockHash(fromSingle(foreignBlockHash));
         const contractAddress = addressFromSingle(foreignContractAddress);
         const startStorageSlot = fromSingle(foreignStartStorageSlot);
-        const blockNumber = BlockNumber(fromSingle(foreignBlockNumber).toNumber());
         const numberOfElements = fromSingle(foreignNumberOfElements).toNumber();
-        const values = await this.handlerAsUtility().utilityStorageRead(contractAddress, startStorageSlot, blockNumber, numberOfElements);
+        const values = await this.handlerAsUtility().utilityStorageRead(blockHash, contractAddress, startStorageSlot, numberOfElements);
         return toForeignCallResult([
             toArray(values)
         ]);
     }
-    async utilityGetPublicDataWitness(foreignBlockNumber, foreignLeafSlot) {
-        const blockNumber = BlockNumber(fromSingle(foreignBlockNumber).toNumber());
+    async utilityGetPublicDataWitness(foreignBlockHash, foreignLeafSlot) {
+        const blockHash = new BlockHash(fromSingle(foreignBlockHash));
         const leafSlot = fromSingle(foreignLeafSlot);
-        const witness = await this.handlerAsUtility().utilityGetPublicDataWitness(blockNumber, leafSlot);
+        const witness = await this.handlerAsUtility().utilityGetPublicDataWitness(blockHash, leafSlot);
         if (!witness) {
-            throw new Error(`Public data witness not found for slot ${leafSlot} at block ${blockNumber}.`);
+            throw new Error(`Public data witness not found for slot ${leafSlot} at block ${blockHash.toString()}.`);
         }
         return toForeignCallResult(witness.toNoirRepresentation());
     }
-    async utilityGetNotes(foreignOwnerIsSome, foreignOwnerValue, foreignStorageSlot, foreignNumSelects, foreignSelectByIndexes, foreignSelectByOffsets, foreignSelectByLengths, foreignSelectValues, foreignSelectComparators, foreignSortByIndexes, foreignSortByOffsets, foreignSortByLengths, foreignSortOrder, foreignLimit, foreignOffset, foreignStatus, foreignMaxNotes, foreignPackedRetrievedNoteLength) {
+    async utilityGetNotes(foreignOwnerIsSome, foreignOwnerValue, foreignStorageSlot, foreignNumSelects, foreignSelectByIndexes, foreignSelectByOffsets, foreignSelectByLengths, foreignSelectValues, foreignSelectComparators, foreignSortByIndexes, foreignSortByOffsets, foreignSortByLengths, foreignSortOrder, foreignLimit, foreignOffset, foreignStatus, foreignMaxNotes, foreignPackedHintedNoteLength) {
         // Parse Option<AztecAddress>: ownerIsSome is 0 for None, 1 for Some
         const owner = fromSingle(foreignOwnerIsSome).toBool() ? AztecAddress.fromField(fromSingle(foreignOwnerValue)) : undefined;
         const storageSlot = fromSingle(foreignStorageSlot);
@@ -253,21 +253,21 @@ export class RPCTranslator {
         const offset = fromSingle(foreignOffset).toNumber();
         const status = fromSingle(foreignStatus).toNumber();
         const maxNotes = fromSingle(foreignMaxNotes).toNumber();
-        const packedRetrievedNoteLength = fromSingle(foreignPackedRetrievedNoteLength).toNumber();
+        const packedHintedNoteLength = fromSingle(foreignPackedHintedNoteLength).toNumber();
         const noteDatas = await this.handlerAsUtility().utilityGetNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status);
-        const returnDataAsArrayOfArrays = noteDatas.map((noteData)=>packAsRetrievedNote({
+        const returnDataAsArrayOfArrays = noteDatas.map((noteData)=>packAsHintedNote({
                 contractAddress: noteData.contractAddress,
                 owner: noteData.owner,
                 randomness: noteData.randomness,
                 storageSlot: noteData.storageSlot,
                 noteNonce: noteData.noteNonce,
-                index: noteData.index,
+                isPending: noteData.isPending,
                 note: noteData.note
             }));
         // Now we convert each sub-array to an array of ForeignCallSingles
         const returnDataAsArrayOfForeignCallSingleArrays = returnDataAsArrayOfArrays.map((subArray)=>subArray.map(toSingle));
         // At last we convert the array of arrays to a bounded vec of arrays
-        return toForeignCallResult(arrayOfArraysToBoundedVecOfArrays(returnDataAsArrayOfForeignCallSingleArrays, maxNotes, packedRetrievedNoteLength));
+        return toForeignCallResult(arrayOfArraysToBoundedVecOfArrays(returnDataAsArrayOfForeignCallSingleArrays, maxNotes, packedHintedNoteLength));
     }
     privateNotifyCreatedNote(foreignOwner, foreignStorageSlot, foreignRandomness, foreignNoteTypeId, foreignNote, foreignNoteHash, foreignCounter) {
         const owner = addressFromSingle(foreignOwner);
@@ -292,6 +292,14 @@ export class RPCTranslator {
         await this.handlerAsPrivate().privateNotifyCreatedNullifier(innerNullifier);
         return toForeignCallResult([]);
     }
+    async privateIsNullifierPending(foreignInnerNullifier, foreignContractAddress) {
+        const innerNullifier = fromSingle(foreignInnerNullifier);
+        const contractAddress = addressFromSingle(foreignContractAddress);
+        const isPending = await this.handlerAsPrivate().privateIsNullifierPending(innerNullifier, contractAddress);
+        return toForeignCallResult([
+            toSingle(new Fr(isPending))
+        ]);
+    }
     async utilityCheckNullifierExists(foreignInnerNullifier) {
         const innerNullifier = fromSingle(foreignInnerNullifier);
         const exists = await this.handlerAsUtility().utilityCheckNullifierExists(innerNullifier);
@@ -328,12 +336,12 @@ export class RPCTranslator {
     privateCallPrivateFunction(_foreignTargetContractAddress, _foreignFunctionSelector, _foreignArgsHash, _foreignSideEffectCounter, _foreignIsStaticCall) {
         throw new Error('Contract calls are forbidden inside a `TestEnvironment::private_context`, use `private_call` instead');
     }
-    async utilityGetNullifierMembershipWitness(foreignBlockNumber, foreignNullifier) {
-        const blockNumber = BlockNumber(fromSingle(foreignBlockNumber).toNumber());
+    async utilityGetNullifierMembershipWitness(foreignBlockHash, foreignNullifier) {
+        const blockHash = new BlockHash(fromSingle(foreignBlockHash));
         const nullifier = fromSingle(foreignNullifier);
-        const witness = await this.handlerAsUtility().utilityGetNullifierMembershipWitness(blockNumber, nullifier);
+        const witness = await this.handlerAsUtility().utilityGetNullifierMembershipWitness(blockHash, nullifier);
         if (!witness) {
-            throw new Error(`Nullifier membership witness not found at block ${blockNumber}.`);
+            throw new Error(`Nullifier membership witness not found at block ${blockHash}.`);
         }
         return toForeignCallResult(witness.toNoirRepresentation());
     }
@@ -375,25 +383,30 @@ export class RPCTranslator {
         }
         return toForeignCallResult(header.toFields().map(toSingle));
     }
-    async utilityGetMembershipWitness(foreignBlockNumber, foreignTreeId, foreignLeafValue) {
-        const blockNumber = BlockNumber(fromSingle(foreignBlockNumber).toNumber());
-        const treeId = fromSingle(foreignTreeId).toNumber();
-        const leafValue = fromSingle(foreignLeafValue);
-        const witness = await this.handlerAsUtility().utilityGetMembershipWitness(blockNumber, treeId, leafValue);
+    async utilityGetNoteHashMembershipWitness(foreignAnchorBlockHash, foreignNoteHash) {
+        const blockHash = new BlockHash(fromSingle(foreignAnchorBlockHash));
+        const noteHash = fromSingle(foreignNoteHash);
+        const witness = await this.handlerAsUtility().utilityGetNoteHashMembershipWitness(blockHash, noteHash);
         if (!witness) {
-            throw new Error(`Membership witness in tree ${MerkleTreeId[treeId]} not found for value ${leafValue} at block ${blockNumber}.`);
+            throw new Error(`Note hash ${noteHash} not found in the note hash tree at block ${blockHash.toString()}.`);
         }
-        return toForeignCallResult([
-            toSingle(witness[0]),
-            toArray(witness.slice(1))
-        ]);
+        return toForeignCallResult(witness.toNoirRepresentation());
     }
-    async utilityGetLowNullifierMembershipWitness(foreignBlockNumber, foreignNullifier) {
-        const blockNumber = BlockNumber(fromSingle(foreignBlockNumber).toNumber());
+    async utilityGetBlockHashMembershipWitness(foreignAnchorBlockHash, foreignBlockHash) {
+        const anchorBlockHash = new BlockHash(fromSingle(foreignAnchorBlockHash));
+        const blockHash = new BlockHash(fromSingle(foreignBlockHash));
+        const witness = await this.handlerAsUtility().utilityGetBlockHashMembershipWitness(anchorBlockHash, blockHash);
+        if (!witness) {
+            throw new Error(`Block hash ${blockHash.toString()} not found in the archive tree at anchor block ${anchorBlockHash.toString()}.`);
+        }
+        return toForeignCallResult(witness.toNoirRepresentation());
+    }
+    async utilityGetLowNullifierMembershipWitness(foreignBlockHash, foreignNullifier) {
+        const blockHash = new BlockHash(fromSingle(foreignBlockHash));
         const nullifier = fromSingle(foreignNullifier);
-        const witness = await this.handlerAsUtility().utilityGetLowNullifierMembershipWitness(blockNumber, nullifier);
+        const witness = await this.handlerAsUtility().utilityGetLowNullifierMembershipWitness(blockHash, nullifier);
         if (!witness) {
-            throw new Error(`Low nullifier witness not found for nullifier ${nullifier} at block ${blockNumber}.`);
+            throw new Error(`Low nullifier witness not found for nullifier ${nullifier} at block ${blockHash}.`);
         }
         return toForeignCallResult(witness.toNoirRepresentation());
     }
@@ -402,11 +415,11 @@ export class RPCTranslator {
         await this.handlerAsUtility().utilityFetchTaggedLogs(pendingTaggedLogArrayBaseSlot);
         return toForeignCallResult([]);
     }
-    async utilityValidateEnqueuedNotesAndEvents(foreignContractAddress, foreignNoteValidationRequestsArrayBaseSlot, foreignEventValidationRequestsArrayBaseSlot) {
+    async utilityValidateAndStoreEnqueuedNotesAndEvents(foreignContractAddress, foreignNoteValidationRequestsArrayBaseSlot, foreignEventValidationRequestsArrayBaseSlot) {
         const contractAddress = AztecAddress.fromField(fromSingle(foreignContractAddress));
         const noteValidationRequestsArrayBaseSlot = fromSingle(foreignNoteValidationRequestsArrayBaseSlot);
         const eventValidationRequestsArrayBaseSlot = fromSingle(foreignEventValidationRequestsArrayBaseSlot);
-        await this.handlerAsUtility().utilityValidateEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot);
+        await this.handlerAsUtility().utilityValidateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot);
         return toForeignCallResult([]);
     }
     async utilityBulkRetrieveLogs(foreignContractAddress, foreignLogRetrievalRequestsArrayBaseSlot, foreignLogRetrievalResponsesArrayBaseSlot) {
@@ -487,9 +500,10 @@ export class RPCTranslator {
         // TODO(#8811): Implement
         return toForeignCallResult([]);
     }
-    async avmOpcodeStorageRead(foreignSlot) {
+    async avmOpcodeStorageRead(foreignSlot, foreignContractAddress) {
         const slot = fromSingle(foreignSlot);
-        const value = (await this.handlerAsAvm().avmOpcodeStorageRead(slot)).value;
+        const contractAddress = AztecAddress.fromField(fromSingle(foreignContractAddress));
+        const value = (await this.handlerAsAvm().avmOpcodeStorageRead(slot, contractAddress)).value;
         return toForeignCallResult([
             toSingle(new Fr(value))
         ]);
@@ -543,10 +557,9 @@ export class RPCTranslator {
         await this.handlerAsAvm().avmOpcodeEmitNoteHash(noteHash);
         return toForeignCallResult([]);
     }
-    async avmOpcodeNullifierExists(foreignInnerNullifier, foreignTargetAddress) {
-        const innerNullifier = fromSingle(foreignInnerNullifier);
-        const targetAddress = AztecAddress.fromField(fromSingle(foreignTargetAddress));
-        const exists = await this.handlerAsAvm().avmOpcodeNullifierExists(innerNullifier, targetAddress);
+    async avmOpcodeNullifierExists(foreignSiloedNullifier) {
+        const siloedNullifier = fromSingle(foreignSiloedNullifier);
+        const exists = await this.handlerAsAvm().avmOpcodeNullifierExists(siloedNullifier);
         return toForeignCallResult([
             toSingle(new Fr(exists))
         ]);

package/dest/state_machine/archiver.d.ts

@@ -1,80 +1,31 @@
-import { ArchiverStoreHelper } from '@aztec/archiver';
-import { BlockNumber, CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { ArchiverDataSourceBase } from '@aztec/archiver';
+import { type EpochNumber, type SlotNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { L2Block, type L2BlockNew, type L2BlockSource, type L2Tips, PublishedL2Block, type ValidateCheckpointResult } from '@aztec/stdlib/block';
-import { Checkpoint, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
-import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import type { L2Tips, ValidateCheckpointResult } from '@aztec/stdlib/block';
+import type { PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
-import type { BlockHeader } from '@aztec/stdlib/tx';
-import type { UInt64 } from '@aztec/stdlib/types';
-export declare class TXEArchiver extends ArchiverStoreHelper implements L2BlockSource {
+/**
+ * TXE Archiver implementation.
+ * Provides most of the endpoints needed by the node for reading from and writing to state,
+ * without needing any of the extra overhead that the Archiver itself requires (i.e. an L1 client).
+ */
+export declare class TXEArchiver extends ArchiverDataSourceBase {
+    private readonly updater;
     constructor(db: AztecAsyncKVStore);
-    getBlock(number: BlockNumber): Promise<L2Block | undefined>;
-    getBlocks(from: BlockNumber, limit: number, proven?: boolean): Promise<L2Block[]>;
-    addCheckpoints(checkpoints: PublishedCheckpoint[], _result?: ValidateCheckpointResult): Promise<boolean>;
-    /**
-     * Gets the number of the latest L2 block processed by the block source implementation.
-     * @returns The number of the latest L2 block processed by the block source implementation.
-     */
-    getBlockNumber(): Promise<BlockNumber>;
-    /**
-     * Gets the number of the latest L2 block proven seen by the block source implementation.
-     * @returns The number of the latest L2 block proven seen by the block source implementation.
-     */
-    getProvenBlockNumber(): Promise<BlockNumber>;
-    /**
-     * Gets a published l2 block. If a negative number is passed, the block returned is the most recent.
-     * @param number - The block number to return (inclusive).
-     * @returns The requested L2 block.
-     */
-    getPublishedBlock(number: number): Promise<PublishedL2Block | undefined>;
-    getPublishedBlocks(from: BlockNumber, limit: number, proven?: boolean): Promise<PublishedL2Block[]>;
-    getL2BlocksNew(from: BlockNumber, limit: number, proven?: boolean): Promise<L2BlockNew[]>;
-    private retrievePublishedBlocks;
-    /**
-     * Gets an l2 block. If a negative number is passed, the block returned is the most recent.
-     * @param number - The block number to return (inclusive).
-     * @returns The requested L2 block.
-     */
-    getL2Block(number: BlockNumber | 'latest'): Promise<L2Block | undefined>;
-    /**
-     * Gets an L2 block (new format).
-     * @param number - The block number to return.
-     * @returns The requested L2 block.
-     */
-    getL2BlockNew(number: BlockNumber): Promise<L2BlockNew | undefined>;
-    /**
-     * Gets an l2 block header.
-     * @param number - The block number to return or 'latest' for the most recent one.
-     * @returns The requested L2 block header.
-     */
-    getBlockHeader(number: number | 'latest'): Promise<BlockHeader | undefined>;
-    getBlockRange(from: number, limit: number, _proven?: boolean): Promise<L2Block[]>;
-    getPublishedCheckpoints(_from: CheckpointNumber, _limit: number): Promise<PublishedCheckpoint[]>;
-    getCheckpointByArchive(_archive: Fr): Promise<Checkpoint | undefined>;
-    getL2SlotNumber(): Promise<SlotNumber | undefined>;
-    getL2EpochNumber(): Promise<EpochNumber>;
-    getCheckpointsForEpoch(_epochNumber: EpochNumber): Promise<Checkpoint[]>;
-    getBlocksForEpoch(_epochNumber: EpochNumber): Promise<L2Block[]>;
-    getBlockHeadersForEpoch(_epochNumber: EpochNumber): Promise<BlockHeader[]>;
-    isEpochComplete(_epochNumber: EpochNumber): Promise<boolean>;
-    getL2Tips(): Promise<L2Tips>;
+    addCheckpoints(checkpoints: PublishedCheckpoint[], result?: ValidateCheckpointResult): Promise<void>;
+    getRollupAddress(): Promise<EthAddress>;
+    getRegistryAddress(): Promise<EthAddress>;
     getL1Constants(): Promise<L1RollupConstants>;
     getGenesisValues(): Promise<{
         genesisArchiveRoot: Fr;
     }>;
+    getL1Timestamp(): Promise<bigint | undefined>;
+    getL2Tips(): Promise<L2Tips>;
+    getL2SlotNumber(): Promise<SlotNumber | undefined>;
+    getL2EpochNumber(): Promise<EpochNumber | undefined>;
+    isEpochComplete(_epochNumber: EpochNumber): Promise<boolean>;
     syncImmediate(): Promise<void>;
-    getContract(_address: AztecAddress, _timestamp?: UInt64): Promise<ContractInstanceWithAddress | undefined>;
-    getRollupAddress(): Promise<EthAddress>;
-    getRegistryAddress(): Promise<EthAddress>;
-    getL1Timestamp(): Promise<bigint>;
-    isPendingChainInvalid(): Promise<boolean>;
-    getPendingChainValidationStatus(): Promise<ValidateCheckpointResult>;
-    getPublishedBlockByHash(_blockHash: Fr): Promise<PublishedL2Block | undefined>;
-    getPublishedBlockByArchive(_archive: Fr): Promise<PublishedL2Block | undefined>;
-    getCheckpointedBlocks(_from: BlockNumber, _limit: number, _proven?: boolean): Promise<never[]>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdGF0ZV9tYWNoaW5lL2FyY2hpdmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxtQkFBbUIsRUFBdUIsTUFBTSxpQkFBaUIsQ0FBQztBQUUzRSxPQUFPLEVBQUUsV0FBVyxFQUFFLGdCQUFnQixFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN6RyxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEVBR0wsT0FBTyxFQUVQLEtBQUssVUFBVSxFQUNmLEtBQUssYUFBYSxFQUVsQixLQUFLLE1BQU0sRUFDWCxnQkFBZ0IsRUFDaEIsS0FBSyx3QkFBd0IsRUFDOUIsTUFBTSxxQkFBcUIsQ0FBQztBQUM3QixPQUFPLEVBQUUsVUFBVSxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDM0UsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMxRSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBS2xELHFCQUFhLFdBQVksU0FBUSxtQkFBb0IsWUFBVyxhQUFhO0lBQzNFLFlBQVksRUFBRSxFQUFFLGlCQUFpQixFQUVoQztJQUVZLFFBQVEsQ0FBQyxNQUFNLEVB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdGF0ZV9tYWNoaW5lL2FyY2hpdmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxzQkFBc0IsRUFBaUQsTUFBTSxpQkFBaUIsQ0FBQztBQUV4RyxPQUFPLEVBQW9CLEtBQUssV0FBVyxFQUFFLEtBQUssVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEcsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQW9DLE1BQU0sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzlHLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDcEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVyRTs7OztHQUlHO0FBQ0gscUJBQWEsV0FBWSxTQUFRLHNCQUFzQjtJQUNyRCxPQUFPLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBNEM7SUFFcEUsWUFBWSxFQUFFLEVBQUUsaUJBQWlCLEVBR2hDO0lBRVksY0FBYyxDQUFDLFdBQVcsRUFBRSxtQkFBbUIsRUFBRSxFQUFFLE1BQU0sQ0FBQyxFQUFFLHdCQUF3QixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFaEg7SUFFTSxnQkFBZ0IsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLENBRTdDO0lBRU0sa0JBQWtCLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUUvQztJQUVNLGNBQWMsSUFBSSxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FFbEQ7SUFFTSxnQkFBZ0IsSUFBSSxPQUFPLENBQUM7UUFBRSxrQkFBa0IsRUFBRSxFQUFFLENBQUE7S0FBRSxDQUFDLENBRTdEO0lBRU0sY0FBYyxJQUFJLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRW5EO0lBRVksU0FBUyxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0E4QnhDO0lBRU0sZUFBZSxJQUFJLE9BQU8sQ0FBQyxVQUFVLEdBQUcsU0FBUyxDQUFDLENBRXhEO0lBRU0sZ0JBQWdCLElBQUksT0FBTyxDQUFDLFdBQVcsR0FBRyxTQUFTLENBQUMsQ0FFMUQ7SUFFTSxlQUFlLENBQUMsWUFBWSxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBRWxFO0lBRU0sYUFBYSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFcEM7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/state_machine/archiver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/state_machine/archiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAiD,MAAM,iBAAiB,CAAC;AAExG,OAAO,EAAoB,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACtG,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAoC,MAAM,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC9G,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAErE;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,sBAAsB;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA4C;IAEpE,YAAY,EAAE,EAAE,iBAAiB,EAGhC;IAEY,cAAc,CAAC,WAAW,EAAE,mBAAmB,EAAE,EAAE,MAAM,CAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAEhH;IAEM,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC,CAE7C;IAEM,kBAAkB,IAAI,OAAO,CAAC,UAAU,CAAC,CAE/C;IAEM,cAAc,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAElD;IAEM,gBAAgB,IAAI,OAAO,CAAC;QAAE,kBAAkB,EAAE,EAAE,CAAA;KAAE,CAAC,CAE7D;IAEM,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAEnD;IAEY,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CA8BxC;IAEM,eAAe,IAAI,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAExD;IAEM,gBAAgB,IAAI,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAE1D;IAEM,eAAe,CAAC,YAAY,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAElE;IAEM,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAEpC;CACF"}

package/dest/state_machine/archiver.js

@@ -1,154 +1,38 @@
-import { ArchiverStoreHelper, KVArchiverDataStore } from '@aztec/archiver';
+import { ArchiverDataSourceBase, ArchiverDataStoreUpdater, KVArchiverDataStore } from '@aztec/archiver';
 import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
-import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { isDefined } from '@aztec/foundation/types';
-import { CommitteeAttestation, L2Block, PublishedL2Block } from '@aztec/stdlib/block';
-import { Checkpoint } from '@aztec/stdlib/checkpoint';
-// We are extending the ArchiverDataStoreHelper here because it provides most of the endpoints needed by the
-// node for reading from and writing to state, without needing any of the extra overhead that the Archiver itself
-// requires (i.e. an L1 client)
-export class TXEArchiver extends ArchiverStoreHelper {
+/**
+ * TXE Archiver implementation.
+ * Provides most of the endpoints needed by the node for reading from and writing to state,
+ * without needing any of the extra overhead that the Archiver itself requires (i.e. an L1 client).
+ */ export class TXEArchiver extends ArchiverDataSourceBase {
+    updater = new ArchiverDataStoreUpdater(this.store);
     constructor(db){
-        super(new KVArchiverDataStore(db, 9999));
-    }
-    async getBlock(number) {
-        if (number === 0) {
-            return undefined;
-        }
-        const publishedBlocks = await this.getPublishedBlocks(number, 1);
-        if (publishedBlocks.length === 0) {
-            return undefined;
-        }
-        return publishedBlocks[0].block;
-    }
-    async getBlocks(from, limit, proven) {
-        const publishedBlocks = await this.getPublishedBlocks(from, limit, proven);
-        return publishedBlocks.map((x)=>x.block);
-    }
-    async addCheckpoints(checkpoints, _result) {
-        const allBlocks = checkpoints.flatMap((ch)=>ch.checkpoint.blocks);
-        const opResults = await Promise.all([
-            this.store.addLogs(allBlocks),
-            this.store.addCheckpoints(checkpoints)
-        ]);
-        return opResults.every(Boolean);
-    }
-    /**
-   * Gets the number of the latest L2 block processed by the block source implementation.
-   * @returns The number of the latest L2 block processed by the block source implementation.
-   */ getBlockNumber() {
-        return this.store.getLatestBlockNumber();
-    }
-    /**
-   * Gets the number of the latest L2 block proven seen by the block source implementation.
-   * @returns The number of the latest L2 block proven seen by the block source implementation.
-   */ getProvenBlockNumber() {
-        return this.store.getProvenBlockNumber();
-    }
-    /**
-   * Gets a published l2 block. If a negative number is passed, the block returned is the most recent.
-   * @param number - The block number to return (inclusive).
-   * @returns The requested L2 block.
-   */ async getPublishedBlock(number) {
-        // If the number provided is -ve, then return the latest block.
-        if (number < 0) {
-            number = await this.store.getLatestBlockNumber();
-        }
-        if (number == 0) {
-            return undefined;
-        }
-        const publishedBlocks = await this.retrievePublishedBlocks(BlockNumber(number), 1);
-        return publishedBlocks.length === 0 ? undefined : publishedBlocks[0];
-    }
-    getPublishedBlocks(from, limit, proven) {
-        return this.retrievePublishedBlocks(from, limit, proven);
-    }
-    async getL2BlocksNew(from, limit, proven) {
-        const blocks = await this.store.getBlocks(from, limit);
-        if (proven === true) {
-            const provenBlockNumber = await this.store.getProvenBlockNumber();
-            return blocks.filter((b)=>b.number <= provenBlockNumber);
-        }
-        return blocks;
-    }
-    async retrievePublishedBlocks(from, limit, proven) {
-        const checkpoints = await this.store.getRangeOfCheckpoints(CheckpointNumber(from), limit);
-        const provenCheckpointNumber = await this.store.getProvenCheckpointNumber();
-        const blocks = (await Promise.all(checkpoints.map((ch)=>this.store.getBlocksForCheckpoint(ch.checkpointNumber)))).filter(isDefined);
-        const olbBlocks = [];
-        for(let i = 0; i < checkpoints.length; i++){
-            const blockForCheckpoint = blocks[i][0];
-            const checkpoint = checkpoints[i];
-            if (proven === true && checkpoint.checkpointNumber > provenCheckpointNumber) {
-                continue;
-            }
-            const oldCheckpoint = new Checkpoint(blockForCheckpoint.archive, checkpoint.header, [
-                blockForCheckpoint
-            ], checkpoint.checkpointNumber);
-            const oldBlock = L2Block.fromCheckpoint(oldCheckpoint);
-            const publishedBlock = new PublishedL2Block(oldBlock, checkpoint.l1, checkpoint.attestations.map((x)=>CommitteeAttestation.fromBuffer(x)));
-            olbBlocks.push(publishedBlock);
-        }
-        return olbBlocks;
-    }
-    /**
-   * Gets an l2 block. If a negative number is passed, the block returned is the most recent.
-   * @param number - The block number to return (inclusive).
-   * @returns The requested L2 block.
-   */ getL2Block(number) {
-        return this.getPublishedBlock(number != 'latest' ? number : -1).then((b)=>b?.block);
-    }
-    /**
-   * Gets an L2 block (new format).
-   * @param number - The block number to return.
-   * @returns The requested L2 block.
-   */ getL2BlockNew(number) {
-        if (number === 0) {
-            return Promise.resolve(undefined);
-        }
-        return this.store.getBlock(number);
-    }
-    /**
-   * Gets an l2 block header.
-   * @param number - The block number to return or 'latest' for the most recent one.
-   * @returns The requested L2 block header.
-   */ async getBlockHeader(number) {
-        if (number === 'latest') {
-            number = await this.store.getLatestBlockNumber();
-        }
-        if (number === 0) {
-            return undefined;
-        }
-        const headers = await this.store.getBlockHeaders(BlockNumber(number), 1);
-        return headers.length === 0 ? undefined : headers[0];
-    }
-    getBlockRange(from, limit, _proven) {
-        return this.getPublishedBlocks(BlockNumber(from), limit).then((blocks)=>blocks.map((b)=>b.block));
-    }
-    getPublishedCheckpoints(_from, _limit) {
-        throw new Error('TXE Archiver does not implement "getPublishedCheckpoints"');
-    }
-    getCheckpointByArchive(_archive) {
-        throw new Error('TXE Archiver does not implement "getCheckpointByArchive"');
+        const store = new KVArchiverDataStore(db, 9999, {
+            epochDuration: 32
+        });
+        super(store);
     }
-    getL2SlotNumber() {
-        throw new Error('TXE Archiver does not implement "getL2SlotNumber"');
+    async addCheckpoints(checkpoints, result) {
+        await this.updater.addCheckpoints(checkpoints, result);
     }
-    getL2EpochNumber() {
-        throw new Error('TXE Archiver does not implement "getL2EpochNumber"');
+    getRollupAddress() {
+        throw new Error('TXE Archiver does not implement "getRollupAddress"');
     }
-    getCheckpointsForEpoch(_epochNumber) {
-        throw new Error('TXE Archiver does not implement "getCheckpointsForEpoch"');
+    getRegistryAddress() {
+        throw new Error('TXE Archiver does not implement "getRegistryAddress"');
     }
-    getBlocksForEpoch(_epochNumber) {
-        throw new Error('TXE Archiver does not implement "getBlocksForEpoch"');
+    getL1Constants() {
+        throw new Error('TXE Archiver does not implement "getL1Constants"');
     }
-    getBlockHeadersForEpoch(_epochNumber) {
-        throw new Error('TXE Archiver does not implement "getBlockHeadersForEpoch"');
+    getGenesisValues() {
+        return Promise.resolve({
+            genesisArchiveRoot: new Fr(GENESIS_ARCHIVE_ROOT)
+        });
     }
-    isEpochComplete(_epochNumber) {
-        throw new Error('TXE Archiver does not implement "isEpochComplete"');
+    getL1Timestamp() {
+        throw new Error('TXE Archiver does not implement "getL1Timestamp"');
     }
     async getL2Tips() {
         // In TXE there is no possibility of reorgs and no blocks are ever getting proven so we just set 'latest', 'proven'
@@ -163,7 +47,7 @@ export class TXEArchiver extends ArchiverStoreHelper {
         if (!checkpointedBlock) {
             throw new Error(`L2Tips requested from TXE Archiver but no checkpointed block found for block number ${number}`);
         }
-        const checkpoint = await this.store.getRangeOfCheckpoints(CheckpointNumber(number), 1);
+        const checkpoint = await this.store.getRangeOfCheckpoints(CheckpointNumber.fromBlockNumber(number), 1);
         if (checkpoint.length === 0) {
             throw new Error(`L2Tips requested from TXE Archiver but no checkpoint found for block number ${number}`);
         }
@@ -186,44 +70,16 @@ export class TXEArchiver extends ArchiverStoreHelper {
             checkpointed: tipId
         };
     }
-    getL1Constants() {
-        throw new Error('TXE Archiver does not implement "getL2Constants"');
+    getL2SlotNumber() {
+        throw new Error('TXE Archiver does not implement "getL2SlotNumber"');
     }
-    getGenesisValues() {
-        return Promise.resolve({
-            genesisArchiveRoot: new Fr(GENESIS_ARCHIVE_ROOT)
-        });
+    getL2EpochNumber() {
+        throw new Error('TXE Archiver does not implement "getL2EpochNumber"');
+    }
+    isEpochComplete(_epochNumber) {
+        throw new Error('TXE Archiver does not implement "isEpochComplete"');
     }
     syncImmediate() {
         throw new Error('TXE Archiver does not implement "syncImmediate"');
     }
-    getContract(_address, _timestamp) {
-        throw new Error('TXE Archiver does not implement "getContract"');
-    }
-    getRollupAddress() {
-        throw new Error('TXE Archiver does not implement "getRollupAddress"');
-    }
-    getRegistryAddress() {
-        throw new Error('TXE Archiver does not implement "getRegistryAddress"');
-    }
-    getL1Timestamp() {
-        throw new Error('TXE Archiver does not implement "getL1Timestamp"');
-    }
-    isPendingChainInvalid() {
-        return Promise.resolve(false);
-    }
-    getPendingChainValidationStatus() {
-        return Promise.resolve({
-            valid: true
-        });
-    }
-    getPublishedBlockByHash(_blockHash) {
-        throw new Error('Method not implemented.');
-    }
-    getPublishedBlockByArchive(_archive) {
-        throw new Error('Method not implemented.');
-    }
-    getCheckpointedBlocks(_from, _limit, _proven) {
-        throw new Error('TXE Archiver does not implement "getCheckpointedBlocks"');
-    }
 }

package/dest/state_machine/index.d.ts

@@ -13,4 +13,4 @@ export declare class TXEStateMachine {
     static create(db: AztecAsyncKVStore): Promise<TXEStateMachine>;
     handleL2Block(block: L2Block): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdGF0ZV9tYWNoaW5lL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDekQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRTlDLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR2pFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFJNUMsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBS3BELHFCQUFhLGVBQWU7SUFFakIsSUFBSSxFQUFFLFNBQVM7SUFDZixZQUFZLEVBQUUsZUFBZTtJQUM3QixRQUFRLEVBQUUsV0FBVztJQUNyQixnQkFBZ0IsRUFBRSxnQkFBZ0I7SUFKM0MsWUFDUyxJQUFJLEVBQUUsU0FBUyxFQUNmLFlBQVksRUFBRSxlQUFlLEVBQzdCLFFBQVEsRUFBRSxXQUFXLEVBQ3JCLGdCQUFnQixFQUFFLGdCQUFnQixFQUN2QztJQUVKLE9BQW9CLE1BQU0sQ0FBQyxFQUFFLEVBQUUsaUJBQWlCLDRCQStCL0M7SUFFWSxhQUFhLENBQUMsS0FBSyxFQUFFLE9BQU8saUJBZ0J4QztDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdGF0ZV9tYWNoaW5lL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDekQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRTlDLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBSWpFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFJNUMsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBS3BELHFCQUFhLGVBQWU7SUFFakIsSUFBSSxFQUFFLFNBQVM7SUFDZixZQUFZLEVBQUUsZUFBZTtJQUM3QixRQUFRLEVBQUUsV0FBVztJQUNyQixnQkFBZ0IsRUFBRSxnQkFBZ0I7SUFKM0MsWUFDUyxJQUFJLEVBQUUsU0FBUyxFQUNmLFlBQVksRUFBRSxlQUFlLEVBQzdCLFFBQVEsRUFBRSxXQUFXLEVBQ3JCLGdCQUFnQixFQUFFLGdCQUFnQixFQUN2QztJQUVKLE9BQW9CLE1BQU0sQ0FBQyxFQUFFLEVBQUUsaUJBQWlCLDRCQStCL0M7SUFFWSxhQUFhLENBQUMsS0FBSyxFQUFFLE9BQU8saUJBbUN4QztDQUNGIn0=

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,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,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;IAJ3C,YACS,IAAI,EAAE,SAAS,EACf,YAAY,EAAE,eAAe,EAC7B,QAAQ,EAAE,WAAW,EACrB,gBAAgB,EAAE,gBAAgB,EACvC;IAEJ,OAAoB,MAAM,CAAC,EAAE,EAAE,iBAAiB,4BA+B/C;IAEY,aAAa,CAAC,KAAK,EAAE,OAAO,iBAgBxC;CACF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/state_machine/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAIjE,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;IAJ3C,YACS,IAAI,EAAE,SAAS,EACf,YAAY,EAAE,eAAe,EAC7B,QAAQ,EAAE,WAAW,EACrB,gBAAgB,EAAE,gBAAgB,EACvC;IAEJ,OAAoB,MAAM,CAAC,EAAE,EAAE,iBAAiB,4BA+B/C;IAEY,aAAa,CAAC,KAAK,EAAE,OAAO,iBAmCxC;CACF"}

package/dest/state_machine/index.js

@@ -1,8 +1,11 @@
 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 { AnchorBlockStore } from '@aztec/pxe/server';
-import { L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+import { Checkpoint, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import { TXEArchiver } from './archiver.js';
 import { DummyP2P } from './dummy_p2p_client.js';
@@ -32,14 +35,29 @@ export class TXEStateMachine {
         return new this(node, synchronizer, archiver, anchorBlockStore);
     }
     async handleL2Block(block) {
-        const checkpoint = block.toCheckpoint();
+        // Create a checkpoint from the block manually
+        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.fromBlockNumber(block.number));
         const publishedCheckpoint = new PublishedCheckpoint(checkpoint, new L1PublishedData(BigInt(block.header.globalVariables.blockNumber), block.header.globalVariables.timestamp, block.header.globalVariables.blockNumber.toString()), []);
         await Promise.all([
-            this.synchronizer.handleL2Block(block.toL2Block()),
+            this.synchronizer.handleL2Block(block),
             this.archiver.addCheckpoints([
                 publishedCheckpoint
             ], undefined),
-            this.anchorBlockStore.setHeader(block.getBlockHeader())
+            this.anchorBlockStore.setHeader(block.header)
         ]);
     }
 }