@aztec/stdlib 3.0.0-nightly.20250908 → 3.0.0-nightly.20250911

package/dest/block/proposal/attestations_and_signers.d.ts

@@ -0,0 +1,48 @@
+import type { ViemCommitteeAttestations } from '@aztec/ethereum';
+import { z } from 'zod';
+import type { Signable, SignatureDomainSeparator } from '../../p2p/signature_utils.js';
+import { CommitteeAttestation } from './committee_attestation.js';
+export declare class CommitteeAttestationsAndSigners implements Signable {
+    attestations: CommitteeAttestation[];
+    constructor(attestations: CommitteeAttestation[]);
+    static get schema(): z.ZodEffects<z.ZodObject<{
+        attestations: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            address: z.ZodType<import("./committee_attestation.js").EthAddress, any, string>;
+            signature: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>, import("./committee_attestation.js").Signature, string>;
+        }, "strip", z.ZodTypeAny, {
+            address: import("./committee_attestation.js").EthAddress;
+            signature: import("./committee_attestation.js").Signature;
+        }, {
+            address: string;
+            signature: string;
+        }>, CommitteeAttestation, {
+            address: string;
+            signature: string;
+        }>, "many">;
+    }, "strip", z.ZodTypeAny, {
+        attestations: CommitteeAttestation[];
+    }, {
+        attestations: {
+            address: string;
+            signature: string;
+        }[];
+    }>, CommitteeAttestationsAndSigners, {
+        attestations: {
+            address: string;
+            signature: string;
+        }[];
+    }>;
+    getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer;
+    static empty(): CommitteeAttestationsAndSigners;
+    toString(): void;
+    getSigners(): import("./committee_attestation.js").EthAddress[];
+    getSignedAttestations(): CommitteeAttestation[];
+    /**
+     * Packs an array of committee attestations into the format expected by the Solidity contract
+     *
+     * @param attestations - Array of committee attestations with addresses and signatures
+     * @returns Packed attestations with bitmap and tightly packed signature/address data
+     */
+    getPackedAttestations(): ViemCommitteeAttestations;
+}
+//# sourceMappingURL=attestations_and_signers.d.ts.map

package/dest/block/proposal/attestations_and_signers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"attestations_and_signers.d.ts","sourceRoot":"","sources":["../../../src/block/proposal/attestations_and_signers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAIjE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,qBAAa,+BAAgC,YAAW,QAAQ;IAC3C,YAAY,EAAE,oBAAoB,EAAE;gBAApC,YAAY,EAAE,oBAAoB,EAAE;IAEvD,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;OAMhB;IAED,gBAAgB,CAAC,eAAe,EAAE,wBAAwB,GAAG,MAAM;IAanE,MAAM,CAAC,KAAK,IAAI,+BAA+B;IAI/C,QAAQ;IAIR,UAAU;IAIV,qBAAqB;IAIrB;;;;;OAKG;IACH,qBAAqB,IAAI,yBAAyB;CAiEnD"}

package/dest/block/proposal/attestations_and_signers.js

@@ -0,0 +1,99 @@
+import { hexToBuffer } from '@aztec/foundation/string';
+import { encodeAbiParameters, parseAbiParameters } from 'viem';
+import { z } from 'zod';
+import { CommitteeAttestation } from './committee_attestation.js';
+export class CommitteeAttestationsAndSigners {
+    attestations;
+    constructor(attestations){
+        this.attestations = attestations;
+    }
+    static get schema() {
+        return z.object({
+            attestations: CommitteeAttestation.schema.array()
+        }).transform((obj)=>new CommitteeAttestationsAndSigners(obj.attestations));
+    }
+    getPayloadToSign(domainSeparator) {
+        const abi = parseAbiParameters('uint8,(bytes,bytes),address[]');
+        const packed = this.getPackedAttestations();
+        const encodedData = encodeAbiParameters(abi, [
+            domainSeparator,
+            [
+                packed.signatureIndices,
+                packed.signaturesOrAddresses
+            ],
+            this.getSigners().map((s)=>s.toString())
+        ]);
+        return hexToBuffer(encodedData);
+    }
+    static empty() {
+        return new CommitteeAttestationsAndSigners([]);
+    }
+    toString() {
+        throw new Error('Not implemented');
+    }
+    getSigners() {
+        return this.attestations.filter((a)=>!a.signature.isEmpty()).map((a)=>a.address);
+    }
+    getSignedAttestations() {
+        return this.attestations.filter((a)=>!a.signature.isEmpty());
+    }
+    /**
+   * Packs an array of committee attestations into the format expected by the Solidity contract
+   *
+   * @param attestations - Array of committee attestations with addresses and signatures
+   * @returns Packed attestations with bitmap and tightly packed signature/address data
+   */ getPackedAttestations() {
+        const length = this.attestations.length;
+        const attestations = this.attestations.map((a)=>a.toViem());
+        // Calculate bitmap size (1 bit per attestation, rounded up to nearest byte)
+        const bitmapSize = Math.ceil(length / 8);
+        const signatureIndices = new Uint8Array(bitmapSize);
+        // Calculate total data size needed
+        let totalDataSize = 0;
+        for(let i = 0; i < length; i++){
+            const signature = attestations[i].signature;
+            // Check if signature is empty (v = 0)
+            const isEmpty = signature.v === 0;
+            if (!isEmpty) {
+                totalDataSize += 65; // v (1) + r (32) + s (32)
+            } else {
+                totalDataSize += 20; // address only
+            }
+        }
+        const signaturesOrAddresses = new Uint8Array(totalDataSize);
+        let dataIndex = 0;
+        // Pack the data
+        for(let i = 0; i < length; i++){
+            const attestation = attestations[i];
+            const signature = attestation.signature;
+            // Check if signature is empty
+            const isEmpty = signature.v === 0;
+            if (!isEmpty) {
+                // Set bit in bitmap (bit 7-0 in each byte, left to right)
+                const byteIndex = Math.floor(i / 8);
+                const bitIndex = 7 - i % 8;
+                signatureIndices[byteIndex] |= 1 << bitIndex;
+                // Pack signature: v + r + s
+                signaturesOrAddresses[dataIndex] = signature.v;
+                dataIndex++;
+                // Pack r (32 bytes)
+                const rBytes = Buffer.from(signature.r.slice(2), 'hex');
+                signaturesOrAddresses.set(rBytes, dataIndex);
+                dataIndex += 32;
+                // Pack s (32 bytes)
+                const sBytes = Buffer.from(signature.s.slice(2), 'hex');
+                signaturesOrAddresses.set(sBytes, dataIndex);
+                dataIndex += 32;
+            } else {
+                // Pack address only (20 bytes)
+                const addrBytes = Buffer.from(attestation.addr.slice(2), 'hex');
+                signaturesOrAddresses.set(addrBytes, dataIndex);
+                dataIndex += 20;
+            }
+        }
+        return {
+            signatureIndices: `0x${Buffer.from(signatureIndices).toString('hex')}`,
+            signaturesOrAddresses: `0x${Buffer.from(signaturesOrAddresses).toString('hex')}`
+        };
+    }
+}

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

@@ -1,2 +1,3 @@
 export * from './committee_attestation.js';
+export * from './attestations_and_signers.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/block/proposal/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/block/proposal/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,+BAA+B,CAAC"}

package/dest/block/proposal/index.js

@@ -1 +1,2 @@
 export * from './committee_attestation.js';
+export * from './attestations_and_signers.js';

package/dest/block/published_l2_block.d.ts

@@ -1,3 +1,5 @@
+import { BufferReader } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
 import { BlockAttestation } from '../p2p/block_attestation.js';
 import { L2Block } from './l2_block.js';
@@ -21,13 +23,14 @@ export declare class L1PublishedData {
         blockHash: string;
     }>;
     static random(): L1PublishedData;
+    static fromFields(fields: FieldsOf<L1PublishedData>): L1PublishedData;
 }
 export declare class PublishedL2Block {
     block: L2Block;
     l1: L1PublishedData;
     attestations: CommitteeAttestation[];
     constructor(block: L2Block, l1: L1PublishedData, attestations: CommitteeAttestation[]);
-    static get schema(): z.ZodObject<{
+    static get schema(): z.ZodEffects<z.ZodObject<{
         block: z.ZodEffects<z.ZodObject<{
             archive: z.ZodEffects<z.ZodObject<{
                 root: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
@@ -115,7 +118,28 @@ export declare class PublishedL2Block {
             address: string;
             signature: string;
         }[];
+    }>, PublishedL2Block, {
+        block: {
+            archive: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            header?: any;
+            body?: any;
+        };
+        l1: {
+            blockNumber: string | number | bigint;
+            timestamp: string | number | bigint;
+            blockHash: string;
+        };
+        attestations: {
+            address: string;
+            signature: string;
+        }[];
     }>;
+    static fromBuffer(bufferOrReader: Buffer | BufferReader): PublishedL2Block;
+    static fromFields(fields: FieldsOf<PublishedL2Block>): PublishedL2Block;
+    toBuffer(): Buffer;
 }
 export declare function getAttestationsFromPublishedL2Block(block: Pick<PublishedL2Block, 'attestations' | 'block'>): 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":"AAKA,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;IAED,MAAM,CAAC,MAAM;CAOd;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,CACjD,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,cAAc,GAAG,OAAO,CAAC,GACtD,gBAAgB,EAAE,CAKpB"}
+{"version":3,"file":"published_l2_block.d.ts","sourceRoot":"","sources":["../../src/block/published_l2_block.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,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;IAED,MAAM,CAAC,MAAM;IAQb,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;CAGpD;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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB;IAU1E,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC;IAI7C,QAAQ,IAAI,MAAM;CAU1B;AAED,wBAAgB,mCAAmC,CACjD,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,cAAc,GAAG,OAAO,CAAC,GACtD,gBAAgB,EAAE,CAKpB"}

package/dest/block/published_l2_block.js

@@ -2,6 +2,7 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { randomBigInt } from '@aztec/foundation/crypto';
 import { schemas } from '@aztec/foundation/schemas';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { z } from 'zod';
 import { BlockAttestation } from '../p2p/block_attestation.js';
 import { ConsensusPayload } from '../p2p/consensus_payload.js';
@@ -26,6 +27,9 @@ export class L1PublishedData {
     static random() {
         return new L1PublishedData(randomBigInt(1000n) + 1n, BigInt(Math.floor(Date.now() / 1000)), Buffer32.random().toString());
     }
+    static fromFields(fields) {
+        return new L1PublishedData(fields.blockNumber, fields.timestamp, fields.blockHash);
+    }
 }
 export class PublishedL2Block {
     block;
@@ -41,7 +45,22 @@ export class PublishedL2Block {
             block: L2Block.schema,
             l1: L1PublishedData.schema,
             attestations: z.array(CommitteeAttestation.schema)
-        });
+        }).transform((obj)=>PublishedL2Block.fromFields(obj));
+    }
+    static fromBuffer(bufferOrReader) {
+        const reader = BufferReader.asReader(bufferOrReader);
+        const block = reader.readObject(L2Block);
+        const l1BlockNumber = reader.readBigInt();
+        const l1BlockHash = reader.readString();
+        const l1Timestamp = reader.readBigInt();
+        const attestations = reader.readVector(CommitteeAttestation);
+        return new PublishedL2Block(block, new L1PublishedData(l1BlockNumber, l1Timestamp, l1BlockHash), attestations);
+    }
+    static fromFields(fields) {
+        return new PublishedL2Block(fields.block, fields.l1, fields.attestations);
+    }
+    toBuffer() {
+        return serializeToBuffer(this.block, this.l1.blockNumber, this.l1.blockHash, this.l1.timestamp, this.attestations.length, this.attestations);
     }
 }
 export function getAttestationsFromPublishedL2Block(block) {

package/dest/block/test/l2_tips_store_test_suite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2_tips_store_test_suite.d.ts","sourceRoot":"","sources":["../../../src/block/test/l2_tips_store_test_suite.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,QA6ExE"}
+{"version":3,"file":"l2_tips_store_test_suite.d.ts","sourceRoot":"","sources":["../../../src/block/test/l2_tips_store_test_suite.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,QA8ExE"}

package/dest/block/test/l2_tips_store_test_suite.js

@@ -1,12 +1,13 @@
 import { times } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
+import { PublishedL2Block } from '@aztec/stdlib/block';
 import { jestExpect as expect } from '@jest/expect';
 export function testL2TipsStore(makeTipsStore) {
     let tipsStore;
     beforeEach(async ()=>{
         tipsStore = await makeTipsStore();
     });
-    const makeBlock = (number)=>({
+    const makeBlock = (number)=>PublishedL2Block.fromFields({
             block: {
                 number,
                 header: {

package/dest/block/validate_block_result.d.ts

@@ -0,0 +1,222 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { BufferReader } from '@aztec/foundation/serialize';
+import { z } from 'zod';
+import { type L2BlockInfo } from './l2_block_info.js';
+import { CommitteeAttestation } from './proposal/committee_attestation.js';
+/** Subtype for invalid block validation results */
+export type ValidateBlockNegativeResult = {
+    valid: false;
+    /** Identifiers from the invalid block */
+    block: L2BlockInfo;
+    /** Committee members at the epoch this block was proposed */
+    committee: EthAddress[];
+    /** Epoch in which this block was proposed */
+    epoch: bigint;
+    /** Proposer selection seed for the epoch */
+    seed: bigint;
+    /** List of committee members who signed this block proposal */
+    attestors: EthAddress[];
+    /** Committee attestations for this block as they were posted to L1 */
+    attestations: CommitteeAttestation[];
+    /** Reason for the block being invalid: not enough attestations were posted */
+    reason: 'insufficient-attestations';
+} | {
+    valid: false;
+    /** Identifiers from the invalid block */
+    block: L2BlockInfo;
+    /** Committee members at the epoch this block was proposed */
+    committee: EthAddress[];
+    /** Epoch in which this block was proposed */
+    epoch: bigint;
+    /** Proposer selection seed for the epoch */
+    seed: bigint;
+    /** List of committee members who signed this block proposal */
+    attestors: EthAddress[];
+    /** Committee attestations for this block as they were posted to L1 */
+    attestations: CommitteeAttestation[];
+    /** Reason for the block being invalid: an invalid attestation was posted */
+    reason: 'invalid-attestation';
+    /** Index in the attestations array of the invalid attestation posted */
+    invalidIndex: number;
+};
+/** Result type for validating a block attestations */
+export type ValidateBlockResult = {
+    valid: true;
+} | ValidateBlockNegativeResult;
+export declare const ValidateBlockResultSchema: z.ZodUnion<[z.ZodObject<{
+    valid: z.ZodLiteral<true>;
+}, "strip", z.ZodTypeAny, {
+    valid: true;
+}, {
+    valid: true;
+}>, z.ZodObject<{
+    valid: z.ZodLiteral<false>;
+    block: z.ZodObject<{
+        blockHash: z.ZodOptional<z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>>;
+        archive: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
+        lastArchive: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
+        blockNumber: z.ZodNumber;
+        slotNumber: z.ZodNumber;
+        txCount: z.ZodNumber;
+        timestamp: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    }, "strip", z.ZodTypeAny, {
+        blockNumber: number;
+        slotNumber: number;
+        timestamp: bigint;
+        lastArchive: import("@aztec/foundation/schemas").Fr;
+        archive: import("@aztec/foundation/schemas").Fr;
+        txCount: number;
+        blockHash?: import("@aztec/foundation/schemas").Fr | undefined;
+    }, {
+        blockNumber: number;
+        slotNumber: number;
+        timestamp: string | number | bigint;
+        lastArchive: string;
+        archive: string;
+        txCount: number;
+        blockHash?: string | undefined;
+    }>;
+    committee: z.ZodArray<z.ZodType<EthAddress, any, string>, "many">;
+    epoch: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    seed: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    attestors: z.ZodArray<z.ZodType<EthAddress, any, string>, "many">;
+    attestations: z.ZodArray<z.ZodEffects<z.ZodObject<{
+        address: z.ZodType<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: EthAddress;
+        signature: import("./proposal/committee_attestation.js").Signature;
+    }, {
+        address: string;
+        signature: string;
+    }>, CommitteeAttestation, {
+        address: string;
+        signature: string;
+    }>, "many">;
+    reason: z.ZodLiteral<"insufficient-attestations">;
+}, "strip", z.ZodTypeAny, {
+    valid: false;
+    block: {
+        blockNumber: number;
+        slotNumber: number;
+        timestamp: bigint;
+        lastArchive: import("@aztec/foundation/schemas").Fr;
+        archive: import("@aztec/foundation/schemas").Fr;
+        txCount: number;
+        blockHash?: import("@aztec/foundation/schemas").Fr | undefined;
+    };
+    attestations: CommitteeAttestation[];
+    committee: EthAddress[];
+    epoch: bigint;
+    seed: bigint;
+    attestors: EthAddress[];
+    reason: "insufficient-attestations";
+}, {
+    valid: false;
+    block: {
+        blockNumber: number;
+        slotNumber: number;
+        timestamp: string | number | bigint;
+        lastArchive: string;
+        archive: string;
+        txCount: number;
+        blockHash?: string | undefined;
+    };
+    attestations: {
+        address: string;
+        signature: string;
+    }[];
+    committee: string[];
+    epoch: string | number | bigint;
+    seed: string | number | bigint;
+    attestors: string[];
+    reason: "insufficient-attestations";
+}>, z.ZodObject<{
+    valid: z.ZodLiteral<false>;
+    block: z.ZodObject<{
+        blockHash: z.ZodOptional<z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>>;
+        archive: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
+        lastArchive: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
+        blockNumber: z.ZodNumber;
+        slotNumber: z.ZodNumber;
+        txCount: z.ZodNumber;
+        timestamp: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    }, "strip", z.ZodTypeAny, {
+        blockNumber: number;
+        slotNumber: number;
+        timestamp: bigint;
+        lastArchive: import("@aztec/foundation/schemas").Fr;
+        archive: import("@aztec/foundation/schemas").Fr;
+        txCount: number;
+        blockHash?: import("@aztec/foundation/schemas").Fr | undefined;
+    }, {
+        blockNumber: number;
+        slotNumber: number;
+        timestamp: string | number | bigint;
+        lastArchive: string;
+        archive: string;
+        txCount: number;
+        blockHash?: string | undefined;
+    }>;
+    committee: z.ZodArray<z.ZodType<EthAddress, any, string>, "many">;
+    epoch: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    seed: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    attestors: z.ZodArray<z.ZodType<EthAddress, any, string>, "many">;
+    attestations: z.ZodArray<z.ZodEffects<z.ZodObject<{
+        address: z.ZodType<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: EthAddress;
+        signature: import("./proposal/committee_attestation.js").Signature;
+    }, {
+        address: string;
+        signature: string;
+    }>, CommitteeAttestation, {
+        address: string;
+        signature: string;
+    }>, "many">;
+    reason: z.ZodLiteral<"invalid-attestation">;
+    invalidIndex: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
+    valid: false;
+    block: {
+        blockNumber: number;
+        slotNumber: number;
+        timestamp: bigint;
+        lastArchive: import("@aztec/foundation/schemas").Fr;
+        archive: import("@aztec/foundation/schemas").Fr;
+        txCount: number;
+        blockHash?: import("@aztec/foundation/schemas").Fr | undefined;
+    };
+    attestations: CommitteeAttestation[];
+    committee: EthAddress[];
+    epoch: bigint;
+    seed: bigint;
+    attestors: EthAddress[];
+    reason: "invalid-attestation";
+    invalidIndex: number;
+}, {
+    valid: false;
+    block: {
+        blockNumber: number;
+        slotNumber: number;
+        timestamp: string | number | bigint;
+        lastArchive: string;
+        archive: string;
+        txCount: number;
+        blockHash?: string | undefined;
+    };
+    attestations: {
+        address: string;
+        signature: string;
+    }[];
+    committee: string[];
+    epoch: string | number | bigint;
+    seed: string | number | bigint;
+    attestors: string[];
+    reason: "invalid-attestation";
+    invalidIndex: number;
+}>]>;
+export declare function serializeValidateBlockResult(result: ValidateBlockResult): Buffer;
+export declare function deserializeValidateBlockResult(bufferOrReader: Buffer | BufferReader): ValidateBlockResult;
+//# sourceMappingURL=validate_block_result.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"validate_block_result.d.ts","sourceRoot":"","sources":["../../src/block/validate_block_result.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAmB,KAAK,WAAW,EAA4C,MAAM,oBAAoB,CAAC;AACjH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,mDAAmD;AACnD,MAAM,MAAM,2BAA2B,GACnC;IACE,KAAK,EAAE,KAAK,CAAC;IACb,yCAAyC;IACzC,KAAK,EAAE,WAAW,CAAC;IACnB,6DAA6D;IAC7D,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,6CAA6C;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,+DAA+D;IAC/D,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,sEAAsE;IACtE,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC,8EAA8E;IAC9E,MAAM,EAAE,2BAA2B,CAAC;CACrC,GACD;IACE,KAAK,EAAE,KAAK,CAAC;IACb,yCAAyC;IACzC,KAAK,EAAE,WAAW,CAAC;IACnB,6DAA6D;IAC7D,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,6CAA6C;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,+DAA+D;IAC/D,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,sEAAsE;IACtE,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC,4EAA4E;IAC5E,MAAM,EAAE,qBAAqB,CAAC;IAC9B,wEAAwE;IACxE,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEN,sDAAsD;AACtD,MAAM,MAAM,mBAAmB,GAAG;IAAE,KAAK,EAAE,IAAI,CAAA;CAAE,GAAG,2BAA2B,CAAC;AAEhF,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAuBE,CAAC;AAEzC,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAqBhF;AAED,wBAAgB,8BAA8B,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,mBAAmB,CAsBzG"}

package/dest/block/validate_block_result.js

@@ -0,0 +1,83 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { schemas } from '@aztec/foundation/schemas';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { z } from 'zod';
+import { BlockInfoSchema, deserializeBlockInfo, serializeBlockInfo } from './l2_block_info.js';
+import { CommitteeAttestation } from './proposal/committee_attestation.js';
+export const ValidateBlockResultSchema = z.union([
+    z.object({
+        valid: z.literal(true)
+    }),
+    z.object({
+        valid: z.literal(false),
+        block: BlockInfoSchema,
+        committee: z.array(schemas.EthAddress),
+        epoch: schemas.BigInt,
+        seed: schemas.BigInt,
+        attestors: z.array(schemas.EthAddress),
+        attestations: z.array(CommitteeAttestation.schema),
+        reason: z.literal('insufficient-attestations')
+    }),
+    z.object({
+        valid: z.literal(false),
+        block: BlockInfoSchema,
+        committee: z.array(schemas.EthAddress),
+        epoch: schemas.BigInt,
+        seed: schemas.BigInt,
+        attestors: z.array(schemas.EthAddress),
+        attestations: z.array(CommitteeAttestation.schema),
+        reason: z.literal('invalid-attestation'),
+        invalidIndex: z.number()
+    })
+]);
+export function serializeValidateBlockResult(result) {
+    if (result.valid) {
+        return serializeToBuffer(true);
+    }
+    const l2Block = serializeBlockInfo(result.block);
+    return serializeToBuffer(result.valid, result.reason, l2Block.length, l2Block, result.committee.length, result.committee, result.epoch, result.seed ?? 0n, result.attestors.length, result.attestors, result.attestations.length, result.attestations, result.reason === 'invalid-attestation' ? result.invalidIndex : 0);
+}
+export function deserializeValidateBlockResult(bufferOrReader) {
+    const reader = BufferReader.asReader(bufferOrReader);
+    const valid = reader.readBoolean();
+    if (valid) {
+        return {
+            valid
+        };
+    }
+    const reason = reader.readString();
+    const block = deserializeBlockInfo(reader.readBuffer());
+    const committee = reader.readVector(EthAddress);
+    const epoch = reader.readBigInt();
+    const seed = reader.readBigInt();
+    const attestors = reader.readVector(EthAddress);
+    const attestations = reader.readVector(CommitteeAttestation);
+    const invalidIndex = reader.readNumber();
+    if (reason === 'insufficient-attestations') {
+        return {
+            valid,
+            reason,
+            block,
+            committee,
+            epoch,
+            seed,
+            attestors,
+            attestations: attestations
+        };
+    } else if (reason === 'invalid-attestation') {
+        return {
+            valid,
+            reason,
+            block,
+            committee,
+            epoch,
+            seed,
+            attestors,
+            invalidIndex,
+            attestations: attestations
+        };
+    } else {
+        const _ = reason;
+        throw new Error(`Unknown reason: ${reason}`);
+    }
+}

package/dest/interfaces/archiver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/interfaces/archiver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAK9D,OAAO,EAAE,KAAK,aAAa,EAA2C,MAAM,6BAA6B,CAAC;AAE1G,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,sBAAsB,CAAC;AAK9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAOnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,MAAM,MAAM,WAAW,GAAG,IAAI,CAC5B,aAAa,GAAG,YAAY,GAAG,kBAAkB,GAAG,mBAAmB,EACvE,OAAO,GAAG,MAAM,CACjB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,WAAW,CAiDvD,CAAC"}
+{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/interfaces/archiver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAK9D,OAAO,EAAE,KAAK,aAAa,EAAgB,MAAM,6BAA6B,CAAC;AAG/E,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,sBAAsB,CAAC;AAK9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAOnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,MAAM,MAAM,WAAW,GAAG,IAAI,CAC5B,aAAa,GAAG,YAAY,GAAG,kBAAkB,GAAG,mBAAmB,EACvE,OAAO,GAAG,MAAM,CACjB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,WAAW,CAiDvD,CAAC"}

package/dest/interfaces/archiver.js

@@ -1,7 +1,8 @@
 import { z } from 'zod';
 import { L2Block } from '../block/l2_block.js';
-import { L2TipsSchema, ValidateBlockResultSchema } from '../block/l2_block_source.js';
+import { L2TipsSchema } from '../block/l2_block_source.js';
 import { PublishedL2Block } from '../block/published_l2_block.js';
+import { ValidateBlockResultSchema } from '../block/validate_block_result.js';
 import { ContractClassPublicSchema, ContractInstanceWithAddressSchema } from '../contract/index.js';
 import { L1RollupConstantsSchema } from '../epoch-helpers/index.js';
 import { LogFilterSchema } from '../logs/log_filter.js';

package/dest/interfaces/block-builder.d.ts

@@ -1,6 +1,8 @@
 import type { Fr } from '@aztec/foundation/fields';
 import type { Timer } from '@aztec/foundation/timer';
 import type { L2Block } from '../block/l2_block.js';
+import type { ChainConfig, SequencerConfig } from '../config/chain-config.js';
+import type { L1RollupConstants } from '../epoch-helpers/index.js';
 import type { Gas } from '../gas/gas.js';
 import type { MerkleTreeWriteOperations } from '../trees/index.js';
 import type { BlockHeader } from '../tx/block_header.js';
@@ -50,13 +52,10 @@ export interface BuildBlockResult {
     blockBuildingTimer: Timer;
     usedTxs: Tx[];
 }
+export type FullNodeBlockBuilderConfig = Pick<L1RollupConstants, 'l1GenesisTime' | 'slotDuration'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<SequencerConfig, 'txPublicSetupAllowList' | 'fakeProcessingDelayPerTxMs'>;
 export interface IFullNodeBlockBuilder {
-    getConfig(): {
-        l1GenesisTime: bigint;
-        slotDuration: number;
-        l1ChainId: number;
-        rollupVersion: number;
-    };
+    getConfig(): FullNodeBlockBuilderConfig;
+    updateConfig(config: Partial<FullNodeBlockBuilderConfig>): void;
     buildBlock(txs: Iterable<Tx> | AsyncIterable<Tx>, l1ToL2Messages: Fr[], globalVariables: GlobalVariables, options: PublicProcessorLimits, fork?: MerkleTreeWriteOperations): Promise<BuildBlockResult>;
     getFork(blockNumber: number): Promise<MerkleTreeWriteOperations>;
 }

package/dest/interfaces/block-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block-builder.d.ts","sourceRoot":"","sources":["../../src/interfaces/block-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,6FAA6F;AAC7F,MAAM,WAAW,aAAc,SAAQ,kBAAkB;IACvD;;;;;OAKG;IACH,aAAa,CACX,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,EAAE,EAAE,EACpB,mBAAmB,EAAE,WAAW,GAC/B,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB;;;OAGG;IACH,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1C;;OAEG;IACH,iBAAiB,CAAC,mBAAmB,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACxE;AAED,MAAM,WAAW,qBAAqB;IACpC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,EAAE,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,wBAAwB;IACvC,mBAAmB,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IACtC,cAAc,CAAC,EAAE;QAAE,aAAa,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;KAAE,CAAC;CACpE;AACD,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,GAAG,CAAC;IACf,uBAAuB,EAAE,MAAM,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,kBAAkB,EAAE,KAAK,CAAC;IAC1B,OAAO,EAAE,EAAE,EAAE,CAAC;CACf;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,IAAI;QACX,aAAa,EAAE,MAAM,CAAC;QACtB,YAAY,EAAE,MAAM,CAAC;QACrB,SAAS,EAAE,MAAM,CAAC;QAClB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;IAEF,UAAU,CACR,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,EACrC,cAAc,EAAE,EAAE,EAAE,EACpB,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,qBAAqB,EAC9B,IAAI,CAAC,EAAE,yBAAyB,GAC/B,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE7B,OAAO,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;CAClE"}
+{"version":3,"file":"block-builder.d.ts","sourceRoot":"","sources":["../../src/interfaces/block-builder.ts"],"names":[],"mappings":"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"}