@aztec/stdlib 0.0.1-commit.2f68f620 → 0.0.1-commit.321f6a9

package/dest/timetable/proposer_timetable.d.ts

@@ -0,0 +1,106 @@
+import type { SlotNumber } from '@aztec/foundation/branded-types';
+import type { Logger } from '@aztec/foundation/log';
+import { ConsensusTimetable, type SlotTimingConstants } from './consensus_timetable.js';
+/** Result of selecting the next block sub-slot to build. */
+export type SubslotSelection = {
+    canStart: false;
+    index: undefined;
+    deadline: undefined;
+    isLastBlock: false;
+} | {
+    canStart: true;
+    index: number;
+    deadline: number;
+    isLastBlock: boolean;
+};
+/**
+ * Proposer ideal/happy-path schedule and block sub-slot timetable.
+ *
+ * Composes a {@link ConsensusTimetable} and adds the operational budgets that only the proposer needs
+ * (`min_block_duration`, `p2p_propagation_time`, `checkpoint_proposal_prepare_time`). Used by the
+ * sequencer and checkpoint-proposal job. All getters take a target slot and return an absolute
+ * wall-clock timestamp in seconds (or sub-slot deadlines in seconds for {@link selectNextSubslot}).
+ *
+ * The single hard deadline {@link getAttestationDeadline} is inherited from the composed
+ * {@link ConsensusTimetable}, so the proposer uses one object.
+ *
+ * `maxBlocksPerCheckpoint` is computed from the local operational budgets and then clamped down to the optional
+ * network-provided value when that value is lower; a network value at or above the computed count leaves the
+ * computed count in effect. When clamping down occurs and a logger is supplied, a warning is emitted.
+ */
+export declare class ProposerTimetable extends ConsensusTimetable {
+    /** Minimum block-building time (`min_block_duration`) in seconds. */
+    readonly minBlockDuration: number;
+    /** One-way proposal/attestation propagation budget (`p2p_propagation_time`) in seconds. */
+    readonly p2pPropagationTime: number;
+    /** Local checkpoint proposal preparation budget (`checkpoint_proposal_prepare_time`) in seconds. */
+    readonly checkpointProposalPrepareTime: number;
+    /** Proposer initialization budget (`checkpoint_proposal_init_time`) reserved before the first sub-slot, in seconds. */
+    readonly checkpointProposalInitTime: number;
+    /**
+     * Effective maximum number of block sub-slots per checkpoint: the value the local operational budgets compute,
+     * clamped down to the explicit network value when that value is lower. A network value above the computed
+     * count has no effect (the computed count is used) and is not logged.
+     */
+    readonly maxBlocksPerCheckpoint: number;
+    constructor(opts: {
+        l1Constants: SlotTimingConstants;
+        blockDuration: number;
+        minBlockDuration: number;
+        p2pPropagationTime: number;
+        checkpointProposalPrepareTime: number;
+        checkpointProposalInitTime: number;
+        checkpointProposalSyncGrace?: number;
+        /** Explicit network max blocks per checkpoint; the effective value is clamped down to this when it is lower. */
+        maxBlocksPerCheckpoint?: number;
+        /** Optional logger; warns when the local budgets compute more blocks than the network value allows. */
+        logger?: Logger;
+    });
+    /**
+     * Computes the maximum number of full-duration block sub-slots in a checkpoint from the already-resolved
+     * budgets. Derived from the spec's `max_blocks_per_checkpoint = floor((last_block_build_time -
+     * first_subslot_start) / D)`, where the first sub-slot starts one `checkpoint_proposal_init_time` (`init`)
+     * after `build_frame_start`, so it simplifies to `floor((S - init - D - 2P - prepCp) / D)`.
+     */
+    private computeMaxBlocksPerCheckpoint;
+    /**
+     * Ideal time the last block must finish building by to make the ideal L1 publish path:
+     * `target_slot_start - E - D - 2P - prepCp` (= `checkpoint_proposal_send_time - prepCp`). Single value;
+     * the proposer sizes block production around the ideal L1-publish path only.
+     */
+    getLastBlockBuildTime(slot: SlotNumber): number;
+    /**
+     * Latest start at which the proposer can still squeeze in a minimum-duration block.
+     *
+     * Multi-block mode: `last_block_build_time - min_block_duration`, an ideal-derived cutoff
+     * intentionally earlier (by `P`) than the consensus receive gate would strictly allow, and
+     * conservatively no later than the final sub-slot's start cutoff in {@link selectNextSubslot}.
+     *
+     */
+    getBuildStartDeadline(slot: SlotNumber): number;
+    /** Ideal L1 publish/send time: `target_slot_start - E`. Also the ideal attestation-receipt target. */
+    getL1PublishIdealTime(slot: SlotNumber): number;
+    /**
+     * Build deadline for sub-slot `k` (zero-based): `build_frame_start + init + (k + 1) * D`.
+     *
+     * The `init` (`checkpoint_proposal_init_time`) offset reserves the proposer's sync/proposer-check/init
+     * budget at the start of the build frame, so the first sub-slot still has its full duration once the
+     * prologue finishes rather than being eaten by it.
+     */
+    getBlockBuildDeadline(slot: SlotNumber, blockIndex: number): number;
+    /** Latest time to keep waiting for txs for sub-slot `k`: `block_build_deadline(k) - min_block_duration`. */
+    getWaitForTxsDeadline(slot: SlotNumber, blockIndex: number): number;
+    /** Maximum number of full-duration block sub-slots for this timing config. */
+    getMaxBlocksPerCheckpoint(): number;
+    /**
+     * Selects the next block sub-slot to build for the target slot given the current wall-clock time.
+     *
+     * Scans sub-slots in order and picks the first whose build deadline is at least `min_block_duration`
+     * in the future. Sub-slots with insufficient remaining headroom are skipped.
+     *
+     * @param slot - Target slot the checkpoint commits to.
+     * @param now - Current wall-clock time in seconds.
+     */
+    selectNextSubslot(slot: SlotNumber, now: number): SubslotSelection;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zZXJfdGltZXRhYmxlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGltZXRhYmxlL3Byb3Bvc2VyX3RpbWV0YWJsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsS0FBSyxtQkFBbUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRXhGLDREQUE0RDtBQUM1RCxNQUFNLE1BQU0sZ0JBQWdCLEdBQ3hCO0lBQUUsUUFBUSxFQUFFLEtBQUssQ0FBQztJQUFDLEtBQUssRUFBRSxTQUFTLENBQUM7SUFBQyxRQUFRLEVBQUUsU0FBUyxDQUFDO0lBQUMsV0FBVyxFQUFFLEtBQUssQ0FBQTtDQUFFLEdBQzlFO0lBQUUsUUFBUSxFQUFFLElBQUksQ0FBQztJQUFDLEtBQUssRUFBRSxNQUFNLENBQUM7SUFBQyxRQUFRLEVBQUUsTUFBTSxDQUFDO0lBQUMsV0FBVyxFQUFFLE9BQU8sQ0FBQTtDQUFFLENBQUM7QUFFOUU7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDSCxxQkFBYSxpQkFBa0IsU0FBUSxrQkFBa0I7SUFDdkQscUVBQXFFO0lBQ3JFLFNBQWdCLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztJQUV6QywyRkFBMkY7SUFDM0YsU0FBZ0Isa0JBQWtCLEVBQUUsTUFBTSxDQUFDO0lBRTNDLG9HQUFvRztJQUNwRyxTQUFnQiw2QkFBNkIsRUFBRSxNQUFNLENBQUM7SUFFdEQsdUhBQXVIO0lBQ3ZILFNBQWdCLDBCQUEwQixFQUFFLE1BQU0sQ0FBQztJQUVuRDs7OztPQUlHO0lBQ0gsU0FBZ0Isc0JBQXNCLEVBQUUsTUFBTSxDQUFDO0lBRS9DLFlBQVksSUFBSSxFQUFFO1FBQ2hCLFdBQVcsRUFBRSxtQkFBbUIsQ0FBQztRQUNqQyxhQUFhLEVBQUUsTUFBTSxDQUFDO1FBQ3RCLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztRQUN6QixrQkFBa0IsRUFBRSxNQUFNLENBQUM7UUFDM0IsNkJBQTZCLEVBQUUsTUFBTSxDQUFDO1FBQ3RDLDBCQUEwQixFQUFFLE1BQU0sQ0FBQztRQUNuQywyQkFBMkIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUNyQyxnSEFBZ0g7UUFDaEgsc0JBQXNCLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDaEMsdUdBQXVHO1FBQ3ZHLE1BQU0sQ0FBQyxFQUFFLE1BQU0sQ0FBQztLQUNqQixFQXNDQTtJQUVEOzs7OztPQUtHO0lBQ0gsT0FBTyxDQUFDLDZCQUE2QjtJQVdyQzs7OztPQUlHO0lBQ0kscUJBQXFCLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxNQUFNLENBUXJEO0lBRUQ7Ozs7Ozs7T0FPRztJQUNJLHFCQUFxQixDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsTUFBTSxDQUVyRDtJQUVELHNHQUFzRztJQUMvRixxQkFBcUIsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLE1BQU0sQ0FFckQ7SUFFRDs7Ozs7O09BTUc7SUFDSSxxQkFBcUIsQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLFVBQVUsRUFBRSxNQUFNLEdBQUcsTUFBTSxDQUV6RTtJQUVELDRHQUE0RztJQUNyRyxxQkFBcUIsQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLFVBQVUsRUFBRSxNQUFNLEdBQUcsTUFBTSxDQUV6RTtJQUVELDhFQUE4RTtJQUN2RSx5QkFBeUIsSUFBSSxNQUFNLENBRXpDO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSSxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLENBV3hFO0NBQ0YifQ==

package/dest/timetable/proposer_timetable.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"proposer_timetable.d.ts","sourceRoot":"","sources":["../../src/timetable/proposer_timetable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EAAE,kBAAkB,EAAE,KAAK,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAExF,4DAA4D;AAC5D,MAAM,MAAM,gBAAgB,GACxB;IAAE,QAAQ,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,SAAS,CAAC;IAAC,WAAW,EAAE,KAAK,CAAA;CAAE,GAC9E;IAAE,QAAQ,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CAAC;AAE9E;;;;;;;;;;;;;;GAcG;AACH,qBAAa,iBAAkB,SAAQ,kBAAkB;IACvD,qEAAqE;IACrE,SAAgB,gBAAgB,EAAE,MAAM,CAAC;IAEzC,2FAA2F;IAC3F,SAAgB,kBAAkB,EAAE,MAAM,CAAC;IAE3C,oGAAoG;IACpG,SAAgB,6BAA6B,EAAE,MAAM,CAAC;IAEtD,uHAAuH;IACvH,SAAgB,0BAA0B,EAAE,MAAM,CAAC;IAEnD;;;;OAIG;IACH,SAAgB,sBAAsB,EAAE,MAAM,CAAC;IAE/C,YAAY,IAAI,EAAE;QAChB,WAAW,EAAE,mBAAmB,CAAC;QACjC,aAAa,EAAE,MAAM,CAAC;QACtB,gBAAgB,EAAE,MAAM,CAAC;QACzB,kBAAkB,EAAE,MAAM,CAAC;QAC3B,6BAA6B,EAAE,MAAM,CAAC;QACtC,0BAA0B,EAAE,MAAM,CAAC;QACnC,2BAA2B,CAAC,EAAE,MAAM,CAAC;QACrC,gHAAgH;QAChH,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAChC,uGAAuG;QACvG,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,EAsCA;IAED;;;;;OAKG;IACH,OAAO,CAAC,6BAA6B;IAWrC;;;;OAIG;IACI,qBAAqB,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAQrD;IAED;;;;;;;OAOG;IACI,qBAAqB,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAErD;IAED,sGAAsG;IAC/F,qBAAqB,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAErD;IAED;;;;;;OAMG;IACI,qBAAqB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAEzE;IAED,4GAA4G;IACrG,qBAAqB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAEzE;IAED,8EAA8E;IACvE,yBAAyB,IAAI,MAAM,CAEzC;IAED;;;;;;;;OAQG;IACI,iBAAiB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAWxE;CACF"}

package/dest/timetable/proposer_timetable.js

@@ -0,0 +1,132 @@
+import { getDefaultCheckpointProposalSyncGrace, resolveTimingBudgets } from './budgets.js';
+import { ConsensusTimetable } from './consensus_timetable.js';
+/**
+ * Proposer ideal/happy-path schedule and block sub-slot timetable.
+ *
+ * Composes a {@link ConsensusTimetable} and adds the operational budgets that only the proposer needs
+ * (`min_block_duration`, `p2p_propagation_time`, `checkpoint_proposal_prepare_time`). Used by the
+ * sequencer and checkpoint-proposal job. All getters take a target slot and return an absolute
+ * wall-clock timestamp in seconds (or sub-slot deadlines in seconds for {@link selectNextSubslot}).
+ *
+ * The single hard deadline {@link getAttestationDeadline} is inherited from the composed
+ * {@link ConsensusTimetable}, so the proposer uses one object.
+ *
+ * `maxBlocksPerCheckpoint` is computed from the local operational budgets and then clamped down to the optional
+ * network-provided value when that value is lower; a network value at or above the computed count leaves the
+ * computed count in effect. When clamping down occurs and a logger is supplied, a warning is emitted.
+ */ export class ProposerTimetable extends ConsensusTimetable {
+    /** Minimum block-building time (`min_block_duration`) in seconds. */ minBlockDuration;
+    /** One-way proposal/attestation propagation budget (`p2p_propagation_time`) in seconds. */ p2pPropagationTime;
+    /** Local checkpoint proposal preparation budget (`checkpoint_proposal_prepare_time`) in seconds. */ checkpointProposalPrepareTime;
+    /** Proposer initialization budget (`checkpoint_proposal_init_time`) reserved before the first sub-slot, in seconds. */ checkpointProposalInitTime;
+    /**
+   * Effective maximum number of block sub-slots per checkpoint: the value the local operational budgets compute,
+   * clamped down to the explicit network value when that value is lower. A network value above the computed
+   * count has no effect (the computed count is used) and is not logged.
+   */ maxBlocksPerCheckpoint;
+    constructor(opts){
+        super({
+            l1Constants: opts.l1Constants,
+            blockDuration: opts.blockDuration,
+            checkpointProposalSyncGrace: opts.checkpointProposalSyncGrace ?? getDefaultCheckpointProposalSyncGrace(opts.blockDuration)
+        });
+        // Resolve operational budgets, applying the fast local/e2e profile for low ethereum slot durations so a
+        // fast network does not inherit the conservative production budgets (which would shrink the build window).
+        const budgets = resolveTimingBudgets(this.ethereumSlotDuration, {
+            minBlockDuration: opts.minBlockDuration,
+            p2pPropagationTime: opts.p2pPropagationTime,
+            checkpointProposalPrepareTime: opts.checkpointProposalPrepareTime,
+            checkpointProposalInitTime: opts.checkpointProposalInitTime
+        });
+        this.p2pPropagationTime = budgets.p2pPropagationTime;
+        this.checkpointProposalPrepareTime = budgets.checkpointProposalPrepareTime;
+        this.checkpointProposalInitTime = budgets.checkpointProposalInitTime;
+        // Clamp min block duration to the block duration so a single sub-slot is always startable.
+        this.minBlockDuration = Math.min(budgets.minBlockDuration, this.blockDuration);
+        const computed = this.computeMaxBlocksPerCheckpoint();
+        this.maxBlocksPerCheckpoint = opts.maxBlocksPerCheckpoint !== undefined ? Math.min(computed, opts.maxBlocksPerCheckpoint) : computed;
+        if (opts.maxBlocksPerCheckpoint !== undefined && opts.maxBlocksPerCheckpoint < computed) {
+            opts.logger?.warn(`Locally computed max blocks per checkpoint clamped down to the network-provided value`, {
+                computed,
+                maxBlocksPerCheckpoint: opts.maxBlocksPerCheckpoint
+            });
+        }
+        if (this.maxBlocksPerCheckpoint < 1) {
+            throw new Error(`Invalid timing configuration: derived ${this.maxBlocksPerCheckpoint} blocks per checkpoint for ` + `slot duration ${this.aztecSlotDuration}s and block duration ${this.blockDuration}s.`);
+        }
+    }
+    /**
+   * Computes the maximum number of full-duration block sub-slots in a checkpoint from the already-resolved
+   * budgets. Derived from the spec's `max_blocks_per_checkpoint = floor((last_block_build_time -
+   * first_subslot_start) / D)`, where the first sub-slot starts one `checkpoint_proposal_init_time` (`init`)
+   * after `build_frame_start`, so it simplifies to `floor((S - init - D - 2P - prepCp) / D)`.
+   */ computeMaxBlocksPerCheckpoint() {
+        // last_block_build_time - (build_frame_start + init) = S - init - D - 2P - prepCp.
+        const timeAvailableForBlocks = this.aztecSlotDuration - this.checkpointProposalInitTime - this.blockDuration - 2 * this.p2pPropagationTime - this.checkpointProposalPrepareTime;
+        return Math.floor(timeAvailableForBlocks / this.blockDuration);
+    }
+    /**
+   * Ideal time the last block must finish building by to make the ideal L1 publish path:
+   * `target_slot_start - E - D - 2P - prepCp` (= `checkpoint_proposal_send_time - prepCp`). Single value;
+   * the proposer sizes block production around the ideal L1-publish path only.
+   */ getLastBlockBuildTime(slot) {
+        return this.getTargetSlotStart(slot) - this.ethereumSlotDuration - this.blockDuration - 2 * this.p2pPropagationTime - this.checkpointProposalPrepareTime;
+    }
+    /**
+   * Latest start at which the proposer can still squeeze in a minimum-duration block.
+   *
+   * Multi-block mode: `last_block_build_time - min_block_duration`, an ideal-derived cutoff
+   * intentionally earlier (by `P`) than the consensus receive gate would strictly allow, and
+   * conservatively no later than the final sub-slot's start cutoff in {@link selectNextSubslot}.
+   *
+   */ getBuildStartDeadline(slot) {
+        return this.getLastBlockBuildTime(slot) - this.minBlockDuration;
+    }
+    /** Ideal L1 publish/send time: `target_slot_start - E`. Also the ideal attestation-receipt target. */ getL1PublishIdealTime(slot) {
+        return this.getTargetSlotStart(slot) - this.ethereumSlotDuration;
+    }
+    /**
+   * Build deadline for sub-slot `k` (zero-based): `build_frame_start + init + (k + 1) * D`.
+   *
+   * The `init` (`checkpoint_proposal_init_time`) offset reserves the proposer's sync/proposer-check/init
+   * budget at the start of the build frame, so the first sub-slot still has its full duration once the
+   * prologue finishes rather than being eaten by it.
+   */ getBlockBuildDeadline(slot, blockIndex) {
+        return this.getBuildFrameStart(slot) + this.checkpointProposalInitTime + (blockIndex + 1) * this.blockDuration;
+    }
+    /** Latest time to keep waiting for txs for sub-slot `k`: `block_build_deadline(k) - min_block_duration`. */ getWaitForTxsDeadline(slot, blockIndex) {
+        return this.getBlockBuildDeadline(slot, blockIndex) - this.minBlockDuration;
+    }
+    /** Maximum number of full-duration block sub-slots for this timing config. */ getMaxBlocksPerCheckpoint() {
+        return this.maxBlocksPerCheckpoint;
+    }
+    /**
+   * Selects the next block sub-slot to build for the target slot given the current wall-clock time.
+   *
+   * Scans sub-slots in order and picks the first whose build deadline is at least `min_block_duration`
+   * in the future. Sub-slots with insufficient remaining headroom are skipped.
+   *
+   * @param slot - Target slot the checkpoint commits to.
+   * @param now - Current wall-clock time in seconds.
+   */ selectNextSubslot(slot, now) {
+        const maxBlocks = this.maxBlocksPerCheckpoint;
+        for(let index = 0; index < maxBlocks; index++){
+            const deadline = this.getBlockBuildDeadline(slot, index);
+            if (deadline - now >= this.minBlockDuration) {
+                const isLastBlock = index === maxBlocks - 1;
+                return {
+                    canStart: true,
+                    index,
+                    deadline,
+                    isLastBlock
+                };
+            }
+        }
+        return {
+            canStart: false,
+            index: undefined,
+            deadline: undefined,
+            isLastBlock: false
+        };
+    }
+}

package/dest/trees/nullifier_membership_witness.d.ts

@@ -1,5 +1,4 @@
 import { NULLIFIER_TREE_HEIGHT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/curves/bn254';
 import { MembershipWitness, SiblingPath } from '@aztec/foundation/trees';
 import { z } from 'zod';
 import { NullifierLeafPreimage } from './nullifier_leaf.js';
@@ -39,15 +38,15 @@ export declare class NullifierMembershipWitness {
         index: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedBigInt<string | number | bigint>>;
         leafPreimage: z.ZodPipe<z.ZodObject<{
             leaf: z.ZodPipe<z.ZodObject<{
-                nullifier: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+                nullifier: z.ZodType<import("@aztec/foundation/schemas").Fr, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Fr, string>>;
             }, z.core.$strip>, z.ZodTransform<import("./nullifier_leaf.js").NullifierLeaf, {
-                nullifier: Fr;
+                nullifier: import("@aztec/foundation/schemas").Fr;
             }>>;
-            nextKey: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+            nextKey: z.ZodType<import("@aztec/foundation/schemas").Fr, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Fr, string>>;
             nextIndex: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedBigInt<string | number | bigint>>;
         }, z.core.$strip>, z.ZodTransform<NullifierLeafPreimage, {
             leaf: import("./nullifier_leaf.js").NullifierLeaf;
-            nextKey: Fr;
+            nextKey: import("@aztec/foundation/schemas").Fr;
             nextIndex: bigint;
         }>>;
         siblingPath: z.ZodPipe<import("../schemas/index.js").ZodFor<Buffer<ArrayBufferLike>>, z.ZodTransform<SiblingPath<42>, Buffer<ArrayBufferLike>>>;
@@ -58,7 +57,5 @@ export declare class NullifierMembershipWitness {
     }>>;
     static random(): NullifierMembershipWitness;
     withoutPreimage(): MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>;
-    /** Serializes as `(NullifierLeafPreimage, MembershipWitness)` to match the Noir oracle return type. */
-    toNoirRepresentation(): (string | string[])[];
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnVsbGlmaWVyX21lbWJlcnNoaXBfd2l0bmVzcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3RyZWVzL251bGxpZmllcl9tZW1iZXJzaGlwX3dpdG5lc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDekQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV6RSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBR3hCLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRTVEOzs7OztHQUtHO0FBQ0gscUJBQWEsMEJBQTBCO0lBRW5DOztPQUVHO2FBQ2EsS0FBSyxFQUFFLE1BQU07SUFDN0I7O09BRUc7YUFDYSxZQUFZLEVBQUUscUJBQXFCO0lBQ25EOztPQUVHO2FBQ2EsV0FBVyxFQUFFLFdBQVcsQ0FBQyxPQUFPLHFCQUFxQixDQUFDO0lBWnhFO0lBQ0U7O09BRUc7SUFDYSxLQUFLLEVBQUUsTUFBTTtJQUM3Qjs7T0FFRztJQUNhLFlBQVksRUFBRSxxQkFBcUI7SUFDbkQ7O09BRUc7SUFDYSxXQUFXLEVBQUUsV0FBVyxDQUFDLE9BQU8scUJBQXFCLENBQUMsRUFDcEU7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7UUFVaEI7SUFFRCxNQUFNLENBQUMsTUFBTSwrQkFNWjtJQUVNLGVBQWUsSUFBSSxpQkFBaUIsQ0FBQyxPQUFPLHFCQUFxQixDQUFDLENBRXhFO0lBRUQsdUdBQXVHO0lBQ2hHLG9CQUFvQixJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sRUFBRSxDQUFDLEVBQUUsQ0FPbkQ7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnVsbGlmaWVyX21lbWJlcnNoaXBfd2l0bmVzcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3RyZWVzL251bGxpZmllcl9tZW1iZXJzaGlwX3dpdG5lc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDekQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLFdBQVcsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXpFLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFHeEIsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFNUQ7Ozs7O0dBS0c7QUFDSCxxQkFBYSwwQkFBMEI7SUFFbkM7O09BRUc7YUFDYSxLQUFLLEVBQUUsTUFBTTtJQUM3Qjs7T0FFRzthQUNhLFlBQVksRUFBRSxxQkFBcUI7SUFDbkQ7O09BRUc7YUFDYSxXQUFXLEVBQUUsV0FBVyxDQUFDLE9BQU8scUJBQXFCLENBQUM7SUFaeEU7SUFDRTs7T0FFRztJQUNhLEtBQUssRUFBRSxNQUFNO0lBQzdCOztPQUVHO0lBQ2EsWUFBWSxFQUFFLHFCQUFxQjtJQUNuRDs7T0FFRztJQUNhLFdBQVcsRUFBRSxXQUFXLENBQUMsT0FBTyxxQkFBcUIsQ0FBQyxFQUNwRTtJQUVKLE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7OztRQVVoQjtJQUVELE1BQU0sQ0FBQyxNQUFNLCtCQU1aO0lBRU0sZUFBZSxJQUFJLGlCQUFpQixDQUFDLE9BQU8scUJBQXFCLENBQUMsQ0FFeEU7Q0FDRiJ9

package/dest/trees/nullifier_membership_witness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nullifier_membership_witness.d.ts","sourceRoot":"","sources":["../../src/trees/nullifier_membership_witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D;;;;;GAKG;AACH,qBAAa,0BAA0B;IAEnC;;OAEG;aACa,KAAK,EAAE,MAAM;IAC7B;;OAEG;aACa,YAAY,EAAE,qBAAqB;IACnD;;OAEG;aACa,WAAW,EAAE,WAAW,CAAC,OAAO,qBAAqB,CAAC;IAZxE;IACE;;OAEG;IACa,KAAK,EAAE,MAAM;IAC7B;;OAEG;IACa,YAAY,EAAE,qBAAqB;IACnD;;OAEG;IACa,WAAW,EAAE,WAAW,CAAC,OAAO,qBAAqB,CAAC,EACpE;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;QAUhB;IAED,MAAM,CAAC,MAAM,+BAMZ;IAEM,eAAe,IAAI,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,CAExE;IAED,uGAAuG;IAChG,oBAAoB,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAOnD;CACF"}
+{"version":3,"file":"nullifier_membership_witness.d.ts","sourceRoot":"","sources":["../../src/trees/nullifier_membership_witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D;;;;;GAKG;AACH,qBAAa,0BAA0B;IAEnC;;OAEG;aACa,KAAK,EAAE,MAAM;IAC7B;;OAEG;aACa,YAAY,EAAE,qBAAqB;IACnD;;OAEG;aACa,WAAW,EAAE,WAAW,CAAC,OAAO,qBAAqB,CAAC;IAZxE;IACE;;OAEG;IACa,KAAK,EAAE,MAAM;IAC7B;;OAEG;IACa,YAAY,EAAE,qBAAqB;IACnD;;OAEG;IACa,WAAW,EAAE,WAAW,CAAC,OAAO,qBAAqB,CAAC,EACpE;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;QAUhB;IAED,MAAM,CAAC,MAAM,+BAMZ;IAEM,eAAe,IAAI,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,CAExE;CACF"}

package/dest/trees/nullifier_membership_witness.js

@@ -1,5 +1,4 @@
 import { NULLIFIER_TREE_HEIGHT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/curves/bn254';
 import { MembershipWitness, SiblingPath } from '@aztec/foundation/trees';
 import { z } from 'zod';
 import { schemas } from '../schemas/index.js';
@@ -37,12 +36,4 @@ import { NullifierLeafPreimage } from './nullifier_leaf.js';
     withoutPreimage() {
         return new MembershipWitness(NULLIFIER_TREE_HEIGHT, this.index, this.siblingPath.toTuple());
     }
-    /** Serializes as `(NullifierLeafPreimage, MembershipWitness)` to match the Noir oracle return type. */ toNoirRepresentation() {
-        // TODO(#12874): remove the stupid as string conversion by modifying ForeignCallOutput type in acvm.js
-        return [
-            ...this.leafPreimage.toFields().map((fr)=>fr.toString()),
-            new Fr(this.index).toString(),
-            this.siblingPath.toFields().map((fr)=>fr.toString())
-        ];
-    }
 }

package/dest/trees/public_data_witness.d.ts

@@ -1,5 +1,4 @@
 import { PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { MembershipWitness, SiblingPath } from '@aztec/foundation/trees';
 import { z } from 'zod';
@@ -42,17 +41,17 @@ export declare class PublicDataWitness {
         index: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedBigInt<string | number | bigint>>;
         leafPreimage: z.ZodPipe<z.ZodObject<{
             leaf: z.ZodPipe<z.ZodObject<{
-                slot: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
-                value: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+                slot: z.ZodType<import("@aztec/foundation/schemas").Fr, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Fr, string>>;
+                value: z.ZodType<import("@aztec/foundation/schemas").Fr, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Fr, string>>;
             }, z.core.$strip>, z.ZodTransform<import("./public_data_leaf.js").PublicDataTreeLeaf, {
-                slot: Fr;
-                value: Fr;
+                slot: import("@aztec/foundation/schemas").Fr;
+                value: import("@aztec/foundation/schemas").Fr;
             }>>;
-            nextKey: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+            nextKey: z.ZodType<import("@aztec/foundation/schemas").Fr, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Fr, string>>;
             nextIndex: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedBigInt<string | number | bigint>>;
         }, z.core.$strip>, z.ZodTransform<PublicDataTreeLeafPreimage, {
             leaf: import("./public_data_leaf.js").PublicDataTreeLeaf;
-            nextKey: Fr;
+            nextKey: import("@aztec/foundation/schemas").Fr;
             nextIndex: bigint;
         }>>;
         siblingPath: z.ZodPipe<import("../schemas/schemas.js").ZodFor<Buffer<ArrayBufferLike>>, z.ZodTransform<SiblingPath<40>, Buffer<ArrayBufferLike>>>;
@@ -61,15 +60,6 @@ export declare class PublicDataWitness {
         leafPreimage: PublicDataTreeLeafPreimage;
         siblingPath: SiblingPath<40>;
     }>>;
-    /**
-     * Returns a field array representation of a public data witness.
-     * @returns A field array representation of a public data witness.
-     */
-    toFields(): Fr[];
-    /**
-     * Returns a representation of the public data witness as expected by intrinsic Noir deserialization.
-     */
-    toNoirRepresentation(): (string | string[])[];
     toBuffer(): Buffer;
     /**
      * Returns a string representation of the TxEffect object.
@@ -90,4 +80,4 @@ export declare class PublicDataWitness {
      */
     static fromString(str: string): PublicDataWitness;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2RhdGFfd2l0bmVzcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3RyZWVzL3B1YmxpY19kYXRhX3dpdG5lc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFM0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFOUUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLFdBQVcsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXpFLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFHeEIsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbkU7Ozs7O0dBS0c7QUFDSCxxQkFBYSxpQkFBaUI7SUFFMUI7O09BRUc7YUFDYSxLQUFLLEVBQUUsTUFBTTtJQUM3Qjs7O09BR0c7YUFDYSxZQUFZLEVBQUUsMEJBQTBCO0lBQ3hEOztPQUVHO2FBQ2EsV0FBVyxFQUFFLFdBQVcsQ0FBQyxPQUFPLHVCQUF1QixDQUFDO0lBYjFFO0lBQ0U7O09BRUc7SUFDYSxLQUFLLEVBQUUsTUFBTTtJQUM3Qjs7O09BR0c7SUFDYSxZQUFZLEVBQUUsMEJBQTBCO0lBQ3hEOztPQUVHO0lBQ2EsV0FBVyxFQUFFLFdBQVcsQ0FBQyxPQUFPLHVCQUF1QixDQUFDLEVBQ3RFO0lBRUosTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7UUFRaEI7SUFFRDs7O09BR0c7SUFDSSxRQUFRLElBQUksRUFBRSxFQUFFLENBU3RCO0lBRUQ7O09BRUc7SUFDSSxvQkFBb0IsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLEVBQUUsQ0FBQyxFQUFFLENBVW5EO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRDs7T0FFRztJQUNILFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsTUFBTSxDQUFDLE1BQU0sc0JBTVo7SUFFTSxlQUFlLElBQUksaUJBQWlCLENBQUMsT0FBTyx1QkFBdUIsQ0FBQyxDQUUxRTtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLGlCQUFpQixDQVFsRTtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLHFCQUU1QjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2RhdGFfd2l0bmVzcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3RyZWVzL3B1YmxpY19kYXRhX3dpdG5lc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFM0QsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUU5RSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsV0FBVyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFekUsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUd4QixPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVuRTs7Ozs7R0FLRztBQUNILHFCQUFhLGlCQUFpQjtJQUUxQjs7T0FFRzthQUNhLEtBQUssRUFBRSxNQUFNO0lBQzdCOzs7T0FHRzthQUNhLFlBQVksRUFBRSwwQkFBMEI7SUFDeEQ7O09BRUc7YUFDYSxXQUFXLEVBQUUsV0FBVyxDQUFDLE9BQU8sdUJBQXVCLENBQUM7SUFiMUU7SUFDRTs7T0FFRztJQUNhLEtBQUssRUFBRSxNQUFNO0lBQzdCOzs7T0FHRztJQUNhLFlBQVksRUFBRSwwQkFBMEI7SUFDeEQ7O09BRUc7SUFDYSxXQUFXLEVBQUUsV0FBVyxDQUFDLE9BQU8sdUJBQXVCLENBQUMsRUFDdEU7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztRQVFoQjtJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQ7O09BRUc7SUFDSCxRQUFRLElBQUksTUFBTSxDQUVqQjtJQUVELE1BQU0sQ0FBQyxNQUFNLHNCQU1aO0lBRU0sZUFBZSxJQUFJLGlCQUFpQixDQUFDLE9BQU8sdUJBQXVCLENBQUMsQ0FFMUU7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxpQkFBaUIsQ0FRbEU7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxxQkFFNUI7Q0FDRiJ9

package/dest/trees/public_data_witness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_data_witness.d.ts","sourceRoot":"","sources":["../../src/trees/public_data_witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;GAKG;AACH,qBAAa,iBAAiB;IAE1B;;OAEG;aACa,KAAK,EAAE,MAAM;IAC7B;;;OAGG;aACa,YAAY,EAAE,0BAA0B;IACxD;;OAEG;aACa,WAAW,EAAE,WAAW,CAAC,OAAO,uBAAuB,CAAC;IAb1E;IACE;;OAEG;IACa,KAAK,EAAE,MAAM;IAC7B;;;OAGG;IACa,YAAY,EAAE,0BAA0B;IACxD;;OAEG;IACa,WAAW,EAAE,WAAW,CAAC,OAAO,uBAAuB,CAAC,EACtE;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;QAQhB;IAED;;;OAGG;IACI,QAAQ,IAAI,EAAE,EAAE,CAStB;IAED;;OAEG;IACI,oBAAoB,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAUnD;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED;;OAEG;IACH,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,MAAM,sBAMZ;IAEM,eAAe,IAAI,iBAAiB,CAAC,OAAO,uBAAuB,CAAC,CAE1E;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB,CAQlE;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,qBAE5B;CACF"}
+{"version":3,"file":"public_data_witness.d.ts","sourceRoot":"","sources":["../../src/trees/public_data_witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;GAKG;AACH,qBAAa,iBAAiB;IAE1B;;OAEG;aACa,KAAK,EAAE,MAAM;IAC7B;;;OAGG;aACa,YAAY,EAAE,0BAA0B;IACxD;;OAEG;aACa,WAAW,EAAE,WAAW,CAAC,OAAO,uBAAuB,CAAC;IAb1E;IACE;;OAEG;IACa,KAAK,EAAE,MAAM;IAC7B;;;OAGG;IACa,YAAY,EAAE,0BAA0B;IACxD;;OAEG;IACa,WAAW,EAAE,WAAW,CAAC,OAAO,uBAAuB,CAAC,EACtE;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;QAQhB;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED;;OAEG;IACH,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,MAAM,sBAMZ;IAEM,eAAe,IAAI,iBAAiB,CAAC,OAAO,uBAAuB,CAAC,CAE1E;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB,CAQlE;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,qBAE5B;CACF"}

package/dest/trees/public_data_witness.js

@@ -1,6 +1,5 @@
 import { PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
-import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { MembershipWitness, SiblingPath } from '@aztec/foundation/trees';
@@ -35,32 +34,6 @@ import { PublicDataTreeLeafPreimage } from './public_data_leaf.js';
             siblingPath: SiblingPath.schemaFor(PUBLIC_DATA_TREE_HEIGHT)
         }).transform(({ index, leafPreimage, siblingPath })=>new PublicDataWitness(index, leafPreimage, siblingPath));
     }
-    /**
-   * Returns a field array representation of a public data witness.
-   * @returns A field array representation of a public data witness.
-   */ toFields() {
-        return [
-            new Fr(this.index),
-            new Fr(this.leafPreimage.leaf.slot),
-            new Fr(this.leafPreimage.leaf.value),
-            new Fr(this.leafPreimage.nextIndex),
-            new Fr(this.leafPreimage.nextKey),
-            ...this.siblingPath.toFields()
-        ];
-    }
-    /**
-   * Returns a representation of the public data witness as expected by intrinsic Noir deserialization.
-   */ toNoirRepresentation() {
-        // TODO(#12874): remove the stupid as string conversion by modifying ForeignCallOutput type in acvm.js
-        return [
-            new Fr(this.index).toString(),
-            new Fr(this.leafPreimage.leaf.slot).toString(),
-            new Fr(this.leafPreimage.leaf.value).toString(),
-            new Fr(this.leafPreimage.nextKey).toString(),
-            new Fr(this.leafPreimage.nextIndex).toString(),
-            this.siblingPath.toFields().map((fr)=>fr.toString())
-        ];
-    }
     toBuffer() {
         return serializeToBuffer([
             this.index,

package/dest/tx/execution_payload.d.ts

@@ -42,4 +42,4 @@ export declare class ExecutionPayload {
  * @throws Error if multiple payloads have different fee payers set
  */
 export declare function mergeExecutionPayloads(requests: ExecutionPayload[]): ExecutionPayload;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0aW9uX3BheWxvYWQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eC9leGVjdXRpb25fcGF5bG9hZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXZEOzs7S0FHSztBQUNMLHFCQUFhLGdCQUFnQjtJQUV6Qix5Q0FBeUM7SUFDbEMsS0FBSyxFQUFFLFlBQVksRUFBRTtJQUM1Qiw2REFBNkQ7SUFDdEQsYUFBYSxFQUFFLFdBQVcsRUFBRTtJQUNuQyx3REFBd0Q7SUFDakQsUUFBUSxFQUFFLE9BQU8sRUFBRTtJQUMxQixnRUFBZ0U7SUFDekQsZUFBZSxFQUFFLFlBQVksRUFBRTtJQUN0Qzs7O09BR0c7SUFDSSxRQUFRLENBQUM7SUFibEI7SUFDRSx5Q0FBeUM7SUFDbEMsS0FBSyxFQUFFLFlBQVksRUFBRTtJQUM1Qiw2REFBNkQ7SUFDdEQsYUFBYSxFQUFFLFdBQVcsRUFBRTtJQUNuQyx3REFBd0Q7SUFDakQsUUFBUSxFQUFFLE9BQU8sRUFBRTtJQUMxQixnRUFBZ0U7SUFDekQsZUFBZSxHQUFFLFlBQVksRUFBTztJQUMzQzs7O09BR0c7SUFDSSxRQUFRLENBQUMsMEJBQWMsRUFDNUI7SUFFSixNQUFNLENBQUMsS0FBSyxxQkFFWDtDQUNGO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUFDLFFBQVEsRUFBRSxnQkFBZ0IsRUFBRSxHQUFHLGdCQUFnQixDQXVCckYifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0aW9uX3BheWxvYWQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eC9leGVjdXRpb25fcGF5bG9hZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXZEOzs7S0FHSztBQUNMLHFCQUFhLGdCQUFnQjtJQUV6Qix5Q0FBeUM7SUFDbEMsS0FBSyxFQUFFLFlBQVksRUFBRTtJQUM1Qiw2REFBNkQ7SUFDdEQsYUFBYSxFQUFFLFdBQVcsRUFBRTtJQUNuQyx3REFBd0Q7SUFDakQsUUFBUSxFQUFFLE9BQU8sRUFBRTtJQUMxQixnRUFBZ0U7SUFDekQsZUFBZSxFQUFFLFlBQVksRUFBRTtJQUN0Qzs7O09BR0c7SUFDSSxRQUFRLENBQUM7SUFibEI7SUFDRSx5Q0FBeUM7SUFDbEMsS0FBSyxFQUFFLFlBQVksRUFBRTtJQUM1Qiw2REFBNkQ7SUFDdEQsYUFBYSxFQUFFLFdBQVcsRUFBRTtJQUNuQyx3REFBd0Q7SUFDakQsUUFBUSxFQUFFLE9BQU8sRUFBRTtJQUMxQixnRUFBZ0U7SUFDekQsZUFBZSxHQUFFLFlBQVksRUFBTztJQUMzQzs7O09BR0c7SUFDSSxRQUFRLENBQUMsMEJBQWMsRUFDNUI7SUFFSixNQUFNLENBQUMsS0FBSyxxQkFFWDtDQUNGO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUFDLFFBQVEsRUFBRSxnQkFBZ0IsRUFBRSxHQUFHLGdCQUFnQixDQXdCckYifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"execution_payload.d.ts","sourceRoot":"","sources":["../../src/tx/execution_payload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD;;;KAGK;AACL,qBAAa,gBAAgB;IAEzB,yCAAyC;IAClC,KAAK,EAAE,YAAY,EAAE;IAC5B,6DAA6D;IACtD,aAAa,EAAE,WAAW,EAAE;IACnC,wDAAwD;IACjD,QAAQ,EAAE,OAAO,EAAE;IAC1B,gEAAgE;IACzD,eAAe,EAAE,YAAY,EAAE;IACtC;;;OAGG;IACI,QAAQ,CAAC;IAblB;IACE,yCAAyC;IAClC,KAAK,EAAE,YAAY,EAAE;IAC5B,6DAA6D;IACtD,aAAa,EAAE,WAAW,EAAE;IACnC,wDAAwD;IACjD,QAAQ,EAAE,OAAO,EAAE;IAC1B,gEAAgE;IACzD,eAAe,GAAE,YAAY,EAAO;IAC3C;;;OAGG;IACI,QAAQ,CAAC,0BAAc,EAC5B;IAEJ,MAAM,CAAC,KAAK,qBAEX;CACF;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,CAuBrF"}
+{"version":3,"file":"execution_payload.d.ts","sourceRoot":"","sources":["../../src/tx/execution_payload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD;;;KAGK;AACL,qBAAa,gBAAgB;IAEzB,yCAAyC;IAClC,KAAK,EAAE,YAAY,EAAE;IAC5B,6DAA6D;IACtD,aAAa,EAAE,WAAW,EAAE;IACnC,wDAAwD;IACjD,QAAQ,EAAE,OAAO,EAAE;IAC1B,gEAAgE;IACzD,eAAe,EAAE,YAAY,EAAE;IACtC;;;OAGG;IACI,QAAQ,CAAC;IAblB;IACE,yCAAyC;IAClC,KAAK,EAAE,YAAY,EAAE;IAC5B,6DAA6D;IACtD,aAAa,EAAE,WAAW,EAAE;IACnC,wDAAwD;IACjD,QAAQ,EAAE,OAAO,EAAE;IAC1B,gEAAgE;IACzD,eAAe,GAAE,YAAY,EAAO;IAC3C;;;OAGG;IACI,QAAQ,CAAC,0BAAc,EAC5B;IAEJ,MAAM,CAAC,KAAK,qBAEX;CACF;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,CAwBrF"}

package/dest/tx/execution_payload.js

@@ -35,6 +35,6 @@ import { AztecAddress } from '../aztec-address/index.js';
     if (uniqueFeePayers.size > 1) {
         throw new Error(`Cannot merge execution payloads with different fee payers. Found: ${Array.from(uniqueFeePayers).join(', ')}`);
     }
-    const feePayer = uniqueFeePayers.size === 1 ? AztecAddress.fromString(Array.from(uniqueFeePayers)[0]) : undefined;
+    const feePayer = uniqueFeePayers.size === 1 ? AztecAddress.fromStringUnsafe(Array.from(uniqueFeePayers)[0]) : undefined;
     return new ExecutionPayload(calls, combinedAuthWitnesses, combinedCapsules, combinedExtraHashedArgs, feePayer);
 }

package/dest/tx/fee_provider.d.ts

@@ -4,7 +4,7 @@ import type { GasFees } from '../gas/gas_fees.js';
 export interface FeeProvider {
     /** Returns the current minimum fees for inclusion in the next block. */
     getCurrentMinFees(): Promise<GasFees>;
-    /** Returns predicted min fees for each slot in the prediction window. */
+    /** Returns current min fees first, followed by predicted min fees for each slot in the prediction window. */
     getPredictedMinFees(manaUsage?: ManaUsageEstimate): Promise<GasFees[]>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3Byb3ZpZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvZmVlX3Byb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFbEQsOEVBQThFO0FBQzlFLE1BQU0sV0FBVyxXQUFXO0lBQzFCLHdFQUF3RTtJQUN4RSxpQkFBaUIsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDdEMseUVBQXlFO0lBQ3pFLG1CQUFtQixDQUFDLFNBQVMsQ0FBQyxFQUFFLGlCQUFpQixHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0NBQ3hFIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3Byb3ZpZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvZmVlX3Byb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFbEQsOEVBQThFO0FBQzlFLE1BQU0sV0FBVyxXQUFXO0lBQzFCLHdFQUF3RTtJQUN4RSxpQkFBaUIsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDdEMsNkdBQTZHO0lBQzdHLG1CQUFtQixDQUFDLFNBQVMsQ0FBQyxFQUFFLGlCQUFpQixHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0NBQ3hFIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"fee_provider.d.ts","sourceRoot":"","sources":["../../src/tx/fee_provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAElD,8EAA8E;AAC9E,MAAM,WAAW,WAAW;IAC1B,wEAAwE;IACxE,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IACtC,yEAAyE;IACzE,mBAAmB,CAAC,SAAS,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;CACxE"}
+{"version":3,"file":"fee_provider.d.ts","sourceRoot":"","sources":["../../src/tx/fee_provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAElD,8EAA8E;AAC9E,MAAM,WAAW,WAAW;IAC1B,wEAAwE;IACxE,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IACtC,6GAA6G;IAC7G,mBAAmB,CAAC,SAAS,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;CACxE"}

package/dest/tx/global_variable_builder.d.ts

@@ -2,22 +2,12 @@ import type { SimulationOverridesPlan } from '@aztec/ethereum/contracts';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { SlotNumber } from '@aztec/foundation/schemas';
 import type { AztecAddress } from '../aztec-address/index.js';
-import type { UInt32 } from '../types/index.js';
-import type { CheckpointGlobalVariables, GlobalVariables } from './global_variables.js';
+import type { CheckpointGlobalVariables } from './global_variables.js';
 /**
  * Interface for building global variables for Aztec blocks.
  */
 export interface GlobalVariableBuilder {
-    /**
-     * Builds global variables for a given block.
-     * @param blockNumber - The block number to build global variables for.
-     * @param coinbase - The address to receive block reward.
-     * @param feeRecipient - The address to receive fees.
-     * @param slotNumber - Optional. The slot number to use for the global variables. If undefined, it will be calculated.
-     * @returns A promise that resolves to the GlobalVariables for the given block number.
-     */
-    buildGlobalVariables(blockNumber: UInt32, coinbase: EthAddress, feeRecipient: AztecAddress, slotNumber?: SlotNumber): Promise<GlobalVariables>;
     /** Builds global variables that are constant throughout a checkpoint. */
     buildCheckpointGlobalVariables(coinbase: EthAddress, feeRecipient: AztecAddress, slotNumber: SlotNumber, simulationOverridesPlan?: SimulationOverridesPlan): Promise<CheckpointGlobalVariables>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2xvYmFsX3ZhcmlhYmxlX2J1aWxkZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eC9nbG9iYWxfdmFyaWFibGVfYnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSx1QkFBdUIsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRTVELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXhGOztHQUVHO0FBQ0gsTUFBTSxXQUFXLHFCQUFxQjtJQUNwQzs7Ozs7OztPQU9HO0lBQ0gsb0JBQW9CLENBQ2xCLFdBQVcsRUFBRSxNQUFNLEVBQ25CLFFBQVEsRUFBRSxVQUFVLEVBQ3BCLFlBQVksRUFBRSxZQUFZLEVBQzFCLFVBQVUsQ0FBQyxFQUFFLFVBQVUsR0FDdEIsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDO0lBRTVCLHlFQUF5RTtJQUN6RSw4QkFBOEIsQ0FDNUIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksRUFDMUIsVUFBVSxFQUFFLFVBQVUsRUFDdEIsdUJBQXVCLENBQUMsRUFBRSx1QkFBdUIsR0FDaEQsT0FBTyxDQUFDLHlCQUF5QixDQUFDLENBQUM7Q0FDdkMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2xvYmFsX3ZhcmlhYmxlX2J1aWxkZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eC9nbG9iYWxfdmFyaWFibGVfYnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSx1QkFBdUIsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRTVELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFdkU7O0dBRUc7QUFDSCxNQUFNLFdBQVcscUJBQXFCO0lBQ3BDLHlFQUF5RTtJQUN6RSw4QkFBOEIsQ0FDNUIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksRUFDMUIsVUFBVSxFQUFFLFVBQVUsRUFDdEIsdUJBQXVCLENBQUMsRUFBRSx1QkFBdUIsR0FDaEQsT0FBTyxDQUFDLHlCQUF5QixDQUFDLENBQUM7Q0FDdkMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"global_variable_builder.d.ts","sourceRoot":"","sources":["../../src/tx/global_variable_builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExF;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;;;;;OAOG;IACH,oBAAoB,CAClB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,UAAU,CAAC,EAAE,UAAU,GACtB,OAAO,CAAC,eAAe,CAAC,CAAC;IAE5B,yEAAyE;IACzE,8BAA8B,CAC5B,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU,EACtB,uBAAuB,CAAC,EAAE,uBAAuB,GAChD,OAAO,CAAC,yBAAyB,CAAC,CAAC;CACvC"}
+{"version":3,"file":"global_variable_builder.d.ts","sourceRoot":"","sources":["../../src/tx/global_variable_builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,yEAAyE;IACzE,8BAA8B,CAC5B,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU,EACtB,uBAAuB,CAAC,EAAE,uBAAuB,GAChD,OAAO,CAAC,yBAAyB,CAAC,CAAC;CACvC"}

package/dest/tx/global_variables.js

@@ -79,7 +79,7 @@ _computedKey = inspect.custom;
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        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));
+        return new GlobalVariables(reader.readField(), reader.readField(), BlockNumber(reader.readU32()), SlotNumber(reader.readU32()), reader.readField().toBigInt(), EthAddress.fromField(reader.readField()), AztecAddress.fromFieldUnsafe(reader.readField()), GasFees.fromFields(reader));
     }
     static getFields(fields) {
         return [
@@ -149,7 +149,7 @@ _computedKey = inspect.custom;
             blockNumber: BlockNumber(randomInt(100_000)),
             slotNumber: SlotNumber(randomInt(100_000)),
             coinbase: EthAddress.random(),
-            feeRecipient: AztecAddress.fromField(Fr.random()),
+            feeRecipient: AztecAddress.fromFieldUnsafe(Fr.random()),
             gasFees: GasFees.random(),
             timestamp: BigInt(randomInt(100_000_000)),
             ...overrides

package/dest/tx/private_tx_constant_data.d.ts

@@ -19,6 +19,14 @@ export declare class PrivateTxConstantData {
      * protocol to execute and prove the transaction.
      */
     txContext: TxContext;
+    /**
+     * Salt of the transaction request (`TxRequest.salt`).
+     *
+     * Bound to the user's `tx_request` by the Init circuit and kept constant by every subsequent kernel so that each
+     * app circuit's `txRequestSalt` public input can be checked against it. It is intentionally not carried into
+     * `TxConstantData`: it is dropped by the Tail circuits rather than being exposed by the final (hiding) kernel.
+     */
+    txRequestSalt: Fr;
     /**
      * Root of the vk tree for the protocol circuits.
      */
@@ -39,6 +47,14 @@ export declare class PrivateTxConstantData {
      * protocol to execute and prove the transaction.
      */
     txContext: TxContext, 
+    /**
+     * Salt of the transaction request (`TxRequest.salt`).
+     *
+     * Bound to the user's `tx_request` by the Init circuit and kept constant by every subsequent kernel so that each
+     * app circuit's `txRequestSalt` public input can be checked against it. It is intentionally not carried into
+     * `TxConstantData`: it is dropped by the Tail circuits rather than being exposed by the final (hiding) kernel.
+     */
+    txRequestSalt: Fr, 
     /**
      * Root of the vk tree for the protocol circuits.
      */
@@ -48,7 +64,7 @@ export declare class PrivateTxConstantData {
      */
     protocolContracts: ProtocolContracts);
     static from(fields: FieldsOf<PrivateTxConstantData>): PrivateTxConstantData;
-    static getFields(fields: FieldsOf<PrivateTxConstantData>): readonly [BlockHeader, TxContext, Fr, ProtocolContracts];
+    static getFields(fields: FieldsOf<PrivateTxConstantData>): readonly [BlockHeader, TxContext, Fr, Fr, ProtocolContracts];
     static fromFields(fields: Fr[] | FieldReader): PrivateTxConstantData;
     toFields(): Fr[];
     static fromBuffer(buffer: Buffer | BufferReader): PrivateTxConstantData;
@@ -57,4 +73,4 @@ export declare class PrivateTxConstantData {
     getSize(): number;
     clone(): PrivateTxConstantData;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV90eF9jb25zdGFudF9kYXRhLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvcHJpdmF0ZV90eF9jb25zdGFudF9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBd0MsTUFBTSw2QkFBNkIsQ0FBQztBQUM5RyxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDaEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTVDOztHQUVHO0FBQ0gscUJBQWEscUJBQXFCO0lBRTlCLDZHQUE2RztJQUN0RyxpQkFBaUIsRUFBRSxXQUFXO0lBQ3JDOzs7Ozs7O09BT0c7SUFDSSxTQUFTLEVBQUUsU0FBUztJQUMzQjs7T0FFRztJQUNJLFVBQVUsRUFBRSxFQUFFO0lBQ3JCOztPQUVHO0lBQ0ksaUJBQWlCLEVBQUUsaUJBQWlCO0lBbkI3QztJQUNFLDZHQUE2RztJQUN0RyxpQkFBaUIsRUFBRSxXQUFXO0lBQ3JDOzs7Ozs7O09BT0c7SUFDSSxTQUFTLEVBQUUsU0FBUztJQUMzQjs7T0FFRztJQUNJLFVBQVUsRUFBRSxFQUFFO0lBQ3JCOztPQUVHO0lBQ0ksaUJBQWlCLEVBQUUsaUJBQWlCLEVBQ3pDO0lBRUosTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLHFCQUFxQixDQUFDLHlCQUVsRDtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxxQkFBcUIsQ0FBQyw0REFFdkQ7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLEdBQUcscUJBQXFCLENBUW5FO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxxQkFBcUIsQ0FRdEU7SUFFRCxRQUFRLDRCQUVQO0lBRUQsTUFBTSxDQUFDLEtBQUssMEJBRVg7SUFFRCxPQUFPLFdBT047SUFFRCxLQUFLLElBQUkscUJBQXFCLENBRTdCO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV90eF9jb25zdGFudF9kYXRhLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvcHJpdmF0ZV90eF9jb25zdGFudF9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBd0MsTUFBTSw2QkFBNkIsQ0FBQztBQUM5RyxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDaEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTVDOztHQUVHO0FBQ0gscUJBQWEscUJBQXFCO0lBRTlCLDZHQUE2RztJQUN0RyxpQkFBaUIsRUFBRSxXQUFXO0lBQ3JDOzs7Ozs7O09BT0c7SUFDSSxTQUFTLEVBQUUsU0FBUztJQUMzQjs7Ozs7O09BTUc7SUFDSSxhQUFhLEVBQUUsRUFBRTtJQUN4Qjs7T0FFRztJQUNJLFVBQVUsRUFBRSxFQUFFO0lBQ3JCOztPQUVHO0lBQ0ksaUJBQWlCLEVBQUUsaUJBQWlCO0lBM0I3QztJQUNFLDZHQUE2RztJQUN0RyxpQkFBaUIsRUFBRSxXQUFXO0lBQ3JDOzs7Ozs7O09BT0c7SUFDSSxTQUFTLEVBQUUsU0FBUztJQUMzQjs7Ozs7O09BTUc7SUFDSSxhQUFhLEVBQUUsRUFBRTtJQUN4Qjs7T0FFRztJQUNJLFVBQVUsRUFBRSxFQUFFO0lBQ3JCOztPQUVHO0lBQ0ksaUJBQWlCLEVBQUUsaUJBQWlCLEVBQ3pDO0lBRUosTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLHFCQUFxQixDQUFDLHlCQUVsRDtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxxQkFBcUIsQ0FBQyxnRUFRdkQ7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLEdBQUcscUJBQXFCLENBU25FO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxxQkFBcUIsQ0FTdEU7SUFFRCxRQUFRLDRCQUVQO0lBRUQsTUFBTSxDQUFDLEtBQUssMEJBUVg7SUFFRCxPQUFPLFdBUU47SUFFRCxLQUFLLElBQUkscUJBQXFCLENBRTdCO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"private_tx_constant_data.d.ts","sourceRoot":"","sources":["../../src/tx/private_tx_constant_data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,qBAAqB;IAE9B,6GAA6G;IACtG,iBAAiB,EAAE,WAAW;IACrC;;;;;;;OAOG;IACI,SAAS,EAAE,SAAS;IAC3B;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,iBAAiB,EAAE,iBAAiB;IAnB7C;IACE,6GAA6G;IACtG,iBAAiB,EAAE,WAAW;IACrC;;;;;;;OAOG;IACI,SAAS,EAAE,SAAS;IAC3B;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,iBAAiB,EAAE,iBAAiB,EACzC;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC,yBAElD;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC,4DAEvD;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,qBAAqB,CAQnE;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,qBAAqB,CAQtE;IAED,QAAQ,4BAEP;IAED,MAAM,CAAC,KAAK,0BAEX;IAED,OAAO,WAON;IAED,KAAK,IAAI,qBAAqB,CAE7B;CACF"}
+{"version":3,"file":"private_tx_constant_data.d.ts","sourceRoot":"","sources":["../../src/tx/private_tx_constant_data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,qBAAqB;IAE9B,6GAA6G;IACtG,iBAAiB,EAAE,WAAW;IACrC;;;;;;;OAOG;IACI,SAAS,EAAE,SAAS;IAC3B;;;;;;OAMG;IACI,aAAa,EAAE,EAAE;IACxB;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,iBAAiB,EAAE,iBAAiB;IA3B7C;IACE,6GAA6G;IACtG,iBAAiB,EAAE,WAAW;IACrC;;;;;;;OAOG;IACI,SAAS,EAAE,SAAS;IAC3B;;;;;;OAMG;IACI,aAAa,EAAE,EAAE;IACxB;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,iBAAiB,EAAE,iBAAiB,EACzC;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC,yBAElD;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC,gEAQvD;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,qBAAqB,CASnE;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,qBAAqB,CAStE;IAED,QAAQ,4BAEP;IAED,MAAM,CAAC,KAAK,0BAQX;IAED,OAAO,WAQN;IAED,KAAK,IAAI,qBAAqB,CAE7B;CACF"}