@aztec/stdlib 4.0.0-nightly.20250907 → 4.0.0-nightly.20260108

package/dest/tx/tx_effect.js

@@ -1,25 +1,22 @@
-import { CONTRACT_CLASS_LOGS_PREFIX, L2_L1_MSGS_PREFIX, MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NOTES_PREFIX, NULLIFIERS_PREFIX, PRIVATE_LOGS_PREFIX, PUBLIC_DATA_UPDATE_REQUESTS_PREFIX, PUBLIC_LOGS_PREFIX, REVERT_CODE_PREFIX, TX_FEE_PREFIX } from '@aztec/constants';
+var _computedKey;
+import { decodeTxBlobData, encodeTxBlobData, getNumTxBlobFields } from '@aztec/blob-lib/encoding';
+import { MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX } from '@aztec/constants';
 import { makeTuple, makeTupleAsync } from '@aztec/foundation/array';
-import { toBufferBE } from '@aztec/foundation/bigint-buffer';
-import { Fr } from '@aztec/foundation/fields';
+import { randomInt } from '@aztec/foundation/crypto/random';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { schemas } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, serializeArrayOfBufferableToVector, serializeToBuffer } from '@aztec/foundation/serialize';
+import { BufferReader, serializeArrayOfBufferableToVector, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { computeUnbalancedMerkleTreeRoot } from '@aztec/foundation/trees';
 import { inspect } from 'util';
 import { z } from 'zod';
 import { PublicDataWrite } from '../avm/public_data_write.js';
 import { RevertCode } from '../avm/revert_code.js';
 import { ContractClassLog } from '../logs/contract_class_log.js';
 import { PrivateLog } from '../logs/private_log.js';
-import { PublicLog } from '../logs/public_log.js';
+import { FlatPublicLogs, PublicLog } from '../logs/public_log.js';
+import { computeTxOutHash } from '../messaging/out_hash.js';
 import { TxHash } from './tx_hash.js';
-// This will appear as 0x74785f7374617274 in logs
-export const TX_START_PREFIX = 8392562855083340404n;
-// These are helper constants to decode tx effects from blob encoded fields
-export const TX_START_PREFIX_BYTES_LENGTH = TX_START_PREFIX.toString(16).length / 2;
-// 7 bytes for: | 0 | txlen[0] | txlen[1] | 0 | REVERT_CODE_PREFIX | 0 | revertCode |
-export const TX_EFFECT_PREFIX_BYTE_LENGTH = TX_START_PREFIX_BYTES_LENGTH + 7;
+_computedKey = inspect.custom;
 export class TxEffect {
     revertCode;
     txHash;
@@ -116,246 +113,109 @@ export class TxEffect {
             serializeArrayOfBufferableToVector(this.l2ToL1Msgs, 1),
             serializeArrayOfBufferableToVector(this.publicDataWrites, 1),
             serializeArrayOfBufferableToVector(this.privateLogs, 1),
-            serializeArrayOfBufferableToVector(this.publicLogs, 1),
+            serializeArrayOfBufferableToVector(this.publicLogs, 4),
             serializeArrayOfBufferableToVector(this.contractClassLogs, 1)
         ]);
     }
     equals(other) {
         return this.revertCode.equals(other.revertCode) && this.txHash.equals(other.txHash) && this.transactionFee.equals(other.transactionFee) && this.noteHashes.length === other.noteHashes.length && this.noteHashes.every((h, i)=>h.equals(other.noteHashes[i])) && this.nullifiers.length === other.nullifiers.length && this.nullifiers.every((h, i)=>h.equals(other.nullifiers[i])) && this.l2ToL1Msgs.length === other.l2ToL1Msgs.length && this.l2ToL1Msgs.every((h, i)=>h.equals(other.l2ToL1Msgs[i])) && this.publicDataWrites.length === other.publicDataWrites.length && this.publicDataWrites.every((h, i)=>h.equals(other.publicDataWrites[i])) && this.privateLogs.length === other.privateLogs.length && this.privateLogs.every((h, i)=>h.equals(other.privateLogs[i])) && this.publicLogs.length === other.publicLogs.length && this.publicLogs.every((h, i)=>h.equals(other.publicLogs[i])) && this.contractClassLogs.length === other.contractClassLogs.length && this.contractClassLogs.every((h, i)=>h.equals(other.contractClassLogs[i]));
     }
-    /** Returns the size of this tx effect in bytes as serialized onto DA. */ getDASize() {
-        return this.toBlobFields().length * Fr.SIZE_IN_BYTES;
-    }
     /**
    * Deserializes the TxEffect object from a Buffer.
    * @param buffer - Buffer or BufferReader object to deserialize.
    * @returns An instance of TxEffect.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new TxEffect(RevertCode.fromBuffer(reader), TxHash.fromBuffer(reader), Fr.fromBuffer(reader), reader.readVectorUint8Prefix(Fr), reader.readVectorUint8Prefix(Fr), reader.readVectorUint8Prefix(Fr), reader.readVectorUint8Prefix(PublicDataWrite), reader.readVectorUint8Prefix(PrivateLog), reader.readVectorUint8Prefix(PublicLog), reader.readVectorUint8Prefix(ContractClassLog));
+        return new TxEffect(RevertCode.fromBuffer(reader), TxHash.fromBuffer(reader), Fr.fromBuffer(reader), reader.readVectorUint8Prefix(Fr), reader.readVectorUint8Prefix(Fr), reader.readVectorUint8Prefix(Fr), reader.readVectorUint8Prefix(PublicDataWrite), reader.readVectorUint8Prefix(PrivateLog), reader.readVector(PublicLog), reader.readVectorUint8Prefix(ContractClassLog));
     }
     /**
    * Computes txOutHash of this tx effect.
    * @dev Follows new_sha in unbalanced_merkle_tree.nr
    */ txOutHash() {
-        const { l2ToL1Msgs } = this;
-        if (l2ToL1Msgs.length == 0) {
-            return Buffer.alloc(32);
-        }
-        return computeUnbalancedMerkleTreeRoot(l2ToL1Msgs.map((msg)=>msg.toBuffer()));
+        return computeTxOutHash(this.l2ToL1Msgs);
     }
-    static async random(numPublicCallsPerTx = 3, numPublicLogsPerCall = 1, maxEffects = undefined) {
-        return new TxEffect(RevertCode.random(), TxHash.random(), new Fr(Math.floor(Math.random() * 100_000)), makeTuple(maxEffects === undefined ? MAX_NOTE_HASHES_PER_TX : Math.min(maxEffects, MAX_NOTE_HASHES_PER_TX), Fr.random), makeTuple(maxEffects === undefined ? MAX_NULLIFIERS_PER_TX : Math.min(maxEffects, MAX_NULLIFIERS_PER_TX), Fr.random), makeTuple(maxEffects === undefined ? MAX_L2_TO_L1_MSGS_PER_TX : Math.min(maxEffects, MAX_L2_TO_L1_MSGS_PER_TX), Fr.random), makeTuple(maxEffects === undefined ? MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX : Math.min(maxEffects, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX), PublicDataWrite.random), makeTuple(MAX_PRIVATE_LOGS_PER_TX, ()=>PrivateLog.random()), await makeTupleAsync(numPublicCallsPerTx * numPublicLogsPerCall, async ()=>await PublicLog.random()), await makeTupleAsync(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLog.random));
+    static async random({ numNoteHashes, numNullifiers, numL2ToL1Msgs, numPublicDataWrites, numPrivateLogs, numPublicCallsPerTx = 3, numPublicLogsPerCall = 1, numContractClassLogs, maxEffects } = {}) {
+        const count = (max, num)=>num ?? Math.min(maxEffects ?? randomInt(max), max);
+        // Every tx effect must have at least 1 nullifier (the first nullifier is used for log indexing)
+        const countNullifiers = (max, num)=>Math.max(1, count(max, num));
+        return new TxEffect(RevertCode.random(), TxHash.random(), new Fr(Math.floor(Math.random() * 100_000)), makeTuple(count(MAX_NOTE_HASHES_PER_TX, numNoteHashes), Fr.random), makeTuple(countNullifiers(MAX_NULLIFIERS_PER_TX, numNullifiers), Fr.random), makeTuple(count(MAX_L2_TO_L1_MSGS_PER_TX, numL2ToL1Msgs), Fr.random), makeTuple(count(MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, numPublicDataWrites), PublicDataWrite.random), makeTuple(count(MAX_PRIVATE_LOGS_PER_TX, numPrivateLogs), ()=>PrivateLog.random()), await Promise.all(new Array(numPublicCallsPerTx * numPublicLogsPerCall).fill(null).map(()=>PublicLog.random())), await makeTupleAsync(count(MAX_CONTRACT_CLASS_LOGS_PER_TX, numContractClassLogs), ContractClassLog.random));
     }
     static empty() {
         return new TxEffect(RevertCode.OK, TxHash.zero(), Fr.ZERO, [], [], [], [], [], [], []);
     }
-    isEmpty() {
-        return this.nullifiers.length === 0;
-    }
     /** Returns a hex representation of the TxEffect object. */ toString() {
         return bufferToHex(this.toBuffer());
     }
-    /**
-   * Returns the prefix as used in a blob.
-   * Used to prefix a 'block' of tx effects with its type and length.
-   */ toPrefix(type, length) {
-        const buf = Buffer.alloc(4);
-        buf.writeUint8(type);
-        buf.writeUInt16BE(length, 2);
-        return new Fr(buf);
+    getNumBlobFields() {
+        return this.getTxStartMarker().numBlobFields;
     }
-    /**
-   * Decodes the prefix as used in a blob to tx effect type and length.
-   */ static fromPrefix(prefix) {
-        const buf = prefix.toBuffer().subarray(-4);
-        return {
-            type: buf[0],
-            length: new Fr(buf.subarray(-2)).toNumber()
-        };
+    toBlobFields() {
+        return encodeTxBlobData(this.toTxBlobData());
     }
-    /**
-   * Encodes the first field of a tx effect as used in a blob:
-   * TX_START_PREFIX | 0 | txlen[0] txlen[1] | 0 | REVERT_CODE_PREFIX | 0 | revert_code
-   */ encodeFirstField(length, revertCode) {
-        const lengthBuf = Buffer.alloc(2);
-        lengthBuf.writeUInt16BE(length, 0);
-        return new Fr(Buffer.concat([
-            toBufferBE(TX_START_PREFIX, TX_START_PREFIX_BYTES_LENGTH),
-            Buffer.alloc(1),
-            lengthBuf,
-            Buffer.alloc(1),
-            Buffer.from([
-                REVERT_CODE_PREFIX
-            ]),
-            Buffer.alloc(1),
-            revertCode.toBuffer()
-        ]));
+    static fromBlobFields(fields) {
+        return TxEffect.fromTxBlobData(decodeTxBlobData(fields));
     }
-    /**
-   * Decodes the first field of a tx effect as used in a blob:
-   * TX_START_PREFIX | 0 | txlen[0] txlen[1] | 0 | REVERT_CODE_PREFIX | 0 | revert_code
-   * Assumes that isFirstField has been called already.
-   */ static decodeFirstField(field) {
-        const buf = field.toBuffer().subarray(-TX_EFFECT_PREFIX_BYTE_LENGTH);
+    getTxStartMarker() {
+        const flatPublicLogs = FlatPublicLogs.fromLogs(this.publicLogs);
+        const partialTxStartMarker = {
+            revertCode: this.revertCode.getCode(),
+            numNoteHashes: this.noteHashes.length,
+            numNullifiers: this.nullifiers.length,
+            numL2ToL1Msgs: this.l2ToL1Msgs.length,
+            numPublicDataWrites: this.publicDataWrites.length,
+            numPrivateLogs: this.privateLogs.length,
+            privateLogsLength: this.privateLogs.reduce((acc, log)=>acc + log.emittedLength, 0),
+            publicLogsLength: flatPublicLogs.length,
+            contractClassLogLength: this.contractClassLogs[0]?.emittedLength ?? 0
+        };
+        const numBlobFields = getNumTxBlobFields(partialTxStartMarker);
         return {
-            length: new Fr(buf.subarray(TX_START_PREFIX_BYTES_LENGTH + 1, TX_START_PREFIX_BYTES_LENGTH + 3)).toNumber(),
-            revertCode: buf[buf.length - 1]
+            ...partialTxStartMarker,
+            numBlobFields
         };
     }
-    /**
-   * Determines whether a field is the first field of a tx effect
-   */ static isFirstField(field) {
-        const buf = field.toBuffer();
-        if (!buf.subarray(0, field.size - TX_EFFECT_PREFIX_BYTE_LENGTH).equals(Buffer.alloc(field.size - TX_EFFECT_PREFIX_BYTE_LENGTH))) {
-            return false;
-        }
-        const sliced = buf.subarray(-TX_EFFECT_PREFIX_BYTE_LENGTH);
-        if (// Checking we start with the correct prefix...
-        !new Fr(sliced.subarray(0, TX_START_PREFIX_BYTES_LENGTH)).equals(new Fr(TX_START_PREFIX)) || // ...and include the revert code prefix..
-        sliced[sliced.length - 3] !== REVERT_CODE_PREFIX || // ...and the following revert code is valid.
-        sliced[sliced.length - 1] > 4) {
-            return false;
-        }
-        return true;
-    }
-    /**
-   * Returns a flat packed array of prefixed fields of all tx effects, used for blobs.
-   */ toBlobFields() {
-        if (this.isEmpty()) {
-            return [];
-        }
-        const flattened = [];
-        // We reassign the first field when we know the length of all effects - see below
-        flattened.push(Fr.ZERO);
-        flattened.push(this.txHash.hash);
-        // TODO: how long should tx fee be? For now, not using toPrefix()
-        flattened.push(new Fr(Buffer.concat([
-            Buffer.from([
-                TX_FEE_PREFIX
-            ]),
-            Buffer.alloc(1),
-            this.transactionFee.toBuffer().subarray(3)
-        ])));
-        if (this.noteHashes.length) {
-            flattened.push(this.toPrefix(NOTES_PREFIX, this.noteHashes.length));
-            flattened.push(...this.noteHashes);
-        }
-        if (this.nullifiers.length) {
-            flattened.push(this.toPrefix(NULLIFIERS_PREFIX, this.nullifiers.length));
-            flattened.push(...this.nullifiers);
-        }
-        if (this.l2ToL1Msgs.length) {
-            flattened.push(this.toPrefix(L2_L1_MSGS_PREFIX, this.l2ToL1Msgs.length));
-            flattened.push(...this.l2ToL1Msgs);
-        }
-        if (this.publicDataWrites.length) {
-            flattened.push(this.toPrefix(PUBLIC_DATA_UPDATE_REQUESTS_PREFIX, this.publicDataWrites.length));
-            flattened.push(...this.publicDataWrites.flatMap((w)=>w.toBlobFields()));
-        }
-        if (this.privateLogs.length) {
-            flattened.push(this.toPrefix(PRIVATE_LOGS_PREFIX, this.privateLogs.length));
-            flattened.push(...this.privateLogs.flatMap((l)=>l.toBlobFields()));
-        }
-        if (this.publicLogs.length) {
-            flattened.push(this.toPrefix(PUBLIC_LOGS_PREFIX, this.publicLogs.length));
-            flattened.push(...this.publicLogs.flatMap((l)=>l.toBlobFields()));
-        }
-        if (this.contractClassLogs.length) {
-            flattened.push(this.toPrefix(CONTRACT_CLASS_LOGS_PREFIX, this.contractClassLogs.length));
-            flattened.push(...this.contractClassLogs.flatMap((l)=>l.toBlobFields()));
-        }
-        // The first value appended to each list of fields representing a tx effect is:
-        // TX_START_PREFIX | 0 | txlen[0] txlen[1] | 0 | REVERT_CODE_PREFIX | 0 | revert_code
-        // Tx start and len are to aid decomposing/ identifying when we reach a new tx effect
-        // The remaining bytes are used for revert code, since that only requires 3 bytes
-        flattened[0] = this.encodeFirstField(flattened.length, this.revertCode);
-        return flattened;
+    toTxBlobData() {
+        return {
+            txStartMarker: this.getTxStartMarker(),
+            txHash: this.txHash.hash,
+            transactionFee: this.transactionFee,
+            noteHashes: this.noteHashes,
+            nullifiers: this.nullifiers,
+            l2ToL1Msgs: this.l2ToL1Msgs,
+            publicDataWrites: this.publicDataWrites.map((w)=>w.toBlobFields()),
+            privateLogs: this.privateLogs.map((l)=>l.toBlobFields()),
+            publicLogs: FlatPublicLogs.fromLogs(this.publicLogs).toBlobFields(),
+            contractClassLog: this.contractClassLogs.map((l)=>l.toBlobFields()).flat()
+        };
     }
     /**
-   * Decodes a flat packed array of prefixed fields to TxEffect
-   */ static fromBlobFields(fields) {
-        const ensureEmpty = (arr)=>{
-            if (arr.length) {
-                throw new Error('Invalid fields given to TxEffect.fromBlobFields(): Attempted to assign property twice.');
-            }
-        };
-        const effect = this.empty();
-        const reader = FieldReader.asReader(fields);
-        const totalFields = reader.remainingFields();
-        if (!totalFields) {
-            return effect;
-        }
-        const firstField = reader.readField();
-        if (!this.isFirstField(firstField)) {
-            throw new Error('Invalid fields given to TxEffect.fromBlobFields(): First field invalid.');
-        }
-        const { length: fieldsToProcess, revertCode } = this.decodeFirstField(firstField);
-        effect.revertCode = RevertCode.fromField(new Fr(revertCode));
-        effect.txHash = new TxHash(reader.readField());
-        // TODO: how long should tx fee be? For now, not using fromPrefix()
-        const prefixedFee = reader.readField();
-        // NB: Fr.fromBuffer hangs here if you provide a buffer less than 32 in len
-        // todo: try new Fr(prefixedFee.toBuffer().subarray(3))
-        effect.transactionFee = Fr.fromBuffer(Buffer.concat([
-            Buffer.alloc(3),
-            prefixedFee.toBuffer().subarray(3)
-        ]));
-        let fieldsProcessed = totalFields - reader.remainingFields();
-        while(fieldsProcessed < fieldsToProcess){
-            const { type, length } = this.fromPrefix(reader.readField());
-            switch(type){
-                case NOTES_PREFIX:
-                    ensureEmpty(effect.noteHashes);
-                    effect.noteHashes = reader.readFieldArray(length);
-                    break;
-                case NULLIFIERS_PREFIX:
-                    ensureEmpty(effect.nullifiers);
-                    effect.nullifiers = reader.readFieldArray(length);
-                    break;
-                case L2_L1_MSGS_PREFIX:
-                    ensureEmpty(effect.l2ToL1Msgs);
-                    effect.l2ToL1Msgs = reader.readFieldArray(length);
-                    break;
-                case PUBLIC_DATA_UPDATE_REQUESTS_PREFIX:
-                    {
-                        ensureEmpty(effect.publicDataWrites);
-                        effect.publicDataWrites = Array.from({
-                            length
-                        }, ()=>PublicDataWrite.fromBlobFields(reader));
-                        break;
-                    }
-                case PRIVATE_LOGS_PREFIX:
-                    {
-                        ensureEmpty(effect.privateLogs);
-                        effect.privateLogs = Array.from({
-                            length
-                        }, ()=>PrivateLog.fromBlobFields(reader));
-                        break;
-                    }
-                case PUBLIC_LOGS_PREFIX:
-                    {
-                        ensureEmpty(effect.publicLogs);
-                        effect.publicLogs = Array.from({
-                            length
-                        }, ()=>PublicLog.fromBlobFields(reader));
-                        break;
-                    }
-                case CONTRACT_CLASS_LOGS_PREFIX:
-                    {
-                        ensureEmpty(effect.contractClassLogs);
-                        effect.contractClassLogs = Array.from({
-                            length
-                        }, ()=>ContractClassLog.fromBlobFields(reader));
-                        break;
-                    }
-                case REVERT_CODE_PREFIX:
-                default:
-                    throw new Error(`Too many fields to decode given to TxEffect.fromBlobFields()`);
-            }
-            fieldsProcessed = totalFields - reader.remainingFields();
-        }
-        return effect;
+   * Decodes a flat packed array of fields to TxEffect.
+   */ static fromTxBlobData(txBlobData) {
+        const txStartMarker = txBlobData.txStartMarker;
+        const revertCode = RevertCode.fromNumber(txStartMarker.revertCode);
+        const txHash = new TxHash(txBlobData.txHash);
+        const transactionFee = txBlobData.transactionFee;
+        const noteHashes = txBlobData.noteHashes;
+        const nullifiers = txBlobData.nullifiers;
+        const l2ToL1Msgs = txBlobData.l2ToL1Msgs;
+        const publicDataWrites = txBlobData.publicDataWrites.map((w)=>PublicDataWrite.fromBlobFields(w));
+        const privateLogs = txBlobData.privateLogs.map((l)=>PrivateLog.fromBlobFields(l.length, l));
+        const publicLogs = FlatPublicLogs.fromBlobFields(txStartMarker.publicLogsLength, txBlobData.publicLogs).toLogs();
+        const contractClassLogs = txStartMarker.contractClassLogLength > 0 ? [
+            ContractClassLog.fromBlobFields(txStartMarker.contractClassLogLength, txBlobData.contractClassLog)
+        ] : [];
+        return TxEffect.from({
+            revertCode,
+            txHash,
+            transactionFee,
+            noteHashes,
+            nullifiers,
+            l2ToL1Msgs,
+            publicDataWrites,
+            privateLogs,
+            publicLogs,
+            contractClassLogs
+        });
     }
     static from(fields) {
         return new TxEffect(fields.revertCode, fields.txHash, fields.transactionFee, fields.noteHashes, fields.nullifiers, fields.l2ToL1Msgs, fields.publicDataWrites, fields.privateLogs, fields.publicLogs, fields.contractClassLogs);
@@ -374,7 +234,7 @@ export class TxEffect {
             contractClassLogs: z.array(ContractClassLog.schema)
         }).transform(TxEffect.from);
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `TxEffect {
       revertCode: ${this.revertCode.getCode()},
       txHash: ${this.txHash},
@@ -384,7 +244,7 @@ export class TxEffect {
       l2ToL1Msgs: [${this.l2ToL1Msgs.map((h)=>h.toString()).join(', ')}],
       publicDataWrites: [${this.publicDataWrites.map((h)=>h.toString()).join(', ')}],
       privateLogs: [${this.privateLogs.map((l)=>l.fields.map((f)=>f.toString()).join(',')).join(', ')}],
-      publicLogs: [${this.publicLogs.map((l)=>l.fields.map((f)=>f.toString()).join(',')).join(', ')}],
+      publicLogs: ${inspect(this.publicLogs)},
       contractClassLogs: [${this.contractClassLogs.map((l)=>l.toFields().map((f)=>f.toString()).join(',')).join(', ')}],
      }`;
     }

package/dest/tx/tx_execution_request.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 { inspect } from 'util';
@@ -14,42 +14,13 @@ import { TxRequest } from './tx_request.js';
  * Request to execute a transaction. Similar to TxRequest, but has the full args.
  */
 export declare class TxExecutionRequest {
-    /**
-     * Sender.
-     */
     origin: AztecAddress;
-    /**
-     * Selector of the function to call.
-     */
     functionSelector: FunctionSelector;
-    /**
-     * The hash of arguments of first call to be executed (usually account entrypoint).
-     * @dev This hash is a pointer to `argsOfCalls` unordered array.
-     */
     firstCallArgsHash: Fr;
-    /**
-     * Transaction context.
-     */
     txContext: TxContext;
-    /**
-     * An unordered array of packed arguments for each call in the transaction.
-     * @dev These arguments are accessed in Noir via oracle and constrained against the args hash. The length of
-     * the array is equal to the number of function calls in the transaction (1 args per 1 call).
-     */
     argsOfCalls: HashedValues[];
-    /**
-     * Transient authorization witnesses for authorizing the execution of one or more actions during this tx.
-     * These witnesses are not expected to be stored in the local witnesses database of the PXE.
-     */
     authWitnesses: AuthWitness[];
-    /**
-     * Read-only data passed through the oracle calls during this tx execution.
-     */
     capsules: Capsule[];
-    /**
-     * A salt to make the tx request hash difficult to predict.
-     * The hash is used as the first nullifier if there is no nullifier emitted throughout the tx.
-     */
     salt: Fr;
     constructor(
     /**
@@ -118,4 +89,4 @@ export declare class TxExecutionRequest {
     static random(): Promise<TxExecutionRequest>;
     [inspect.custom](): string;
 }
-//# sourceMappingURL=tx_execution_request.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfZXhlY3V0aW9uX3JlcXVlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eC90eF9leGVjdXRpb25fcmVxdWVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUU5RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRy9CLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQy9ELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0scUJBQXFCLENBQUM7QUFFM0QsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUV2QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzVDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1Qzs7R0FFRztBQUVILHFCQUFhLGtCQUFrQjtJQUtwQixNQUFNLEVBQUUsWUFBWTtJQUlwQixnQkFBZ0IsRUFBRSxnQkFBZ0I7SUFLbEMsaUJBQWlCLEVBQUUsRUFBRTtJQUlyQixTQUFTLEVBQUUsU0FBUztJQU1wQixXQUFXLEVBQUUsWUFBWSxFQUFFO0lBSzNCLGFBQWEsRUFBRSxXQUFXLEVBQUU7SUFJNUIsUUFBUSxFQUFFLE9BQU8sRUFBRTtJQUtuQixJQUFJO0lBckNiO0lBQ0U7O09BRUc7SUFDSSxNQUFNLEVBQUUsWUFBWTtJQUMzQjs7T0FFRztJQUNJLGdCQUFnQixFQUFFLGdCQUFnQjtJQUN6Qzs7O09BR0c7SUFDSSxpQkFBaUIsRUFBRSxFQUFFO0lBQzVCOztPQUVHO0lBQ0ksU0FBUyxFQUFFLFNBQVM7SUFDM0I7Ozs7T0FJRztJQUNJLFdBQVcsRUFBRSxZQUFZLEVBQUU7SUFDbEM7OztPQUdHO0lBQ0ksYUFBYSxFQUFFLFdBQVcsRUFBRTtJQUNuQzs7T0FFRztJQUNJLFFBQVEsRUFBRSxPQUFPLEVBQUU7SUFDMUI7OztPQUdHO0lBQ0ksSUFBSSxLQUFjLEVBQ3ZCO0lBR0osTUFBTSxLQUFLLE1BQU0sSUFBSSxNQUFNLENBQUMsa0JBQWtCLENBQUMsQ0FhOUM7SUFFRCxXQUFXLElBQUksU0FBUyxDQVN2QjtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQywwR0FXcEQ7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsa0JBQWtCLENBQUMsR0FBRyxrQkFBa0IsQ0FFcEU7SUFFRDs7O09BR0c7SUFDSCxRQUFRLDRCQVdQO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxrQkFFUDtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLGtCQUFrQixDQVluRTtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsa0JBQWtCLENBRWpEO0lBRUQsT0FBYSxNQUFNLGdDQWNsQjtJQUVELENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxXQUVmO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"tx_execution_request.d.ts","sourceRoot":"","sources":["../../src/tx/tx_execution_request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,kBAAkB;IAE3B;;OAEG;IACI,MAAM,EAAE,YAAY;IAC3B;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;;OAGG;IACI,iBAAiB,EAAE,EAAE;IAC5B;;OAEG;IACI,SAAS,EAAE,SAAS;IAC3B;;;;OAIG;IACI,WAAW,EAAE,YAAY,EAAE;IAClC;;;OAGG;IACI,aAAa,EAAE,WAAW,EAAE;IACnC;;OAEG;IACI,QAAQ,EAAE,OAAO,EAAE;IAC1B;;;OAGG;IACI,IAAI;;IApCX;;OAEG;IACI,MAAM,EAAE,YAAY;IAC3B;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;;OAGG;IACI,iBAAiB,EAAE,EAAE;IAC5B;;OAEG;IACI,SAAS,EAAE,SAAS;IAC3B;;;;OAIG;IACI,WAAW,EAAE,YAAY,EAAE;IAClC;;;OAGG;IACI,aAAa,EAAE,WAAW,EAAE;IACnC;;OAEG;IACI,QAAQ,EAAE,OAAO,EAAE;IAC1B;;;OAGG;IACI,IAAI,KAAc;IAG3B,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAa9C;IAED,WAAW,IAAI,SAAS;IAWxB,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC;IAarD,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG,kBAAkB;IAIrE;;;OAGG;IACH,QAAQ;IAaR;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB;IAcpE;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB;WAIrC,MAAM;IAgBnB,CAAC,OAAO,CAAC,MAAM,CAAC;CAGjB"}
+{"version":3,"file":"tx_execution_request.d.ts","sourceRoot":"","sources":["../../src/tx/tx_execution_request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AAEH,qBAAa,kBAAkB;IAKpB,MAAM,EAAE,YAAY;IAIpB,gBAAgB,EAAE,gBAAgB;IAKlC,iBAAiB,EAAE,EAAE;IAIrB,SAAS,EAAE,SAAS;IAMpB,WAAW,EAAE,YAAY,EAAE;IAK3B,aAAa,EAAE,WAAW,EAAE;IAI5B,QAAQ,EAAE,OAAO,EAAE;IAKnB,IAAI;IArCb;IACE;;OAEG;IACI,MAAM,EAAE,YAAY;IAC3B;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;;OAGG;IACI,iBAAiB,EAAE,EAAE;IAC5B;;OAEG;IACI,SAAS,EAAE,SAAS;IAC3B;;;;OAIG;IACI,WAAW,EAAE,YAAY,EAAE;IAClC;;;OAGG;IACI,aAAa,EAAE,WAAW,EAAE;IACnC;;OAEG;IACI,QAAQ,EAAE,OAAO,EAAE;IAC1B;;;OAGG;IACI,IAAI,KAAc,EACvB;IAGJ,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAa9C;IAED,WAAW,IAAI,SAAS,CASvB;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,0GAWpD;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,CAEpE;IAED;;;OAGG;IACH,QAAQ,4BAWP;IAED;;;OAGG;IACH,QAAQ,kBAEP;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB,CAYnE;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAEjD;IAED,OAAa,MAAM,gCAclB;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAEf;CACF"}

package/dest/tx/tx_execution_request.js

@@ -1,4 +1,5 @@
-import { Fr } from '@aztec/foundation/fields';
+var _computedKey;
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { inspect } from 'util';
@@ -13,9 +14,11 @@ import { FunctionData } from './function_data.js';
 import { HashedValues } from './hashed_values.js';
 import { TxContext } from './tx_context.js';
 import { TxRequest } from './tx_request.js';
+_computedKey = inspect.custom;
 /**
  * Request to execute a transaction. Similar to TxRequest, but has the full args.
- */ export class TxExecutionRequest {
+ */ // docs:start:tx_execution_request_class
+export class TxExecutionRequest {
     origin;
     functionSelector;
     firstCallArgsHash;
@@ -55,6 +58,7 @@ import { TxRequest } from './tx_request.js';
         this.capsules = capsules;
         this.salt = salt;
     }
+    // docs:end:tx_execution_request_class
     static get schema() {
         return z.object({
             origin: schemas.AztecAddress,
@@ -128,7 +132,7 @@ import { TxRequest } from './tx_request.js';
             ])
         ], Fr.random());
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `TxExecutionRequest(${this.origin} called ${this.functionSelector})`;
     }
 }

package/dest/tx/tx_hash.d.ts

@@ -1,11 +1,10 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 /**
  * A class representing hash of Aztec transaction.
  * @dev Computed by hashing the public inputs of the private kernel tail circuit (see Tx::getTxHash function).
  */
 export declare class TxHash {
-    /** A field representing the tx hash (tx hash is an output of poseidon hash hence it's a field). */
     readonly hash: Fr;
     constructor(
     /** A field representing the tx hash (tx hash is an output of poseidon hash hence it's a field). */
@@ -31,4 +30,4 @@ export declare class TxHashArray extends Array<TxHash> {
     static fromBuffer(buffer: Buffer | BufferReader): TxHashArray;
     toBuffer(): Buffer;
 }
-//# sourceMappingURL=tx_hash.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfaGFzaC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R4L3R4X2hhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQXNDLE1BQU0sNkJBQTZCLENBQUM7QUFJL0Y7OztHQUdHO0FBQ0gscUJBQWEsTUFBTTthQUdDLElBQUksRUFBRSxFQUFFO0lBRjFCO0lBQ0UsbUdBQW1HO0lBQ25GLElBQUksRUFBRSxFQUFFLEVBQ3RCO0lBRUosTUFBTSxDQUFDLE1BQU0sV0FFWjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLFVBQVUsR0FBRyxZQUFZLFVBR2xEO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxVQUU1QjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFLE1BQU0sVUFFOUI7SUFFRCxNQUFNLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxFQUFFLFVBRXpCO0lBRU0sUUFBUSw0QkFFZDtJQUVNLFFBQVEsa0JBRWQ7SUFFTSxRQUFRLFdBRWQ7SUFFRCxNQUFNLGtCQUVMO0lBRU0sTUFBTSxDQUFDLEtBQUssRUFBRSxNQUFNLFdBRTFCO0lBRUQsTUFBTSxLQUFLLE1BQU0saU5BRWhCO0lBRUQsTUFBTSxDQUFDLElBQUksV0FFVjtJQUVELE1BQU0sS0FBSyxJQUFJLFdBRWQ7Q0FDRjtBQUVEOztJQUVJO0FBQ0oscUJBQWEsV0FBWSxTQUFRLEtBQUssQ0FBQyxNQUFNLENBQUM7SUFDNUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksZUFTOUM7SUFFTSxRQUFRLElBQUksTUFBTSxDQUV4QjtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"tx_hash.d.ts","sourceRoot":"","sources":["../../src/tx/tx_hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAsC,MAAM,6BAA6B,CAAC;AAI/F;;;GAGG;AACH,qBAAa,MAAM;IAEf,mGAAmG;aACnF,IAAI,EAAE,EAAE;;IADxB,mGAAmG;IACnF,IAAI,EAAE,EAAE;IAG1B,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,YAAY;IAKnD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM;IAI/B,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE;IAInB,QAAQ;IAIR,QAAQ;IAIR,QAAQ;IAIf,MAAM;IAIC,MAAM,CAAC,KAAK,EAAE,MAAM;IAI3B,MAAM,KAAK,MAAM,iNAEhB;IAED,MAAM,CAAC,IAAI;IAIX,MAAM,KAAK,IAAI,WAEd;CACF;AAED;;IAEI;AACJ,qBAAa,WAAY,SAAQ,KAAK,CAAC,MAAM,CAAC;IAC5C,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAWxC,QAAQ,IAAI,MAAM;CAG1B"}
+{"version":3,"file":"tx_hash.d.ts","sourceRoot":"","sources":["../../src/tx/tx_hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAsC,MAAM,6BAA6B,CAAC;AAI/F;;;GAGG;AACH,qBAAa,MAAM;aAGC,IAAI,EAAE,EAAE;IAF1B;IACE,mGAAmG;IACnF,IAAI,EAAE,EAAE,EACtB;IAEJ,MAAM,CAAC,MAAM,WAEZ;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,YAAY,UAGlD;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,UAE5B;IAED,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,UAE9B;IAED,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,UAEzB;IAEM,QAAQ,4BAEd;IAEM,QAAQ,kBAEd;IAEM,QAAQ,WAEd;IAED,MAAM,kBAEL;IAEM,MAAM,CAAC,KAAK,EAAE,MAAM,WAE1B;IAED,MAAM,KAAK,MAAM,iNAEhB;IAED,MAAM,CAAC,IAAI,WAEV;IAED,MAAM,KAAK,IAAI,WAEd;CACF;AAED;;IAEI;AACJ,qBAAa,WAAY,SAAQ,KAAK,CAAC,MAAM,CAAC;IAC5C,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,eAS9C;IAEM,QAAQ,IAAI,MAAM,CAExB;CACF"}

package/dest/tx/tx_hash.js

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeArrayOfBufferableToVector } from '@aztec/foundation/serialize';
 import { schemas } from '../schemas/index.js';
 /**

package/dest/tx/tx_receipt.d.ts

@@ -1,3 +1,4 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { RevertCode } from '../avm/revert_code.js';
 import { L2BlockHash } from '../block/block_hash.js';
@@ -21,18 +22,12 @@ export declare enum TxStatus {
  * We should not be using a TxReceipt to answer a query for a pending or dropped tx.
  */
 export declare class TxReceipt {
-    /** A unique identifier for a transaction. */
     txHash: TxHash;
-    /** The transaction's status. */
     status: TxStatus;
-    /** Description of transaction error, if any. */
     error: string;
-    /** The transaction fee paid for the transaction. */
     transactionFee?: bigint | undefined;
-    /** The hash of the block containing the transaction. */
     blockHash?: L2BlockHash | undefined;
-    /** The block number in which the transaction was included. */
-    blockNumber?: number | undefined;
+    blockNumber?: BlockNumber | undefined;
     constructor(
     /** A unique identifier for a transaction. */
     txHash: TxHash, 
@@ -45,10 +40,10 @@ export declare class TxReceipt {
     /** The hash of the block containing the transaction. */
     blockHash?: L2BlockHash | undefined, 
     /** The block number in which the transaction was included. */
-    blockNumber?: number | undefined);
+    blockNumber?: BlockNumber | undefined);
     static empty(): TxReceipt;
     static get schema(): ZodFor<TxReceipt>;
     static from(fields: FieldsOf<TxReceipt>): TxReceipt;
     static statusFromRevertCode(revertCode: RevertCode): TxStatus.SUCCESS | TxStatus.APP_LOGIC_REVERTED | TxStatus.TEARDOWN_REVERTED | TxStatus.BOTH_REVERTED;
 }
-//# sourceMappingURL=tx_receipt.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcmVjZWlwdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R4L3R4X3JlY2VpcHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBcUIsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUl4RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBVyxNQUFNLHVCQUF1QixDQUFDO0FBQzdELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFdEM7O0dBRUc7QUFDSCxvQkFBWSxRQUFRO0lBQ2xCLE9BQU8sWUFBWTtJQUNuQixPQUFPLFlBQVk7SUFDbkIsT0FBTyxZQUFZO0lBQ25CLGtCQUFrQix1QkFBdUI7SUFDekMsaUJBQWlCLHNCQUFzQjtJQUN2QyxhQUFhLGtCQUFrQjtDQUNoQztBQUVEOzs7OztHQUtHO0FBQ0gscUJBQWEsU0FBUztJQUdYLE1BQU0sRUFBRSxNQUFNO0lBRWQsTUFBTSxFQUFFLFFBQVE7SUFFaEIsS0FBSyxFQUFFLE1BQU07SUFFYixjQUFjLENBQUM7SUFFZixTQUFTLENBQUM7SUFFVixXQUFXLENBQUM7SUFackI7SUFDRSw2Q0FBNkM7SUFDdEMsTUFBTSxFQUFFLE1BQU07SUFDckIsZ0NBQWdDO0lBQ3pCLE1BQU0sRUFBRSxRQUFRO0lBQ3ZCLGdEQUFnRDtJQUN6QyxLQUFLLEVBQUUsTUFBTTtJQUNwQixvREFBb0Q7SUFDN0MsY0FBYyxDQUFDLG9CQUFRO0lBQzlCLHdEQUF3RDtJQUNqRCxTQUFTLENBQUMseUJBQWE7SUFDOUIsOERBQThEO0lBQ3ZELFdBQVcsQ0FBQyx5QkFBYSxFQUM5QjtJQUVKLE1BQU0sQ0FBQyxLQUFLLGNBRVg7SUFFRCxNQUFNLEtBQUssTUFBTSxJQUFJLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FXckM7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsU0FBUyxDQUFDLGFBU3RDO0lBRUQsT0FBYyxvQkFBb0IsQ0FBQyxVQUFVLEVBQUUsVUFBVSx3R0FZeEQ7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"tx_receipt.d.ts","sourceRoot":"","sources":["../../src/tx/tx_receipt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;GAEG;AACH,oBAAY,QAAQ;IAClB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,kBAAkB,uBAAuB;IACzC,iBAAiB,sBAAsB;IACvC,aAAa,kBAAkB;CAChC;AAED;;;;;GAKG;AACH,qBAAa,SAAS;IAElB,6CAA6C;IACtC,MAAM,EAAE,MAAM;IACrB,gCAAgC;IACzB,MAAM,EAAE,QAAQ;IACvB,gDAAgD;IACzC,KAAK,EAAE,MAAM;IACpB,oDAAoD;IAC7C,cAAc,CAAC,EAAE,MAAM;IAC9B,wDAAwD;IACjD,SAAS,CAAC,EAAE,WAAW;IAC9B,8DAA8D;IACvD,WAAW,CAAC,EAAE,MAAM;;IAX3B,6CAA6C;IACtC,MAAM,EAAE,MAAM;IACrB,gCAAgC;IACzB,MAAM,EAAE,QAAQ;IACvB,gDAAgD;IACzC,KAAK,EAAE,MAAM;IACpB,oDAAoD;IAC7C,cAAc,CAAC,EAAE,MAAM,YAAA;IAC9B,wDAAwD;IACjD,SAAS,CAAC,EAAE,WAAW,YAAA;IAC9B,8DAA8D;IACvD,WAAW,CAAC,EAAE,MAAM,YAAA;IAG7B,MAAM,CAAC,KAAK;IAIZ,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,CAWrC;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC;WAWzB,oBAAoB,CAAC,UAAU,EAAE,UAAU;CAa1D"}
+{"version":3,"file":"tx_receipt.d.ts","sourceRoot":"","sources":["../../src/tx/tx_receipt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AACjF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;GAEG;AACH,oBAAY,QAAQ;IAClB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,kBAAkB,uBAAuB;IACzC,iBAAiB,sBAAsB;IACvC,aAAa,kBAAkB;CAChC;AAED;;;;;GAKG;AACH,qBAAa,SAAS;IAGX,MAAM,EAAE,MAAM;IAEd,MAAM,EAAE,QAAQ;IAEhB,KAAK,EAAE,MAAM;IAEb,cAAc,CAAC;IAEf,SAAS,CAAC;IAEV,WAAW,CAAC;IAZrB;IACE,6CAA6C;IACtC,MAAM,EAAE,MAAM;IACrB,gCAAgC;IACzB,MAAM,EAAE,QAAQ;IACvB,gDAAgD;IACzC,KAAK,EAAE,MAAM;IACpB,oDAAoD;IAC7C,cAAc,CAAC,oBAAQ;IAC9B,wDAAwD;IACjD,SAAS,CAAC,yBAAa;IAC9B,8DAA8D;IACvD,WAAW,CAAC,yBAAa,EAC9B;IAEJ,MAAM,CAAC,KAAK,cAEX;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,CAWrC;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,aAStC;IAED,OAAc,oBAAoB,CAAC,UAAU,EAAE,UAAU,wGAYxD;CACF"}

package/dest/tx/tx_receipt.js

@@ -1,3 +1,4 @@
+import { BlockNumberSchema } from '@aztec/foundation/branded-types';
 import { z } from 'zod';
 import { RevertCode } from '../avm/revert_code.js';
 import { L2BlockHash } from '../block/block_hash.js';
@@ -43,7 +44,7 @@ import { TxHash } from './tx_hash.js';
             status: z.nativeEnum(TxStatus),
             error: z.string(),
             blockHash: L2BlockHash.schema.optional(),
-            blockNumber: z.number().int().nonnegative().optional(),
+            blockNumber: BlockNumberSchema.optional(),
             transactionFee: schemas.BigInt.optional()
         }).transform(TxReceipt.from);
     }

package/dest/tx/tx_request.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 { AztecAddress } from '../aztec-address/index.js';
@@ -8,15 +8,10 @@ import { TxContext } from './tx_context.js';
  * Transaction request.
  */
 export declare class TxRequest {
-    /** Sender. */
     origin: AztecAddress;
-    /** Pedersen hash of function arguments. */
     argsHash: Fr;
-    /** Transaction context. */
     txContext: TxContext;
-    /** Function data representing the function to call. */
     functionData: FunctionData;
-    /** A salt to make the hash difficult to predict. The hash is used as the first nullifier if there is no nullifier emitted throughout the tx. */
     salt: Fr;
     constructor(
     /** Sender. */
@@ -47,4 +42,4 @@ export declare class TxRequest {
     static empty(): TxRequest;
     isEmpty(): boolean;
 }
-//# sourceMappingURL=tx_request.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcmVxdWVzdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R4L3R4X3JlcXVlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQXdDLE1BQU0sNkJBQTZCLENBQUM7QUFDakcsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFeEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFNUM7O0dBRUc7QUFDSCxxQkFBYSxTQUFTO0lBSVgsTUFBTSxFQUFFLFlBQVk7SUFFcEIsUUFBUSxFQUFFLEVBQUU7SUFFWixTQUFTLEVBQUUsU0FBUztJQUVwQixZQUFZLEVBQUUsWUFBWTtJQUUxQixJQUFJLEVBQUUsRUFBRTtJQVZqQjtJQUNFLGNBQWM7SUFDUCxNQUFNLEVBQUUsWUFBWTtJQUMzQiwyQ0FBMkM7SUFDcEMsUUFBUSxFQUFFLEVBQUU7SUFDbkIsMkJBQTJCO0lBQ3BCLFNBQVMsRUFBRSxTQUFTO0lBQzNCLHVEQUF1RDtJQUNoRCxZQUFZLEVBQUUsWUFBWTtJQUNqQyxnSkFBZ0o7SUFDekksSUFBSSxFQUFFLEVBQUUsRUFDYjtJQUdKLE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxTQUFTLENBQUMsNERBRTNDO0lBRUQsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLFNBQVMsQ0FBQyxHQUFHLFNBQVMsQ0FFbEQ7SUFFRDs7O09BR0c7SUFDSCxRQUFRLDRCQUVQO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQU1mO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsU0FBUyxDQVMxRDtJQUVELElBQUksZ0JBRUg7SUFFRCxNQUFNLENBQUMsS0FBSyxjQUVYO0lBRUQsT0FBTyxZQVFOO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"tx_request.d.ts","sourceRoot":"","sources":["../../src/tx/tx_request.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAwC,MAAM,6BAA6B,CAAC;AACjG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,SAAS;IAGlB,cAAc;IACP,MAAM,EAAE,YAAY;IAC3B,2CAA2C;IACpC,QAAQ,EAAE,EAAE;IACnB,2BAA2B;IACpB,SAAS,EAAE,SAAS;IAC3B,uDAAuD;IAChD,YAAY,EAAE,YAAY;IACjC,gJAAgJ;IACzI,IAAI,EAAE,EAAE;;IATf,cAAc;IACP,MAAM,EAAE,YAAY;IAC3B,2CAA2C;IACpC,QAAQ,EAAE,EAAE;IACnB,2BAA2B;IACpB,SAAS,EAAE,SAAS;IAC3B,uDAAuD;IAChD,YAAY,EAAE,YAAY;IACjC,gJAAgJ;IACzI,IAAI,EAAE,EAAE;IAIjB,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC;IAI5C,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,SAAS;IAInD;;;OAGG;IACH,QAAQ;IAIR,QAAQ,IAAI,EAAE,EAAE;IAQhB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAW3D,IAAI;IAIJ,MAAM,CAAC,KAAK;IAIZ,OAAO;CASR"}
+{"version":3,"file":"tx_request.d.ts","sourceRoot":"","sources":["../../src/tx/tx_request.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAwC,MAAM,6BAA6B,CAAC;AACjG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,SAAS;IAIX,MAAM,EAAE,YAAY;IAEpB,QAAQ,EAAE,EAAE;IAEZ,SAAS,EAAE,SAAS;IAEpB,YAAY,EAAE,YAAY;IAE1B,IAAI,EAAE,EAAE;IAVjB;IACE,cAAc;IACP,MAAM,EAAE,YAAY;IAC3B,2CAA2C;IACpC,QAAQ,EAAE,EAAE;IACnB,2BAA2B;IACpB,SAAS,EAAE,SAAS;IAC3B,uDAAuD;IAChD,YAAY,EAAE,YAAY;IACjC,gJAAgJ;IACzI,IAAI,EAAE,EAAE,EACb;IAGJ,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,4DAE3C;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,SAAS,CAElD;IAED;;;OAGG;IACH,QAAQ,4BAEP;IAED,QAAQ,IAAI,EAAE,EAAE,CAMf;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAS1D;IAED,IAAI,gBAEH;IAED,MAAM,CAAC,KAAK,cAEX;IAED,OAAO,YAQN;CACF"}

package/dest/tx/tx_request.js

@@ -1,6 +1,6 @@
 import { GeneratorIndex, TX_REQUEST_LENGTH } from '@aztec/constants';
-import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { AztecAddress } from '../aztec-address/index.js';
 import { FunctionData } from './function_data.js';