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

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 };