@aztec-labs/pxe 6.0.0-rc.1 → 6.0.0-rc.3

package/src/contract_function_simulator/oracle/utility_execution_oracle.ts

@@ -5,7 +5,7 @@ import {
   PRIVATE_LOG_CIPHERTEXT_LEN,
 } from '@aztec-labs/constants';
 import type { BlockNumber } from '@aztec-labs/foundation/branded-types';
-import { uniqueBy } from '@aztec-labs/foundation/collection';
+import { chunk, uniqueBy } from '@aztec-labs/foundation/collection';
 import { Aes128 } from '@aztec-labs/foundation/crypto/aes128';
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
 import { Point } from '@aztec-labs/foundation/curves/grumpkin';
@@ -28,12 +28,16 @@ import { AztecAddress } from '@aztec-labs/stdlib/aztec-address';
 import { BlockHash, type BlockParameter, type L2TipsProvider } from '@aztec-labs/stdlib/block';
 import type { CompleteAddress, ContractInstancePreimageWithAddress, PartialAddress } from '@aztec-labs/stdlib/contract';
 import { siloNullifier } from '@aztec-labs/stdlib/hash';
-import type { AztecNode } from '@aztec-labs/stdlib/interfaces/server';
+import { type AztecNode, MAX_RPC_LEN } from '@aztec-labs/stdlib/interfaces/client';
 import type { KeyValidationRequest } from '@aztec-labs/stdlib/kernel';
 import { PublicKeys, computeAddressSecret, hashPublicKey } from '@aztec-labs/stdlib/keys';
 import { AppTaggingSecret, FlatPublicLogs, appSiloEcdhSharedSecret } from '@aztec-labs/stdlib/logs';
-import { type UnsiloedMessageNullifier, getL1ToL2MessageWitness } from '@aztec-labs/stdlib/messaging';
-import type { NoteStatus } from '@aztec-labs/stdlib/note';
+import {
+  type UnsiloedMessageNullifier,
+  getL1ToL2MessageWitness,
+  lookUpL1ToL2MessageWitness,
+} from '@aztec-labs/stdlib/messaging';
+import { NoteStatus } from '@aztec-labs/stdlib/note';
 import { MerkleTreeId } from '@aztec-labs/stdlib/trees';
 import {
   type BlockHeader,
@@ -58,7 +62,7 @@ import type { AddressStore } from '../../storage/address_store/address_store.js'
 import { assertAllowedScope } from '../../storage/allowed_scopes.js';
 import type { CapsuleService } from '../../storage/capsule_store/capsule_service.js';
 import { FactCollectionKey, FactCollectionTypeKey, anchoredTipBlockNumbers } from '../../storage/fact_store/index.js';
-import type { FactService, OriginBlock } from '../../storage/fact_store/index.js';
+import type { BlockReference, FactService } from '../../storage/fact_store/index.js';
 import type { NoteStore } from '../../storage/note_store/note_store.js';
 import type { PrivateEventStore } from '../../storage/private_event_store/private_event_store.js';
 import type { ChangeSetId } from '../../storage/staged_write_coordinator.js';
@@ -74,11 +78,13 @@ import { type FactCollection, emptyFactCollection, toNoirFactCollection } from '
 import type { LogRetrievalRequest } from '../noir-structs/log_retrieval_request.js';
 import type { LogRetrievalResponse } from '../noir-structs/log_retrieval_response.js';
 import type { NoteData } from '../noir-structs/note_data.js';
+import type { NoteOrigin } from '../noir-structs/note_origin.js';
 import type { NoteValidationRequest } from '../noir-structs/note_validation_request.js';
 import {
   type NullifierMembershipWitnessData,
   toNullifierMembershipWitnessData,
 } from '../noir-structs/nullifier_membership_witness_data.js';
+import type { NullifierStatus } from '../noir-structs/nullifier_status.js';
 import { Option } from '../noir-structs/option.js';
 import type { PendingTaggedLog } from '../noir-structs/pending_tagged_log.js';
 import type { ProvidedSecret } from '../noir-structs/provided_secret.js';
@@ -506,17 +512,65 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
   }
 
   /**
-   * Check if a nullifier exists in the nullifier tree.
-   * @param innerNullifier - The inner nullifier.
-   * @returns A boolean indicating whether the nullifier exists in the tree or not.
+   * Returns the tx and block in which a settled note of the executing contract was created, or `None` if no such note
+   * is known. Nullified notes are also returned.
    */
-  public async doesNullifierExist(innerNullifier: Fr) {
-    const [nullifier, anchor] = await allToCompletion([
-      siloNullifier(this.contractAddress, innerNullifier!),
-      this.anchorBlockHeader.toBlockParameter(),
-    ]);
-    const [leafIndex] = await this.aztecNode.findLeavesIndexes(anchor, MerkleTreeId.NULLIFIER_TREE, [nullifier]);
-    return leafIndex?.data !== undefined;
+  public async getSettledNoteOrigin(
+    noteHash: Fr,
+    contractAddress: AztecAddress,
+    noteNonce: Fr,
+  ): Promise<Option<NoteOrigin>> {
+    this.#assertOwnContract(contractAddress);
+
+    // The store is only indexed by contract, so this scans all of the contract's notes. The query is rare enough and
+    // stores are small enough that this is not a concern.
+    const notes = await this.noteStore.getNotes(
+      { contractAddress, status: NoteStatus.ACTIVE_OR_NULLIFIED, scopes: this.scopes },
+      this.changeSetId,
+    );
+    const note = notes.find(note => note.noteHash.equals(noteHash) && note.noteNonce.equals(noteNonce));
+
+    return note
+      ? Option.some({
+          txHash: note.txHash.hash,
+          block: { blockNumber: note.l2BlockNumber, blockHash: Fr.fromHexString(note.l2BlockHash) },
+        })
+      : Option.none();
+  }
+
+  /**
+   * Returns the status of each inner nullifier: whether it exists in the nullifier tree at the anchor block and, if
+   * so, the block it was inserted in. Results are aligned with the input.
+   */
+  public async getNullifierStatuses(innerNullifiers: EphemeralArray<Fr>): Promise<EphemeralArray<NullifierStatus>> {
+    const siloedNullifiers = await allToCompletion(
+      innerNullifiers
+        .readAll(this.ephemeralArrayService)
+        .map(innerNullifier => siloNullifier(this.contractAddress, innerNullifier)),
+    );
+    const statuses = await this.getSiloedNullifierStatuses(siloedNullifiers);
+    return EphemeralArray.fromValues(this.ephemeralArrayService, statuses);
+  }
+
+  /** Looks up siloed nullifiers in the nullifier tree at the anchor block, returning one status per input. */
+  protected async getSiloedNullifierStatuses(siloedNullifiers: Fr[]): Promise<NullifierStatus[]> {
+    const anchor = await this.anchorBlockHeader.toBlockParameter();
+    const leaves = (
+      await allToCompletion(
+        chunk(siloedNullifiers, MAX_RPC_LEN).map(batch =>
+          this.aztecNode.findLeavesIndexes(anchor, MerkleTreeId.NULLIFIER_TREE, batch),
+        ),
+      )
+    ).flat();
+    return leaves.map(
+      (leaf): NullifierStatus =>
+        leaf
+          ? {
+              exists: true,
+              originBlock: Option.some({ blockNumber: leaf.l2BlockNumber, blockHash: leaf.l2BlockHash.toFr() }),
+            }
+          : { exists: false, originBlock: Option.none() },
+    );
   }
 
   /**
@@ -537,6 +591,27 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
     return new MembershipWitness(L1_TO_L2_MSG_TREE_HEIGHT, messageIndex, siblingPath.toTuple());
   }
 
+  /**
+   * Returns the membership witness of an L1 to L2 message, or none if there is no such message.
+   * @param messageHash - Hash of the message.
+   * @param nullifier - When present, the unsiloed nullifier of the message and the address to silo it with. The witness
+   * is only returned if the siloed nullifier is absent from the nullifier tree, i.e. the message has not been consumed.
+   * @returns The l1 to l2 membership witness (index of message in the tree and sibling path), or none.
+   */
+  public async tryGetL1ToL2MembershipWitness(
+    messageHash: Fr,
+    nullifier: Option<UnsiloedMessageNullifier>,
+  ): Promise<Option<MembershipWitness<typeof L1_TO_L2_MSG_TREE_HEIGHT>>> {
+    const anchor = await this.anchorBlockHeader.toBlockParameter();
+    const lookup = await lookUpL1ToL2MessageWitness(this.aztecNode, messageHash, nullifier.value, anchor);
+    if (lookup.type !== 'found') {
+      return Option.none();
+    }
+
+    const [messageIndex, siblingPath] = lookup.witness;
+    return Option.some(new MembershipWitness(L1_TO_L2_MSG_TREE_HEIGHT, messageIndex, siblingPath.toTuple()));
+  }
+
   /**
    * Read the public storage data.
    * @param blockHash - The block hash to read storage at.
@@ -787,7 +862,7 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
     factCollectionId: Fr,
     factTypeId: Fr,
     payload: EphemeralArray<Fr>,
-    originBlock: Option<OriginBlock>,
+    originBlock: Option<BlockReference>,
   ): Promise<void> {
     this.#assertOwnContract(contractAddress);
     return this.factService.recordFact(

package/src/operation_queue.ts

@@ -37,6 +37,10 @@ export type SyncedOperationContext = {
  * {@link StagedWriteCoordinator}): staged writes are committed if the operation succeeds and discarded if it throws.
  */
 export class OperationQueue {
+  private static readonly WARN_QUEUE_DEPTH = 10;
+  private static readonly WARN_WAIT_MS = 30_000;
+  private static readonly WARN_INTERVAL_MS = 60_000;
+  private lastPressureWarningAt = -Infinity;
   private readonly queue = new SerialQueue();
   private readonly node: CachingAztecNode;
   private readonly synchronizer: BlockSynchronizer;
@@ -72,13 +76,40 @@ export class OperationQueue {
    */
   public run<T>(fn: () => Promise<T>): Promise<T> {
     // TODO(#12636): relax the conditions under which we forbid concurrency.
-    if (this.queue.length() != 0) {
-      this.log.warn(
-        `PXE is already processing ${this.queue.length()} operations, concurrent execution is not supported. Will run once those are complete.`,
-      );
+    const queued = new Timer();
+    const queueDepth = this.queue.length();
+    if (queueDepth >= OperationQueue.WARN_QUEUE_DEPTH) {
+      this.warnQueuePressure('depth', queueDepth, 0);
     }
+    const waitWarning = setTimeout(() => {
+      this.warnQueuePressure('wait', this.queue.length(), queued.ms());
+    }, OperationQueue.WARN_WAIT_MS);
 
-    return this.queue.put(fn);
+    return this.queue
+      .put(() => {
+        clearTimeout(waitWarning);
+        this.log.debug('Starting queued PXE operation', {
+          eventName: 'pxe_operation_started',
+          queueDepth,
+          waitMs: queued.ms(),
+        });
+        return fn();
+      })
+      .finally(() => clearTimeout(waitWarning));
+  }
+
+  private warnQueuePressure(reason: 'depth' | 'wait', queueDepth: number, waitMs: number): void {
+    const now = Date.now();
+    if (now - this.lastPressureWarningAt < OperationQueue.WARN_INTERVAL_MS) {
+      return;
+    }
+    this.lastPressureWarningAt = now;
+    this.log.warn('PXE operation queue is congested', {
+      eventName: 'pxe_operation_queue_pressure',
+      reason,
+      queueDepth,
+      waitMs,
+    });
   }
 
   /**

package/src/oracle_version.ts

@@ -10,8 +10,8 @@
 /// used to provide helpful error messages if a contract calls an oracle that doesn't exist. We don't throw immediately
 /// if AZTEC_NR_MINOR > PXE_MINOR because if a contract is updated to use a newer Aztec.nr dependency without actually
 /// using any of the new oracles then there is no reason to throw.
-export const ORACLE_VERSION_MAJOR = 31;
-export const ORACLE_VERSION_MINOR = 0;
+export const ORACLE_VERSION_MAJOR = 32;
+export const ORACLE_VERSION_MINOR = 2;
 
 /// This hash is computed from `ORACLE_REGISTRY` (each oracle's name, ordered parameter names and
 /// types, and return type) and is used to detect when the oracle interface changes. When it does, you need to either:
@@ -19,7 +19,7 @@ export const ORACLE_VERSION_MINOR = 0;
 /// - increment only `ORACLE_VERSION_MINOR` if the change is additive (a new oracle was added).
 ///
 /// These constants must be kept in sync between this file and `noir-projects/aztec-nr/aztec/src/oracle/version.nr`.
-export const ORACLE_INTERFACE_HASH = '34050955eaba2373f10bb168a41d8ea2634cf1bb3b86048cd168fe784fc82a73';
+export const ORACLE_INTERFACE_HASH = '1382416bfef61d1a54dd7dd0ab4350954b38ac2465fc19368495fffda7d69f75';
 
 /// The oracle interface served to the protocol contracts, which is versioned separately from the Aztec.nr one above.
 /// It is a single number that must match exactly: protocol contracts are only rebuilt when they are redeployed on a

package/src/storage/backwards_compatibility_tests/__snapshots__/AddressStore.json

@@ -2,21 +2,21 @@
   "complete_addresses": [
     {
       "index": 0,
-      "value": "2369ead09116908cedc1642d5e0c714ef288ecbc838e4d434f800a408914ce4413ad6965d11a533a663d07507319f74ac3305325f6f72423c0b24aa1193268bb19e95c05f09cb86d1a6257572f9082ca15d4a02373c4d8c9cee23dc61a4c2a882f9017d51bca6616102d8a1d4dba89e4ce12881a2414576f01d2fec9492814a22a1b054e998835d166711839b515d434b1fbc207ad4fdb5b2b43d6ac6b400871019f5bb255e87523d43da83ebc9fa95169b653d4abef902e011e9eac620fc45b1006a921250e1395ef3cfc24c0e57d8f6745e7660ff70a28150f569bf66b8d5b28f331bfc59268b3f8b708104b95ed3a8065805cac8a0bdb622ce038631584c00000000000000000000000000000000000000000000000000000000000000003"
+      "value": "20c1641e3181d87e3383458cd994b80833d42772f0afddb5ff41611c0524493a13ad6965d11a533a663d07507319f74ac3305325f6f72423c0b24aa1193268bb19e95c05f09cb86d1a6257572f9082ca15d4a02373c4d8c9cee23dc61a4c2a882f9017d51bca6616102d8a1d4dba89e4ce12881a2414576f01d2fec9492814a22a1b054e998835d166711839b515d434b1fbc207ad4fdb5b2b43d6ac6b400871019f5bb255e87523d43da83ebc9fa95169b653d4abef902e011e9eac620fc45b1006a921250e1395ef3cfc24c0e57d8f6745e7660ff70a28150f569bf66b8d5b28f331bfc59268b3f8b708104b95ed3a8065805cac8a0bdb622ce038631584c00000000000000000000000000000000000000000000000000000000000000003"
     },
     {
       "index": 1,
-      "value": "1fc97e4d0bb6609f25973d986a7b4787cdbad4fb98c8823591c67e7cd744ba6317c2df1b7355bb4c4494aa4ec85d15ff8881cea1b34691f0cc558e8aef3f3f4c267e526a2e6e9adf6a026989be005bd50d1aea76d20816b9843bc95557696f9f16c3eb259ba3e3eb27b7fe3abc36e87923990bf5c265cb0d57790eda2a4432f105a5449624125d37f10cd4c68ffd57b0dc0cdaa916cb37840be1db9bf88e3c5f0e81754454e3b12035b13448a9fe3b980bf31a9808cb93e146628fb06fa1b46f1694840b143402ffa76cba23e6a9be64b4db084fa804f61940e2d10cf41d273e2475eeff188767ebed988e7d9997d9ed9fe667ff68df9b7143bc663c242929260000000000000000000000000000000000000000000000000000000000000007"
+      "value": "23210e69198ab87b18f469c5e5b79dd6c51999350a8940b4b20e2b8c13ae05aa17c2df1b7355bb4c4494aa4ec85d15ff8881cea1b34691f0cc558e8aef3f3f4c267e526a2e6e9adf6a026989be005bd50d1aea76d20816b9843bc95557696f9f16c3eb259ba3e3eb27b7fe3abc36e87923990bf5c265cb0d57790eda2a4432f105a5449624125d37f10cd4c68ffd57b0dc0cdaa916cb37840be1db9bf88e3c5f0e81754454e3b12035b13448a9fe3b980bf31a9808cb93e146628fb06fa1b46f1694840b143402ffa76cba23e6a9be64b4db084fa804f61940e2d10cf41d273e2475eeff188767ebed988e7d9997d9ed9fe667ff68df9b7143bc663c242929260000000000000000000000000000000000000000000000000000000000000007"
     }
   ],
   "complete_address_index": [
     {
-      "key": "utf8:0x1fc97e4d0bb6609f25973d986a7b4787cdbad4fb98c8823591c67e7cd744ba63",
-      "value": "num:1"
+      "key": "utf8:0x20c1641e3181d87e3383458cd994b80833d42772f0afddb5ff41611c0524493a",
+      "value": "num:0"
     },
     {
-      "key": "utf8:0x2369ead09116908cedc1642d5e0c714ef288ecbc838e4d434f800a408914ce44",
-      "value": "num:0"
+      "key": "utf8:0x23210e69198ab87b18f469c5e5b79dd6c51999350a8940b4b20e2b8c13ae05aa",
+      "value": "num:1"
     }
   ]
 }

package/src/storage/backwards_compatibility_tests/__snapshots__/KeyStore.json

@@ -1,51 +1,51 @@
 {
   "key_store": [
     {
-      "key": "utf8:0x2369ead09116908cedc1642d5e0c714ef288ecbc838e4d434f800a408914ce44-ivpk_m",
+      "key": "utf8:0x20c1641e3181d87e3383458cd994b80833d42772f0afddb5ff41611c0524493a-ivpk_m",
       "value": "19e95c05f09cb86d1a6257572f9082ca15d4a02373c4d8c9cee23dc61a4c2a882f9017d51bca6616102d8a1d4dba89e4ce12881a2414576f01d2fec9492814a2"
     },
     {
-      "key": "utf8:0x2369ead09116908cedc1642d5e0c714ef288ecbc838e4d434f800a408914ce44-ivpk_m_hash",
+      "key": "utf8:0x20c1641e3181d87e3383458cd994b80833d42772f0afddb5ff41611c0524493a-ivpk_m_hash",
       "value": "1fd17152d394f6a43b527c531590888d610d1bcb9aa71a02498ce820bbf4dc62"
     },
     {
-      "key": "utf8:0x2369ead09116908cedc1642d5e0c714ef288ecbc838e4d434f800a408914ce44-ivsk_m",
+      "key": "utf8:0x20c1641e3181d87e3383458cd994b80833d42772f0afddb5ff41611c0524493a-ivsk_m",
       "value": "1fb01c42d1aaa2662041b899c77cb19e08192193acc5a94405f1b43c974eba7a"
     },
     {
-      "key": "utf8:0x2369ead09116908cedc1642d5e0c714ef288ecbc838e4d434f800a408914ce44-nhk_m",
+      "key": "utf8:0x20c1641e3181d87e3383458cd994b80833d42772f0afddb5ff41611c0524493a-nhk_m",
       "value": "2dd30220767969b10044b1322585bb4c4df4e0c5d9b4d7b3045a879a8e3e91d2"
     },
     {
-      "key": "utf8:0x2369ead09116908cedc1642d5e0c714ef288ecbc838e4d434f800a408914ce44-npk_m",
+      "key": "utf8:0x20c1641e3181d87e3383458cd994b80833d42772f0afddb5ff41611c0524493a-npk_m",
       "value": "214c7a24ddf501afc8734c7379ee502296289eb24cd8cd03cd435e128c06be0000987721e0963b4a5bd81ee862e2740d8849fd90537569064d3d3a4640e858d2"
     },
     {
-      "key": "utf8:0x2369ead09116908cedc1642d5e0c714ef288ecbc838e4d434f800a408914ce44-npk_m_hash",
+      "key": "utf8:0x20c1641e3181d87e3383458cd994b80833d42772f0afddb5ff41611c0524493a-npk_m_hash",
       "value": "13ad6965d11a533a663d07507319f74ac3305325f6f72423c0b24aa1193268bb"
     },
     {
-      "key": "utf8:0x2369ead09116908cedc1642d5e0c714ef288ecbc838e4d434f800a408914ce44-ovpk_m",
+      "key": "utf8:0x20c1641e3181d87e3383458cd994b80833d42772f0afddb5ff41611c0524493a-ovpk_m",
       "value": "2c19ff0b089b07da436e6f7be6b26cdc17b9cee504a528c071ef6a416299683d0b369479d6e50504702d0b56bb56e4e8e0e77171429896651d0c11621e82ebc3"
     },
     {
-      "key": "utf8:0x2369ead09116908cedc1642d5e0c714ef288ecbc838e4d434f800a408914ce44-ovpk_m_hash",
+      "key": "utf8:0x20c1641e3181d87e3383458cd994b80833d42772f0afddb5ff41611c0524493a-ovpk_m_hash",
       "value": "2a1b054e998835d166711839b515d434b1fbc207ad4fdb5b2b43d6ac6b400871"
     },
     {
-      "key": "utf8:0x2369ead09116908cedc1642d5e0c714ef288ecbc838e4d434f800a408914ce44-ovsk_m",
+      "key": "utf8:0x20c1641e3181d87e3383458cd994b80833d42772f0afddb5ff41611c0524493a-ovsk_m",
       "value": "279fe6ef7dd2477b919327b1ebab7497c41b9a7ccfa9d5d52e32698e3b85293b"
     },
     {
-      "key": "utf8:0x2369ead09116908cedc1642d5e0c714ef288ecbc838e4d434f800a408914ce44-tpk_m",
+      "key": "utf8:0x20c1641e3181d87e3383458cd994b80833d42772f0afddb5ff41611c0524493a-tpk_m",
       "value": "2fcdd0d194adafd753dc0ed279f5cfb54ddcce1dd581d4631cf343ba9ee6c1ab2858abca6c00da3def156b1f12a6464384e326d5fa724c2fc2ff2b7f3fc8ad5f"
     },
     {
-      "key": "utf8:0x2369ead09116908cedc1642d5e0c714ef288ecbc838e4d434f800a408914ce44-tpk_m_hash",
+      "key": "utf8:0x20c1641e3181d87e3383458cd994b80833d42772f0afddb5ff41611c0524493a-tpk_m_hash",
       "value": "019f5bb255e87523d43da83ebc9fa95169b653d4abef902e011e9eac620fc45b"
     },
     {
-      "key": "utf8:0x2369ead09116908cedc1642d5e0c714ef288ecbc838e4d434f800a408914ce44-tsk_m",
+      "key": "utf8:0x20c1641e3181d87e3383458cd994b80833d42772f0afddb5ff41611c0524493a-tsk_m",
       "value": "183cb61099458d1564aa57c90c7091ac623a14092ab314150c9cfbb416810320"
     }
   ]

package/src/storage/fact_store/fact_service.ts

@@ -4,7 +4,7 @@ import type { AztecAddress } from '@aztec-labs/stdlib/aztec-address';
 import { assertAllowedScope } from '../allowed_scopes.js';
 import type { ChangeSetId } from '../staged_write_coordinator.js';
 import type { FactStore } from './fact_store.js';
-import type { FactCollectionKey, FactCollectionTypeKey, OriginBlock } from './fact_store_keys.js';
+import type { BlockReference, FactCollectionKey, FactCollectionTypeKey } from './fact_store_keys.js';
 import {
   type FactCollectionWithOriginState,
   type FactWithOriginState,
@@ -29,7 +29,7 @@ export class FactService {
     factCollectionKey: FactCollectionKey,
     factTypeId: Fr,
     payload: Fr[],
-    originBlock: OriginBlock | undefined,
+    originBlock: BlockReference | undefined,
     changeSetId: ChangeSetId,
   ): Promise<void> {
     assertAllowedScope(factCollectionKey.scope, this.allowedScopes);

package/src/storage/fact_store/fact_store.ts

@@ -5,7 +5,7 @@ import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncMultiMap } from '@azte
 
 import { BaseStagingStore, type ReadonlyDb } from '../base_staging_store.js';
 import type { ChangeSetId } from '../staged_write_coordinator.js';
-import { FactCollectionKey, type FactCollectionTypeKey, type OriginBlock } from './fact_store_keys.js';
+import { type BlockReference, FactCollectionKey, type FactCollectionTypeKey } from './fact_store_keys.js';
 import { type Fact, StoredFact, factKeyStrOf } from './stored_fact.js';
 
 type BlockNum = number;
@@ -82,7 +82,7 @@ export class FactStore extends BaseStagingStore<FactStoreChangeSet, FactStoreDb>
     factCollectionKey: FactCollectionKey,
     factTypeId: Fr,
     payload: Fr[],
-    originBlock: OriginBlock | undefined,
+    originBlock: BlockReference | undefined,
     changeSetId: ChangeSetId,
   ): Promise<void> {
     return this.withChangeSet(changeSetId, changeSet => {

package/src/storage/fact_store/fact_store_keys.ts

@@ -2,10 +2,8 @@ import { Fr } from '@aztec-labs/foundation/curves/bn254';
 import type { FieldsOf } from '@aztec-labs/foundation/types';
 import { AztecAddress } from '@aztec-labs/stdlib/aztec-address';
 
-/**
- * The block a retractable fact originates from.
- */
-export type OriginBlock = { blockNumber: number; blockHash: Fr };
+/** A block, identified by its number and hash. */
+export type BlockReference = { blockNumber: number; blockHash: Fr };
 
 /** Facts are always tied to a real scope; the zero address is not a valid fact scope. */
 function assertNonZeroScope(scope: AztecAddress): void {

package/src/storage/fact_store/index.ts

@@ -1,6 +1,6 @@
 export { FactStore, type FactCollection } from './fact_store.js';
 export { FactService } from './fact_service.js';
-export { FactCollectionKey, FactCollectionTypeKey, type OriginBlock } from './fact_store_keys.js';
+export { FactCollectionKey, FactCollectionTypeKey, type BlockReference } from './fact_store_keys.js';
 export type { Fact } from './stored_fact.js';
 export {
   OriginBlockState,

package/src/storage/fact_store/origin_state.ts

@@ -1,7 +1,7 @@
 import type { Fr } from '@aztec-labs/foundation/curves/bn254';
 import type { L2Tips } from '@aztec-labs/stdlib/block';
 
-import type { FactCollectionKey, OriginBlock } from './fact_store_keys.js';
+import type { BlockReference, FactCollectionKey } from './fact_store_keys.js';
 import type { Fact } from './stored_fact.js';
 
 /**
@@ -49,7 +49,7 @@ export function anchoredTipBlockNumbers(tips: L2Tips, anchorBlockNumber: number)
 }
 
 /** A retractable fact's origin block annotated with that block's current chain state. */
-export type RetractableFactOrigin = OriginBlock & { blockState: OriginBlockState };
+export type RetractableFactOrigin = BlockReference & { blockState: OriginBlockState };
 
 /** A fact enriched with origin-block state. `originBlock` is undefined for a non-retractable fact. */
 export type FactWithOriginState = { factTypeId: Fr; payload: Fr[]; originBlock: RetractableFactOrigin | undefined };

package/src/storage/fact_store/stored_fact.ts

@@ -3,10 +3,10 @@ import { Fr } from '@aztec-labs/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec-labs/foundation/serialize';
 import { AztecAddress } from '@aztec-labs/stdlib/aztec-address';
 
-import { FactCollectionKey, type OriginBlock } from './fact_store_keys.js';
+import { type BlockReference, FactCollectionKey } from './fact_store_keys.js';
 
 /** A fact as returned by the fact store. */
-export type Fact = { factTypeId: Fr; payload: Fr[]; originBlock: OriginBlock | undefined };
+export type Fact = { factTypeId: Fr; payload: Fr[]; originBlock: BlockReference | undefined };
 
 /**
  * A single immutable fact belonging to a fact collection.
@@ -16,7 +16,7 @@ export class StoredFact {
     public readonly factCollectionKey: FactCollectionKey,
     public readonly factTypeId: Fr,
     public readonly payload: Fr[],
-    public readonly originBlock: OriginBlock | undefined,
+    public readonly originBlock: BlockReference | undefined,
   ) {}
 
   /** Whether this fact is deleted on block pruning (true) or survives reorgs (false). */

package/dest/contract_function_simulator/noir-structs/origin_block.d.ts

@@ -1,11 +0,0 @@
-import type { Fr } from '@aztec-labs/foundation/curves/bn254';
-/**
- * The block a retractable fact originates from.
- *
- * A TS version of the `OriginBlock` struct in `facts/mod.nr`.
- */
-export type OriginBlock = {
-    blockNumber: number;
-    blockHash: Fr;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JpZ2luX2Jsb2NrLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3RfZnVuY3Rpb25fc2ltdWxhdG9yL25vaXItc3RydWN0cy9vcmlnaW5fYmxvY2sudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFFOUQ7Ozs7R0FJRztBQUNILE1BQU0sTUFBTSxXQUFXLEdBQUc7SUFBRSxXQUFXLEVBQUUsTUFBTSxDQUFDO0lBQUMsU0FBUyxFQUFFLEVBQUUsQ0FBQTtDQUFFLENBQUMifQ==

package/dest/contract_function_simulator/noir-structs/origin_block.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"origin_block.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/noir-structs/origin_block.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AAE9D;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,EAAE,CAAA;CAAE,CAAC"}

package/dest/contract_function_simulator/noir-structs/origin_block.js

@@ -1,5 +0,0 @@
-/**
- * The block a retractable fact originates from.
- *
- * A TS version of the `OriginBlock` struct in `facts/mod.nr`.
- */ export { };

package/src/contract_function_simulator/noir-structs/origin_block.ts

@@ -1,8 +0,0 @@
-import type { Fr } from '@aztec-labs/foundation/curves/bn254';
-
-/**
- * The block a retractable fact originates from.
- *
- * A TS version of the `OriginBlock` struct in `facts/mod.nr`.
- */
-export type OriginBlock = { blockNumber: number; blockHash: Fr };