@aztec/archiver 2.1.0-rc.10 → 2.1.0-rc.11

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

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/archiver/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EAEzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,iBAAiB,EAAkB,MAAM,6BAA6B,CAAC;AAErF,YAAY,EAAE,mBAAmB,EAAE,CAAC;AAEpC;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,cAAc,EAAE,gBAAgB,EAChC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,EACnD,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,CAAC,CAoF9B"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/archiver/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EACL,KAAK,gBAAgB,EAErB,KAAK,mBAAmB,EAEzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,iBAAiB,EAAkB,MAAM,6BAA6B,CAAC;AAErF,YAAY,EAAE,mBAAmB,EAAE,CAAC;AAEpC;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,cAAc,EAAE,gBAAgB,EAChC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,EACnD,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,CAAC,CA4E9B"}

package/dest/archiver/validation.js

@@ -1,12 +1,12 @@
 import { compactArray } from '@aztec/foundation/collection';
-import { getAttestationsFromPublishedL2Block } from '@aztec/stdlib/block';
+import { getAttestationInfoFromPublishedL2Block } from '@aztec/stdlib/block';
 import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
 /**
  * Validates the attestations submitted for the given block.
  * Returns true if the attestations are valid and sufficient, false otherwise.
  */ export async function validateBlockAttestations(publishedBlock, epochCache, constants, logger) {
-    const attestations = getAttestationsFromPublishedL2Block(publishedBlock);
-    const attestors = compactArray(attestations.map((a)=>a?.tryGetSender()));
+    const attestorInfos = getAttestationInfoFromPublishedL2Block(publishedBlock);
+    const attestors = compactArray(attestorInfos.map((info)=>'address' in info ? info.address : undefined));
     const { block } = publishedBlock;
     const blockHash = await block.hash().then((hash)=>hash.toString());
     const archiveRoot = block.archive.root.toString();
@@ -22,8 +22,7 @@ import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
     };
     logger?.debug(`Validating attestations for block ${block.number} at slot ${slot} in epoch ${epoch}`, {
         committee: (committee ?? []).map((member)=>member.toString()),
-        recoveredAttestors: attestors.map((member)=>member.toString()),
-        invalidAttestations: attestations.filter((a)=>a !== undefined && a.tryGetSender() === undefined).map((a)=>a?.toInspect()),
+        recoveredAttestors: attestorInfos,
         postedAttestations: publishedBlock.attestations.map((a)=>(a.address.isZero() ? a.signature : a.address).toString()),
         ...logData
     });
@@ -35,58 +34,54 @@ import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
     }
     const committeeSet = new Set(committee.map((member)=>member.toString()));
     const requiredAttestationCount = Math.floor(committee.length * 2 / 3) + 1;
-    for(let i = 0; i < attestations.length; i++){
-        const attestation = attestations[i];
-        // Skip empty signatures (undefined entries)
-        if (attestation === undefined) {
-            continue;
-        }
-        const signer = attestation.tryGetSender()?.toString();
-        if (signer !== undefined && committeeSet.has(signer)) {
-            continue;
-        }
-        if (signer === undefined) {
-            logger?.warn(`Attestation with invalid signature at slot ${slot}`, {
-                committee,
-                ...logData
-            });
-        } else {
-            logger?.warn(`Attestation from non-committee member ${signer} at slot ${slot}`, {
-                committee,
-                ...logData
-            });
-        }
-        const reason = 'invalid-attestation';
-        return {
+    const failedValidationResult = (reason)=>({
             valid: false,
             reason,
-            invalidIndex: i,
             block: publishedBlock.block.toBlockInfo(),
             committee,
             seed,
             epoch,
             attestors,
             attestations: publishedBlock.attestations
-        };
+        });
+    for(let i = 0; i < attestorInfos.length; i++){
+        const info = attestorInfos[i];
+        // Fail on invalid signatures (no address recovered)
+        if (info.status === 'invalid-signature' || info.status === 'empty') {
+            logger?.warn(`Attestation with empty or invalid signature at slot ${slot}`, {
+                committee,
+                invalidIndex: i,
+                ...logData
+            });
+            return {
+                ...failedValidationResult('invalid-attestation'),
+                invalidIndex: i
+            };
+        }
+        // Check if the attestor is in the committee
+        if (info.status === 'recovered-from-signature' || info.status === 'provided-as-address') {
+            const signer = info.address.toString();
+            if (!committeeSet.has(signer)) {
+                logger?.warn(`Attestation from non-committee member ${signer} at slot ${slot}`, {
+                    committee,
+                    invalidIndex: i,
+                    ...logData
+                });
+                return {
+                    ...failedValidationResult('invalid-attestation'),
+                    invalidIndex: i
+                };
+            }
+        }
     }
-    const validAttestationCount = compactArray(attestations).length;
+    const validAttestationCount = attestorInfos.filter((info)=>info.status === 'recovered-from-signature').length;
     if (validAttestationCount < requiredAttestationCount) {
         logger?.warn(`Insufficient attestations for block at slot ${slot}`, {
             requiredAttestations: requiredAttestationCount,
             actualAttestations: validAttestationCount,
             ...logData
         });
-        const reason = 'insufficient-attestations';
-        return {
-            valid: false,
-            reason,
-            block: publishedBlock.block.toBlockInfo(),
-            committee,
-            seed,
-            epoch,
-            attestors,
-            attestations: publishedBlock.attestations
-        };
+        return failedValidationResult('insufficient-attestations');
     }
     logger?.debug(`Block attestations validated successfully for block ${block.number} at slot ${slot}`, logData);
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/archiver",
-  "version": "2.1.0-rc.10",
+  "version": "2.1.0-rc.11",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -66,18 +66,18 @@
     ]
   },
   "dependencies": {
-    "@aztec/blob-lib": "2.1.0-rc.10",
-    "@aztec/blob-sink": "2.1.0-rc.10",
-    "@aztec/constants": "2.1.0-rc.10",
-    "@aztec/epoch-cache": "2.1.0-rc.10",
-    "@aztec/ethereum": "2.1.0-rc.10",
-    "@aztec/foundation": "2.1.0-rc.10",
-    "@aztec/kv-store": "2.1.0-rc.10",
-    "@aztec/l1-artifacts": "2.1.0-rc.10",
-    "@aztec/noir-protocol-circuits-types": "2.1.0-rc.10",
-    "@aztec/protocol-contracts": "2.1.0-rc.10",
-    "@aztec/stdlib": "2.1.0-rc.10",
-    "@aztec/telemetry-client": "2.1.0-rc.10",
+    "@aztec/blob-lib": "2.1.0-rc.11",
+    "@aztec/blob-sink": "2.1.0-rc.11",
+    "@aztec/constants": "2.1.0-rc.11",
+    "@aztec/epoch-cache": "2.1.0-rc.11",
+    "@aztec/ethereum": "2.1.0-rc.11",
+    "@aztec/foundation": "2.1.0-rc.11",
+    "@aztec/kv-store": "2.1.0-rc.11",
+    "@aztec/l1-artifacts": "2.1.0-rc.11",
+    "@aztec/noir-protocol-circuits-types": "2.1.0-rc.11",
+    "@aztec/protocol-contracts": "2.1.0-rc.11",
+    "@aztec/stdlib": "2.1.0-rc.11",
+    "@aztec/telemetry-client": "2.1.0-rc.11",
     "@spalladino/viem": "2.38.2-eip7594.0",
     "lodash.groupby": "^4.6.0",
     "lodash.omit": "^4.5.0",

package/src/archiver/validation.ts

@@ -3,8 +3,9 @@ import { compactArray } from '@aztec/foundation/collection';
 import type { Logger } from '@aztec/foundation/log';
 import {
   type PublishedL2Block,
+  type ValidateBlockNegativeResult,
   type ValidateBlockResult,
-  getAttestationsFromPublishedL2Block,
+  getAttestationInfoFromPublishedL2Block,
 } from '@aztec/stdlib/block';
 import { type L1RollupConstants, getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
 
@@ -20,8 +21,8 @@ export async function validateBlockAttestations(
   constants: Pick<L1RollupConstants, 'epochDuration'>,
   logger?: Logger,
 ): Promise<ValidateBlockResult> {
-  const attestations = getAttestationsFromPublishedL2Block(publishedBlock);
-  const attestors = compactArray(attestations.map(a => a?.tryGetSender()));
+  const attestorInfos = getAttestationInfoFromPublishedL2Block(publishedBlock);
+  const attestors = compactArray(attestorInfos.map(info => ('address' in info ? info.address : undefined)));
   const { block } = publishedBlock;
   const blockHash = await block.hash().then(hash => hash.toString());
   const archiveRoot = block.archive.root.toString();
@@ -32,10 +33,7 @@ export async function validateBlockAttestations(
 
   logger?.debug(`Validating attestations for block ${block.number} at slot ${slot} in epoch ${epoch}`, {
     committee: (committee ?? []).map(member => member.toString()),
-    recoveredAttestors: attestors.map(member => member.toString()),
-    invalidAttestations: attestations
-      .filter(a => a !== undefined && a.tryGetSender() === undefined)
-      .map(a => a?.toInspect()),
+    recoveredAttestors: attestorInfos,
     postedAttestations: publishedBlock.attestations.map(a => (a.address.isZero() ? a.signature : a.address).toString()),
     ...logData,
   });
@@ -48,57 +46,52 @@ export async function validateBlockAttestations(
   const committeeSet = new Set(committee.map(member => member.toString()));
   const requiredAttestationCount = Math.floor((committee.length * 2) / 3) + 1;
 
-  for (let i = 0; i < attestations.length; i++) {
-    const attestation = attestations[i];
+  const failedValidationResult = <TReason extends ValidateBlockNegativeResult['reason']>(reason: TReason) => ({
+    valid: false as const,
+    reason,
+    block: publishedBlock.block.toBlockInfo(),
+    committee,
+    seed,
+    epoch,
+    attestors,
+    attestations: publishedBlock.attestations,
+  });
 
-    // Skip empty signatures (undefined entries)
-    if (attestation === undefined) {
-      continue;
-    }
+  for (let i = 0; i < attestorInfos.length; i++) {
+    const info = attestorInfos[i];
 
-    const signer = attestation.tryGetSender()?.toString();
-    if (signer !== undefined && committeeSet.has(signer)) {
-      continue;
+    // Fail on invalid signatures (no address recovered)
+    if (info.status === 'invalid-signature' || info.status === 'empty') {
+      logger?.warn(`Attestation with empty or invalid signature at slot ${slot}`, {
+        committee,
+        invalidIndex: i,
+        ...logData,
+      });
+      return { ...failedValidationResult('invalid-attestation'), invalidIndex: i };
     }
 
-    if (signer === undefined) {
-      logger?.warn(`Attestation with invalid signature at slot ${slot}`, { committee, ...logData });
-    } else {
-      logger?.warn(`Attestation from non-committee member ${signer} at slot ${slot}`, { committee, ...logData });
+    // Check if the attestor is in the committee
+    if (info.status === 'recovered-from-signature' || info.status === 'provided-as-address') {
+      const signer = info.address.toString();
+      if (!committeeSet.has(signer)) {
+        logger?.warn(`Attestation from non-committee member ${signer} at slot ${slot}`, {
+          committee,
+          invalidIndex: i,
+          ...logData,
+        });
+        return { ...failedValidationResult('invalid-attestation'), invalidIndex: i };
+      }
     }
-
-    const reason = 'invalid-attestation';
-    return {
-      valid: false,
-      reason,
-      invalidIndex: i,
-      block: publishedBlock.block.toBlockInfo(),
-      committee,
-      seed,
-      epoch,
-      attestors,
-      attestations: publishedBlock.attestations,
-    };
   }
 
-  const validAttestationCount = compactArray(attestations).length;
+  const validAttestationCount = attestorInfos.filter(info => info.status === 'recovered-from-signature').length;
   if (validAttestationCount < requiredAttestationCount) {
     logger?.warn(`Insufficient attestations for block at slot ${slot}`, {
       requiredAttestations: requiredAttestationCount,
       actualAttestations: validAttestationCount,
       ...logData,
     });
-    const reason = 'insufficient-attestations';
-    return {
-      valid: false,
-      reason,
-      block: publishedBlock.block.toBlockInfo(),
-      committee,
-      seed,
-      epoch,
-      attestors,
-      attestations: publishedBlock.attestations,
-    };
+    return failedValidationResult('insufficient-attestations');
   }
 
   logger?.debug(`Block attestations validated successfully for block ${block.number} at slot ${slot}`, logData);