@aztec/sequencer-client 0.0.1-commit.a072138 → 0.0.1-commit.a89ec08
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/client/sequencer-client.d.ts +16 -7
- package/dest/client/sequencer-client.d.ts.map +1 -1
- package/dest/client/sequencer-client.js +56 -23
- package/dest/config.d.ts +25 -6
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +46 -28
- package/dest/global_variable_builder/global_builder.d.ts +14 -10
- package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
- package/dest/global_variable_builder/global_builder.js +22 -21
- package/dest/global_variable_builder/index.d.ts +2 -2
- package/dest/global_variable_builder/index.d.ts.map +1 -1
- package/dest/publisher/config.d.ts +31 -17
- package/dest/publisher/config.d.ts.map +1 -1
- package/dest/publisher/config.js +101 -42
- package/dest/publisher/sequencer-publisher-factory.d.ts +11 -3
- package/dest/publisher/sequencer-publisher-factory.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher-factory.js +13 -2
- package/dest/publisher/sequencer-publisher.d.ts +29 -13
- package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher.js +106 -57
- package/dest/sequencer/checkpoint_proposal_job.d.ts +10 -4
- package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -1
- package/dest/sequencer/checkpoint_proposal_job.js +162 -107
- package/dest/sequencer/checkpoint_voter.d.ts +1 -2
- package/dest/sequencer/checkpoint_voter.d.ts.map +1 -1
- package/dest/sequencer/checkpoint_voter.js +2 -5
- package/dest/sequencer/metrics.d.ts +17 -5
- package/dest/sequencer/metrics.d.ts.map +1 -1
- package/dest/sequencer/metrics.js +86 -15
- package/dest/sequencer/sequencer.d.ts +29 -13
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +47 -43
- package/dest/sequencer/timetable.d.ts +4 -6
- package/dest/sequencer/timetable.d.ts.map +1 -1
- package/dest/sequencer/timetable.js +7 -11
- package/dest/sequencer/types.d.ts +2 -2
- package/dest/sequencer/types.d.ts.map +1 -1
- package/dest/test/index.d.ts +3 -5
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/mock_checkpoint_builder.d.ts +11 -11
- package/dest/test/mock_checkpoint_builder.d.ts.map +1 -1
- package/dest/test/mock_checkpoint_builder.js +47 -34
- package/dest/test/utils.d.ts +3 -3
- package/dest/test/utils.d.ts.map +1 -1
- package/dest/test/utils.js +5 -4
- package/package.json +28 -28
- package/src/client/sequencer-client.ts +78 -21
- package/src/config.ts +61 -38
- package/src/global_variable_builder/global_builder.ts +23 -24
- package/src/global_variable_builder/index.ts +1 -1
- package/src/publisher/config.ts +112 -43
- package/src/publisher/sequencer-publisher-factory.ts +23 -6
- package/src/publisher/sequencer-publisher.ts +123 -71
- package/src/sequencer/checkpoint_proposal_job.ts +238 -136
- package/src/sequencer/checkpoint_voter.ts +1 -12
- package/src/sequencer/metrics.ts +92 -18
- package/src/sequencer/sequencer.ts +60 -49
- package/src/sequencer/timetable.ts +13 -12
- package/src/sequencer/types.ts +1 -1
- package/src/test/index.ts +2 -4
- package/src/test/mock_checkpoint_builder.ts +65 -49
- package/src/test/utils.ts +5 -2
|
@@ -436,22 +436,21 @@ function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
|
|
|
436
436
|
return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
|
|
437
437
|
}
|
|
438
438
|
var _dec, _dec1, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _initProto;
|
|
439
|
-
import { NUM_CHECKPOINT_END_MARKER_FIELDS, getNumBlockEndBlobFields } from '@aztec/blob-lib/encoding';
|
|
440
|
-
import { BLOBS_PER_CHECKPOINT, FIELDS_PER_BLOB } from '@aztec/constants';
|
|
441
439
|
import { BlockNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
|
|
442
440
|
import { randomInt } from '@aztec/foundation/crypto/random';
|
|
443
|
-
import {
|
|
441
|
+
import { flipSignature, generateRecoverableSignature, generateUnrecoverableSignature } from '@aztec/foundation/crypto/secp256k1-signer';
|
|
444
442
|
import { filter } from '@aztec/foundation/iterator';
|
|
445
443
|
import { createLogger } from '@aztec/foundation/log';
|
|
446
444
|
import { sleep, sleepUntil } from '@aztec/foundation/sleep';
|
|
447
445
|
import { Timer } from '@aztec/foundation/timer';
|
|
448
446
|
import { isErrorClass, unfreeze } from '@aztec/foundation/types';
|
|
449
447
|
import { CommitteeAttestationsAndSigners, MaliciousCommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
|
|
448
|
+
import { validateCheckpoint } from '@aztec/stdlib/checkpoint';
|
|
450
449
|
import { getSlotStartBuildTimestamp } from '@aztec/stdlib/epoch-helpers';
|
|
451
450
|
import { Gas } from '@aztec/stdlib/gas';
|
|
452
|
-
import {
|
|
451
|
+
import { InsufficientValidTxsError } from '@aztec/stdlib/interfaces/server';
|
|
453
452
|
import { computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
|
|
454
|
-
import { orderAttestations } from '@aztec/stdlib/p2p';
|
|
453
|
+
import { orderAttestations, trimAttestations } from '@aztec/stdlib/p2p';
|
|
455
454
|
import { AttestationTimeoutError } from '@aztec/stdlib/validators';
|
|
456
455
|
import { Attributes, trackSpan } from '@aztec/telemetry-client';
|
|
457
456
|
import { DutyAlreadySignedError, SlashingProtectionError } from '@aztec/validator-ha-signer/errors';
|
|
@@ -590,7 +589,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
590
589
|
// Wait until the voting promises have resolved, so all requests are enqueued (not sent)
|
|
591
590
|
await Promise.all(votesPromises);
|
|
592
591
|
if (checkpoint) {
|
|
593
|
-
this.metrics.
|
|
592
|
+
this.metrics.recordCheckpointProposalSuccess();
|
|
594
593
|
}
|
|
595
594
|
// Do not post anything to L1 if we are fishermen, but do perform L1 fee analysis
|
|
596
595
|
if (this.config.fishermanMode) {
|
|
@@ -640,13 +639,14 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
640
639
|
const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(this.checkpointNumber);
|
|
641
640
|
const inHash = computeInHashFromL1ToL2Messages(l1ToL2Messages);
|
|
642
641
|
// Collect the out hashes of all the checkpoints before this one in the same epoch
|
|
643
|
-
const
|
|
644
|
-
|
|
642
|
+
const previousCheckpointOutHashes = (await this.l2BlockSource.getCheckpointsDataForEpoch(this.epoch)).filter((c)=>c.checkpointNumber < this.checkpointNumber).map((c)=>c.checkpointOutHash);
|
|
643
|
+
// Get the fee asset price modifier from the oracle
|
|
644
|
+
const feeAssetPriceModifier = await this.publisher.getFeeAssetPriceModifier();
|
|
645
645
|
const fork = _ts_add_disposable_resource(env, await this.worldState.fork(this.syncedToBlockNumber, {
|
|
646
646
|
closeDelayMs: 12_000
|
|
647
|
-
}),
|
|
647
|
+
}), true);
|
|
648
648
|
// Create checkpoint builder for the entire slot
|
|
649
|
-
const checkpointBuilder = await this.checkpointsBuilder.startCheckpoint(this.checkpointNumber, checkpointGlobalVariables, l1ToL2Messages, previousCheckpointOutHashes, fork, this.log.getBindings());
|
|
649
|
+
const checkpointBuilder = await this.checkpointsBuilder.startCheckpoint(this.checkpointNumber, checkpointGlobalVariables, feeAssetPriceModifier, l1ToL2Messages, previousCheckpointOutHashes, fork, this.log.getBindings());
|
|
650
650
|
// Options for the validator client when creating block and checkpoint proposals
|
|
651
651
|
const blockProposalOptions = {
|
|
652
652
|
publishFullTxs: !!this.config.publishTxsWithProposals,
|
|
@@ -658,6 +658,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
658
658
|
};
|
|
659
659
|
let blocksInCheckpoint = [];
|
|
660
660
|
let blockPendingBroadcast = undefined;
|
|
661
|
+
const checkpointBuildTimer = new Timer();
|
|
661
662
|
try {
|
|
662
663
|
// Main loop: build blocks for the checkpoint
|
|
663
664
|
const result = await this.buildBlocksForCheckpoint(checkpointBuilder, checkpointGlobalVariables.timestamp, inHash, blockProposalOptions);
|
|
@@ -667,19 +668,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
667
668
|
// These errors are expected in HA mode, so we yield and let another HA node handle the slot
|
|
668
669
|
// The only distinction between the 2 errors is SlashingProtectionError throws when the payload is different,
|
|
669
670
|
// which is normal for block building (may have picked different txs)
|
|
670
|
-
if (err
|
|
671
|
-
this.log.info(`Checkpoint proposal for slot ${this.slot} already signed by another HA node, yielding`, {
|
|
672
|
-
slot: this.slot,
|
|
673
|
-
signedByNode: err.signedByNode
|
|
674
|
-
});
|
|
675
|
-
return undefined;
|
|
676
|
-
}
|
|
677
|
-
if (err instanceof SlashingProtectionError) {
|
|
678
|
-
this.log.info(`Checkpoint proposal for slot ${this.slot} blocked by slashing protection, yielding`, {
|
|
679
|
-
slot: this.slot,
|
|
680
|
-
existingMessageHash: err.existingMessageHash,
|
|
681
|
-
attemptedMessageHash: err.attemptedMessageHash
|
|
682
|
-
});
|
|
671
|
+
if (this.handleHASigningError(err, 'Block proposal')) {
|
|
683
672
|
return undefined;
|
|
684
673
|
}
|
|
685
674
|
throw err;
|
|
@@ -693,10 +682,37 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
693
682
|
});
|
|
694
683
|
return undefined;
|
|
695
684
|
}
|
|
685
|
+
const minBlocksForCheckpoint = this.config.minBlocksForCheckpoint;
|
|
686
|
+
if (minBlocksForCheckpoint !== undefined && blocksInCheckpoint.length < minBlocksForCheckpoint) {
|
|
687
|
+
this.log.warn(`Checkpoint has fewer blocks than minimum (${blocksInCheckpoint.length} < ${minBlocksForCheckpoint}), skipping proposal`, {
|
|
688
|
+
slot: this.slot,
|
|
689
|
+
blocksBuilt: blocksInCheckpoint.length,
|
|
690
|
+
minBlocksForCheckpoint
|
|
691
|
+
});
|
|
692
|
+
return undefined;
|
|
693
|
+
}
|
|
696
694
|
// Assemble and broadcast the checkpoint proposal, including the last block that was not
|
|
697
695
|
// broadcasted yet, and wait to collect the committee attestations.
|
|
698
696
|
this.setStateFn(SequencerState.ASSEMBLING_CHECKPOINT, this.slot);
|
|
699
697
|
const checkpoint = await checkpointBuilder.completeCheckpoint();
|
|
698
|
+
// Final validation: per-block limits are only checked if the operator set them explicitly.
|
|
699
|
+
// Otherwise, checkpoint-level budgets were already enforced by the redistribution logic.
|
|
700
|
+
try {
|
|
701
|
+
validateCheckpoint(checkpoint, {
|
|
702
|
+
rollupManaLimit: this.l1Constants.rollupManaLimit,
|
|
703
|
+
maxL2BlockGas: this.config.maxL2BlockGas,
|
|
704
|
+
maxDABlockGas: this.config.maxDABlockGas,
|
|
705
|
+
maxTxsPerBlock: this.config.maxTxsPerBlock,
|
|
706
|
+
maxTxsPerCheckpoint: this.config.maxTxsPerCheckpoint
|
|
707
|
+
});
|
|
708
|
+
} catch (err) {
|
|
709
|
+
this.log.error(`Built an invalid checkpoint at slot ${this.slot} (skipping proposal)`, err, {
|
|
710
|
+
checkpoint: checkpoint.header.toInspect()
|
|
711
|
+
});
|
|
712
|
+
return undefined;
|
|
713
|
+
}
|
|
714
|
+
// Record checkpoint-level build metrics
|
|
715
|
+
this.metrics.recordCheckpointBuild(checkpointBuildTimer.ms(), blocksInCheckpoint.length, checkpoint.getStats().txCount, Number(checkpoint.header.totalManaUsed.toBigInt()));
|
|
700
716
|
// Do not collect attestations nor publish to L1 in fisherman mode
|
|
701
717
|
if (this.config.fishermanMode) {
|
|
702
718
|
this.log.info(`Built checkpoint for slot ${this.slot} with ${blocksInCheckpoint.length} blocks. ` + `Skipping proposal in fisherman mode.`, {
|
|
@@ -714,7 +730,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
714
730
|
txs: blockPendingBroadcast.txs
|
|
715
731
|
};
|
|
716
732
|
// Create the checkpoint proposal and broadcast it
|
|
717
|
-
const proposal = await this.validatorClient.createCheckpointProposal(checkpoint.header, checkpoint.archive.root, lastBlock, this.proposer, checkpointProposalOptions);
|
|
733
|
+
const proposal = await this.validatorClient.createCheckpointProposal(checkpoint.header, checkpoint.archive.root, feeAssetPriceModifier, lastBlock, this.proposer, checkpointProposalOptions);
|
|
718
734
|
const blockProposedAt = this.dateProvider.now();
|
|
719
735
|
await this.p2pClient.broadcastCheckpointProposal(proposal);
|
|
720
736
|
this.setStateFn(SequencerState.COLLECTING_ATTESTATIONS, this.slot);
|
|
@@ -728,20 +744,8 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
728
744
|
attestationsSignature = await this.validatorClient.signAttestationsAndSigners(attestations, signer, this.slot, this.checkpointNumber);
|
|
729
745
|
} catch (err) {
|
|
730
746
|
// We shouldn't really get here since we yield to another HA node
|
|
731
|
-
// as soon as we see these errors when creating block proposals.
|
|
732
|
-
if (err
|
|
733
|
-
this.log.info(`Attestations signature for slot ${this.slot} already signed by another HA node, yielding`, {
|
|
734
|
-
slot: this.slot,
|
|
735
|
-
signedByNode: err.signedByNode
|
|
736
|
-
});
|
|
737
|
-
return undefined;
|
|
738
|
-
}
|
|
739
|
-
if (err instanceof SlashingProtectionError) {
|
|
740
|
-
this.log.info(`Attestations signature for slot ${this.slot} blocked by slashing protection, yielding`, {
|
|
741
|
-
slot: this.slot,
|
|
742
|
-
existingMessageHash: err.existingMessageHash,
|
|
743
|
-
attemptedMessageHash: err.attemptedMessageHash
|
|
744
|
-
});
|
|
747
|
+
// as soon as we see these errors when creating block or checkpoint proposals.
|
|
748
|
+
if (this.handleHASigningError(err, 'Attestations signature')) {
|
|
745
749
|
return undefined;
|
|
746
750
|
}
|
|
747
751
|
throw err;
|
|
@@ -751,6 +755,14 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
751
755
|
const aztecSlotDuration = this.l1Constants.slotDuration;
|
|
752
756
|
const slotStartBuildTimestamp = this.getSlotStartBuildTimestamp();
|
|
753
757
|
const txTimeoutAt = new Date((slotStartBuildTimestamp + aztecSlotDuration) * 1000);
|
|
758
|
+
// If we have been configured to potentially skip publishing checkpoint then roll the dice here
|
|
759
|
+
if (this.config.skipPublishingCheckpointsPercent !== undefined && this.config.skipPublishingCheckpointsPercent > 0) {
|
|
760
|
+
const result = Math.max(0, randomInt(100));
|
|
761
|
+
if (result < this.config.skipPublishingCheckpointsPercent) {
|
|
762
|
+
this.log.warn(`Skipping publishing proposal for checkpoint ${checkpoint.number}. Configured percentage: ${this.config.skipPublishingCheckpointsPercent}, generated value: ${result}`);
|
|
763
|
+
return checkpoint;
|
|
764
|
+
}
|
|
765
|
+
}
|
|
754
766
|
await this.publisher.enqueueProposeCheckpoint(checkpoint, attestations, attestationsSignature, {
|
|
755
767
|
txTimeoutAt,
|
|
756
768
|
forcePendingCheckpointNumber: this.invalidateCheckpoint?.forcePendingCheckpointNumber
|
|
@@ -760,7 +772,8 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
760
772
|
env.error = e;
|
|
761
773
|
env.hasError = true;
|
|
762
774
|
} finally{
|
|
763
|
-
_ts_dispose_resources(env);
|
|
775
|
+
const result = _ts_dispose_resources(env);
|
|
776
|
+
if (result) await result;
|
|
764
777
|
}
|
|
765
778
|
} catch (err) {
|
|
766
779
|
if (err && (err instanceof DutyAlreadySignedError || err instanceof SlashingProtectionError)) {
|
|
@@ -777,8 +790,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
777
790
|
const blocksInCheckpoint = [];
|
|
778
791
|
const txHashesAlreadyIncluded = new Set();
|
|
779
792
|
const initialBlockNumber = BlockNumber(this.syncedToBlockNumber + 1);
|
|
780
|
-
|
|
781
|
-
let remainingBlobFields = BLOBS_PER_CHECKPOINT * FIELDS_PER_BLOB - NUM_CHECKPOINT_END_MARKER_FIELDS;
|
|
793
|
+
const slot = this.slot;
|
|
782
794
|
// Last block in the checkpoint will usually be flagged as pending broadcast, so we send it along with the checkpoint proposal
|
|
783
795
|
let blockPendingBroadcast = undefined;
|
|
784
796
|
while(true){
|
|
@@ -789,7 +801,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
789
801
|
const timingInfo = this.timetable.canStartNextBlock(secondsIntoSlot);
|
|
790
802
|
if (!timingInfo.canStart) {
|
|
791
803
|
this.log.debug(`Not enough time left in slot to start another block`, {
|
|
792
|
-
slot
|
|
804
|
+
slot,
|
|
793
805
|
blocksBuilt,
|
|
794
806
|
secondsIntoSlot
|
|
795
807
|
});
|
|
@@ -804,8 +816,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
804
816
|
buildDeadline: timingInfo.deadline ? new Date((this.getSlotStartBuildTimestamp() + timingInfo.deadline) * 1000) : undefined,
|
|
805
817
|
blockNumber,
|
|
806
818
|
indexWithinCheckpoint,
|
|
807
|
-
txHashesAlreadyIncluded
|
|
808
|
-
remainingBlobFields
|
|
819
|
+
txHashesAlreadyIncluded
|
|
809
820
|
});
|
|
810
821
|
// TODO(palla/mbps): Review these conditions. We may want to keep trying in some scenarios.
|
|
811
822
|
if (!buildResult && timingInfo.isLastBlock) {
|
|
@@ -819,33 +830,23 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
819
830
|
} else if ('error' in buildResult) {
|
|
820
831
|
// If there was an error building the block, just exit the loop and give up the rest of the slot
|
|
821
832
|
if (!(buildResult.error instanceof SequencerInterruptedError)) {
|
|
822
|
-
this.log.warn(`Halting block building for slot ${
|
|
823
|
-
slot
|
|
833
|
+
this.log.warn(`Halting block building for slot ${slot}`, {
|
|
834
|
+
slot,
|
|
824
835
|
blocksBuilt,
|
|
825
836
|
error: buildResult.error
|
|
826
837
|
});
|
|
827
838
|
}
|
|
828
839
|
break;
|
|
829
840
|
}
|
|
830
|
-
const { block, usedTxs
|
|
841
|
+
const { block, usedTxs } = buildResult;
|
|
831
842
|
blocksInCheckpoint.push(block);
|
|
832
|
-
// Update remaining blob fields for the next block
|
|
833
|
-
remainingBlobFields = newRemainingBlobFields;
|
|
834
|
-
// Sync the proposed block to the archiver to make it available
|
|
835
|
-
// Note that the checkpoint builder uses its own fork so it should not need to wait for this syncing
|
|
836
|
-
// Eventually we should refactor the checkpoint builder to not need a separate long-lived fork
|
|
837
|
-
// Fire and forget - don't block the critical path, but log errors
|
|
838
|
-
this.syncProposedBlockToArchiver(block).catch((err)=>{
|
|
839
|
-
this.log.error(`Failed to sync proposed block ${block.number} to archiver`, {
|
|
840
|
-
blockNumber: block.number,
|
|
841
|
-
err
|
|
842
|
-
});
|
|
843
|
-
});
|
|
844
843
|
usedTxs.forEach((tx)=>txHashesAlreadyIncluded.add(tx.txHash.toString()));
|
|
845
|
-
// If this is the last block,
|
|
844
|
+
// If this is the last block, send the proposed block to the archiver,
|
|
845
|
+
// and exit the loop now so we can build the checkpoint and start collecting attestations.
|
|
846
846
|
if (timingInfo.isLastBlock) {
|
|
847
|
-
this.
|
|
848
|
-
|
|
847
|
+
await this.syncProposedBlockToArchiver(block);
|
|
848
|
+
this.log.verbose(`Completed final block ${blockNumber} for slot ${slot}`, {
|
|
849
|
+
slot,
|
|
849
850
|
blockNumber,
|
|
850
851
|
blocksBuilt
|
|
851
852
|
});
|
|
@@ -855,12 +856,17 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
855
856
|
};
|
|
856
857
|
break;
|
|
857
858
|
}
|
|
858
|
-
//
|
|
859
|
-
//
|
|
860
|
-
if
|
|
861
|
-
|
|
862
|
-
|
|
863
|
-
|
|
859
|
+
// Broadcast the block proposal (unless we're in fisherman mode) unless the block is the last one,
|
|
860
|
+
// in which case we'll broadcast it along with the checkpoint at the end of the loop.
|
|
861
|
+
// Note that we only send the block to the archiver if we manage to create the proposal, so if there's
|
|
862
|
+
// a HA error we don't pollute our archiver with a block that won't make it to the chain.
|
|
863
|
+
const proposal = await this.createBlockProposal(block, inHash, usedTxs, blockProposalOptions);
|
|
864
|
+
// Sync the proposed block to the archiver to make it available, only after we've managed to sign the proposal.
|
|
865
|
+
// We wait for the sync to succeed, as this helps catch consistency errors, even if it means we lose some time for block-building.
|
|
866
|
+
// If this throws, we abort the entire checkpoint.
|
|
867
|
+
await this.syncProposedBlockToArchiver(block);
|
|
868
|
+
// Once we have a signed proposal and the archiver agreed with our proposed block, then we broadcast it.
|
|
869
|
+
proposal && await this.p2pClient.broadcastProposal(proposal);
|
|
864
870
|
// Wait until the next block's start time
|
|
865
871
|
await this.waitUntilNextSubslot(timingInfo.deadline);
|
|
866
872
|
}
|
|
@@ -873,6 +879,13 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
873
879
|
blockPendingBroadcast
|
|
874
880
|
};
|
|
875
881
|
}
|
|
882
|
+
/** Creates a block proposal for a given block via the validator client (unless in fisherman mode) */ createBlockProposal(block, inHash, usedTxs, blockProposalOptions) {
|
|
883
|
+
if (this.config.fishermanMode) {
|
|
884
|
+
this.log.info(`Skipping block proposal for block ${block.number} in fisherman mode`);
|
|
885
|
+
return Promise.resolve(undefined);
|
|
886
|
+
}
|
|
887
|
+
return this.validatorClient.createBlockProposal(block.header, block.indexWithinCheckpoint, inHash, block.archive.root, usedTxs, this.proposer, blockProposalOptions);
|
|
888
|
+
}
|
|
876
889
|
/** Sleeps until it is time to produce the next block in the slot */ async waitUntilNextSubslot(nextSubslotStart) {
|
|
877
890
|
this.setStateFn(SequencerState.WAITING_UNTIL_NEXT_BLOCK, this.slot);
|
|
878
891
|
this.log.verbose(`Waiting until time for the next block at ${nextSubslotStart}s into slot`, {
|
|
@@ -881,15 +894,14 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
881
894
|
await this.waitUntilTimeInSlot(nextSubslotStart);
|
|
882
895
|
}
|
|
883
896
|
/** Builds a single block. Called from the main block building loop. */ async buildSingleBlock(checkpointBuilder, opts) {
|
|
884
|
-
const { blockTimestamp, forceCreate, blockNumber, indexWithinCheckpoint, buildDeadline, txHashesAlreadyIncluded
|
|
897
|
+
const { blockTimestamp, forceCreate, blockNumber, indexWithinCheckpoint, buildDeadline, txHashesAlreadyIncluded } = opts;
|
|
885
898
|
this.log.verbose(`Preparing block ${blockNumber} index ${indexWithinCheckpoint} at checkpoint ${this.checkpointNumber} for slot ${this.slot}`, {
|
|
886
899
|
...checkpointBuilder.getConstantData(),
|
|
887
900
|
...opts
|
|
888
901
|
});
|
|
889
902
|
try {
|
|
890
903
|
// Wait until we have enough txs to build the block
|
|
891
|
-
const minTxs = this.
|
|
892
|
-
const { availableTxs, canStartBuilding } = await this.waitForMinTxs(opts);
|
|
904
|
+
const { availableTxs, canStartBuilding, minTxs } = await this.waitForMinTxs(opts);
|
|
893
905
|
if (!canStartBuilding) {
|
|
894
906
|
this.log.warn(`Not enough txs to build block ${blockNumber} at index ${indexWithinCheckpoint} in slot ${this.slot} (got ${availableTxs} txs but needs ${minTxs})`, {
|
|
895
907
|
blockNumber,
|
|
@@ -906,39 +918,39 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
906
918
|
}
|
|
907
919
|
// Create iterator to pending txs. We filter out txs already included in previous blocks in the checkpoint
|
|
908
920
|
// just in case p2p failed to sync the provisional block and didn't get to remove those txs from the mempool yet.
|
|
909
|
-
const pendingTxs = filter(this.p2pClient.
|
|
921
|
+
const pendingTxs = filter(this.p2pClient.iterateEligiblePendingTxs(), (tx)=>!txHashesAlreadyIncluded.has(tx.txHash.toString()));
|
|
910
922
|
this.log.debug(`Building block ${blockNumber} at index ${indexWithinCheckpoint} for slot ${this.slot} with ${availableTxs} available txs`, {
|
|
911
923
|
slot: this.slot,
|
|
912
924
|
blockNumber,
|
|
913
925
|
indexWithinCheckpoint
|
|
914
926
|
});
|
|
915
927
|
this.setStateFn(SequencerState.CREATING_BLOCK, this.slot);
|
|
916
|
-
//
|
|
917
|
-
|
|
918
|
-
|
|
928
|
+
// Per-block limits are operator overrides (from SEQ_MAX_L2_BLOCK_GAS etc.) further capped
|
|
929
|
+
// by remaining checkpoint-level budgets inside CheckpointBuilder before each block is built.
|
|
930
|
+
// minValidTxs is passed into the builder so it can reject the block *before* updating state.
|
|
931
|
+
const minValidTxs = forceCreate ? 0 : this.config.minValidTxsPerBlock ?? minTxs;
|
|
919
932
|
const blockBuilderOptions = {
|
|
920
933
|
maxTransactions: this.config.maxTxsPerBlock,
|
|
921
|
-
|
|
922
|
-
|
|
923
|
-
|
|
924
|
-
|
|
934
|
+
maxBlockGas: this.config.maxL2BlockGas !== undefined || this.config.maxDABlockGas !== undefined ? new Gas(this.config.maxDABlockGas ?? Infinity, this.config.maxL2BlockGas ?? Infinity) : undefined,
|
|
935
|
+
deadline: buildDeadline,
|
|
936
|
+
isBuildingProposal: true,
|
|
937
|
+
minValidTxs,
|
|
938
|
+
maxBlocksPerCheckpoint: this.timetable.maxNumberOfBlocks,
|
|
939
|
+
perBlockAllocationMultiplier: this.config.perBlockAllocationMultiplier
|
|
925
940
|
};
|
|
926
|
-
// Actually build the block by executing txs
|
|
941
|
+
// Actually build the block by executing txs. The builder throws InsufficientValidTxsError
|
|
942
|
+
// if the number of successfully processed txs is below minValidTxs, ensuring state is not
|
|
943
|
+
// updated for blocks that will be discarded.
|
|
927
944
|
const buildResult = await this.buildSingleBlockWithCheckpointBuilder(checkpointBuilder, pendingTxs, blockNumber, blockTimestamp, blockBuilderOptions);
|
|
928
945
|
// If any txs failed during execution, drop them from the mempool so we don't pick them up again
|
|
929
946
|
await this.dropFailedTxsFromP2P(buildResult.failedTxs);
|
|
930
|
-
|
|
931
|
-
// too long, then we may not get to minTxsPerBlock after executing public functions.
|
|
932
|
-
const minValidTxs = this.config.minValidTxsPerBlock ?? minTxs;
|
|
933
|
-
const numTxs = buildResult.status === 'no-valid-txs' ? 0 : buildResult.numTxs;
|
|
934
|
-
if (buildResult.status === 'no-valid-txs' || !forceCreate && numTxs < minValidTxs) {
|
|
947
|
+
if (buildResult.status === 'insufficient-valid-txs') {
|
|
935
948
|
this.log.warn(`Block ${blockNumber} at index ${indexWithinCheckpoint} on slot ${this.slot} has too few valid txs to be proposed`, {
|
|
936
949
|
slot: this.slot,
|
|
937
950
|
blockNumber,
|
|
938
|
-
numTxs,
|
|
951
|
+
numTxs: buildResult.processedCount,
|
|
939
952
|
indexWithinCheckpoint,
|
|
940
|
-
minValidTxs
|
|
941
|
-
buildResult: buildResult.status
|
|
953
|
+
minValidTxs
|
|
942
954
|
});
|
|
943
955
|
this.eventEmitter.emit('block-build-failed', {
|
|
944
956
|
reason: `Insufficient valid txs`,
|
|
@@ -948,7 +960,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
948
960
|
return undefined;
|
|
949
961
|
}
|
|
950
962
|
// Block creation succeeded, emit stats and metrics
|
|
951
|
-
const {
|
|
963
|
+
const { block, publicProcessorDuration, usedTxs, blockBuildDuration, numTxs } = buildResult;
|
|
952
964
|
const blockStats = {
|
|
953
965
|
eventName: 'l2-block-built',
|
|
954
966
|
duration: blockBuildDuration,
|
|
@@ -957,7 +969,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
957
969
|
};
|
|
958
970
|
const blockHash = await block.hash();
|
|
959
971
|
const txHashes = block.body.txEffects.map((tx)=>tx.txHash);
|
|
960
|
-
const manaPerSec =
|
|
972
|
+
const manaPerSec = block.header.totalManaUsed.toNumberUnsafe() / (blockBuildDuration / 1000);
|
|
961
973
|
this.log.info(`Built block ${block.number} at checkpoint ${this.checkpointNumber} for slot ${this.slot} with ${numTxs} txs`, {
|
|
962
974
|
blockHash,
|
|
963
975
|
txHashes,
|
|
@@ -968,11 +980,10 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
968
980
|
blockNumber: block.number,
|
|
969
981
|
slot: this.slot
|
|
970
982
|
});
|
|
971
|
-
this.metrics.recordBuiltBlock(blockBuildDuration,
|
|
983
|
+
this.metrics.recordBuiltBlock(blockBuildDuration, block.header.totalManaUsed.toNumberUnsafe());
|
|
972
984
|
return {
|
|
973
985
|
block,
|
|
974
|
-
usedTxs
|
|
975
|
-
remainingBlobFields: maxBlobFieldsForTxs - usedTxBlobFields
|
|
986
|
+
usedTxs
|
|
976
987
|
};
|
|
977
988
|
} catch (err) {
|
|
978
989
|
this.eventEmitter.emit('block-build-failed', {
|
|
@@ -990,7 +1001,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
990
1001
|
};
|
|
991
1002
|
}
|
|
992
1003
|
}
|
|
993
|
-
/** Uses the checkpoint builder to build a block, catching
|
|
1004
|
+
/** Uses the checkpoint builder to build a block, catching InsufficientValidTxsError. */ async buildSingleBlockWithCheckpointBuilder(checkpointBuilder, pendingTxs, blockNumber, blockTimestamp, blockBuilderOptions) {
|
|
994
1005
|
try {
|
|
995
1006
|
const workTimer = new Timer();
|
|
996
1007
|
const result = await checkpointBuilder.buildBlock(pendingTxs, blockNumber, blockTimestamp, blockBuilderOptions);
|
|
@@ -1001,10 +1012,11 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
1001
1012
|
status: 'success'
|
|
1002
1013
|
};
|
|
1003
1014
|
} catch (err) {
|
|
1004
|
-
if (isErrorClass(err,
|
|
1015
|
+
if (isErrorClass(err, InsufficientValidTxsError)) {
|
|
1005
1016
|
return {
|
|
1006
1017
|
failedTxs: err.failedTxs,
|
|
1007
|
-
|
|
1018
|
+
processedCount: err.processedCount,
|
|
1019
|
+
status: 'insufficient-valid-txs'
|
|
1008
1020
|
};
|
|
1009
1021
|
}
|
|
1010
1022
|
throw err;
|
|
@@ -1023,7 +1035,8 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
1023
1035
|
if (startBuildingDeadline === undefined || now >= startBuildingDeadline) {
|
|
1024
1036
|
return {
|
|
1025
1037
|
canStartBuilding: false,
|
|
1026
|
-
availableTxs
|
|
1038
|
+
availableTxs,
|
|
1039
|
+
minTxs
|
|
1027
1040
|
};
|
|
1028
1041
|
}
|
|
1029
1042
|
// Wait a bit before checking again
|
|
@@ -1033,12 +1046,13 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
1033
1046
|
slot: this.slot,
|
|
1034
1047
|
indexWithinCheckpoint
|
|
1035
1048
|
});
|
|
1036
|
-
await
|
|
1049
|
+
await this.waitForTxsPollingInterval();
|
|
1037
1050
|
availableTxs = await this.p2pClient.getPendingTxCount();
|
|
1038
1051
|
}
|
|
1039
1052
|
return {
|
|
1040
1053
|
canStartBuilding: true,
|
|
1041
|
-
availableTxs
|
|
1054
|
+
availableTxs,
|
|
1055
|
+
minTxs
|
|
1042
1056
|
};
|
|
1043
1057
|
}
|
|
1044
1058
|
/**
|
|
@@ -1075,10 +1089,16 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
1075
1089
|
try {
|
|
1076
1090
|
const attestations = await this.validatorClient.collectAttestations(proposal, numberOfRequiredAttestations, attestationDeadline);
|
|
1077
1091
|
collectedAttestationsCount = attestations.length;
|
|
1092
|
+
// Trim attestations to minimum required to save L1 calldata gas
|
|
1093
|
+
const localAddresses = this.validatorClient.getValidatorAddresses();
|
|
1094
|
+
const trimmed = trimAttestations(attestations, numberOfRequiredAttestations, this.attestorAddress, localAddresses);
|
|
1095
|
+
if (trimmed.length < attestations.length) {
|
|
1096
|
+
this.log.debug(`Trimmed attestations from ${attestations.length} to ${trimmed.length} for L1 submission`);
|
|
1097
|
+
}
|
|
1078
1098
|
// Rollup contract requires that the signatures are provided in the order of the committee
|
|
1079
|
-
const sorted = orderAttestations(
|
|
1099
|
+
const sorted = orderAttestations(trimmed, committee);
|
|
1080
1100
|
// Manipulate the attestations if we've been configured to do so
|
|
1081
|
-
if (this.config.injectFakeAttestation || this.config.shuffleAttestationOrdering) {
|
|
1101
|
+
if (this.config.injectFakeAttestation || this.config.injectHighSValueAttestation || this.config.injectUnrecoverableSignatureAttestation || this.config.shuffleAttestationOrdering) {
|
|
1082
1102
|
return this.manipulateAttestations(proposal.slotNumber, epoch, seed, committee, sorted);
|
|
1083
1103
|
}
|
|
1084
1104
|
return new CommitteeAttestationsAndSigners(sorted);
|
|
@@ -1095,7 +1115,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
1095
1115
|
// Compute the proposer index in the committee, since we dont want to tweak it.
|
|
1096
1116
|
// Otherwise, the L1 rollup contract will reject the block outright.
|
|
1097
1117
|
const proposerIndex = Number(this.epochCache.computeProposerIndex(slotNumber, epoch, seed, BigInt(committee.length)));
|
|
1098
|
-
if (this.config.injectFakeAttestation) {
|
|
1118
|
+
if (this.config.injectFakeAttestation || this.config.injectHighSValueAttestation || this.config.injectUnrecoverableSignatureAttestation) {
|
|
1099
1119
|
// Find non-empty attestations that are not from the proposer
|
|
1100
1120
|
const nonProposerIndices = [];
|
|
1101
1121
|
for(let i = 0; i < attestations.length; i++){
|
|
@@ -1105,8 +1125,16 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
1105
1125
|
}
|
|
1106
1126
|
if (nonProposerIndices.length > 0) {
|
|
1107
1127
|
const targetIndex = nonProposerIndices[randomInt(nonProposerIndices.length)];
|
|
1108
|
-
this.
|
|
1109
|
-
|
|
1128
|
+
if (this.config.injectHighSValueAttestation) {
|
|
1129
|
+
this.log.warn(`Injecting high-s value attestation in checkpoint for slot ${slotNumber} at index ${targetIndex}`);
|
|
1130
|
+
unfreeze(attestations[targetIndex]).signature = flipSignature(attestations[targetIndex].signature);
|
|
1131
|
+
} else if (this.config.injectUnrecoverableSignatureAttestation) {
|
|
1132
|
+
this.log.warn(`Injecting unrecoverable signature attestation in checkpoint for slot ${slotNumber} at index ${targetIndex}`);
|
|
1133
|
+
unfreeze(attestations[targetIndex]).signature = generateUnrecoverableSignature();
|
|
1134
|
+
} else {
|
|
1135
|
+
this.log.warn(`Injecting fake attestation in checkpoint for slot ${slotNumber} at index ${targetIndex}`);
|
|
1136
|
+
unfreeze(attestations[targetIndex]).signature = generateRecoverableSignature();
|
|
1137
|
+
}
|
|
1110
1138
|
}
|
|
1111
1139
|
return new CommitteeAttestationsAndSigners(attestations);
|
|
1112
1140
|
}
|
|
@@ -1135,14 +1163,18 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
1135
1163
|
const failedTxData = failedTxs.map((fail)=>fail.tx);
|
|
1136
1164
|
const failedTxHashes = failedTxData.map((tx)=>tx.getTxHash());
|
|
1137
1165
|
this.log.verbose(`Dropping failed txs ${failedTxHashes.join(', ')}`);
|
|
1138
|
-
await this.p2pClient.
|
|
1166
|
+
await this.p2pClient.handleFailedExecution(failedTxHashes);
|
|
1139
1167
|
}
|
|
1140
1168
|
/**
|
|
1141
1169
|
* Adds the proposed block to the archiver so it's available via P2P.
|
|
1142
1170
|
* Gossip doesn't echo messages back to the sender, so the proposer's archiver/world-state
|
|
1143
1171
|
* would never receive its own block without this explicit sync.
|
|
1172
|
+
*
|
|
1173
|
+
* In fisherman mode we skip this push: the fisherman builds blocks locally for validation
|
|
1174
|
+
* and fee analysis only, and pushing them to the archiver causes spurious reorg cascades
|
|
1175
|
+
* whenever the real proposer's block arrives from L1.
|
|
1144
1176
|
*/ async syncProposedBlockToArchiver(block) {
|
|
1145
|
-
if (this.config.skipPushProposedBlocksToArchiver !== false) {
|
|
1177
|
+
if (this.config.skipPushProposedBlocksToArchiver !== false || this.config.fishermanMode) {
|
|
1146
1178
|
this.log.warn(`Skipping push of proposed block ${block.number} to archiver`, {
|
|
1147
1179
|
blockNumber: block.number,
|
|
1148
1180
|
slot: block.header.globalVariables.slotNumber
|
|
@@ -1170,15 +1202,38 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
|
|
|
1170
1202
|
slot: this.slot,
|
|
1171
1203
|
feeAnalysisId: feeAnalysis?.id
|
|
1172
1204
|
});
|
|
1173
|
-
this.metrics.
|
|
1205
|
+
this.metrics.recordCheckpointProposalFailed('block_build_failed');
|
|
1174
1206
|
}
|
|
1175
1207
|
this.publisher.clearPendingRequests();
|
|
1176
1208
|
}
|
|
1209
|
+
/**
|
|
1210
|
+
* Helper to handle HA double-signing errors. Returns true if the error was handled (caller should yield).
|
|
1211
|
+
*/ handleHASigningError(err, errorContext) {
|
|
1212
|
+
if (err instanceof DutyAlreadySignedError) {
|
|
1213
|
+
this.log.info(`${errorContext} for slot ${this.slot} already signed by another HA node, yielding`, {
|
|
1214
|
+
slot: this.slot,
|
|
1215
|
+
signedByNode: err.signedByNode
|
|
1216
|
+
});
|
|
1217
|
+
return true;
|
|
1218
|
+
}
|
|
1219
|
+
if (err instanceof SlashingProtectionError) {
|
|
1220
|
+
this.log.info(`${errorContext} for slot ${this.slot} blocked by slashing protection, yielding`, {
|
|
1221
|
+
slot: this.slot,
|
|
1222
|
+
existingMessageHash: err.existingMessageHash,
|
|
1223
|
+
attemptedMessageHash: err.attemptedMessageHash
|
|
1224
|
+
});
|
|
1225
|
+
return true;
|
|
1226
|
+
}
|
|
1227
|
+
return false;
|
|
1228
|
+
}
|
|
1177
1229
|
/** Waits until a specific time within the current slot */ async waitUntilTimeInSlot(targetSecondsIntoSlot) {
|
|
1178
1230
|
const slotStartTimestamp = this.getSlotStartBuildTimestamp();
|
|
1179
1231
|
const targetTimestamp = slotStartTimestamp + targetSecondsIntoSlot;
|
|
1180
1232
|
await sleepUntil(new Date(targetTimestamp * 1000), this.dateProvider.nowAsDate());
|
|
1181
1233
|
}
|
|
1234
|
+
/** Waits the polling interval for transactions. Extracted for test overriding. */ async waitForTxsPollingInterval() {
|
|
1235
|
+
await sleep(TXS_POLLING_MS);
|
|
1236
|
+
}
|
|
1182
1237
|
getSlotStartBuildTimestamp() {
|
|
1183
1238
|
return getSlotStartBuildTimestamp(this.slot, this.l1Constants);
|
|
1184
1239
|
}
|
|
@@ -20,7 +20,6 @@ export declare class CheckpointVoter {
|
|
|
20
20
|
private readonly config;
|
|
21
21
|
private readonly metrics;
|
|
22
22
|
private readonly log;
|
|
23
|
-
private slotTimestamp;
|
|
24
23
|
private governanceSigner;
|
|
25
24
|
private slashingSigner;
|
|
26
25
|
constructor(slot: SlotNumber, publisher: SequencerPublisher, attestorAddress: EthAddress, validatorClient: ValidatorClient, slasherClient: SlasherClientInterface | undefined, l1Constants: SequencerRollupConstants, config: ResolvedSequencerConfig, metrics: SequencerMetrics, log: Logger);
|
|
@@ -32,4 +31,4 @@ export declare class CheckpointVoter {
|
|
|
32
31
|
private enqueueGovernanceVote;
|
|
33
32
|
private enqueueSlashingVote;
|
|
34
33
|
}
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF92b3Rlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcXVlbmNlci9jaGVja3BvaW50X3ZvdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2xFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMvRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQU0vRCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRTNEOztHQUVHO0FBQ0gscUJBQWEsZUFBZTtJQUt4QixPQUFPLENBQUMsUUFBUSxDQUFDLElBQUk7SUFDckIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBQzFCLE9BQU8sQ0FBQyxRQUFRLENBQUMsZUFBZTtJQUNoQyxPQUFPLENBQUMsUUFBUSxDQUFDLGVBQWU7SUFDaEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhO0lBQzlCLE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVztJQUM1QixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxPQUFPO0lBQ3hCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRztJQVp0QixPQUFPLENBQUMsZ0JBQWdCLENBQXVEO0lBQy9FLE9BQU8sQ0FBQyxjQUFjLENBQXVEO0lBRTdFLFlBQ21CLElBQUksRUFBRSxVQUFVLEVBQ2hCLFNBQVMsRUFBRSxrQkFBa0IsRUFDN0IsZUFBZSxFQUFFLFVBQVUsRUFDM0IsZUFBZSxFQUFFLGVBQWUsRUFDaEMsYUFBYSxFQUFFLHNCQUFzQixHQUFHLFNBQVMsRUFDakQsV0FBVyxFQUFFLHdCQUF3QixFQUNyQyxNQUFNLEVBQUUsdUJBQXVCLEVBQy9CLE9BQU8sRUFBRSxnQkFBZ0IsRUFDekIsR0FBRyxFQUFFLE1BQU0sRUFXN0I7SUFFRDs7O09BR0c7SUFDSCxZQUFZLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxHQUFHLFNBQVMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxPQUFPLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FVM0U7WUFFYSxxQkFBcUI7WUErQnJCLG1CQUFtQjtDQTJCbEMifQ==
|
|
@@ -1 +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;
|
|
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;AAC7D,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;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,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,EAW7B;IAED;;;OAGG;IACH,YAAY,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,EAAE,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC,CAU3E;YAEa,qBAAqB;YA+BrB,mBAAmB;CA2BlC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
|
|
2
1
|
import { DutyAlreadySignedError } from '@aztec/validator-ha-signer/errors';
|
|
3
2
|
import { DutyType } from '@aztec/validator-ha-signer/types';
|
|
4
3
|
/**
|
|
@@ -13,7 +12,6 @@ import { DutyType } from '@aztec/validator-ha-signer/types';
|
|
|
13
12
|
config;
|
|
14
13
|
metrics;
|
|
15
14
|
log;
|
|
16
|
-
slotTimestamp;
|
|
17
15
|
governanceSigner;
|
|
18
16
|
slashingSigner;
|
|
19
17
|
constructor(slot, publisher, attestorAddress, validatorClient, slasherClient, l1Constants, config, metrics, log){
|
|
@@ -26,7 +24,6 @@ import { DutyType } from '@aztec/validator-ha-signer/types';
|
|
|
26
24
|
this.config = config;
|
|
27
25
|
this.metrics = metrics;
|
|
28
26
|
this.log = log;
|
|
29
|
-
this.slotTimestamp = getTimestampForSlot(this.slot, this.l1Constants);
|
|
30
27
|
// Create separate signers with appropriate duty contexts for governance and slashing votes
|
|
31
28
|
// These use HA protection to ensure only one node signs per slot/duty
|
|
32
29
|
const governanceContext = {
|
|
@@ -69,7 +66,7 @@ import { DutyType } from '@aztec/validator-ha-signer/types';
|
|
|
69
66
|
governanceProposerPayload: governanceProposerPayload.toString()
|
|
70
67
|
});
|
|
71
68
|
try {
|
|
72
|
-
return await this.publisher.enqueueGovernanceCastSignal(governanceProposerPayload, this.slot, this.
|
|
69
|
+
return await this.publisher.enqueueGovernanceCastSignal(governanceProposerPayload, this.slot, this.attestorAddress, this.governanceSigner);
|
|
73
70
|
} catch (err) {
|
|
74
71
|
if (err instanceof DutyAlreadySignedError) {
|
|
75
72
|
this.log.info(`Governance vote already signed by another node`, {
|
|
@@ -93,7 +90,7 @@ import { DutyType } from '@aztec/validator-ha-signer/types';
|
|
|
93
90
|
actionCount: actions.length
|
|
94
91
|
});
|
|
95
92
|
this.metrics.recordSlashingAttempt(actions.length);
|
|
96
|
-
return await this.publisher.enqueueSlashingActions(actions, this.slot, this.
|
|
93
|
+
return await this.publisher.enqueueSlashingActions(actions, this.slot, this.attestorAddress, this.slashingSigner);
|
|
97
94
|
} catch (err) {
|
|
98
95
|
if (err instanceof DutyAlreadySignedError) {
|
|
99
96
|
this.log.info(`Slashing vote already signed by another node`, {
|