@aztec/txe 0.0.1-commit.24de95ac → 0.0.1-commit.2e2504e2

package/dest/rpc_translator.js

@@ -1,10 +1,13 @@
 import { Fr, Point } from '@aztec/aztec.js/fields';
 import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX } from '@aztec/constants';
-import { packAsRetrievedNote } from '@aztec/pxe/simulator';
-import { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+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;
 export class UnavailableOracleError extends Error {
     constructor(oracleName){
         super(`${oracleName} oracles not available with the current handler`);
@@ -64,7 +67,7 @@ export class RPCTranslator {
     }
     async txeSetPrivateTXEContext(foreignContractAddressIsSome, foreignContractAddressValue, foreignAnchorBlockNumberIsSome, foreignAnchorBlockNumberValue) {
         const contractAddress = fromSingle(foreignContractAddressIsSome).toBool() ? AztecAddress.fromField(fromSingle(foreignContractAddressValue)) : undefined;
-        const anchorBlockNumber = fromSingle(foreignAnchorBlockNumberIsSome).toBool() ? fromSingle(foreignAnchorBlockNumberValue).toNumber() : undefined;
+        const anchorBlockNumber = fromSingle(foreignAnchorBlockNumberIsSome).toBool() ? BlockNumber(fromSingle(foreignAnchorBlockNumberValue).toNumber()) : undefined;
         const privateContextInputs = await this.stateHandler.enterPrivateState(contractAddress, anchorBlockNumber);
         return toForeignCallResult(privateContextInputs.toFields().map(toSingle));
     }
@@ -80,6 +83,12 @@ export class RPCTranslator {
     }
     // Other oracles - these get handled by the oracle handler
     // TXE-specific oracles
+    txeGetDefaultAddress() {
+        const defaultAddress = this.handlerAsTxe().txeGetDefaultAddress();
+        return toForeignCallResult([
+            toSingle(defaultAddress)
+        ]);
+    }
     async txeGetNextBlockNumber() {
         const nextBlockNumber = await this.handlerAsTxe().txeGetNextBlockNumber();
         return toForeignCallResult([
@@ -163,8 +172,29 @@ export class RPCTranslator {
             ...arrayToBoundedVec(toArray(nullifiers), MAX_NULLIFIERS_PER_TX)
         ]);
     }
-    // Since the argument is a slice, noir automatically adds a length field to oracle call.
-    privateStoreInExecutionCache(_foreignLength, foreignValues, foreignHash) {
+    async txeGetPrivateEvents(foreignSelector, foreignContractAddress, foreignScope) {
+        const selector = EventSelector.fromField(fromSingle(foreignSelector));
+        const contractAddress = addressFromSingle(foreignContractAddress);
+        const scope = addressFromSingle(foreignScope);
+        const events = await this.handlerAsTxe().txeGetPrivateEvents(selector, contractAddress, scope);
+        if (events.length > MAX_PRIVATE_EVENTS_PER_TXE_QUERY) {
+            throw new Error(`Array of length ${events.length} larger than maxLen ${MAX_PRIVATE_EVENTS_PER_TXE_QUERY}`);
+        }
+        if (events.some((e)=>e.length > MAX_EVENT_LEN)) {
+            throw new Error(`Some private event has length larger than maxLen ${MAX_EVENT_LEN}`);
+        }
+        // This is a workaround as Noir does not currently let us return nested structs with arrays. We instead return a raw
+        // multidimensional array in get_private_events_oracle and create the BoundedVecs here.
+        const rawArrayStorage = events.map((e)=>e.concat(Array(MAX_EVENT_LEN - e.length).fill(new Fr(0)))).concat(Array(MAX_PRIVATE_EVENTS_PER_TXE_QUERY - events.length).fill(Array(MAX_EVENT_LEN).fill(new Fr(0)))).flat();
+        const eventLengths = events.map((e)=>new Fr(e.length)).concat(Array(MAX_PRIVATE_EVENTS_PER_TXE_QUERY - events.length).fill(new Fr(0)));
+        const queryLength = new Fr(events.length);
+        return toForeignCallResult([
+            toArray(rawArrayStorage),
+            toArray(eventLengths),
+            toSingle(queryLength)
+        ]);
+    }
+    privateStoreInExecutionCache(foreignValues, foreignHash) {
         const values = fromArray(foreignValues);
         const hash = fromSingle(foreignHash);
         this.handlerAsPrivate().privateStoreInExecutionCache(values, hash);
@@ -186,26 +216,28 @@ 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 = 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 = 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(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);
         const numSelects = fromSingle(foreignNumSelects).toNumber();
         const selectByIndexes = fromArray(foreignSelectByIndexes).map((fr)=>fr.toNumber());
@@ -221,21 +253,31 @@ export class RPCTranslator {
         const offset = fromSingle(foreignOffset).toNumber();
         const status = fromSingle(foreignStatus).toNumber();
         const maxNotes = fromSingle(foreignMaxNotes).toNumber();
-        const packedRetrievedNoteLength = fromSingle(foreignPackedRetrievedNoteLength).toNumber();
-        const noteDatas = await this.handlerAsUtility().utilityGetNotes(storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status);
-        const returnDataAsArrayOfArrays = noteDatas.map(packAsRetrievedNote);
+        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)=>packAsHintedNote({
+                contractAddress: noteData.contractAddress,
+                owner: noteData.owner,
+                randomness: noteData.randomness,
+                storageSlot: noteData.storageSlot,
+                noteNonce: noteData.noteNonce,
+                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(foreignStorageSlot, foreignNoteTypeId, foreignNote, foreignNoteHash, foreignCounter) {
+    privateNotifyCreatedNote(foreignOwner, foreignStorageSlot, foreignRandomness, foreignNoteTypeId, foreignNote, foreignNoteHash, foreignCounter) {
+        const owner = addressFromSingle(foreignOwner);
         const storageSlot = fromSingle(foreignStorageSlot);
+        const randomness = fromSingle(foreignRandomness);
         const noteTypeId = NoteSelector.fromField(fromSingle(foreignNoteTypeId));
         const note = fromArray(foreignNote);
         const noteHash = fromSingle(foreignNoteHash);
         const counter = fromSingle(foreignCounter).toNumber();
-        this.handlerAsPrivate().privateNotifyCreatedNote(storageSlot, noteTypeId, note, noteHash, counter);
+        this.handlerAsPrivate().privateNotifyCreatedNote(owner, storageSlot, randomness, noteTypeId, note, noteHash, counter);
         return toForeignCallResult([]);
     }
     async privateNotifyNullifiedNote(foreignInnerNullifier, foreignNoteHash, foreignCounter) {
@@ -250,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);
@@ -268,15 +318,27 @@ export class RPCTranslator {
             ...instance.publicKeys.toFields()
         ].map(toSingle));
     }
-    async utilityGetPublicKeysAndPartialAddress(foreignAddress) {
+    async utilityTryGetPublicKeysAndPartialAddress(foreignAddress) {
         const address = addressFromSingle(foreignAddress);
-        const { publicKeys, partialAddress } = await this.handlerAsUtility().utilityGetPublicKeysAndPartialAddress(address);
-        return toForeignCallResult([
-            toArray([
-                ...publicKeys.toFields(),
-                partialAddress
-            ])
-        ]);
+        const result = await this.handlerAsUtility().utilityTryGetPublicKeysAndPartialAddress(address);
+        // We are going to return a Noir Option struct to represent the possibility of null values. Options are a struct
+        // with two fields: `some` (a boolean) and `value` (a field array in this case).
+        if (result === undefined) {
+            // No data was found so we set `some` to 0 and pad `value` with zeros get the correct return size.
+            return toForeignCallResult([
+                toSingle(new Fr(0)),
+                toArray(Array(13).fill(new Fr(0)))
+            ]);
+        } else {
+            // Data was found so we set `some` to 1 and return it along with `value`.
+            return toForeignCallResult([
+                toSingle(new Fr(1)),
+                toArray([
+                    ...result.publicKeys.toFields(),
+                    result.partialAddress
+                ])
+            ]);
+        }
     }
     async utilityGetKeyValidationRequest(foreignPkMHash) {
         const pkMHash = fromSingle(foreignPkMHash);
@@ -286,12 +348,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 = 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());
     }
@@ -314,37 +376,49 @@ export class RPCTranslator {
     privateNotifySetMinRevertibleSideEffectCounter(_foreignMinRevertibleSideEffectCounter) {
         throw new Error('Enqueueing public calls is not supported in TestEnvironment::private_context');
     }
-    async utilityGetUtilityContext() {
-        const context = await this.handlerAsUtility().utilityGetUtilityContext();
+    async privateIsSideEffectCounterRevertible(foreignSideEffectCounter) {
+        const sideEffectCounter = fromSingle(foreignSideEffectCounter).toNumber();
+        const isRevertible = await this.handlerAsPrivate().privateIsSideEffectCounterRevertible(sideEffectCounter);
+        return toForeignCallResult([
+            toSingle(new Fr(isRevertible))
+        ]);
+    }
+    utilityGetUtilityContext() {
+        const context = this.handlerAsUtility().utilityGetUtilityContext();
         return toForeignCallResult(context.toNoirRepresentation());
     }
     async utilityGetBlockHeader(foreignBlockNumber) {
-        const blockNumber = fromSingle(foreignBlockNumber).toNumber();
+        const blockNumber = BlockNumber(fromSingle(foreignBlockNumber).toNumber());
         const header = await this.handlerAsUtility().utilityGetBlockHeader(blockNumber);
         if (!header) {
             throw new Error(`Block header not found for block ${blockNumber}.`);
         }
         return toForeignCallResult(header.toFields().map(toSingle));
     }
-    async utilityGetMembershipWitness(foreignBlockNumber, foreignTreeId, foreignLeafValue) {
-        const 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 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(foreignBlockNumber, foreignNullifier) {
-        const blockNumber = fromSingle(foreignBlockNumber).toNumber();
+    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());
     }
@@ -353,11 +427,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) {
@@ -438,9 +512,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))
         ]);
@@ -494,10 +569,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))
         ]);
@@ -553,7 +627,7 @@ export class RPCTranslator {
     avmOpcodeSuccessCopy() {
         throw new Error('Contract calls are forbidden inside a `TestEnvironment::public_context`, use `public_call` instead');
     }
-    async txePrivateCallNewFlow(foreignFrom, foreignTargetContractAddress, foreignFunctionSelector, _foreignArgsLength, foreignArgs, foreignArgsHash, foreignIsStaticCall) {
+    async txePrivateCallNewFlow(foreignFrom, foreignTargetContractAddress, foreignFunctionSelector, foreignArgs, foreignArgsHash, foreignIsStaticCall) {
         const from = addressFromSingle(foreignFrom);
         const targetContractAddress = addressFromSingle(foreignTargetContractAddress);
         const functionSelector = FunctionSelector.fromField(fromSingle(foreignFunctionSelector));
@@ -565,7 +639,7 @@ export class RPCTranslator {
             toArray(returnValues)
         ]);
     }
-    async txeSimulateUtilityFunction(foreignTargetContractAddress, foreignFunctionSelector, _foreignArgsLength, foreignArgs) {
+    async txeSimulateUtilityFunction(foreignTargetContractAddress, foreignFunctionSelector, foreignArgs) {
         const targetContractAddress = addressFromSingle(foreignTargetContractAddress);
         const functionSelector = FunctionSelector.fromField(fromSingle(foreignFunctionSelector));
         const args = fromArray(foreignArgs);
@@ -574,7 +648,7 @@ export class RPCTranslator {
             toArray(returnValues)
         ]);
     }
-    async txePublicCallNewFlow(foreignFrom, foreignAddress, _foreignLength, foreignCalldata, foreignIsStaticCall) {
+    async txePublicCallNewFlow(foreignFrom, foreignAddress, foreignCalldata, foreignIsStaticCall) {
         const from = addressFromSingle(foreignFrom);
         const address = addressFromSingle(foreignAddress);
         const calldata = fromArray(foreignCalldata);

package/dest/state_machine/archiver.d.ts

@@ -1,61 +1,31 @@
-import { ArchiverStoreHelper, type PublishedL2Block } from '@aztec/archiver';
+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 { Fr } from '@aztec/foundation/fields';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { L2Block, L2BlockSource, L2Tips, ValidateBlockResult } from '@aztec/stdlib/block';
-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);
-    addBlocks(blocks: PublishedL2Block[]): 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<number>;
-    /**
-     * 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<number>;
-    /**
-     * 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>;
-    /**
-     * 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.
-     */
-    getBlock(number: number | 'latest'): Promise<L2Block | 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>;
-    getBlocks(from: number, limit: number, _proven?: boolean): Promise<L2Block[]>;
-    getL2SlotNumber(): Promise<bigint>;
-    getL2EpochNumber(): Promise<bigint>;
-    getBlocksForEpoch(_epochNumber: bigint): Promise<L2Block[]>;
-    getBlockHeadersForEpoch(_epochNumber: bigint): Promise<BlockHeader[]>;
-    isEpochComplete(_epochNumber: bigint): 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<ValidateBlockResult>;
 }
-//# sourceMappingURL=archiver.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdGF0ZV9tYWNoaW5lL2FyY2hpdmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxzQkFBc0IsRUFBaUQsTUFBTSxpQkFBaUIsQ0FBQztBQUV4RyxPQUFPLEVBQW9CLEtBQUssV0FBVyxFQUFFLEtBQUssVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEcsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQW9DLE1BQU0sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzlHLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDcEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVyRTs7OztHQUlHO0FBQ0gscUJBQWEsV0FBWSxTQUFRLHNCQUFzQjtJQUNyRCxPQUFPLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBNEM7SUFFcEUsWUFBWSxFQUFFLEVBQUUsaUJBQWlCLEVBR2hDO0lBRVksY0FBYyxDQUFDLFdBQVcsRUFBRSxtQkFBbUIsRUFBRSxFQUFFLE1BQU0sQ0FBQyxFQUFFLHdCQUF3QixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFaEg7SUFFTSxnQkFBZ0IsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLENBRTdDO0lBRU0sa0JBQWtCLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUUvQztJQUVNLGNBQWMsSUFBSSxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FFbEQ7SUFFTSxnQkFBZ0IsSUFBSSxPQUFPLENBQUM7UUFBRSxrQkFBa0IsRUFBRSxFQUFFLENBQUE7S0FBRSxDQUFDLENBRTdEO0lBRU0sY0FBYyxJQUFJLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRW5EO0lBRVksU0FBUyxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FnQ3hDO0lBRU0sZUFBZSxJQUFJLE9BQU8sQ0FBQyxVQUFVLEdBQUcsU0FBUyxDQUFDLENBRXhEO0lBRU0sZ0JBQWdCLElBQUksT0FBTyxDQUFDLFdBQVcsR0FBRyxTQUFTLENBQUMsQ0FFMUQ7SUFFTSxlQUFlLENBQUMsWUFBWSxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBRWxFO0lBRU0sYUFBYSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFcEM7Q0FDRiJ9

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":"AAAA,OAAO,EAAE,mBAAmB,EAAuB,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAElG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/F,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAKlD,qBAAa,WAAY,SAAQ,mBAAoB,YAAW,aAAa;gBAC/D,EAAE,EAAE,iBAAiB;IAIX,SAAS,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAS7E;;;OAGG;IACI,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAIxC;;;OAGG;IACI,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC;IAI9C;;;;OAIG;IACmB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAY9F;;;;OAIG;IACI,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAIxE;;;;OAIG;IACU,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAWjF,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAI7E,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAIlC,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;IAInC,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAI3D,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAIrE,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvD,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5B,cAAc,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAI5C,gBAAgB,IAAI,OAAO,CAAC;QAAE,kBAAkB,EAAE,EAAE,CAAA;KAAE,CAAC;IAIvD,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAI1G,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC;IAIvC,kBAAkB,IAAI,OAAO,CAAC,UAAU,CAAC;IAIzC,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAIjC,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC;IAIhC,+BAA+B,IAAI,OAAO,CAAC,mBAAmB,CAAC;CAGhF"}
+{"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,CAgCxC;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,70 +1,76 @@
-import { ArchiverStoreHelper, KVArchiverDataStore } from '@aztec/archiver';
+import { ArchiverDataSourceBase, ArchiverDataStoreUpdater, KVArchiverDataStore } from '@aztec/archiver';
 import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
-// 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 {
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+/**
+ * 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));
+        const store = new KVArchiverDataStore(db, 9999, {
+            epochDuration: 32
+        });
+        super(store);
     }
-    async addBlocks(blocks) {
-        const opResults = await Promise.all([
-            this.store.addLogs(blocks.map((block)=>block.block)),
-            this.store.addBlocks(blocks)
-        ]);
-        return opResults.every(Boolean);
+    async addCheckpoints(checkpoints, result) {
+        await this.updater.addCheckpoints(checkpoints, result);
     }
-    /**
-   * 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.getSynchedL2BlockNumber();
+    getRollupAddress() {
+        throw new Error('TXE Archiver does not implement "getRollupAddress"');
     }
-    /**
-   * 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.getSynchedL2BlockNumber();
+    getRegistryAddress() {
+        throw new Error('TXE Archiver does not implement "getRegistryAddress"');
     }
-    /**
-   * 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.getSynchedL2BlockNumber();
-        }
-        if (number == 0) {
-            return undefined;
-        }
-        const blocks = await this.store.getPublishedBlocks(number, 1);
-        return blocks.length === 0 ? undefined : blocks[0];
+    getL1Constants() {
+        throw new Error('TXE Archiver does not implement "getL1Constants"');
     }
-    /**
-   * 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.
-   */ getBlock(number) {
-        return this.getPublishedBlock(number != 'latest' ? number : -1).then((block)=>block?.block);
+    getGenesisValues() {
+        return Promise.resolve({
+            genesisArchiveRoot: new Fr(GENESIS_ARCHIVE_ROOT)
+        });
     }
-    /**
-   * 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.getSynchedL2BlockNumber();
+    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'
+        // and 'finalized' to the latest block.
+        const blockHeader = await this.getBlockHeader('latest');
+        if (!blockHeader) {
+            throw new Error('L2Tips requested from TXE Archiver but no block header found');
         }
-        if (number === 0) {
-            return undefined;
+        const number = blockHeader.globalVariables.blockNumber;
+        const hash = (await blockHeader.hash()).toString();
+        const checkpointedBlock = await this.getCheckpointedBlock(number);
+        if (!checkpointedBlock) {
+            throw new Error(`L2Tips requested from TXE Archiver but no checkpointed block found for block number ${number}`);
         }
-        const headers = await this.store.getBlockHeaders(number, 1);
-        return headers.length === 0 ? undefined : headers[0];
-    }
-    getBlocks(from, limit, _proven) {
-        return this.getPublishedBlocks(from, limit).then((blocks)=>blocks.map((b)=>b.block));
+        // 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 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}`);
+        }
+        const blockId = {
+            number,
+            hash
+        };
+        const checkpointId = {
+            number: checkpoint[0].checkpointNumber,
+            hash: checkpoint[0].header.hash().toString()
+        };
+        const tipId = {
+            block: blockId,
+            checkpoint: checkpointId
+        };
+        return {
+            proposed: blockId,
+            proven: tipId,
+            finalized: tipId,
+            checkpointed: tipId
+        };
     }
     getL2SlotNumber() {
         throw new Error('TXE Archiver does not implement "getL2SlotNumber"');
@@ -72,47 +78,10 @@ export class TXEArchiver extends ArchiverStoreHelper {
     getL2EpochNumber() {
         throw new Error('TXE Archiver does not implement "getL2EpochNumber"');
     }
-    getBlocksForEpoch(_epochNumber) {
-        throw new Error('TXE Archiver does not implement "getBlocksForEpoch"');
-    }
-    getBlockHeadersForEpoch(_epochNumber) {
-        throw new Error('TXE Archiver does not implement "getBlockHeadersForEpoch"');
-    }
     isEpochComplete(_epochNumber) {
         throw new Error('TXE Archiver does not implement "isEpochComplete"');
     }
-    getL2Tips() {
-        throw new Error('TXE Archiver does not implement "getL2Tips"');
-    }
-    getL1Constants() {
-        throw new Error('TXE Archiver does not implement "getL2Constants"');
-    }
-    getGenesisValues() {
-        return Promise.resolve({
-            genesisArchiveRoot: new Fr(GENESIS_ARCHIVE_ROOT)
-        });
-    }
     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
-        });
-    }
 }