@aztec/sequencer-client 0.0.1-commit.ee80a48 → 0.0.1-commit.ef17749e1

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.
Files changed (73) hide show
  1. package/dest/client/sequencer-client.d.ts +23 -7
  2. package/dest/client/sequencer-client.d.ts.map +1 -1
  3. package/dest/client/sequencer-client.js +99 -16
  4. package/dest/config.d.ts +24 -6
  5. package/dest/config.d.ts.map +1 -1
  6. package/dest/config.js +40 -28
  7. package/dest/global_variable_builder/global_builder.d.ts +2 -4
  8. package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
  9. package/dest/publisher/config.d.ts +35 -17
  10. package/dest/publisher/config.d.ts.map +1 -1
  11. package/dest/publisher/config.js +106 -42
  12. package/dest/publisher/index.d.ts +2 -1
  13. package/dest/publisher/index.d.ts.map +1 -1
  14. package/dest/publisher/l1_tx_failed_store/factory.d.ts +11 -0
  15. package/dest/publisher/l1_tx_failed_store/factory.d.ts.map +1 -0
  16. package/dest/publisher/l1_tx_failed_store/factory.js +22 -0
  17. package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts +59 -0
  18. package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts.map +1 -0
  19. package/dest/publisher/l1_tx_failed_store/failed_tx_store.js +1 -0
  20. package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.d.ts +15 -0
  21. package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.d.ts.map +1 -0
  22. package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.js +34 -0
  23. package/dest/publisher/l1_tx_failed_store/index.d.ts +4 -0
  24. package/dest/publisher/l1_tx_failed_store/index.d.ts.map +1 -0
  25. package/dest/publisher/l1_tx_failed_store/index.js +2 -0
  26. package/dest/publisher/sequencer-publisher-factory.d.ts +11 -3
  27. package/dest/publisher/sequencer-publisher-factory.d.ts.map +1 -1
  28. package/dest/publisher/sequencer-publisher-factory.js +27 -2
  29. package/dest/publisher/sequencer-publisher.d.ts +26 -7
  30. package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
  31. package/dest/publisher/sequencer-publisher.js +299 -30
  32. package/dest/sequencer/checkpoint_proposal_job.d.ts +4 -4
  33. package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -1
  34. package/dest/sequencer/checkpoint_proposal_job.js +104 -48
  35. package/dest/sequencer/metrics.d.ts +17 -5
  36. package/dest/sequencer/metrics.d.ts.map +1 -1
  37. package/dest/sequencer/metrics.js +86 -15
  38. package/dest/sequencer/sequencer.d.ts +23 -12
  39. package/dest/sequencer/sequencer.d.ts.map +1 -1
  40. package/dest/sequencer/sequencer.js +25 -26
  41. package/dest/sequencer/timetable.d.ts +4 -6
  42. package/dest/sequencer/timetable.d.ts.map +1 -1
  43. package/dest/sequencer/timetable.js +7 -11
  44. package/dest/sequencer/types.d.ts +5 -2
  45. package/dest/sequencer/types.d.ts.map +1 -1
  46. package/dest/test/index.d.ts +3 -5
  47. package/dest/test/index.d.ts.map +1 -1
  48. package/dest/test/mock_checkpoint_builder.d.ts +8 -8
  49. package/dest/test/mock_checkpoint_builder.d.ts.map +1 -1
  50. package/dest/test/mock_checkpoint_builder.js +45 -34
  51. package/dest/test/utils.d.ts +3 -3
  52. package/dest/test/utils.d.ts.map +1 -1
  53. package/dest/test/utils.js +5 -4
  54. package/package.json +28 -28
  55. package/src/client/sequencer-client.ts +135 -18
  56. package/src/config.ts +54 -38
  57. package/src/global_variable_builder/global_builder.ts +1 -1
  58. package/src/publisher/config.ts +121 -43
  59. package/src/publisher/index.ts +3 -0
  60. package/src/publisher/l1_tx_failed_store/factory.ts +32 -0
  61. package/src/publisher/l1_tx_failed_store/failed_tx_store.ts +55 -0
  62. package/src/publisher/l1_tx_failed_store/file_store_failed_tx_store.ts +46 -0
  63. package/src/publisher/l1_tx_failed_store/index.ts +3 -0
  64. package/src/publisher/sequencer-publisher-factory.ts +38 -6
  65. package/src/publisher/sequencer-publisher.ts +300 -43
  66. package/src/sequencer/checkpoint_proposal_job.ts +142 -54
  67. package/src/sequencer/metrics.ts +92 -18
  68. package/src/sequencer/sequencer.ts +33 -31
  69. package/src/sequencer/timetable.ts +13 -12
  70. package/src/sequencer/types.ts +4 -1
  71. package/src/test/index.ts +2 -4
  72. package/src/test/mock_checkpoint_builder.ts +60 -46
  73. 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 { Signature } from '@aztec/foundation/eth-signature';
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
451
  import { NoValidTxsError } 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.recordBlockProposalSuccess();
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 previousCheckpoints = (await this.l2BlockSource.getCheckpointsForEpoch(this.epoch)).filter((c)=>c.number < this.checkpointNumber);
644
- const previousCheckpointOutHashes = previousCheckpoints.map((c)=>c.getCheckpointOutHash());
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
- }), false);
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);
@@ -681,10 +682,36 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
681
682
  });
682
683
  return undefined;
683
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
+ }
684
694
  // Assemble and broadcast the checkpoint proposal, including the last block that was not
685
695
  // broadcasted yet, and wait to collect the committee attestations.
686
696
  this.setStateFn(SequencerState.ASSEMBLING_CHECKPOINT, this.slot);
687
697
  const checkpoint = await checkpointBuilder.completeCheckpoint();
698
+ // Final validation round for the checkpoint before we propose it, just for safety
699
+ try {
700
+ validateCheckpoint(checkpoint, {
701
+ rollupManaLimit: this.l1Constants.rollupManaLimit,
702
+ maxL2BlockGas: this.config.maxL2BlockGas,
703
+ maxDABlockGas: this.config.maxDABlockGas,
704
+ maxTxsPerBlock: this.config.maxTxsPerBlock,
705
+ maxTxsPerCheckpoint: this.config.maxTxsPerCheckpoint
706
+ });
707
+ } catch (err) {
708
+ this.log.error(`Built an invalid checkpoint at slot ${this.slot} (skipping proposal)`, err, {
709
+ checkpoint: checkpoint.header.toInspect()
710
+ });
711
+ return undefined;
712
+ }
713
+ // Record checkpoint-level build metrics
714
+ this.metrics.recordCheckpointBuild(checkpointBuildTimer.ms(), blocksInCheckpoint.length, checkpoint.getStats().txCount, Number(checkpoint.header.totalManaUsed.toBigInt()));
688
715
  // Do not collect attestations nor publish to L1 in fisherman mode
689
716
  if (this.config.fishermanMode) {
690
717
  this.log.info(`Built checkpoint for slot ${this.slot} with ${blocksInCheckpoint.length} blocks. ` + `Skipping proposal in fisherman mode.`, {
@@ -702,7 +729,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
702
729
  txs: blockPendingBroadcast.txs
703
730
  };
704
731
  // Create the checkpoint proposal and broadcast it
705
- const proposal = await this.validatorClient.createCheckpointProposal(checkpoint.header, checkpoint.archive.root, lastBlock, this.proposer, checkpointProposalOptions);
732
+ const proposal = await this.validatorClient.createCheckpointProposal(checkpoint.header, checkpoint.archive.root, feeAssetPriceModifier, lastBlock, this.proposer, checkpointProposalOptions);
706
733
  const blockProposedAt = this.dateProvider.now();
707
734
  await this.p2pClient.broadcastCheckpointProposal(proposal);
708
735
  this.setStateFn(SequencerState.COLLECTING_ATTESTATIONS, this.slot);
@@ -727,6 +754,14 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
727
754
  const aztecSlotDuration = this.l1Constants.slotDuration;
728
755
  const slotStartBuildTimestamp = this.getSlotStartBuildTimestamp();
729
756
  const txTimeoutAt = new Date((slotStartBuildTimestamp + aztecSlotDuration) * 1000);
757
+ // If we have been configured to potentially skip publishing checkpoint then roll the dice here
758
+ if (this.config.skipPublishingCheckpointsPercent !== undefined && this.config.skipPublishingCheckpointsPercent > 0) {
759
+ const result = Math.max(0, randomInt(100));
760
+ if (result < this.config.skipPublishingCheckpointsPercent) {
761
+ this.log.warn(`Skipping publishing proposal for checkpoint ${checkpoint.number}. Configured percentage: ${this.config.skipPublishingCheckpointsPercent}, generated value: ${result}`);
762
+ return checkpoint;
763
+ }
764
+ }
730
765
  await this.publisher.enqueueProposeCheckpoint(checkpoint, attestations, attestationsSignature, {
731
766
  txTimeoutAt,
732
767
  forcePendingCheckpointNumber: this.invalidateCheckpoint?.forcePendingCheckpointNumber
@@ -736,7 +771,8 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
736
771
  env.error = e;
737
772
  env.hasError = true;
738
773
  } finally{
739
- _ts_dispose_resources(env);
774
+ const result = _ts_dispose_resources(env);
775
+ if (result) await result;
740
776
  }
741
777
  } catch (err) {
742
778
  if (err && (err instanceof DutyAlreadySignedError || err instanceof SlashingProtectionError)) {
@@ -753,8 +789,6 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
753
789
  const blocksInCheckpoint = [];
754
790
  const txHashesAlreadyIncluded = new Set();
755
791
  const initialBlockNumber = BlockNumber(this.syncedToBlockNumber + 1);
756
- // Remaining blob fields available for blocks (checkpoint end marker already subtracted)
757
- let remainingBlobFields = BLOBS_PER_CHECKPOINT * FIELDS_PER_BLOB - NUM_CHECKPOINT_END_MARKER_FIELDS;
758
792
  // Last block in the checkpoint will usually be flagged as pending broadcast, so we send it along with the checkpoint proposal
759
793
  let blockPendingBroadcast = undefined;
760
794
  while(true){
@@ -780,8 +814,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
780
814
  buildDeadline: timingInfo.deadline ? new Date((this.getSlotStartBuildTimestamp() + timingInfo.deadline) * 1000) : undefined,
781
815
  blockNumber,
782
816
  indexWithinCheckpoint,
783
- txHashesAlreadyIncluded,
784
- remainingBlobFields
817
+ txHashesAlreadyIncluded
785
818
  });
786
819
  // TODO(palla/mbps): Review these conditions. We may want to keep trying in some scenarios.
787
820
  if (!buildResult && timingInfo.isLastBlock) {
@@ -803,10 +836,8 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
803
836
  }
804
837
  break;
805
838
  }
806
- const { block, usedTxs, remainingBlobFields: newRemainingBlobFields } = buildResult;
839
+ const { block, usedTxs } = buildResult;
807
840
  blocksInCheckpoint.push(block);
808
- // Update remaining blob fields for the next block
809
- remainingBlobFields = newRemainingBlobFields;
810
841
  // Sync the proposed block to the archiver to make it available
811
842
  // Note that the checkpoint builder uses its own fork so it should not need to wait for this syncing
812
843
  // Eventually we should refactor the checkpoint builder to not need a separate long-lived fork
@@ -857,7 +888,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
857
888
  await this.waitUntilTimeInSlot(nextSubslotStart);
858
889
  }
859
890
  /** Builds a single block. Called from the main block building loop. */ async buildSingleBlock(checkpointBuilder, opts) {
860
- const { blockTimestamp, forceCreate, blockNumber, indexWithinCheckpoint, buildDeadline, txHashesAlreadyIncluded, remainingBlobFields } = opts;
891
+ const { blockTimestamp, forceCreate, blockNumber, indexWithinCheckpoint, buildDeadline, txHashesAlreadyIncluded } = opts;
861
892
  this.log.verbose(`Preparing block ${blockNumber} index ${indexWithinCheckpoint} at checkpoint ${this.checkpointNumber} for slot ${this.slot}`, {
862
893
  ...checkpointBuilder.getConstantData(),
863
894
  ...opts
@@ -882,22 +913,20 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
882
913
  }
883
914
  // Create iterator to pending txs. We filter out txs already included in previous blocks in the checkpoint
884
915
  // just in case p2p failed to sync the provisional block and didn't get to remove those txs from the mempool yet.
885
- const pendingTxs = filter(this.p2pClient.iteratePendingTxs(), (tx)=>!txHashesAlreadyIncluded.has(tx.txHash.toString()));
916
+ const pendingTxs = filter(this.p2pClient.iterateEligiblePendingTxs(), (tx)=>!txHashesAlreadyIncluded.has(tx.txHash.toString()));
886
917
  this.log.debug(`Building block ${blockNumber} at index ${indexWithinCheckpoint} for slot ${this.slot} with ${availableTxs} available txs`, {
887
918
  slot: this.slot,
888
919
  blockNumber,
889
920
  indexWithinCheckpoint
890
921
  });
891
922
  this.setStateFn(SequencerState.CREATING_BLOCK, this.slot);
892
- // Calculate blob fields limit for txs (remaining capacity - this block's end overhead)
893
- const blockEndOverhead = getNumBlockEndBlobFields(indexWithinCheckpoint === 0);
894
- const maxBlobFieldsForTxs = remainingBlobFields - blockEndOverhead;
923
+ // Per-block limits derived at startup by computeBlockLimits(), further capped
924
+ // by remaining checkpoint-level budgets inside CheckpointBuilder before each block is built.
895
925
  const blockBuilderOptions = {
896
926
  maxTransactions: this.config.maxTxsPerBlock,
897
- maxBlockSize: this.config.maxBlockSizeInBytes,
898
- maxBlockGas: new Gas(this.config.maxDABlockGas, this.config.maxL2BlockGas),
899
- maxBlobFields: maxBlobFieldsForTxs,
900
- deadline: buildDeadline
927
+ maxBlockGas: this.config.maxL2BlockGas !== undefined || this.config.maxDABlockGas !== undefined ? new Gas(this.config.maxDABlockGas ?? Infinity, this.config.maxL2BlockGas ?? Infinity) : undefined,
928
+ deadline: buildDeadline,
929
+ isBuildingProposal: true
901
930
  };
902
931
  // Actually build the block by executing txs
903
932
  const buildResult = await this.buildSingleBlockWithCheckpointBuilder(checkpointBuilder, pendingTxs, blockNumber, blockTimestamp, blockBuilderOptions);
@@ -924,7 +953,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
924
953
  return undefined;
925
954
  }
926
955
  // Block creation succeeded, emit stats and metrics
927
- const { publicGas, block, publicProcessorDuration, usedTxs, usedTxBlobFields, blockBuildDuration } = buildResult;
956
+ const { block, publicProcessorDuration, usedTxs, blockBuildDuration } = buildResult;
928
957
  const blockStats = {
929
958
  eventName: 'l2-block-built',
930
959
  duration: blockBuildDuration,
@@ -933,7 +962,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
933
962
  };
934
963
  const blockHash = await block.hash();
935
964
  const txHashes = block.body.txEffects.map((tx)=>tx.txHash);
936
- const manaPerSec = publicGas.l2Gas / (blockBuildDuration / 1000);
965
+ const manaPerSec = block.header.totalManaUsed.toNumberUnsafe() / (blockBuildDuration / 1000);
937
966
  this.log.info(`Built block ${block.number} at checkpoint ${this.checkpointNumber} for slot ${this.slot} with ${numTxs} txs`, {
938
967
  blockHash,
939
968
  txHashes,
@@ -944,11 +973,10 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
944
973
  blockNumber: block.number,
945
974
  slot: this.slot
946
975
  });
947
- this.metrics.recordBuiltBlock(blockBuildDuration, publicGas.l2Gas);
976
+ this.metrics.recordBuiltBlock(blockBuildDuration, block.header.totalManaUsed.toNumberUnsafe());
948
977
  return {
949
978
  block,
950
- usedTxs,
951
- remainingBlobFields: maxBlobFieldsForTxs - usedTxBlobFields
979
+ usedTxs
952
980
  };
953
981
  } catch (err) {
954
982
  this.eventEmitter.emit('block-build-failed', {
@@ -1009,7 +1037,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
1009
1037
  slot: this.slot,
1010
1038
  indexWithinCheckpoint
1011
1039
  });
1012
- await sleep(TXS_POLLING_MS);
1040
+ await this.waitForTxsPollingInterval();
1013
1041
  availableTxs = await this.p2pClient.getPendingTxCount();
1014
1042
  }
1015
1043
  return {
@@ -1051,10 +1079,16 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
1051
1079
  try {
1052
1080
  const attestations = await this.validatorClient.collectAttestations(proposal, numberOfRequiredAttestations, attestationDeadline);
1053
1081
  collectedAttestationsCount = attestations.length;
1082
+ // Trim attestations to minimum required to save L1 calldata gas
1083
+ const localAddresses = this.validatorClient.getValidatorAddresses();
1084
+ const trimmed = trimAttestations(attestations, numberOfRequiredAttestations, this.attestorAddress, localAddresses);
1085
+ if (trimmed.length < attestations.length) {
1086
+ this.log.debug(`Trimmed attestations from ${attestations.length} to ${trimmed.length} for L1 submission`);
1087
+ }
1054
1088
  // Rollup contract requires that the signatures are provided in the order of the committee
1055
- const sorted = orderAttestations(attestations, committee);
1089
+ const sorted = orderAttestations(trimmed, committee);
1056
1090
  // Manipulate the attestations if we've been configured to do so
1057
- if (this.config.injectFakeAttestation || this.config.shuffleAttestationOrdering) {
1091
+ if (this.config.injectFakeAttestation || this.config.injectHighSValueAttestation || this.config.injectUnrecoverableSignatureAttestation || this.config.shuffleAttestationOrdering) {
1058
1092
  return this.manipulateAttestations(proposal.slotNumber, epoch, seed, committee, sorted);
1059
1093
  }
1060
1094
  return new CommitteeAttestationsAndSigners(sorted);
@@ -1071,7 +1105,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
1071
1105
  // Compute the proposer index in the committee, since we dont want to tweak it.
1072
1106
  // Otherwise, the L1 rollup contract will reject the block outright.
1073
1107
  const proposerIndex = Number(this.epochCache.computeProposerIndex(slotNumber, epoch, seed, BigInt(committee.length)));
1074
- if (this.config.injectFakeAttestation) {
1108
+ if (this.config.injectFakeAttestation || this.config.injectHighSValueAttestation || this.config.injectUnrecoverableSignatureAttestation) {
1075
1109
  // Find non-empty attestations that are not from the proposer
1076
1110
  const nonProposerIndices = [];
1077
1111
  for(let i = 0; i < attestations.length; i++){
@@ -1081,8 +1115,16 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
1081
1115
  }
1082
1116
  if (nonProposerIndices.length > 0) {
1083
1117
  const targetIndex = nonProposerIndices[randomInt(nonProposerIndices.length)];
1084
- this.log.warn(`Injecting fake attestation in checkpoint for slot ${slotNumber} at index ${targetIndex}`);
1085
- unfreeze(attestations[targetIndex]).signature = Signature.random();
1118
+ if (this.config.injectHighSValueAttestation) {
1119
+ this.log.warn(`Injecting high-s value attestation in checkpoint for slot ${slotNumber} at index ${targetIndex}`);
1120
+ unfreeze(attestations[targetIndex]).signature = flipSignature(attestations[targetIndex].signature);
1121
+ } else if (this.config.injectUnrecoverableSignatureAttestation) {
1122
+ this.log.warn(`Injecting unrecoverable signature attestation in checkpoint for slot ${slotNumber} at index ${targetIndex}`);
1123
+ unfreeze(attestations[targetIndex]).signature = generateUnrecoverableSignature();
1124
+ } else {
1125
+ this.log.warn(`Injecting fake attestation in checkpoint for slot ${slotNumber} at index ${targetIndex}`);
1126
+ unfreeze(attestations[targetIndex]).signature = generateRecoverableSignature();
1127
+ }
1086
1128
  }
1087
1129
  return new CommitteeAttestationsAndSigners(attestations);
1088
1130
  }
@@ -1091,14 +1133,25 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
1091
1133
  const shuffled = [
1092
1134
  ...attestations
1093
1135
  ];
1094
- const [i, j] = [
1095
- (proposerIndex + 1) % shuffled.length,
1096
- (proposerIndex + 2) % shuffled.length
1097
- ];
1098
- const valueI = shuffled[i];
1099
- const valueJ = shuffled[j];
1100
- shuffled[i] = valueJ;
1101
- shuffled[j] = valueI;
1136
+ // Find two non-proposer positions that both have non-empty signatures to swap.
1137
+ // This ensures the bitmap doesn't change, so the MaliciousCommitteeAttestationsAndSigners
1138
+ // signers array stays correctly aligned with L1's committee reconstruction.
1139
+ const swappable = [];
1140
+ for(let k = 0; k < shuffled.length; k++){
1141
+ if (!shuffled[k].signature.isEmpty() && k !== proposerIndex) {
1142
+ swappable.push(k);
1143
+ }
1144
+ }
1145
+ if (swappable.length >= 2) {
1146
+ const [i, j] = [
1147
+ swappable[0],
1148
+ swappable[1]
1149
+ ];
1150
+ [shuffled[i], shuffled[j]] = [
1151
+ shuffled[j],
1152
+ shuffled[i]
1153
+ ];
1154
+ }
1102
1155
  const signers = new CommitteeAttestationsAndSigners(attestations).getSigners();
1103
1156
  return new MaliciousCommitteeAttestationsAndSigners(shuffled, signers);
1104
1157
  }
@@ -1111,7 +1164,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
1111
1164
  const failedTxData = failedTxs.map((fail)=>fail.tx);
1112
1165
  const failedTxHashes = failedTxData.map((tx)=>tx.getTxHash());
1113
1166
  this.log.verbose(`Dropping failed txs ${failedTxHashes.join(', ')}`);
1114
- await this.p2pClient.deleteTxs(failedTxHashes);
1167
+ await this.p2pClient.handleFailedExecution(failedTxHashes);
1115
1168
  }
1116
1169
  /**
1117
1170
  * Adds the proposed block to the archiver so it's available via P2P.
@@ -1146,7 +1199,7 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
1146
1199
  slot: this.slot,
1147
1200
  feeAnalysisId: feeAnalysis?.id
1148
1201
  });
1149
- this.metrics.recordBlockProposalFailed('block_build_failed');
1202
+ this.metrics.recordCheckpointProposalFailed('block_build_failed');
1150
1203
  }
1151
1204
  this.publisher.clearPendingRequests();
1152
1205
  }
@@ -1175,6 +1228,9 @@ _dec = trackSpan('CheckpointProposalJob.execute'), _dec1 = trackSpan('Checkpoint
1175
1228
  const targetTimestamp = slotStartTimestamp + targetSecondsIntoSlot;
1176
1229
  await sleepUntil(new Date(targetTimestamp * 1000), this.dateProvider.nowAsDate());
1177
1230
  }
1231
+ /** Waits the polling interval for transactions. Extracted for test overriding. */ async waitForTxsPollingInterval() {
1232
+ await sleep(TXS_POLLING_MS);
1233
+ }
1178
1234
  getSlotStartBuildTimestamp() {
1179
1235
  return getSlotStartBuildTimestamp(this.slot, this.l1Constants);
1180
1236
  }
@@ -21,15 +21,24 @@ export declare class SequencerMetrics {
21
21
  private slots;
22
22
  private filledSlots;
23
23
  private blockProposalFailed;
24
- private blockProposalSuccess;
25
- private blockProposalPrecheckFailed;
24
+ private checkpointProposalSuccess;
25
+ private checkpointPrecheckFailed;
26
+ private checkpointProposalFailed;
26
27
  private checkpointSuccess;
27
28
  private slashingAttempts;
28
29
  private checkpointAttestationDelay;
30
+ private checkpointBuildDuration;
31
+ private checkpointBlockCount;
32
+ private checkpointTxCount;
33
+ private checkpointTotalMana;
29
34
  private fishermanWouldBeIncluded;
30
35
  private fishermanTimeBeforeBlock;
31
36
  private fishermanPendingBlobTxCount;
32
37
  private fishermanIncludedBlobTxCount;
38
+ private fishermanPendingBlobCount;
39
+ private fishermanIncludedBlobCount;
40
+ private fishermanBlockBlobsFull;
41
+ private fishermanMaxBlobCapacity;
33
42
  private fishermanCalculatedPriorityFee;
34
43
  private fishermanPriorityFeeDelta;
35
44
  private fishermanEstimatedCost;
@@ -48,8 +57,11 @@ export declare class SequencerMetrics {
48
57
  incFilledSlot(proposer: string, coinbase: Hex | EthAddress | undefined): Promise<void>;
49
58
  recordCheckpointSuccess(): void;
50
59
  recordBlockProposalFailed(reason?: string): void;
51
- recordBlockProposalSuccess(): void;
52
- recordBlockProposalPrecheckFailed(checkType: 'slot_already_taken' | 'rollup_contract_check_failed' | 'slot_mismatch' | 'block_number_mismatch'): void;
60
+ recordCheckpointProposalSuccess(): void;
61
+ recordCheckpointPrecheckFailed(checkType: 'slot_already_taken' | 'rollup_contract_check_failed' | 'slot_mismatch' | 'block_number_mismatch'): void;
62
+ recordCheckpointProposalFailed(reason?: string): void;
63
+ /** Records aggregate metrics for a completed checkpoint build. */
64
+ recordCheckpointBuild(durationMs: number, blockCount: number, txCount: number, totalMana: number): void;
53
65
  recordSlashingAttempt(actionCount: number): void;
54
66
  /**
55
67
  * Records metrics for a completed fisherman fee analysis
@@ -57,4 +69,4 @@ export declare class SequencerMetrics {
57
69
  */
58
70
  recordFishermanFeeAnalysis(analysis: L1FeeAnalysisResult): void;
59
71
  }
60
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcXVlbmNlci9tZXRyaWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzNFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2xFLE9BQU8sRUFNTCxLQUFLLGVBQWUsRUFDcEIsS0FBSyxNQUFNLEVBR1osTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQWUsTUFBTSxNQUFNLENBQUM7QUFFN0MsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBR2pELHFCQUFhLGdCQUFnQjtJQTJDekIsT0FBTyxDQUFDLE1BQU07SUExQ2hCLFNBQWdCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDL0IsT0FBTyxDQUFDLEtBQUssQ0FBUTtJQUVyQixPQUFPLENBQUMsWUFBWSxDQUFnQjtJQUNwQyxPQUFPLENBQUMsa0JBQWtCLENBQVk7SUFDdEMsT0FBTyxDQUFDLHVCQUF1QixDQUFRO0lBQ3ZDLE9BQU8sQ0FBQyw2QkFBNkIsQ0FBWTtJQUdqRCxPQUFPLENBQUMseUJBQXlCLENBQVE7SUFDekMsT0FBTyxDQUFDLDhCQUE4QixDQUFRO0lBQzlDLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBUTtJQUNsQyxPQUFPLENBQUMsbUJBQW1CLENBQVE7SUFFbkMsT0FBTyxDQUFDLE9BQU8sQ0FBUTtJQUV2QixPQUFPLENBQUMsS0FBSyxDQUFnQjtJQUM3QixPQUFPLENBQUMsV0FBVyxDQUFnQjtJQUVuQyxPQUFPLENBQUMsbUJBQW1CLENBQWdCO0lBQzNDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBZ0I7SUFDNUMsT0FBTyxDQUFDLDJCQUEyQixDQUFnQjtJQUNuRCxPQUFPLENBQUMsaUJBQWlCLENBQWdCO0lBQ3pDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBZ0I7SUFDeEMsT0FBTyxDQUFDLDBCQUEwQixDQUFZO0lBRzlDLE9BQU8sQ0FBQyx3QkFBd0IsQ0FBZ0I7SUFDaEQsT0FBTyxDQUFDLHdCQUF3QixDQUFZO0lBQzVDLE9BQU8sQ0FBQywyQkFBMkIsQ0FBWTtJQUMvQyxPQUFPLENBQUMsNEJBQTRCLENBQVk7SUFDaEQsT0FBTyxDQUFDLDhCQUE4QixDQUFZO0lBQ2xELE9BQU8sQ0FBQyx5QkFBeUIsQ0FBWTtJQUM3QyxPQUFPLENBQUMsc0JBQXNCLENBQVk7SUFDMUMsT0FBTyxDQUFDLDZCQUE2QixDQUFZO0lBQ2pELE9BQU8sQ0FBQywrQkFBK0IsQ0FBWTtJQUNuRCxPQUFPLENBQUMsNkJBQTZCLENBQVk7SUFFakQsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFhO0lBRWxDLFlBQ0UsTUFBTSxFQUFFLGVBQWUsRUFDZixNQUFNLEVBQUUsY0FBYyxFQUM5QixJQUFJLFNBQWMsRUFrR25CO0lBRU0sMEJBQTBCLENBQUMseUJBQXlCLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLFFBT3ZGO0lBRU0sZ0NBQWdDLENBQUMsUUFBUSxFQUFFLE1BQU0sUUFFdkQ7SUFFTSwyQkFBMkIsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxNQUFNLFFBR25FO0lBRUQsZ0JBQWdCLENBQUMsZUFBZSxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSxRQU0xRDtJQUVELGlCQUFpQixTQUloQjtJQUVELDZCQUE2QixDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLGNBQWMsUUFJdEU7SUFFRCxXQUFXLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsTUFBTSxRQVc3QztJQUVLLGFBQWEsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxHQUFHLEdBQUcsVUFBVSxHQUFHLFNBQVMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBaUIzRjtJQUVELHVCQUF1QixTQUV0QjtJQUVELHlCQUF5QixDQUFDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sUUFJeEM7SUFFRCwwQkFBMEIsU0FFekI7SUFFRCxpQ0FBaUMsQ0FDL0IsU0FBUyxFQUFFLG9CQUFvQixHQUFHLDhCQUE4QixHQUFHLGVBQWUsR0FBRyx1QkFBdUIsUUFLN0c7SUFFRCxxQkFBcUIsQ0FBQyxXQUFXLEVBQUUsTUFBTSxRQUV4QztJQUVEOzs7T0FHRztJQUNILDBCQUEwQixDQUFDLFFBQVEsRUFBRSxtQkFBbUIsUUFxRnZEO0NBQ0YifQ==
72
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcXVlbmNlci9tZXRyaWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzNFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2xFLE9BQU8sRUFNTCxLQUFLLGVBQWUsRUFDcEIsS0FBSyxNQUFNLEVBR1osTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQWUsTUFBTSxNQUFNLENBQUM7QUFFN0MsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRWpELHFCQUFhLGdCQUFnQjtJQW9EekIsT0FBTyxDQUFDLE1BQU07SUFuRGhCLFNBQWdCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDL0IsT0FBTyxDQUFDLEtBQUssQ0FBUTtJQUVyQixPQUFPLENBQUMsWUFBWSxDQUFnQjtJQUNwQyxPQUFPLENBQUMsa0JBQWtCLENBQVk7SUFDdEMsT0FBTyxDQUFDLHVCQUF1QixDQUFRO0lBQ3ZDLE9BQU8sQ0FBQyw2QkFBNkIsQ0FBWTtJQUdqRCxPQUFPLENBQUMseUJBQXlCLENBQVE7SUFDekMsT0FBTyxDQUFDLDhCQUE4QixDQUFRO0lBQzlDLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBUTtJQUNsQyxPQUFPLENBQUMsbUJBQW1CLENBQVE7SUFFbkMsT0FBTyxDQUFDLE9BQU8sQ0FBUTtJQUV2QixPQUFPLENBQUMsS0FBSyxDQUFnQjtJQUM3QixPQUFPLENBQUMsV0FBVyxDQUFnQjtJQUVuQyxPQUFPLENBQUMsbUJBQW1CLENBQWdCO0lBQzND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
@@ -1 +1 @@
1
- {"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/sequencer/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAML,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,KAAK,GAAG,EAAe,MAAM,MAAM,CAAC;AAE7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAGjD,qBAAa,gBAAgB;IA2CzB,OAAO,CAAC,MAAM;IA1ChB,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,KAAK,CAAQ;IAErB,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,kBAAkB,CAAY;IACtC,OAAO,CAAC,uBAAuB,CAAQ;IACvC,OAAO,CAAC,6BAA6B,CAAY;IAGjD,OAAO,CAAC,yBAAyB,CAAQ;IACzC,OAAO,CAAC,8BAA8B,CAAQ;IAC9C,OAAO,CAAC,kBAAkB,CAAQ;IAClC,OAAO,CAAC,mBAAmB,CAAQ;IAEnC,OAAO,CAAC,OAAO,CAAQ;IAEvB,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,WAAW,CAAgB;IAEnC,OAAO,CAAC,mBAAmB,CAAgB;IAC3C,OAAO,CAAC,oBAAoB,CAAgB;IAC5C,OAAO,CAAC,2BAA2B,CAAgB;IACnD,OAAO,CAAC,iBAAiB,CAAgB;IACzC,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,0BAA0B,CAAY;IAG9C,OAAO,CAAC,wBAAwB,CAAgB;IAChD,OAAO,CAAC,wBAAwB,CAAY;IAC5C,OAAO,CAAC,2BAA2B,CAAY;IAC/C,OAAO,CAAC,4BAA4B,CAAY;IAChD,OAAO,CAAC,8BAA8B,CAAY;IAClD,OAAO,CAAC,yBAAyB,CAAY;IAC7C,OAAO,CAAC,sBAAsB,CAAY;IAC1C,OAAO,CAAC,6BAA6B,CAAY;IACjD,OAAO,CAAC,+BAA+B,CAAY;IACnD,OAAO,CAAC,6BAA6B,CAAY;IAEjD,OAAO,CAAC,YAAY,CAAC,CAAa;IAElC,YACE,MAAM,EAAE,eAAe,EACf,MAAM,EAAE,cAAc,EAC9B,IAAI,SAAc,EAkGnB;IAEM,0BAA0B,CAAC,yBAAyB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,QAOvF;IAEM,gCAAgC,CAAC,QAAQ,EAAE,MAAM,QAEvD;IAEM,2BAA2B,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,QAGnE;IAED,gBAAgB,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAM1D;IAED,iBAAiB,SAIhB;IAED,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,QAItE;IAED,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,QAW7C;IAEK,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,UAAU,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB3F;IAED,uBAAuB,SAEtB;IAED,yBAAyB,CAAC,MAAM,CAAC,EAAE,MAAM,QAIxC;IAED,0BAA0B,SAEzB;IAED,iCAAiC,CAC/B,SAAS,EAAE,oBAAoB,GAAG,8BAA8B,GAAG,eAAe,GAAG,uBAAuB,QAK7G;IAED,qBAAqB,CAAC,WAAW,EAAE,MAAM,QAExC;IAED;;;OAGG;IACH,0BAA0B,CAAC,QAAQ,EAAE,mBAAmB,QAqFvD;CACF"}
1
+ {"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/sequencer/metrics.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,5 @@
1
1
  import { Attributes, Metrics, createUpDownCounterWithDefault } from '@aztec/telemetry-client';
2
2
  import { formatUnits } from 'viem';
3
- // TODO(palla/mbps): Review all metrics and add any missing ones per checkpoint
4
3
  export class SequencerMetrics {
5
4
  rollup;
6
5
  tracer;
@@ -18,16 +17,25 @@ export class SequencerMetrics {
18
17
  slots;
19
18
  filledSlots;
20
19
  blockProposalFailed;
21
- blockProposalSuccess;
22
- blockProposalPrecheckFailed;
20
+ checkpointProposalSuccess;
21
+ checkpointPrecheckFailed;
22
+ checkpointProposalFailed;
23
23
  checkpointSuccess;
24
24
  slashingAttempts;
25
25
  checkpointAttestationDelay;
26
+ checkpointBuildDuration;
27
+ checkpointBlockCount;
28
+ checkpointTxCount;
29
+ checkpointTotalMana;
26
30
  // Fisherman fee analysis metrics
27
31
  fishermanWouldBeIncluded;
28
32
  fishermanTimeBeforeBlock;
29
33
  fishermanPendingBlobTxCount;
30
34
  fishermanIncludedBlobTxCount;
35
+ fishermanPendingBlobCount;
36
+ fishermanIncludedBlobCount;
37
+ fishermanBlockBlobsFull;
38
+ fishermanMaxBlobCapacity;
31
39
  fishermanCalculatedPriorityFee;
32
40
  fishermanPriorityFeeDelta;
33
41
  fishermanEstimatedCost;
@@ -49,7 +57,7 @@ export class SequencerMetrics {
49
57
  this.blockBuildManaPerSecond = this.meter.createGauge(Metrics.SEQUENCER_BLOCK_BUILD_MANA_PER_SECOND);
50
58
  this.stateTransitionBufferDuration = this.meter.createHistogram(Metrics.SEQUENCER_STATE_TRANSITION_BUFFER_DURATION);
51
59
  this.checkpointAttestationDelay = this.meter.createHistogram(Metrics.SEQUENCER_CHECKPOINT_ATTESTATION_DELAY);
52
- this.rewards = this.meter.createGauge(Metrics.SEQUENCER_CURRENT_BLOCK_REWARDS);
60
+ this.rewards = this.meter.createGauge(Metrics.SEQUENCER_CURRENT_SLOT_REWARDS);
53
61
  this.slots = createUpDownCounterWithDefault(this.meter, Metrics.SEQUENCER_SLOT_COUNT);
54
62
  /**
55
63
  * NOTE: we do not track missed slots as a separate metric. That would be difficult to determine
@@ -60,9 +68,9 @@ export class SequencerMetrics {
60
68
  this.requiredAttestions = this.meter.createGauge(Metrics.SEQUENCER_REQUIRED_ATTESTATIONS_COUNT);
61
69
  this.collectedAttestions = this.meter.createGauge(Metrics.SEQUENCER_COLLECTED_ATTESTATIONS_COUNT);
62
70
  this.blockProposalFailed = createUpDownCounterWithDefault(this.meter, Metrics.SEQUENCER_BLOCK_PROPOSAL_FAILED_COUNT);
63
- this.blockProposalSuccess = createUpDownCounterWithDefault(this.meter, Metrics.SEQUENCER_BLOCK_PROPOSAL_SUCCESS_COUNT);
71
+ this.checkpointProposalSuccess = createUpDownCounterWithDefault(this.meter, Metrics.SEQUENCER_CHECKPOINT_PROPOSAL_SUCCESS_COUNT);
64
72
  this.checkpointSuccess = createUpDownCounterWithDefault(this.meter, Metrics.SEQUENCER_CHECKPOINT_SUCCESS_COUNT);
65
- this.blockProposalPrecheckFailed = createUpDownCounterWithDefault(this.meter, Metrics.SEQUENCER_BLOCK_PROPOSAL_PRECHECK_FAILED_COUNT, {
73
+ this.checkpointPrecheckFailed = createUpDownCounterWithDefault(this.meter, Metrics.SEQUENCER_CHECKPOINT_PRECHECK_FAILED_COUNT, {
66
74
  [Attributes.ERROR_TYPE]: [
67
75
  'slot_already_taken',
68
76
  'rollup_contract_check_failed',
@@ -70,12 +78,21 @@ export class SequencerMetrics {
70
78
  'block_number_mismatch'
71
79
  ]
72
80
  });
81
+ this.checkpointProposalFailed = createUpDownCounterWithDefault(this.meter, Metrics.SEQUENCER_CHECKPOINT_PROPOSAL_FAILED_COUNT);
82
+ this.checkpointBuildDuration = this.meter.createHistogram(Metrics.SEQUENCER_CHECKPOINT_BUILD_DURATION);
83
+ this.checkpointBlockCount = this.meter.createGauge(Metrics.SEQUENCER_CHECKPOINT_BLOCK_COUNT);
84
+ this.checkpointTxCount = this.meter.createGauge(Metrics.SEQUENCER_CHECKPOINT_TX_COUNT);
85
+ this.checkpointTotalMana = this.meter.createGauge(Metrics.SEQUENCER_CHECKPOINT_TOTAL_MANA);
73
86
  this.slashingAttempts = createUpDownCounterWithDefault(this.meter, Metrics.SEQUENCER_SLASHING_ATTEMPTS_COUNT);
74
87
  // Fisherman fee analysis metrics
75
88
  this.fishermanWouldBeIncluded = createUpDownCounterWithDefault(this.meter, Metrics.FISHERMAN_FEE_ANALYSIS_WOULD_BE_INCLUDED, {
76
89
  [Attributes.OK]: [
77
90
  true,
78
91
  false
92
+ ],
93
+ [Attributes.BLOCK_FULL]: [
94
+ 'true',
95
+ 'false'
79
96
  ]
80
97
  });
81
98
  this.fishermanTimeBeforeBlock = this.meter.createHistogram(Metrics.FISHERMAN_FEE_ANALYSIS_TIME_BEFORE_BLOCK);
@@ -87,6 +104,15 @@ export class SequencerMetrics {
87
104
  this.fishermanEstimatedOverpayment = this.meter.createHistogram(Metrics.FISHERMAN_FEE_ANALYSIS_ESTIMATED_OVERPAYMENT);
88
105
  this.fishermanMinedBlobTxPriorityFee = this.meter.createHistogram(Metrics.FISHERMAN_FEE_ANALYSIS_MINED_BLOB_TX_PRIORITY_FEE);
89
106
  this.fishermanMinedBlobTxTotalCost = this.meter.createHistogram(Metrics.FISHERMAN_FEE_ANALYSIS_MINED_BLOB_TX_TOTAL_COST);
107
+ this.fishermanPendingBlobCount = this.meter.createHistogram(Metrics.FISHERMAN_FEE_ANALYSIS_PENDING_BLOB_COUNT);
108
+ this.fishermanIncludedBlobCount = this.meter.createHistogram(Metrics.FISHERMAN_FEE_ANALYSIS_INCLUDED_BLOB_COUNT);
109
+ this.fishermanBlockBlobsFull = createUpDownCounterWithDefault(this.meter, Metrics.FISHERMAN_FEE_ANALYSIS_BLOCK_BLOBS_FULL, {
110
+ [Attributes.OK]: [
111
+ true,
112
+ false
113
+ ]
114
+ });
115
+ this.fishermanMaxBlobCapacity = this.meter.createHistogram(Metrics.FISHERMAN_FEE_ANALYSIS_MAX_BLOB_CAPACITY);
90
116
  }
91
117
  recordRequiredAttestations(requiredAttestationsCount, allowanceMs) {
92
118
  this.requiredAttestions.record(requiredAttestationsCount);
@@ -156,14 +182,27 @@ export class SequencerMetrics {
156
182
  }
157
183
  });
158
184
  }
159
- recordBlockProposalSuccess() {
160
- this.blockProposalSuccess.add(1);
185
+ recordCheckpointProposalSuccess() {
186
+ this.checkpointProposalSuccess.add(1);
161
187
  }
162
- recordBlockProposalPrecheckFailed(checkType) {
163
- this.blockProposalPrecheckFailed.add(1, {
188
+ recordCheckpointPrecheckFailed(checkType) {
189
+ this.checkpointPrecheckFailed.add(1, {
164
190
  [Attributes.ERROR_TYPE]: checkType
165
191
  });
166
192
  }
193
+ recordCheckpointProposalFailed(reason) {
194
+ this.checkpointProposalFailed.add(1, {
195
+ ...reason && {
196
+ [Attributes.ERROR_TYPE]: reason
197
+ }
198
+ });
199
+ }
200
+ /** Records aggregate metrics for a completed checkpoint build. */ recordCheckpointBuild(durationMs, blockCount, txCount, totalMana) {
201
+ this.checkpointBuildDuration.record(Math.ceil(durationMs));
202
+ this.checkpointBlockCount.record(blockCount);
203
+ this.checkpointTxCount.record(txCount);
204
+ this.checkpointTotalMana.record(totalMana);
205
+ }
167
206
  recordSlashingAttempt(actionCount) {
168
207
  this.slashingAttempts.add(actionCount);
169
208
  }
@@ -184,9 +223,11 @@ export class SequencerMetrics {
184
223
  };
185
224
  // Record pending block snapshot data (once per strategy for comparison)
186
225
  this.fishermanPendingBlobTxCount.record(analysis.pendingSnapshot.pendingBlobTxCount, strategyAttributes);
226
+ this.fishermanPendingBlobCount.record(analysis.pendingSnapshot.pendingBlobCount, strategyAttributes);
187
227
  // Record mined block data if available
188
228
  if (analysis.minedBlock) {
189
229
  this.fishermanIncludedBlobTxCount.record(analysis.minedBlock.includedBlobTxCount, strategyAttributes);
230
+ this.fishermanIncludedBlobCount.record(analysis.minedBlock.includedBlobCount, strategyAttributes);
190
231
  // Record actual fees from blob transactions in the mined block
191
232
  for (const blobTx of analysis.minedBlock.includedBlobTxs){
192
233
  // Record priority fee per gas in Gwei
@@ -211,16 +252,34 @@ export class SequencerMetrics {
211
252
  // Record analysis results if available
212
253
  if (analysis.analysis) {
213
254
  this.fishermanTimeBeforeBlock.record(Math.ceil(analysis.analysis.timeBeforeBlockMs), strategyAttributes);
255
+ // Record whether the block reached 100% blob capacity
256
+ if (analysis.analysis.blockBlobsFull) {
257
+ this.fishermanBlockBlobsFull.add(1, {
258
+ ...strategyAttributes,
259
+ [Attributes.OK]: true
260
+ });
261
+ } else {
262
+ this.fishermanBlockBlobsFull.add(1, {
263
+ ...strategyAttributes,
264
+ [Attributes.OK]: false
265
+ });
266
+ }
267
+ // Record the max blob capacity for this block
268
+ this.fishermanMaxBlobCapacity.record(analysis.analysis.maxBlobCapacity, strategyAttributes);
214
269
  // Record strategy-specific inclusion result
215
270
  if (strategyResult.wouldBeIncluded !== undefined) {
271
+ const inclusionAttributes = {
272
+ ...strategyAttributes,
273
+ [Attributes.BLOCK_FULL]: analysis.analysis.blockBlobsFull ? 'true' : 'false'
274
+ };
216
275
  if (strategyResult.wouldBeIncluded) {
217
276
  this.fishermanWouldBeIncluded.add(1, {
218
- ...strategyAttributes,
277
+ ...inclusionAttributes,
219
278
  [Attributes.OK]: true
220
279
  });
221
280
  } else {
222
281
  this.fishermanWouldBeIncluded.add(1, {
223
- ...strategyAttributes,
282
+ ...inclusionAttributes,
224
283
  [Attributes.OK]: false,
225
284
  ...strategyResult.exclusionReason && {
226
285
  [Attributes.ERROR_TYPE]: strategyResult.exclusionReason
@@ -231,15 +290,27 @@ export class SequencerMetrics {
231
290
  // Record strategy-specific priority fee delta
232
291
  if (strategyResult.priorityFeeDelta !== undefined) {
233
292
  const priorityFeeDeltaGwei = Number(strategyResult.priorityFeeDelta) / 1e9;
234
- this.fishermanPriorityFeeDelta.record(priorityFeeDeltaGwei, strategyAttributes);
293
+ const deltaAttributes = {
294
+ ...strategyAttributes,
295
+ [Attributes.BLOCK_FULL]: analysis.analysis.blockBlobsFull ? 'true' : 'false'
296
+ };
297
+ this.fishermanPriorityFeeDelta.record(priorityFeeDeltaGwei, deltaAttributes);
235
298
  }
236
299
  // Record estimated cost if available
237
300
  if (strategyResult.estimatedCostEth !== undefined) {
238
- this.fishermanEstimatedCost.record(strategyResult.estimatedCostEth, strategyAttributes);
301
+ const costAttributes = {
302
+ ...strategyAttributes,
303
+ [Attributes.BLOCK_FULL]: analysis.analysis.blockBlobsFull ? 'true' : 'false'
304
+ };
305
+ this.fishermanEstimatedCost.record(strategyResult.estimatedCostEth, costAttributes);
239
306
  }
240
307
  // Record estimated overpayment if available
241
308
  if (strategyResult.estimatedOverpaymentEth !== undefined) {
242
- this.fishermanEstimatedOverpayment.record(strategyResult.estimatedOverpaymentEth, strategyAttributes);
309
+ const overpaymentAttributes = {
310
+ ...strategyAttributes,
311
+ [Attributes.BLOCK_FULL]: analysis.analysis.blockBlobsFull ? 'true' : 'false'
312
+ };
313
+ this.fishermanEstimatedOverpayment.record(strategyResult.estimatedOverpaymentEth, overpaymentAttributes);
243
314
  }
244
315
  }
245
316
  }