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

package/dest/storage/fact_store/fact_store.d.ts

@@ -2,7 +2,7 @@ import type { Fr } from '@aztec-labs/foundation/curves/bn254';
 import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncMultiMap } from '@aztec-labs/kv-store';
 import { BaseStagingStore } 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 } from './stored_fact.js';
 type BlockNum = number;
 type FactBuffer = Buffer;
@@ -64,7 +64,7 @@ export declare class FactStore extends BaseStagingStore<FactStoreChangeSet, Fact
      * Idempotent: re-recording an identical fact (same collection, fact type, payload, and origin block) is a no-op.
      * The same payload tied to a different origin block is a distinct fact.
      */
-    recordFact(factCollectionKey: FactCollectionKey, factTypeId: Fr, payload: Fr[], originBlock: OriginBlock | undefined, changeSetId: ChangeSetId): Promise<void>;
+    recordFact(factCollectionKey: FactCollectionKey, factTypeId: Fr, payload: Fr[], originBlock: BlockReference | undefined, changeSetId: ChangeSetId): Promise<void>;
     /**
      * Deletes a fact collection: removes every fact under the (scope-qualified) collection key.
      *
@@ -98,4 +98,4 @@ type FactStoreDb = {
     factsByBlock: AztecAsyncMultiMap<BlockNum, FactKeyStr>;
 };
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdF9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2UvZmFjdF9zdG9yZS9mYWN0X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRzlELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLGFBQWEsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRWpHLE9BQU8sRUFBRSxnQkFBZ0IsRUFBbUIsTUFBTSwwQkFBMEIsQ0FBQztBQUM3RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNsRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsS0FBSyxxQkFBcUIsRUFBRSxLQUFLLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3ZHLE9BQU8sRUFBRSxLQUFLLElBQUksRUFBRSxVQUFVLEVBQWdCLE1BQU0sa0JBQWtCLENBQUM7QUFFdkUsS0FBSyxRQUFRLEdBQUcsTUFBTSxDQUFDO0FBQ3ZCLEtBQUssVUFBVSxHQUFHLE1BQU0sQ0FBQztBQUV6QixLQUFLLG9CQUFvQixHQUFHLE1BQU0sQ0FBQztBQUNuQyxLQUFLLFVBQVUsR0FBRyxNQUFNLENBQUM7QUFFekIsa0RBQWtEO0FBQ2xELE1BQU0sTUFBTSxjQUFjLEdBQUc7SUFBRSxHQUFHLEVBQUUsaUJBQWlCLENBQUM7SUFBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUE7Q0FBRSxDQUFDO0FBS3ZFLHdGQUF3RjtBQUN4RixLQUFLLFFBQVEsR0FBRztJQUFFLElBQUksRUFBRSxZQUFZLENBQUM7SUFBQyxJQUFJLEVBQUUsVUFBVSxDQUFBO0NBQUUsR0FBRztJQUFFLElBQUksRUFBRSxzQkFBc0IsQ0FBQztJQUFDLEdBQUcsRUFBRSxpQkFBaUIsQ0FBQTtDQUFFLENBQUM7QUFFcEg7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBMEJHO0FBQ0gscUJBQWEsU0FBVSxTQUFRLGdCQUFnQixDQUFDLGtCQUFrQixFQUFFLFdBQVcsQ0FBQzs7SUFDOUUsTUFBTSw4Q0FBOEI7SUFFcEMsWUFBWSxLQUFLLEVBQUUsaUJBQWlCLEVBV25DO0lBRUQ7Ozs7Ozs7Ozs7O09BV0c7SUFDSCxVQUFVLENBQ1IsaUJBQWlCLEVBQUUsaUJBQWlCLEVBQ3BDLFVBQVUsRUFBRSxFQUFFLEVBQ2QsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUNiLFdBQVcsRUFBRSxXQUFXLEdBQUcsU0FBUyxFQUNwQyxXQUFXLEVBQUUsV0FBVyxHQUN2QixPQUFPLENBQUMsSUFBSSxDQUFDLENBT2Y7SUFFRDs7OztPQUlHO0lBQ0gsb0JBQW9CLENBQUMsaUJBQWlCLEVBQUUsaUJBQWlCLEVBQUUsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSWxHO0lBRUQ7O09BRUc7SUFDSCxpQkFBaUIsQ0FDZixpQkFBaUIsRUFBRSxpQkFBaUIsRUFDcEMsV0FBVyxFQUFFLFdBQVcsR0FDdkIsT0FBTyxDQUFDLGNBQWMsR0FBRyxTQUFTLENBQUMsQ0FhckM7SUFFRDs7T0FFRztJQUNILHdCQUF3QixDQUN0QixxQkFBcUIsRUFBRSxxQkFBcUIsRUFDNUMsV0FBVyxFQUFFLFdBQVcsR0FDdkIsT0FBTyxDQUFDLGNBQWMsRUFBRSxDQUFDLENBUzNCO0lBRUQsVUFBZ0IsY0FBYyxDQUFDLFNBQVMsRUFBRSxrQkFBa0IsRUFBRSxFQUFFLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FlNUY7SUFFRDs7OztPQUlHO0lBQ0gsVUFBZ0IsYUFBYSxDQUFDLE9BQU8sRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSS9FO0NBK09GO0FBRUQsa0hBQWtIO0FBQ2xILEtBQUssa0JBQWtCLEdBQUcsUUFBUSxFQUFFLENBQUM7QUFFckMsS0FBSyxXQUFXLEdBQUc7SUFDakIscUNBQXFDO0lBQ3JDLEtBQUssRUFBRSxhQUFhLENBQUMsVUFBVSxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBRTdDLGtGQUFrRjtJQUNsRixpQkFBaUIsRUFBRSxrQkFBa0IsQ0FBQyxvQkFBb0IsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUV4RSxtRkFBbUY7SUFDbkYsWUFBWSxFQUFFLGtCQUFrQixDQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsQ0FBQztDQUN4RCxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdF9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2UvZmFjdF9zdG9yZS9mYWN0X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRzlELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLGFBQWEsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRWpHLE9BQU8sRUFBRSxnQkFBZ0IsRUFBbUIsTUFBTSwwQkFBMEIsQ0FBQztBQUM3RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNsRSxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQUUsaUJBQWlCLEVBQUUsS0FBSyxxQkFBcUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzFHLE9BQU8sRUFBRSxLQUFLLElBQUksRUFBRSxVQUFVLEVBQWdCLE1BQU0sa0JBQWtCLENBQUM7QUFFdkUsS0FBSyxRQUFRLEdBQUcsTUFBTSxDQUFDO0FBQ3ZCLEtBQUssVUFBVSxHQUFHLE1BQU0sQ0FBQztBQUV6QixLQUFLLG9CQUFvQixHQUFHLE1BQU0sQ0FBQztBQUNuQyxLQUFLLFVBQVUsR0FBRyxNQUFNLENBQUM7QUFFekIsa0RBQWtEO0FBQ2xELE1BQU0sTUFBTSxjQUFjLEdBQUc7SUFBRSxHQUFHLEVBQUUsaUJBQWlCLENBQUM7SUFBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUE7Q0FBRSxDQUFDO0FBS3ZFLHdGQUF3RjtBQUN4RixLQUFLLFFBQVEsR0FBRztJQUFFLElBQUksRUFBRSxZQUFZLENBQUM7SUFBQyxJQUFJLEVBQUUsVUFBVSxDQUFBO0NBQUUsR0FBRztJQUFFLElBQUksRUFBRSxzQkFBc0IsQ0FBQztJQUFDLEdBQUcsRUFBRSxpQkFBaUIsQ0FBQTtDQUFFLENBQUM7QUFFcEg7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBMEJHO0FBQ0gscUJBQWEsU0FBVSxTQUFRLGdCQUFnQixDQUFDLGtCQUFrQixFQUFFLFdBQVcsQ0FBQzs7SUFDOUUsTUFBTSw4Q0FBOEI7SUFFcEMsWUFBWSxLQUFLLEVBQUUsaUJBQWlCLEVBV25DO0lBRUQ7Ozs7Ozs7Ozs7O09BV0c7SUFDSCxVQUFVLENBQ1IsaUJBQWlCLEVBQUUsaUJBQWlCLEVBQ3BDLFVBQVUsRUFBRSxFQUFFLEVBQ2QsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUNiLFdBQVcsRUFBRSxjQUFjLEdBQUcsU0FBUyxFQUN2QyxXQUFXLEVBQUUsV0FBVyxHQUN2QixPQUFPLENBQUMsSUFBSSxDQUFDLENBT2Y7SUFFRDs7OztPQUlHO0lBQ0gsb0JBQW9CLENBQUMsaUJBQWlCLEVBQUUsaUJBQWlCLEVBQUUsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSWxHO0lBRUQ7O09BRUc7SUFDSCxpQkFBaUIsQ0FDZixpQkFBaUIsRUFBRSxpQkFBaUIsRUFDcEMsV0FBVyxFQUFFLFdBQVcsR0FDdkIsT0FBTyxDQUFDLGNBQWMsR0FBRyxTQUFTLENBQUMsQ0FhckM7SUFFRDs7T0FFRztJQUNILHdCQUF3QixDQUN0QixxQkFBcUIsRUFBRSxxQkFBcUIsRUFDNUMsV0FBVyxFQUFFLFdBQVcsR0FDdkIsT0FBTyxDQUFDLGNBQWMsRUFBRSxDQUFDLENBUzNCO0lBRUQsVUFBZ0IsY0FBYyxDQUFDLFNBQVMsRUFBRSxrQkFBa0IsRUFBRSxFQUFFLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FlNUY7SUFFRDs7OztPQUlHO0lBQ0gsVUFBZ0IsYUFBYSxDQUFDLE9BQU8sRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSS9FO0NBK09GO0FBRUQsa0hBQWtIO0FBQ2xILEtBQUssa0JBQWtCLEdBQUcsUUFBUSxFQUFFLENBQUM7QUFFckMsS0FBSyxXQUFXLEdBQUc7SUFDakIscUNBQXFDO0lBQ3JDLEtBQUssRUFBRSxhQUFhLENBQUMsVUFBVSxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBRTdDLGtGQUFrRjtJQUNsRixpQkFBaUIsRUFBRSxrQkFBa0IsQ0FBQyxvQkFBb0IsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUV4RSxtRkFBbUY7SUFDbkYsWUFBWSxFQUFFLGtCQUFrQixDQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsQ0FBQztDQUN4RCxDQUFDIn0=

package/dest/storage/fact_store/fact_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fact_store.d.ts","sourceRoot":"","sources":["../../../src/storage/fact_store/fact_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AAG9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAEjG,OAAO,EAAE,gBAAgB,EAAmB,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,KAAK,qBAAqB,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACvG,OAAO,EAAE,KAAK,IAAI,EAAE,UAAU,EAAgB,MAAM,kBAAkB,CAAC;AAEvE,KAAK,QAAQ,GAAG,MAAM,CAAC;AACvB,KAAK,UAAU,GAAG,MAAM,CAAC;AAEzB,KAAK,oBAAoB,GAAG,MAAM,CAAC;AACnC,KAAK,UAAU,GAAG,MAAM,CAAC;AAEzB,kDAAkD;AAClD,MAAM,MAAM,cAAc,GAAG;IAAE,GAAG,EAAE,iBAAiB,CAAC;IAAC,KAAK,EAAE,IAAI,EAAE,CAAA;CAAE,CAAC;AAKvE,wFAAwF;AACxF,KAAK,QAAQ,GAAG;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,UAAU,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,sBAAsB,CAAC;IAAC,GAAG,EAAE,iBAAiB,CAAA;CAAE,CAAC;AAEpH;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,qBAAa,SAAU,SAAQ,gBAAgB,CAAC,kBAAkB,EAAE,WAAW,CAAC;;IAC9E,MAAM,8CAA8B;IAEpC,YAAY,KAAK,EAAE,iBAAiB,EAWnC;IAED;;;;;;;;;;;OAWG;IACH,UAAU,CACR,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,EAAE,EACd,OAAO,EAAE,EAAE,EAAE,EACb,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,IAAI,CAAC,CAOf;IAED;;;;OAIG;IACH,oBAAoB,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAIlG;IAED;;OAEG;IACH,iBAAiB,CACf,iBAAiB,EAAE,iBAAiB,EACpC,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAarC;IAED;;OAEG;IACH,wBAAwB,CACtB,qBAAqB,EAAE,qBAAqB,EAC5C,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,cAAc,EAAE,CAAC,CAS3B;IAED,UAAgB,cAAc,CAAC,SAAS,EAAE,kBAAkB,EAAE,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAe5F;IAED;;;;OAIG;IACH,UAAgB,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAI/E;CA+OF;AAED,kHAAkH;AAClH,KAAK,kBAAkB,GAAG,QAAQ,EAAE,CAAC;AAErC,KAAK,WAAW,GAAG;IACjB,qCAAqC;IACrC,KAAK,EAAE,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAE7C,kFAAkF;IAClF,iBAAiB,EAAE,kBAAkB,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;IAExE,mFAAmF;IACnF,YAAY,EAAE,kBAAkB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;CACxD,CAAC"}
+{"version":3,"file":"fact_store.d.ts","sourceRoot":"","sources":["../../../src/storage/fact_store/fact_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AAG9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAEjG,OAAO,EAAE,gBAAgB,EAAmB,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,KAAK,cAAc,EAAE,iBAAiB,EAAE,KAAK,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC1G,OAAO,EAAE,KAAK,IAAI,EAAE,UAAU,EAAgB,MAAM,kBAAkB,CAAC;AAEvE,KAAK,QAAQ,GAAG,MAAM,CAAC;AACvB,KAAK,UAAU,GAAG,MAAM,CAAC;AAEzB,KAAK,oBAAoB,GAAG,MAAM,CAAC;AACnC,KAAK,UAAU,GAAG,MAAM,CAAC;AAEzB,kDAAkD;AAClD,MAAM,MAAM,cAAc,GAAG;IAAE,GAAG,EAAE,iBAAiB,CAAC;IAAC,KAAK,EAAE,IAAI,EAAE,CAAA;CAAE,CAAC;AAKvE,wFAAwF;AACxF,KAAK,QAAQ,GAAG;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,UAAU,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,sBAAsB,CAAC;IAAC,GAAG,EAAE,iBAAiB,CAAA;CAAE,CAAC;AAEpH;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,qBAAa,SAAU,SAAQ,gBAAgB,CAAC,kBAAkB,EAAE,WAAW,CAAC;;IAC9E,MAAM,8CAA8B;IAEpC,YAAY,KAAK,EAAE,iBAAiB,EAWnC;IAED;;;;;;;;;;;OAWG;IACH,UAAU,CACR,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,EAAE,EACd,OAAO,EAAE,EAAE,EAAE,EACb,WAAW,EAAE,cAAc,GAAG,SAAS,EACvC,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,IAAI,CAAC,CAOf;IAED;;;;OAIG;IACH,oBAAoB,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAIlG;IAED;;OAEG;IACH,iBAAiB,CACf,iBAAiB,EAAE,iBAAiB,EACpC,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAarC;IAED;;OAEG;IACH,wBAAwB,CACtB,qBAAqB,EAAE,qBAAqB,EAC5C,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,cAAc,EAAE,CAAC,CAS3B;IAED,UAAgB,cAAc,CAAC,SAAS,EAAE,kBAAkB,EAAE,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAe5F;IAED;;;;OAIG;IACH,UAAgB,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAI/E;CA+OF;AAED,kHAAkH;AAClH,KAAK,kBAAkB,GAAG,QAAQ,EAAE,CAAC;AAErC,KAAK,WAAW,GAAG;IACjB,qCAAqC;IACrC,KAAK,EAAE,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAE7C,kFAAkF;IAClF,iBAAiB,EAAE,kBAAkB,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;IAExE,mFAAmF;IACnF,YAAY,EAAE,kBAAkB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;CACxD,CAAC"}

package/dest/storage/fact_store/fact_store_keys.d.ts

@@ -1,10 +1,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 = {
+/** A block, identified by its number and hash. */
+export type BlockReference = {
     blockNumber: number;
     blockHash: Fr;
 };
@@ -31,4 +29,4 @@ export declare class FactCollectionKey {
     factCollectionTypeKey(): FactCollectionTypeKey;
     toString(): string;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdF9zdG9yZV9rZXlzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RvcmFnZS9mYWN0X3N0b3JlL2ZhY3Rfc3RvcmVfa2V5cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDN0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRWhFOztHQUVHO0FBQ0gsTUFBTSxNQUFNLFdBQVcsR0FBRztJQUFFLFdBQVcsRUFBRSxNQUFNLENBQUM7SUFBQyxTQUFTLEVBQUUsRUFBRSxDQUFBO0NBQUUsQ0FBQztBQVNqRSxvRkFBb0Y7QUFDcEYscUJBQWEscUJBQXFCO2FBRWQsZUFBZSxFQUFFLFlBQVk7YUFDN0IsS0FBSyxFQUFFLFlBQVk7YUFDbkIsb0JBQW9CLEVBQUUsRUFBRTtJQUgxQyxZQUNrQixlQUFlLEVBQUUsWUFBWSxFQUM3QixLQUFLLEVBQUUsWUFBWSxFQUNuQixvQkFBb0IsRUFBRSxFQUFFLEVBR3pDO0lBRUQsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLHFCQUFxQixDQUFDLEdBQUcscUJBQXFCLENBRTFFO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7Q0FDRjtBQUVELHFHQUFxRztBQUNyRyxxQkFBYSxpQkFBaUI7YUFFVixlQUFlLEVBQUUsWUFBWTthQUM3QixLQUFLLEVBQUUsWUFBWTthQUNuQixvQkFBb0IsRUFBRSxFQUFFO2FBQ3hCLGdCQUFnQixFQUFFLEVBQUU7SUFKdEMsWUFDa0IsZUFBZSxFQUFFLFlBQVksRUFDN0IsS0FBSyxFQUFFLFlBQVksRUFDbkIsb0JBQW9CLEVBQUUsRUFBRSxFQUN4QixnQkFBZ0IsRUFBRSxFQUFFLEVBR3JDO0lBRUQsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsaUJBQWlCLENBT2xFO0lBRUQsMEJBQTBCO0lBQzFCLE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxpQkFBaUIsQ0FRaEQ7SUFFRCxrSEFBa0g7SUFDbEgscUJBQXFCLElBQUkscUJBQXFCLENBRTdDO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdF9zdG9yZV9rZXlzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RvcmFnZS9mYWN0X3N0b3JlL2ZhY3Rfc3RvcmVfa2V5cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDN0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRWhFLGtEQUFrRDtBQUNsRCxNQUFNLE1BQU0sY0FBYyxHQUFHO0lBQUUsV0FBVyxFQUFFLE1BQU0sQ0FBQztJQUFDLFNBQVMsRUFBRSxFQUFFLENBQUE7Q0FBRSxDQUFDO0FBU3BFLG9GQUFvRjtBQUNwRixxQkFBYSxxQkFBcUI7YUFFZCxlQUFlLEVBQUUsWUFBWTthQUM3QixLQUFLLEVBQUUsWUFBWTthQUNuQixvQkFBb0IsRUFBRSxFQUFFO0lBSDFDLFlBQ2tCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLEtBQUssRUFBRSxZQUFZLEVBQ25CLG9CQUFvQixFQUFFLEVBQUUsRUFHekM7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMscUJBQXFCLENBQUMsR0FBRyxxQkFBcUIsQ0FFMUU7SUFFRCxRQUFRLElBQUksTUFBTSxDQUVqQjtDQUNGO0FBRUQscUdBQXFHO0FBQ3JHLHFCQUFhLGlCQUFpQjthQUVWLGVBQWUsRUFBRSxZQUFZO2FBQzdCLEtBQUssRUFBRSxZQUFZO2FBQ25CLG9CQUFvQixFQUFFLEVBQUU7YUFDeEIsZ0JBQWdCLEVBQUUsRUFBRTtJQUp0QyxZQUNrQixlQUFlLEVBQUUsWUFBWSxFQUM3QixLQUFLLEVBQUUsWUFBWSxFQUNuQixvQkFBb0IsRUFBRSxFQUFFLEVBQ3hCLGdCQUFnQixFQUFFLEVBQUUsRUFHckM7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsaUJBQWlCLENBQUMsR0FBRyxpQkFBaUIsQ0FPbEU7SUFFRCwwQkFBMEI7SUFDMUIsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLGlCQUFpQixDQVFoRDtJQUVELGtIQUFrSDtJQUNsSCxxQkFBcUIsSUFBSSxxQkFBcUIsQ0FFN0M7SUFFRCxRQUFRLElBQUksTUFBTSxDQUVqQjtDQUNGIn0=

package/dest/storage/fact_store/fact_store_keys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fact_store_keys.d.ts","sourceRoot":"","sources":["../../../src/storage/fact_store/fact_store_keys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEhE;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,EAAE,CAAA;CAAE,CAAC;AASjE,oFAAoF;AACpF,qBAAa,qBAAqB;aAEd,eAAe,EAAE,YAAY;aAC7B,KAAK,EAAE,YAAY;aACnB,oBAAoB,EAAE,EAAE;IAH1C,YACkB,eAAe,EAAE,YAAY,EAC7B,KAAK,EAAE,YAAY,EACnB,oBAAoB,EAAE,EAAE,EAGzC;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC,GAAG,qBAAqB,CAE1E;IAED,QAAQ,IAAI,MAAM,CAEjB;CACF;AAED,qGAAqG;AACrG,qBAAa,iBAAiB;aAEV,eAAe,EAAE,YAAY;aAC7B,KAAK,EAAE,YAAY;aACnB,oBAAoB,EAAE,EAAE;aACxB,gBAAgB,EAAE,EAAE;IAJtC,YACkB,eAAe,EAAE,YAAY,EAC7B,KAAK,EAAE,YAAY,EACnB,oBAAoB,EAAE,EAAE,EACxB,gBAAgB,EAAE,EAAE,EAGrC;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,iBAAiB,CAOlE;IAED,0BAA0B;IAC1B,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAQhD;IAED,kHAAkH;IAClH,qBAAqB,IAAI,qBAAqB,CAE7C;IAED,QAAQ,IAAI,MAAM,CAEjB;CACF"}
+{"version":3,"file":"fact_store_keys.d.ts","sourceRoot":"","sources":["../../../src/storage/fact_store/fact_store_keys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEhE,kDAAkD;AAClD,MAAM,MAAM,cAAc,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,EAAE,CAAA;CAAE,CAAC;AASpE,oFAAoF;AACpF,qBAAa,qBAAqB;aAEd,eAAe,EAAE,YAAY;aAC7B,KAAK,EAAE,YAAY;aACnB,oBAAoB,EAAE,EAAE;IAH1C,YACkB,eAAe,EAAE,YAAY,EAC7B,KAAK,EAAE,YAAY,EACnB,oBAAoB,EAAE,EAAE,EAGzC;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC,GAAG,qBAAqB,CAE1E;IAED,QAAQ,IAAI,MAAM,CAEjB;CACF;AAED,qGAAqG;AACrG,qBAAa,iBAAiB;aAEV,eAAe,EAAE,YAAY;aAC7B,KAAK,EAAE,YAAY;aACnB,oBAAoB,EAAE,EAAE;aACxB,gBAAgB,EAAE,EAAE;IAJtC,YACkB,eAAe,EAAE,YAAY,EAC7B,KAAK,EAAE,YAAY,EACnB,oBAAoB,EAAE,EAAE,EACxB,gBAAgB,EAAE,EAAE,EAGrC;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,iBAAiB,CAOlE;IAED,0BAA0B;IAC1B,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAQhD;IAED,kHAAkH;IAClH,qBAAqB,IAAI,qBAAqB,CAE7C;IAED,QAAQ,IAAI,MAAM,CAEjB;CACF"}

package/dest/storage/fact_store/index.d.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, classifyOriginBlockState, originBlockStateFromNumber, anchoredTipBlockNumbers, toFactWithOriginState, type TipBlockNumbers, type RetractableFactOrigin, type FactWithOriginState, type FactCollectionWithOriginState, } from './origin_state.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL2ZhY3Rfc3RvcmUvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLGNBQWMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNoRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUscUJBQXFCLEVBQUUsS0FBSyxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRyxZQUFZLEVBQUUsSUFBSSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDN0MsT0FBTyxFQUNMLGdCQUFnQixFQUNoQix3QkFBd0IsRUFDeEIsMEJBQTBCLEVBQzFCLHVCQUF1QixFQUN2QixxQkFBcUIsRUFDckIsS0FBSyxlQUFlLEVBQ3BCLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssbUJBQW1CLEVBQ3hCLEtBQUssNkJBQTZCLEdBQ25DLE1BQU0sbUJBQW1CLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL2ZhY3Rfc3RvcmUvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLGNBQWMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNoRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUscUJBQXFCLEVBQUUsS0FBSyxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNyRyxZQUFZLEVBQUUsSUFBSSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDN0MsT0FBTyxFQUNMLGdCQUFnQixFQUNoQix3QkFBd0IsRUFDeEIsMEJBQTBCLEVBQzFCLHVCQUF1QixFQUN2QixxQkFBcUIsRUFDckIsS0FBSyxlQUFlLEVBQ3BCLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssbUJBQW1CLEVBQ3hCLEtBQUssNkJBQTZCLEdBQ25DLE1BQU0sbUJBQW1CLENBQUMifQ==

package/dest/storage/fact_store/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/storage/fact_store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAClG,YAAY,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,0BAA0B,EAC1B,uBAAuB,EACvB,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,EACxB,KAAK,6BAA6B,GACnC,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/storage/fact_store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACrG,YAAY,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,0BAA0B,EAC1B,uBAAuB,EACvB,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,EACxB,KAAK,6BAA6B,GACnC,MAAM,mBAAmB,CAAC"}

package/dest/storage/fact_store/origin_state.d.ts

@@ -1,6 +1,6 @@
 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';
 /**
  * Chain state of a retractable fact's origin block, mirroring the L2 chain tips.
@@ -35,7 +35,7 @@ export type TipBlockNumbers = {
  */
 export declare function anchoredTipBlockNumbers(tips: L2Tips, anchorBlockNumber: number): TipBlockNumbers;
 /** A retractable fact's origin block annotated with that block's current chain state. */
-export type RetractableFactOrigin = OriginBlock & {
+export type RetractableFactOrigin = BlockReference & {
     blockState: OriginBlockState;
 };
 /** A fact enriched with origin-block state. `originBlock` is undefined for a non-retractable fact. */
@@ -56,4 +56,4 @@ export type FactCollectionWithOriginState = {
 export declare function classifyOriginBlockState(blockNumber: number, tips: TipBlockNumbers): OriginBlockState;
 /** Enriches a stored fact with the chain state of its origin block (when retractable). */
 export declare function toFactWithOriginState(fact: Fact, tips: TipBlockNumbers): FactWithOriginState;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JpZ2luX3N0YXRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RvcmFnZS9mYWN0X3N0b3JlL29yaWdpbl9zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUV2RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUMzRSxPQUFPLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUU3Qzs7Ozs7Ozs7OztHQVVHO0FBQ0gsb0JBQVksZ0JBQWdCO0lBQzFCLE9BQU8sSUFBSTtJQUNYLE1BQU0sSUFBSTtJQUNWLFNBQVMsSUFBSTtDQUNkO0FBRUQsa0ZBQWtGO0FBQ2xGLHdCQUFnQiwwQkFBMEIsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLGdCQUFnQixDQU0xRTtBQUVELCtHQUErRztBQUMvRyxNQUFNLE1BQU0sZUFBZSxHQUFHO0lBQUUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQUMsb0JBQW9CLEVBQUUsTUFBTSxDQUFBO0NBQUUsQ0FBQztBQUUxRjs7Ozs7OztHQU9HO0FBQ0gsd0JBQWdCLHVCQUF1QixDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxHQUFHLGVBQWUsQ0FLaEc7QUFFRCx5RkFBeUY7QUFDekYsTUFBTSxNQUFNLHFCQUFxQixHQUFHLFdBQVcsR0FBRztJQUFFLFVBQVUsRUFBRSxnQkFBZ0IsQ0FBQTtDQUFFLENBQUM7QUFFbkYsc0dBQXNHO0FBQ3RHLE1BQU0sTUFBTSxtQkFBbUIsR0FBRztJQUFFLFVBQVUsRUFBRSxFQUFFLENBQUM7SUFBQyxPQUFPLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFBQyxXQUFXLEVBQUUscUJBQXFCLEdBQUcsU0FBUyxDQUFBO0NBQUUsQ0FBQztBQUVwSCw4REFBOEQ7QUFDOUQsTUFBTSxNQUFNLDZCQUE2QixHQUFHO0lBQUUsR0FBRyxFQUFFLGlCQUFpQixDQUFDO0lBQUMsS0FBSyxFQUFFLG1CQUFtQixFQUFFLENBQUE7Q0FBRSxDQUFDO0FBRXJHOzs7R0FHRztBQUNILHdCQUFnQix3QkFBd0IsQ0FBQyxXQUFXLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxlQUFlLEdBQUcsZ0JBQWdCLENBUXJHO0FBRUQsMEZBQTBGO0FBQzFGLHdCQUFnQixxQkFBcUIsQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxlQUFlLEdBQUcsbUJBQW1CLENBUzVGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JpZ2luX3N0YXRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RvcmFnZS9mYWN0X3N0b3JlL29yaWdpbl9zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUV2RCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM5RSxPQUFPLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUU3Qzs7Ozs7Ozs7OztHQVVHO0FBQ0gsb0JBQVksZ0JBQWdCO0lBQzFCLE9BQU8sSUFBSTtJQUNYLE1BQU0sSUFBSTtJQUNWLFNBQVMsSUFBSTtDQUNkO0FBRUQsa0ZBQWtGO0FBQ2xGLHdCQUFnQiwwQkFBMEIsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLGdCQUFnQixDQU0xRTtBQUVELCtHQUErRztBQUMvRyxNQUFNLE1BQU0sZUFBZSxHQUFHO0lBQUUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQUMsb0JBQW9CLEVBQUUsTUFBTSxDQUFBO0NBQUUsQ0FBQztBQUUxRjs7Ozs7OztHQU9HO0FBQ0gsd0JBQWdCLHVCQUF1QixDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxHQUFHLGVBQWUsQ0FLaEc7QUFFRCx5RkFBeUY7QUFDekYsTUFBTSxNQUFNLHFCQUFxQixHQUFHLGNBQWMsR0FBRztJQUFFLFVBQVUsRUFBRSxnQkFBZ0IsQ0FBQTtDQUFFLENBQUM7QUFFdEYsc0dBQXNHO0FBQ3RHLE1BQU0sTUFBTSxtQkFBbUIsR0FBRztJQUFFLFVBQVUsRUFBRSxFQUFFLENBQUM7SUFBQyxPQUFPLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFBQyxXQUFXLEVBQUUscUJBQXFCLEdBQUcsU0FBUyxDQUFBO0NBQUUsQ0FBQztBQUVwSCw4REFBOEQ7QUFDOUQsTUFBTSxNQUFNLDZCQUE2QixHQUFHO0lBQUUsR0FBRyxFQUFFLGlCQUFpQixDQUFDO0lBQUMsS0FBSyxFQUFFLG1CQUFtQixFQUFFLENBQUE7Q0FBRSxDQUFDO0FBRXJHOzs7R0FHRztBQUNILHdCQUFnQix3QkFBd0IsQ0FBQyxXQUFXLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxlQUFlLEdBQUcsZ0JBQWdCLENBUXJHO0FBRUQsMEZBQTBGO0FBQzFGLHdCQUFnQixxQkFBcUIsQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxlQUFlLEdBQUcsbUJBQW1CLENBUzVGIn0=

package/dest/storage/fact_store/origin_state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"origin_state.d.ts","sourceRoot":"","sources":["../../../src/storage/fact_store/origin_state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;;;;GAUG;AACH,oBAAY,gBAAgB;IAC1B,OAAO,IAAI;IACX,MAAM,IAAI;IACV,SAAS,IAAI;CACd;AAED,kFAAkF;AAClF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAM1E;AAED,+GAA+G;AAC/G,MAAM,MAAM,eAAe,GAAG;IAAE,iBAAiB,EAAE,MAAM,CAAC;IAAC,oBAAoB,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1F;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,eAAe,CAKhG;AAED,yFAAyF;AACzF,MAAM,MAAM,qBAAqB,GAAG,WAAW,GAAG;IAAE,UAAU,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAEnF,sGAAsG;AACtG,MAAM,MAAM,mBAAmB,GAAG;IAAE,UAAU,EAAE,EAAE,CAAC;IAAC,OAAO,EAAE,EAAE,EAAE,CAAC;IAAC,WAAW,EAAE,qBAAqB,GAAG,SAAS,CAAA;CAAE,CAAC;AAEpH,8DAA8D;AAC9D,MAAM,MAAM,6BAA6B,GAAG;IAAE,GAAG,EAAE,iBAAiB,CAAC;IAAC,KAAK,EAAE,mBAAmB,EAAE,CAAA;CAAE,CAAC;AAErG;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,GAAG,gBAAgB,CAQrG;AAED,0FAA0F;AAC1F,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,GAAG,mBAAmB,CAS5F"}
+{"version":3,"file":"origin_state.d.ts","sourceRoot":"","sources":["../../../src/storage/fact_store/origin_state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;;;;GAUG;AACH,oBAAY,gBAAgB;IAC1B,OAAO,IAAI;IACX,MAAM,IAAI;IACV,SAAS,IAAI;CACd;AAED,kFAAkF;AAClF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAM1E;AAED,+GAA+G;AAC/G,MAAM,MAAM,eAAe,GAAG;IAAE,iBAAiB,EAAE,MAAM,CAAC;IAAC,oBAAoB,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1F;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,eAAe,CAKhG;AAED,yFAAyF;AACzF,MAAM,MAAM,qBAAqB,GAAG,cAAc,GAAG;IAAE,UAAU,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAEtF,sGAAsG;AACtG,MAAM,MAAM,mBAAmB,GAAG;IAAE,UAAU,EAAE,EAAE,CAAC;IAAC,OAAO,EAAE,EAAE,EAAE,CAAC;IAAC,WAAW,EAAE,qBAAqB,GAAG,SAAS,CAAA;CAAE,CAAC;AAEpH,8DAA8D;AAC9D,MAAM,MAAM,6BAA6B,GAAG;IAAE,GAAG,EAAE,iBAAiB,CAAC;IAAC,KAAK,EAAE,mBAAmB,EAAE,CAAA;CAAE,CAAC;AAErG;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,GAAG,gBAAgB,CAQrG;AAED,0FAA0F;AAC1F,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,GAAG,mBAAmB,CAS5F"}

package/dest/storage/fact_store/stored_fact.d.ts

@@ -1,11 +1,11 @@
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
 import { BufferReader } from '@aztec-labs/foundation/serialize';
-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;
+    originBlock: BlockReference | undefined;
 };
 /**
  * A single immutable fact belonging to a fact collection.
@@ -14,8 +14,8 @@ export declare class StoredFact {
     readonly factCollectionKey: FactCollectionKey;
     readonly factTypeId: Fr;
     readonly payload: Fr[];
-    readonly originBlock: OriginBlock | undefined;
-    constructor(factCollectionKey: FactCollectionKey, factTypeId: Fr, payload: Fr[], originBlock: OriginBlock | undefined);
+    readonly originBlock: BlockReference | undefined;
+    constructor(factCollectionKey: FactCollectionKey, factTypeId: Fr, payload: Fr[], originBlock: BlockReference | undefined);
     /** Whether this fact is deleted on block pruning (true) or survives reorgs (false). */
     get isRetractable(): boolean;
     /** Stable digest of the payload, used for fact idempotency. */
@@ -29,4 +29,4 @@ export declare class StoredFact {
  * Builds the serialized key that identifies a fact in the store.
  */
 export declare function factKeyStrOf(fact: StoredFact): string;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmVkX2ZhY3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL2ZhY3Rfc3RvcmUvc3RvcmVkX2ZhY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sa0NBQWtDLENBQUM7QUFHbkYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLEtBQUssV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFM0UsNENBQTRDO0FBQzVDLE1BQU0sTUFBTSxJQUFJLEdBQUc7SUFBRSxVQUFVLEVBQUUsRUFBRSxDQUFDO0lBQUMsT0FBTyxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxTQUFTLENBQUE7Q0FBRSxDQUFDO0FBRTNGOztHQUVHO0FBQ0gscUJBQWEsVUFBVTthQUVILGlCQUFpQixFQUFFLGlCQUFpQjthQUNwQyxVQUFVLEVBQUUsRUFBRTthQUNkLE9BQU8sRUFBRSxFQUFFLEVBQUU7YUFDYixXQUFXLEVBQUUsV0FBVyxHQUFHLFNBQVM7SUFKdEQsWUFDa0IsaUJBQWlCLEVBQUUsaUJBQWlCLEVBQ3BDLFVBQVUsRUFBRSxFQUFFLEVBQ2QsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUNiLFdBQVcsRUFBRSxXQUFXLEdBQUcsU0FBUyxFQUNsRDtJQUVKLHVGQUF1RjtJQUN2RixJQUFJLGFBQWEsSUFBSSxPQUFPLENBRTNCO0lBRUQsK0RBQStEO0lBQy9ELFdBQVcsSUFBSSxFQUFFLENBRWhCO0lBRUQsdURBQXVEO0lBQ3ZELE1BQU0sSUFBSSxJQUFJLENBRWI7SUFFRCxRQUFRLElBQUksTUFBTSxDQWFqQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsVUFBVSxDQW1CM0Q7Q0FDRjtBQUVEOztHQUVHO0FBQ0gsd0JBQWdCLFlBQVksQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLE1BQU0sQ0FHckQifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmVkX2ZhY3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL2ZhY3Rfc3RvcmUvc3RvcmVkX2ZhY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sa0NBQWtDLENBQUM7QUFHbkYsT0FBTyxFQUFFLEtBQUssY0FBYyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFOUUsNENBQTRDO0FBQzVDLE1BQU0sTUFBTSxJQUFJLEdBQUc7SUFBRSxVQUFVLEVBQUUsRUFBRSxDQUFDO0lBQUMsT0FBTyxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBQUMsV0FBVyxFQUFFLGNBQWMsR0FBRyxTQUFTLENBQUE7Q0FBRSxDQUFDO0FBRTlGOztHQUVHO0FBQ0gscUJBQWEsVUFBVTthQUVILGlCQUFpQixFQUFFLGlCQUFpQjthQUNwQyxVQUFVLEVBQUUsRUFBRTthQUNkLE9BQU8sRUFBRSxFQUFFLEVBQUU7YUFDYixXQUFXLEVBQUUsY0FBYyxHQUFHLFNBQVM7SUFKekQsWUFDa0IsaUJBQWlCLEVBQUUsaUJBQWlCLEVBQ3BDLFVBQVUsRUFBRSxFQUFFLEVBQ2QsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUNiLFdBQVcsRUFBRSxjQUFjLEdBQUcsU0FBUyxFQUNyRDtJQUVKLHVGQUF1RjtJQUN2RixJQUFJLGFBQWEsSUFBSSxPQUFPLENBRTNCO0lBRUQsK0RBQStEO0lBQy9ELFdBQVcsSUFBSSxFQUFFLENBRWhCO0lBRUQsdURBQXVEO0lBQ3ZELE1BQU0sSUFBSSxJQUFJLENBRWI7SUFFRCxRQUFRLElBQUksTUFBTSxDQWFqQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsVUFBVSxDQW1CM0Q7Q0FDRjtBQUVEOztHQUVHO0FBQ0gsd0JBQWdCLFlBQVksQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLE1BQU0sQ0FHckQifQ==

package/dest/storage/fact_store/stored_fact.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stored_fact.d.ts","sourceRoot":"","sources":["../../../src/storage/fact_store/stored_fact.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AACzD,OAAO,EAAE,YAAY,EAAqB,MAAM,kCAAkC,CAAC;AAGnF,OAAO,EAAE,iBAAiB,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAE3E,4CAA4C;AAC5C,MAAM,MAAM,IAAI,GAAG;IAAE,UAAU,EAAE,EAAE,CAAC;IAAC,OAAO,EAAE,EAAE,EAAE,CAAC;IAAC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAA;CAAE,CAAC;AAE3F;;GAEG;AACH,qBAAa,UAAU;aAEH,iBAAiB,EAAE,iBAAiB;aACpC,UAAU,EAAE,EAAE;aACd,OAAO,EAAE,EAAE,EAAE;aACb,WAAW,EAAE,WAAW,GAAG,SAAS;IAJtD,YACkB,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,EAAE,EACd,OAAO,EAAE,EAAE,EAAE,EACb,WAAW,EAAE,WAAW,GAAG,SAAS,EAClD;IAEJ,uFAAuF;IACvF,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED,+DAA+D;IAC/D,WAAW,IAAI,EAAE,CAEhB;IAED,uDAAuD;IACvD,MAAM,IAAI,IAAI,CAEb;IAED,QAAQ,IAAI,MAAM,CAajB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,UAAU,CAmB3D;CACF;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAGrD"}
+{"version":3,"file":"stored_fact.d.ts","sourceRoot":"","sources":["../../../src/storage/fact_store/stored_fact.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AACzD,OAAO,EAAE,YAAY,EAAqB,MAAM,kCAAkC,CAAC;AAGnF,OAAO,EAAE,KAAK,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9E,4CAA4C;AAC5C,MAAM,MAAM,IAAI,GAAG;IAAE,UAAU,EAAE,EAAE,CAAC;IAAC,OAAO,EAAE,EAAE,EAAE,CAAC;IAAC,WAAW,EAAE,cAAc,GAAG,SAAS,CAAA;CAAE,CAAC;AAE9F;;GAEG;AACH,qBAAa,UAAU;aAEH,iBAAiB,EAAE,iBAAiB;aACpC,UAAU,EAAE,EAAE;aACd,OAAO,EAAE,EAAE,EAAE;aACb,WAAW,EAAE,cAAc,GAAG,SAAS;IAJzD,YACkB,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,EAAE,EACd,OAAO,EAAE,EAAE,EAAE,EACb,WAAW,EAAE,cAAc,GAAG,SAAS,EACrD;IAEJ,uFAAuF;IACvF,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED,+DAA+D;IAC/D,WAAW,IAAI,EAAE,CAEhB;IAED,uDAAuD;IACvD,MAAM,IAAI,IAAI,CAEb;IAED,QAAQ,IAAI,MAAM,CAajB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,UAAU,CAmB3D;CACF;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAGrD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec-labs/pxe",
-  "version": "6.0.0-rc.1",
+  "version": "6.0.0-rc.3",
   "type": "module",
   "typedocOptions": {
     "entryPoints": [
@@ -71,21 +71,21 @@
     ]
   },
   "dependencies": {
-    "@aztec-foundation/bb.js": "6.0.0-rc.1",
-    "@aztec-foundation/noir-acvm_js": "6.0.0-rc.1",
-    "@aztec-foundation/noir-noirc_abi": "6.0.0-rc.1",
-    "@aztec-foundation/noir-types": "6.0.0-rc.1",
-    "@aztec-labs/bb-prover": "6.0.0-rc.1",
-    "@aztec-labs/constants": "6.0.0-rc.1",
-    "@aztec-labs/ethereum": "6.0.0-rc.1",
-    "@aztec-labs/foundation": "6.0.0-rc.1",
-    "@aztec-labs/key-store": "6.0.0-rc.1",
-    "@aztec-labs/kv-store": "6.0.0-rc.1",
-    "@aztec-labs/noir-protocol-circuits-types": "6.0.0-rc.1",
-    "@aztec-labs/protocol-contracts": "6.0.0-rc.1",
-    "@aztec-labs/simulator": "6.0.0-rc.1",
-    "@aztec-labs/standard-contracts": "6.0.0-rc.1",
-    "@aztec-labs/stdlib": "6.0.0-rc.1",
+    "@aztec-foundation/bb.js": "6.0.0-rc.6",
+    "@aztec-foundation/noir-acvm_js": "6.0.0-rc.6",
+    "@aztec-foundation/noir-noirc_abi": "6.0.0-rc.6",
+    "@aztec-foundation/noir-types": "6.0.0-rc.6",
+    "@aztec-labs/bb-prover": "6.0.0-rc.3",
+    "@aztec-labs/constants": "6.0.0-rc.3",
+    "@aztec-labs/ethereum": "6.0.0-rc.3",
+    "@aztec-labs/foundation": "6.0.0-rc.3",
+    "@aztec-labs/key-store": "6.0.0-rc.3",
+    "@aztec-labs/kv-store": "6.0.0-rc.3",
+    "@aztec-labs/noir-protocol-circuits-types": "6.0.0-rc.3",
+    "@aztec-labs/protocol-contracts": "6.0.0-rc.3",
+    "@aztec-labs/simulator": "6.0.0-rc.3",
+    "@aztec-labs/standard-contracts": "6.0.0-rc.3",
+    "@aztec-labs/stdlib": "6.0.0-rc.3",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
     "lodash.omit": "^4.5.0",
@@ -94,8 +94,8 @@
     "viem": "npm:@aztec/viem@2.38.3"
   },
   "devDependencies": {
-    "@aztec-labs/noir-test-contracts.js": "6.0.0-rc.1",
-    "@aztec-labs/world-state": "6.0.0-rc.1",
+    "@aztec-labs/noir-test-contracts.js": "6.0.0-rc.3",
+    "@aztec-labs/world-state": "6.0.0-rc.3",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.omit": "^4.5.7",

package/src/contract_function_simulator/contract_function_simulator.ts

@@ -732,7 +732,12 @@ export async function generateSimulatedProvingResult(
     );
     gasUsed = meterGasUsed(revertibleData, isPrivateOnlyTx).add(meterGasUsed(nonRevertibleData, isPrivateOnlyTx));
     if (publicTeardownCallRequest) {
-      gasUsed = gasUsed.add(privateExecutionResult.entrypoint.publicInputs.txContext.gasSettings.teardownGasLimits);
+      // The teardown call is dispatched by the AVM like any other enqueued public call, so it consumes the startup
+      // gas on top of its gas limits.
+      const teardownStartupGas = Gas.from({ daGas: 0, l2Gas: FIXED_AVM_STARTUP_L2_GAS });
+      gasUsed = gasUsed
+        .add(privateExecutionResult.entrypoint.publicInputs.txContext.gasSettings.teardownGasLimits)
+        .add(teardownStartupGas);
     }
 
     inputsForPublic = new PartialPrivateTailPublicInputsForPublic(

package/src/contract_function_simulator/index.ts

@@ -79,6 +79,8 @@ export { pickNotes } from './pick_notes.js';
 export type { IMiscOracle, IUtilityExecutionOracle, IPrivateExecutionOracle } from './oracle/interfaces.js';
 export type { FactCollection } from './noir-structs/fact_collection.js';
 export type { NoteData } from './noir-structs/note_data.js';
+export type { NullifierStatus } from './noir-structs/nullifier_status.js';
+export type { NoteOrigin } from './noir-structs/note_origin.js';
 export type { ResolvedTaggingStrategy } from './noir-structs/resolved_tagging_strategy.js';
 export { TxResolverService } from '../messages/tx_resolver_service.js';
 export { UtilityExecutionOracle } from './oracle/utility_execution_oracle.js';

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

@@ -0,0 +1,11 @@
+import type { Fr } from '@aztec-labs/foundation/curves/bn254';
+
+import type { BlockReference } from '../../storage/fact_store/index.js';
+
+/** TypeScript counterpart of `NoteOrigin` in Aztec.nr. */
+export type NoteOrigin = {
+  /** Hash of the tx that created the note. */
+  txHash: Fr;
+  /** The block that tx was included in. */
+  block: BlockReference;
+};

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

@@ -0,0 +1,9 @@
+import type { BlockReference } from '../../storage/fact_store/index.js';
+import type { Option } from './option.js';
+
+/** TypeScript counterpart of `NullifierStatus` in Aztec.nr. */
+export type NullifierStatus = {
+  exists: boolean;
+  /** The block the nullifier was included in. Absent when it does not exist or is pending in the current transaction. */
+  originBlock: Option<BlockReference>;
+};

package/src/contract_function_simulator/oracle/acir_callback.ts

@@ -24,7 +24,10 @@ export class UnavailableOracleError extends Error {
 export function buildACIRCallback(
   handler: OracleHandler,
   options: {
-    /** The contract whose function the callback is built for. */
+    /**
+     * The contract whose function the callback is built for. Protocol contracts are only served the protocol oracles,
+     * which no other contract is served.
+     */
     contractAddress?: AztecAddress;
     currentRegistry?: Record<string, OracleRegistryEntry>;
     legacyRegistry?: Record<string, LegacyOracleEntry>;
@@ -37,6 +40,18 @@ export function buildACIRCallback(
     legacyRegistry = LEGACY_ORACLE_REGISTRY,
     protocolRegistry = PROTOCOL_ORACLE_REGISTRY,
   } = options;
+  const calledByProtocolContract = contractAddress !== undefined && isProtocolContract(contractAddress);
+  const target = calledByProtocolContract
+    ? buildProtocolOracleCallbacks(handler, protocolRegistry)
+    : buildCurrentAndLegacyOracleCallbacks(handler, currentRegistry, legacyRegistry);
+  return new Proxy(target, makeUnknownOracleTrap(handler, calledByProtocolContract));
+}
+
+function buildCurrentAndLegacyOracleCallbacks(
+  handler: OracleHandler,
+  currentRegistry: Record<string, OracleRegistryEntry>,
+  legacyRegistry: Record<string, LegacyOracleEntry>,
+): ACIRCallback {
   const target = {} as ACIRCallback;
   for (const [oracleKey, entry] of Object.entries(currentRegistry)) {
     const { oracleKind, methodName } = parseOracleName(oracleKey, 'Oracle');
@@ -72,27 +87,23 @@ export function buildACIRCallback(
     };
   }
 
-  // Protocol oracle names: served to protocol contracts only, each with its own wire.
-  const calledByProtocolContract = contractAddress !== undefined && isProtocolContract(contractAddress);
+  return target;
+}
+
+function buildProtocolOracleCallbacks(
+  handler: OracleHandler,
+  protocolRegistry: Record<string, ProtocolOracleEntry>,
+): ACIRCallback {
+  const target = {} as ACIRCallback;
   for (const [protocolKey, protocol] of Object.entries(protocolRegistry)) {
-    if (protocolKey in target) {
-      throw new Error(`Protocol oracle "${protocolKey}" collides with another oracle of the same name`);
-    }
     const wire = makeEntry({ params: [...protocol.params], returnType: protocol.returnType });
     target[protocolKey] = async (...inputs: ACVMField[][]) => {
-      if (!calledByProtocolContract) {
-        const caller = contractAddress ?? 'a caller that is not a contract';
-        throw new Error(
-          `Oracle '${protocolKey}' can only be called by protocol contracts, but was called by ${caller}`,
-        );
-      }
       assertHandlerSupportsOracleKind(handler, protocol.oracleKind);
       const args = wire.deserializeParams(inputs).map(p => p.value);
       return wire.serializeReturn(await protocol.serve(handler, args));
     };
   }
-
-  return new Proxy(target, makeUnknownOracleTrap(handler, calledByProtocolContract));
+  return target;
 }
 
 /** Parses an `aztec_{oracleKind}_{method}` oracle name into its parts, throwing if it doesn't follow the convention. */

package/src/contract_function_simulator/oracle/oracle_registry.ts

@@ -3,7 +3,6 @@ import { ARCHIVE_HEIGHT, L1_TO_L2_MSG_TREE_HEIGHT, NOTE_HASH_TREE_HEIGHT } from
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
 import { FieldReader } from '@aztec-labs/foundation/serialize';
 import { toACVMField } from '@aztec-labs/simulator/client';
-import type { UnsiloedMessageNullifier } from '@aztec-labs/stdlib/messaging';
 
 import {
   ARRAY,
@@ -11,6 +10,7 @@ import {
   BLOCK_HASH,
   BLOCK_HEADER,
   BLOCK_NUMBER,
+  BLOCK_REFERENCE,
   BOOL,
   BOUNDED_VEC,
   CALL_PRIVATE_RESULT,
@@ -29,11 +29,12 @@ import {
   MEMBERSHIP_WITNESS,
   type MaybePromise,
   NOTE,
+  NOTE_ORIGIN,
   NOTE_SELECTOR,
   NOTE_VALIDATION_REQUEST,
   NULLIFIER_MEMBERSHIP_WITNESS,
+  NULLIFIER_STATUS,
   OPTION,
-  ORIGIN_BLOCK,
   type OutputSlot,
   PENDING_TAGGED_LOG,
   POINT,
@@ -43,12 +44,12 @@ import {
   RESOLVED_TAGGING_STRATEGY,
   RESOLVED_TX,
   STR,
-  STRUCT,
   TX_EFFECT,
   TX_HASH,
   type TypeMapping,
   U8,
   U32,
+  UNSILOED_MESSAGE_NULLIFIER,
   UTILITY_CONTEXT,
   assertReadersConsumed,
   slotsOf,
@@ -184,27 +185,27 @@ export const ORACLE_REGISTRY = {
     returnType: OPTION(PUBLIC_KEYS_AND_PARTIAL_ADDRESS),
   }),
 
-  aztec_utl_doesNullifierExist: makeEntry({
-    params: [{ name: 'innerNullifier', type: FIELD }],
-    returnType: BOOL,
+  aztec_utl_getNullifierStatuses: makeEntry({
+    params: [{ name: 'innerNullifiers', type: EPHEMERAL_ARRAY(FIELD) }],
+    returnType: EPHEMERAL_ARRAY(NULLIFIER_STATUS),
   }),
 
   aztec_utl_getL1ToL2MembershipWitnessV2: makeEntry({
     params: [
       { name: 'messageHash', type: FIELD },
-      {
-        name: 'nullifier',
-        type: OPTION(
-          STRUCT<UnsiloedMessageNullifier>([
-            { name: 'contractAddress', type: AZTEC_ADDRESS },
-            { name: 'nullifier', type: FIELD },
-          ]),
-        ),
-      },
+      { name: 'nullifier', type: OPTION(UNSILOED_MESSAGE_NULLIFIER) },
     ],
     returnType: MEMBERSHIP_WITNESS(L1_TO_L2_MSG_TREE_HEIGHT),
   }),
 
+  aztec_utl_tryGetL1ToL2MembershipWitness: makeEntry({
+    params: [
+      { name: 'messageHash', type: FIELD },
+      { name: 'nullifier', type: OPTION(UNSILOED_MESSAGE_NULLIFIER) },
+    ],
+    returnType: OPTION(MEMBERSHIP_WITNESS(L1_TO_L2_MSG_TREE_HEIGHT)),
+  }),
+
   aztec_utl_getFromPublicStorage: makeEntry({
     params: [
       { name: 'blockHash', type: BLOCK_HASH },
@@ -238,6 +239,15 @@ export const ORACLE_REGISTRY = {
     returnType: BOUNDED_VEC(NOTE),
   }),
 
+  aztec_utl_getSettledNoteOrigin: makeEntry({
+    params: [
+      { name: 'noteHash', type: FIELD },
+      { name: 'contractAddress', type: AZTEC_ADDRESS },
+      { name: 'noteNonce', type: FIELD },
+    ],
+    returnType: OPTION(NOTE_ORIGIN),
+  }),
+
   aztec_utl_getPendingTaggedLogsV2: makeEntry({
     params: [
       { name: 'scope', type: AZTEC_ADDRESS },
@@ -348,7 +358,7 @@ export const ORACLE_REGISTRY = {
       { name: 'factCollectionId', type: FIELD },
       { name: 'factTypeId', type: FIELD },
       { name: 'payload', type: EPHEMERAL_ARRAY(FIELD) },
-      { name: 'originBlock', type: OPTION(ORIGIN_BLOCK) },
+      { name: 'originBlock', type: OPTION(BLOCK_REFERENCE) },
     ],
   }),
 

package/src/contract_function_simulator/oracle/oracle_type_mappings.ts

@@ -34,6 +34,7 @@ import {
   Tag,
   appTaggingSecretKindFromDeliveryMode,
 } from '@aztec-labs/stdlib/logs';
+import type { UnsiloedMessageNullifier } from '@aztec-labs/stdlib/messaging';
 import type {
   AppendOnlyTreeSnapshot,
   NullifierLeaf,
@@ -50,7 +51,7 @@ import {
 } from '@aztec-labs/stdlib/tx';
 
 import {
-  type OriginBlock,
+  type BlockReference,
   type OriginBlockState,
   type RetractableFactOrigin,
   originBlockStateFromNumber,
@@ -65,8 +66,10 @@ import type { FactCollection } from '../noir-structs/fact_collection.js';
 import { type LogRetrievalRequest, type LogSource, logSourceFromField } 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 { NoteValidationRequest } from '../noir-structs/note_validation_request.js';
 import type { NullifierMembershipWitnessData } 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';
@@ -543,11 +546,26 @@ export const PENDING_TAGGED_LOG: TypeMapping<PendingTaggedLog> = STRUCT([
   { name: 'context', type: RESOLVED_TX },
 ]);
 
-export const ORIGIN_BLOCK: TypeMapping<OriginBlock> = STRUCT([
+export const BLOCK_REFERENCE: TypeMapping<BlockReference> = STRUCT([
   { name: 'blockNumber', type: U32 },
   { name: 'blockHash', type: FIELD },
 ]);
 
+export const UNSILOED_MESSAGE_NULLIFIER: TypeMapping<UnsiloedMessageNullifier> = STRUCT([
+  { name: 'contractAddress', type: AZTEC_ADDRESS },
+  { name: 'nullifier', type: FIELD },
+]);
+
+export const NULLIFIER_STATUS: TypeMapping<NullifierStatus> = STRUCT([
+  { name: 'exists', type: BOOL },
+  { name: 'originBlock', type: OPTION(BLOCK_REFERENCE) },
+]);
+
+export const NOTE_ORIGIN: TypeMapping<NoteOrigin> = STRUCT([
+  { name: 'txHash', type: FIELD },
+  { name: 'block', type: BLOCK_REFERENCE },
+]);
+
 const ORIGIN_BLOCK_STATE: TypeMapping<OriginBlockState> = SCALAR({
   kind: 'origin-block-state',
   serialization: { fn: v => [new Fr(v)] },

package/src/contract_function_simulator/oracle/private_execution_oracle.ts

@@ -45,6 +45,7 @@ import { ExecutionTaggingIndexCache } from '../execution_tagging_index_cache.js'
 import type { HashedValuesCache } from '../hashed_values_cache.js';
 import { BoundedVec } from '../noir-structs/bounded_vec.js';
 import type { NoteData } from '../noir-structs/note_data.js';
+import type { NullifierStatus } from '../noir-structs/nullifier_status.js';
 import { Option } from '../noir-structs/option.js';
 import type { ResolvedTaggingStrategy } from '../noir-structs/resolved_tagging_strategy.js';
 import { pickNotes } from '../pick_notes.js';
@@ -417,21 +418,23 @@ export class PrivateExecutionOracle extends UtilityExecutionOracle implements IP
     return Promise.resolve(preimage);
   }
 
-  override async doesNullifierExist(innerNullifier: Fr): Promise<boolean> {
-    // This oracle must be overridden because while utility execution can only meaningfully check if a nullifier exists
-    // in the synched block, during private execution there's also the possibility of it being pending, i.e. created
-    // in the current transaction.
+  protected override async getSiloedNullifierStatuses(siloedNullifiers: Fr[]): Promise<NullifierStatus[]> {
+    // This must be overridden because while utility execution can only meaningfully check if a nullifier exists in
+    // the anchor block, during private execution there's also the possibility of it being pending, i.e. created in
+    // the current transaction.
 
-    this.logger.debug(`Checking existence of inner nullifier ${innerNullifier}`, {
+    this.logger.debug(`Checking existence of ${siloedNullifiers.length} nullifiers`, {
       contractAddress: this.contractAddress,
+      siloedNullifiers,
     });
 
-    const nullifier = (await siloNullifier(this.contractAddress, innerNullifier)).toBigInt();
+    const pendingNullifiers = this.noteCache.getNullifiers(this.contractAddress);
+    const isPending = siloedNullifiers.map(nullifier => pendingNullifiers.has(nullifier.toBigInt()));
+    const settledStatuses = await super.getSiloedNullifierStatuses(siloedNullifiers.filter((_, i) => !isPending[i]));
 
-    return (
-      this.noteCache.getNullifiers(this.contractAddress).has(nullifier) ||
-      (await super.doesNullifierExist(innerNullifier))
-    );
+    const pendingStatus: NullifierStatus = { exists: true, originBlock: Option.none() };
+    let nextSettled = 0;
+    return isPending.map(pending => (pending ? pendingStatus : settledStatuses[nextSettled++]));
   }
 
   /**