feat: merge-train/spartan (#18092)

BEGIN_COMMIT_OVERRIDE
fix: pass along proof submission disabled flag (#18091)
chore: track attestation failures for all validators (#18098)
chore: fix flake (#18101)
END_COMMIT_OVERRIDE

Author: AztecBot

yarn-project/end-to-end/src/e2e_l1_publisher/e2e_l1_publisher.test.ts

@@ -725,6 +725,8 @@ describe('L1Publisher integration', () => {
     let sendRequestsResult: Awaited<ReturnType<SequencerPublisher['sendRequests']>> | null;
 
     beforeEach(async () => {
+      sendRequestsResult = null;
+
       await setup({ aztecSlotDuration: 48 });
 
       await ethCheatCodes.setAutomine(false);
@@ -743,7 +745,10 @@ describe('L1Publisher integration', () => {
       void publisher
         .sendRequests()
         .then(r => (sendRequestsResult = r ?? null))
-        .catch(err => err);
+        .catch(err => {
+          sendRequestsResult = null;
+          return err;
+        });
 
       // Wait until the publish tx is sent
       await retryUntil(() => ethCheatCodes.getTxPoolStatus().then(s => s.pending > 0), 'tx sent', 20, 0.1);
@@ -775,8 +780,6 @@ describe('L1Publisher integration', () => {
         if (nextL2Slot > initialL2Slot) {
           expect(sendRequestsResult).toBeNull();
           break;
-        } else {
-          expect(sendRequestsResult).toBeUndefined();
         }
       }
 
@@ -872,7 +875,7 @@ describe('L1Publisher integration', () => {
 
       // Wait for completion
       await retryUntil(() => !!sendRequestsResult, 'request resolved', 5, 0.1);
-      await retryUntil(() => publisher.l1TxUtils.state === TxUtilsState.MINED, 'mined', 5, 0.1);
+      await retryUntil(() => publisher.l1TxUtils.state === TxUtilsState.MINED, 'mined', 10, 0.1);
 
       // The second proposal should succeed
       expect(sendRequestsResult).not.toBeNull();

yarn-project/prover-node/src/factory.ts

@@ -181,6 +181,7 @@ export async function createProverNode(
       'txGatheringIntervalMs',
       'txGatheringTimeoutMs',
       'proverNodeFailedEpochStore',
+      'proverNodeDisableProofPublish',
       'dataDirectory',
       'l1ChainId',
       'rollupVersion',

yarn-project/telemetry-client/src/attributes.ts

@@ -126,3 +126,6 @@ export const TX_COLLECTION_METHOD = 'aztec.tx_collection.method';
 
 /** Scope of L1 transaction (sequencer, prover, or other) */
 export const L1_TX_SCOPE = 'aztec.l1_tx.scope';
+
+/** Generic error type attribute */
+export const IS_COMMITTEE_MEMBER = 'aztec.is_committee_member';

yarn-project/validator-client/src/metrics.ts

@@ -85,15 +85,17 @@ export class ValidatorMetrics {
     this.successfulAttestationsCount.add(num);
   }
 
-  public incFailedAttestationsBadProposal(num: number, reason: string) {
+  public incFailedAttestationsBadProposal(num: number, reason: string, inCommittee: boolean) {
     this.failedAttestationsBadProposalCount.add(num, {
       [Attributes.ERROR_TYPE]: reason,
+      [Attributes.IS_COMMITTEE_MEMBER]: inCommittee,
     });
   }
 
-  public incFailedAttestationsNodeIssue(num: number, reason: string) {
+  public incFailedAttestationsNodeIssue(num: number, reason: string, inCommittee: boolean) {
     this.failedAttestationsNodeIssueCount.add(num, {
       [Attributes.ERROR_TYPE]: reason,
+      [Attributes.IS_COMMITTEE_MEMBER]: inCommittee,
     });
   }
 }

yarn-project/validator-client/src/validator.ts

@@ -295,24 +295,21 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     if (!validationResult.isValid) {
       this.log.warn(`Proposal validation failed: ${validationResult.reason}`, proposalInfo);
 
-      // Only track attestation failure metrics if we're actually in the committee
-      if (partOfCommittee) {
-        const reason = validationResult.reason || 'unknown';
-        // Classify failure reason: bad proposal vs node issue
-        const badProposalReasons: BlockProposalValidationFailureReason[] = [
-          'invalid_proposal',
-          'state_mismatch',
-          'failed_txs',
-          'in_hash_mismatch',
-          'parent_block_wrong_slot',
-        ];
-
-        if (badProposalReasons.includes(reason as BlockProposalValidationFailureReason)) {
-          this.metrics.incFailedAttestationsBadProposal(1, reason);
-        } else {
-          // Node issues: parent_block_not_found, block_number_already_exists, txs_not_available, timeout, unknown_error
-          this.metrics.incFailedAttestationsNodeIssue(1, reason);
-        }
+      const reason = validationResult.reason || 'unknown';
+      // Classify failure reason: bad proposal vs node issue
+      const badProposalReasons: BlockProposalValidationFailureReason[] = [
+        'invalid_proposal',
+        'state_mismatch',
+        'failed_txs',
+        'in_hash_mismatch',
+        'parent_block_wrong_slot',
+      ];
+
+      if (badProposalReasons.includes(reason as BlockProposalValidationFailureReason)) {
+        this.metrics.incFailedAttestationsBadProposal(1, reason, partOfCommittee);
+      } else {
+        // Node issues so we can't attest
+        this.metrics.incFailedAttestationsNodeIssue(1, reason, partOfCommittee);
       }
 
       // Slash invalid block proposals (can happen even when not in committee)