@aztec/sequencer-client 0.0.1-commit.96bb3f7 → 0.0.1-commit.993d52e

package/dest/sequencer/checkpoint_proposal_job.js

@@ -436,21 +436,25 @@ function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
     return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
 }
 var _dec, _dec1, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _initProto;
+import { NUM_CHECKPOINT_END_MARKER_FIELDS, getNumBlockEndBlobFields } from '@aztec/blob-lib/encoding';
 import { BLOBS_PER_CHECKPOINT, FIELDS_PER_BLOB } from '@aztec/constants';
-import { BlockNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
 import { randomInt } from '@aztec/foundation/crypto/random';
-import { Signature } from '@aztec/foundation/eth-signature';
+import { flipSignature, generateRecoverableSignature, generateUnrecoverableSignature } from '@aztec/foundation/crypto/secp256k1-signer';
 import { filter } from '@aztec/foundation/iterator';
+import { createLogger } from '@aztec/foundation/log';
 import { sleep, sleepUntil } from '@aztec/foundation/sleep';
 import { Timer } from '@aztec/foundation/timer';
-import { unfreeze } from '@aztec/foundation/types';
+import { isErrorClass, unfreeze } from '@aztec/foundation/types';
 import { CommitteeAttestationsAndSigners, MaliciousCommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
 import { getSlotStartBuildTimestamp } from '@aztec/stdlib/epoch-helpers';
 import { Gas } from '@aztec/stdlib/gas';
+import { NoValidTxsError } from '@aztec/stdlib/interfaces/server';
 import { computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
-import { orderAttestations } from '@aztec/stdlib/p2p';
+import { orderAttestations, trimAttestations } from '@aztec/stdlib/p2p';
 import { AttestationTimeoutError } from '@aztec/stdlib/validators';
 import { Attributes, trackSpan } from '@aztec/telemetry-client';
+import { DutyAlreadySignedError, SlashingProtectionError } from '@aztec/validator-ha-signer/errors';
 import { CheckpointVoter } from './checkpoint_voter.js';
 import { SequencerInterruptedError } from './errors.js';
 import { SequencerState } from './utils.js';
@@ -468,6 +472,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
  * as well as enqueueing votes for slashing and governance proposals. This class is created from
  * the Sequencer once the check for being the proposer for the slot has succeeded.
  */ export class CheckpointProposalJob {
+    epoch;
     slot;
     checkpointNumber;
     syncedToBlockNumber;
@@ -480,6 +485,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
     p2pClient;
     worldState;
     l1ToL2MessageSource;
+    l2BlockSource;
     checkpointsBuilder;
     blockSink;
     l1Constants;
@@ -491,7 +497,6 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
     metrics;
     eventEmitter;
     setStateFn;
-    log;
     tracer;
     static{
         ({ e: [_initProto] } = _apply_decs_2203_r(this, [
@@ -537,8 +542,10 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
             ]
         ], []));
     }
-    constructor(slot, checkpointNumber, syncedToBlockNumber, // TODO(palla/mbps): Can we remove the proposer in favor of attestorAddress? Need to check fisherman-node flows.
-    proposer, publisher, attestorAddress, invalidateCheckpoint, validatorClient, globalsBuilder, p2pClient, worldState, l1ToL2MessageSource, checkpointsBuilder, blockSink, l1Constants, config, timetable, slasherClient, epochCache, dateProvider, metrics, eventEmitter, setStateFn, log, tracer){
+    log;
+    constructor(epoch, slot, checkpointNumber, syncedToBlockNumber, // TODO(palla/mbps): Can we remove the proposer in favor of attestorAddress? Need to check fisherman-node flows.
+    proposer, publisher, attestorAddress, invalidateCheckpoint, validatorClient, globalsBuilder, p2pClient, worldState, l1ToL2MessageSource, l2BlockSource, checkpointsBuilder, blockSink, l1Constants, config, timetable, slasherClient, epochCache, dateProvider, metrics, eventEmitter, setStateFn, tracer, bindings){
+        this.epoch = epoch;
         this.slot = slot;
         this.checkpointNumber = checkpointNumber;
         this.syncedToBlockNumber = syncedToBlockNumber;
@@ -551,6 +558,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
         this.p2pClient = p2pClient;
         this.worldState = worldState;
         this.l1ToL2MessageSource = l1ToL2MessageSource;
+        this.l2BlockSource = l2BlockSource;
         this.checkpointsBuilder = checkpointsBuilder;
         this.blockSink = blockSink;
         this.l1Constants = l1Constants;
@@ -562,9 +570,12 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
         this.metrics = metrics;
         this.eventEmitter = eventEmitter;
         this.setStateFn = setStateFn;
-        this.log = log;
         this.tracer = tracer;
         _initProto(this);
+        this.log = createLogger('sequencer:checkpoint-proposal', {
+            ...bindings,
+            instanceId: `slot-${slot}`
+        });
     }
     /**
    * Executes the checkpoint proposal job.
@@ -579,7 +590,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
         // Wait until the voting promises have resolved, so all requests are enqueued (not sent)
         await Promise.all(votesPromises);
         if (checkpoint) {
-            this.metrics.recordBlockProposalSuccess();
+            this.metrics.recordCheckpointProposalSuccess();
         }
         // Do not post anything to L1 if we are fishermen, but do perform L1 fee analysis
         if (this.config.fishermanMode) {
@@ -628,11 +639,15 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                 // Collect L1 to L2 messages for the checkpoint and compute their hash
                 const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(this.checkpointNumber);
                 const inHash = computeInHashFromL1ToL2Messages(l1ToL2Messages);
+                // Collect the out hashes of all the checkpoints before this one in the same epoch
+                const previousCheckpointOutHashes = (await this.l2BlockSource.getCheckpointsDataForEpoch(this.epoch)).filter((c)=>c.checkpointNumber < this.checkpointNumber).map((c)=>c.checkpointOutHash);
+                // Get the fee asset price modifier from the oracle
+                const feeAssetPriceModifier = await this.publisher.getFeeAssetPriceModifier();
                 const fork = _ts_add_disposable_resource(env, await this.worldState.fork(this.syncedToBlockNumber, {
                     closeDelayMs: 12_000
-                }), false);
+                }), true);
                 // Create checkpoint builder for the entire slot
-                const checkpointBuilder = await this.checkpointsBuilder.startCheckpoint(this.checkpointNumber, checkpointGlobalVariables, l1ToL2Messages, fork);
+                const checkpointBuilder = await this.checkpointsBuilder.startCheckpoint(this.checkpointNumber, checkpointGlobalVariables, feeAssetPriceModifier, l1ToL2Messages, previousCheckpointOutHashes, fork, this.log.getBindings());
                 // Options for the validator client when creating block and checkpoint proposals
                 const blockProposalOptions = {
                     publishFullTxs: !!this.config.publishTxsWithProposals,
@@ -642,8 +657,23 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                     publishFullTxs: !!this.config.publishTxsWithProposals,
                     broadcastInvalidCheckpointProposal: this.config.broadcastInvalidBlockProposal
                 };
-                // Main loop: build blocks for the checkpoint
-                const { blocksInCheckpoint, blockPendingBroadcast } = await this.buildBlocksForCheckpoint(checkpointBuilder, checkpointGlobalVariables.timestamp, inHash, blockProposalOptions);
+                let blocksInCheckpoint = [];
+                let blockPendingBroadcast = undefined;
+                const checkpointBuildTimer = new Timer();
+                try {
+                    // Main loop: build blocks for the checkpoint
+                    const result = await this.buildBlocksForCheckpoint(checkpointBuilder, checkpointGlobalVariables.timestamp, inHash, blockProposalOptions);
+                    blocksInCheckpoint = result.blocksInCheckpoint;
+                    blockPendingBroadcast = result.blockPendingBroadcast;
+                } catch (err) {
+                    // These errors are expected in HA mode, so we yield and let another HA node handle the slot
+                    // The only distinction between the 2 errors is SlashingProtectionError throws when the payload is different,
+                    // which is normal for block building (may have picked different txs)
+                    if (this.handleHASigningError(err, 'Block proposal')) {
+                        return undefined;
+                    }
+                    throw err;
+                }
                 if (blocksInCheckpoint.length === 0) {
                     this.log.warn(`No blocks were built for slot ${this.slot}`, {
                         slot: this.slot
@@ -653,10 +683,21 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                     });
                     return undefined;
                 }
+                const minBlocksForCheckpoint = this.config.minBlocksForCheckpoint;
+                if (minBlocksForCheckpoint !== undefined && blocksInCheckpoint.length < minBlocksForCheckpoint) {
+                    this.log.warn(`Checkpoint has fewer blocks than minimum (${blocksInCheckpoint.length} < ${minBlocksForCheckpoint}), skipping proposal`, {
+                        slot: this.slot,
+                        blocksBuilt: blocksInCheckpoint.length,
+                        minBlocksForCheckpoint
+                    });
+                    return undefined;
+                }
                 // Assemble and broadcast the checkpoint proposal, including the last block that was not
                 // broadcasted yet, and wait to collect the committee attestations.
                 this.setStateFn(SequencerState.ASSEMBLING_CHECKPOINT, this.slot);
                 const checkpoint = await checkpointBuilder.completeCheckpoint();
+                // Record checkpoint-level build metrics
+                this.metrics.recordCheckpointBuild(checkpointBuildTimer.ms(), blocksInCheckpoint.length, checkpoint.getStats().txCount, Number(checkpoint.header.totalManaUsed.toBigInt()));
                 // Do not collect attestations nor publish to L1 in fisherman mode
                 if (this.config.fishermanMode) {
                     this.log.info(`Built checkpoint for slot ${this.slot} with ${blocksInCheckpoint.length} blocks. ` + `Skipping proposal in fisherman mode.`, {
@@ -674,7 +715,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                     txs: blockPendingBroadcast.txs
                 };
                 // Create the checkpoint proposal and broadcast it
-                const proposal = await this.validatorClient.createCheckpointProposal(checkpoint.header, checkpoint.archive.root, lastBlock, this.proposer, checkpointProposalOptions);
+                const proposal = await this.validatorClient.createCheckpointProposal(checkpoint.header, checkpoint.archive.root, feeAssetPriceModifier, lastBlock, this.proposer, checkpointProposalOptions);
                 const blockProposedAt = this.dateProvider.now();
                 await this.p2pClient.broadcastCheckpointProposal(proposal);
                 this.setStateFn(SequencerState.COLLECTING_ATTESTATIONS, this.slot);
@@ -683,12 +724,30 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                 this.metrics.recordCheckpointAttestationDelay(blockAttestedAt - blockProposedAt);
                 // Proposer must sign over the attestations before pushing them to L1
                 const signer = this.proposer ?? this.publisher.getSenderAddress();
-                const attestationsSignature = await this.validatorClient.signAttestationsAndSigners(attestations, signer);
+                let attestationsSignature;
+                try {
+                    attestationsSignature = await this.validatorClient.signAttestationsAndSigners(attestations, signer, this.slot, this.checkpointNumber);
+                } catch (err) {
+                    // We shouldn't really get here since we yield to another HA node
+                    // as soon as we see these errors when creating block or checkpoint proposals.
+                    if (this.handleHASigningError(err, 'Attestations signature')) {
+                        return undefined;
+                    }
+                    throw err;
+                }
                 // Enqueue publishing the checkpoint to L1
                 this.setStateFn(SequencerState.PUBLISHING_CHECKPOINT, this.slot);
                 const aztecSlotDuration = this.l1Constants.slotDuration;
                 const slotStartBuildTimestamp = this.getSlotStartBuildTimestamp();
                 const txTimeoutAt = new Date((slotStartBuildTimestamp + aztecSlotDuration) * 1000);
+                // If we have been configured to potentially skip publishing checkpoint then roll the dice here
+                if (this.config.skipPublishingCheckpointsPercent !== undefined && this.config.skipPublishingCheckpointsPercent > 0) {
+                    const result = Math.max(0, randomInt(100));
+                    if (result < this.config.skipPublishingCheckpointsPercent) {
+                        this.log.warn(`Skipping publishing proposal for checkpoint ${checkpoint.number}. Configured percentage: ${this.config.skipPublishingCheckpointsPercent}, generated value: ${result}`);
+                        return checkpoint;
+                    }
+                }
                 await this.publisher.enqueueProposeCheckpoint(checkpoint, attestations, attestationsSignature, {
                     txTimeoutAt,
                     forcePendingCheckpointNumber: this.invalidateCheckpoint?.forcePendingCheckpointNumber
@@ -698,9 +757,14 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                 env.error = e;
                 env.hasError = true;
             } finally{
-                _ts_dispose_resources(env);
+                const result = _ts_dispose_resources(env);
+                if (result) await result;
             }
         } catch (err) {
+            if (err && (err instanceof DutyAlreadySignedError || err instanceof SlashingProtectionError)) {
+                // swallow this error. It's already been logged by a function deeper in the stack
+                return undefined;
+            }
             this.log.error(`Error building checkpoint at slot ${this.slot}`, err);
             return undefined;
         }
@@ -711,11 +775,13 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
         const blocksInCheckpoint = [];
         const txHashesAlreadyIncluded = new Set();
         const initialBlockNumber = BlockNumber(this.syncedToBlockNumber + 1);
+        // Remaining blob fields available for blocks (checkpoint end marker already subtracted)
+        let remainingBlobFields = BLOBS_PER_CHECKPOINT * FIELDS_PER_BLOB - NUM_CHECKPOINT_END_MARKER_FIELDS;
         // Last block in the checkpoint will usually be flagged as pending broadcast, so we send it along with the checkpoint proposal
         let blockPendingBroadcast = undefined;
         while(true){
             const blocksBuilt = blocksInCheckpoint.length;
-            const indexWithinCheckpoint = blocksBuilt;
+            const indexWithinCheckpoint = IndexWithinCheckpoint(blocksBuilt);
             const blockNumber = BlockNumber(initialBlockNumber + blocksBuilt);
             const secondsIntoSlot = this.getSecondsIntoSlot();
             const timingInfo = this.timetable.canStartNextBlock(secondsIntoSlot);
@@ -736,8 +802,10 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                 buildDeadline: timingInfo.deadline ? new Date((this.getSlotStartBuildTimestamp() + timingInfo.deadline) * 1000) : undefined,
                 blockNumber,
                 indexWithinCheckpoint,
-                txHashesAlreadyIncluded
+                txHashesAlreadyIncluded,
+                remainingBlobFields
             });
+            // TODO(palla/mbps): Review these conditions. We may want to keep trying in some scenarios.
             if (!buildResult && timingInfo.isLastBlock) {
                 break;
             } else if (!buildResult && timingInfo.deadline !== undefined) {
@@ -757,12 +825,21 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                 }
                 break;
             }
-            const { block, usedTxs } = buildResult;
+            const { block, usedTxs, remainingBlobFields: newRemainingBlobFields } = buildResult;
             blocksInCheckpoint.push(block);
+            // Update remaining blob fields for the next block
+            remainingBlobFields = newRemainingBlobFields;
             // Sync the proposed block to the archiver to make it available
             // Note that the checkpoint builder uses its own fork so it should not need to wait for this syncing
             // Eventually we should refactor the checkpoint builder to not need a separate long-lived fork
-            await this.syncProposedBlockToArchiver(block);
+            // Fire and forget - don't block the critical path, but log errors
+            this.syncProposedBlockToArchiver(block).catch((err)=>{
+                this.log.error(`Failed to sync proposed block ${block.number} to archiver`, {
+                    blockNumber: block.number,
+                    err
+                });
+            });
+            usedTxs.forEach((tx)=>txHashesAlreadyIncluded.add(tx.txHash.toString()));
             // If this is the last block, exit the loop now so we start collecting attestations
             if (timingInfo.isLastBlock) {
                 this.log.verbose(`Completed final block ${blockNumber} for slot ${this.slot}`, {
@@ -802,7 +879,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
         await this.waitUntilTimeInSlot(nextSubslotStart);
     }
     /** Builds a single block. Called from the main block building loop. */ async buildSingleBlock(checkpointBuilder, opts) {
-        const { blockTimestamp, forceCreate, blockNumber, indexWithinCheckpoint, buildDeadline, txHashesAlreadyIncluded } = opts;
+        const { blockTimestamp, forceCreate, blockNumber, indexWithinCheckpoint, buildDeadline, txHashesAlreadyIncluded, remainingBlobFields } = opts;
         this.log.verbose(`Preparing block ${blockNumber} index ${indexWithinCheckpoint} at checkpoint ${this.checkpointNumber} for slot ${this.slot}`, {
             ...checkpointBuilder.getConstantData(),
             ...opts
@@ -827,50 +904,53 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
             }
             // Create iterator to pending txs. We filter out txs already included in previous blocks in the checkpoint
             // just in case p2p failed to sync the provisional block and didn't get to remove those txs from the mempool yet.
-            const pendingTxs = filter(this.p2pClient.iteratePendingTxs(), (tx)=>!txHashesAlreadyIncluded.has(tx.txHash.toString()));
+            const pendingTxs = filter(this.p2pClient.iterateEligiblePendingTxs(), (tx)=>!txHashesAlreadyIncluded.has(tx.txHash.toString()));
             this.log.debug(`Building block ${blockNumber} at index ${indexWithinCheckpoint} for slot ${this.slot} with ${availableTxs} available txs`, {
                 slot: this.slot,
                 blockNumber,
                 indexWithinCheckpoint
             });
             this.setStateFn(SequencerState.CREATING_BLOCK, this.slot);
+            // Calculate blob fields limit for txs (remaining capacity - this block's end overhead)
+            const blockEndOverhead = getNumBlockEndBlobFields(indexWithinCheckpoint === 0);
+            const maxBlobFieldsForTxs = remainingBlobFields - blockEndOverhead;
             const blockBuilderOptions = {
                 maxTransactions: this.config.maxTxsPerBlock,
                 maxBlockSize: this.config.maxBlockSizeInBytes,
                 maxBlockGas: new Gas(this.config.maxDABlockGas, this.config.maxL2BlockGas),
-                maxBlobFields: BLOBS_PER_CHECKPOINT * FIELDS_PER_BLOB,
+                maxBlobFields: maxBlobFieldsForTxs,
                 deadline: buildDeadline
             };
             // Actually build the block by executing txs
-            const workTimer = new Timer();
-            const { publicGas, block, publicProcessorDuration, numTxs, blockBuildingTimer, usedTxs, failedTxs } = await checkpointBuilder.buildBlock(pendingTxs, blockNumber, blockTimestamp, blockBuilderOptions);
-            const blockBuildDuration = workTimer.ms();
+            const buildResult = await this.buildSingleBlockWithCheckpointBuilder(checkpointBuilder, pendingTxs, blockNumber, blockTimestamp, blockBuilderOptions);
             // If any txs failed during execution, drop them from the mempool so we don't pick them up again
-            await this.dropFailedTxsFromP2P(failedTxs);
+            await this.dropFailedTxsFromP2P(buildResult.failedTxs);
             // Check if we have created a block with enough txs. If there were invalid txs in the pool, or if execution took
             // too long, then we may not get to minTxsPerBlock after executing public functions.
             const minValidTxs = this.config.minValidTxsPerBlock ?? minTxs;
-            if (!forceCreate && numTxs < minValidTxs) {
-                this.log.warn(`Block ${blockNumber} at index ${indexWithinCheckpoint} on slot ${this.slot} has too few valid txs to be proposed (got ${numTxs} but required ${minValidTxs})`, {
+            const numTxs = buildResult.status === 'no-valid-txs' ? 0 : buildResult.numTxs;
+            if (buildResult.status === 'no-valid-txs' || !forceCreate && numTxs < minValidTxs) {
+                this.log.warn(`Block ${blockNumber} at index ${indexWithinCheckpoint} on slot ${this.slot} has too few valid txs to be proposed`, {
                     slot: this.slot,
                     blockNumber,
                     numTxs,
-                    indexWithinCheckpoint
+                    indexWithinCheckpoint,
+                    minValidTxs,
+                    buildResult: buildResult.status
                 });
-                this.eventEmitter.emit('block-tx-count-check-failed', {
-                    minTxs: minValidTxs,
-                    availableTxs: numTxs,
+                this.eventEmitter.emit('block-build-failed', {
+                    reason: `Insufficient valid txs`,
                     slot: this.slot
                 });
                 this.metrics.recordBlockProposalFailed('insufficient_valid_txs');
                 return undefined;
             }
             // Block creation succeeded, emit stats and metrics
+            const { publicGas, block, publicProcessorDuration, usedTxs, usedTxBlobFields, blockBuildDuration } = buildResult;
             const blockStats = {
                 eventName: 'l2-block-built',
                 duration: blockBuildDuration,
                 publicProcessDuration: publicProcessorDuration,
-                rollupCircuitsDuration: blockBuildingTimer.ms(),
                 ...block.getStats()
             };
             const blockHash = await block.hash();
@@ -889,7 +969,8 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
             this.metrics.recordBuiltBlock(blockBuildDuration, publicGas.l2Gas);
             return {
                 block,
-                usedTxs
+                usedTxs,
+                remainingBlobFields: maxBlobFieldsForTxs - usedTxBlobFields
             };
         } catch (err) {
             this.eventEmitter.emit('block-build-failed', {
@@ -907,9 +988,30 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
             };
         }
     }
+    /** Uses the checkpoint builder to build a block, catching specific txs */ async buildSingleBlockWithCheckpointBuilder(checkpointBuilder, pendingTxs, blockNumber, blockTimestamp, blockBuilderOptions) {
+        try {
+            const workTimer = new Timer();
+            const result = await checkpointBuilder.buildBlock(pendingTxs, blockNumber, blockTimestamp, blockBuilderOptions);
+            const blockBuildDuration = workTimer.ms();
+            return {
+                ...result,
+                blockBuildDuration,
+                status: 'success'
+            };
+        } catch (err) {
+            if (isErrorClass(err, NoValidTxsError)) {
+                return {
+                    failedTxs: err.failedTxs,
+                    status: 'no-valid-txs'
+                };
+            }
+            throw err;
+        }
+    }
     /** Waits until minTxs are available on the pool for building a block. */ async waitForMinTxs(opts) {
-        const minTxs = this.config.minTxsPerBlock;
         const { indexWithinCheckpoint, blockNumber, buildDeadline, forceCreate } = opts;
+        // We only allow a block with 0 txs in the first block of the checkpoint
+        const minTxs = indexWithinCheckpoint > 0 && this.config.minTxsPerBlock === 0 ? 1 : this.config.minTxsPerBlock;
         // Deadline is undefined if we are not enforcing the timetable, meaning we'll exit immediately when out of time
         const startBuildingDeadline = buildDeadline ? new Date(buildDeadline.getTime() - this.timetable.minExecutionTime * 1000) : undefined;
         let availableTxs = await this.p2pClient.getPendingTxCount();
@@ -929,7 +1031,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                 slot: this.slot,
                 indexWithinCheckpoint
             });
-            await sleep(TXS_POLLING_MS);
+            await this.waitForTxsPollingInterval();
             availableTxs = await this.p2pClient.getPendingTxCount();
         }
         return {
@@ -964,17 +1066,23 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
             return new CommitteeAttestationsAndSigners(orderAttestations(attestations ?? [], committee));
         }
         const attestationTimeAllowed = this.config.enforceTimeTable ? this.timetable.getMaxAllowedTime(SequencerState.PUBLISHING_CHECKPOINT) : this.l1Constants.slotDuration;
-        const attestationDeadline = new Date(this.dateProvider.now() + attestationTimeAllowed * 1000);
+        const attestationDeadline = new Date((this.getSlotStartBuildTimestamp() + attestationTimeAllowed) * 1000);
         this.metrics.recordRequiredAttestations(numberOfRequiredAttestations, attestationTimeAllowed);
         const collectAttestationsTimer = new Timer();
         let collectedAttestationsCount = 0;
         try {
             const attestations = await this.validatorClient.collectAttestations(proposal, numberOfRequiredAttestations, attestationDeadline);
             collectedAttestationsCount = attestations.length;
+            // Trim attestations to minimum required to save L1 calldata gas
+            const localAddresses = this.validatorClient.getValidatorAddresses();
+            const trimmed = trimAttestations(attestations, numberOfRequiredAttestations, this.attestorAddress, localAddresses);
+            if (trimmed.length < attestations.length) {
+                this.log.debug(`Trimmed attestations from ${attestations.length} to ${trimmed.length} for L1 submission`);
+            }
             // Rollup contract requires that the signatures are provided in the order of the committee
-            const sorted = orderAttestations(attestations, committee);
+            const sorted = orderAttestations(trimmed, committee);
             // Manipulate the attestations if we've been configured to do so
-            if (this.config.injectFakeAttestation || this.config.shuffleAttestationOrdering) {
+            if (this.config.injectFakeAttestation || this.config.injectHighSValueAttestation || this.config.injectUnrecoverableSignatureAttestation || this.config.shuffleAttestationOrdering) {
                 return this.manipulateAttestations(proposal.slotNumber, epoch, seed, committee, sorted);
             }
             return new CommitteeAttestationsAndSigners(sorted);
@@ -991,7 +1099,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
         // Compute the proposer index in the committee, since we dont want to tweak it.
         // Otherwise, the L1 rollup contract will reject the block outright.
         const proposerIndex = Number(this.epochCache.computeProposerIndex(slotNumber, epoch, seed, BigInt(committee.length)));
-        if (this.config.injectFakeAttestation) {
+        if (this.config.injectFakeAttestation || this.config.injectHighSValueAttestation || this.config.injectUnrecoverableSignatureAttestation) {
             // Find non-empty attestations that are not from the proposer
             const nonProposerIndices = [];
             for(let i = 0; i < attestations.length; i++){
@@ -1001,8 +1109,16 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
             }
             if (nonProposerIndices.length > 0) {
                 const targetIndex = nonProposerIndices[randomInt(nonProposerIndices.length)];
-                this.log.warn(`Injecting fake attestation in checkpoint for slot ${slotNumber} at index ${targetIndex}`);
-                unfreeze(attestations[targetIndex]).signature = Signature.random();
+                if (this.config.injectHighSValueAttestation) {
+                    this.log.warn(`Injecting high-s value attestation in checkpoint for slot ${slotNumber} at index ${targetIndex}`);
+                    unfreeze(attestations[targetIndex]).signature = flipSignature(attestations[targetIndex].signature);
+                } else if (this.config.injectUnrecoverableSignatureAttestation) {
+                    this.log.warn(`Injecting unrecoverable signature attestation in checkpoint for slot ${slotNumber} at index ${targetIndex}`);
+                    unfreeze(attestations[targetIndex]).signature = generateUnrecoverableSignature();
+                } else {
+                    this.log.warn(`Injecting fake attestation in checkpoint for slot ${slotNumber} at index ${targetIndex}`);
+                    unfreeze(attestations[targetIndex]).signature = generateRecoverableSignature();
+                }
             }
             return new CommitteeAttestationsAndSigners(attestations);
         }
@@ -1031,14 +1147,13 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
         const failedTxData = failedTxs.map((fail)=>fail.tx);
         const failedTxHashes = failedTxData.map((tx)=>tx.getTxHash());
         this.log.verbose(`Dropping failed txs ${failedTxHashes.join(', ')}`);
-        await this.p2pClient.deleteTxs(failedTxHashes);
+        await this.p2pClient.handleFailedExecution(failedTxHashes);
     }
     /**
    * Adds the proposed block to the archiver so it's available via P2P.
    * Gossip doesn't echo messages back to the sender, so the proposer's archiver/world-state
    * would never receive its own block without this explicit sync.
    */ async syncProposedBlockToArchiver(block) {
-        // TODO(palla/mbps): Change default to false once block sync is stable.
         if (this.config.skipPushProposedBlocksToArchiver !== false) {
             this.log.warn(`Skipping push of proposed block ${block.number} to archiver`, {
                 blockNumber: block.number,
@@ -1067,15 +1182,38 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
                 slot: this.slot,
                 feeAnalysisId: feeAnalysis?.id
             });
-            this.metrics.recordBlockProposalFailed('block_build_failed');
+            this.metrics.recordCheckpointProposalFailed('block_build_failed');
         }
         this.publisher.clearPendingRequests();
     }
+    /**
+   * Helper to handle HA double-signing errors. Returns true if the error was handled (caller should yield).
+   */ handleHASigningError(err, errorContext) {
+        if (err instanceof DutyAlreadySignedError) {
+            this.log.info(`${errorContext} for slot ${this.slot} already signed by another HA node, yielding`, {
+                slot: this.slot,
+                signedByNode: err.signedByNode
+            });
+            return true;
+        }
+        if (err instanceof SlashingProtectionError) {
+            this.log.info(`${errorContext} for slot ${this.slot} blocked by slashing protection, yielding`, {
+                slot: this.slot,
+                existingMessageHash: err.existingMessageHash,
+                attemptedMessageHash: err.attemptedMessageHash
+            });
+            return true;
+        }
+        return false;
+    }
     /** Waits until a specific time within the current slot */ async waitUntilTimeInSlot(targetSecondsIntoSlot) {
         const slotStartTimestamp = this.getSlotStartBuildTimestamp();
         const targetTimestamp = slotStartTimestamp + targetSecondsIntoSlot;
         await sleepUntil(new Date(targetTimestamp * 1000), this.dateProvider.nowAsDate());
     }
+    /** Waits the polling interval for transactions. Extracted for test overriding. */ async waitForTxsPollingInterval() {
+        await sleep(TXS_POLLING_MS);
+    }
     getSlotStartBuildTimestamp() {
         return getSlotStartBuildTimestamp(this.slot, this.l1Constants);
     }

package/dest/sequencer/checkpoint_voter.d.ts

@@ -21,7 +21,8 @@ export declare class CheckpointVoter {
     private readonly metrics;
     private readonly log;
     private slotTimestamp;
-    private signer;
+    private governanceSigner;
+    private slashingSigner;
     constructor(slot: SlotNumber, publisher: SequencerPublisher, attestorAddress: EthAddress, validatorClient: ValidatorClient, slasherClient: SlasherClientInterface | undefined, l1Constants: SequencerRollupConstants, config: ResolvedSequencerConfig, metrics: SequencerMetrics, log: Logger);
     /**
      * Enqueues governance and slashing votes with the publisher.
@@ -31,4 +32,4 @@ export declare class CheckpointVoter {
     private enqueueGovernanceVote;
     private enqueueSlashingVote;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF92b3Rlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcXVlbmNlci9jaGVja3BvaW50X3ZvdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2xFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFN0QsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMvRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUkvRCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRTNEOztHQUVHO0FBQ0gscUJBQWEsZUFBZTtJQUt4QixPQUFPLENBQUMsUUFBUSxDQUFDLElBQUk7SUFDckIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBQzFCLE9BQU8sQ0FBQyxRQUFRLENBQUMsZUFBZTtJQUNoQyxPQUFPLENBQUMsUUFBUSxDQUFDLGVBQWU7SUFDaEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhO0lBQzlCLE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVztJQUM1QixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxPQUFPO0lBQ3hCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRztJQVp0QixPQUFPLENBQUMsYUFBYSxDQUFTO0lBQzlCLE9BQU8sQ0FBQyxNQUFNLENBQXVEO0lBRXJFLFlBQ21CLElBQUksRUFBRSxVQUFVLEVBQ2hCLFNBQVMsRUFBRSxrQkFBa0IsRUFDN0IsZUFBZSxFQUFFLFVBQVUsRUFDM0IsZUFBZSxFQUFFLGVBQWUsRUFDaEMsYUFBYSxFQUFFLHNCQUFzQixHQUFHLFNBQVMsRUFDakQsV0FBVyxFQUFFLHdCQUF3QixFQUNyQyxNQUFNLEVBQUUsdUJBQXVCLEVBQy9CLE9BQU8sRUFBRSxnQkFBZ0IsRUFDekIsR0FBRyxFQUFFLE1BQU0sRUFLN0I7SUFFRDs7O09BR0c7SUFDSCxZQUFZLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxHQUFHLFNBQVMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxPQUFPLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FVM0U7WUFFYSxxQkFBcUI7WUF5QnJCLG1CQUFtQjtDQTBCbEMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF92b3Rlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcXVlbmNlci9jaGVja3BvaW50X3ZvdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2xFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFN0QsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMvRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQU0vRCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRTNEOztHQUVHO0FBQ0gscUJBQWEsZUFBZTtJQU14QixPQUFPLENBQUMsUUFBUSxDQUFDLElBQUk7SUFDckIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBQzFCLE9BQU8sQ0FBQyxRQUFRLENBQUMsZUFBZTtJQUNoQyxPQUFPLENBQUMsUUFBUSxDQUFDLGVBQWU7SUFDaEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhO0lBQzlCLE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVztJQUM1QixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxPQUFPO0lBQ3hCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRztJQWJ0QixPQUFPLENBQUMsYUFBYSxDQUFTO0lBQzlCLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBdUQ7SUFDL0UsT0FBTyxDQUFDLGNBQWMsQ0FBdUQ7SUFFN0UsWUFDbUIsSUFBSSxFQUFFLFVBQVUsRUFDaEIsU0FBUyxFQUFFLGtCQUFrQixFQUM3QixlQUFlLEVBQUUsVUFBVSxFQUMzQixlQUFlLEVBQUUsZUFBZSxFQUNoQyxhQUFhLEVBQUUsc0JBQXNCLEdBQUcsU0FBUyxFQUNqRCxXQUFXLEVBQUUsd0JBQXdCLEVBQ3JDLE1BQU0sRUFBRSx1QkFBdUIsRUFDL0IsT0FBTyxFQUFFLGdCQUFnQixFQUN6QixHQUFHLEVBQUUsTUFBTSxFQWE3QjtJQUVEOzs7T0FHRztJQUNILFlBQVksSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsU0FBUyxDQUFDLEVBQUUsT0FBTyxDQUFDLE9BQU8sR0FBRyxTQUFTLENBQUMsQ0FBQyxDQVUzRTtZQUVhLHFCQUFxQjtZQWdDckIsbUJBQW1CO0NBaUNsQyJ9

package/dest/sequencer/checkpoint_voter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkpoint_voter.d.ts","sourceRoot":"","sources":["../../src/sequencer/checkpoint_voter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAE7D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAE3D;;GAEG;AACH,qBAAa,eAAe;IAKxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAZtB,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAuD;IAErE,YACmB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,kBAAkB,EAC7B,eAAe,EAAE,UAAU,EAC3B,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,sBAAsB,GAAG,SAAS,EACjD,WAAW,EAAE,wBAAwB,EACrC,MAAM,EAAE,uBAAuB,EAC/B,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,MAAM,EAK7B;IAED;;;OAGG;IACH,YAAY,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,EAAE,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC,CAU3E;YAEa,qBAAqB;YAyBrB,mBAAmB;CA0BlC"}
+{"version":3,"file":"checkpoint_voter.d.ts","sourceRoot":"","sources":["../../src/sequencer/checkpoint_voter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAE7D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAM/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAE3D;;GAEG;AACH,qBAAa,eAAe;IAMxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAbtB,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,gBAAgB,CAAuD;IAC/E,OAAO,CAAC,cAAc,CAAuD;IAE7E,YACmB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,kBAAkB,EAC7B,eAAe,EAAE,UAAU,EAC3B,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,sBAAsB,GAAG,SAAS,EACjD,WAAW,EAAE,wBAAwB,EACrC,MAAM,EAAE,uBAAuB,EAC/B,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,MAAM,EAa7B;IAED;;;OAGG;IACH,YAAY,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,EAAE,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC,CAU3E;YAEa,qBAAqB;YAgCrB,mBAAmB;CAiClC"}

package/dest/sequencer/checkpoint_voter.js

@@ -1,4 +1,6 @@
 import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
+import { DutyAlreadySignedError } from '@aztec/validator-ha-signer/errors';
+import { DutyType } from '@aztec/validator-ha-signer/types';
 /**
  * Handles governance and slashing voting for a given slot.
  */ export class CheckpointVoter {
@@ -12,7 +14,8 @@ import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
     metrics;
     log;
     slotTimestamp;
-    signer;
+    governanceSigner;
+    slashingSigner;
     constructor(slot, publisher, attestorAddress, validatorClient, slasherClient, l1Constants, config, metrics, log){
         this.slot = slot;
         this.publisher = publisher;
@@ -24,7 +27,18 @@ import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
         this.metrics = metrics;
         this.log = log;
         this.slotTimestamp = getTimestampForSlot(this.slot, this.l1Constants);
-        this.signer = (msg)=>this.validatorClient.signWithAddress(this.attestorAddress, msg).then((s)=>s.toString());
+        // Create separate signers with appropriate duty contexts for governance and slashing votes
+        // These use HA protection to ensure only one node signs per slot/duty
+        const governanceContext = {
+            slot: this.slot,
+            dutyType: DutyType.GOVERNANCE_VOTE
+        };
+        this.governanceSigner = (msg)=>this.validatorClient.signWithAddress(this.attestorAddress, msg, governanceContext).then((s)=>s.toString());
+        const slashingContext = {
+            slot: this.slot,
+            dutyType: DutyType.SLASHING_VOTE
+        };
+        this.slashingSigner = (msg)=>this.validatorClient.signWithAddress(this.attestorAddress, msg, slashingContext).then((s)=>s.toString());
     }
     /**
    * Enqueues governance and slashing votes with the publisher.
@@ -55,11 +69,16 @@ import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
             governanceProposerPayload: governanceProposerPayload.toString()
         });
         try {
-            return await this.publisher.enqueueGovernanceCastSignal(governanceProposerPayload, this.slot, this.slotTimestamp, this.attestorAddress, this.signer);
+            return await this.publisher.enqueueGovernanceCastSignal(governanceProposerPayload, this.slot, this.slotTimestamp, this.attestorAddress, this.governanceSigner);
         } catch (err) {
-            this.log.error(`Error enqueuing governance vote`, err, {
-                slot: this.slot
-            });
+            if (err instanceof DutyAlreadySignedError) {
+                this.log.info(`Governance vote already signed by another node`, {
+                    slot: this.slot,
+                    signedByNode: err.signedByNode
+                });
+            } else {
+                this.log.error(`Error enqueueing governance vote`, err);
+            }
             return false;
         }
     }
@@ -74,11 +93,16 @@ import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
                 actionCount: actions.length
             });
             this.metrics.recordSlashingAttempt(actions.length);
-            return await this.publisher.enqueueSlashingActions(actions, this.slot, this.slotTimestamp, this.attestorAddress, this.signer);
+            return await this.publisher.enqueueSlashingActions(actions, this.slot, this.slotTimestamp, this.attestorAddress, this.slashingSigner);
         } catch (err) {
-            this.log.error(`Error enqueuing slashing vote`, err, {
-                slot: this.slot
-            });
+            if (err instanceof DutyAlreadySignedError) {
+                this.log.info(`Slashing vote already signed by another node`, {
+                    slot: this.slot,
+                    signedByNode: err.signedByNode
+                });
+            } else {
+                this.log.error(`Error enqueueing slashing vote`, err);
+            }
             return false;
         }
     }

package/dest/sequencer/index.d.ts

@@ -1,7 +1,6 @@
-export * from './block_builder.js';
 export * from './checkpoint_proposal_job.js';
 export * from './checkpoint_voter.js';
 export * from './config.js';
 export * from './events.js';
 export * from './sequencer.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXF1ZW5jZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLDhCQUE4QixDQUFDO0FBQzdDLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxnQkFBZ0IsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXF1ZW5jZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLHVCQUF1QixDQUFDO0FBQ3RDLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsZ0JBQWdCLENBQUMifQ==

package/dest/sequencer/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sequencer/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sequencer/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC"}

package/dest/sequencer/index.js

@@ -1,4 +1,3 @@
-export * from './block_builder.js';
 export * from './checkpoint_proposal_job.js';
 export * from './checkpoint_voter.js';
 export * from './config.js';