@aztec/stdlib 0.0.0-test.1 → 0.0.1-commit.b655e406

package/dest/block/{l2_block_downloader → l2_block_stream}/l2_block_stream.js

@@ -1,6 +1,7 @@
 import { AbortError } from '@aztec/foundation/error';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
+import { makeL2BlockId } from '../l2_block_source.js';
 /** Creates a stream of events for new blocks, chain tips updates, and reorgs, out of polling an archiver or a node. */ export class L2BlockStream {
     l2BlockSource;
     localData;
@@ -9,6 +10,7 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
     opts;
     runningPromise;
     isSyncing;
+    hasStarted;
     constructor(l2BlockSource, localData, handler, log = createLogger('types:block_stream'), opts = {}){
         this.l2BlockSource = l2BlockSource;
         this.localData = localData;
@@ -16,6 +18,7 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
         this.log = log;
         this.opts = opts;
         this.isSyncing = false;
+        this.hasStarted = false;
         this.runningPromise = new RunningPromise(()=>this.work(), log, this.opts.pollIntervalMS ?? 1000);
     }
     start() {
@@ -53,31 +56,49 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
             });
             // Check if there was a reorg and emit a chain-pruned event if so.
             let latestBlockNumber = localTips.latest.number;
+            const sourceCache = new BlockHashCache([
+                sourceTips.latest
+            ]);
             while(!await this.areBlockHashesEqualAt(latestBlockNumber, {
-                sourceCache: [
-                    sourceTips.latest
-                ]
+                sourceCache
             })){
                 latestBlockNumber--;
             }
             if (latestBlockNumber < localTips.latest.number) {
+                latestBlockNumber = Math.min(latestBlockNumber, sourceTips.latest.number); // see #13471
+                const hash = sourceCache.get(latestBlockNumber) ?? await this.getBlockHashFromSource(latestBlockNumber);
+                if (latestBlockNumber !== 0 && !hash) {
+                    throw new Error(`Block hash not found in block source for block number ${latestBlockNumber}`);
+                }
                 this.log.verbose(`Reorg detected. Pruning blocks from ${latestBlockNumber + 1} to ${localTips.latest.number}.`);
                 await this.emitEvent({
                     type: 'chain-pruned',
-                    blockNumber: latestBlockNumber
+                    block: makeL2BlockId(latestBlockNumber, hash)
                 });
             }
             // If we are just starting, use the starting block number from the options.
             if (latestBlockNumber === 0 && this.opts.startingBlock !== undefined) {
                 latestBlockNumber = Math.max(this.opts.startingBlock - 1, 0);
+            }
+            // Only log this entry once (for sanity)
+            if (!this.hasStarted) {
                 this.log.verbose(`Starting sync from block number ${latestBlockNumber}`);
+                this.hasStarted = true;
+            }
+            let nextBlockNumber = latestBlockNumber + 1;
+            if (this.opts.skipFinalized) {
+                // When skipping finalized blocks we need to provide reliable reorg detection while fetching as few blocks as
+                // possible. Finalized blocks cannot be reorged by definition, so we can skip most of them. We do need the very
+                // last finalized block however in order to guarantee that we will eventually find a block in which our local
+                // store matches the source.
+                // If the last finalized block is behind our local tip, there is nothing to skip.
+                nextBlockNumber = Math.max(sourceTips.finalized.number, nextBlockNumber);
             }
             // Request new blocks from the source.
-            while(latestBlockNumber < sourceTips.latest.number){
-                const from = latestBlockNumber + 1;
-                const limit = Math.min(this.opts.batchSize ?? 20, sourceTips.latest.number - from + 1);
-                this.log.trace(`Requesting blocks from ${from} limit ${limit} proven=${this.opts.proven}`);
-                const blocks = await this.l2BlockSource.getBlocks(from, limit, this.opts.proven);
+            while(nextBlockNumber <= sourceTips.latest.number){
+                const limit = Math.min(this.opts.batchSize ?? 50, sourceTips.latest.number - nextBlockNumber + 1);
+                this.log.trace(`Requesting blocks from ${nextBlockNumber} limit ${limit} proven=${this.opts.proven}`);
+                const blocks = await this.l2BlockSource.getPublishedBlocks(nextBlockNumber, limit, this.opts.proven);
                 if (blocks.length === 0) {
                     break;
                 }
@@ -85,21 +106,19 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
                     type: 'blocks-added',
                     blocks
                 });
-                latestBlockNumber = blocks.at(-1).number;
+                nextBlockNumber = blocks.at(-1).block.number + 1;
             }
             // Update the proven and finalized tips.
-            // TODO(palla/reorg): Should we emit this before passing the new blocks? This would allow world-state to skip
-            // building the data structures for the pending chain if it's unneeded.
             if (localTips.proven !== undefined && sourceTips.proven.number !== localTips.proven.number) {
                 await this.emitEvent({
                     type: 'chain-proven',
-                    blockNumber: sourceTips.proven.number
+                    block: sourceTips.proven
                 });
             }
             if (localTips.finalized !== undefined && sourceTips.finalized.number !== localTips.finalized.number) {
                 await this.emitEvent({
                     type: 'chain-finalized',
-                    blockNumber: sourceTips.finalized.number
+                    block: sourceTips.finalized
                 });
             }
         } catch (err) {
@@ -118,20 +137,52 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
             return true;
         }
         const localBlockHash = await this.localData.getL2BlockHash(blockNumber);
-        const sourceBlockHash = args.sourceCache.find((id)=>id.number === blockNumber && id.hash)?.hash ?? await this.l2BlockSource.getBlockHeader(blockNumber).then((h)=>h?.hash()).then((hash)=>hash?.toString());
+        if (!localBlockHash && this.opts.skipFinalized) {
+            // Failing to find a block hash when skipping finalized blocks can be highly problematic as we'd potentially need
+            // to go all the way back to the genesis block to find a block in which we agree with the source (since we've
+            // potentially skipped all history). This means that stores that prune old blocks must be careful to leave no gaps
+            // when going back from latest block to the last finalized one.
+            this.log.error(`No local block hash for block number ${blockNumber}`);
+            throw new AbortError();
+        }
+        const sourceBlockHashFromCache = args.sourceCache.get(blockNumber);
+        const sourceBlockHash = args.sourceCache.get(blockNumber) ?? await this.getBlockHashFromSource(blockNumber);
+        if (!sourceBlockHashFromCache && sourceBlockHash) {
+            args.sourceCache.add({
+                number: blockNumber,
+                hash: sourceBlockHash
+            });
+        }
         this.log.trace(`Comparing block hashes for block ${blockNumber}`, {
             localBlockHash,
-            sourceBlockHash,
-            sourceCacheNumber: args.sourceCache[0]?.number,
-            sourceCacheHash: args.sourceCache[0]?.hash
+            sourceBlockHash
         });
         return localBlockHash === sourceBlockHash;
     }
+    getBlockHashFromSource(blockNumber) {
+        return this.l2BlockSource.getBlockHeader(blockNumber).then((h)=>h?.hash()).then((hash)=>hash?.toString());
+    }
     async emitEvent(event) {
-        this.log.debug(`Emitting ${event.type} (${event.type === 'blocks-added' ? event.blocks.length : event.blockNumber})`);
+        this.log.debug(`Emitting ${event.type} (${event.type === 'blocks-added' ? event.blocks.length : event.block.number})`);
         await this.handler.handleBlockStreamEvent(event);
         if (!this.isRunning() && !this.isSyncing) {
             throw new AbortError();
         }
     }
 }
+class BlockHashCache {
+    cache = new Map();
+    constructor(initial = []){
+        for (const block of initial){
+            this.add(block);
+        }
+    }
+    add(block) {
+        if (block.hash) {
+            this.cache.set(block.number, block.hash);
+        }
+    }
+    get(blockNumber) {
+        return this.cache.get(blockNumber);
+    }
+}

package/dest/block/l2_block_stream/l2_tips_memory_store.d.ts

@@ -0,0 +1,18 @@
+import type { L2Block } from '../l2_block.js';
+import type { L2BlockId, L2BlockTag, L2Tips } from '../l2_block_source.js';
+import type { L2BlockStreamEvent, L2BlockStreamEventHandler, L2BlockStreamLocalDataProvider } from './interfaces.js';
+/**
+ * Stores currently synced L2 tips and unfinalized block hashes.
+ * @dev tests in kv-store/src/stores/l2_tips_memory_store.test.ts
+ */
+export declare class L2TipsMemoryStore implements L2BlockStreamEventHandler, L2BlockStreamLocalDataProvider {
+    protected readonly l2TipsStore: Map<L2BlockTag, number>;
+    protected readonly l2BlockHashesStore: Map<number, string>;
+    getL2BlockHash(number: number): Promise<string | undefined>;
+    getL2Tips(): Promise<L2Tips>;
+    private getL2Tip;
+    handleBlockStreamEvent(event: L2BlockStreamEvent): Promise<void>;
+    protected saveTag(name: L2BlockTag, block: L2BlockId): void;
+    protected computeBlockHash(block: L2Block): Promise<`0x${string}`>;
+}
+//# sourceMappingURL=l2_tips_memory_store.d.ts.map

package/dest/block/l2_block_stream/l2_tips_memory_store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"l2_tips_memory_store.d.ts","sourceRoot":"","sources":["../../../src/block/l2_block_stream/l2_tips_memory_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAC;AAErH;;;GAGG;AACH,qBAAa,iBAAkB,YAAW,yBAAyB,EAAE,8BAA8B;IACjG,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAa;IACpE,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEhE,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI3D,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAQnC,OAAO,CAAC,QAAQ;IAaH,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B7E,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS;IAOpD,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO;CAG1C"}

package/dest/block/l2_block_stream/l2_tips_memory_store.js

@@ -0,0 +1,70 @@
+/**
+ * Stores currently synced L2 tips and unfinalized block hashes.
+ * @dev tests in kv-store/src/stores/l2_tips_memory_store.test.ts
+ */ export class L2TipsMemoryStore {
+    l2TipsStore = new Map();
+    l2BlockHashesStore = new Map();
+    getL2BlockHash(number) {
+        return Promise.resolve(this.l2BlockHashesStore.get(number));
+    }
+    getL2Tips() {
+        return Promise.resolve({
+            latest: this.getL2Tip('latest'),
+            finalized: this.getL2Tip('finalized'),
+            proven: this.getL2Tip('proven')
+        });
+    }
+    getL2Tip(tag) {
+        const blockNumber = this.l2TipsStore.get(tag);
+        if (blockNumber === undefined || blockNumber === 0) {
+            return {
+                number: 0,
+                hash: undefined
+            };
+        }
+        const blockHash = this.l2BlockHashesStore.get(blockNumber);
+        if (!blockHash) {
+            throw new Error(`Block hash not found for block number ${blockNumber}`);
+        }
+        return {
+            number: blockNumber,
+            hash: blockHash
+        };
+    }
+    async handleBlockStreamEvent(event) {
+        switch(event.type){
+            case 'blocks-added':
+                {
+                    const blocks = event.blocks.map((b)=>b.block);
+                    for (const block of blocks){
+                        this.l2BlockHashesStore.set(block.number, await this.computeBlockHash(block));
+                    }
+                    this.l2TipsStore.set('latest', blocks.at(-1).number);
+                    break;
+                }
+            case 'chain-pruned':
+                this.saveTag('latest', event.block);
+                break;
+            case 'chain-proven':
+                this.saveTag('proven', event.block);
+                break;
+            case 'chain-finalized':
+                this.saveTag('finalized', event.block);
+                for (const key of this.l2BlockHashesStore.keys()){
+                    if (key < event.block.number) {
+                        this.l2BlockHashesStore.delete(key);
+                    }
+                }
+                break;
+        }
+    }
+    saveTag(name, block) {
+        this.l2TipsStore.set(name, block.number);
+        if (block.hash) {
+            this.l2BlockHashesStore.set(block.number, block.hash);
+        }
+    }
+    computeBlockHash(block) {
+        return block.hash().then((hash)=>hash.toString());
+    }
+}

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/committee_attestation.d.ts

@@ -0,0 +1,36 @@
+import type { ViemCommitteeAttestation, ViemCommitteeAttestations } from '@aztec/ethereum';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Signature } from '@aztec/foundation/eth-signature';
+import { BufferReader } from '@aztec/foundation/serialize';
+import { z } from 'zod';
+export { EthAddress, Signature };
+export declare class CommitteeAttestation {
+    readonly address: EthAddress;
+    readonly signature: Signature;
+    constructor(address: EthAddress, signature: Signature);
+    static get schema(): 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>, Signature, string>;
+    }, "strip", z.ZodTypeAny, {
+        address: EthAddress;
+        signature: Signature;
+    }, {
+        address: string;
+        signature: string;
+    }>, CommitteeAttestation, {
+        address: string;
+        signature: string;
+    }>;
+    static fromAddress(address: EthAddress): CommitteeAttestation;
+    static fromAddressAndSignature(address: EthAddress, signature: Signature): CommitteeAttestation;
+    static fromSignature(signature: Signature): CommitteeAttestation;
+    static fromViem(viem: ViemCommitteeAttestation): CommitteeAttestation;
+    static fromBuffer(buffer: Buffer | BufferReader): CommitteeAttestation;
+    static random(): CommitteeAttestation;
+    static empty(): CommitteeAttestation;
+    static fromPacked(packed: ViemCommitteeAttestations, committeeSize: number): CommitteeAttestation[];
+    toBuffer(): Buffer;
+    equals(other: CommitteeAttestation): boolean;
+    toViem(): ViemCommitteeAttestation;
+}
+//# sourceMappingURL=committee_attestation.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"committee_attestation.d.ts","sourceRoot":"","sources":["../../../src/block/proposal/committee_attestation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC3F,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;AAEjC,qBAAa,oBAAoB;aAEb,OAAO,EAAE,UAAU;aACnB,SAAS,EAAE,SAAS;gBADpB,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,SAAS;IAGtC,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAGD,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,UAAU,GAAG,oBAAoB;IAK7D,MAAM,CAAC,uBAAuB,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,GAAG,oBAAoB;IAI/F,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,oBAAoB;IAIhE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,wBAAwB,GAAG,oBAAoB;IAIrE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,oBAAoB;IAOtE,MAAM,CAAC,MAAM,IAAI,oBAAoB;IAKrC,MAAM,CAAC,KAAK,IAAI,oBAAoB;IAIpC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,yBAAyB,EAAE,aAAa,EAAE,MAAM,GAAG,oBAAoB,EAAE;IA+CnG,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO;IAI5C,MAAM,IAAI,wBAAwB;CAMnC"}

package/dest/block/proposal/committee_attestation.js

@@ -0,0 +1,101 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Signature } from '@aztec/foundation/eth-signature';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { z } from 'zod';
+export { EthAddress, Signature };
+export class CommitteeAttestation {
+    address;
+    signature;
+    constructor(address, signature){
+        this.address = address;
+        this.signature = signature;
+    }
+    static get schema() {
+        return z.object({
+            address: EthAddress.schema,
+            signature: Signature.schema
+        }).transform(({ address, signature })=>new CommitteeAttestation(address, signature));
+    }
+    // Create an empty attestation for an address that has not signed
+    static fromAddress(address) {
+        return new CommitteeAttestation(address, Signature.empty());
+    }
+    // Create an attestation from an address and a signature
+    static fromAddressAndSignature(address, signature) {
+        return new CommitteeAttestation(address, signature);
+    }
+    static fromSignature(signature) {
+        return new CommitteeAttestation(EthAddress.ZERO, signature);
+    }
+    static fromViem(viem) {
+        return new CommitteeAttestation(EthAddress.fromString(viem.addr), Signature.fromViemSignature(viem.signature));
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        const address = reader.readObject(EthAddress);
+        const signature = reader.readObject(Signature);
+        return new CommitteeAttestation(address, signature);
+    }
+    static random() {
+        // note: will be invalid
+        return new CommitteeAttestation(EthAddress.random(), Signature.random());
+    }
+    static empty() {
+        return new CommitteeAttestation(EthAddress.ZERO, Signature.empty());
+    }
+    static fromPacked(packed, committeeSize) {
+        const signatureIndicesBuffer = Buffer.from(packed.signatureIndices.slice(2), 'hex');
+        const dataBuffer = Buffer.from(packed.signaturesOrAddresses.slice(2), 'hex');
+        const attestations = [];
+        let dataIndex = 0;
+        for(let i = 0; i < committeeSize; i++){
+            // Check if this position has a signature
+            const byteIndex = Math.floor(i / 8);
+            const bitIndex = 7 - i % 8;
+            const hasSignature = byteIndex < signatureIndicesBuffer.length && (signatureIndicesBuffer[byteIndex] & 1 << bitIndex) !== 0;
+            if (hasSignature) {
+                // Extract signature: v (1 byte) + r (32 bytes) + s (32 bytes)
+                if (dataIndex + 65 > dataBuffer.length) {
+                    throw new Error(`Insufficient data for signature at position ${i}`);
+                }
+                const v = dataBuffer[dataIndex];
+                const r = `0x${dataBuffer.subarray(dataIndex + 1, dataIndex + 33).toString('hex')}`;
+                const s = `0x${dataBuffer.subarray(dataIndex + 33, dataIndex + 65).toString('hex')}`;
+                const signature = Signature.fromViemSignature({
+                    r,
+                    s,
+                    v
+                });
+                // For signed attestations, we use a zero address as the address is recovered from the signature
+                attestations.push(new CommitteeAttestation(EthAddress.ZERO, signature));
+                dataIndex += 65;
+            } else {
+                // Extract address (20 bytes)
+                if (dataIndex + 20 > dataBuffer.length) {
+                    throw new Error(`Insufficient data for address at position ${i}`);
+                }
+                const addressBytes = dataBuffer.subarray(dataIndex, dataIndex + 20);
+                const address = EthAddress.fromString(`0x${addressBytes.toString('hex')}`);
+                // For address-only attestations, use empty signature
+                attestations.push(new CommitteeAttestation(address, Signature.empty()));
+                dataIndex += 20;
+            }
+        }
+        return attestations;
+    }
+    toBuffer() {
+        return serializeToBuffer([
+            this.address,
+            this.signature
+        ]);
+    }
+    equals(other) {
+        return this.address.equals(other.address) && this.signature.equals(other.signature);
+    }
+    toViem() {
+        return {
+            addr: this.address.toString(),
+            signature: this.signature.toViemSignature()
+        };
+    }
+}

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

@@ -0,0 +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

@@ -0,0 +1 @@
+{"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

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