@aztec/sequencer-client 0.0.1-commit.b6e433891 → 0.0.1-commit.b8a057fa

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 (118) hide show
  1. package/README.md +281 -21
  2. package/dest/client/sequencer-client.d.ts +23 -5
  3. package/dest/client/sequencer-client.d.ts.map +1 -1
  4. package/dest/client/sequencer-client.js +33 -34
  5. package/dest/config.d.ts +11 -4
  6. package/dest/config.d.ts.map +1 -1
  7. package/dest/config.js +55 -26
  8. package/dest/global_variable_builder/fee_predictor.d.ts +37 -0
  9. package/dest/global_variable_builder/fee_predictor.d.ts.map +1 -0
  10. package/dest/global_variable_builder/fee_predictor.js +138 -0
  11. package/dest/global_variable_builder/fee_provider.d.ts +21 -0
  12. package/dest/global_variable_builder/fee_provider.d.ts.map +1 -0
  13. package/dest/global_variable_builder/fee_provider.js +80 -0
  14. package/dest/global_variable_builder/global_builder.d.ts +13 -26
  15. package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
  16. package/dest/global_variable_builder/global_builder.js +9 -67
  17. package/dest/global_variable_builder/index.d.ts +4 -2
  18. package/dest/global_variable_builder/index.d.ts.map +1 -1
  19. package/dest/global_variable_builder/index.js +2 -0
  20. package/dest/publisher/config.d.ts +19 -3
  21. package/dest/publisher/config.d.ts.map +1 -1
  22. package/dest/publisher/config.js +30 -5
  23. package/dest/publisher/l1_to_l2_messaging.d.ts +21 -0
  24. package/dest/publisher/l1_to_l2_messaging.d.ts.map +1 -0
  25. package/dest/publisher/l1_to_l2_messaging.js +70 -0
  26. package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts +50 -11
  27. package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts.map +1 -1
  28. package/dest/publisher/l1_tx_failed_store/failed_tx_store.js +68 -1
  29. package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.d.ts +2 -2
  30. package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.d.ts.map +1 -1
  31. package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.js +4 -2
  32. package/dest/publisher/l1_tx_failed_store/index.d.ts +2 -2
  33. package/dest/publisher/l1_tx_failed_store/index.d.ts.map +1 -1
  34. package/dest/publisher/l1_tx_failed_store/index.js +1 -0
  35. package/dest/publisher/sequencer-bundle-simulator.d.ts +96 -0
  36. package/dest/publisher/sequencer-bundle-simulator.d.ts.map +1 -0
  37. package/dest/publisher/sequencer-bundle-simulator.js +198 -0
  38. package/dest/publisher/sequencer-publisher-factory.d.ts +3 -5
  39. package/dest/publisher/sequencer-publisher-factory.d.ts.map +1 -1
  40. package/dest/publisher/sequencer-publisher-factory.js +2 -3
  41. package/dest/publisher/sequencer-publisher.d.ts +101 -67
  42. package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
  43. package/dest/publisher/sequencer-publisher.js +615 -535
  44. package/dest/publisher/write_json.d.ts +11 -0
  45. package/dest/publisher/write_json.d.ts.map +1 -0
  46. package/dest/publisher/write_json.js +57 -0
  47. package/dest/sequencer/automine/automine_factory.d.ts +56 -0
  48. package/dest/sequencer/automine/automine_factory.d.ts.map +1 -0
  49. package/dest/sequencer/automine/automine_factory.js +85 -0
  50. package/dest/sequencer/automine/automine_sequencer.d.ts +189 -0
  51. package/dest/sequencer/automine/automine_sequencer.d.ts.map +1 -0
  52. package/dest/sequencer/automine/automine_sequencer.js +690 -0
  53. package/dest/sequencer/automine/index.d.ts +3 -0
  54. package/dest/sequencer/automine/index.d.ts.map +1 -0
  55. package/dest/sequencer/automine/index.js +2 -0
  56. package/dest/sequencer/checkpoint_proposal_job.d.ts +71 -21
  57. package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -1
  58. package/dest/sequencer/checkpoint_proposal_job.js +724 -212
  59. package/dest/sequencer/checkpoint_proposal_job_metrics.d.ts +34 -0
  60. package/dest/sequencer/checkpoint_proposal_job_metrics.d.ts.map +1 -0
  61. package/dest/sequencer/checkpoint_proposal_job_metrics.js +72 -0
  62. package/dest/sequencer/checkpoint_voter.d.ts +1 -2
  63. package/dest/sequencer/checkpoint_voter.d.ts.map +1 -1
  64. package/dest/sequencer/checkpoint_voter.js +2 -5
  65. package/dest/sequencer/events.d.ts +61 -5
  66. package/dest/sequencer/events.d.ts.map +1 -1
  67. package/dest/sequencer/metrics.d.ts +9 -10
  68. package/dest/sequencer/metrics.d.ts.map +1 -1
  69. package/dest/sequencer/metrics.js +34 -20
  70. package/dest/sequencer/requests_tracker.d.ts +22 -0
  71. package/dest/sequencer/requests_tracker.d.ts.map +1 -0
  72. package/dest/sequencer/requests_tracker.js +33 -0
  73. package/dest/sequencer/sequencer.d.ts +155 -33
  74. package/dest/sequencer/sequencer.d.ts.map +1 -1
  75. package/dest/sequencer/sequencer.js +546 -161
  76. package/dest/sequencer/types.d.ts +2 -2
  77. package/dest/sequencer/types.d.ts.map +1 -1
  78. package/dest/test/index.d.ts +3 -3
  79. package/dest/test/index.d.ts.map +1 -1
  80. package/dest/test/utils.d.ts +15 -1
  81. package/dest/test/utils.d.ts.map +1 -1
  82. package/dest/test/utils.js +25 -7
  83. package/package.json +30 -28
  84. package/src/client/sequencer-client.ts +47 -43
  85. package/src/config.ts +64 -26
  86. package/src/global_variable_builder/README.md +44 -0
  87. package/src/global_variable_builder/fee_predictor.ts +182 -0
  88. package/src/global_variable_builder/fee_provider.ts +97 -0
  89. package/src/global_variable_builder/global_builder.ts +19 -89
  90. package/src/global_variable_builder/index.ts +3 -1
  91. package/src/publisher/config.ts +62 -7
  92. package/src/publisher/l1_to_l2_messaging.ts +85 -0
  93. package/src/publisher/l1_tx_failed_store/failed_tx_store.ts +117 -8
  94. package/src/publisher/l1_tx_failed_store/file_store_failed_tx_store.ts +4 -3
  95. package/src/publisher/l1_tx_failed_store/index.ts +1 -1
  96. package/src/publisher/sequencer-bundle-simulator.ts +254 -0
  97. package/src/publisher/sequencer-publisher-factory.ts +3 -6
  98. package/src/publisher/sequencer-publisher.ts +711 -609
  99. package/src/publisher/write_json.ts +78 -0
  100. package/src/sequencer/README.md +162 -450
  101. package/src/sequencer/automine/README.md +60 -0
  102. package/src/sequencer/automine/automine_factory.ts +152 -0
  103. package/src/sequencer/automine/automine_sequencer.ts +796 -0
  104. package/src/sequencer/automine/index.ts +6 -0
  105. package/src/sequencer/checkpoint_proposal_job.ts +844 -241
  106. package/src/sequencer/checkpoint_proposal_job_metrics.ts +128 -0
  107. package/src/sequencer/checkpoint_voter.ts +1 -12
  108. package/src/sequencer/events.ts +66 -5
  109. package/src/sequencer/metrics.ts +43 -24
  110. package/src/sequencer/requests_tracker.ts +43 -0
  111. package/src/sequencer/sequencer.ts +628 -178
  112. package/src/sequencer/types.ts +1 -1
  113. package/src/test/index.ts +2 -2
  114. package/src/test/utils.ts +61 -10
  115. package/dest/sequencer/timetable.d.ts +0 -88
  116. package/dest/sequencer/timetable.d.ts.map +0 -1
  117. package/dest/sequencer/timetable.js +0 -222
  118. package/src/sequencer/timetable.ts +0 -283
@@ -370,14 +370,12 @@ function applyDecs2203RFactory() {
370
370
  function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
371
371
  return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
372
372
  }
373
- var _dec, _dec1, _dec2, _initProto;
373
+ var _dec, _dec1, _initProto;
374
374
  import { Blob, getBlobsPerL1Block, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
375
- import { FeeAssetPriceOracle, MULTI_CALL_3_ADDRESS, Multicall3, RollupContract } from '@aztec/ethereum/contracts';
376
- import { L1FeeAnalyzer } from '@aztec/ethereum/l1-fee-analysis';
377
- import { MAX_L1_TX_LIMIT, WEI_CONST } from '@aztec/ethereum/l1-tx-utils';
378
- import { FormattedViemError, formatViemError, mergeAbis, tryExtractEvent } from '@aztec/ethereum/utils';
379
- import { sumBigint } from '@aztec/foundation/bigint';
380
- import { toHex as toPaddedHex } from '@aztec/foundation/bigint-buffer';
375
+ import { FeeAssetPriceOracle, MULTI_CALL_3_ADDRESS, Multicall3, MulticallForwarderRevertedError, buildSimulationOverridesStateOverride } from '@aztec/ethereum/contracts';
376
+ import { L1FeeAnalyzer, captureWindowBlockFees } from '@aztec/ethereum/l1-fee-analysis';
377
+ import { L1TxTimeoutError, MAX_L1_TX_LIMIT, WEI_CONST } from '@aztec/ethereum/l1-tx-utils';
378
+ import { FormattedViemError, formatViemError, mergeAbis, tryDecodeRevertReason, tryExtractEvent } from '@aztec/ethereum/utils';
381
379
  import { CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
382
380
  import { trimmedBytesLength } from '@aztec/foundation/buffer';
383
381
  import { pick } from '@aztec/foundation/collection';
@@ -385,30 +383,40 @@ import { TimeoutError } from '@aztec/foundation/error';
385
383
  import { EthAddress } from '@aztec/foundation/eth-address';
386
384
  import { Signature } from '@aztec/foundation/eth-signature';
387
385
  import { createLogger } from '@aztec/foundation/log';
388
- import { makeBackoff, retry } from '@aztec/foundation/retry';
386
+ import { InterruptibleSleep } from '@aztec/foundation/sleep';
389
387
  import { bufferToHex } from '@aztec/foundation/string';
390
388
  import { Timer } from '@aztec/foundation/timer';
391
- import { EmpireBaseAbi, ErrorsAbi, RollupAbi } from '@aztec/l1-artifacts';
389
+ import { EmpireBaseAbi, ErrorsAbi, RollupAbi, SlashingProposerAbi } from '@aztec/l1-artifacts';
392
390
  import { encodeSlashConsensusVotes } from '@aztec/slasher';
393
391
  import { CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
392
+ import { getLastL1SlotTimestampForL2Slot, getNextL1SlotTimestamp, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
394
393
  import { getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
395
- import { encodeFunctionData, keccak256, multicall3Abi, toHex } from 'viem';
394
+ import { encodeFunctionData, keccak256, toHex } from 'viem';
396
395
  import { createL1TxFailedStore } from './l1_tx_failed_store/index.js';
396
+ import { SequencerBundleSimulator } from './sequencer-bundle-simulator.js';
397
397
  import { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js';
398
+ /**
399
+ * Returns true if the receipt indicates a successful send AND the expected event was emitted
400
+ * by the target contract. Both pieces are required: an aggregate3 entry that reverted will
401
+ * have receipt.status === 'success' but no event log.
402
+ */ function extractEventSuccess(receipt, opts) {
403
+ if (!receipt || receipt.status !== 'success') {
404
+ return false;
405
+ }
406
+ return !!tryExtractEvent(receipt.logs, opts.address.toString(), opts.abi, opts.eventName);
407
+ }
398
408
  export const Actions = [
399
409
  'invalidate-by-invalid-attestation',
400
410
  'invalidate-by-insufficient-attestations',
411
+ 'prune',
401
412
  'propose',
402
413
  'governance-signal',
403
- 'empire-slashing-signal',
404
- 'create-empire-payload',
405
- 'execute-empire-payload',
406
414
  'vote-offenses',
407
415
  'execute-slash'
408
416
  ];
409
417
  // Sorting for actions such that invalidations go before proposals, and proposals go before votes
410
418
  export const compareActions = (a, b)=>Actions.indexOf(a) - Actions.indexOf(b);
411
- _dec = trackSpan('SequencerPublisher.sendRequests'), _dec1 = trackSpan('SequencerPublisher.validateBlockHeader'), _dec2 = trackSpan('SequencerPublisher.validateCheckpointForSubmission');
419
+ _dec = trackSpan('SequencerPublisher.sendRequests'), _dec1 = trackSpan('SequencerPublisher.validateBlockHeader');
412
420
  export class SequencerPublisher {
413
421
  config;
414
422
  static{
@@ -422,57 +430,59 @@ export class SequencerPublisher {
422
430
  _dec1,
423
431
  2,
424
432
  "validateBlockHeader"
425
- ],
426
- [
427
- _dec2,
428
- 2,
429
- "validateCheckpointForSubmission"
430
433
  ]
431
434
  ], []));
432
435
  }
433
436
  interrupted;
434
437
  metrics;
438
+ bundleSimulator;
435
439
  epochCache;
436
440
  failedTxStore;
437
- governanceLog;
438
- slashingLog;
441
+ /**
442
+ * ABI used to decode raw revert payloads from dropped bundle entries when the original
443
+ * request did not carry an abi (e.g. the propose request). Merges every contract the
444
+ * publisher can route to so any of their custom errors decode against it.
445
+ */ revertDecoderAbi;
439
446
  lastActions;
440
- isPayloadEmptyCache;
441
- payloadProposedCache;
442
447
  log;
443
448
  ethereumSlotDuration;
444
449
  aztecSlotDuration;
450
+ previousL1BlockWaitTimeoutMs;
451
+ previousL1BlockWaitPollIntervalMs;
452
+ /** Date provider for wall-clock time. */ dateProvider;
445
453
  blobClient;
446
- /** Address to use for simulations in fisherman mode (actual proposer's address) */ proposerAddressForSimulation;
447
454
  /** Optional callback to obtain a replacement publisher when the current one fails to send. */ getNextPublisher;
448
455
  /** L1 fee analyzer for fisherman mode */ l1FeeAnalyzer;
449
456
  /** Fee asset price oracle for computing price modifiers from Uniswap V4 */ feeAssetPriceOracle;
450
- // A CALL to a cold address is 2700 gas
451
- static MULTICALL_OVERHEAD_GAS_GUESS = 5000n;
452
- // Gas report for VotingWithSigTest shows a max gas of 100k, but we've seen it cost 700k+ in testnet
453
- static VOTE_GAS_GUESS = 800_000n;
457
+ /** Interruptible sleep used by sendRequestsAt to wait until a target timestamp. */ interruptibleSleep;
454
458
  l1TxUtils;
455
459
  rollupContract;
456
460
  govProposerContract;
457
461
  slashingProposerContract;
458
- slashFactoryContract;
459
462
  tracer;
460
463
  requests;
461
464
  constructor(config, deps){
462
465
  this.config = config;
463
466
  this.interrupted = (_initProto(this), false);
464
- this.governanceLog = createLogger('sequencer:publisher:governance');
465
- this.slashingLog = createLogger('sequencer:publisher:slashing');
467
+ this.revertDecoderAbi = mergeAbis([
468
+ RollupAbi,
469
+ SlashingProposerAbi,
470
+ EmpireBaseAbi,
471
+ ErrorsAbi
472
+ ]);
466
473
  this.lastActions = {};
467
- this.isPayloadEmptyCache = new Map();
468
- this.payloadProposedCache = new Set();
474
+ this.interruptibleSleep = new InterruptibleSleep();
469
475
  this.requests = [];
470
476
  this.log = deps.log ?? createLogger('sequencer:publisher');
471
477
  this.ethereumSlotDuration = BigInt(config.ethereumSlotDuration);
472
478
  this.aztecSlotDuration = BigInt(config.aztecSlotDuration);
479
+ this.previousL1BlockWaitTimeoutMs = config.sequencerPublisherPreviousL1BlockWaitTimeoutMs;
480
+ this.previousL1BlockWaitPollIntervalMs = config.sequencerPublisherPreviousL1BlockWaitPollIntervalMs;
481
+ this.dateProvider = deps.dateProvider;
473
482
  this.epochCache = deps.epochCache;
474
483
  this.lastActions = deps.lastActions;
475
484
  this.blobClient = deps.blobClient;
485
+ this.dateProvider = deps.dateProvider;
476
486
  const telemetry = deps.telemetry ?? getTelemetryClient();
477
487
  this.metrics = deps.metrics ?? new SequencerPublisherMetrics(telemetry, 'SequencerPublisher');
478
488
  this.tracer = telemetry.getTracer('SequencerPublisher');
@@ -486,40 +496,116 @@ export class SequencerPublisher {
486
496
  const newSlashingProposer = await this.rollupContract.getSlashingProposer();
487
497
  this.slashingProposerContract = newSlashingProposer;
488
498
  });
489
- this.slashFactoryContract = deps.slashFactoryContract;
490
499
  // Initialize L1 fee analyzer for fisherman mode
491
500
  if (config.fishermanMode) {
492
- this.l1FeeAnalyzer = new L1FeeAnalyzer(this.l1TxUtils.client, deps.dateProvider, createLogger('sequencer:publisher:fee-analyzer'));
501
+ this.l1FeeAnalyzer = new L1FeeAnalyzer(this.l1TxUtils.client, deps.dateProvider, this.log.createChild('fee-analyzer'));
493
502
  }
494
503
  // Initialize fee asset price oracle
495
- this.feeAssetPriceOracle = new FeeAssetPriceOracle(this.l1TxUtils.client, this.rollupContract, createLogger('sequencer:publisher:price-oracle'));
504
+ this.feeAssetPriceOracle = new FeeAssetPriceOracle(this.l1TxUtils.client, this.rollupContract, this.log.createChild('price-oracle'));
496
505
  // Initialize failed L1 tx store (optional, for test networks)
497
506
  this.failedTxStore = createL1TxFailedStore(config.l1TxFailedStore, this.log);
507
+ this.bundleSimulator = new SequencerBundleSimulator({
508
+ getL1TxUtils: ()=>this.l1TxUtils,
509
+ rollupContract: this.rollupContract,
510
+ epochCache: this.epochCache,
511
+ log: this.log.createChild('bundle-simulator')
512
+ });
498
513
  }
499
514
  /**
500
- * Backs up a failed L1 transaction to the configured store for debugging.
501
- * Does nothing if no store is configured.
502
- */ backupFailedTx(failedTx) {
503
- if (!this.failedTxStore) {
504
- return;
505
- }
515
+ * Logs the gas-pricing data of a failed L1 transaction at warn so underpricing is diagnosable
516
+ * from logs even with no failed-tx store configured — and backs the record up to the store when
517
+ * one is. When captureFeeSummary is true, also records the fee data of the already-mined L1
518
+ * blocks in the target slot's inclusion window.
519
+ */ backupFailedTx(failedTx, opts) {
506
520
  const tx = {
507
521
  ...failedTx,
508
522
  timestamp: Date.now()
509
523
  };
510
524
  // Fire and forget - don't block on backup
511
- void this.failedTxStore.then((store)=>store?.saveFailedTx(tx)).catch((err)=>{
512
- this.log.warn(`Failed to backup failed L1 tx to store`, err);
513
- });
525
+ void (async ()=>{
526
+ try {
527
+ // Prefer a pre-captured summary (shared across a batch of failures in the same slot) so we
528
+ // don't re-read the fee window per record. A capture error must not lose the record itself.
529
+ const feeSummary = opts?.sharedFeeSummary ?? (opts?.captureFeeSummary ? await this.captureFeeEnvironment(opts.targetSlot).catch(()=>undefined) : undefined);
530
+ if (feeSummary) {
531
+ tx.gasInfo = {
532
+ ...tx.gasInfo,
533
+ ...feeSummary
534
+ };
535
+ }
536
+ if (tx.gasInfo) {
537
+ this.log.warn(`Gas pricing data for failed L1 tx (${tx.failureType})`, {
538
+ failureType: tx.failureType,
539
+ actions: tx.context.actions,
540
+ slot: tx.context.slot,
541
+ ...tx.gasInfo,
542
+ ...tx.timing
543
+ });
544
+ }
545
+ const store = await this.failedTxStore;
546
+ if (store) {
547
+ await store.saveFailedTx(tx);
548
+ }
549
+ } catch (err) {
550
+ this.log.warn(`Failed to backup failed L1 tx to store`, err);
551
+ }
552
+ })();
553
+ }
554
+ /**
555
+ * Captures per-block fee data for the L1 blocks in the target slot's inclusion window (the blocks the
556
+ * tx could have landed in) for underpricing diagnostics. Reads only already-mined blocks, so it never
557
+ * waits on the chain. Safe to call off the critical path: the underlying capture never throws, and this
558
+ * returns undefined when there is no target slot or the window is not yet mined (e.g. an early send
559
+ * failure), in which case the record simply carries no window data.
560
+ */ async captureFeeEnvironment(targetL2Slot) {
561
+ if (targetL2Slot === undefined) {
562
+ return undefined;
563
+ }
564
+ const l1Constants = this.epochCache.getL1Constants();
565
+ // The inclusion window is [start of slot N, start of slot N+1): all L1 blocks that can include a tx
566
+ // for this L2 slot. getTimestampForSlot returns seconds, matching block.timestamp.
567
+ const windowStartS = getTimestampForSlot(targetL2Slot, l1Constants);
568
+ const windowEndS = getTimestampForSlot(SlotNumber(Number(targetL2Slot) + 1), l1Constants);
569
+ const windowBlocks = await captureWindowBlockFees(this.l1TxUtils.client, windowStartS, windowEndS);
570
+ if (windowBlocks.length === 0) {
571
+ return undefined;
572
+ }
573
+ return {
574
+ windowBlocks
575
+ };
576
+ }
577
+ /** Computes timing info relative to the L2 slot deadline. */ computeTimingInfo(targetL2Slot) {
578
+ if (targetL2Slot === undefined) {
579
+ return undefined;
580
+ }
581
+ const l1Constants = this.epochCache.getL1Constants();
582
+ const slotDeadlineS = getTimestampForSlot(SlotNumber(Number(targetL2Slot) + 1), l1Constants);
583
+ const slotDeadlineMs = Number(slotDeadlineS) * 1000;
584
+ return {
585
+ targetL2Slot: Number(targetL2Slot),
586
+ slotDeadlineTimestampS: slotDeadlineS,
587
+ msUntilSlotDeadline: slotDeadlineMs - this.dateProvider.now()
588
+ };
589
+ }
590
+ /**
591
+ * Builds an id for a synthetic failure record (send-error/timeout) that has no on-chain tx hash.
592
+ * Includes the failure time so each attempt — including retries of the same slot — is stored as its
593
+ * own record rather than overwriting the previous one.
594
+ */ failureRecordId(actions, targetSlot) {
595
+ return keccak256(toHex(`${actions.join(',')}:${targetSlot ?? ''}:${Date.now()}`));
514
596
  }
515
597
  getRollupContract() {
516
598
  return this.rollupContract;
517
599
  }
518
600
  /**
519
601
  * Gets the fee asset price modifier from the oracle.
520
- * Returns 0n if the oracle query fails.
521
- */ getFeeAssetPriceModifier() {
522
- return this.feeAssetPriceOracle.computePriceModifier();
602
+ *
603
+ * @param predictedParentEthPerFeeAssetE12 - Optional predicted parent eth-per-fee-asset (E12).
604
+ * Pipelined proposers should pass the value from the predicted parent fee header so the
605
+ * modifier matches the parent L1 will use when applying it.
606
+ * @returns The fee asset price modifier in basis points, or 0n if the oracle query fails.
607
+ */ getFeeAssetPriceModifier(predictedParentEthPerFeeAssetE12) {
608
+ return this.feeAssetPriceOracle.computePriceModifier(predictedParentEthPerFeeAssetE12);
523
609
  }
524
610
  getSenderAddress() {
525
611
  return this.l1TxUtils.getSenderAddress();
@@ -529,12 +615,6 @@ export class SequencerPublisher {
529
615
  */ getL1FeeAnalyzer() {
530
616
  return this.l1FeeAnalyzer;
531
617
  }
532
- /**
533
- * Sets the proposer address to use for simulations in fisherman mode.
534
- * @param proposerAddress - The actual proposer's address to use for balance lookups in simulations
535
- */ setProposerAddressForSimulation(proposerAddress) {
536
- this.proposerAddressForSimulation = proposerAddress;
537
- }
538
618
  addRequest(request) {
539
619
  this.requests.push(request);
540
620
  }
@@ -592,11 +672,15 @@ export class SequencerPublisher {
592
672
  }
593
673
  /**
594
674
  * Sends all requests that are still valid.
675
+ * @param targetSlot - The target L2 slot for this send. When provided (the production path, via
676
+ * sendRequestsAt), it is threaded into bundleSimulate so the block.timestamp override matches
677
+ * the slot the propose is built for. When omitted, falls back to getCurrentL2Slot() for the
678
+ * AutomineSequencer, which publishes synchronously within the current slot.
595
679
  * @returns one of:
596
680
  * - A receipt and stats if the tx succeeded
597
681
  * - a receipt and errorMsg if it failed on L1
598
682
  * - undefined if no valid requests are found OR the tx failed to send.
599
- */ async sendRequests() {
683
+ */ async sendRequests(targetSlot) {
600
684
  const requestsToProcess = [
601
685
  ...this.requests
602
686
  ];
@@ -604,10 +688,9 @@ export class SequencerPublisher {
604
688
  if (this.interrupted || requestsToProcess.length === 0) {
605
689
  return undefined;
606
690
  }
607
- const currentL2Slot = this.getCurrentL2Slot();
691
+ const currentL2Slot = targetSlot ?? this.getCurrentL2Slot();
608
692
  this.log.debug(`Sending requests on L2 slot ${currentL2Slot}`);
609
693
  const validRequests = requestsToProcess.filter((request)=>request.lastValidL2Slot >= currentL2Slot);
610
- const validActions = validRequests.map((x)=>x.action);
611
694
  const expiredActions = requestsToProcess.filter((request)=>request.lastValidL2Slot < currentL2Slot).map((x)=>x.action);
612
695
  if (validRequests.length !== requestsToProcess.length) {
613
696
  this.log.warn(`Some requests were expired for slot ${currentL2Slot}`, {
@@ -625,75 +708,98 @@ export class SequencerPublisher {
625
708
  this.log.debug(`No valid requests to send`);
626
709
  return undefined;
627
710
  }
628
- // @note - we can only have one blob config per bundle
629
- // find requests with gas and blob configs
630
- // See https://github.com/AztecProtocol/aztec-packages/issues/11513
711
+ // Collect earliest txTimeoutAt across all requests.
631
712
  const gasConfigs = validRequests.filter((request)=>request.gasConfig).map((request)=>request.gasConfig);
632
- const blobConfigs = validRequests.filter((request)=>request.blobConfig).map((request)=>request.blobConfig);
633
- if (blobConfigs.length > 1) {
634
- throw new Error('Multiple blob configs found');
635
- }
636
- const blobConfig = blobConfigs[0];
637
- // Merge gasConfigs. Yields the sum of gasLimits, and the earliest txTimeoutAt, or undefined if no gasConfig sets them.
638
- const gasLimits = gasConfigs.map((g)=>g?.gasLimit).filter((g)=>g !== undefined);
639
- let gasLimit = gasLimits.length > 0 ? sumBigint(gasLimits) : undefined; // sum
640
- // Cap at L1 block gas limit so the node accepts the tx ("gas limit too high" otherwise).
641
- const maxGas = MAX_L1_TX_LIMIT;
642
- if (gasLimit !== undefined && gasLimit > maxGas) {
643
- this.log.debug('Capping bundled tx gas limit to L1 max', {
644
- requested: gasLimit,
645
- capped: maxGas
646
- });
647
- gasLimit = maxGas;
648
- }
649
713
  const txTimeoutAts = gasConfigs.map((g)=>g?.txTimeoutAt).filter((g)=>g !== undefined);
650
- const txTimeoutAt = txTimeoutAts.length > 0 ? new Date(Math.min(...txTimeoutAts.map((g)=>g.getTime()))) : undefined; // earliest
651
- const txConfig = {
652
- gasLimit,
653
- txTimeoutAt
654
- };
714
+ const txTimeoutAt = txTimeoutAts.length > 0 ? new Date(Math.min(...txTimeoutAts.map((g)=>g.getTime()))) : undefined;
655
715
  // Sort the requests so that proposals always go first
656
716
  // This ensures the committee gets precomputed correctly
657
717
  validRequests.sort((a, b)=>compareActions(a.action, b.action));
658
718
  try {
659
- // Capture context for failed tx backup before sending
660
- const l1BlockNumber = await this.l1TxUtils.getBlockNumber();
661
- const multicallData = encodeFunctionData({
662
- abi: multicall3Abi,
663
- functionName: 'aggregate3',
664
- args: [
665
- validRequests.map((r)=>({
666
- target: r.request.to,
667
- callData: r.request.data,
668
- allowFailure: true
669
- }))
670
- ]
671
- });
672
- const blobDataHex = blobConfig?.blobs?.map((b)=>toHex(b));
673
- const txContext = {
674
- multicallData,
675
- blobData: blobDataHex,
676
- l1BlockNumber
719
+ // Bundle-level eth_simulateV1: filters out entries that revert and derives the gasLimit.
720
+ const bundleResult = await this.bundleSimulator.simulate(validRequests, currentL2Slot);
721
+ if (bundleResult.kind === 'aborted') {
722
+ this.logDroppedInSim(bundleResult.droppedRequests);
723
+ void this.backupDroppedInSim(bundleResult.droppedRequests, currentL2Slot).catch((err)=>this.log.error(`Failed to backup requests dropped in simulation`, err));
724
+ return undefined;
725
+ }
726
+ const { requests, droppedRequests, gasLimit } = bundleResult.kind === 'fallback' ? {
727
+ requests: bundleResult.requests,
728
+ droppedRequests: bundleResult.droppedRequests,
729
+ gasLimit: MAX_L1_TX_LIMIT
730
+ } : bundleResult;
731
+ this.logDroppedInSim(droppedRequests);
732
+ // Compute blobConfig from survivors (not original validRequests) so that if the propose
733
+ // entry was dropped by bundleSimulate we don't attach a blob-typed config to a non-blob tx.
734
+ const [blobConfig] = requests.filter((r)=>r.blobConfig).map((r)=>r.blobConfig);
735
+ const txConfig = {
736
+ gasLimit,
737
+ txTimeoutAt
677
738
  };
678
739
  this.log.debug('Forwarding transactions', {
679
- validRequests: validRequests.map((request)=>request.action),
740
+ requests: requests.map((request)=>request.action),
680
741
  txConfig
681
742
  });
682
- const result = await this.forwardWithPublisherRotation(validRequests, txConfig, blobConfig);
743
+ const result = await this.forwardWithPublisherRotation(requests, txConfig, blobConfig, currentL2Slot);
683
744
  if (result === undefined) {
684
745
  return undefined;
685
746
  }
686
- const { successfulActions = [], failedActions = [] } = this.callbackBundledTransactions(validRequests, result, txContext);
747
+ const { successfulActions = [], failedActions = [] } = this.callbackBundledTransactions(requests, result);
748
+ const allFailedActions = [
749
+ ...failedActions,
750
+ ...droppedRequests.map((d)=>d.request.action)
751
+ ];
687
752
  return {
688
753
  result,
689
754
  expiredActions,
690
- sentActions: validActions,
755
+ sentActions: requests.map((x)=>x.action),
691
756
  successfulActions,
692
- failedActions
757
+ failedActions: allFailedActions
693
758
  };
694
759
  } catch (err) {
695
760
  const viemError = formatViemError(err);
696
761
  this.log.error(`Failed to publish bundled transactions`, viemError);
762
+ if (err instanceof TimeoutError) {
763
+ const timeoutState = err instanceof L1TxTimeoutError ? err.txState : undefined;
764
+ void (async ()=>{
765
+ // The RPC is likely degraded right after a timeout, so back up without the block number
766
+ // rather than leaking an unhandled rejection.
767
+ const l1BlockNumber = await this.l1TxUtils.getBlockNumber().catch(()=>0n);
768
+ this.backupFailedTx({
769
+ id: this.failureRecordId(validRequests.map((r)=>r.action), currentL2Slot),
770
+ failureType: 'timeout',
771
+ request: {
772
+ to: MULTI_CALL_3_ADDRESS,
773
+ data: '0x'
774
+ },
775
+ l1BlockNumber,
776
+ error: {
777
+ message: viemError.message,
778
+ name: 'TimeoutError'
779
+ },
780
+ context: {
781
+ actions: validRequests.map((r)=>r.action),
782
+ requests: validRequests.filter((r)=>r.request.to !== null).map((r)=>({
783
+ action: r.action,
784
+ to: r.request.to,
785
+ data: r.request.data
786
+ })),
787
+ sender: this.getSenderAddress().toString(),
788
+ slot: Number(currentL2Slot)
789
+ },
790
+ timing: this.computeTimingInfo(currentL2Slot),
791
+ gasInfo: timeoutState ? {
792
+ sentGasPriceLadder: timeoutState.gasPriceHistory,
793
+ attempts: timeoutState.attempts,
794
+ gasLimit: timeoutState.gasLimit,
795
+ nonce: timeoutState.nonce
796
+ } : undefined
797
+ }, {
798
+ captureFeeSummary: true,
799
+ targetSlot: currentL2Slot
800
+ });
801
+ })();
802
+ }
697
803
  return undefined;
698
804
  } finally{
699
805
  try {
@@ -703,26 +809,96 @@ export class SequencerPublisher {
703
809
  }
704
810
  }
705
811
  }
812
+ /** Logs entries dropped by bundle simulation as warnings on the publisher's logger. */ logDroppedInSim(dropped) {
813
+ for (const drop of dropped){
814
+ const revertReasonDecoded = drop.revertReason ?? tryDecodeRevertReason(drop.returnData, this.revertDecoderAbi);
815
+ this.log.warn('Bundle entry dropped: action reverted in sim', {
816
+ action: drop.request.action,
817
+ revertReason: revertReasonDecoded ?? drop.returnData,
818
+ revertReasonDecoded,
819
+ returnData: drop.returnData
820
+ });
821
+ }
822
+ }
823
+ /** Backs up entries dropped by bundle simulation, one record per dropped action. */ async backupDroppedInSim(dropped, targetSlot) {
824
+ if (dropped.length === 0) {
825
+ return;
826
+ }
827
+ // Invoked as `void backupDroppedInSim(...)` on the publish path, so it must not throw.
828
+ try {
829
+ const l1BlockNumber = await this.l1TxUtils.getBlockNumber();
830
+ // Every dropped entry failed in the same slot against the same L1 fee conditions, so capture
831
+ // the fee environment once and share it rather than re-reading the window per entry.
832
+ const sharedFeeSummary = await this.captureFeeEnvironment(targetSlot).catch(()=>undefined);
833
+ const timing = this.computeTimingInfo(targetSlot);
834
+ for (const { request: req } of dropped){
835
+ this.backupFailedTx({
836
+ id: keccak256(req.request.data),
837
+ failureType: 'simulation',
838
+ request: {
839
+ to: req.request.to,
840
+ data: req.request.data
841
+ },
842
+ l1BlockNumber,
843
+ error: {
844
+ message: 'Bundle entry dropped: action reverted in sim'
845
+ },
846
+ context: {
847
+ actions: [
848
+ req.action
849
+ ],
850
+ sender: this.getSenderAddress().toString(),
851
+ slot: targetSlot !== undefined ? Number(targetSlot) : undefined
852
+ },
853
+ timing
854
+ }, {
855
+ sharedFeeSummary
856
+ });
857
+ }
858
+ } catch (err) {
859
+ this.log.warn(`Failed to back up dropped-in-sim entries`, err);
860
+ }
861
+ }
706
862
  /**
707
863
  * Forwards transactions via Multicall3, rotating to the next available publisher if a send
708
864
  * failure occurs (i.e. the tx never reached the chain).
709
865
  * On-chain reverts and simulation errors are returned as-is without rotation.
710
- */ async forwardWithPublisherRotation(validRequests, txConfig, blobConfig) {
866
+ */ async forwardWithPublisherRotation(validRequests, txConfig, blobConfig, targetSlot) {
867
+ if (!txConfig?.gasLimit) {
868
+ throw new Error('gasLimit is required for bundled transactions');
869
+ }
870
+ const txConfigWithGasLimit = txConfig;
711
871
  const triedAddresses = [];
712
872
  let currentPublisher = this.l1TxUtils;
713
873
  while(true){
874
+ if (txConfig.txTimeoutAt && new Date() > txConfig.txTimeoutAt) {
875
+ this.log.warn(`Tx timeout (${txConfig.txTimeoutAt.toISOString()}) elapsed; stopping publisher rotation`, {
876
+ triedAddresses: triedAddresses.map((a)=>a.toString())
877
+ });
878
+ return undefined;
879
+ }
714
880
  triedAddresses.push(currentPublisher.getSenderAddress());
715
881
  try {
716
- const result = await Multicall3.forward(validRequests.map((r)=>r.request), currentPublisher, txConfig, blobConfig, this.rollupContract.address, this.log);
882
+ const result = await Multicall3.forward(validRequests.map((r)=>r.request), currentPublisher, txConfigWithGasLimit, blobConfig, {
883
+ gasLimitRequired: true
884
+ });
717
885
  this.l1TxUtils = currentPublisher;
718
886
  return result;
719
887
  } catch (err) {
720
888
  if (err instanceof TimeoutError) {
721
889
  throw err;
722
890
  }
891
+ if (err instanceof MulticallForwarderRevertedError) {
892
+ this.log.error('Forwarder transaction reverted on-chain; not rotating publisher', err, {
893
+ transactionHash: err.receipt.transactionHash
894
+ });
895
+ this.backupRevertFailure(validRequests, err, currentPublisher, targetSlot);
896
+ return undefined;
897
+ }
723
898
  const viemError = formatViemError(err);
724
899
  if (!this.getNextPublisher) {
725
900
  this.log.error('Failed to publish bundled transactions', viemError);
901
+ this.backupSendFailure(validRequests, viemError, currentPublisher, targetSlot);
726
902
  return undefined;
727
903
  }
728
904
  this.log.warn(`Publisher ${currentPublisher.getSenderAddress()} failed to send, rotating to next publisher`, viemError);
@@ -730,121 +906,205 @@ export class SequencerPublisher {
730
906
  ...triedAddresses
731
907
  ]);
732
908
  if (!nextPublisher) {
733
- this.log.error('All available publishers exhausted, failed to publish bundled transactions');
909
+ this.log.error(`All available publishers exhausted (tried ${triedAddresses.length}), failed to publish bundled transactions`, viemError, {
910
+ triedAddresses: triedAddresses.map((a)=>a.toString())
911
+ });
912
+ this.backupSendFailure(validRequests, viemError, currentPublisher, targetSlot);
734
913
  return undefined;
735
914
  }
736
915
  currentPublisher = nextPublisher;
737
916
  }
738
917
  }
739
918
  }
740
- callbackBundledTransactions(requests, result, txContext) {
741
- const actionsListStr = requests.map((r)=>r.action).join(', ');
742
- if (result instanceof FormattedViemError) {
743
- this.log.error(`Failed to publish bundled transactions (${actionsListStr})`, result);
919
+ /** Backs up an on-chain revert failure to the failed tx store. */ backupRevertFailure(requests, err, publisher, targetSlot) {
920
+ this.backupFailedTx({
921
+ id: err.receipt.transactionHash,
922
+ failureType: 'revert',
923
+ request: {
924
+ to: MULTI_CALL_3_ADDRESS,
925
+ data: '0x'
926
+ },
927
+ l1BlockNumber: err.receipt.blockNumber,
928
+ receipt: {
929
+ transactionHash: err.receipt.transactionHash,
930
+ blockNumber: err.receipt.blockNumber,
931
+ gasUsed: err.receipt.gasUsed,
932
+ status: 'reverted'
933
+ },
934
+ error: {
935
+ message: err.message,
936
+ name: err.name
937
+ },
938
+ context: {
939
+ actions: requests.map((r)=>r.action),
940
+ requests: requests.filter((r)=>r.request.to !== null).map((r)=>({
941
+ action: r.action,
942
+ to: r.request.to,
943
+ data: r.request.data
944
+ })),
945
+ sender: publisher.getSenderAddress().toString(),
946
+ slot: targetSlot !== undefined ? Number(targetSlot) : undefined
947
+ },
948
+ gasInfo: err.txState ? {
949
+ sentGasPrice: err.txState.gasPrice,
950
+ gasLimit: err.txState.gasLimit,
951
+ nonce: err.txState.nonce
952
+ } : undefined,
953
+ timing: this.computeTimingInfo(targetSlot)
954
+ }, {
955
+ captureFeeSummary: true,
956
+ targetSlot
957
+ });
958
+ }
959
+ /** Backs up a send failure (tx never reached chain) to the failed tx store. */ backupSendFailure(requests, error, publisher, targetSlot) {
960
+ // If we can't get the block number, still back up without it.
961
+ void this.l1TxUtils.getBlockNumber().catch(()=>0n).then((l1BlockNumber)=>{
744
962
  this.backupFailedTx({
745
- id: keccak256(txContext.multicallData),
963
+ id: this.failureRecordId(requests.map((r)=>r.action), targetSlot),
746
964
  failureType: 'send-error',
747
965
  request: {
748
966
  to: MULTI_CALL_3_ADDRESS,
749
- data: txContext.multicallData
967
+ data: '0x'
750
968
  },
751
- blobData: txContext.blobData,
752
- l1BlockNumber: txContext.l1BlockNumber.toString(),
969
+ l1BlockNumber,
753
970
  error: {
754
- message: result.message,
755
- name: result.name
971
+ message: error.message,
972
+ name: 'name' in error ? error.name : undefined
756
973
  },
757
974
  context: {
758
975
  actions: requests.map((r)=>r.action),
759
- requests: requests.map((r)=>({
976
+ requests: requests.filter((r)=>r.request.to !== null).map((r)=>({
760
977
  action: r.action,
761
978
  to: r.request.to,
762
979
  data: r.request.data
763
980
  })),
764
- sender: this.getSenderAddress().toString()
765
- }
766
- });
767
- return {
768
- failedActions: requests.map((r)=>r.action)
769
- };
770
- } else {
771
- this.log.verbose(`Published bundled transactions (${actionsListStr})`, {
772
- result,
773
- requests: requests.map((r)=>({
774
- ...r,
775
- // Avoid logging large blob data
776
- blobConfig: r.blobConfig ? {
777
- ...r.blobConfig,
778
- blobs: r.blobConfig.blobs.map((b)=>({
779
- size: trimmedBytesLength(b)
780
- }))
781
- } : undefined
782
- }))
981
+ sender: publisher.getSenderAddress().toString(),
982
+ slot: targetSlot !== undefined ? Number(targetSlot) : undefined
983
+ },
984
+ timing: this.computeTimingInfo(targetSlot)
985
+ }, {
986
+ captureFeeSummary: true,
987
+ targetSlot
783
988
  });
784
- const successfulActions = [];
785
- const failedActions = [];
786
- for (const request of requests){
787
- if (request.checkSuccess(request.request, result)) {
788
- successfulActions.push(request.action);
789
- } else {
790
- failedActions.push(request.action);
989
+ });
990
+ }
991
+ /*
992
+ * Schedules sending all enqueued requests at (or after) the start of the given L2 slot.
993
+ */ async sendRequestsAt(targetSlot) {
994
+ await this.waitForTargetSlot(targetSlot);
995
+ if (this.interrupted) {
996
+ return undefined;
997
+ }
998
+ return this.sendRequests(targetSlot);
999
+ }
1000
+ /**
1001
+ * Sleeps until one L1 slot before the L2 slot boundary, and then waits for that L1 block
1002
+ * to be mined, so we don't risk being included in it. If that block never gets mined after
1003
+ * a timeout, we assume it got skipped on L1, so we send the tx anyway.
1004
+ */ async waitForTargetSlot(targetSlot) {
1005
+ const l1Constants = this.epochCache.getL1Constants();
1006
+ const nowInSeconds = this.dateProvider.nowInSeconds();
1007
+ const startOfTargetSlotTs = getTimestampForSlot(targetSlot, l1Constants);
1008
+ const previousL1BlockTs = startOfTargetSlotTs - this.ethereumSlotDuration;
1009
+ const waitDeadlineTs = previousL1BlockTs + BigInt(this.previousL1BlockWaitTimeoutMs / 1000);
1010
+ const logCtx = {
1011
+ targetSlot,
1012
+ startOfTargetSlotTs,
1013
+ nowInSeconds,
1014
+ previousL1BlockTs,
1015
+ waitDeadlineTs
1016
+ };
1017
+ // Check if we are already past time
1018
+ if (nowInSeconds >= startOfTargetSlotTs) {
1019
+ this.log.verbose(`Target slot ${targetSlot} already started, sending requests immediately`, logCtx);
1020
+ return;
1021
+ }
1022
+ // Otherwise we wait
1023
+ this.log.debug(`Waiting for slot ${targetSlot} before sending requests`, logCtx);
1024
+ // Wait until previous L1 block timestamp first
1025
+ const sleepMs = (Number(previousL1BlockTs) - nowInSeconds) * 1000;
1026
+ if (sleepMs > 0 && !this.interrupted) {
1027
+ this.log.trace(`Sleeping ${sleepMs}ms before waiting for previous L1 block`, logCtx);
1028
+ await this.interruptibleSleep.sleep(sleepMs);
1029
+ }
1030
+ // Then loop until we see the previous L1 block, so we know that we cannot be included in it.
1031
+ // We time out after a while, once we are sure that that block is skipped in L1.
1032
+ while(!this.interrupted){
1033
+ try {
1034
+ const nowInSeconds = this.dateProvider.nowInSeconds();
1035
+ logCtx.nowInSeconds = nowInSeconds;
1036
+ if (nowInSeconds >= waitDeadlineTs) {
1037
+ this.log.warn(`Timed out waiting for previous L1 block before sending requests, proceeding`, logCtx);
1038
+ return;
791
1039
  }
792
- }
793
- // Single backup for the whole reverted tx
794
- if (failedActions.length > 0 && result?.receipt?.status === 'reverted') {
795
- this.backupFailedTx({
796
- id: result.receipt.transactionHash,
797
- failureType: 'revert',
798
- request: {
799
- to: MULTI_CALL_3_ADDRESS,
800
- data: txContext.multicallData
801
- },
802
- blobData: txContext.blobData,
803
- l1BlockNumber: result.receipt.blockNumber.toString(),
804
- receipt: {
805
- transactionHash: result.receipt.transactionHash,
806
- blockNumber: result.receipt.blockNumber.toString(),
807
- gasUsed: (result.receipt.gasUsed ?? 0n).toString(),
808
- status: 'reverted'
809
- },
810
- error: {
811
- message: result.errorMsg ?? 'Transaction reverted'
812
- },
813
- context: {
814
- actions: failedActions,
815
- requests: requests.filter((r)=>failedActions.includes(r.action)).map((r)=>({
816
- action: r.action,
817
- to: r.request.to,
818
- data: r.request.data
819
- })),
820
- sender: this.getSenderAddress().toString()
821
- }
1040
+ const latestBlockTs = await this.l1TxUtils.getBlock().then((b)=>b.timestamp);
1041
+ if (latestBlockTs >= previousL1BlockTs) {
1042
+ this.log.debug(`Previous L1 block mined, proceeding to send requests`, {
1043
+ ...logCtx,
1044
+ latestBlockTs
1045
+ });
1046
+ return;
1047
+ }
1048
+ this.log.trace(`Previous L1 block not mined yet, continuing to wait`, {
1049
+ ...logCtx,
1050
+ latestBlockTs
822
1051
  });
1052
+ } catch (err) {
1053
+ this.log.error(`Error while waiting for previous L1 block before sending requests; retrying`, err, logCtx);
1054
+ } finally{
1055
+ await this.interruptibleSleep.sleep(this.previousL1BlockWaitPollIntervalMs);
1056
+ }
1057
+ }
1058
+ }
1059
+ callbackBundledTransactions(requests, result) {
1060
+ const actionsListStr = requests.map((r)=>r.action).join(', ');
1061
+ this.log.verbose(`Published bundled transactions (${actionsListStr})`, {
1062
+ result,
1063
+ requests: requests.map((r)=>({
1064
+ ...r,
1065
+ // Avoid logging large blob data
1066
+ blobConfig: r.blobConfig ? {
1067
+ ...r.blobConfig,
1068
+ blobs: r.blobConfig.blobs.map((b)=>({
1069
+ size: trimmedBytesLength(b)
1070
+ }))
1071
+ } : undefined
1072
+ }))
1073
+ });
1074
+ const successfulActions = [];
1075
+ const failedActions = [];
1076
+ for (const request of requests){
1077
+ if (request.checkSuccess(request.request, result)) {
1078
+ successfulActions.push(request.action);
1079
+ } else {
1080
+ failedActions.push(request.action);
823
1081
  }
824
- return {
825
- successfulActions,
826
- failedActions
827
- };
828
1082
  }
1083
+ return {
1084
+ successfulActions,
1085
+ failedActions
1086
+ };
829
1087
  }
830
1088
  /**
831
1089
  * @notice Will call `canProposeAt` to make sure that it is possible to propose
832
1090
  * @param tipArchive - The archive to check
833
1091
  * @returns The slot and block number if it is possible to propose, undefined otherwise
834
- */ canProposeAt(tipArchive, msgSender, opts = {}) {
1092
+ */ async canProposeAt(tipArchive, msgSender, simulationOverridesPlan) {
835
1093
  // TODO: #14291 - should loop through multiple keys to check if any of them can propose
836
- const ignoredErrors = [
1094
+ // These errors are expected when we cannot actually propose right now — usually because our
1095
+ // local view of the chain is ahead of L1 (proposed parent hasn't landed yet, or someone
1096
+ // else has just landed the slot, or the archive override doesn't match). We log a warn and
1097
+ // skip the proposal; we do NOT treat these as bugs.
1098
+ const expectedErrors = [
837
1099
  'SlotAlreadyInChain',
838
1100
  'InvalidProposer',
839
1101
  'InvalidArchive'
840
1102
  ];
841
- const pipelined = opts.pipelined ?? this.epochCache.isProposerPipeliningEnabled();
842
- const slotOffset = pipelined ? this.aztecSlotDuration : 0n;
843
- return this.rollupContract.canProposeAt(tipArchive.toBuffer(), msgSender.toString(), this.ethereumSlotDuration, slotOffset, {
844
- forcePendingCheckpointNumber: opts.forcePendingCheckpointNumber
845
- }).catch((err)=>{
846
- if (err instanceof FormattedViemError && ignoredErrors.find((e)=>err.message.includes(e))) {
847
- this.log.warn(`Failed canProposeAtTime check with ${ignoredErrors.find((e)=>err.message.includes(e))}`, {
1103
+ const slotOffset = this.aztecSlotDuration;
1104
+ const nextL1SlotTs = this.getNextL1SlotTimestamp() + slotOffset;
1105
+ return this.rollupContract.canProposeAt(tipArchive.toBuffer(), msgSender.toString(), nextL1SlotTs, await buildSimulationOverridesStateOverride(this.rollupContract, simulationOverridesPlan)).catch((err)=>{
1106
+ if (err instanceof FormattedViemError && expectedErrors.find((e)=>err.message.includes(e))) {
1107
+ this.log.warn(`Failed canProposeAtTime check with ${expectedErrors.find((e)=>err.message.includes(e))}`, {
848
1108
  error: err.message
849
1109
  });
850
1110
  } else {
@@ -858,22 +1118,23 @@ export class SequencerPublisher {
858
1118
  * @dev This is a convenience function that can be used by the sequencer to validate a "partial" header.
859
1119
  * It will throw if the block header is invalid.
860
1120
  * @param header - The block header to validate
861
- */ async validateBlockHeader(header, opts) {
1121
+ */ async validateBlockHeader(header, simulationOverridesPlan) {
862
1122
  const flags = {
863
1123
  ignoreDA: true,
864
1124
  ignoreSignatures: true
865
1125
  };
866
1126
  const args = [
867
1127
  header.toViem(),
868
- CommitteeAttestationsAndSigners.empty().getPackedAttestations(),
1128
+ CommitteeAttestationsAndSigners.packAttestations([]),
869
1129
  [],
870
1130
  Signature.empty().toViemSignature(),
871
1131
  `0x${'0'.repeat(64)}`,
872
1132
  header.blobsHash.toString(),
873
1133
  flags
874
1134
  ];
875
- const ts = BigInt((await this.l1TxUtils.getBlock()).timestamp + this.ethereumSlotDuration);
876
- const stateOverrides = await this.rollupContract.makePendingCheckpointNumberOverride(opts?.forcePendingCheckpointNumber);
1135
+ const l1Constants = this.epochCache.getL1Constants();
1136
+ const ts = getLastL1SlotTimestampForL2Slot(header.slotNumber, l1Constants);
1137
+ const stateOverrides = await buildSimulationOverridesStateOverride(this.rollupContract, simulationOverridesPlan);
877
1138
  let balance = 0n;
878
1139
  if (this.config.fishermanMode) {
879
1140
  // In fisherman mode, we can't know where the proposer is publishing from
@@ -895,7 +1156,7 @@ export class SequencerPublisher {
895
1156
  }),
896
1157
  from: MULTI_CALL_3_ADDRESS
897
1158
  }, {
898
- time: ts + 1n
1159
+ time: ts
899
1160
  }, stateOverrides);
900
1161
  this.log.debug(`Simulated validateHeader`);
901
1162
  }
@@ -941,6 +1202,7 @@ export class SequencerPublisher {
941
1202
  gasUsed,
942
1203
  checkpointNumber,
943
1204
  forcePendingCheckpointNumber: CheckpointNumber(checkpointNumber - 1),
1205
+ lastArchive: validationResult.checkpoint.lastArchive,
944
1206
  reason
945
1207
  };
946
1208
  } catch (err) {
@@ -953,8 +1215,8 @@ export class SequencerPublisher {
953
1215
  request,
954
1216
  error: viemError.message
955
1217
  });
956
- const latestPendingCheckpointNumber = await this.rollupContract.getCheckpointNumber();
957
- if (latestPendingCheckpointNumber < checkpointNumber) {
1218
+ const latestProposedCheckpointNumber = await this.rollupContract.getCheckpointNumber();
1219
+ if (latestProposedCheckpointNumber < checkpointNumber) {
958
1220
  this.log.verbose(`Checkpoint ${checkpointNumber} has already been invalidated`, {
959
1221
  ...logData
960
1222
  });
@@ -974,9 +1236,9 @@ export class SequencerPublisher {
974
1236
  request: {
975
1237
  to: request.to,
976
1238
  data: request.data,
977
- value: request.value?.toString()
1239
+ value: request.value
978
1240
  },
979
- l1BlockNumber: l1BlockNumber.toString(),
1241
+ l1BlockNumber,
980
1242
  error: {
981
1243
  message: viemError.message,
982
1244
  name: viemError.name
@@ -987,7 +1249,11 @@ export class SequencerPublisher {
987
1249
  ],
988
1250
  checkpointNumber,
989
1251
  sender: this.getSenderAddress().toString()
990
- }
1252
+ },
1253
+ timing: this.computeTimingInfo(this.getCurrentL2Slot())
1254
+ }, {
1255
+ captureFeeSummary: true,
1256
+ targetSlot: this.getCurrentL2Slot()
991
1257
  });
992
1258
  throw new Error(`Failed to simulate invalidate checkpoint ${checkpointNumber}`, {
993
1259
  cause: viemError
@@ -1004,7 +1270,11 @@ export class SequencerPublisher {
1004
1270
  reason
1005
1271
  };
1006
1272
  this.log.debug(`Building invalidate checkpoint ${checkpoint.checkpointNumber} request`, logData);
1007
- const attestationsAndSigners = new CommitteeAttestationsAndSigners(validationResult.attestations).getPackedAttestations();
1273
+ // Use the exact packed tuple posted to L1 verbatim. A repack via `packAttestations` is not a
1274
+ // byte-faithful inverse of `fromPacked` (a canonicalized yParity byte or an all-zero signature slot
1275
+ // round-trips differently), so it would diverge from the stored `attestationsHash` and revert the
1276
+ // invalidation.
1277
+ const attestationsAndSigners = validationResult.verbatimAttestations;
1008
1278
  if (reason === 'invalid-attestation') {
1009
1279
  return this.rollupContract.buildInvalidateBadAttestationRequest(checkpoint.checkpointNumber, attestationsAndSigners, committee, validationResult.invalidIndex);
1010
1280
  } else if (reason === 'insufficient-attestations') {
@@ -1014,30 +1284,7 @@ export class SequencerPublisher {
1014
1284
  throw new Error(`Unknown reason for invalidation`);
1015
1285
  }
1016
1286
  }
1017
- /** Simulates `propose` to make sure that the checkpoint is valid for submission */ async validateCheckpointForSubmission(checkpoint, attestationsAndSigners, attestationsAndSignersSignature, options) {
1018
- // Anchor the simulation timestamp to the checkpoint's own slot start time
1019
- // rather than the current L1 block timestamp, which may overshoot into the next slot if the build ran late.
1020
- const ts = checkpoint.header.timestamp;
1021
- const blobFields = checkpoint.toBlobFields();
1022
- const blobs = await getBlobsPerL1Block(blobFields);
1023
- const blobInput = getPrefixedEthBlobCommitments(blobs);
1024
- const args = [
1025
- {
1026
- header: checkpoint.header.toViem(),
1027
- archive: toHex(checkpoint.archive.root.toBuffer()),
1028
- oracleInput: {
1029
- feeAssetPriceModifier: checkpoint.feeAssetPriceModifier
1030
- }
1031
- },
1032
- attestationsAndSigners.getPackedAttestations(),
1033
- attestationsAndSigners.getSigners().map((signer)=>signer.toString()),
1034
- attestationsAndSignersSignature.toViemSignature(),
1035
- blobInput
1036
- ];
1037
- await this.simulateProposeTx(args, ts, options);
1038
- return ts;
1039
- }
1040
- async enqueueCastSignalHelper(slotNumber, timestamp, signalType, payload, base, signerAddress, signer) {
1287
+ async enqueueCastSignalHelper(slotNumber, signalType, payload, base, signerAddress, signer) {
1041
1288
  if (this.lastActions[signalType] && this.lastActions[signalType] === slotNumber) {
1042
1289
  this.log.debug(`Skipping duplicate vote cast signal ${signalType} for slot ${slotNumber}`);
1043
1290
  return false;
@@ -1057,30 +1304,26 @@ export class SequencerPublisher {
1057
1304
  if (roundInfo.lastSignalSlot >= slotNumber) {
1058
1305
  return false;
1059
1306
  }
1060
- if (await this.isPayloadEmpty(payload)) {
1307
+ if (await base.isPayloadEmpty(payload)) {
1061
1308
  this.log.warn(`Skipping vote cast for payload with empty code`);
1062
1309
  return false;
1063
1310
  }
1064
- // Check if payload was already submitted to governance
1065
- const cacheKey = payload.toString();
1066
- if (!this.payloadProposedCache.has(cacheKey)) {
1067
- try {
1068
- const l1StartBlock = await this.rollupContract.getL1StartBlock();
1069
- const proposed = await retry(()=>base.hasPayloadBeenProposed(payload.toString(), l1StartBlock), 'Check if payload was proposed', makeBackoff([
1070
- 0,
1071
- 1,
1072
- 2
1073
- ]), this.log, true);
1074
- if (proposed) {
1075
- this.payloadProposedCache.add(cacheKey);
1076
- }
1077
- } catch (err) {
1078
- this.log.warn(`Failed to check if payload ${payload} was proposed after retries, skipping signal`, err);
1079
- return false;
1080
- }
1311
+ // Skip signaling if there is already a live (non-terminal) Governance proposal for this
1312
+ // payload. This is intentionally not cached: a previously-live proposal may transition to
1313
+ // a terminal state (Dropped/Rejected/Expired/Executed), at which point we may want to re-signal
1314
+ // the same payload in a future round.
1315
+ let proposed = false;
1316
+ try {
1317
+ proposed = await base.hasActiveProposalWithPayload(payload.toString());
1318
+ } catch (err) {
1319
+ // We deliberately swallow the error and proceed to signal. Failing closed (skipping the
1320
+ // signal) on transient RPC errors would let a flaky L1 endpoint silence governance
1321
+ // participation entirely; failing open at worst produces a duplicate signal that the
1322
+ // contract will simply count alongside others in the round.
1323
+ this.log.error(`Failed to check if payload ${payload} was already proposed (signalling anyway)`, err);
1081
1324
  }
1082
- if (this.payloadProposedCache.has(cacheKey)) {
1083
- this.log.info(`Payload ${payload} was already proposed to governance, stopping signals`);
1325
+ if (proposed) {
1326
+ this.log.info(`Payload ${payload} has a live governance proposal, stopping signals`);
1084
1327
  return false;
1085
1328
  }
1086
1329
  const cachedLastVote = this.lastActions[signalType];
@@ -1093,53 +1336,17 @@ export class SequencerPublisher {
1093
1336
  signer: this.l1TxUtils.client.account?.address,
1094
1337
  lastValidL2Slot: slotNumber
1095
1338
  });
1096
- const l1BlockNumber = await this.l1TxUtils.getBlockNumber();
1097
- try {
1098
- await this.l1TxUtils.simulate(request, {
1099
- time: timestamp
1100
- }, [], mergeAbis([
1101
- request.abi ?? [],
1102
- ErrorsAbi
1103
- ]));
1104
- this.log.debug(`Simulation for ${action} at slot ${slotNumber} succeeded`, {
1105
- request
1106
- });
1107
- } catch (err) {
1108
- const viemError = formatViemError(err);
1109
- this.log.error(`Failed simulation for ${action} at slot ${slotNumber} (enqueuing the action anyway)`, viemError);
1110
- this.backupFailedTx({
1111
- id: keccak256(request.data),
1112
- failureType: 'simulation',
1113
- request: {
1114
- to: request.to,
1115
- data: request.data,
1116
- value: request.value?.toString()
1117
- },
1118
- l1BlockNumber: l1BlockNumber.toString(),
1119
- error: {
1120
- message: viemError.message,
1121
- name: viemError.name
1122
- },
1123
- context: {
1124
- actions: [
1125
- action
1126
- ],
1127
- slot: slotNumber,
1128
- sender: this.getSenderAddress().toString()
1129
- }
1130
- });
1131
- // Yes, we enqueue the request anyway, in case there was a bug with the simulation itself
1132
- }
1133
1339
  // TODO(palla/slash): All votes (governance and slashing) should txTimeoutAt at the end of the slot.
1134
1340
  this.addRequest({
1135
- gasConfig: {
1136
- gasLimit: SequencerPublisher.VOTE_GAS_GUESS
1137
- },
1138
1341
  action,
1139
1342
  request,
1140
1343
  lastValidL2Slot: slotNumber,
1141
1344
  checkSuccess: (_request, result)=>{
1142
- const success = result && result.receipt && result.receipt.status === 'success' && tryExtractEvent(result.receipt.logs, base.address.toString(), EmpireBaseAbi, 'SignalCast');
1345
+ const success = result && extractEventSuccess(result.receipt, {
1346
+ address: base.address.toString(),
1347
+ abi: EmpireBaseAbi,
1348
+ eventName: 'SignalCast'
1349
+ });
1143
1350
  const logData = {
1144
1351
  ...result,
1145
1352
  slotNumber,
@@ -1158,68 +1365,70 @@ export class SequencerPublisher {
1158
1365
  });
1159
1366
  return true;
1160
1367
  }
1161
- async isPayloadEmpty(payload) {
1162
- const key = payload.toString();
1163
- const cached = this.isPayloadEmptyCache.get(key);
1164
- if (cached) {
1165
- return cached;
1166
- }
1167
- const isEmpty = !await this.l1TxUtils.getCode(payload);
1168
- this.isPayloadEmptyCache.set(key, isEmpty);
1169
- return isEmpty;
1170
- }
1171
1368
  /**
1172
1369
  * Enqueues a governance castSignal transaction to cast a signal for a given slot number.
1173
1370
  * @param slotNumber - The slot number to cast a signal for.
1174
- * @param timestamp - The timestamp of the slot to cast a signal for.
1175
1371
  * @returns True if the signal was successfully enqueued, false otherwise.
1176
- */ enqueueGovernanceCastSignal(governancePayload, slotNumber, timestamp, signerAddress, signer) {
1177
- return this.enqueueCastSignalHelper(slotNumber, timestamp, 'governance-signal', governancePayload, this.govProposerContract, signerAddress, signer);
1372
+ */ enqueueGovernanceCastSignal(governancePayload, slotNumber, signerAddress, signer) {
1373
+ return this.enqueueCastSignalHelper(slotNumber, 'governance-signal', governancePayload, this.govProposerContract, signerAddress, signer);
1374
+ }
1375
+ /**
1376
+ * Enqueues a `prune()` transaction if the rollup is prunable at the given slot's L1 timestamp.
1377
+ * `prune()` is permissionless and idempotent — if the chain is no longer prunable by send time the
1378
+ * bundle simulation usually drops the entry; on a node without `eth_simulateV1` the bundle is sent
1379
+ * as-is and the prune reverts `Rollup__NothingToPrune` inside `aggregate3(allowFailure: true)`
1380
+ * (a failed action, never a whole-tx revert). Used by the failed-sync fallback so a stuck pending
1381
+ * chain (e.g. bad data blocking sync) can be wound back to recover.
1382
+ * @returns true if a prune request was enqueued, false otherwise.
1383
+ */ async enqueuePruneIfPrunable(slotNumber) {
1384
+ if (this.lastActions['prune'] === slotNumber) {
1385
+ this.log.debug(`Skipping duplicate prune for slot ${slotNumber}`, {
1386
+ slotNumber
1387
+ });
1388
+ return false;
1389
+ }
1390
+ // Use the SAME timestamp the bundle simulator overrides block.timestamp with at send time
1391
+ // (sequencer-bundle-simulator.ts) so this upfront check and the send-time sim agree. Slot-start
1392
+ // and last-L1-slot both fall within the same L2 slot (and epoch, which is what `canPruneAtTime`
1393
+ // derives), so they agree today; matching the simulator keeps it robust if the contract ever uses
1394
+ // the timestamp more granularly.
1395
+ const ts = getLastL1SlotTimestampForL2Slot(slotNumber, this.epochCache.getL1Constants());
1396
+ const canPrune = await this.rollupContract.canPruneAtTime(ts).catch((err)=>{
1397
+ this.log.error(`Failed to check canPruneAtTime for slot ${slotNumber}`, err, {
1398
+ slotNumber
1399
+ });
1400
+ return false;
1401
+ });
1402
+ if (!canPrune) {
1403
+ this.log.debug(`Rollup not prunable at slot ${slotNumber}`, {
1404
+ slotNumber
1405
+ });
1406
+ return false;
1407
+ }
1408
+ const request = {
1409
+ to: this.rollupContract.address,
1410
+ data: encodeFunctionData({
1411
+ abi: RollupAbi,
1412
+ functionName: 'prune',
1413
+ args: []
1414
+ })
1415
+ };
1416
+ this.log.info(`Enqueuing rollup prune for slot ${slotNumber}`, {
1417
+ slotNumber
1418
+ });
1419
+ return this.enqueueRequest('prune', request, {
1420
+ address: this.rollupContract.address,
1421
+ abi: RollupAbi,
1422
+ eventName: 'PrunedPending'
1423
+ }, slotNumber);
1178
1424
  }
1179
- /** Enqueues all slashing actions as returned by the slasher client. */ async enqueueSlashingActions(actions, slotNumber, timestamp, signerAddress, signer) {
1425
+ /** Enqueues all slashing actions as returned by the slasher client. */ async enqueueSlashingActions(actions, slotNumber, signerAddress, signer) {
1180
1426
  if (actions.length === 0) {
1181
1427
  this.log.debug(`No slashing actions to enqueue for slot ${slotNumber}`);
1182
1428
  return false;
1183
1429
  }
1184
1430
  for (const action of actions){
1185
1431
  switch(action.type){
1186
- case 'vote-empire-payload':
1187
- {
1188
- if (this.slashingProposerContract?.type !== 'empire') {
1189
- this.log.error('Cannot vote for empire payload on non-empire slashing contract');
1190
- break;
1191
- }
1192
- this.log.debug(`Enqueuing slashing vote for payload ${action.payload} at slot ${slotNumber}`, {
1193
- signerAddress
1194
- });
1195
- await this.enqueueCastSignalHelper(slotNumber, timestamp, 'empire-slashing-signal', action.payload, this.slashingProposerContract, signerAddress, signer);
1196
- break;
1197
- }
1198
- case 'create-empire-payload':
1199
- {
1200
- this.log.debug(`Enqueuing slashing create payload at slot ${slotNumber}`, {
1201
- slotNumber,
1202
- signerAddress
1203
- });
1204
- const request = this.slashFactoryContract.buildCreatePayloadRequest(action.data);
1205
- await this.simulateAndEnqueueRequest('create-empire-payload', request, (receipt)=>!!this.slashFactoryContract.tryExtractSlashPayloadCreatedEvent(receipt.logs), slotNumber, timestamp);
1206
- break;
1207
- }
1208
- case 'execute-empire-payload':
1209
- {
1210
- this.log.debug(`Enqueuing slashing execute payload at slot ${slotNumber}`, {
1211
- slotNumber,
1212
- signerAddress
1213
- });
1214
- if (this.slashingProposerContract?.type !== 'empire') {
1215
- this.log.error('Cannot execute slashing payload on non-empire slashing contract');
1216
- return false;
1217
- }
1218
- const empireSlashingProposer = this.slashingProposerContract;
1219
- const request = empireSlashingProposer.buildExecuteRoundRequest(action.round);
1220
- await this.simulateAndEnqueueRequest('execute-empire-payload', request, (receipt)=>!!empireSlashingProposer.tryExtractPayloadSubmittedEvent(receipt.logs), slotNumber, timestamp);
1221
- break;
1222
- }
1223
1432
  case 'vote-offenses':
1224
1433
  {
1225
1434
  this.log.debug(`Enqueuing slashing vote for ${action.votes.length} votes at slot ${slotNumber}`, {
@@ -1228,14 +1437,17 @@ export class SequencerPublisher {
1228
1437
  votesCount: action.votes.length,
1229
1438
  signerAddress
1230
1439
  });
1231
- if (this.slashingProposerContract?.type !== 'tally') {
1232
- this.log.error('Cannot vote for slashing offenses on non-tally slashing contract');
1440
+ if (!this.slashingProposerContract) {
1441
+ this.log.error('No slashing proposer contract available');
1233
1442
  return false;
1234
1443
  }
1235
- const tallySlashingProposer = this.slashingProposerContract;
1236
1444
  const votes = bufferToHex(encodeSlashConsensusVotes(action.votes));
1237
- const request = await tallySlashingProposer.buildVoteRequestFromSigner(votes, slotNumber, signer);
1238
- await this.simulateAndEnqueueRequest('vote-offenses', request, (receipt)=>!!tallySlashingProposer.tryExtractVoteCastEvent(receipt.logs), slotNumber, timestamp);
1445
+ const request = await this.slashingProposerContract.buildVoteRequestFromSigner(votes, slotNumber, signer);
1446
+ this.enqueueRequest('vote-offenses', request, {
1447
+ address: this.slashingProposerContract.address.toString(),
1448
+ abi: SlashingProposerAbi,
1449
+ eventName: 'VoteCast'
1450
+ }, slotNumber);
1239
1451
  break;
1240
1452
  }
1241
1453
  case 'execute-slash':
@@ -1245,13 +1457,16 @@ export class SequencerPublisher {
1245
1457
  round: action.round,
1246
1458
  signerAddress
1247
1459
  });
1248
- if (this.slashingProposerContract?.type !== 'tally') {
1249
- this.log.error('Cannot execute slashing offenses on non-tally slashing contract');
1460
+ if (!this.slashingProposerContract) {
1461
+ this.log.error('No slashing proposer contract available');
1250
1462
  return false;
1251
1463
  }
1252
- const tallySlashingProposer = this.slashingProposerContract;
1253
- const request = tallySlashingProposer.buildExecuteRoundRequest(action.round, action.committees);
1254
- await this.simulateAndEnqueueRequest('execute-slash', request, (receipt)=>!!tallySlashingProposer.tryExtractRoundExecutedEvent(receipt.logs), slotNumber, timestamp);
1464
+ const executeRequest = this.slashingProposerContract.buildExecuteRoundRequest(action.round, action.committees);
1465
+ this.enqueueRequest('execute-slash', executeRequest, {
1466
+ address: this.slashingProposerContract.address.toString(),
1467
+ abi: SlashingProposerAbi,
1468
+ eventName: 'RoundExecuted'
1469
+ }, slotNumber);
1255
1470
  break;
1256
1471
  }
1257
1472
  default:
@@ -1263,7 +1478,7 @@ export class SequencerPublisher {
1263
1478
  }
1264
1479
  return true;
1265
1480
  }
1266
- /** Simulates and enqueues a proposal for a checkpoint on L1 */ async enqueueProposeCheckpoint(checkpoint, attestationsAndSigners, attestationsAndSignersSignature, opts = {}) {
1481
+ /** Enqueues a proposal for a checkpoint on L1 */ async enqueueProposeCheckpoint(checkpoint, attestationsAndSigners, attestationsAndSignersSignature, opts = {}) {
1267
1482
  const checkpointHeader = checkpoint.header;
1268
1483
  const blobFields = checkpoint.toBlobFields();
1269
1484
  const blobs = await getBlobsPerL1Block(blobFields);
@@ -1275,52 +1490,38 @@ export class SequencerPublisher {
1275
1490
  attestationsAndSignersSignature,
1276
1491
  feeAssetPriceModifier: checkpoint.feeAssetPriceModifier
1277
1492
  };
1278
- let ts;
1279
- try {
1280
- // @note This will make sure that we are passing the checks for our header ASSUMING that the data is also made available
1281
- // This means that we can avoid the simulation issues in later checks.
1282
- // By simulation issue, I mean the fact that the block.timestamp is equal to the last block, not the next, which
1283
- // make time consistency checks break.
1284
- // TODO(palla): Check whether we're validating twice, once here and once within addProposeTx, since we call simulateProposeTx in both places.
1285
- ts = await this.validateCheckpointForSubmission(checkpoint, attestationsAndSigners, attestationsAndSignersSignature, opts);
1286
- } catch (err) {
1287
- this.log.error(`Checkpoint validation failed. ${err instanceof Error ? err.message : 'No error message'}`, err, {
1288
- ...checkpoint.getStats(),
1289
- slotNumber: checkpoint.header.slotNumber,
1290
- forcePendingCheckpointNumber: opts.forcePendingCheckpointNumber
1291
- });
1292
- throw err;
1293
- }
1294
1493
  this.log.verbose(`Enqueuing checkpoint propose transaction`, {
1295
1494
  ...checkpoint.toCheckpointInfo(),
1296
- ...opts
1495
+ txTimeoutAt: opts.txTimeoutAt
1496
+ });
1497
+ await this.addProposeTx(checkpoint, proposeTxArgs, {
1498
+ txTimeoutAt: opts.txTimeoutAt
1297
1499
  });
1298
- await this.addProposeTx(checkpoint, proposeTxArgs, opts, ts);
1299
1500
  }
1300
1501
  enqueueInvalidateCheckpoint(request, opts = {}) {
1301
1502
  if (!request) {
1302
1503
  return;
1303
1504
  }
1304
- // We issued the simulation against the rollup contract, so we need to account for the overhead of the multicall3
1305
- const gasLimit = this.l1TxUtils.bumpGasLimit(BigInt(Math.ceil(Number(request.gasUsed) * 64 / 63)));
1306
1505
  const { gasUsed, checkpointNumber } = request;
1307
1506
  const logData = {
1308
1507
  gasUsed,
1309
1508
  checkpointNumber,
1310
- gasLimit,
1311
1509
  opts
1312
1510
  };
1313
1511
  this.log.verbose(`Enqueuing invalidate checkpoint request`, logData);
1314
1512
  this.addRequest({
1315
1513
  action: `invalidate-by-${request.reason}`,
1316
1514
  request: request.request,
1317
- gasConfig: {
1318
- gasLimit,
1515
+ gasConfig: opts.txTimeoutAt ? {
1319
1516
  txTimeoutAt: opts.txTimeoutAt
1320
- },
1517
+ } : undefined,
1321
1518
  lastValidL2Slot: SlotNumber(this.getCurrentL2Slot() + 2),
1322
1519
  checkSuccess: (_req, result)=>{
1323
- const success = result && result.receipt && result.receipt.status === 'success' && tryExtractEvent(result.receipt.logs, this.rollupContract.address, RollupAbi, 'CheckpointInvalidated');
1520
+ const success = result && extractEventSuccess(result.receipt, {
1521
+ address: this.rollupContract.address,
1522
+ abi: RollupAbi,
1523
+ eventName: 'CheckpointInvalidated'
1524
+ });
1324
1525
  if (!success) {
1325
1526
  this.log.warn(`Invalidate checkpoint ${request.checkpointNumber} failed`, {
1326
1527
  ...result,
@@ -1336,89 +1537,36 @@ export class SequencerPublisher {
1336
1537
  }
1337
1538
  });
1338
1539
  }
1339
- async simulateAndEnqueueRequest(action, request, checkSuccess, slotNumber, timestamp) {
1340
- const logData = {
1341
- slotNumber,
1342
- timestamp,
1343
- gasLimit: undefined
1344
- };
1540
+ /**
1541
+ * Dedup-checked enqueue helper for actions that are simulated at bundle-send time rather
1542
+ * than at enqueue time. Validates the (action, slot) dedup key, sets `lastActions`, and
1543
+ * enqueues without a gasLimit so the bundle simulate sets the only gasLimit that matters.
1544
+ */ enqueueRequest(action, request, eventOpts, slotNumber) {
1345
1545
  if (this.lastActions[action] && this.lastActions[action] === slotNumber) {
1346
1546
  this.log.debug(`Skipping duplicate action ${action} for slot ${slotNumber}`);
1347
1547
  return false;
1348
1548
  }
1349
1549
  const cachedLastActionSlot = this.lastActions[action];
1350
1550
  this.lastActions[action] = slotNumber;
1351
- this.log.debug(`Simulating ${action} for slot ${slotNumber}`, logData);
1352
- const l1BlockNumber = await this.l1TxUtils.getBlockNumber();
1353
- let gasUsed;
1354
- const simulateAbi = mergeAbis([
1355
- request.abi ?? [],
1356
- ErrorsAbi
1357
- ]);
1358
- try {
1359
- ({ gasUsed } = await this.l1TxUtils.simulate(request, {
1360
- time: timestamp
1361
- }, [], simulateAbi)); // TODO(palla/slash): Check the timestamp logic
1362
- this.log.verbose(`Simulation for ${action} succeeded`, {
1363
- ...logData,
1364
- request,
1365
- gasUsed
1366
- });
1367
- } catch (err) {
1368
- const viemError = formatViemError(err, simulateAbi);
1369
- this.log.error(`Simulation for ${action} at ${slotNumber} failed`, viemError, logData);
1370
- this.backupFailedTx({
1371
- id: keccak256(request.data),
1372
- failureType: 'simulation',
1373
- request: {
1374
- to: request.to,
1375
- data: request.data,
1376
- value: request.value?.toString()
1377
- },
1378
- l1BlockNumber: l1BlockNumber.toString(),
1379
- error: {
1380
- message: viemError.message,
1381
- name: viemError.name
1382
- },
1383
- context: {
1384
- actions: [
1385
- action
1386
- ],
1387
- slot: slotNumber,
1388
- sender: this.getSenderAddress().toString()
1389
- }
1390
- });
1391
- return false;
1392
- }
1393
- // We issued the simulation against the rollup contract, so we need to account for the overhead of the multicall3
1394
- const gasLimit = this.l1TxUtils.bumpGasLimit(BigInt(Math.ceil(Number(gasUsed) * 64 / 63)));
1395
- logData.gasLimit = gasLimit;
1396
- // Store the ABI used for simulation on the request so Multicall3.forward can decode errors
1397
- // when the tx is sent and a revert is diagnosed via simulation.
1398
- const requestWithAbi = {
1399
- ...request,
1400
- abi: simulateAbi
1401
- };
1402
- this.log.debug(`Enqueuing ${action}`, logData);
1551
+ this.log.debug(`Enqueuing ${action}`, {
1552
+ slotNumber
1553
+ });
1403
1554
  this.addRequest({
1404
1555
  action,
1405
- request: requestWithAbi,
1406
- gasConfig: {
1407
- gasLimit
1408
- },
1556
+ request,
1409
1557
  lastValidL2Slot: slotNumber,
1410
- checkSuccess: (_req, result)=>{
1411
- const success = result && result.receipt && result.receipt.status === 'success' && checkSuccess(result.receipt);
1558
+ checkSuccess: (_request, result)=>{
1559
+ const success = result && extractEventSuccess(result.receipt, eventOpts);
1412
1560
  if (!success) {
1413
1561
  this.log.warn(`Action ${action} at ${slotNumber} failed`, {
1414
1562
  ...result,
1415
- ...logData
1563
+ slotNumber
1416
1564
  });
1417
1565
  this.lastActions[action] = cachedLastActionSlot;
1418
1566
  } else {
1419
1567
  this.log.info(`Action ${action} at ${slotNumber} succeeded`, {
1420
1568
  ...result,
1421
- ...logData
1569
+ slotNumber
1422
1570
  });
1423
1571
  }
1424
1572
  return !!success;
@@ -1433,13 +1581,14 @@ export class SequencerPublisher {
1433
1581
  * A call to `restart` is required before you can continue publishing.
1434
1582
  */ interrupt() {
1435
1583
  this.interrupted = true;
1584
+ this.interruptibleSleep.interrupt();
1436
1585
  this.l1TxUtils.interrupt();
1437
1586
  }
1438
1587
  /** Restarts the publisher after calling `interrupt`. */ restart() {
1439
1588
  this.interrupted = false;
1440
1589
  this.l1TxUtils.restart();
1441
1590
  }
1442
- async prepareProposeTx(encodedData, timestamp, options) {
1591
+ async prepareProposeTx(encodedData) {
1443
1592
  const kzg = Blob.getViemKzgInstance();
1444
1593
  const blobInput = getPrefixedEthBlobCommitments(encodedData.blobs);
1445
1594
  this.log.debug('Validating blob input', {
@@ -1453,7 +1602,11 @@ export class SequencerPublisher {
1453
1602
  blobEvaluationGas = BigInt(encodedData.blobs.length) * 21_000n;
1454
1603
  this.log.debug(`Using fixed blob evaluation gas estimate in fisherman mode: ${blobEvaluationGas}`);
1455
1604
  } else {
1456
- // Normal mode - use estimateGas with blob inputs
1605
+ // We call validateBlobs via estimateGas with real blob+kzg sidecars as a consistency check
1606
+ // that our locally-built blob commitments match the blob data. The bundle simulate at send
1607
+ // time uses eth_simulateV1, which cannot carry blob inputs, so the rollup's on-chain blob
1608
+ // check is forced off there — making this the only pre-flight detector of a commitment/data
1609
+ // mismatch. The returned gas estimate is stashed on the request for the bundle path to read.
1457
1610
  blobEvaluationGas = await this.l1TxUtils.estimateGas(this.getSenderAddress().toString(), {
1458
1611
  to: this.rollupContract.address,
1459
1612
  data: encodeFunctionData({
@@ -1487,7 +1640,7 @@ export class SequencerPublisher {
1487
1640
  data: validateBlobsData
1488
1641
  },
1489
1642
  blobData: encodedData.blobs.map((b)=>toHex(b.data)),
1490
- l1BlockNumber: l1BlockNumber.toString(),
1643
+ l1BlockNumber,
1491
1644
  error: {
1492
1645
  message: viemError.message,
1493
1646
  name: viemError.name
@@ -1497,7 +1650,11 @@ export class SequencerPublisher {
1497
1650
  'validate-blobs'
1498
1651
  ],
1499
1652
  sender: this.getSenderAddress().toString()
1500
- }
1653
+ },
1654
+ timing: this.computeTimingInfo(this.getCurrentL2Slot())
1655
+ }, {
1656
+ captureFeeSummary: true,
1657
+ targetSlot: this.getCurrentL2Slot()
1501
1658
  });
1502
1659
  throw new Error('Failed to validate blobs');
1503
1660
  });
@@ -1516,109 +1673,23 @@ export class SequencerPublisher {
1516
1673
  encodedData.attestationsAndSignersSignature.toViemSignature(),
1517
1674
  blobInput
1518
1675
  ];
1519
- const { rollupData, simulationResult } = await this.simulateProposeTx(args, timestamp, options);
1520
- return {
1521
- args,
1522
- blobEvaluationGas,
1523
- rollupData,
1524
- simulationResult
1525
- };
1526
- }
1527
- /**
1528
- * Simulates the propose tx with eth_simulateV1
1529
- * @param args - The propose tx args
1530
- * @param timestamp - The timestamp to simulate proposal at
1531
- * @returns The simulation result
1532
- */ async simulateProposeTx(args, timestamp, options) {
1533
1676
  const rollupData = encodeFunctionData({
1534
1677
  abi: RollupAbi,
1535
1678
  functionName: 'propose',
1536
1679
  args
1537
1680
  });
1538
- // override the pending checkpoint number if requested
1539
- const forcePendingCheckpointNumberStateDiff = (options.forcePendingCheckpointNumber !== undefined ? await this.rollupContract.makePendingCheckpointNumberOverride(options.forcePendingCheckpointNumber) : []).flatMap((override)=>override.stateDiff ?? []);
1540
- const stateOverrides = [
1541
- {
1542
- address: this.rollupContract.address,
1543
- // @note we override checkBlob to false since blobs are not part simulate()
1544
- stateDiff: [
1545
- {
1546
- slot: toPaddedHex(RollupContract.checkBlobStorageSlot, true),
1547
- value: toPaddedHex(0n, true)
1548
- },
1549
- ...forcePendingCheckpointNumberStateDiff
1550
- ]
1551
- }
1552
- ];
1553
- // In fisherman mode, simulate as the proposer but with sufficient balance
1554
- if (this.proposerAddressForSimulation) {
1555
- stateOverrides.push({
1556
- address: this.proposerAddressForSimulation.toString(),
1557
- balance: 10n * WEI_CONST * WEI_CONST
1558
- });
1559
- }
1560
- const l1BlockNumber = await this.l1TxUtils.getBlockNumber();
1561
- const simulationResult = await this.l1TxUtils.simulate({
1562
- to: this.rollupContract.address,
1563
- data: rollupData,
1564
- gas: MAX_L1_TX_LIMIT,
1565
- ...this.proposerAddressForSimulation && {
1566
- from: this.proposerAddressForSimulation.toString()
1567
- }
1568
- }, {
1569
- // @note we add 1n to the timestamp because geth implementation doesn't like simulation timestamp to be equal to the current block timestamp
1570
- time: timestamp + 1n,
1571
- // @note reth should have a 30m gas limit per block but throws errors that this tx is beyond limit so we increase here
1572
- gasLimit: MAX_L1_TX_LIMIT * 2n
1573
- }, stateOverrides, RollupAbi, {
1574
- // @note fallback gas estimate to use if the node doesn't support simulation API
1575
- fallbackGasEstimate: MAX_L1_TX_LIMIT
1576
- }).catch((err)=>{
1577
- // In fisherman mode, we expect ValidatorSelection__MissingProposerSignature since fisherman doesn't have proposer signature
1578
- const viemError = formatViemError(err);
1579
- if (this.config.fishermanMode && viemError.message?.includes('ValidatorSelection__MissingProposerSignature')) {
1580
- this.log.debug(`Ignoring expected ValidatorSelection__MissingProposerSignature error in fisherman mode`);
1581
- // Return a minimal simulation result with the fallback gas estimate
1582
- return {
1583
- gasUsed: MAX_L1_TX_LIMIT,
1584
- logs: []
1585
- };
1586
- }
1587
- this.log.error(`Failed to simulate propose tx`, viemError);
1588
- this.backupFailedTx({
1589
- id: keccak256(rollupData),
1590
- failureType: 'simulation',
1591
- request: {
1592
- to: this.rollupContract.address,
1593
- data: rollupData
1594
- },
1595
- l1BlockNumber: l1BlockNumber.toString(),
1596
- error: {
1597
- message: viemError.message,
1598
- name: viemError.name
1599
- },
1600
- context: {
1601
- actions: [
1602
- 'propose'
1603
- ],
1604
- slot: Number(args[0].header.slotNumber),
1605
- sender: this.getSenderAddress().toString()
1606
- }
1607
- });
1608
- throw err;
1609
- });
1610
1681
  return {
1611
- rollupData,
1612
- simulationResult
1682
+ args,
1683
+ blobEvaluationGas,
1684
+ rollupData
1613
1685
  };
1614
1686
  }
1615
- async addProposeTx(checkpoint, encodedData, opts = {}, timestamp) {
1687
+ async addProposeTx(checkpoint, encodedData, opts = {}) {
1616
1688
  const slot = checkpoint.header.slotNumber;
1617
1689
  const timer = new Timer();
1618
1690
  const kzg = Blob.getViemKzgInstance();
1619
- const { rollupData, simulationResult, blobEvaluationGas } = await this.prepareProposeTx(encodedData, timestamp, opts);
1691
+ const { rollupData, blobEvaluationGas } = await this.prepareProposeTx(encodedData);
1620
1692
  const startBlock = await this.l1TxUtils.getBlockNumber();
1621
- const gasLimit = this.l1TxUtils.bumpGasLimit(BigInt(Math.ceil(Number(simulationResult.gasUsed) * 64 / 63)) + blobEvaluationGas + SequencerPublisher.MULTICALL_OVERHEAD_GAS_GUESS);
1622
1693
  // Send the blobs to the blob client preemptively. This helps in tests where the sequencer mistakingly thinks that the propose
1623
1694
  // tx fails but it does get mined. We make sure that the blobs are sent to the blob client regardless of the tx outcome.
1624
1695
  void Promise.resolve().then(()=>this.blobClient.sendBlobsToFilestore(encodedData.blobs).catch((_err)=>{
@@ -1632,9 +1703,10 @@ export class SequencerPublisher {
1632
1703
  },
1633
1704
  lastValidL2Slot: checkpoint.header.slotNumber,
1634
1705
  gasConfig: {
1635
- ...opts,
1636
- gasLimit
1706
+ txTimeoutAt: opts.txTimeoutAt,
1707
+ gasLimit: undefined
1637
1708
  },
1709
+ blobEvaluationGas,
1638
1710
  blobConfig: {
1639
1711
  blobs: encodedData.blobs.map((b)=>b.data),
1640
1712
  kzg
@@ -1644,7 +1716,11 @@ export class SequencerPublisher {
1644
1716
  return false;
1645
1717
  }
1646
1718
  const { receipt, stats, errorMsg } = result;
1647
- const success = receipt && receipt.status === 'success' && tryExtractEvent(receipt.logs, this.rollupContract.address, RollupAbi, 'CheckpointProposed');
1719
+ const success = extractEventSuccess(receipt, {
1720
+ address: this.rollupContract.address,
1721
+ abi: RollupAbi,
1722
+ eventName: 'CheckpointProposed'
1723
+ });
1648
1724
  if (success) {
1649
1725
  const endBlock = receipt.blockNumber;
1650
1726
  const inclusionBlocks = Number(endBlock - startBlock);
@@ -1681,4 +1757,8 @@ export class SequencerPublisher {
1681
1757
  }
1682
1758
  });
1683
1759
  }
1760
+ /** Returns the timestamp of the next L1 slot boundary after now. */ getNextL1SlotTimestamp() {
1761
+ const l1Constants = this.epochCache.getL1Constants();
1762
+ return getNextL1SlotTimestamp(this.dateProvider.nowInSeconds(), l1Constants);
1763
+ }
1684
1764
  }