@aztec/stdlib 0.0.1-commit.b655e406 → 0.0.1-commit.c0b82b2

package/dest/tx/global_variables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global_variables.d.ts","sourceRoot":"","sources":["../../src/tx/global_variables.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EACL,YAAY,EACZ,WAAW,EAIZ,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAExD;;GAEG;AACH,qBAAa,eAAe;IAExB,gCAAgC;IACzB,OAAO,EAAE,EAAE;IAClB,gCAAgC;IACzB,OAAO,EAAE,EAAE;IAClB,oCAAoC;IAC7B,WAAW,EAAE,MAAM;IAC1B,kCAAkC;IAC3B,UAAU,EAAE,EAAE;IACrB,iCAAiC;IAC1B,SAAS,EAAE,MAAM;IACxB,iCAAiC;IAC1B,QAAQ,EAAE,UAAU;IAC3B,+BAA+B;IACxB,YAAY,EAAE,YAAY;IACjC,wCAAwC;IACjC,OAAO,EAAE,OAAO;;IAfvB,gCAAgC;IACzB,OAAO,EAAE,EAAE;IAClB,gCAAgC;IACzB,OAAO,EAAE,EAAE;IAClB,oCAAoC;IAC7B,WAAW,EAAE,MAAM;IAC1B,kCAAkC;IAC3B,UAAU,EAAE,EAAE;IACrB,iCAAiC;IAC1B,SAAS,EAAE,MAAM;IACxB,iCAAiC;IAC1B,QAAQ,EAAE,UAAU;IAC3B,+BAA+B;IACxB,YAAY,EAAE,YAAY;IACjC,wCAAwC;IACjC,OAAO,EAAE,OAAO;IAGzB,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;IAED,OAAO,IAAI,MAAM;IAIjB,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG,eAAe;IAI/D,MAAM,CAAC,KAAK,CAAC,MAAM,GAAE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAM,GAAG,eAAe;IAc9E,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,eAAe;IAcjE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,eAAe;IAe9D,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;IAalD,QAAQ;IAaR,QAAQ;IAUR;;;OAGG;IACH,cAAc;;;;;;;IAUd,KAAK,IAAI,eAAe;IAIxB,OAAO,IAAI,OAAO;IAalB,SAAS;;;;;;;;;;;IAcT,CAAC,OAAO,CAAC,MAAM,CAAC;IAIT,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;CAYpC"}
+{"version":3,"file":"global_variables.d.ts","sourceRoot":"","sources":["../../src/tx/global_variables.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAqB,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7F,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EACL,YAAY,EACZ,WAAW,EAIZ,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD;;;GAGG;AACH,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,aAAa,CAAC,CAAC;AAEvF;;GAEG;AACH,qBAAa,eAAe;IAExB,gCAAgC;IACzB,OAAO,EAAE,EAAE;IAClB,gCAAgC;IACzB,OAAO,EAAE,EAAE;IAClB,oCAAoC;IAC7B,WAAW,EAAE,WAAW;IAC/B,kCAAkC;IAC3B,UAAU,EAAE,UAAU;IAC7B,iCAAiC;IAC1B,SAAS,EAAE,MAAM;IACxB,iCAAiC;IAC1B,QAAQ,EAAE,UAAU;IAC3B,+BAA+B;IACxB,YAAY,EAAE,YAAY;IACjC,wCAAwC;IACjC,OAAO,EAAE,OAAO;IAhBzB;IACE,gCAAgC;IACzB,OAAO,EAAE,EAAE;IAClB,gCAAgC;IACzB,OAAO,EAAE,EAAE;IAClB,oCAAoC;IAC7B,WAAW,EAAE,WAAW;IAC/B,kCAAkC;IAC3B,UAAU,EAAE,UAAU;IAC7B,iCAAiC;IAC1B,SAAS,EAAE,MAAM;IACxB,iCAAiC;IAC1B,QAAQ,EAAE,UAAU;IAC3B,+BAA+B;IACxB,YAAY,EAAE,YAAY;IACjC,wCAAwC;IACjC,OAAO,EAAE,OAAO,EACrB;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;IAED,OAAO,IAAI,MAAM,CAEhB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG,eAAe,CAE9D;IAED;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,eAAe,CAWhD;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,GAAE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAM,GAAG,eAAe,CAY7E;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,eAAe,CAYhE;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,eAAe,CAa7D;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,yFAWjD;IAED,QAAQ,4BAWP;IAED,QAAQ,SAQP;IAED;;;OAGG;IACH,cAAc;;;;;;MAQb;IAED;;;;OAIG;IACH,MAAM;;;;;;;;;MAWL;IAED,KAAK,IAAI,eAAe,CAEvB;IAED,OAAO,IAAI,OAAO,CAWjB;IAED,MAAM,CAAC,MAAM,CAAC,SAAS,GAAE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAM,GAAG,eAAe,CAYjF;IAED,SAAS;;;;;;;;;;MAYR;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAEf;IAEM,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAWlC;CACF"}

package/dest/tx/global_variables.js

@@ -1,6 +1,9 @@
+var _computedKey;
 import { GLOBAL_VARIABLES_LENGTH } from '@aztec/constants';
+import { BlockNumber, BlockNumberSchema, SlotNumber } from '@aztec/foundation/branded-types';
+import { randomInt } from '@aztec/foundation/crypto/random';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { BufferReader, FieldReader, bigintToUInt64BE, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
@@ -8,6 +11,7 @@ import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
 import { GasFees } from '../gas/gas_fees.js';
 import { schemas } from '../schemas/index.js';
+_computedKey = inspect.custom;
 /**
  * Global variables of the L2 block.
  */ export class GlobalVariables {
@@ -33,8 +37,8 @@ import { schemas } from '../schemas/index.js';
         return z.object({
             chainId: schemas.Fr,
             version: schemas.Fr,
-            blockNumber: schemas.UInt32,
-            slotNumber: schemas.Fr,
+            blockNumber: BlockNumberSchema,
+            slotNumber: schemas.SlotNumber,
             timestamp: schemas.BigInt,
             coinbase: schemas.EthAddress,
             feeRecipient: schemas.AztecAddress,
@@ -47,10 +51,19 @@ import { schemas } from '../schemas/index.js';
     static from(fields) {
         return new GlobalVariables(...GlobalVariables.getFields(fields));
     }
+    /**
+   * Creates a GlobalVariables instance from a plain object without Zod validation.
+   * This method is optimized for performance and skips validation, making it suitable
+   * for deserializing trusted data (e.g., from C++ via MessagePack).
+   * @param obj - Plain object containing GlobalVariables fields
+   * @returns A GlobalVariables instance
+   */ static fromPlainObject(obj) {
+        return new GlobalVariables(Fr.fromPlainObject(obj.chainId), Fr.fromPlainObject(obj.version), obj.blockNumber, SlotNumber(Fr.fromPlainObject(obj.slotNumber).toNumber()), typeof obj.timestamp === 'bigint' ? obj.timestamp : BigInt(obj.timestamp), EthAddress.fromPlainObject(obj.coinbase), AztecAddress.fromPlainObject(obj.feeRecipient), GasFees.fromPlainObject(obj.gasFees));
+    }
     static empty(fields = {}) {
         return GlobalVariables.from({
-            blockNumber: 0,
-            slotNumber: Fr.ZERO,
+            blockNumber: BlockNumber.ZERO,
+            slotNumber: SlotNumber.ZERO,
             timestamp: 0n,
             chainId: Fr.ZERO,
             version: Fr.ZERO,
@@ -62,11 +75,11 @@ import { schemas } from '../schemas/index.js';
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new GlobalVariables(Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readNumber(), Fr.fromBuffer(reader), reader.readUInt64(), reader.readObject(EthAddress), reader.readObject(AztecAddress), reader.readObject(GasFees));
+        return new GlobalVariables(Fr.fromBuffer(reader), Fr.fromBuffer(reader), BlockNumber(reader.readNumber()), SlotNumber(reader.readNumber()), reader.readUInt64(), reader.readObject(EthAddress), reader.readObject(AztecAddress), reader.readObject(GasFees));
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new GlobalVariables(reader.readField(), reader.readField(), reader.readU32(), reader.readField(), reader.readField().toBigInt(), EthAddress.fromField(reader.readField()), AztecAddress.fromField(reader.readField()), GasFees.fromFields(reader));
+        return new GlobalVariables(reader.readField(), reader.readField(), BlockNumber(reader.readU32()), SlotNumber(reader.readU32()), reader.readField().toBigInt(), EthAddress.fromField(reader.readField()), AztecAddress.fromField(reader.readField()), GasFees.fromFields(reader));
     }
     static getFields(fields) {
         return [
@@ -105,24 +118,53 @@ import { schemas } from '../schemas/index.js';
    */ toFriendlyJSON() {
         return {
             blockNumber: this.blockNumber,
-            slotNumber: this.slotNumber.toNumber(),
+            slotNumber: this.slotNumber,
             timestamp: this.timestamp.toString(),
             coinbase: this.coinbase.toString(),
             gasFees: jsonStringify(this.gasFees)
         };
     }
+    /**
+   * Converts GlobalVariables to a plain object suitable for MessagePack serialization.
+   * This method ensures that slotNumber is serialized as a Fr (Field element) to match
+   * the C++ struct definition which expects slot_number as FF.
+   */ toJSON() {
+        return {
+            chainId: this.chainId,
+            version: this.version,
+            blockNumber: this.blockNumber,
+            slotNumber: new Fr(this.slotNumber),
+            timestamp: this.timestamp,
+            coinbase: this.coinbase,
+            feeRecipient: this.feeRecipient,
+            gasFees: this.gasFees
+        };
+    }
     clone() {
         return GlobalVariables.fromBuffer(this.toBuffer());
     }
     isEmpty() {
-        return this.chainId.isZero() && this.version.isZero() && this.blockNumber === 0 && this.slotNumber.isZero() && this.timestamp === 0n && this.coinbase.isZero() && this.feeRecipient.isZero() && this.gasFees.isEmpty();
+        return this.chainId.isZero() && this.version.isZero() && this.blockNumber === 0 && this.slotNumber === 0 && this.timestamp === 0n && this.coinbase.isZero() && this.feeRecipient.isZero() && this.gasFees.isEmpty();
+    }
+    static random(overrides = {}) {
+        return GlobalVariables.from({
+            chainId: new Fr(randomInt(100_000)),
+            version: new Fr(randomInt(100_000)),
+            blockNumber: BlockNumber(randomInt(100_000)),
+            slotNumber: SlotNumber(randomInt(100_000)),
+            coinbase: EthAddress.random(),
+            feeRecipient: AztecAddress.fromField(Fr.random()),
+            gasFees: GasFees.random(),
+            timestamp: BigInt(randomInt(100_000_000)),
+            ...overrides
+        });
     }
     toInspect() {
         return {
             chainId: this.chainId.toNumber(),
             version: this.version.toNumber(),
             blockNumber: this.blockNumber,
-            slotNumber: this.slotNumber.toNumber(),
+            slotNumber: this.slotNumber,
             timestamp: this.timestamp,
             coinbase: this.coinbase.toString(),
             feeRecipient: this.feeRecipient.toString(),
@@ -130,10 +172,10 @@ import { schemas } from '../schemas/index.js';
             feePerL2Gas: Number(this.gasFees.feePerL2Gas)
         };
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `GlobalVariables ${inspect(this.toInspect())}`;
     }
     equals(other) {
-        return this.chainId.equals(other.chainId) && this.version.equals(other.version) && this.blockNumber === other.blockNumber && this.slotNumber.equals(other.slotNumber) && this.timestamp === other.timestamp && this.coinbase.equals(other.coinbase) && this.feeRecipient.equals(other.feeRecipient) && this.gasFees.equals(other.gasFees);
+        return this.chainId.equals(other.chainId) && this.version.equals(other.version) && this.blockNumber === other.blockNumber && this.slotNumber === other.slotNumber && this.timestamp === other.timestamp && this.coinbase.equals(other.coinbase) && this.feeRecipient.equals(other.feeRecipient) && this.gasFees.equals(other.gasFees);
     }
 }

package/dest/tx/hashed_values.d.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { type ZodFor } from '../schemas/schemas.js';
@@ -33,4 +33,4 @@ export declare class HashedValues {
     static fromArgs(args: Fr[]): Promise<HashedValues>;
     static fromCalldata(calldata: Fr[]): Promise<HashedValues>;
 }
-//# sourceMappingURL=hashed_values.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFzaGVkX3ZhbHVlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R4L2hhc2hlZF92YWx1ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFDOUUsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFLeEQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0sdUJBQXVCLENBQUM7QUFHN0Q7O0dBRUc7QUFDSCxxQkFBYSxZQUFZO0lBRXJCOztPQUVHO2FBQ2EsTUFBTSxFQUFFLEVBQUUsRUFBRTtJQUM1Qjs7T0FFRzthQUNhLElBQUksRUFBRSxFQUFFO0lBUjFCO0lBQ0U7O09BRUc7SUFDYSxNQUFNLEVBQUUsRUFBRSxFQUFFO0lBQzVCOztPQUVHO0lBQ2EsSUFBSSxFQUFFLEVBQUUsRUFDdEI7SUFFSixPQUFPLFdBRU47SUFFRCxNQUFNLEtBQUssTUFBTSxJQUFJLE1BQU0sQ0FBQyxZQUFZLENBQUMsQ0FPeEM7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsWUFBWSxDQUFDLEdBQUcsWUFBWSxDQUV4RDtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxZQUFZLENBQUMsdUJBRTlDO0lBRUQsTUFBTSxDQUFDLE1BQU0saUJBRVo7SUFFRCxRQUFRLDRCQUVQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxZQUFZLENBRzdEO0lBR0QsT0FBYSxRQUFRLENBQUMsSUFBSSxFQUFFLEVBQUUsRUFBRSx5QkFFL0I7SUFHRCxPQUFhLFlBQVksQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLHlCQUV2QztDQUNGIn0=

package/dest/tx/hashed_values.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hashed_values.d.ts","sourceRoot":"","sources":["../../src/tx/hashed_values.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAKxD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,uBAAuB,CAAC;AAG7D;;GAEG;AACH,qBAAa,YAAY;IAErB;;OAEG;aACa,MAAM,EAAE,EAAE,EAAE;IAC5B;;OAEG;aACa,IAAI,EAAE,EAAE;;IAPxB;;OAEG;IACa,MAAM,EAAE,EAAE,EAAE;IAC5B;;OAEG;IACa,IAAI,EAAE,EAAE;IAG1B,OAAO;IAIP,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,CAOxC;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,YAAY;IAIzD,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC;IAI/C,MAAM,CAAC,MAAM;IAIb,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,YAAY;WAMjD,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE;WAKnB,YAAY,CAAC,QAAQ,EAAE,EAAE,EAAE;CAGzC"}
+{"version":3,"file":"hashed_values.d.ts","sourceRoot":"","sources":["../../src/tx/hashed_values.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAKxD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,uBAAuB,CAAC;AAG7D;;GAEG;AACH,qBAAa,YAAY;IAErB;;OAEG;aACa,MAAM,EAAE,EAAE,EAAE;IAC5B;;OAEG;aACa,IAAI,EAAE,EAAE;IAR1B;IACE;;OAEG;IACa,MAAM,EAAE,EAAE,EAAE;IAC5B;;OAEG;IACa,IAAI,EAAE,EAAE,EACtB;IAEJ,OAAO,WAEN;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,CAOxC;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,YAAY,CAExD;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,uBAE9C;IAED,MAAM,CAAC,MAAM,iBAEZ;IAED,QAAQ,4BAEP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,YAAY,CAG7D;IAGD,OAAa,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,yBAE/B;IAGD,OAAa,YAAY,CAAC,QAAQ,EAAE,EAAE,EAAE,yBAEvC;CACF"}

package/dest/tx/hashed_values.js

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { z } from 'zod';
 import { computeCalldataHash, computeVarArgsHash } from '../hash/index.js';

package/dest/tx/in_tx.d.ts

@@ -0,0 +1,26 @@
+import { z } from 'zod';
+import { type InBlock } from '../block/in_block.js';
+import { TxHash } from './tx_hash.js';
+export type InTx = InBlock & {
+    txHash: TxHash;
+};
+export declare function randomInTx(): InTx;
+export declare function inTxSchema(): z.ZodIntersection<z.ZodObject<{
+    l2BlockNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, import("@aztec/foundation/branded-types").BlockNumber, string | number | bigint>;
+    l2BlockHash: import("@aztec/foundation/schemas").ZodFor<import("../block/block_hash.js").BlockHash>;
+}, "strip", z.ZodTypeAny, {
+    l2BlockNumber: number & {
+        _branding: "BlockNumber";
+    };
+    l2BlockHash: import("../block/block_hash.js").BlockHash;
+}, {
+    l2BlockNumber: string | number | bigint;
+    l2BlockHash?: any;
+}>, z.ZodObject<{
+    txHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, TxHash, string>;
+}, "strip", z.ZodTypeAny, {
+    txHash: TxHash;
+}, {
+    txHash: string;
+}>>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5fdHguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eC9pbl90eC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxLQUFLLE9BQU8sRUFBZ0MsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRixPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRXRDLE1BQU0sTUFBTSxJQUFJLEdBQUcsT0FBTyxHQUFHO0lBQzNCLE1BQU0sRUFBRSxNQUFNLENBQUM7Q0FDaEIsQ0FBQztBQUVGLHdCQUFnQixVQUFVLElBQUksSUFBSSxDQUtqQztBQUVELHdCQUFnQixVQUFVOzs7Ozs7Ozs7Ozs7Ozs7OztJQU96QiJ9

package/dest/tx/in_tx.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"in_tx.d.ts","sourceRoot":"","sources":["../../src/tx/in_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,KAAK,OAAO,EAAgC,MAAM,sBAAsB,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,MAAM,MAAM,IAAI,GAAG,OAAO,GAAG;IAC3B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAgB,UAAU,IAAI,IAAI,CAKjC;AAED,wBAAgB,UAAU;;;;;;;;;;;;;;;;;IAOzB"}

package/dest/tx/in_tx.js

@@ -0,0 +1,14 @@
+import { z } from 'zod';
+import { inBlockSchema, randomInBlock } from '../block/in_block.js';
+import { TxHash } from './tx_hash.js';
+export function randomInTx() {
+    return {
+        ...randomInBlock(),
+        txHash: TxHash.random()
+    };
+}
+export function inTxSchema() {
+    return z.intersection(inBlockSchema(), z.object({
+        txHash: TxHash.schema
+    }));
+}

package/dest/tx/index.d.ts

@@ -1,7 +1,6 @@
 export * from './block_header.js';
 export * from './call_context.js';
 export * from './global_variables.js';
-export * from './content_commitment.js';
 export * from './state_reference.js';
 export * from './partial_state_reference.js';
 export * from './function_data.js';
@@ -31,4 +30,6 @@ export * from './indexed_tx_effect.js';
 export * from './offchain_effect.js';
 export * from './profiling.js';
 export * from './protocol_contracts.js';
-//# sourceMappingURL=index.d.ts.map
+export * from './execution_payload.js';
+export * from './in_tx.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsOEJBQThCLENBQUM7QUFDN0MsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYywrQkFBK0IsQ0FBQztBQUM5QyxjQUFjLHdDQUF3QyxDQUFDO0FBQ3ZELGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYyxTQUFTLENBQUM7QUFDeEIsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLCtCQUErQixDQUFDO0FBQzlDLGNBQWMsMkJBQTJCLENBQUM7QUFDMUMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLGdDQUFnQyxDQUFDO0FBQy9DLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLFlBQVksQ0FBQyJ9

package/dest/tx/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tx/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,wCAAwC,CAAC;AACvD,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,SAAS,CAAC;AACxB,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,cAAc,CAAC;AAC7B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tx/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,wCAAwC,CAAC;AACvD,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,SAAS,CAAC;AACxB,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,cAAc,CAAC;AAC7B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,YAAY,CAAC"}

package/dest/tx/index.js

@@ -1,7 +1,6 @@
 export * from './block_header.js';
 export * from './call_context.js';
 export * from './global_variables.js';
-export * from './content_commitment.js';
 export * from './state_reference.js';
 export * from './partial_state_reference.js';
 export * from './function_data.js';
@@ -31,3 +30,5 @@ export * from './indexed_tx_effect.js';
 export * from './offchain_effect.js';
 export * from './profiling.js';
 export * from './protocol_contracts.js';
+export * from './execution_payload.js';
+export * from './in_tx.js';

package/dest/tx/indexed_tx_effect.d.ts

@@ -1,27 +1,31 @@
-import { L2BlockHash } from '../block/block_hash.js';
-import { type InBlock } from '../block/in_block.js';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { BlockHash } from '../block/block_hash.js';
+import { type DataInBlock } from '../block/in_block.js';
 import { TxEffect } from './tx_effect.js';
-export type IndexedTxEffect = InBlock<TxEffect> & {
+export type IndexedTxEffect = DataInBlock<TxEffect> & {
     txIndexInBlock: number;
 };
 export declare function indexedTxSchema(): import("zod").ZodObject<{
+    l2BlockNumber: import("zod").ZodEffects<import("zod").ZodPipeline<import("zod").ZodUnion<[import("zod").ZodNumber, import("zod").ZodBigInt, import("zod").ZodString]>, import("zod").ZodNumber>, BlockNumber, string | number | bigint>;
+    l2BlockHash: import("@aztec/foundation/schemas").ZodFor<BlockHash>;
+} & {
     data: import("@aztec/foundation/schemas").ZodFor<TxEffect>;
-    l2BlockNumber: import("zod").ZodPipeline<import("zod").ZodUnion<[import("zod").ZodBigInt, import("zod").ZodNumber, import("zod").ZodString]>, import("zod").ZodNumber>;
-    l2BlockHash: import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
 } & {
     txIndexInBlock: import("zod").ZodPipeline<import("zod").ZodUnion<[import("zod").ZodBigInt, import("zod").ZodNumber, import("zod").ZodString]>, import("zod").ZodNumber>;
 }, "strip", import("zod").ZodTypeAny, {
+    l2BlockNumber: number & {
+        _branding: "BlockNumber";
+    };
+    l2BlockHash: BlockHash;
     data: TxEffect;
-    l2BlockNumber: number;
-    l2BlockHash: L2BlockHash;
     txIndexInBlock: number;
 }, {
     l2BlockNumber: string | number | bigint;
-    l2BlockHash: string;
-    txIndexInBlock: string | number | bigint;
+    l2BlockHash?: any;
     data?: any;
+    txIndexInBlock: string | number | bigint;
 }>;
 export declare function randomIndexedTxEffect(): Promise<IndexedTxEffect>;
 export declare function serializeIndexedTxEffect(effect: IndexedTxEffect): Buffer;
 export declare function deserializeIndexedTxEffect(buffer: Buffer): IndexedTxEffect;
-//# sourceMappingURL=indexed_tx_effect.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXhlZF90eF9lZmZlY3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eC9pbmRleGVkX3R4X2VmZmVjdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFLOUQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBMkMsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFMUMsTUFBTSxNQUFNLGVBQWUsR0FBRyxXQUFXLENBQUMsUUFBUSxDQUFDLEdBQUc7SUFBRSxjQUFjLEVBQUUsTUFBTSxDQUFBO0NBQUUsQ0FBQztBQUVqRix3QkFBZ0IsZUFBZTs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQUU5QjtBQUVELHdCQUFzQixxQkFBcUIsSUFBSSxPQUFPLENBQUMsZUFBZSxDQUFDLENBS3RFO0FBRUQsd0JBQWdCLHdCQUF3QixDQUFDLE1BQU0sRUFBRSxlQUFlLEdBQUcsTUFBTSxDQUV4RTtBQUVELHdCQUFnQiwwQkFBMEIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLGVBQWUsQ0FjMUUifQ==

package/dest/tx/indexed_tx_effect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"indexed_tx_effect.d.ts","sourceRoot":"","sources":["../../src/tx/indexed_tx_effect.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,KAAK,OAAO,EAAmC,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7E,wBAAgB,eAAe;;;;;;;;;;;;;;;;GAE9B;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,eAAe,CAAC,CAKtE;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM,CAExE;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,CAc1E"}
+{"version":3,"file":"indexed_tx_effect.d.ts","sourceRoot":"","sources":["../../src/tx/indexed_tx_effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAK9D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,KAAK,WAAW,EAA2C,MAAM,sBAAsB,CAAC;AACjG,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjF,wBAAgB,eAAe;;;;;;;;;;;;;;;;;;;GAE9B;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,eAAe,CAAC,CAKtE;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM,CAExE;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,CAc1E"}

package/dest/tx/indexed_tx_effect.js

@@ -1,16 +1,20 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { L2BlockHash } from '../block/block_hash.js';
-import { inBlockSchemaFor, randomInBlock } from '../block/in_block.js';
+import { BlockHash } from '../block/block_hash.js';
+import { dataInBlockSchemaFor, randomDataInBlock } from '../block/in_block.js';
 import { TxEffect } from './tx_effect.js';
 export function indexedTxSchema() {
-    return inBlockSchemaFor(TxEffect.schema).extend({
+    return dataInBlockSchemaFor(TxEffect.schema).extend({
         txIndexInBlock: schemas.Integer
     });
 }
 export async function randomIndexedTxEffect() {
     return {
-        ...randomInBlock(await TxEffect.random()),
+        ...randomDataInBlock(await TxEffect.random({
+            numNullifiers: 1 + Math.floor(Math.random() * 64)
+        })),
         txIndexInBlock: Math.floor(Math.random() * 1000)
     };
 }
@@ -19,8 +23,8 @@ export function serializeIndexedTxEffect(effect) {
 }
 export function deserializeIndexedTxEffect(buffer) {
     const reader = BufferReader.asReader(buffer);
-    const l2BlockHash = reader.readObject(L2BlockHash);
-    const l2BlockNumber = reader.readNumber();
+    const l2BlockHash = new BlockHash(reader.readObject(Fr));
+    const l2BlockNumber = BlockNumber(reader.readNumber());
     const txIndexInBlock = reader.readNumber();
     const data = reader.readObject(TxEffect);
     return {

package/dest/tx/offchain_effect.d.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { AztecAddress } from '../aztec-address/index.js';
 export declare const OFFCHAIN_MESSAGE_IDENTIFIER: Fr;
 /**
@@ -11,4 +11,4 @@ export type OffchainEffect = {
     /** The contract that emitted the data */
     contractAddress: AztecAddress;
 };
-//# sourceMappingURL=offchain_effect.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2ZmY2hhaW5fZWZmZWN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvb2ZmY2hhaW5fZWZmZWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUk5RCxlQUFPLE1BQU0sMkJBQTJCLEVBQUUsRUFFekMsQ0FBQztBQUVGOzs7R0FHRztBQUNILE1BQU0sTUFBTSxjQUFjLEdBQUc7SUFDM0IsdUJBQXVCO0lBQ3ZCLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQztJQUNYLHlDQUF5QztJQUN6QyxlQUFlLEVBQUUsWUFBWSxDQUFDO0NBQy9CLENBQUMifQ==

package/dest/tx/offchain_effect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"offchain_effect.d.ts","sourceRoot":"","sources":["../../src/tx/offchain_effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAI9D,eAAO,MAAM,2BAA2B,EAAE,EAEzC,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,uBAAuB;IACvB,IAAI,EAAE,EAAE,EAAE,CAAC;IACX,yCAAyC;IACzC,eAAe,EAAE,YAAY,CAAC;CAC/B,CAAC"}
+{"version":3,"file":"offchain_effect.d.ts","sourceRoot":"","sources":["../../src/tx/offchain_effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAI9D,eAAO,MAAM,2BAA2B,EAAE,EAEzC,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,uBAAuB;IACvB,IAAI,EAAE,EAAE,EAAE,CAAC;IACX,yCAAyC;IACzC,eAAe,EAAE,YAAY,CAAC;CAC/B,CAAC"}

package/dest/tx/offchain_effect.js

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 // The following identifier was copied over from `noir-projects/aztec-nr/aztec/src/messages/offchain_messages.nr`.
 // poseidon2hash("aztecnr_offchain_message")
 export const OFFCHAIN_MESSAGE_IDENTIFIER = new Fr(6023466688192654631553769360478808766602235351827869819420284624004071427516n);

package/dest/tx/partial_state_reference.d.ts

@@ -1,6 +1,6 @@
-import type { ViemPartialStateReference } from '@aztec/ethereum';
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 /**
@@ -92,11 +92,11 @@ export declare class PartialStateReference {
         };
     }>;
     getSize(): number;
+    static getFields(fields: FieldsOf<PartialStateReference>): readonly [AppendOnlyTreeSnapshot, AppendOnlyTreeSnapshot, AppendOnlyTreeSnapshot];
+    static from(fields: FieldsOf<PartialStateReference>): PartialStateReference;
     static fromBuffer(buffer: Buffer | BufferReader): PartialStateReference;
     static fromFields(fields: Fr[] | FieldReader): PartialStateReference;
-    static fromViem(stateReference: ViemPartialStateReference): PartialStateReference;
     static random(): PartialStateReference;
-    toViem(): ViemPartialStateReference;
     toAbi(): [
         ReturnType<AppendOnlyTreeSnapshot['toAbi']>,
         ReturnType<AppendOnlyTreeSnapshot['toAbi']>,
@@ -108,4 +108,4 @@ export declare class PartialStateReference {
     isEmpty(): boolean;
     equals(other: this): boolean;
 }
-//# sourceMappingURL=partial_state_reference.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFydGlhbF9zdGF0ZV9yZWZlcmVuY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eC9wYXJ0aWFsX3N0YXRlX3JlZmVyZW5jZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBRS9FOztHQUVHO0FBQ0gscUJBQWEscUJBQXFCO0lBRTlCLHNDQUFzQzthQUN0QixZQUFZLEVBQUUsc0JBQXNCO0lBQ3BELHNDQUFzQzthQUN0QixhQUFhLEVBQUUsc0JBQXNCO0lBQ3JELHdDQUF3QzthQUN4QixjQUFjLEVBQUUsc0JBQXNCO0lBTnhEO0lBQ0Usc0NBQXNDO0lBQ3RCLFlBQVksRUFBRSxzQkFBc0I7SUFDcEQsc0NBQXNDO0lBQ3RCLGFBQWEsRUFBRSxzQkFBc0I7SUFDckQsd0NBQXdDO0lBQ3hCLGNBQWMsRUFBRSxzQkFBc0IsRUFDcEQ7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztPQVdoQjtJQUVELE9BQU8sV0FFTjtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxxQkFBcUIsQ0FBQyxxRkFFdkQ7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMscUJBQXFCLENBQUMseUJBRWxEO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxxQkFBcUIsQ0FPdEU7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLEdBQUcscUJBQXFCLENBUW5FO0lBRUQsTUFBTSxDQUFDLE1BQU0sSUFBSSxxQkFBcUIsQ0FNckM7SUFFRCxLQUFLLElBQUk7UUFDUCxVQUFVLENBQUMsc0JBQXNCLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDM0MsVUFBVSxDQUFDLHNCQUFzQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzNDLFVBQVUsQ0FBQyxzQkFBc0IsQ0FBQyxPQUFPLENBQUMsQ0FBQztLQUM1QyxDQUVBO0lBRUQsTUFBTSxDQUFDLEtBQUssSUFBSSxxQkFBcUIsQ0FNcEM7SUFFRCxRQUFRLDRCQUVQO0lBRUQsUUFBUSxTQVlQO0lBRUQsT0FBTyxJQUFJLE9BQU8sQ0FFakI7SUFFTSxNQUFNLENBQUMsS0FBSyxFQUFFLElBQUksR0FBRyxPQUFPLENBTWxDO0NBQ0YifQ==

package/dest/tx/partial_state_reference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"partial_state_reference.d.ts","sourceRoot":"","sources":["../../src/tx/partial_state_reference.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E;;GAEG;AACH,qBAAa,qBAAqB;IAE9B,sCAAsC;aACtB,YAAY,EAAE,sBAAsB;IACpD,sCAAsC;aACtB,aAAa,EAAE,sBAAsB;IACrD,wCAAwC;aACxB,cAAc,EAAE,sBAAsB;;IALtD,sCAAsC;IACtB,YAAY,EAAE,sBAAsB;IACpD,sCAAsC;IACtB,aAAa,EAAE,sBAAsB;IACrD,wCAAwC;IACxB,cAAc,EAAE,sBAAsB;IAGxD,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAWhB;IAED,OAAO;IAIP,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,qBAAqB;IASvE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,qBAAqB;IAUpE,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,yBAAyB;IAQzD,MAAM,CAAC,MAAM,IAAI,qBAAqB;IAQtC,MAAM,IAAI,yBAAyB;IAQnC,KAAK,IAAI;QACP,UAAU,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC3C,UAAU,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC3C,UAAU,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;KAC5C;IAID,MAAM,CAAC,KAAK,IAAI,qBAAqB;IAQrC,QAAQ;IAIR,QAAQ;IAcR,OAAO,IAAI,OAAO;IAIX,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;CAOpC"}
+{"version":3,"file":"partial_state_reference.d.ts","sourceRoot":"","sources":["../../src/tx/partial_state_reference.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAC3F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E;;GAEG;AACH,qBAAa,qBAAqB;IAE9B,sCAAsC;aACtB,YAAY,EAAE,sBAAsB;IACpD,sCAAsC;aACtB,aAAa,EAAE,sBAAsB;IACrD,wCAAwC;aACxB,cAAc,EAAE,sBAAsB;IANxD;IACE,sCAAsC;IACtB,YAAY,EAAE,sBAAsB;IACpD,sCAAsC;IACtB,aAAa,EAAE,sBAAsB;IACrD,wCAAwC;IACxB,cAAc,EAAE,sBAAsB,EACpD;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAWhB;IAED,OAAO,WAEN;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC,qFAEvD;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC,yBAElD;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,qBAAqB,CAOtE;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,qBAAqB,CAQnE;IAED,MAAM,CAAC,MAAM,IAAI,qBAAqB,CAMrC;IAED,KAAK,IAAI;QACP,UAAU,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC3C,UAAU,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC3C,UAAU,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;KAC5C,CAEA;IAED,MAAM,CAAC,KAAK,IAAI,qBAAqB,CAMpC;IAED,QAAQ,4BAEP;IAED,QAAQ,SAYP;IAED,OAAO,IAAI,OAAO,CAEjB;IAEM,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAMlC;CACF"}

package/dest/tx/partial_state_reference.js

@@ -23,6 +23,16 @@ import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
     getSize() {
         return this.noteHashTree.getSize() + this.nullifierTree.getSize() + this.publicDataTree.getSize();
     }
+    static getFields(fields) {
+        return [
+            fields.noteHashTree,
+            fields.nullifierTree,
+            fields.publicDataTree
+        ];
+    }
+    static from(fields) {
+        return new PartialStateReference(...PartialStateReference.getFields(fields));
+    }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
         return new PartialStateReference(reader.readObject(AppendOnlyTreeSnapshot), reader.readObject(AppendOnlyTreeSnapshot), reader.readObject(AppendOnlyTreeSnapshot));
@@ -34,19 +44,9 @@ import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
         const publicDataTree = AppendOnlyTreeSnapshot.fromFields(reader);
         return new PartialStateReference(noteHashTree, nullifierTree, publicDataTree);
     }
-    static fromViem(stateReference) {
-        return new PartialStateReference(AppendOnlyTreeSnapshot.fromViem(stateReference.noteHashTree), AppendOnlyTreeSnapshot.fromViem(stateReference.nullifierTree), AppendOnlyTreeSnapshot.fromViem(stateReference.publicDataTree));
-    }
     static random() {
         return new PartialStateReference(AppendOnlyTreeSnapshot.random(), AppendOnlyTreeSnapshot.random(), AppendOnlyTreeSnapshot.random());
     }
-    toViem() {
-        return {
-            noteHashTree: this.noteHashTree.toViem(),
-            nullifierTree: this.nullifierTree.toViem(),
-            publicDataTree: this.publicDataTree.toViem()
-        };
-    }
     toAbi() {
         return [
             this.noteHashTree.toAbi(),

package/dest/tx/private_execution_result.d.ts

@@ -1,4 +1,5 @@
-import { Fr } from '@aztec/foundation/fields';
+import type { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
 import { NoteSelector } from '../abi/note_selector.js';
@@ -8,7 +9,6 @@ import { ContractClassLog, ContractClassLogFields } from '../logs/contract_class
 import { type PreTag } from '../logs/pre_tag.js';
 import { Note } from '../note/note.js';
 import { type ZodFor } from '../schemas/index.js';
-import type { UInt32 } from '../types/index.js';
 import { HashedValues } from './hashed_values.js';
 import type { OffchainEffect } from './offchain_effect.js';
 /**
@@ -19,6 +19,8 @@ export declare class NoteAndSlot {
     note: Note;
     /** The storage slot of the note. */
     storageSlot: Fr;
+    /** The randomness injected to the note. */
+    randomness: Fr;
     /** The note type identifier. */
     noteTypeId: NoteSelector;
     constructor(
@@ -26,45 +28,30 @@ export declare class NoteAndSlot {
     note: Note, 
     /** The storage slot of the note. */
     storageSlot: Fr, 
+    /** The randomness injected to the note. */
+    randomness: Fr, 
     /** The note type identifier. */
     noteTypeId: NoteSelector);
     static get schema(): z.ZodEffects<z.ZodObject<{
-        note: z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Buffer<ArrayBuffer>, string>, z.ZodEffects<z.ZodObject<{
-            type: z.ZodLiteral<"Buffer">;
-            data: z.ZodArray<z.ZodNumber, "many">;
-        }, "strip", z.ZodTypeAny, {
-            type: "Buffer";
-            data: number[];
-        }, {
-            type: "Buffer";
-            data: number[];
-        }>, Buffer<ArrayBuffer>, {
-            type: "Buffer";
-            data: number[];
-        }>]>, Note, string | {
-            type: "Buffer";
-            data: number[];
-        }>;
+        note: z.ZodEffects<ZodFor<Buffer<ArrayBufferLike>>, Note, any>;
         storageSlot: ZodFor<Fr>;
+        randomness: ZodFor<Fr>;
         noteTypeId: z.ZodType<NoteSelector, any, string>;
     }, "strip", z.ZodTypeAny, {
-        storageSlot: Fr;
         note: Note;
+        storageSlot: Fr;
+        randomness: Fr;
         noteTypeId: NoteSelector;
     }, {
-        note: string | {
-            type: "Buffer";
-            data: number[];
-        };
-        noteTypeId: string;
+        note?: any;
         storageSlot?: any;
-    }>, NoteAndSlot, {
-        note: string | {
-            type: "Buffer";
-            data: number[];
-        };
+        randomness?: any;
         noteTypeId: string;
+    }>, NoteAndSlot, {
+        note?: any;
         storageSlot?: any;
+        randomness?: any;
+        noteTypeId: string;
     }>;
     static from(fields: FieldsOf<NoteAndSlot>): NoteAndSlot;
     static random(): NoteAndSlot;
@@ -82,12 +69,12 @@ export declare class CountedContractClassLog implements IsEmpty {
 }
 export declare class PrivateExecutionResult {
     entrypoint: PrivateCallExecutionResult;
-    /** The first non revertible nullifier, or zero if there was none. */
+    /** The first non-revertible nullifier emitted by any private call, or the protocol nullifier if there was none. */
     firstNullifier: Fr;
     /** An array of calldata for the enqueued public function calls and the teardown function call. */
     publicFunctionCalldata: HashedValues[];
     constructor(entrypoint: PrivateCallExecutionResult, 
-    /** The first non revertible nullifier, or zero if there was none. */
+    /** The first non-revertible nullifier emitted by any private call, or the protocol nullifier if there was none. */
     firstNullifier: Fr, 
     /** An array of calldata for the enqueued public function calls and the teardown function call. */
     publicFunctionCalldata: HashedValues[]);
@@ -97,7 +84,7 @@ export declare class PrivateExecutionResult {
     /**
      * The anchor block number that this execution was simulated with.
      */
-    getSimulationAnchorBlockNumber(): UInt32;
+    getSimulationAnchorBlockNumber(): BlockNumber;
 }
 /**
  * The result of executing a call to a private function.
@@ -111,8 +98,6 @@ export declare class PrivateCallExecutionResult {
     partialWitness: Map<number, string>;
     /** The call stack item. */
     publicInputs: PrivateCircuitPublicInputs;
-    /** Mapping of note hash to its index in the note hash tree. Used for building hints for note hash read requests. */
-    noteHashLeafIndexMap: Map<bigint, bigint>;
     /** The notes created in the executed function. */
     newNotes: NoteAndSlot[];
     /** Mapping of note hash counter to the counter of its nullifier. */
@@ -123,7 +108,7 @@ export declare class PrivateCallExecutionResult {
     offchainEffects: {
         data: Fr[];
     }[];
-    /** The pre tags used in this tx to compute tags for private logs */
+    /** The pre-tags used in this tx to compute tags for private logs */
     preTags: PreTag[];
     /** The nested executions. */
     nestedExecutionResults: PrivateCallExecutionResult[];
@@ -143,8 +128,6 @@ export declare class PrivateCallExecutionResult {
     partialWitness: Map<number, string>, 
     /** The call stack item. */
     publicInputs: PrivateCircuitPublicInputs, 
-    /** Mapping of note hash to its index in the note hash tree. Used for building hints for note hash read requests. */
-    noteHashLeafIndexMap: Map<bigint, bigint>, 
     /** The notes created in the executed function. */
     newNotes: NoteAndSlot[], 
     /** Mapping of note hash counter to the counter of its nullifier. */
@@ -155,7 +138,7 @@ export declare class PrivateCallExecutionResult {
     offchainEffects: {
         data: Fr[];
     }[], 
-    /** The pre tags used in this tx to compute tags for private logs */
+    /** The pre-tags used in this tx to compute tags for private logs */
     preTags: PreTag[], 
     /** The nested executions. */
     nestedExecutionResults: PrivateCallExecutionResult[], 
@@ -169,7 +152,6 @@ export declare class PrivateCallExecutionResult {
     static from(fields: FieldsOf<PrivateCallExecutionResult>): PrivateCallExecutionResult;
     static random(nested?: number): Promise<PrivateCallExecutionResult>;
 }
-export declare function collectNoteHashLeafIndexMap(execResult: PrivateExecutionResult): Map<bigint, bigint>;
 export declare function collectNoteHashNullifierCounterMap(execResult: PrivateExecutionResult): Map<number, number>;
 /**
  * Collect all contract class logs across all nested executions and sorts by counter.
@@ -199,4 +181,4 @@ export declare class PrivateExecutionProfileResult {
         }>;
     });
 }
-//# sourceMappingURL=private_execution_result.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9leGVjdXRpb25fcmVzdWx0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvcHJpdmF0ZV9leGVjdXRpb25fcmVzdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR25FLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQUN4RixPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUU3RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUN6RixPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sb0JBQW9CLENBQUM7QUFDL0QsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3ZDLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBc0IsTUFBTSxxQkFBcUIsQ0FBQztBQUN0RSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEQsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFM0Q7O0dBRUc7QUFDSCxxQkFBYSxXQUFXO0lBRXBCLGdCQUFnQjtJQUNULElBQUksRUFBRSxJQUFJO0lBQ2pCLG9DQUFvQztJQUM3QixXQUFXLEVBQUUsRUFBRTtJQUN0QiwyQ0FBMkM7SUFDcEMsVUFBVSxFQUFFLEVBQUU7SUFDckIsZ0NBQWdDO0lBQ3pCLFVB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