@aztec/stdlib 3.0.0-nightly.20251114 → 3.0.0-nightly.20251118

package/dest/avm/avm.js

@@ -1,3 +1,4 @@
+import { DEFAULT_MAX_DEBUG_LOG_MEMORY_READS } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 import { z } from 'zod';
@@ -499,11 +500,11 @@ export class AvmRevertCheckpointHint {
         return new AvmRevertCheckpointHint(obj.actionCounter, obj.oldCheckpointId, obj.newCheckpointId, TreeSnapshots.fromPlainObject(obj.stateBefore), TreeSnapshots.fromPlainObject(obj.stateAfter));
     }
 }
-export class AvmContractDBCreateCheckpointHint extends AvmCheckpointActionNoStateChangeHint {
+export class AvmContractDbCreateCheckpointHint extends AvmCheckpointActionNoStateChangeHint {
 }
-export class AvmContractDBCommitCheckpointHint extends AvmCheckpointActionNoStateChangeHint {
+export class AvmContractDbCommitCheckpointHint extends AvmCheckpointActionNoStateChangeHint {
 }
-export class AvmContractDBRevertCheckpointHint extends AvmCheckpointActionNoStateChangeHint {
+export class AvmContractDbRevertCheckpointHint extends AvmCheckpointActionNoStateChangeHint {
 }
 ////////////////////////////////////////////////////////////////////////////
 // Hints (other)
@@ -620,9 +621,9 @@ export class AvmExecutionHints {
     contractClasses;
     bytecodeCommitments;
     debugFunctionNames;
-    contractDBCreateCheckpointHints;
-    contractDBCommitCheckpointHints;
-    contractDBRevertCheckpointHints;
+    contractDbCreateCheckpointHints;
+    contractDbCommitCheckpointHints;
+    contractDbRevertCheckpointHints;
     startingTreeRoots;
     getSiblingPathHints;
     getPreviousValueIndexHints;
@@ -637,7 +638,7 @@ export class AvmExecutionHints {
     revertCheckpointHints;
     constructor(globalVariables, tx, // Protocol contracts.
     protocolContracts, // Contract hints.
-    contractInstances = [], contractClasses = [], bytecodeCommitments = [], debugFunctionNames = [], contractDBCreateCheckpointHints = [], contractDBCommitCheckpointHints = [], contractDBRevertCheckpointHints = [], // Merkle DB hints.
+    contractInstances = [], contractClasses = [], bytecodeCommitments = [], debugFunctionNames = [], contractDbCreateCheckpointHints = [], contractDbCommitCheckpointHints = [], contractDbRevertCheckpointHints = [], // Merkle DB hints.
     startingTreeRoots = TreeSnapshots.empty(), getSiblingPathHints = [], getPreviousValueIndexHints = [], getLeafPreimageHintsPublicDataTree = [], getLeafPreimageHintsNullifierTree = [], getLeafValueHints = [], sequentialInsertHintsPublicDataTree = [], sequentialInsertHintsNullifierTree = [], appendLeavesHints = [], createCheckpointHints = [], commitCheckpointHints = [], revertCheckpointHints = []){
         this.globalVariables = globalVariables;
         this.tx = tx;
@@ -646,9 +647,9 @@ export class AvmExecutionHints {
         this.contractClasses = contractClasses;
         this.bytecodeCommitments = bytecodeCommitments;
         this.debugFunctionNames = debugFunctionNames;
-        this.contractDBCreateCheckpointHints = contractDBCreateCheckpointHints;
-        this.contractDBCommitCheckpointHints = contractDBCommitCheckpointHints;
-        this.contractDBRevertCheckpointHints = contractDBRevertCheckpointHints;
+        this.contractDbCreateCheckpointHints = contractDbCreateCheckpointHints;
+        this.contractDbCommitCheckpointHints = contractDbCommitCheckpointHints;
+        this.contractDbRevertCheckpointHints = contractDbRevertCheckpointHints;
         this.startingTreeRoots = startingTreeRoots;
         this.getSiblingPathHints = getSiblingPathHints;
         this.getPreviousValueIndexHints = getPreviousValueIndexHints;
@@ -672,7 +673,7 @@ export class AvmExecutionHints {
         if (obj instanceof AvmExecutionHints) {
             return obj;
         }
-        return new AvmExecutionHints(GlobalVariables.fromPlainObject(obj.globalVariables), AvmTxHint.fromPlainObject(obj.tx), ProtocolContracts.fromPlainObject(obj.protocolContracts), obj.contractInstances?.map((i)=>AvmContractInstanceHint.fromPlainObject(i)) || [], obj.contractClasses?.map((c)=>AvmContractClassHint.fromPlainObject(c)) || [], obj.bytecodeCommitments?.map((b)=>AvmBytecodeCommitmentHint.fromPlainObject(b)) || [], obj.debugFunctionNames?.map((d)=>AvmDebugFunctionNameHint.fromPlainObject(d)) || [], obj.contractDBCreateCheckpointHints?.map((h)=>AvmContractDBCreateCheckpointHint.fromPlainObject(h)) || [], obj.contractDBCommitCheckpointHints?.map((h)=>AvmContractDBCommitCheckpointHint.fromPlainObject(h)) || [], obj.contractDBRevertCheckpointHints?.map((h)=>AvmContractDBRevertCheckpointHint.fromPlainObject(h)) || [], obj.startingTreeRoots ? TreeSnapshots.fromPlainObject(obj.startingTreeRoots) : TreeSnapshots.empty(), obj.getSiblingPathHints?.map((h)=>AvmGetSiblingPathHint.fromPlainObject(h)) || [], obj.getPreviousValueIndexHints?.map((h)=>AvmGetPreviousValueIndexHint.fromPlainObject(h)) || [], obj.getLeafPreimageHintsPublicDataTree?.map((h)=>AvmGetLeafPreimageHintPublicDataTree.fromPlainObject(h)) || [], obj.getLeafPreimageHintsNullifierTree?.map((h)=>AvmGetLeafPreimageHintNullifierTree.fromPlainObject(h)) || [], obj.getLeafValueHints?.map((h)=>AvmGetLeafValueHint.fromPlainObject(h)) || [], obj.sequentialInsertHintsPublicDataTree?.map((h)=>AvmSequentialInsertHintPublicDataTree.fromPlainObject(h)) || [], obj.sequentialInsertHintsNullifierTree?.map((h)=>AvmSequentialInsertHintNullifierTree.fromPlainObject(h)) || [], obj.appendLeavesHints?.map((h)=>AvmAppendLeavesHint.fromPlainObject(h)) || [], obj.createCheckpointHints?.map((h)=>AvmCreateCheckpointHint.fromPlainObject(h)) || [], obj.commitCheckpointHints?.map((h)=>AvmCommitCheckpointHint.fromPlainObject(h)) || [], obj.revertCheckpointHints?.map((h)=>AvmRevertCheckpointHint.fromPlainObject(h)) || []);
+        return new AvmExecutionHints(GlobalVariables.fromPlainObject(obj.globalVariables), AvmTxHint.fromPlainObject(obj.tx), ProtocolContracts.fromPlainObject(obj.protocolContracts), obj.contractInstances?.map((i)=>AvmContractInstanceHint.fromPlainObject(i)) || [], obj.contractClasses?.map((c)=>AvmContractClassHint.fromPlainObject(c)) || [], obj.bytecodeCommitments?.map((b)=>AvmBytecodeCommitmentHint.fromPlainObject(b)) || [], obj.debugFunctionNames?.map((d)=>AvmDebugFunctionNameHint.fromPlainObject(d)) || [], obj.contractDbCreateCheckpointHints?.map((h)=>AvmContractDbCreateCheckpointHint.fromPlainObject(h)) || [], obj.contractDbCommitCheckpointHints?.map((h)=>AvmContractDbCommitCheckpointHint.fromPlainObject(h)) || [], obj.contractDbRevertCheckpointHints?.map((h)=>AvmContractDbRevertCheckpointHint.fromPlainObject(h)) || [], obj.startingTreeRoots ? TreeSnapshots.fromPlainObject(obj.startingTreeRoots) : TreeSnapshots.empty(), obj.getSiblingPathHints?.map((h)=>AvmGetSiblingPathHint.fromPlainObject(h)) || [], obj.getPreviousValueIndexHints?.map((h)=>AvmGetPreviousValueIndexHint.fromPlainObject(h)) || [], obj.getLeafPreimageHintsPublicDataTree?.map((h)=>AvmGetLeafPreimageHintPublicDataTree.fromPlainObject(h)) || [], obj.getLeafPreimageHintsNullifierTree?.map((h)=>AvmGetLeafPreimageHintNullifierTree.fromPlainObject(h)) || [], obj.getLeafValueHints?.map((h)=>AvmGetLeafValueHint.fromPlainObject(h)) || [], obj.sequentialInsertHintsPublicDataTree?.map((h)=>AvmSequentialInsertHintPublicDataTree.fromPlainObject(h)) || [], obj.sequentialInsertHintsNullifierTree?.map((h)=>AvmSequentialInsertHintNullifierTree.fromPlainObject(h)) || [], obj.appendLeavesHints?.map((h)=>AvmAppendLeavesHint.fromPlainObject(h)) || [], obj.createCheckpointHints?.map((h)=>AvmCreateCheckpointHint.fromPlainObject(h)) || [], obj.commitCheckpointHints?.map((h)=>AvmCommitCheckpointHint.fromPlainObject(h)) || [], obj.revertCheckpointHints?.map((h)=>AvmRevertCheckpointHint.fromPlainObject(h)) || []);
     }
     static empty() {
         return new AvmExecutionHints(GlobalVariables.empty(), AvmTxHint.empty(), ProtocolContracts.empty());
@@ -686,9 +687,9 @@ export class AvmExecutionHints {
             contractClasses: AvmContractClassHint.schema.array(),
             bytecodeCommitments: AvmBytecodeCommitmentHint.schema.array(),
             debugFunctionNames: AvmDebugFunctionNameHint.schema.array(),
-            contractDBCreateCheckpointHints: AvmContractDBCreateCheckpointHint.schema.array(),
-            contractDBCommitCheckpointHints: AvmContractDBCommitCheckpointHint.schema.array(),
-            contractDBRevertCheckpointHints: AvmContractDBRevertCheckpointHint.schema.array(),
+            contractDbCreateCheckpointHints: AvmContractDbCreateCheckpointHint.schema.array(),
+            contractDbCommitCheckpointHints: AvmContractDbCommitCheckpointHint.schema.array(),
+            contractDbRevertCheckpointHints: AvmContractDbRevertCheckpointHint.schema.array(),
             startingTreeRoots: TreeSnapshots.schema,
             getSiblingPathHints: AvmGetSiblingPathHint.schema.array(),
             getPreviousValueIndexHints: AvmGetPreviousValueIndexHint.schema.array(),
@@ -701,7 +702,7 @@ export class AvmExecutionHints {
             createCheckpointHints: AvmCreateCheckpointHint.schema.array(),
             commitCheckpointHints: AvmCommitCheckpointHint.schema.array(),
             revertCheckpointHints: AvmRevertCheckpointHint.schema.array()
-        }).transform(({ globalVariables, tx, protocolContracts, contractInstances, contractClasses, bytecodeCommitments, debugFunctionNames, contractDBCreateCheckpointHints, contractDBCommitCheckpointHints, contractDBRevertCheckpointHints, startingTreeRoots, getSiblingPathHints, getPreviousValueIndexHints, getLeafPreimageHintsPublicDataTree, getLeafPreimageHintsNullifierTree, getLeafValueHints, sequentialInsertHintsPublicDataTree, sequentialInsertHintsNullifierTree, appendLeavesHints, createCheckpointHints, commitCheckpointHints, revertCheckpointHints })=>new AvmExecutionHints(globalVariables, tx, protocolContracts, contractInstances, contractClasses, bytecodeCommitments, debugFunctionNames, contractDBCreateCheckpointHints, contractDBCommitCheckpointHints, contractDBRevertCheckpointHints, startingTreeRoots, getSiblingPathHints, getPreviousValueIndexHints, getLeafPreimageHintsPublicDataTree, getLeafPreimageHintsNullifierTree, getLeafValueHints, sequentialInsertHintsPublicDataTree, sequentialInsertHintsNullifierTree, appendLeavesHints, createCheckpointHints, commitCheckpointHints, revertCheckpointHints));
+        }).transform(({ globalVariables, tx, protocolContracts, contractInstances, contractClasses, bytecodeCommitments, debugFunctionNames, contractDbCreateCheckpointHints, contractDbCommitCheckpointHints, contractDbRevertCheckpointHints, startingTreeRoots, getSiblingPathHints, getPreviousValueIndexHints, getLeafPreimageHintsPublicDataTree, getLeafPreimageHintsNullifierTree, getLeafValueHints, sequentialInsertHintsPublicDataTree, sequentialInsertHintsNullifierTree, appendLeavesHints, createCheckpointHints, commitCheckpointHints, revertCheckpointHints })=>new AvmExecutionHints(globalVariables, tx, protocolContracts, contractInstances, contractClasses, bytecodeCommitments, debugFunctionNames, contractDbCreateCheckpointHints, contractDbCommitCheckpointHints, contractDbRevertCheckpointHints, startingTreeRoots, getSiblingPathHints, getPreviousValueIndexHints, getLeafPreimageHintsPublicDataTree, getLeafPreimageHintsNullifierTree, getLeafValueHints, sequentialInsertHintsPublicDataTree, sequentialInsertHintsNullifierTree, appendLeavesHints, createCheckpointHints, commitCheckpointHints, revertCheckpointHints));
     }
 }
 export class AvmCircuitInputs {
@@ -743,7 +744,7 @@ export class PublicTxResult {
     hints;
     publicInputs;
     constructor(// Simulation result.
-    gasUsed, revertCode, revertReason, // These are only guaranteed to be present in "client initiated simulation" mode.
+    gasUsed, revertCode, revertReason, // These are only guaranteed to be present if the simulator is configured to collect them.
     processedPhases, logs, // For the proving request.
     hints, publicInputs){
         this.gasUsed = gasUsed;
@@ -779,27 +780,65 @@ export class PublicTxResult {
         return new PublicTxResult(GasUsed.fromPlainObject(obj.gasUsed), RevertCode.fromPlainObject(obj.revertCode), /*revertReason=*/ undefined, /*processedPhases=*/ [], obj.logs?.map(DebugLog.fromPlainObject), obj.hints ? AvmExecutionHints.fromPlainObject(obj.hints) : undefined, AvmCircuitPublicInputs.fromPlainObject(obj.publicInputs));
     }
 }
+export class PublicSimulatorConfig {
+    proverId;
+    skipFeeEnforcement;
+    collectCallMetadata;
+    collectHints;
+    collectDebugLogs;
+    maxDebugLogMemoryReads;
+    collectStatistics;
+    constructor(proverId, skipFeeEnforcement, collectCallMetadata, collectHints, collectDebugLogs, maxDebugLogMemoryReads, collectStatistics){
+        this.proverId = proverId;
+        this.skipFeeEnforcement = skipFeeEnforcement;
+        this.collectCallMetadata = collectCallMetadata;
+        this.collectHints = collectHints;
+        this.collectDebugLogs = collectDebugLogs;
+        this.maxDebugLogMemoryReads = maxDebugLogMemoryReads;
+        this.collectStatistics = collectStatistics;
+    }
+    static from(obj) {
+        return new PublicSimulatorConfig(obj.proverId ?? Fr.ZERO, obj.skipFeeEnforcement ?? false, obj.collectCallMetadata ?? false, obj.collectHints ?? false, obj.collectDebugLogs ?? false, obj.maxDebugLogMemoryReads ?? DEFAULT_MAX_DEBUG_LOG_MEMORY_READS, obj.collectStatistics ?? false);
+    }
+    static empty() {
+        return PublicSimulatorConfig.from({});
+    }
+    static get schema() {
+        return z.object({
+            proverId: Fr.schema,
+            skipFeeEnforcement: z.boolean(),
+            collectCallMetadata: z.boolean(),
+            collectHints: z.boolean(),
+            collectDebugLogs: z.boolean(),
+            maxDebugLogMemoryReads: z.number(),
+            collectStatistics: z.boolean()
+        }).transform(PublicSimulatorConfig.from);
+    }
+}
 export class AvmFastSimulationInputs {
     wsRevision;
+    config;
     tx;
     globalVariables;
     protocolContracts;
-    constructor(wsRevision, tx, globalVariables, protocolContracts){
+    constructor(wsRevision, config, tx, globalVariables, protocolContracts){
         this.wsRevision = wsRevision;
+        this.config = config;
         this.tx = tx;
         this.globalVariables = globalVariables;
         this.protocolContracts = protocolContracts;
     }
     static empty() {
-        return new AvmFastSimulationInputs(WorldStateRevision.empty(), AvmTxHint.empty(), GlobalVariables.empty(), ProtocolContracts.empty());
+        return new AvmFastSimulationInputs(WorldStateRevision.empty(), PublicSimulatorConfig.empty(), AvmTxHint.empty(), GlobalVariables.empty(), ProtocolContracts.empty());
     }
     static get schema() {
         return z.object({
             wsRevision: WorldStateRevision.schema,
+            config: PublicSimulatorConfig.schema,
             tx: AvmTxHint.schema,
             globalVariables: GlobalVariables.schema,
             protocolContracts: ProtocolContracts.schema
-        }).transform(({ wsRevision, tx, globalVariables, protocolContracts })=>new AvmFastSimulationInputs(wsRevision, tx, globalVariables, protocolContracts));
+        }).transform(({ wsRevision, config, tx, globalVariables, protocolContracts })=>new AvmFastSimulationInputs(wsRevision, config, tx, globalVariables, protocolContracts));
     }
     serializeWithMessagePack() {
         return serializeWithMessagePack(this);

package/dest/avm/avm_proving_request.d.ts

@@ -743,7 +743,7 @@ export declare const AvmProvingRequestSchema: z.ZodObject<{
                 selector?: any;
                 address?: any;
             }>, "many">;
-            contractDBCreateCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            contractDbCreateCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 actionCounter: z.ZodNumber;
                 oldCheckpointId: z.ZodNumber;
                 newCheckpointId: z.ZodNumber;
@@ -764,7 +764,7 @@ export declare const AvmProvingRequestSchema: z.ZodObject<{
                 oldCheckpointId: number;
                 newCheckpointId: number;
             }>, "many">;
-            contractDBCommitCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            contractDbCommitCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 actionCounter: z.ZodNumber;
                 oldCheckpointId: z.ZodNumber;
                 newCheckpointId: z.ZodNumber;
@@ -785,7 +785,7 @@ export declare const AvmProvingRequestSchema: z.ZodObject<{
                 oldCheckpointId: number;
                 newCheckpointId: number;
             }>, "many">;
-            contractDBRevertCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            contractDbRevertCheckpointHints: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 actionCounter: z.ZodNumber;
                 oldCheckpointId: z.ZodNumber;
                 newCheckpointId: z.ZodNumber;
@@ -2378,17 +2378,17 @@ export declare const AvmProvingRequestSchema: z.ZodObject<{
             contractClasses: import("./avm.js").AvmContractClassHint[];
             bytecodeCommitments: import("./avm.js").AvmBytecodeCommitmentHint[];
             debugFunctionNames: import("./avm.js").AvmDebugFunctionNameHint[];
-            contractDBCreateCheckpointHints: {
+            contractDbCreateCheckpointHints: {
                 readonly actionCounter: number;
                 readonly oldCheckpointId: number;
                 readonly newCheckpointId: number;
             }[];
-            contractDBCommitCheckpointHints: {
+            contractDbCommitCheckpointHints: {
                 readonly actionCounter: number;
                 readonly oldCheckpointId: number;
                 readonly newCheckpointId: number;
             }[];
-            contractDBRevertCheckpointHints: {
+            contractDbRevertCheckpointHints: {
                 readonly actionCounter: number;
                 readonly oldCheckpointId: number;
                 readonly newCheckpointId: number;
@@ -2581,17 +2581,17 @@ export declare const AvmProvingRequestSchema: z.ZodObject<{
                 selector?: any;
                 address?: any;
             }[];
-            contractDBCreateCheckpointHints: {
+            contractDbCreateCheckpointHints: {
                 actionCounter: number;
                 oldCheckpointId: number;
                 newCheckpointId: number;
             }[];
-            contractDBCommitCheckpointHints: {
+            contractDbCommitCheckpointHints: {
                 actionCounter: number;
                 oldCheckpointId: number;
                 newCheckpointId: number;
             }[];
-            contractDBRevertCheckpointHints: {
+            contractDbRevertCheckpointHints: {
                 actionCounter: number;
                 oldCheckpointId: number;
                 newCheckpointId: number;
@@ -2983,17 +2983,17 @@ export declare const AvmProvingRequestSchema: z.ZodObject<{
                 selector?: any;
                 address?: any;
             }[];
-            contractDBCreateCheckpointHints: {
+            contractDbCreateCheckpointHints: {
                 actionCounter: number;
                 oldCheckpointId: number;
                 newCheckpointId: number;
             }[];
-            contractDBCommitCheckpointHints: {
+            contractDbCommitCheckpointHints: {
                 actionCounter: number;
                 oldCheckpointId: number;
                 newCheckpointId: number;
             }[];
-            contractDBRevertCheckpointHints: {
+            contractDbRevertCheckpointHints: {
                 actionCounter: number;
                 oldCheckpointId: number;
                 newCheckpointId: number;
@@ -4632,17 +4632,17 @@ export declare const AvmProvingRequestSchema: z.ZodObject<{
                 selector?: any;
                 address?: any;
             }[];
-            contractDBCreateCheckpointHints: {
+            contractDbCreateCheckpointHints: {
                 actionCounter: number;
                 oldCheckpointId: number;
                 newCheckpointId: number;
             }[];
-            contractDBCommitCheckpointHints: {
+            contractDbCommitCheckpointHints: {
                 actionCounter: number;
                 oldCheckpointId: number;
                 newCheckpointId: number;
             }[];
-            contractDBRevertCheckpointHints: {
+            contractDbRevertCheckpointHints: {
                 actionCounter: number;
                 oldCheckpointId: number;
                 newCheckpointId: number;
@@ -5201,17 +5201,17 @@ export declare const AvmProvingRequestSchema: z.ZodObject<{
                 selector?: any;
                 address?: any;
             }[];
-            contractDBCreateCheckpointHints: {
+            contractDbCreateCheckpointHints: {
                 actionCounter: number;
                 oldCheckpointId: number;
                 newCheckpointId: number;
             }[];
-            contractDBCommitCheckpointHints: {
+            contractDbCommitCheckpointHints: {
                 actionCounter: number;
                 oldCheckpointId: number;
                 newCheckpointId: number;
             }[];
-            contractDBRevertCheckpointHints: {
+            contractDbRevertCheckpointHints: {
                 actionCounter: number;
                 oldCheckpointId: number;
                 newCheckpointId: number;
@@ -5776,17 +5776,17 @@ export declare const AvmProvingRequestSchema: z.ZodObject<{
                 selector?: any;
                 address?: any;
             }[];
-            contractDBCreateCheckpointHints: {
+            contractDbCreateCheckpointHints: {
                 actionCounter: number;
                 oldCheckpointId: number;
                 newCheckpointId: number;
             }[];
-            contractDBCommitCheckpointHints: {
+            contractDbCommitCheckpointHints: {
                 actionCounter: number;
                 oldCheckpointId: number;
                 newCheckpointId: number;
             }[];
-            contractDBRevertCheckpointHints: {
+            contractDbRevertCheckpointHints: {
                 actionCounter: number;
                 oldCheckpointId: number;
                 newCheckpointId: number;

package/dest/avm/public_data_write.d.ts

@@ -42,7 +42,7 @@ export declare class PublicDataWrite {
     static fromFields(fields: Fr[] | FieldReader): PublicDataWrite;
     toFields(): Fr[];
     static fromBlobFields(fields: Fr[] | FieldReader): PublicDataWrite;
-    toBlobFields(): Fr[];
+    toBlobFields(): [Fr, Fr];
     static fromBuffer(buffer: Buffer | BufferReader): PublicDataWrite;
     toBuffer(): Buffer<ArrayBufferLike>;
     static fromString(str: string): PublicDataWrite;

package/dest/avm/public_data_write.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_data_write.d.ts","sourceRoot":"","sources":["../../src/avm/public_data_write.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAE9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,qBAAa,eAAe;IAIxB;;OAEG;aACa,QAAQ,EAAE,EAAE;IAC5B;;OAEG;aACa,KAAK,EAAE,EAAE;IAV3B,MAAM,CAAC,aAAa,SAAwB;;IAG1C;;OAEG;IACa,QAAQ,EAAE,EAAE;IAC5B;;OAEG;IACa,KAAK,EAAE,EAAE;IAG3B,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;IAI7C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;IAIlD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,eAAe;IAK9D,QAAQ,IAAI,EAAE,EAAE;IAUhB,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAKhD,YAAY,IAAI,EAAE,EAAE;IAIpB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,QAAQ;IAIR,MAAM,CAAC,KAAK;IAIZ;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,eAAe;IAIjD,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO;IAI9C,OAAO;IAIP,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO;CAGxC"}
+{"version":3,"file":"public_data_write.d.ts","sourceRoot":"","sources":["../../src/avm/public_data_write.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAE9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,qBAAa,eAAe;IAIxB;;OAEG;aACa,QAAQ,EAAE,EAAE;IAC5B;;OAEG;aACa,KAAK,EAAE,EAAE;IAV3B,MAAM,CAAC,aAAa,SAAwB;;IAG1C;;OAEG;IACa,QAAQ,EAAE,EAAE;IAC5B;;OAEG;IACa,KAAK,EAAE,EAAE;IAG3B,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;IAI7C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;IAIlD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,eAAe;IAK9D,QAAQ,IAAI,EAAE,EAAE;IAUhB,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAKhD,YAAY,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;IAIxB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,QAAQ;IAIR,MAAM,CAAC,KAAK;IAIZ;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,eAAe;IAIjD,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO;IAI9C,OAAO;IAIP,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO;CAGxC"}

package/dest/avm/revert_code.d.ts

@@ -44,7 +44,8 @@ export declare class RevertCode {
     toBuffer(): Buffer;
     toField(): Fr;
     getSerializedLength(): number;
-    static fromField(fr: Fr): RevertCode;
+    static fromNumber(code: number): RevertCode;
+    static fromField(field: Fr): RevertCode;
     static fromFields(fields: Fr[] | FieldReader): RevertCode;
     static fromBuffer(buffer: Buffer | BufferReader): RevertCode;
     private static readonly NUM_OPTIONS;

package/dest/avm/revert_code.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"revert_code.d.ts","sourceRoot":"","sources":["../../src/avm/revert_code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAExE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,oBAAY,cAAc;IACxB,EAAE,IAAI;IACN,kBAAkB,IAAI;IACtB,iBAAiB,IAAI;IACrB,aAAa,IAAI;CAClB;AAWD;;GAEG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO;IAGP,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAqC;IACnE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,EAAE,UAAU,CAAqD;IACnG,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,UAAU,CAAoD;IACjG,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,UAAU,CAAgD;IAElF,OAAO,IAAI,cAAc;IAIzB,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO;IAIlC,IAAI,IAAI,OAAO;IAIf,cAAc;IAed,MAAM;IAIb,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,CAEtC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU;IAW5C;;;;;OAKG;IAEH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAM;IAC7C,cAAc,IAAI,MAAM;IAK/B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAK;IAC1C,QAAQ,IAAI,MAAM;IAMlB,OAAO,IAAI,EAAE;IAIb,mBAAmB,IAAI,MAAM;WAItB,SAAS,CAAC,EAAE,EAAE,EAAE,GAAG,UAAU;WAO7B,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,UAAU;WAKlD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,UAAU;IASnE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAK;IACxC,MAAM,CAAC,MAAM,IAAI,UAAU;IAI3B,CAAC,OAAO,CAAC,MAAM,CAAC;CAGjB"}
+{"version":3,"file":"revert_code.d.ts","sourceRoot":"","sources":["../../src/avm/revert_code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAExE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,oBAAY,cAAc;IACxB,EAAE,IAAI;IACN,kBAAkB,IAAI;IACtB,iBAAiB,IAAI;IACrB,aAAa,IAAI;CAClB;AAWD;;GAEG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO;IAGP,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAqC;IACnE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,EAAE,UAAU,CAAqD;IACnG,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,UAAU,CAAoD;IACjG,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,UAAU,CAAgD;IAElF,OAAO,IAAI,cAAc;IAIzB,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO;IAIlC,IAAI,IAAI,OAAO;IAIf,cAAc;IAed,MAAM;IAIb,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,CAEtC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU;IAW5C;;;;;OAKG;IAEH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAM;IAC7C,cAAc,IAAI,MAAM;IAK/B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAK;IAC1C,QAAQ,IAAI,MAAM;IAMlB,OAAO,IAAI,EAAE;IAIb,mBAAmB,IAAI,MAAM;WAItB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU;WAOpC,SAAS,CAAC,KAAK,EAAE,EAAE,GAAG,UAAU;WAIhC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,UAAU;WAKlD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,UAAU;IAMnE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAK;IACxC,MAAM,CAAC,MAAM,IAAI,UAAU;IAI3B,CAAC,OAAO,CAAC,MAAM,CAAC;CAGjB"}

package/dest/avm/revert_code.js

@@ -93,11 +93,14 @@ function isRevertCodeEnum(value) {
     getSerializedLength() {
         return this.toBuffer().length;
     }
-    static fromField(fr) {
-        if (!isRevertCodeEnum(fr.toNumber())) {
-            throw new Error(`Invalid RevertCode: ${fr.toNumber()}`);
+    static fromNumber(code) {
+        if (!isRevertCodeEnum(code)) {
+            throw new Error(`Invalid RevertCode: ${code}`);
         }
-        return new RevertCode(fr.toNumber());
+        return new RevertCode(code);
+    }
+    static fromField(field) {
+        return RevertCode.fromNumber(field.toNumber());
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
@@ -106,10 +109,7 @@ function isRevertCodeEnum(value) {
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
         const code = reader.readBytes(RevertCode.PACKED_SIZE_IN_BYTES).readUInt8(0);
-        if (!isRevertCodeEnum(code)) {
-            throw new Error(`Invalid RevertCode: ${code}`);
-        }
-        return new RevertCode(code);
+        return RevertCode.fromNumber(code);
     }
     static NUM_OPTIONS = 4;
     static random() {

package/dest/block/body.d.ts

@@ -1,11 +1,8 @@
-import { createBlockEndMarker } from '@aztec/blob-lib/encoding';
-import { Fr } from '@aztec/foundation/fields';
+import type { TxBlobData } from '@aztec/blob-lib/encoding';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import type { ZodFor } from '../schemas/index.js';
 import { TxEffect } from '../tx/tx_effect.js';
-export { createBlockEndMarker };
-export declare function getBlockBlobFields(txEffects: TxEffect[]): Fr[];
 export declare class Body {
     txEffects: TxEffect[];
     constructor(txEffects: TxEffect[]);
@@ -24,11 +21,11 @@ export declare class Body {
     /**
      * Returns a flat packed array of fields of all tx effects - used for blobs.
      */
-    toBlobFields(): Fr[];
+    toTxBlobData(): TxBlobData[];
     /**
      * Decodes a block from blob fields.
      */
-    static fromBlobFields(fields: Fr[]): Body;
+    static fromTxBlobData(txBlobData: TxBlobData[]): Body;
     [inspect.custom](): string;
     static random(txsPerBlock?: number, numPublicCallsPerTx?: number, numPublicLogsPerCall?: number, maxEffects?: number | undefined): Promise<Body>;
     static empty(): Body;

package/dest/block/body.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"body.d.ts","sourceRoot":"","sources":["../../src/block/body.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAiD,MAAM,0BAA0B,CAAC;AAE/G,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAkC,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,oBAAoB,EAAE,CAAC;AAEhC,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,QAAQ,EAAE,QAIvD;AAED,qBAAa,IAAI;IACI,SAAS,EAAE,QAAQ,EAAE;gBAArB,SAAS,EAAE,QAAQ,EAAE;IAExC,MAAM,CAAC,KAAK,EAAE,IAAI;IAMlB,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAMhC;IAED;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAM5C;;OAEG;IACH,YAAY;IAIZ;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,EAAE;IAqBlC,CAAC,OAAO,CAAC,MAAM,CAAC;WAMH,MAAM,CACjB,WAAW,SAAI,EACf,mBAAmB,SAAI,EACvB,oBAAoB,SAAI,EACxB,UAAU,GAAE,MAAM,GAAG,SAAqB;IAS5C,MAAM,CAAC,KAAK;CAGb"}
+{"version":3,"file":"body.d.ts","sourceRoot":"","sources":["../../src/block/body.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,qBAAa,IAAI;IACI,SAAS,EAAE,QAAQ,EAAE;gBAArB,SAAS,EAAE,QAAQ,EAAE;IAExC,MAAM,CAAC,KAAK,EAAE,IAAI;IAMlB,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAMhC;IAED;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAM5C;;OAEG;IACH,YAAY,IAAI,UAAU,EAAE;IAI5B;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI;IAKrD,CAAC,OAAO,CAAC,MAAM,CAAC;WAMH,MAAM,CACjB,WAAW,SAAI,EACf,mBAAmB,SAAI,EACvB,oBAAoB,SAAI,EACxB,UAAU,GAAE,MAAM,GAAG,SAAqB;IAS5C,MAAM,CAAC,KAAK;CAGb"}

package/dest/block/body.js

@@ -1,15 +1,8 @@
-import { createBlockEndMarker, getNumTxsFromBlockEndMarker, isBlockEndMarker } from '@aztec/blob-lib/encoding';
 import { timesParallel } from '@aztec/foundation/collection';
-import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { z } from 'zod';
 import { TxEffect } from '../tx/tx_effect.js';
-export { createBlockEndMarker };
-export function getBlockBlobFields(txEffects) {
-    const blobFields = txEffects.flatMap((txEffect)=>txEffect.toBlobFields());
-    blobFields.push(createBlockEndMarker(txEffects.length));
-    return blobFields;
-}
 export class Body {
     txEffects;
     constructor(txEffects){
@@ -38,26 +31,14 @@ export class Body {
     }
     /**
    * Returns a flat packed array of fields of all tx effects - used for blobs.
-   */ toBlobFields() {
-        return getBlockBlobFields(this.txEffects);
+   */ toTxBlobData() {
+        return this.txEffects.map((txEffect)=>txEffect.toTxBlobData());
     }
     /**
    * Decodes a block from blob fields.
-   */ static fromBlobFields(fields) {
-        const txEffects = [];
-        const reader = new FieldReader(fields.slice(0, -1));
-        while(!reader.isFinished()){
-            txEffects.push(TxEffect.fromBlobFields(reader));
-        }
-        // If the fields are from a proven block, or are constructed by calling `toBlobFields`, the following errors should never throw.
-        if (!isBlockEndMarker(fields[fields.length - 1])) {
-            throw new Error('Block end marker not found');
-        }
-        const numTxs = getNumTxsFromBlockEndMarker(fields[fields.length - 1]);
-        if (numTxs !== txEffects.length) {
-            throw new Error(`Expected ${numTxs} txs, but got ${txEffects.length}`);
-        }
-        return new this(txEffects);
+   */ static fromTxBlobData(txBlobData) {
+        const txEffects = txBlobData.map((data)=>TxEffect.fromTxBlobData(data));
+        return new Body(txEffects);
     }
     [inspect.custom]() {
         return `Body {

package/dest/block/index.d.ts

@@ -1,4 +1,5 @@
 export * from './l2_block.js';
+export * from './l2_block_new.js';
 export * from './l2_block_header.js';
 export * from './l2_block_stream/index.js';
 export * from './in_block.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC"}

package/dest/block/index.js

@@ -1,4 +1,5 @@
 export * from './l2_block.js';
+export * from './l2_block_new.js';
 export * from './l2_block_header.js';
 export * from './l2_block_stream/index.js';
 export * from './in_block.js';

package/dest/block/l2_block.d.ts

@@ -1,3 +1,4 @@
+import { type BlockBlobData } from '@aztec/blob-lib/encoding';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { z } from 'zod';
@@ -8,6 +9,8 @@ import { L2BlockHeader } from './l2_block_header.js';
 import type { L2BlockInfo } from './l2_block_info.js';
 /**
  * The data that makes up the rollup proof, with encoder decoder functions.
+ *
+ * @deprecated Use `L2BlockNew` instead.
  */
 export declare class L2Block {
     /** Snapshot of archive tree after the block is applied. */
@@ -116,6 +119,8 @@ export declare class L2Block {
      * TODO(#17027): Remove this method from L2Block and create a dedicated Checkpoint class.
      */
     getCheckpointBlobFields(): Fr[];
+    toBlobFields(isFirstBlock: boolean): Fr[];
+    toBlockBlobData(isFirstBlock: boolean): BlockBlobData;
     /**
      * Returns stats used for logging.
      * @returns Stats on tx count, number, and log size and count.

package/dest/block/l2_block.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2_block.d.ts","sourceRoot":"","sources":["../../src/block/l2_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD;;GAEG;AACH,qBAAa,OAAO;IAEhB,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,aAAa;IAC5B,qBAAqB;IACd,IAAI,EAAE,IAAI;IACjB,OAAO,CAAC,SAAS;;IANjB,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,aAAa;IAC5B,qBAAqB;IACd,IAAI,EAAE,IAAI,EACT,SAAS,GAAE,EAAE,GAAG,SAAqB;IAG/C,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAS5C;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAIvC;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;;;;;;OAQG;WACU,MAAM,CACjB,UAAU,EAAE,MAAM,EAClB,WAAW,SAAI,EACf,mBAAmB,SAAI,EACvB,oBAAoB,SAAI,EACxB,MAAM,GAAE,EAAE,GAAG,SAAqB,EAClC,UAAU,GAAE,MAAM,GAAG,SAAqB,EAC1C,UAAU,GAAE,MAAM,GAAG,SAAqB,GACzC,OAAO,CAAC,OAAO,CAAC;IAUnB;;;OAGG;IACH,MAAM,CAAC,KAAK,IAAI,OAAO;IAIvB,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;OAGG;IACU,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC;IAOhC;;;;OAIG;IACI,mBAAmB;IAKnB,cAAc,IAAI,WAAW;IAIpC;;;;OAIG;IACI,uBAAuB;IAI9B;;;OAGG;IACH,QAAQ;;;;;;;;;IAuBR,WAAW,IAAI,WAAW;IAY1B,MAAM,CAAC,KAAK,EAAE,OAAO;CAGtB"}
+{"version":3,"file":"l2_block.d.ts","sourceRoot":"","sources":["../../src/block/l2_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAuB,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD;;;;GAIG;AACH,qBAAa,OAAO;IAEhB,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,aAAa;IAC5B,qBAAqB;IACd,IAAI,EAAE,IAAI;IACjB,OAAO,CAAC,SAAS;;IANjB,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,aAAa;IAC5B,qBAAqB;IACd,IAAI,EAAE,IAAI,EACT,SAAS,GAAE,EAAE,GAAG,SAAqB;IAG/C,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAS5C;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAIvC;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;;;;;;OAQG;WACU,MAAM,CACjB,UAAU,EAAE,MAAM,EAClB,WAAW,SAAI,EACf,mBAAmB,SAAI,EACvB,oBAAoB,SAAI,EACxB,MAAM,GAAE,EAAE,GAAG,SAAqB,EAClC,UAAU,GAAE,MAAM,GAAG,SAAqB,EAC1C,UAAU,GAAE,MAAM,GAAG,SAAqB,GACzC,OAAO,CAAC,OAAO,CAAC;IAUnB;;;OAGG;IACH,MAAM,CAAC,KAAK,IAAI,OAAO;IAIvB,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;OAGG;IACU,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC;IAOhC;;;;OAIG;IACI,mBAAmB;IAKnB,cAAc,IAAI,WAAW;IAIpC;;;;OAIG;IACI,uBAAuB;IAKvB,YAAY,CAAC,YAAY,EAAE,OAAO,GAAG,EAAE,EAAE;IAKzC,eAAe,CAAC,YAAY,EAAE,OAAO,GAAG,aAAa;IAuB5D;;;OAGG;IACH,QAAQ;;;;;;;;;IAuBR,WAAW,IAAI,WAAW;IAY1B,MAAM,CAAC,KAAK,EAAE,OAAO;CAGtB"}

package/dest/block/l2_block.js

@@ -1,13 +1,16 @@
+import { encodeBlockBlobData } from '@aztec/blob-lib/encoding';
+import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { z } from 'zod';
-import { getCheckpointBlobFields } from '../checkpoint/checkpoint_body.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { Body } from './body.js';
 import { makeAppendOnlyTreeSnapshot, makeL2BlockHeader } from './l2_block_code_to_purge.js';
 import { L2BlockHeader } from './l2_block_header.js';
 /**
  * The data that makes up the rollup proof, with encoder decoder functions.
+ *
+ * @deprecated Use `L2BlockNew` instead.
  */ export class L2Block {
     archive;
     header;
@@ -107,9 +110,36 @@ import { L2BlockHeader } from './l2_block_header.js';
    * This only works when there's one block per checkpoint.
    * TODO(#17027): Remove this method from L2Block and create a dedicated Checkpoint class.
    */ getCheckpointBlobFields() {
-        return getCheckpointBlobFields([
-            this.body.txEffects
-        ]);
+        const blockBlobData = this.toBlobFields(true);
+        return [
+            new Fr(blockBlobData.length + 1)
+        ].concat(blockBlobData);
+    }
+    toBlobFields(isFirstBlock) {
+        const blockBlobData = this.toBlockBlobData(isFirstBlock);
+        return encodeBlockBlobData(blockBlobData);
+    }
+    toBlockBlobData(isFirstBlock) {
+        return {
+            blockEndMarker: {
+                numTxs: this.body.txEffects.length,
+                timestamp: this.header.globalVariables.timestamp,
+                blockNumber: this.number
+            },
+            blockEndStateField: {
+                l1ToL2MessageNextAvailableLeafIndex: this.header.state.l1ToL2MessageTree.nextAvailableLeafIndex,
+                noteHashNextAvailableLeafIndex: this.header.state.partial.noteHashTree.nextAvailableLeafIndex,
+                nullifierNextAvailableLeafIndex: this.header.state.partial.nullifierTree.nextAvailableLeafIndex,
+                publicDataNextAvailableLeafIndex: this.header.state.partial.publicDataTree.nextAvailableLeafIndex,
+                totalManaUsed: this.header.totalManaUsed.toBigInt()
+            },
+            lastArchiveRoot: this.header.lastArchive.root,
+            noteHashRoot: this.header.state.partial.noteHashTree.root,
+            nullifierRoot: this.header.state.partial.nullifierTree.root,
+            publicDataRoot: this.header.state.partial.publicDataTree.root,
+            l1ToL2MessageRoot: isFirstBlock ? this.header.state.l1ToL2MessageTree.root : undefined,
+            txs: this.body.toTxBlobData()
+        };
     }
     /**
    * Returns stats used for logging.