@aztec/stdlib 0.87.3-nightly.20250528 → 0.87.3

package/dest/block/l2_block.js

@@ -60,8 +60,8 @@ import { makeAppendOnlyTreeSnapshot, makeHeader } from './l2_block_code_to_purge
    * @param numPublicLogsPerCall - The number of public logs per 1 public function invocation.
    * @param inHash - The hash of the L1 to L2 messages subtree which got inserted in this block.
    * @returns The L2 block.
-   */ static async random(l2BlockNum, txsPerBlock = 4, numPublicCallsPerTx = 3, numPublicLogsPerCall = 1, inHash = undefined, slotNumber = undefined, maxEffects = undefined) {
-        const body = await Body.random(txsPerBlock, numPublicCallsPerTx, numPublicLogsPerCall, maxEffects);
+   */ static async random(l2BlockNum, txsPerBlock = 4, numPublicCallsPerTx = 3, numPublicLogsPerCall = 1, inHash = undefined, slotNumber = undefined) {
+        const body = await Body.random(txsPerBlock, numPublicCallsPerTx, numPublicLogsPerCall);
         return new L2Block(makeAppendOnlyTreeSnapshot(l2BlockNum + 1), makeHeader(0, txsPerBlock, l2BlockNum, slotNumber ?? l2BlockNum, inHash), body);
     }
     /**

package/dest/block/l2_block_source.d.ts

@@ -1,5 +1,5 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import type { TypedEventEmitter } from '@aztec/foundation/types';
+import type { EventEmitter } from 'events';
 import { z } from 'zod';
 import type { L1RollupConstants } from '../epoch-helpers/index.js';
 import type { BlockHeader } from '../tx/block_header.js';
@@ -106,11 +106,7 @@ export interface L2BlockSource {
  * L2BlockSource that emits events upon pending / proven chain changes.
  * see L2BlockSourceEvents for the events emitted.
  */
-export type ArchiverEmitter = TypedEventEmitter<{
-    [L2BlockSourceEvents.L2PruneDetected]: (args: L2BlockSourceEvent) => void;
-    [L2BlockSourceEvents.L2BlockProven]: (args: L2BlockSourceEvent) => void;
-}>;
-export interface L2BlockSourceEventEmitter extends L2BlockSource, ArchiverEmitter {
+export interface L2BlockSourceEventEmitter extends L2BlockSource, EventEmitter {
 }
 /**
  * Identifier for L2 block tags.
@@ -248,11 +244,10 @@ export declare const L2TipsSchema: z.ZodObject<{
     };
 }>;
 export declare enum L2BlockSourceEvents {
-    L2PruneDetected = "l2PruneDetected",
-    L2BlockProven = "l2BlockProven"
+    L2PruneDetected = "l2PruneDetected"
 }
 export type L2BlockSourceEvent = {
-    type: 'l2PruneDetected' | 'l2BlockProven';
+    type: 'l2PruneDetected';
     blockNumber: bigint;
     slotNumber: bigint;
     epochNumber: bigint;

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

@@ -1 +1 @@
-{"version":3,"file":"l2_block_source.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC;IAExC;;;OAGG;IACH,kBAAkB,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC;IAE1C;;;OAGG;IACH,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAElC;;;OAGG;IACH,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAExC;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;IAEvD;;;;OAIG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;IAE5E;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAE7E,yDAAyD;IACzD,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAE/F;;;;OAIG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC;IAElE;;;;OAIG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IAEpE;;OAEG;IACH,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAEnC;;OAEG;IACH,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpC;;;;OAIG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAE3D;;;;OAIG;IACH,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAErE;;;OAGG;IACH,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvD;;OAEG;IACH,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE7B;;OAEG;IACH,cAAc,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAE7C,oBAAoB;IACpB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAChC;AAED;;;GAGG;AAEH,MAAM,MAAM,eAAe,GAAG,iBAAiB,CAAC;IAC9C,CAAC,mBAAmB,CAAC,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAC1E,CAAC,mBAAmB,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACzE,CAAC,CAAC;AACH,MAAM,WAAW,yBAA0B,SAAQ,aAAa,EAAE,eAAe;CAAG;AAEpF;;;;;GAKG;AACH,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,QAAQ,GAAG,WAAW,CAAC;AAE3D,4BAA4B;AAC5B,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;AAEnD,6CAA6C;AAC7C,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,6BAA6B;AAC7B,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAKtE;AAGD,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;IASnB,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAIK,CAAC;AAE/B,oBAAY,mBAAmB;IAC7B,eAAe,oBAAoB;IACnC,aAAa,kBAAkB;CAChC;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,iBAAiB,GAAG,eAAe,CAAC;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}
+{"version":3,"file":"l2_block_source.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_source.ts"],"names":[],"mappings":"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"}

package/dest/block/l2_block_source.js

@@ -26,6 +26,5 @@ export const L2TipsSchema = z.object({
 });
 export var L2BlockSourceEvents = /*#__PURE__*/ function(L2BlockSourceEvents) {
     L2BlockSourceEvents["L2PruneDetected"] = "l2PruneDetected";
-    L2BlockSourceEvents["L2BlockProven"] = "l2BlockProven";
     return L2BlockSourceEvents;
 }({});

package/dest/block/published_l2_block.d.ts

@@ -1,13 +1,54 @@
+import { Signature } from '@aztec/foundation/eth-signature';
+import { L2Block } from '@aztec/stdlib/block';
 import { z } from 'zod';
 import { BlockAttestation } from '../p2p/block_attestation.js';
-import { L2Block } from './l2_block.js';
-import { CommitteeAttestation } from './proposal/committee_attestation.js';
-export declare class L1PublishedData {
+export type L1PublishedData = {
     blockNumber: bigint;
     timestamp: bigint;
     blockHash: string;
-    constructor(blockNumber: bigint, timestamp: bigint, blockHash: string);
-    static get schema(): z.ZodObject<{
+};
+export type PublishedL2Block = {
+    block: L2Block;
+    l1: L1PublishedData;
+    signatures: Signature[];
+};
+export declare const PublishedL2BlockSchema: z.ZodObject<{
+    block: z.ZodEffects<z.ZodObject<{
+        archive: z.ZodEffects<z.ZodObject<{
+            root: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
+            nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+        }, "strip", z.ZodTypeAny, {
+            root: import("@aztec/foundation/schemas").Fr;
+            nextAvailableLeafIndex: number;
+        }, {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        }>;
+        header: import("@aztec/foundation/schemas").ZodFor<import("../tx/block_header.js").BlockHeader>;
+        body: import("@aztec/foundation/schemas").ZodFor<import("@aztec/stdlib/block").Body>;
+    }, "strip", z.ZodTypeAny, {
+        archive: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
+        header: import("../tx/block_header.js").BlockHeader;
+        body: import("@aztec/stdlib/block").Body;
+    }, {
+        archive: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        };
+        header?: any;
+        body?: any;
+    }>, L2Block, {
+        archive: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        };
+        header?: any;
+        body?: any;
+    }>;
+    l1: z.ZodObject<{
         blockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
         timestamp: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
         blockHash: z.ZodString;
@@ -20,101 +61,30 @@ export declare class L1PublishedData {
         timestamp: string | number | bigint;
         blockHash: string;
     }>;
-}
-export declare class PublishedL2Block {
+    signatures: z.ZodArray<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>, Signature, string>, "many">;
+}, "strip", z.ZodTypeAny, {
     block: L2Block;
-    l1: L1PublishedData;
-    attestations: CommitteeAttestation[];
-    constructor(block: L2Block, l1: L1PublishedData, attestations: CommitteeAttestation[]);
-    static get schema(): z.ZodObject<{
-        block: z.ZodEffects<z.ZodObject<{
-            archive: z.ZodEffects<z.ZodObject<{
-                root: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
-                nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-            }, "strip", z.ZodTypeAny, {
-                root: import("@aztec/foundation/schemas").Fr;
-                nextAvailableLeafIndex: number;
-            }, {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            }>;
-            header: import("@aztec/foundation/schemas").ZodFor<import("../tx/block_header.js").BlockHeader>;
-            body: import("@aztec/foundation/schemas").ZodFor<import("./body.js").Body>;
-        }, "strip", z.ZodTypeAny, {
-            archive: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
-            header: import("../tx/block_header.js").BlockHeader;
-            body: import("./body.js").Body;
-        }, {
-            archive: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            header?: any;
-            body?: any;
-        }>, L2Block, {
-            archive: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            header?: any;
-            body?: any;
-        }>;
-        l1: z.ZodObject<{
-            blockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-            timestamp: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-            blockHash: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            blockNumber: bigint;
-            timestamp: bigint;
-            blockHash: string;
-        }, {
-            blockNumber: string | number | bigint;
-            timestamp: string | number | bigint;
-            blockHash: string;
-        }>;
-        attestations: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            address: z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>;
-            signature: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>, import("./proposal/committee_attestation.js").Signature, string>;
-        }, "strip", z.ZodTypeAny, {
-            address: import("@aztec/foundation/schemas").EthAddress;
-            signature: import("./proposal/committee_attestation.js").Signature;
-        }, {
-            address: string;
-            signature: string;
-        }>, CommitteeAttestation, {
-            address: string;
-            signature: string;
-        }>, "many">;
-    }, "strip", z.ZodTypeAny, {
-        block: L2Block;
-        l1: {
-            blockNumber: bigint;
-            timestamp: bigint;
-            blockHash: string;
-        };
-        attestations: CommitteeAttestation[];
-    }, {
-        block: {
-            archive: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            header?: any;
-            body?: any;
-        };
-        l1: {
-            blockNumber: string | number | bigint;
-            timestamp: string | number | bigint;
-            blockHash: string;
+    l1: {
+        blockNumber: bigint;
+        timestamp: bigint;
+        blockHash: string;
+    };
+    signatures: Signature[];
+}, {
+    block: {
+        archive: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
         };
-        attestations: {
-            address: string;
-            signature: string;
-        }[];
-    }>;
-}
+        header?: any;
+        body?: any;
+    };
+    l1: {
+        blockNumber: string | number | bigint;
+        timestamp: string | number | bigint;
+        blockHash: string;
+    };
+    signatures: string[];
+}>;
 export declare function getAttestationsFromPublishedL2Block(block: PublishedL2Block): BlockAttestation[];
 //# sourceMappingURL=published_l2_block.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"published_l2_block.d.ts","sourceRoot":"","sources":["../../src/block/published_l2_block.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,qBAAa,eAAe;IAEjB,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,MAAM;IACjB,SAAS,EAAE,MAAM;gBAFjB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM;IAG1B,MAAM,KAAK,MAAM;;;;;;;;;;;;OAMhB;CACF;AAED,qBAAa,gBAAgB;IAElB,KAAK,EAAE,OAAO;IACd,EAAE,EAAE,eAAe;IACnB,YAAY,EAAE,oBAAoB,EAAE;gBAFpC,KAAK,EAAE,OAAO,EACd,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,oBAAoB,EAAE;IAG7C,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAMhB;CACF;AAED,wBAAgB,mCAAmC,CAAC,KAAK,EAAE,gBAAgB,sBAQ1E"}
+{"version":3,"file":"published_l2_block.d.ts","sourceRoot":"","sources":["../../src/block/published_l2_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAG/D,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,OAAO,CAAC;IACf,EAAE,EAAE,eAAe,CAAC;IACpB,UAAU,EAAE,SAAS,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQjC,CAAC;AAEH,wBAAgB,mCAAmC,CAAC,KAAK,EAAE,gBAAgB,sBAK1E"}

package/dest/block/published_l2_block.js

@@ -1,45 +1,19 @@
-// Ignoring import issue to fix portable inferred type issue in zod schema
+import { Signature } from '@aztec/foundation/eth-signature';
 import { schemas } from '@aztec/foundation/schemas';
+import { L2Block } from '@aztec/stdlib/block';
 import { z } from 'zod';
 import { BlockAttestation } from '../p2p/block_attestation.js';
 import { ConsensusPayload } from '../p2p/consensus_payload.js';
-import { L2Block } from './l2_block.js';
-import { CommitteeAttestation } from './proposal/committee_attestation.js';
-export class L1PublishedData {
-    blockNumber;
-    timestamp;
-    blockHash;
-    constructor(blockNumber, timestamp, blockHash){
-        this.blockNumber = blockNumber;
-        this.timestamp = timestamp;
-        this.blockHash = blockHash;
-    }
-    static get schema() {
-        return z.object({
-            blockNumber: schemas.BigInt,
-            timestamp: schemas.BigInt,
-            blockHash: z.string()
-        });
-    }
-}
-export class PublishedL2Block {
-    block;
-    l1;
-    attestations;
-    constructor(block, l1, attestations){
-        this.block = block;
-        this.l1 = l1;
-        this.attestations = attestations;
-    }
-    static get schema() {
-        return z.object({
-            block: L2Block.schema,
-            l1: L1PublishedData.schema,
-            attestations: z.array(CommitteeAttestation.schema)
-        });
-    }
-}
+export const PublishedL2BlockSchema = z.object({
+    block: L2Block.schema,
+    l1: z.object({
+        blockNumber: schemas.BigInt,
+        timestamp: schemas.BigInt,
+        blockHash: z.string()
+    }),
+    signatures: z.array(Signature.schema)
+});
 export function getAttestationsFromPublishedL2Block(block) {
     const payload = ConsensusPayload.fromBlock(block.block);
-    return block.attestations.filter((attestation)=>!attestation.signature.isEmpty()).map((attestation)=>new BlockAttestation(block.block.header.globalVariables.blockNumber, payload, attestation.signature));
+    return block.signatures.filter((sig)=>!sig.isEmpty).map((signature)=>new BlockAttestation(block.block.header.globalVariables.blockNumber, payload, signature));
 }

package/dest/block/test/l2_tips_store_test_suite.js

@@ -18,7 +18,7 @@ export function testL2TipsStore(makeTipsStore) {
                 blockHash: `0x${number}`,
                 timestamp: BigInt(number)
             },
-            attestations: []
+            signatures: []
         });
     const makeBlockId = (number)=>({
             number,

package/dest/interfaces/archiver.js

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { L2Block } from '../block/l2_block.js';
 import { L2TipsSchema } from '../block/l2_block_source.js';
-import { PublishedL2Block } from '../block/published_l2_block.js';
+import { PublishedL2BlockSchema } from '../block/published_l2_block.js';
 import { ContractClassPublicSchema, ContractInstanceWithAddressSchema } from '../contract/index.js';
 import { L1RollupConstantsSchema } from '../epoch-helpers/index.js';
 import { LogFilterSchema } from '../logs/log_filter.js';
@@ -24,7 +24,7 @@ export const ArchiverApiSchema = {
         z.literal('latest')
     ])).returns(BlockHeader.schema.optional()),
     getBlocks: z.function().args(schemas.Integer, schemas.Integer, optional(z.boolean())).returns(z.array(L2Block.schema)),
-    getPublishedBlocks: z.function().args(schemas.Integer, schemas.Integer, optional(z.boolean())).returns(z.array(PublishedL2Block.schema)),
+    getPublishedBlocks: z.function().args(schemas.Integer, schemas.Integer, optional(z.boolean())).returns(z.array(PublishedL2BlockSchema)),
     getTxEffect: z.function().args(TxHash.schema).returns(indexedTxSchema().optional()),
     getSettledTxReceipt: z.function().args(TxHash.schema).returns(TxReceipt.schema.optional()),
     getL2SlotNumber: z.function().args().returns(schemas.BigInt),

package/dest/interfaces/aztec-node.js

@@ -7,7 +7,7 @@ import { inBlockSchemaFor } from '../block/in_block.js';
 import { L2Block } from '../block/l2_block.js';
 import { L2BlockNumberSchema } from '../block/l2_block_number.js';
 import { L2TipsSchema } from '../block/l2_block_source.js';
-import { PublishedL2Block } from '../block/published_l2_block.js';
+import { PublishedL2BlockSchema } from '../block/published_l2_block.js';
 import { ContractClassPublicSchema, ContractInstanceWithAddressSchema, NodeInfoSchema, ProtocolContractAddressesSchema } from '../contract/index.js';
 import { GasFees } from '../gas/gas_fees.js';
 import { LogFilterSchema } from '../logs/log_filter.js';
@@ -48,7 +48,7 @@ export const AztecNodeApiSchema = {
     isReady: z.function().returns(z.boolean()),
     getNodeInfo: z.function().returns(NodeInfoSchema),
     getBlocks: z.function().args(z.number(), z.number()).returns(z.array(L2Block.schema)),
-    getPublishedBlocks: z.function().args(z.number(), z.number()).returns(z.array(PublishedL2Block.schema)),
+    getPublishedBlocks: z.function().args(z.number(), z.number()).returns(z.array(PublishedL2BlockSchema)),
     getCurrentBaseFees: z.function().returns(GasFees.schema),
     getNodeVersion: z.function().returns(z.string()),
     getVersion: z.function().returns(z.number()),