@aztec/ethereum 0.0.1-commit.e558bd1c → 0.0.1-commit.e57c76e

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 (159) hide show
  1. package/dest/client.d.ts +25 -3
  2. package/dest/client.d.ts.map +1 -1
  3. package/dest/client.js +60 -8
  4. package/dest/config.d.ts +8 -6
  5. package/dest/config.d.ts.map +1 -1
  6. package/dest/config.js +15 -11
  7. package/dest/contracts/chain_state_override.d.ts +78 -0
  8. package/dest/contracts/chain_state_override.d.ts.map +1 -0
  9. package/dest/contracts/chain_state_override.js +137 -0
  10. package/dest/contracts/fee_asset_price_oracle.d.ts +105 -0
  11. package/dest/contracts/fee_asset_price_oracle.d.ts.map +1 -0
  12. package/dest/contracts/fee_asset_price_oracle.js +656 -0
  13. package/dest/contracts/governance.d.ts +108 -33
  14. package/dest/contracts/governance.d.ts.map +1 -1
  15. package/dest/contracts/governance.js +196 -15
  16. package/dest/contracts/governance_proposer.d.ts +33 -1
  17. package/dest/contracts/governance_proposer.d.ts.map +1 -1
  18. package/dest/contracts/governance_proposer.js +53 -2
  19. package/dest/contracts/inbox.d.ts +3 -3
  20. package/dest/contracts/inbox.d.ts.map +1 -1
  21. package/dest/contracts/inbox.js +12 -7
  22. package/dest/contracts/index.d.ts +4 -3
  23. package/dest/contracts/index.d.ts.map +1 -1
  24. package/dest/contracts/index.js +3 -2
  25. package/dest/contracts/multicall.d.ts +127 -12
  26. package/dest/contracts/multicall.d.ts.map +1 -1
  27. package/dest/contracts/multicall.js +201 -94
  28. package/dest/contracts/outbox.d.ts +27 -4
  29. package/dest/contracts/outbox.d.ts.map +1 -1
  30. package/dest/contracts/outbox.js +34 -7
  31. package/dest/contracts/registry.d.ts +3 -1
  32. package/dest/contracts/registry.d.ts.map +1 -1
  33. package/dest/contracts/registry.js +30 -1
  34. package/dest/contracts/rollup.d.ts +5259 -29
  35. package/dest/contracts/rollup.d.ts.map +1 -1
  36. package/dest/contracts/rollup.js +388 -71
  37. package/dest/contracts/{tally_slashing_proposer.d.ts → slashing_proposer.d.ts} +3 -4
  38. package/dest/contracts/slashing_proposer.d.ts.map +1 -0
  39. package/dest/contracts/{tally_slashing_proposer.js → slashing_proposer.js} +13 -15
  40. package/dest/deploy_aztec_l1_contracts.d.ts +4 -8
  41. package/dest/deploy_aztec_l1_contracts.d.ts.map +1 -1
  42. package/dest/deploy_aztec_l1_contracts.js +35 -23
  43. package/dest/deploy_l1_contract.js +3 -3
  44. package/dest/generated/l1-contracts-defaults.d.ts +2 -2
  45. package/dest/generated/l1-contracts-defaults.js +2 -2
  46. package/dest/l1_artifacts.d.ts +14259 -15724
  47. package/dest/l1_artifacts.d.ts.map +1 -1
  48. package/dest/l1_artifacts.js +9 -24
  49. package/dest/l1_contract_addresses.d.ts +61 -65
  50. package/dest/l1_contract_addresses.d.ts.map +1 -1
  51. package/dest/l1_contract_addresses.js +101 -82
  52. package/dest/l1_reader.d.ts +5 -5
  53. package/dest/l1_reader.d.ts.map +1 -1
  54. package/dest/l1_reader.js +9 -7
  55. package/dest/l1_tx_utils/config.d.ts +7 -1
  56. package/dest/l1_tx_utils/config.d.ts.map +1 -1
  57. package/dest/l1_tx_utils/config.js +14 -1
  58. package/dest/l1_tx_utils/factory.d.ts +18 -10
  59. package/dest/l1_tx_utils/factory.d.ts.map +1 -1
  60. package/dest/l1_tx_utils/factory.js +17 -7
  61. package/dest/l1_tx_utils/fee-strategies/p75_competitive.js +1 -1
  62. package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.js +1 -1
  63. package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts +15 -15
  64. package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts.map +1 -1
  65. package/dest/l1_tx_utils/forwarder_l1_tx_utils.js +9 -15
  66. package/dest/l1_tx_utils/index-blobs.d.ts +3 -3
  67. package/dest/l1_tx_utils/index-blobs.d.ts.map +1 -1
  68. package/dest/l1_tx_utils/index-blobs.js +2 -2
  69. package/dest/l1_tx_utils/index.d.ts +2 -1
  70. package/dest/l1_tx_utils/index.d.ts.map +1 -1
  71. package/dest/l1_tx_utils/index.js +1 -0
  72. package/dest/l1_tx_utils/l1_tx_utils.d.ts +26 -7
  73. package/dest/l1_tx_utils/l1_tx_utils.d.ts.map +1 -1
  74. package/dest/l1_tx_utils/l1_tx_utils.js +95 -60
  75. package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts +1 -1
  76. package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts.map +1 -1
  77. package/dest/l1_tx_utils/readonly_l1_tx_utils.js +10 -5
  78. package/dest/l1_tx_utils/tx_delayer.d.ts +58 -0
  79. package/dest/l1_tx_utils/tx_delayer.d.ts.map +1 -0
  80. package/dest/{test → l1_tx_utils}/tx_delayer.js +67 -37
  81. package/dest/publisher_manager.d.ts +21 -7
  82. package/dest/publisher_manager.d.ts.map +1 -1
  83. package/dest/publisher_manager.js +81 -7
  84. package/dest/queries.d.ts +13 -2
  85. package/dest/queries.d.ts.map +1 -1
  86. package/dest/queries.js +62 -3
  87. package/dest/test/chain_monitor.d.ts +23 -3
  88. package/dest/test/chain_monitor.d.ts.map +1 -1
  89. package/dest/test/chain_monitor.js +38 -2
  90. package/dest/test/eth_cheat_codes.d.ts +12 -4
  91. package/dest/test/eth_cheat_codes.d.ts.map +1 -1
  92. package/dest/test/eth_cheat_codes.js +17 -4
  93. package/dest/test/index.d.ts +1 -3
  94. package/dest/test/index.d.ts.map +1 -1
  95. package/dest/test/index.js +0 -2
  96. package/dest/test/rollup_cheat_codes.d.ts +31 -3
  97. package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
  98. package/dest/test/rollup_cheat_codes.js +59 -7
  99. package/dest/test/start_anvil.d.ts +23 -3
  100. package/dest/test/start_anvil.d.ts.map +1 -1
  101. package/dest/test/start_anvil.js +143 -29
  102. package/dest/test/upgrade_utils.js +2 -2
  103. package/dest/utils.d.ts +9 -2
  104. package/dest/utils.d.ts.map +1 -1
  105. package/dest/utils.js +48 -16
  106. package/package.json +6 -8
  107. package/src/client.ts +66 -2
  108. package/src/config.ts +24 -15
  109. package/src/contracts/chain_state_override.ts +200 -0
  110. package/src/contracts/fee_asset_price_oracle.ts +285 -0
  111. package/src/contracts/governance.ts +269 -12
  112. package/src/contracts/governance_proposer.ts +54 -1
  113. package/src/contracts/inbox.ts +13 -5
  114. package/src/contracts/index.ts +3 -2
  115. package/src/contracts/multicall.ts +243 -105
  116. package/src/contracts/outbox.ts +42 -8
  117. package/src/contracts/registry.ts +31 -1
  118. package/src/contracts/rollup.ts +439 -73
  119. package/src/contracts/{tally_slashing_proposer.ts → slashing_proposer.ts} +14 -16
  120. package/src/deploy_aztec_l1_contracts.ts +57 -34
  121. package/src/deploy_l1_contract.ts +3 -3
  122. package/src/generated/l1-contracts-defaults.ts +2 -2
  123. package/src/l1_artifacts.ts +12 -35
  124. package/src/l1_contract_addresses.ts +120 -94
  125. package/src/l1_reader.ts +17 -10
  126. package/src/l1_tx_utils/config.ts +20 -0
  127. package/src/l1_tx_utils/factory.ts +31 -31
  128. package/src/l1_tx_utils/fee-strategies/p75_competitive.ts +1 -1
  129. package/src/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.ts +1 -1
  130. package/src/l1_tx_utils/forwarder_l1_tx_utils.ts +43 -54
  131. package/src/l1_tx_utils/index-blobs.ts +2 -2
  132. package/src/l1_tx_utils/index.ts +1 -0
  133. package/src/l1_tx_utils/l1_tx_utils.ts +93 -42
  134. package/src/l1_tx_utils/readonly_l1_tx_utils.ts +10 -5
  135. package/src/{test → l1_tx_utils}/tx_delayer.ts +93 -56
  136. package/src/publisher_manager.ts +105 -10
  137. package/src/queries.ts +70 -4
  138. package/src/test/chain_monitor.ts +65 -3
  139. package/src/test/eth_cheat_codes.ts +16 -4
  140. package/src/test/index.ts +0 -2
  141. package/src/test/rollup_cheat_codes.ts +64 -6
  142. package/src/test/start_anvil.ts +177 -29
  143. package/src/test/upgrade_utils.ts +2 -2
  144. package/src/utils.ts +45 -18
  145. package/dest/contracts/empire_slashing_proposer.d.ts +0 -67
  146. package/dest/contracts/empire_slashing_proposer.d.ts.map +0 -1
  147. package/dest/contracts/empire_slashing_proposer.js +0 -207
  148. package/dest/contracts/tally_slashing_proposer.d.ts.map +0 -1
  149. package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts +0 -26
  150. package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts.map +0 -1
  151. package/dest/l1_tx_utils/l1_tx_utils_with_blobs.js +0 -26
  152. package/dest/test/delayed_tx_utils.d.ts +0 -13
  153. package/dest/test/delayed_tx_utils.d.ts.map +0 -1
  154. package/dest/test/delayed_tx_utils.js +0 -28
  155. package/dest/test/tx_delayer.d.ts +0 -36
  156. package/dest/test/tx_delayer.d.ts.map +0 -1
  157. package/src/contracts/empire_slashing_proposer.ts +0 -259
  158. package/src/l1_tx_utils/l1_tx_utils_with_blobs.ts +0 -77
  159. package/src/test/delayed_tx_utils.ts +0 -52
@@ -376,25 +376,20 @@ import { Buffer32 } from '@aztec/foundation/buffer';
376
376
  import { Fr } from '@aztec/foundation/curves/bn254';
377
377
  import { memoize } from '@aztec/foundation/decorators';
378
378
  import { EthAddress } from '@aztec/foundation/eth-address';
379
+ import { createLogger } from '@aztec/foundation/log';
379
380
  import { makeBackoff, retry } from '@aztec/foundation/retry';
381
+ import { getErrorCause } from '@aztec/foundation/types';
380
382
  import { EscapeHatchAbi } from '@aztec/l1-artifacts/EscapeHatchAbi';
381
383
  import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
382
384
  import { RollupStorage } from '@aztec/l1-artifacts/RollupStorage';
383
385
  import chunk from 'lodash.chunk';
384
- import { encodeFunctionData, getContract, hexToBigInt, keccak256 } from 'viem';
386
+ import { ContractFunctionRevertedError, RpcRequestError, decodeErrorResult, encodeAbiParameters, encodeFunctionData, getContract, hexToBigInt, keccak256 } from 'viem';
385
387
  import { getPublicClient } from '../client.js';
386
388
  import { formatViemError } from '../utils.js';
387
- import { EmpireSlashingProposerContract } from './empire_slashing_proposer.js';
388
389
  import { GSEContract } from './gse.js';
389
390
  import { SlasherContract } from './slasher_contract.js';
390
- import { TallySlashingProposerContract } from './tally_slashing_proposer.js';
391
+ import { SlashingProposerContract } from './slashing_proposer.js';
391
392
  import { checkBlockTag } from './utils.js';
392
- export var SlashingProposerType = /*#__PURE__*/ function(SlashingProposerType) {
393
- SlashingProposerType[SlashingProposerType["None"] = 0] = "None";
394
- SlashingProposerType[SlashingProposerType["Tally"] = 1] = "Tally";
395
- SlashingProposerType[SlashingProposerType["Empire"] = 2] = "Empire";
396
- return SlashingProposerType;
397
- }({});
398
393
  /**
399
394
  * Status of a validator/attester in the staking system.
400
395
  * Matches the Status enum in StakingLib.sol
@@ -405,6 +400,37 @@ export var SlashingProposerType = /*#__PURE__*/ function(SlashingProposerType) {
405
400
  AttesterStatus[AttesterStatus["EXITING"] = 3] = "EXITING";
406
401
  return AttesterStatus;
407
402
  }({});
403
+ /** Field offsets within the CompressedTempCheckpointLog struct in Solidity storage. */ export var TempCheckpointLogField = /*#__PURE__*/ function(TempCheckpointLogField) {
404
+ TempCheckpointLogField[TempCheckpointLogField["HeaderHash"] = 0] = "HeaderHash";
405
+ TempCheckpointLogField[TempCheckpointLogField["BlobCommitmentsHash"] = 1] = "BlobCommitmentsHash";
406
+ TempCheckpointLogField[TempCheckpointLogField["OutHash"] = 2] = "OutHash";
407
+ TempCheckpointLogField[TempCheckpointLogField["AttestationsHash"] = 3] = "AttestationsHash";
408
+ TempCheckpointLogField[TempCheckpointLogField["PayloadDigest"] = 4] = "PayloadDigest";
409
+ TempCheckpointLogField[TempCheckpointLogField["SlotNumber"] = 5] = "SlotNumber";
410
+ TempCheckpointLogField[TempCheckpointLogField["FeeHeader"] = 6] = "FeeHeader";
411
+ return TempCheckpointLogField;
412
+ }({});
413
+ const INSUFFICIENT_VALIDATOR_SET_SIZE_ERROR = 'ValidatorSelection__InsufficientValidatorSetSize';
414
+ function isValidatorSelectionError(err, errorName) {
415
+ return getErrorCause(err, ContractFunctionRevertedError)?.data?.errorName === errorName || decodeRpcRequestErrorName(err) === errorName;
416
+ }
417
+ function decodeRpcRequestErrorName(err) {
418
+ const data = getErrorCause(err, RpcRequestError)?.data;
419
+ if (!isHexString(data)) {
420
+ return undefined;
421
+ }
422
+ try {
423
+ return decodeErrorResult({
424
+ abi: RollupAbi,
425
+ data
426
+ }).errorName;
427
+ } catch {
428
+ return undefined;
429
+ }
430
+ }
431
+ function isHexString(value) {
432
+ return typeof value === 'string' && value.startsWith('0x');
433
+ }
408
434
  export class RollupContract {
409
435
  client;
410
436
  static{
@@ -499,6 +525,16 @@ export class RollupContract {
499
525
  2,
500
526
  "getGenesisArchiveTreeRoot"
501
527
  ],
528
+ [
529
+ memoize,
530
+ 2,
531
+ "getVkTreeRoot"
532
+ ],
533
+ [
534
+ memoize,
535
+ 2,
536
+ "getProtocolContractsHash"
537
+ ],
502
538
  [
503
539
  memoize,
504
540
  2,
@@ -507,6 +543,7 @@ export class RollupContract {
507
543
  ], []));
508
544
  }
509
545
  rollup;
546
+ logger;
510
547
  static cachedStfStorageSlot;
511
548
  cachedEscapeHatch;
512
549
  static get checkBlobStorageSlot() {
@@ -525,12 +562,12 @@ export class RollupContract {
525
562
  }
526
563
  static getFromConfig(config) {
527
564
  const client = getPublicClient(config);
528
- const address = config.l1Contracts.rollupAddress.toString();
565
+ const address = config.rollupAddress.toString();
529
566
  return new RollupContract(client, address);
530
567
  }
531
568
  constructor(client, address){
532
569
  this.client = client;
533
- _initProto(this);
570
+ this.logger = (_initProto(this), createLogger('ethereum:rollup'));
534
571
  if (address instanceof EthAddress) {
535
572
  address = address.toString();
536
573
  }
@@ -555,34 +592,10 @@ export class RollupContract {
555
592
  return undefined;
556
593
  }
557
594
  const proposerAddress = await slasher.getProposer();
558
- const proposerAbi = [
559
- {
560
- type: 'function',
561
- name: 'SLASHING_PROPOSER_TYPE',
562
- inputs: [],
563
- outputs: [
564
- {
565
- name: '',
566
- type: 'uint8',
567
- internalType: 'enum SlasherFlavor'
568
- }
569
- ],
570
- stateMutability: 'view'
571
- }
572
- ];
573
- const proposer = getContract({
574
- address: proposerAddress.toString(),
575
- abi: proposerAbi,
576
- client: this.client
577
- });
578
- const proposerType = await proposer.read.SLASHING_PROPOSER_TYPE();
579
- if (proposerType === 1..valueOf()) {
580
- return new TallySlashingProposerContract(this.client, proposerAddress);
581
- } else if (proposerType === 2..valueOf()) {
582
- return new EmpireSlashingProposerContract(this.client, proposerAddress);
583
- } else {
584
- throw new Error(`Unknown slashing proposer type: ${proposerType}`);
595
+ if (proposerAddress.isZero()) {
596
+ return undefined;
585
597
  }
598
+ return new SlashingProposerContract(this.client, proposerAddress);
586
599
  }
587
600
  getL1StartBlock() {
588
601
  return this.rollup.read.L1_BLOCK_AT_GENESIS();
@@ -640,24 +653,44 @@ export class RollupContract {
640
653
  0n
641
654
  ]));
642
655
  }
656
+ async getVkTreeRoot() {
657
+ const slot = BigInt(RollupContract.stfStorageSlot) + 3n;
658
+ const value = await this.client.getStorageAt({
659
+ address: this.address,
660
+ slot: `0x${slot.toString(16)}`
661
+ });
662
+ return Fr.fromString(value ?? '0x0');
663
+ }
664
+ async getProtocolContractsHash() {
665
+ const slot = BigInt(RollupContract.stfStorageSlot) + 4n;
666
+ const value = await this.client.getStorageAt({
667
+ address: this.address,
668
+ slot: `0x${slot.toString(16)}`
669
+ });
670
+ return Fr.fromString(value ?? '0x0');
671
+ }
643
672
  /**
644
673
  * Returns rollup constants used for epoch queries.
645
674
  * Return type is `L1RollupConstants` which is defined in stdlib,
646
675
  * so we cant reference it until we move this contract to that package.
647
676
  */ async getRollupConstants() {
648
- const [l1StartBlock, l1GenesisTime, slotDuration, epochDuration, proofSubmissionEpochs] = await Promise.all([
677
+ const [l1StartBlock, l1GenesisTime, slotDuration, epochDuration, proofSubmissionEpochs, targetCommitteeSize, rollupManaLimit] = await Promise.all([
649
678
  this.getL1StartBlock(),
650
679
  this.getL1GenesisTime(),
651
680
  this.getSlotDuration(),
652
681
  this.getEpochDuration(),
653
- this.getProofSubmissionEpochs()
682
+ this.getProofSubmissionEpochs(),
683
+ this.getTargetCommitteeSize(),
684
+ this.getManaLimit()
654
685
  ]);
655
686
  return {
656
687
  l1StartBlock,
657
688
  l1GenesisTime,
658
689
  slotDuration,
659
690
  epochDuration: Number(epochDuration),
660
- proofSubmissionEpochs: Number(proofSubmissionEpochs)
691
+ proofSubmissionEpochs: Number(proofSubmissionEpochs),
692
+ targetCommitteeSize,
693
+ rollupManaLimit: Number(rollupManaLimit)
661
694
  };
662
695
  }
663
696
  async getSlasherAddress() {
@@ -703,7 +736,11 @@ export class RollupContract {
703
736
  BigInt(epoch)
704
737
  ]);
705
738
  return isOpen;
706
- } catch {
739
+ } catch (err) {
740
+ this.logger.warn('isEscapeHatchOpen failed (treating as closed); RPC or contract error may cause liveness risk', {
741
+ epoch: Number(epoch),
742
+ error: err
743
+ });
707
744
  return false;
708
745
  }
709
746
  }
@@ -732,24 +769,40 @@ export class RollupContract {
732
769
  getCheckpointReward() {
733
770
  return this.rollup.read.getCheckpointReward();
734
771
  }
735
- async getCheckpointNumber() {
736
- return CheckpointNumber.fromBigInt(await this.rollup.read.getPendingCheckpointNumber());
772
+ async getCheckpointNumber(options) {
773
+ await checkBlockTag(options?.blockNumber, this.client);
774
+ return CheckpointNumber.fromBigInt(await this.rollup.read.getPendingCheckpointNumber(options));
737
775
  }
738
- async getProvenCheckpointNumber() {
739
- return CheckpointNumber.fromBigInt(await this.rollup.read.getProvenCheckpointNumber());
776
+ async getProvenCheckpointNumber(options) {
777
+ await checkBlockTag(options?.blockNumber, this.client);
778
+ return CheckpointNumber.fromBigInt(await this.rollup.read.getProvenCheckpointNumber(options));
740
779
  }
741
- async getSlotNumber() {
742
- return SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot());
780
+ async getSlotNumber(options) {
781
+ await checkBlockTag(options?.blockNumber, this.client);
782
+ return SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot(options));
743
783
  }
744
- async getL1FeesAt(timestamp) {
784
+ async getL1FeesAt(timestamp, options) {
785
+ await checkBlockTag(options?.blockNumber, this.client);
745
786
  const result = await this.rollup.read.getL1FeesAt([
746
787
  timestamp
747
- ]);
788
+ ], options);
748
789
  return {
749
790
  baseFee: result.baseFee,
750
791
  blobFee: result.blobFee
751
792
  };
752
793
  }
794
+ async getFeeHeader(checkpointNumber) {
795
+ const result = await this.rollup.read.getFeeHeader([
796
+ checkpointNumber
797
+ ]);
798
+ return {
799
+ excessMana: result.excessMana,
800
+ manaUsed: result.manaUsed,
801
+ ethPerFeeAsset: result.ethPerFeeAsset,
802
+ congestionCost: result.congestionCost,
803
+ proverCost: result.proverCost
804
+ };
805
+ }
753
806
  getEthPerFeeAsset() {
754
807
  return this.rollup.read.getEthPerFeeAsset();
755
808
  }
@@ -762,7 +815,7 @@ export class RollupContract {
762
815
  timestamp
763
816
  ]
764
817
  }).catch((e)=>{
765
- if (e instanceof Error && e.message.includes('ValidatorSelection__InsufficientValidatorSetSize')) {
818
+ if (isValidatorSelectionError(e, INSUFFICIENT_VALIDATOR_SET_SIZE_ERROR)) {
766
819
  return {
767
820
  result: undefined
768
821
  };
@@ -789,7 +842,7 @@ export class RollupContract {
789
842
  functionName: 'getCurrentEpochCommittee',
790
843
  args: []
791
844
  }).catch((e)=>{
792
- if (e instanceof Error && e.message.includes('ValidatorSelection__InsufficientValidatorSetSize')) {
845
+ if (isValidatorSelectionError(e, INSUFFICIENT_VALIDATOR_SET_SIZE_ERROR)) {
793
846
  return {
794
847
  result: undefined
795
848
  };
@@ -818,10 +871,11 @@ export class RollupContract {
818
871
  });
819
872
  return EthAddress.fromString(result);
820
873
  }
821
- async getCheckpoint(checkpointNumber) {
874
+ async getCheckpoint(checkpointNumber, options) {
875
+ await checkBlockTag(options?.blockNumber, this.client);
822
876
  const result = await this.rollup.read.getCheckpoint([
823
877
  BigInt(checkpointNumber)
824
- ]);
878
+ ], options);
825
879
  return {
826
880
  archive: Fr.fromString(result.archive),
827
881
  headerHash: Buffer32.fromString(result.headerHash),
@@ -851,6 +905,28 @@ export class RollupContract {
851
905
  0.5
852
906
  ]));
853
907
  }
908
+ /**
909
+ * Returns the effective pending checkpoint, accounting for potential prunes.
910
+ * When a prune can happen, the L1 contract uses the proven checkpoint instead of the pending one.
911
+ * This mirrors the behavior of getEffectivePendingCheckpointNumber in STFLib.sol.
912
+ * @param atTimestamp - The timestamp to evaluate pruneability at. Defaults to the current L1 block timestamp.
913
+ * @param options - Optional L1 block number to pin the queries to.
914
+ */ getEffectivePendingCheckpoint(atTimestamp, options) {
915
+ return retry(async ()=>{
916
+ const timestamp = atTimestamp ?? (await this.client.getBlock()).timestamp;
917
+ const canPrune = await this.canPruneAtTime(timestamp, options);
918
+ if (canPrune) {
919
+ const provenCheckpointNumber = await this.getProvenCheckpointNumber(options);
920
+ return await this.getCheckpoint(provenCheckpointNumber, options);
921
+ }
922
+ const pendingCheckpointNumber = await this.getCheckpointNumber(options);
923
+ return await this.getCheckpoint(pendingCheckpointNumber, options);
924
+ }, 'getting effective pending checkpoint', makeBackoff([
925
+ 0.5,
926
+ 0.5,
927
+ 0.5
928
+ ]));
929
+ }
854
930
  async getTips() {
855
931
  const { pending, proven } = await this.rollup.read.getTips();
856
932
  return {
@@ -935,9 +1011,8 @@ export class RollupContract {
935
1011
  * @return [slot, checkpointNumber, timeOfNextL1Slot] - If you can propose, the L2 slot number, checkpoint number and
936
1012
  * timestamp of the next L1 block
937
1013
  * @throws otherwise
938
- */ async canProposeAtNextEthBlock(archive, account, slotDuration, opts = {}) {
939
- const latestBlock = await this.client.getBlock();
940
- const timeOfNextL1Slot = latestBlock.timestamp + BigInt(slotDuration);
1014
+ */ async canProposeAt(archive, account, timestamp, stateOverride = []) {
1015
+ const timeOfNextL1Slot = timestamp;
941
1016
  const who = typeof account === 'string' ? account : account.address;
942
1017
  try {
943
1018
  const { result: [slot, checkpointNumber] } = await this.client.simulateContract({
@@ -950,7 +1025,7 @@ export class RollupContract {
950
1025
  who
951
1026
  ],
952
1027
  account,
953
- stateOverride: await this.makePendingCheckpointNumberOverride(opts.forcePendingCheckpointNumber)
1028
+ stateOverride
954
1029
  });
955
1030
  return {
956
1031
  slot: SlotNumber.fromBigInt(slot),
@@ -962,11 +1037,15 @@ export class RollupContract {
962
1037
  }
963
1038
  }
964
1039
  /**
965
- * Returns a state override that sets the pending checkpoint number to the specified value. Useful for simulations.
966
- * Requires querying the current state of the contract to get the current proven checkpoint number, as they are both
967
- * stored in the same slot. If the argument is undefined, it returns an empty override.
968
- */ async makePendingCheckpointNumberOverride(forcePendingCheckpointNumber) {
969
- if (forcePendingCheckpointNumber === undefined) {
1040
+ * Returns a state override that sets the pending and/or proven checkpoint numbers. Useful for simulations.
1041
+ * Both values share a single storage slot (pending in the upper 128 bits, proven in the lower 128 bits), so
1042
+ * a single combined override is emitted to avoid the second state-diff clobbering the first. The current live
1043
+ * value is read once to preserve any half not being overridden. Returns an empty override if neither is set.
1044
+ *
1045
+ * Throws if the resulting `proven > pending`, which would crash the simulation: `STFLib.canPruneAtTime` calls
1046
+ * `getEpochForCheckpoint(proven + 1)` whenever `pending != proven`, and that asserts `_n <= tips.pending`.
1047
+ */ async makeChainTipsOverride(override) {
1048
+ if (override.pending === undefined && override.proven === undefined) {
970
1049
  return [];
971
1050
  }
972
1051
  const slot = RollupContract.stfStorageSlot;
@@ -974,8 +1053,15 @@ export class RollupContract {
974
1053
  address: this.address,
975
1054
  slot
976
1055
  });
977
- const currentProvenCheckpointNumber = currentValue ? hexToBigInt(currentValue) & (1n << 128n) - 1n : 0n;
978
- const newValue = BigInt(forcePendingCheckpointNumber) << 128n | currentProvenCheckpointNumber;
1056
+ const currentRaw = currentValue ? hexToBigInt(currentValue) : 0n;
1057
+ const currentPending = currentRaw >> 128n;
1058
+ const currentProven = currentRaw & (1n << 128n) - 1n;
1059
+ const newPending = override.pending !== undefined ? BigInt(override.pending) : currentPending;
1060
+ const newProven = override.proven !== undefined ? BigInt(override.proven) : currentProven;
1061
+ if (newProven > newPending) {
1062
+ throw new Error(`Invalid chain tips override: proven (${newProven}) > pending (${newPending})`);
1063
+ }
1064
+ const newValue = newPending << 128n | newProven;
979
1065
  return [
980
1066
  {
981
1067
  address: this.address,
@@ -988,6 +1074,161 @@ export class RollupContract {
988
1074
  }
989
1075
  ];
990
1076
  }
1077
+ /**
1078
+ * Returns a state override that patches `tempCheckpointLogs[checkpointNumber]` with every field that
1079
+ * the L1 contract reads during `propose()` for the checkpoint that builds on top of it (proposer
1080
+ * pipelining simulation). Mirrors the writes done by `ProposeLib.addTempCheckpointLog`.
1081
+ *
1082
+ * `blobCommitmentsHash` and `attestationsHash` are intentionally not exposed here — the propose path
1083
+ * never asserts against them, so leaving them at storage zero is harmless.
1084
+ */ async makeTempCheckpointLogOverride(checkpointNumber, fields) {
1085
+ const constants = await this.getRollupConstants();
1086
+ const slotAt = (field)=>`0x${this.computeTempCheckpointLogStorageSlot(checkpointNumber, field, constants).toString(16).padStart(64, '0')}`;
1087
+ const word = (v)=>`0x${v.toString(16).padStart(64, '0')}`;
1088
+ const stateDiff = [];
1089
+ if (fields.headerHash) {
1090
+ stateDiff.push({
1091
+ slot: slotAt(0),
1092
+ value: fields.headerHash.toString()
1093
+ });
1094
+ }
1095
+ if (fields.outHash) {
1096
+ stateDiff.push({
1097
+ slot: slotAt(2),
1098
+ value: fields.outHash.toString()
1099
+ });
1100
+ }
1101
+ if (fields.payloadDigest) {
1102
+ stateDiff.push({
1103
+ slot: slotAt(4),
1104
+ value: fields.payloadDigest.toString()
1105
+ });
1106
+ }
1107
+ if (fields.slotNumber !== undefined) {
1108
+ // CompressedSlot is uint32 on L1 (SafeCast.toUint32 reverts on overflow). Match that behavior here
1109
+ // so a malformed override surfaces immediately rather than silently truncating into a wrong slot.
1110
+ const slotNumber = BigInt(fields.slotNumber);
1111
+ if (slotNumber < 0n || slotNumber > 0xffffffffn) {
1112
+ throw new Error(`slotNumber ${slotNumber} does not fit in uint32`);
1113
+ }
1114
+ stateDiff.push({
1115
+ slot: slotAt(5),
1116
+ value: word(slotNumber)
1117
+ });
1118
+ }
1119
+ if (fields.feeHeader) {
1120
+ stateDiff.push({
1121
+ slot: slotAt(6),
1122
+ value: word(RollupContract.compressFeeHeader(fields.feeHeader))
1123
+ });
1124
+ }
1125
+ if (stateDiff.length === 0) {
1126
+ return [];
1127
+ }
1128
+ return [
1129
+ {
1130
+ address: this.address,
1131
+ stateDiff
1132
+ }
1133
+ ];
1134
+ }
1135
+ /**
1136
+ * Returns a state override that sets archives[checkpointNumber] to the given archive value.
1137
+ * Used when simulating a canProposeAtTime call where the local archive differs from L1
1138
+ * (e.g. pipelining where the parent checkpoint hasn't landed on L1 yet).
1139
+ */ makeArchiveOverride(checkpointNumber, archive) {
1140
+ const archivesMappingBase = hexToBigInt(RollupContract.stfStorageSlot) + 1n;
1141
+ const archiveSlot = hexToBigInt(keccak256(encodeAbiParameters([
1142
+ {
1143
+ type: 'uint256'
1144
+ },
1145
+ {
1146
+ type: 'uint256'
1147
+ }
1148
+ ], [
1149
+ BigInt(checkpointNumber),
1150
+ archivesMappingBase
1151
+ ])));
1152
+ return [
1153
+ {
1154
+ address: this.address,
1155
+ stateDiff: [
1156
+ {
1157
+ slot: `0x${archiveSlot.toString(16).padStart(64, '0')}`,
1158
+ value: archive.toString()
1159
+ }
1160
+ ]
1161
+ }
1162
+ ];
1163
+ }
1164
+ /** Merges multiple StateOverride arrays, combining stateDiff entries for the same address. */ static mergeStateOverrides(...overrides) {
1165
+ const byAddress = new Map();
1166
+ for (const override of overrides){
1167
+ for (const entry of override){
1168
+ const key = entry.address.toLowerCase();
1169
+ const existing = byAddress.get(key);
1170
+ if (existing) {
1171
+ existing.stateDiff.push(...entry.stateDiff ?? []);
1172
+ if (entry.balance !== undefined) {
1173
+ existing.balance = entry.balance;
1174
+ }
1175
+ } else {
1176
+ byAddress.set(key, {
1177
+ address: entry.address,
1178
+ balance: entry.balance,
1179
+ stateDiff: [
1180
+ ...entry.stateDiff ?? []
1181
+ ]
1182
+ });
1183
+ }
1184
+ }
1185
+ }
1186
+ return [
1187
+ ...byAddress.values()
1188
+ ];
1189
+ }
1190
+ /** Compresses a FeeHeader into a uint256 matching FeeHeaderLib.compress() in FeeStructs.sol. */ static compressFeeHeader(feeHeader) {
1191
+ const MASK_48_BITS = (1n << 48n) - 1n;
1192
+ const MASK_64_BITS = (1n << 64n) - 1n;
1193
+ const MASK_63_BITS = (1n << 63n) - 1n;
1194
+ let value = BigInt(feeHeader.manaUsed) & (1n << 32n) - 1n; // bits [0:31]
1195
+ value |= (feeHeader.excessMana < MASK_48_BITS ? feeHeader.excessMana : MASK_48_BITS) << 32n; // bits [32:79]
1196
+ value |= (BigInt(feeHeader.ethPerFeeAsset) & MASK_48_BITS) << 80n; // bits [80:127]
1197
+ value |= (feeHeader.congestionCost < MASK_64_BITS ? feeHeader.congestionCost : MASK_64_BITS) << 128n; // bits [128:191]
1198
+ value |= (feeHeader.proverCost < MASK_63_BITS ? feeHeader.proverCost : MASK_63_BITS) << 192n; // bits [192:254]
1199
+ value |= 1n << 255n; // preheat flag
1200
+ return value;
1201
+ }
1202
+ /** Computes the fee header for a child checkpoint given parent fee header and child data.
1203
+ * Must stay in sync with Solidity FeeLib.sol (computeNewEthPerFeeAsset, clampedAdd). */ static computeChildFeeHeader(parentFeeHeader, childManaUsed, feeAssetPriceModifier, manaTarget) {
1204
+ const MIN_ETH_PER_FEE_ASSET = 100n;
1205
+ const MAX_ETH_PER_FEE_ASSET = 100_000_000_000_000n; // 1e14, matches FeeLib.sol
1206
+ // excessMana = clampedAdd(parent.excessMana + parent.manaUsed, -manaTarget)
1207
+ const sum = parentFeeHeader.excessMana + parentFeeHeader.manaUsed;
1208
+ const excessMana = sum > manaTarget ? sum - manaTarget : 0n;
1209
+ // ethPerFeeAsset = computeNewEthPerFeeAsset(max(parent.ethPerFeeAsset, MIN), modifier)
1210
+ const parentPrice = parentFeeHeader.ethPerFeeAsset > MIN_ETH_PER_FEE_ASSET ? parentFeeHeader.ethPerFeeAsset : MIN_ETH_PER_FEE_ASSET;
1211
+ let newPrice;
1212
+ if (feeAssetPriceModifier >= 0n) {
1213
+ newPrice = parentPrice * (10_000n + feeAssetPriceModifier) / 10_000n;
1214
+ } else {
1215
+ const absMod = -feeAssetPriceModifier;
1216
+ newPrice = parentPrice * (10_000n - absMod) / 10_000n;
1217
+ }
1218
+ if (newPrice < MIN_ETH_PER_FEE_ASSET) {
1219
+ newPrice = MIN_ETH_PER_FEE_ASSET;
1220
+ }
1221
+ if (newPrice > MAX_ETH_PER_FEE_ASSET) {
1222
+ newPrice = MAX_ETH_PER_FEE_ASSET;
1223
+ }
1224
+ return {
1225
+ excessMana,
1226
+ manaUsed: childManaUsed,
1227
+ ethPerFeeAsset: newPrice,
1228
+ congestionCost: 0n,
1229
+ proverCost: 0n
1230
+ };
1231
+ }
991
1232
  /** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */ buildInvalidateBadAttestationRequest(checkpointNumber, attestationsAndSigners, committee, invalidIndex) {
992
1233
  return {
993
1234
  to: this.address,
@@ -1029,11 +1270,25 @@ export class RollupContract {
1029
1270
  prover
1030
1271
  ]);
1031
1272
  }
1032
- getManaMinFeeAt(timestamp, inFeeAsset) {
1273
+ getManaMinFeeAt(timestamp, inFeeAsset, stateOverride) {
1033
1274
  return this.rollup.read.getManaMinFeeAt([
1034
1275
  timestamp,
1035
1276
  inFeeAsset
1277
+ ], {
1278
+ stateOverride
1279
+ });
1280
+ }
1281
+ async getManaMinFeeComponentsAt(timestamp, inFeeAsset) {
1282
+ const result = await this.rollup.read.getManaMinFeeComponentsAt([
1283
+ timestamp,
1284
+ inFeeAsset
1036
1285
  ]);
1286
+ return {
1287
+ sequencerCost: result.sequencerCost,
1288
+ proverCost: result.proverCost,
1289
+ congestionCost: result.congestionCost,
1290
+ congestionMultiplier: result.congestionMultiplier
1291
+ };
1037
1292
  }
1038
1293
  async getSlotAt(timestamp) {
1039
1294
  return SlotNumber.fromBigInt(await this.rollup.read.getSlotAt([
@@ -1084,10 +1339,10 @@ export class RollupContract {
1084
1339
  prover
1085
1340
  ]);
1086
1341
  }
1087
- async getAttesters() {
1342
+ async getAttesters(timestamp) {
1088
1343
  const attesterSize = await this.getActiveAttesterCount();
1089
1344
  const gse = new GSEContract(this.client, await this.getGSE());
1090
- const ts = (await this.client.getBlock()).timestamp;
1345
+ const ts = timestamp ?? (await this.client.getBlock()).timestamp;
1091
1346
  const indices = Array.from({
1092
1347
  length: attesterSize
1093
1348
  }, (_, i)=>BigInt(i));
@@ -1193,7 +1448,8 @@ export class RollupContract {
1193
1448
  const args = log.args;
1194
1449
  if (args.checkpointNumber !== undefined) {
1195
1450
  callback({
1196
- checkpointNumber: CheckpointNumber.fromBigInt(args.checkpointNumber)
1451
+ checkpointNumber: CheckpointNumber.fromBigInt(args.checkpointNumber),
1452
+ event: log
1197
1453
  });
1198
1454
  }
1199
1455
  }
@@ -1224,6 +1480,18 @@ export class RollupContract {
1224
1480
  }
1225
1481
  });
1226
1482
  }
1483
+ /**
1484
+ * Fetches OwnershipTransferred events emitted on the L1 block this rollup was deployed on.
1485
+ * The Rollup inherits from Ownable and emits this event in its constructor, so the event
1486
+ * is guaranteed to exist on `l1StartBlock` for any correctly deployed rollup. Used as a
1487
+ * probe to detect RPC nodes that prune historical logs.
1488
+ */ async getOwnershipTransferredEventsAtDeploy() {
1489
+ const l1StartBlock = await this.getL1StartBlock();
1490
+ return await this.rollup.getEvents.OwnershipTransferred({}, {
1491
+ fromBlock: l1StartBlock,
1492
+ toBlock: l1StartBlock
1493
+ });
1494
+ }
1227
1495
  /** Fetches CheckpointProposed events within the given block range. */ async getCheckpointProposedEvents(fromBlock, toBlock) {
1228
1496
  const logs = await this.rollup.getEvents.CheckpointProposed({}, {
1229
1497
  fromBlock,
@@ -1237,9 +1505,58 @@ export class RollupContract {
1237
1505
  checkpointNumber: CheckpointNumber.fromBigInt(log.args.checkpointNumber),
1238
1506
  archive: Fr.fromString(log.args.archive),
1239
1507
  versionedBlobHashes: log.args.versionedBlobHashes.map((h)=>Buffer.from(h.slice(2), 'hex')),
1240
- attestationsHash: log.args.attestationsHash ? Buffer32.fromString(log.args.attestationsHash) : undefined,
1241
- payloadDigest: log.args.payloadDigest ? Buffer32.fromString(log.args.payloadDigest) : undefined
1508
+ attestationsHash: (()=>{
1509
+ if (!log.args.attestationsHash) {
1510
+ throw new Error(`CheckpointProposed event missing attestationsHash for checkpoint ${log.args.checkpointNumber}`);
1511
+ }
1512
+ return Buffer32.fromString(log.args.attestationsHash);
1513
+ })(),
1514
+ payloadDigest: (()=>{
1515
+ if (!log.args.payloadDigest) {
1516
+ throw new Error(`CheckpointProposed event missing payloadDigest for checkpoint ${log.args.checkpointNumber}`);
1517
+ }
1518
+ return Buffer32.fromString(log.args.payloadDigest);
1519
+ })()
1242
1520
  }
1243
1521
  }));
1244
1522
  }
1523
+ /** Packs pending and proven checkpoint numbers into the chain tips storage format. */ static packChainTips(pendingCheckpointNumber, provenCheckpointNumber) {
1524
+ return pendingCheckpointNumber << 128n | provenCheckpointNumber & (1n << 128n) - 1n;
1525
+ }
1526
+ /** Storage slot for the chain tips (offset 0 within the STF storage struct). */ static get chainTipsStorageSlot() {
1527
+ return BigInt(RollupContract.stfStorageSlot);
1528
+ }
1529
+ /**
1530
+ * Computes the storage slot for a field within a tempCheckpointLog entry.
1531
+ * @param checkpointNumber - The checkpoint number
1532
+ * @param field - The field within the CompressedTempCheckpointLog struct
1533
+ */ async getTempCheckpointLogStorageSlot(checkpointNumber, field) {
1534
+ const [epochDuration, proofSubmissionEpochs] = await Promise.all([
1535
+ this.getEpochDuration(),
1536
+ this.getProofSubmissionEpochs()
1537
+ ]);
1538
+ return this.computeTempCheckpointLogStorageSlot(checkpointNumber, field, {
1539
+ epochDuration,
1540
+ proofSubmissionEpochs
1541
+ });
1542
+ }
1543
+ computeTempCheckpointLogStorageSlot(checkpointNumber, field, constants) {
1544
+ const fieldOffset = BigInt(field);
1545
+ const { epochDuration, proofSubmissionEpochs } = constants;
1546
+ const roundaboutSize = BigInt(epochDuration) * (BigInt(proofSubmissionEpochs) + 1n) + 1n;
1547
+ const tempCheckpointLogsBase = BigInt(RollupContract.stfStorageSlot) + 2n;
1548
+ const circularIndex = BigInt(checkpointNumber) % roundaboutSize;
1549
+ const entryBase = BigInt(keccak256(encodeAbiParameters([
1550
+ {
1551
+ type: 'uint256'
1552
+ },
1553
+ {
1554
+ type: 'uint256'
1555
+ }
1556
+ ], [
1557
+ circularIndex,
1558
+ tempCheckpointLogsBase
1559
+ ])));
1560
+ return entryBase + fieldOffset;
1561
+ }
1245
1562
  }