@aztec/ethereum 0.0.1-commit.db765a8 → 0.0.1-commit.ddcf04837

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 (91) hide show
  1. package/dest/client.d.ts +10 -2
  2. package/dest/client.d.ts.map +1 -1
  3. package/dest/client.js +13 -7
  4. package/dest/config.d.ts +6 -6
  5. package/dest/config.d.ts.map +1 -1
  6. package/dest/config.js +5 -9
  7. package/dest/contracts/chain_state_override.d.ts +38 -0
  8. package/dest/contracts/chain_state_override.d.ts.map +1 -0
  9. package/dest/contracts/chain_state_override.js +100 -0
  10. package/dest/contracts/inbox.d.ts +3 -3
  11. package/dest/contracts/inbox.d.ts.map +1 -1
  12. package/dest/contracts/inbox.js +5 -6
  13. package/dest/contracts/index.d.ts +3 -3
  14. package/dest/contracts/index.d.ts.map +1 -1
  15. package/dest/contracts/index.js +2 -2
  16. package/dest/contracts/multicall.d.ts +51 -2
  17. package/dest/contracts/multicall.d.ts.map +1 -1
  18. package/dest/contracts/multicall.js +85 -0
  19. package/dest/contracts/rollup.d.ts +83 -20
  20. package/dest/contracts/rollup.d.ts.map +1 -1
  21. package/dest/contracts/rollup.js +288 -58
  22. package/dest/contracts/{tally_slashing_proposer.d.ts → slashing_proposer.d.ts} +3 -4
  23. package/dest/contracts/slashing_proposer.d.ts.map +1 -0
  24. package/dest/contracts/{tally_slashing_proposer.js → slashing_proposer.js} +13 -15
  25. package/dest/deploy_aztec_l1_contracts.d.ts +3 -6
  26. package/dest/deploy_aztec_l1_contracts.d.ts.map +1 -1
  27. package/dest/deploy_aztec_l1_contracts.js +2 -4
  28. package/dest/generated/l1-contracts-defaults.d.ts +1 -1
  29. package/dest/generated/l1-contracts-defaults.js +1 -1
  30. package/dest/l1_artifacts.d.ts +8644 -15983
  31. package/dest/l1_artifacts.d.ts.map +1 -1
  32. package/dest/l1_artifacts.js +9 -24
  33. package/dest/l1_contract_addresses.d.ts +1 -5
  34. package/dest/l1_contract_addresses.d.ts.map +1 -1
  35. package/dest/l1_contract_addresses.js +0 -6
  36. package/dest/l1_reader.d.ts +3 -1
  37. package/dest/l1_reader.d.ts.map +1 -1
  38. package/dest/l1_reader.js +6 -1
  39. package/dest/l1_tx_utils/l1_tx_utils.d.ts +3 -1
  40. package/dest/l1_tx_utils/l1_tx_utils.d.ts.map +1 -1
  41. package/dest/l1_tx_utils/l1_tx_utils.js +34 -26
  42. package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts +1 -1
  43. package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts.map +1 -1
  44. package/dest/l1_tx_utils/readonly_l1_tx_utils.js +8 -4
  45. package/dest/publisher_manager.d.ts +21 -7
  46. package/dest/publisher_manager.d.ts.map +1 -1
  47. package/dest/publisher_manager.js +81 -7
  48. package/dest/queries.js +3 -3
  49. package/dest/test/chain_monitor.d.ts +22 -3
  50. package/dest/test/chain_monitor.d.ts.map +1 -1
  51. package/dest/test/chain_monitor.js +33 -2
  52. package/dest/test/eth_cheat_codes.d.ts +6 -4
  53. package/dest/test/eth_cheat_codes.d.ts.map +1 -1
  54. package/dest/test/eth_cheat_codes.js +6 -4
  55. package/dest/test/rollup_cheat_codes.d.ts +5 -1
  56. package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
  57. package/dest/test/rollup_cheat_codes.js +9 -1
  58. package/dest/test/start_anvil.d.ts +15 -1
  59. package/dest/test/start_anvil.d.ts.map +1 -1
  60. package/dest/test/start_anvil.js +17 -2
  61. package/dest/utils.d.ts +1 -1
  62. package/dest/utils.d.ts.map +1 -1
  63. package/dest/utils.js +16 -12
  64. package/package.json +5 -5
  65. package/src/client.ts +10 -2
  66. package/src/config.ts +9 -13
  67. package/src/contracts/chain_state_override.ts +147 -0
  68. package/src/contracts/inbox.ts +4 -4
  69. package/src/contracts/index.ts +2 -2
  70. package/src/contracts/multicall.ts +65 -1
  71. package/src/contracts/rollup.ts +315 -61
  72. package/src/contracts/{tally_slashing_proposer.ts → slashing_proposer.ts} +14 -16
  73. package/src/deploy_aztec_l1_contracts.ts +1 -5
  74. package/src/generated/l1-contracts-defaults.ts +1 -1
  75. package/src/l1_artifacts.ts +12 -35
  76. package/src/l1_contract_addresses.ts +0 -7
  77. package/src/l1_reader.ts +13 -1
  78. package/src/l1_tx_utils/l1_tx_utils.ts +24 -14
  79. package/src/l1_tx_utils/readonly_l1_tx_utils.ts +8 -4
  80. package/src/publisher_manager.ts +105 -10
  81. package/src/queries.ts +3 -3
  82. package/src/test/chain_monitor.ts +60 -3
  83. package/src/test/eth_cheat_codes.ts +6 -4
  84. package/src/test/rollup_cheat_codes.ts +11 -1
  85. package/src/test/start_anvil.ts +33 -2
  86. package/src/utils.ts +17 -14
  87. package/dest/contracts/empire_slashing_proposer.d.ts +0 -69
  88. package/dest/contracts/empire_slashing_proposer.d.ts.map +0 -1
  89. package/dest/contracts/empire_slashing_proposer.js +0 -216
  90. package/dest/contracts/tally_slashing_proposer.d.ts.map +0 -1
  91. package/src/contracts/empire_slashing_proposer.ts +0 -265
@@ -376,25 +376,19 @@ 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';
380
381
  import { EscapeHatchAbi } from '@aztec/l1-artifacts/EscapeHatchAbi';
381
382
  import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
382
383
  import { RollupStorage } from '@aztec/l1-artifacts/RollupStorage';
383
384
  import chunk from 'lodash.chunk';
384
- import { encodeFunctionData, getContract, hexToBigInt, keccak256 } from 'viem';
385
+ import { encodeAbiParameters, encodeFunctionData, getContract, hexToBigInt, keccak256 } from 'viem';
385
386
  import { getPublicClient } from '../client.js';
386
387
  import { formatViemError } from '../utils.js';
387
- import { EmpireSlashingProposerContract } from './empire_slashing_proposer.js';
388
388
  import { GSEContract } from './gse.js';
389
389
  import { SlasherContract } from './slasher_contract.js';
390
- import { TallySlashingProposerContract } from './tally_slashing_proposer.js';
390
+ import { SlashingProposerContract } from './slashing_proposer.js';
391
391
  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
392
  /**
399
393
  * Status of a validator/attester in the staking system.
400
394
  * Matches the Status enum in StakingLib.sol
@@ -405,6 +399,16 @@ export var SlashingProposerType = /*#__PURE__*/ function(SlashingProposerType) {
405
399
  AttesterStatus[AttesterStatus["EXITING"] = 3] = "EXITING";
406
400
  return AttesterStatus;
407
401
  }({});
402
+ /** Field offsets within the CompressedTempCheckpointLog struct in Solidity storage. */ export var TempCheckpointLogField = /*#__PURE__*/ function(TempCheckpointLogField) {
403
+ TempCheckpointLogField[TempCheckpointLogField["HeaderHash"] = 0] = "HeaderHash";
404
+ TempCheckpointLogField[TempCheckpointLogField["BlobCommitmentsHash"] = 1] = "BlobCommitmentsHash";
405
+ TempCheckpointLogField[TempCheckpointLogField["OutHash"] = 2] = "OutHash";
406
+ TempCheckpointLogField[TempCheckpointLogField["AttestationsHash"] = 3] = "AttestationsHash";
407
+ TempCheckpointLogField[TempCheckpointLogField["PayloadDigest"] = 4] = "PayloadDigest";
408
+ TempCheckpointLogField[TempCheckpointLogField["SlotNumber"] = 5] = "SlotNumber";
409
+ TempCheckpointLogField[TempCheckpointLogField["FeeHeader"] = 6] = "FeeHeader";
410
+ return TempCheckpointLogField;
411
+ }({});
408
412
  export class RollupContract {
409
413
  client;
410
414
  static{
@@ -499,6 +503,16 @@ export class RollupContract {
499
503
  2,
500
504
  "getGenesisArchiveTreeRoot"
501
505
  ],
506
+ [
507
+ memoize,
508
+ 2,
509
+ "getVkTreeRoot"
510
+ ],
511
+ [
512
+ memoize,
513
+ 2,
514
+ "getProtocolContractsHash"
515
+ ],
502
516
  [
503
517
  memoize,
504
518
  2,
@@ -507,6 +521,7 @@ export class RollupContract {
507
521
  ], []));
508
522
  }
509
523
  rollup;
524
+ logger;
510
525
  static cachedStfStorageSlot;
511
526
  cachedEscapeHatch;
512
527
  static get checkBlobStorageSlot() {
@@ -530,7 +545,7 @@ export class RollupContract {
530
545
  }
531
546
  constructor(client, address){
532
547
  this.client = client;
533
- _initProto(this);
548
+ this.logger = (_initProto(this), createLogger('ethereum:rollup'));
534
549
  if (address instanceof EthAddress) {
535
550
  address = address.toString();
536
551
  }
@@ -555,34 +570,10 @@ export class RollupContract {
555
570
  return undefined;
556
571
  }
557
572
  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}`);
573
+ if (proposerAddress.isZero()) {
574
+ return undefined;
585
575
  }
576
+ return new SlashingProposerContract(this.client, proposerAddress);
586
577
  }
587
578
  getL1StartBlock() {
588
579
  return this.rollup.read.L1_BLOCK_AT_GENESIS();
@@ -640,18 +631,35 @@ export class RollupContract {
640
631
  0n
641
632
  ]));
642
633
  }
634
+ async getVkTreeRoot() {
635
+ const slot = BigInt(RollupContract.stfStorageSlot) + 3n;
636
+ const value = await this.client.getStorageAt({
637
+ address: this.address,
638
+ slot: `0x${slot.toString(16)}`
639
+ });
640
+ return Fr.fromString(value ?? '0x0');
641
+ }
642
+ async getProtocolContractsHash() {
643
+ const slot = BigInt(RollupContract.stfStorageSlot) + 4n;
644
+ const value = await this.client.getStorageAt({
645
+ address: this.address,
646
+ slot: `0x${slot.toString(16)}`
647
+ });
648
+ return Fr.fromString(value ?? '0x0');
649
+ }
643
650
  /**
644
651
  * Returns rollup constants used for epoch queries.
645
652
  * Return type is `L1RollupConstants` which is defined in stdlib,
646
653
  * so we cant reference it until we move this contract to that package.
647
654
  */ async getRollupConstants() {
648
- const [l1StartBlock, l1GenesisTime, slotDuration, epochDuration, proofSubmissionEpochs, targetCommitteeSize] = await Promise.all([
655
+ const [l1StartBlock, l1GenesisTime, slotDuration, epochDuration, proofSubmissionEpochs, targetCommitteeSize, rollupManaLimit] = await Promise.all([
649
656
  this.getL1StartBlock(),
650
657
  this.getL1GenesisTime(),
651
658
  this.getSlotDuration(),
652
659
  this.getEpochDuration(),
653
660
  this.getProofSubmissionEpochs(),
654
- this.getTargetCommitteeSize()
661
+ this.getTargetCommitteeSize(),
662
+ this.getManaLimit()
655
663
  ]);
656
664
  return {
657
665
  l1StartBlock,
@@ -659,7 +667,8 @@ export class RollupContract {
659
667
  slotDuration,
660
668
  epochDuration: Number(epochDuration),
661
669
  proofSubmissionEpochs: Number(proofSubmissionEpochs),
662
- targetCommitteeSize
670
+ targetCommitteeSize,
671
+ rollupManaLimit: Number(rollupManaLimit)
663
672
  };
664
673
  }
665
674
  async getSlasherAddress() {
@@ -705,7 +714,11 @@ export class RollupContract {
705
714
  BigInt(epoch)
706
715
  ]);
707
716
  return isOpen;
708
- } catch {
717
+ } catch (err) {
718
+ this.logger.warn('isEscapeHatchOpen failed (treating as closed); RPC or contract error may cause liveness risk', {
719
+ epoch: Number(epoch),
720
+ error: err
721
+ });
709
722
  return false;
710
723
  }
711
724
  }
@@ -734,24 +747,40 @@ export class RollupContract {
734
747
  getCheckpointReward() {
735
748
  return this.rollup.read.getCheckpointReward();
736
749
  }
737
- async getCheckpointNumber() {
738
- return CheckpointNumber.fromBigInt(await this.rollup.read.getPendingCheckpointNumber());
750
+ async getCheckpointNumber(options) {
751
+ await checkBlockTag(options?.blockNumber, this.client);
752
+ return CheckpointNumber.fromBigInt(await this.rollup.read.getPendingCheckpointNumber(options));
739
753
  }
740
- async getProvenCheckpointNumber() {
741
- return CheckpointNumber.fromBigInt(await this.rollup.read.getProvenCheckpointNumber());
754
+ async getProvenCheckpointNumber(options) {
755
+ await checkBlockTag(options?.blockNumber, this.client);
756
+ return CheckpointNumber.fromBigInt(await this.rollup.read.getProvenCheckpointNumber(options));
742
757
  }
743
- async getSlotNumber() {
744
- return SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot());
758
+ async getSlotNumber(options) {
759
+ await checkBlockTag(options?.blockNumber, this.client);
760
+ return SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot(options));
745
761
  }
746
- async getL1FeesAt(timestamp) {
762
+ async getL1FeesAt(timestamp, options) {
763
+ await checkBlockTag(options?.blockNumber, this.client);
747
764
  const result = await this.rollup.read.getL1FeesAt([
748
765
  timestamp
749
- ]);
766
+ ], options);
750
767
  return {
751
768
  baseFee: result.baseFee,
752
769
  blobFee: result.blobFee
753
770
  };
754
771
  }
772
+ async getFeeHeader(checkpointNumber) {
773
+ const result = await this.rollup.read.getFeeHeader([
774
+ checkpointNumber
775
+ ]);
776
+ return {
777
+ excessMana: result.excessMana,
778
+ manaUsed: result.manaUsed,
779
+ ethPerFeeAsset: result.ethPerFeeAsset,
780
+ congestionCost: result.congestionCost,
781
+ proverCost: result.proverCost
782
+ };
783
+ }
755
784
  getEthPerFeeAsset() {
756
785
  return this.rollup.read.getEthPerFeeAsset();
757
786
  }
@@ -820,10 +849,11 @@ export class RollupContract {
820
849
  });
821
850
  return EthAddress.fromString(result);
822
851
  }
823
- async getCheckpoint(checkpointNumber) {
852
+ async getCheckpoint(checkpointNumber, options) {
853
+ await checkBlockTag(options?.blockNumber, this.client);
824
854
  const result = await this.rollup.read.getCheckpoint([
825
855
  BigInt(checkpointNumber)
826
- ]);
856
+ ], options);
827
857
  return {
828
858
  archive: Fr.fromString(result.archive),
829
859
  headerHash: Buffer32.fromString(result.headerHash),
@@ -853,6 +883,28 @@ export class RollupContract {
853
883
  0.5
854
884
  ]));
855
885
  }
886
+ /**
887
+ * Returns the effective pending checkpoint, accounting for potential prunes.
888
+ * When a prune can happen, the L1 contract uses the proven checkpoint instead of the pending one.
889
+ * This mirrors the behavior of getEffectivePendingCheckpointNumber in STFLib.sol.
890
+ * @param atTimestamp - The timestamp to evaluate pruneability at. Defaults to the current L1 block timestamp.
891
+ * @param options - Optional L1 block number to pin the queries to.
892
+ */ getEffectivePendingCheckpoint(atTimestamp, options) {
893
+ return retry(async ()=>{
894
+ const timestamp = atTimestamp ?? (await this.client.getBlock()).timestamp;
895
+ const canPrune = await this.canPruneAtTime(timestamp, options);
896
+ if (canPrune) {
897
+ const provenCheckpointNumber = await this.getProvenCheckpointNumber(options);
898
+ return await this.getCheckpoint(provenCheckpointNumber, options);
899
+ }
900
+ const pendingCheckpointNumber = await this.getCheckpointNumber(options);
901
+ return await this.getCheckpoint(pendingCheckpointNumber, options);
902
+ }, 'getting effective pending checkpoint', makeBackoff([
903
+ 0.5,
904
+ 0.5,
905
+ 0.5
906
+ ]));
907
+ }
856
908
  async getTips() {
857
909
  const { pending, proven } = await this.rollup.read.getTips();
858
910
  return {
@@ -937,9 +989,8 @@ export class RollupContract {
937
989
  * @return [slot, checkpointNumber, timeOfNextL1Slot] - If you can propose, the L2 slot number, checkpoint number and
938
990
  * timestamp of the next L1 block
939
991
  * @throws otherwise
940
- */ async canProposeAtNextEthBlock(archive, account, slotDuration, opts = {}) {
941
- const latestBlock = await this.client.getBlock();
942
- const timeOfNextL1Slot = latestBlock.timestamp + BigInt(slotDuration);
992
+ */ async canProposeAt(archive, account, timestamp, stateOverride = []) {
993
+ const timeOfNextL1Slot = timestamp;
943
994
  const who = typeof account === 'string' ? account : account.address;
944
995
  try {
945
996
  const { result: [slot, checkpointNumber] } = await this.client.simulateContract({
@@ -952,7 +1003,7 @@ export class RollupContract {
952
1003
  who
953
1004
  ],
954
1005
  account,
955
- stateOverride: await this.makePendingCheckpointNumberOverride(opts.forcePendingCheckpointNumber)
1006
+ stateOverride
956
1007
  });
957
1008
  return {
958
1009
  slot: SlotNumber.fromBigInt(slot),
@@ -990,6 +1041,139 @@ export class RollupContract {
990
1041
  }
991
1042
  ];
992
1043
  }
1044
+ /**
1045
+ * Returns a state override that sets tempCheckpointLogs[checkpointNumber].feeHeader to the compressed fee header.
1046
+ * Used when simulating a propose call where the parent checkpoint hasn't landed on L1 yet (pipelining).
1047
+ */ async makeFeeHeaderOverride(checkpointNumber, feeHeader) {
1048
+ const { epochDuration, proofSubmissionEpochs } = await this.getRollupConstants();
1049
+ const roundaboutSize = BigInt(epochDuration * (proofSubmissionEpochs + 1) + 1);
1050
+ const circularIndex = BigInt(checkpointNumber) % roundaboutSize;
1051
+ // tempCheckpointLogs is at offset 2 in RollupStore
1052
+ const tempCheckpointLogsMappingBase = hexToBigInt(RollupContract.stfStorageSlot) + 2n;
1053
+ // Solidity mapping slot: keccak256(abi.encode(key, baseSlot))
1054
+ const structBaseSlot = hexToBigInt(keccak256(encodeAbiParameters([
1055
+ {
1056
+ type: 'uint256'
1057
+ },
1058
+ {
1059
+ type: 'uint256'
1060
+ }
1061
+ ], [
1062
+ circularIndex,
1063
+ tempCheckpointLogsMappingBase
1064
+ ])));
1065
+ // feeHeader is the 7th field (offset 6) in CompressedTempCheckpointLog
1066
+ const feeHeaderSlot = structBaseSlot + 6n;
1067
+ const compressed = RollupContract.compressFeeHeader(feeHeader);
1068
+ return [
1069
+ {
1070
+ address: this.address,
1071
+ stateDiff: [
1072
+ {
1073
+ slot: `0x${feeHeaderSlot.toString(16).padStart(64, '0')}`,
1074
+ value: `0x${compressed.toString(16).padStart(64, '0')}`
1075
+ }
1076
+ ]
1077
+ }
1078
+ ];
1079
+ }
1080
+ /**
1081
+ * Returns a state override that sets archives[checkpointNumber] to the given archive value.
1082
+ * Used when simulating a canProposeAtTime call where the local archive differs from L1
1083
+ * (e.g. pipelining where the parent checkpoint hasn't landed on L1 yet).
1084
+ */ makeArchiveOverride(checkpointNumber, archive) {
1085
+ const archivesMappingBase = hexToBigInt(RollupContract.stfStorageSlot) + 1n;
1086
+ const archiveSlot = hexToBigInt(keccak256(encodeAbiParameters([
1087
+ {
1088
+ type: 'uint256'
1089
+ },
1090
+ {
1091
+ type: 'uint256'
1092
+ }
1093
+ ], [
1094
+ BigInt(checkpointNumber),
1095
+ archivesMappingBase
1096
+ ])));
1097
+ return [
1098
+ {
1099
+ address: this.address,
1100
+ stateDiff: [
1101
+ {
1102
+ slot: `0x${archiveSlot.toString(16).padStart(64, '0')}`,
1103
+ value: archive.toString()
1104
+ }
1105
+ ]
1106
+ }
1107
+ ];
1108
+ }
1109
+ /** Merges multiple StateOverride arrays, combining stateDiff entries for the same address. */ static mergeStateOverrides(...overrides) {
1110
+ const byAddress = new Map();
1111
+ for (const override of overrides){
1112
+ for (const entry of override){
1113
+ const key = entry.address.toLowerCase();
1114
+ const existing = byAddress.get(key);
1115
+ if (existing) {
1116
+ existing.stateDiff.push(...entry.stateDiff ?? []);
1117
+ if (entry.balance !== undefined) {
1118
+ existing.balance = entry.balance;
1119
+ }
1120
+ } else {
1121
+ byAddress.set(key, {
1122
+ address: entry.address,
1123
+ balance: entry.balance,
1124
+ stateDiff: [
1125
+ ...entry.stateDiff ?? []
1126
+ ]
1127
+ });
1128
+ }
1129
+ }
1130
+ }
1131
+ return [
1132
+ ...byAddress.values()
1133
+ ];
1134
+ }
1135
+ /** Compresses a FeeHeader into a uint256 matching FeeHeaderLib.compress() in FeeStructs.sol. */ static compressFeeHeader(feeHeader) {
1136
+ const MASK_48_BITS = (1n << 48n) - 1n;
1137
+ const MASK_64_BITS = (1n << 64n) - 1n;
1138
+ const MASK_63_BITS = (1n << 63n) - 1n;
1139
+ let value = BigInt(feeHeader.manaUsed) & (1n << 32n) - 1n; // bits [0:31]
1140
+ value |= (feeHeader.excessMana < MASK_48_BITS ? feeHeader.excessMana : MASK_48_BITS) << 32n; // bits [32:79]
1141
+ value |= (BigInt(feeHeader.ethPerFeeAsset) & MASK_48_BITS) << 80n; // bits [80:127]
1142
+ value |= (feeHeader.congestionCost < MASK_64_BITS ? feeHeader.congestionCost : MASK_64_BITS) << 128n; // bits [128:191]
1143
+ value |= (feeHeader.proverCost < MASK_63_BITS ? feeHeader.proverCost : MASK_63_BITS) << 192n; // bits [192:254]
1144
+ value |= 1n << 255n; // preheat flag
1145
+ return value;
1146
+ }
1147
+ /** Computes the fee header for a child checkpoint given parent fee header and child data.
1148
+ * Must stay in sync with Solidity FeeLib.sol (computeNewEthPerFeeAsset, clampedAdd). */ static computeChildFeeHeader(parentFeeHeader, childManaUsed, feeAssetPriceModifier, manaTarget) {
1149
+ const MIN_ETH_PER_FEE_ASSET = 100n;
1150
+ const MAX_ETH_PER_FEE_ASSET = 100_000_000_000_000n; // 1e14, matches FeeLib.sol
1151
+ // excessMana = clampedAdd(parent.excessMana + parent.manaUsed, -manaTarget)
1152
+ const sum = parentFeeHeader.excessMana + parentFeeHeader.manaUsed;
1153
+ const excessMana = sum > manaTarget ? sum - manaTarget : 0n;
1154
+ // ethPerFeeAsset = computeNewEthPerFeeAsset(max(parent.ethPerFeeAsset, MIN), modifier)
1155
+ const parentPrice = parentFeeHeader.ethPerFeeAsset > MIN_ETH_PER_FEE_ASSET ? parentFeeHeader.ethPerFeeAsset : MIN_ETH_PER_FEE_ASSET;
1156
+ let newPrice;
1157
+ if (feeAssetPriceModifier >= 0n) {
1158
+ newPrice = parentPrice * (10_000n + feeAssetPriceModifier) / 10_000n;
1159
+ } else {
1160
+ const absMod = -feeAssetPriceModifier;
1161
+ newPrice = parentPrice * (10_000n - absMod) / 10_000n;
1162
+ }
1163
+ if (newPrice < MIN_ETH_PER_FEE_ASSET) {
1164
+ newPrice = MIN_ETH_PER_FEE_ASSET;
1165
+ }
1166
+ if (newPrice > MAX_ETH_PER_FEE_ASSET) {
1167
+ newPrice = MAX_ETH_PER_FEE_ASSET;
1168
+ }
1169
+ return {
1170
+ excessMana,
1171
+ manaUsed: childManaUsed,
1172
+ ethPerFeeAsset: newPrice,
1173
+ congestionCost: 0n,
1174
+ proverCost: 0n
1175
+ };
1176
+ }
993
1177
  /** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */ buildInvalidateBadAttestationRequest(checkpointNumber, attestationsAndSigners, committee, invalidIndex) {
994
1178
  return {
995
1179
  to: this.address,
@@ -1031,11 +1215,25 @@ export class RollupContract {
1031
1215
  prover
1032
1216
  ]);
1033
1217
  }
1034
- getManaMinFeeAt(timestamp, inFeeAsset) {
1218
+ getManaMinFeeAt(timestamp, inFeeAsset, stateOverride) {
1035
1219
  return this.rollup.read.getManaMinFeeAt([
1036
1220
  timestamp,
1037
1221
  inFeeAsset
1222
+ ], {
1223
+ stateOverride
1224
+ });
1225
+ }
1226
+ async getManaMinFeeComponentsAt(timestamp, inFeeAsset) {
1227
+ const result = await this.rollup.read.getManaMinFeeComponentsAt([
1228
+ timestamp,
1229
+ inFeeAsset
1038
1230
  ]);
1231
+ return {
1232
+ sequencerCost: result.sequencerCost,
1233
+ proverCost: result.proverCost,
1234
+ congestionCost: result.congestionCost,
1235
+ congestionMultiplier: result.congestionMultiplier
1236
+ };
1039
1237
  }
1040
1238
  async getSlotAt(timestamp) {
1041
1239
  return SlotNumber.fromBigInt(await this.rollup.read.getSlotAt([
@@ -1086,10 +1284,10 @@ export class RollupContract {
1086
1284
  prover
1087
1285
  ]);
1088
1286
  }
1089
- async getAttesters() {
1287
+ async getAttesters(timestamp) {
1090
1288
  const attesterSize = await this.getActiveAttesterCount();
1091
1289
  const gse = new GSEContract(this.client, await this.getGSE());
1092
- const ts = (await this.client.getBlock()).timestamp;
1290
+ const ts = timestamp ?? (await this.client.getBlock()).timestamp;
1093
1291
  const indices = Array.from({
1094
1292
  length: attesterSize
1095
1293
  }, (_, i)=>BigInt(i));
@@ -1254,4 +1452,36 @@ export class RollupContract {
1254
1452
  }
1255
1453
  }));
1256
1454
  }
1455
+ /** Packs pending and proven checkpoint numbers into the chain tips storage format. */ static packChainTips(pendingCheckpointNumber, provenCheckpointNumber) {
1456
+ return pendingCheckpointNumber << 128n | provenCheckpointNumber & (1n << 128n) - 1n;
1457
+ }
1458
+ /** Storage slot for the chain tips (offset 0 within the STF storage struct). */ static get chainTipsStorageSlot() {
1459
+ return BigInt(RollupContract.stfStorageSlot);
1460
+ }
1461
+ /**
1462
+ * Computes the storage slot for a field within a tempCheckpointLog entry.
1463
+ * @param checkpointNumber - The checkpoint number
1464
+ * @param field - The field within the CompressedTempCheckpointLog struct
1465
+ */ async getTempCheckpointLogStorageSlot(checkpointNumber, field) {
1466
+ const fieldOffset = BigInt(field);
1467
+ const [epochDuration, proofSubmissionEpochs] = await Promise.all([
1468
+ this.getEpochDuration(),
1469
+ this.getProofSubmissionEpochs()
1470
+ ]);
1471
+ const roundaboutSize = BigInt(epochDuration) * (BigInt(proofSubmissionEpochs) + 1n) + 1n;
1472
+ const tempCheckpointLogsBase = BigInt(RollupContract.stfStorageSlot) + 2n;
1473
+ const circularIndex = BigInt(checkpointNumber) % roundaboutSize;
1474
+ const entryBase = BigInt(keccak256(encodeAbiParameters([
1475
+ {
1476
+ type: 'uint256'
1477
+ },
1478
+ {
1479
+ type: 'uint256'
1480
+ }
1481
+ ], [
1482
+ circularIndex,
1483
+ tempCheckpointLogsBase
1484
+ ])));
1485
+ return entryBase + fieldOffset;
1486
+ }
1257
1487
  }
@@ -5,13 +5,12 @@ import { Buffer32 } from '@aztec/foundation/buffer';
5
5
  import { EthAddress } from '@aztec/foundation/eth-address';
6
6
  import { type Hex, type Log, type TypedDataDefinition } from 'viem';
7
7
  /**
8
- * Wrapper around the TallySlashingProposer contract that provides
8
+ * Wrapper around the SlashingProposer contract that provides
9
9
  * a TypeScript interface for interacting with the consensus-based slashing system.
10
10
  */
11
- export declare class TallySlashingProposerContract {
11
+ export declare class SlashingProposerContract {
12
12
  readonly client: ViemClient;
13
13
  private readonly contract;
14
- readonly type: "tally";
15
14
  constructor(client: ViemClient, address: Hex | EthAddress);
16
15
  get address(): EthAddress;
17
16
  getQuorumSize(): Promise<bigint>;
@@ -137,4 +136,4 @@ export declare class TallySlashingProposerContract {
137
136
  * @returns An array of numbers representing the slash votes
138
137
  */
139
138
  export declare function decodeSlashConsensusVotes(buffer: Buffer): number[];
140
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFsbHlfc2xhc2hpbmdfcHJvcG9zZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdHMvdGFsbHlfc2xhc2hpbmdfcHJvcG9zZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFeEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzdELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFNM0QsT0FBTyxFQUVMLEtBQUssR0FBRyxFQUNSLEtBQUssR0FBRyxFQUNSLEtBQUssbUJBQW1CLEVBR3pCLE1BQU0sTUFBTSxDQUFDO0FBRWQ7OztHQUdHO0FBQ0gscUJBQWEsNkJBQTZCO2FBTXRCLE1BQU0sRUFBRSxVQUFVO0lBTHBDLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFxRTtJQUU5RixTQUFnQixJQUFJLFVBQW9CO0lBRXhDLFlBQ2tCLE1BQU0sRUFBRSxVQUFVLEVBQ2xDLE9BQU8sRUFBRSxHQUFHLEdBQUcsVUFBVSxFQU8xQjtJQUVELElBQVcsT0FBTyxlQUVqQjtJQUVNLGFBQWEsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBRXRDO0lBRU0sWUFBWSxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFckM7SUFFTSxnQkFBZ0IsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBRXpDO0lBRU0sb0JBQW9CLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUU3QztJQUVNLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFNUM7SUFFTSx5QkFBeUIsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENB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
139
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xhc2hpbmdfcHJvcG9zZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdHMvc2xhc2hpbmdfcHJvcG9zZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFeEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzdELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFNM0QsT0FBTyxFQUVMLEtBQUssR0FBRyxFQUNSLEtBQUssR0FBRyxFQUNSLEtBQUssbUJBQW1CLEVBR3pCLE1BQU0sTUFBTSxDQUFDO0FBRWQ7OztHQUdHO0FBQ0gscUJBQWEsd0JBQXdCO2FBSWpCLE1BQU0sRUFBRSxVQUFVO0lBSHBDLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFnRTtJQUV6RixZQUNrQixNQUFNLEVBQUUsVUFBVSxFQUNsQyxPQUFPLEVBQUUsR0FBRyxHQUFHLFVBQVUsRUFPMUI7SUFFRCxJQUFXLE9BQU8sZUFFakI7SUFFTSxhQUFhLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUV0QztJQUVNLFlBQVksSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBRXJDO0lBRU0sZ0JBQWdCLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUV6QztJQUVNLG9CQUFvQixJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFN0M7SUFFTSxtQkFBbUIsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBRTVDO0lBRU0seUJBQXlCLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUVsRDtJQUVNLGtCQUFrQixJQUFJLE9BQU8sQ0FBQyxDQUFD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
@@ -0,0 +1 @@
1
+ {"version":3,"file":"slashing_proposer.d.ts","sourceRoot":"","sources":["../../src/contracts/slashing_proposer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAM3D,OAAO,EAEL,KAAK,GAAG,EACR,KAAK,GAAG,EACR,KAAK,mBAAmB,EAGzB,MAAM,MAAM,CAAC;AAEd;;;GAGG;AACH,qBAAa,wBAAwB;aAIjB,MAAM,EAAE,UAAU;IAHpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgE;IAEzF,YACkB,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU,EAO1B;IAED,IAAW,OAAO,eAEjB;IAEM,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAEtC;IAEM,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAErC;IAEM,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,CAEzC;IAEM,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,CAE7C;IAEM,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAE5C;IAEM,yBAAyB,IAAI,OAAO,CAAC,MAAM,CAAC,CAElD;IAEM,kBAAkB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAM7D;IAEM,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC,CAE/C;IAEM,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,CAExC;IAED;;;;OAIG;IACU,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAC5C,UAAU,EAAE,OAAO,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC,CAGD;IAED;;;;;OAKG;IACU,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAEpF;IAED,iGAAiG;IACpF,UAAU,CACrB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,OAAO,EAAE;YAAE,WAAW,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,UAAU,CAAA;SAAE,EAAE,CAAC;QAAC,OAAO,EAAE,UAAU,CAAA;KAAE,CAAC,CAM7F;IAED,gFAAgF;IACnE,QAAQ,CACnB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,OAAO,EAAE;YAAE,WAAW,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,UAAU,CAAA;SAAE,EAAE,CAAC;QAAC,UAAU,EAAE,UAAU,EAAE,EAAE,CAAA;KAAE,CAAC,CAIpG;IAED,OAAO,CAAC,eAAe;IASvB,6DAA6D;IACtD,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE;;;;;;;kBAEzC;IAED,kEAAkE;IAC3D,4BAA4B,CAAC,IAAI,EAAE,GAAG,EAAE;;;;;;kBAE9C;IAED;;;;;;OAMG;IACU,0BAA0B,CACrC,KAAK,EAAE,GAAG,EACV,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,GACjD,OAAO,CAAC,WAAW,CAAC,CAatB;IAED,kEAAkE;IAC3D,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,GAAG,mBAAmB,CAsB3E;IAED,oEAAoE;IACvD,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CAE9E;IAED;;;;;OAKG;IACI,6BAA6B,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,GAAG,CAAC;QAAC,CAAC,EAAE,GAAG,CAAA;KAAE,GAAG,WAAW,CAUtG;IAED;;;;;OAKG;IACI,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,GAAG,WAAW,CAUtF;IAED,uDAAuD;IAC1C,WAAW,CAAC,KAAK,EAAE,MAAM;;;SAYrC;IAED;;;;OAIG;IACI,gBAAgB,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,GAAG,MAAM,IAAI,CAcjG;IAED;;;;OAIG;IACI,qBAAqB,CAC1B,QAAQ,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,GAAG,CAAA;KAAE,KAAK,IAAI,GAChF,MAAM,IAAI,CAcZ;CACF;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAelE"}
@@ -4,21 +4,19 @@ import { EthAddress } from '@aztec/foundation/eth-address';
4
4
  import { Signature } from '@aztec/foundation/eth-signature';
5
5
  import { hexToBuffer } from '@aztec/foundation/string';
6
6
  import { SlasherAbi } from '@aztec/l1-artifacts/SlasherAbi';
7
- import { TallySlashingProposerAbi } from '@aztec/l1-artifacts/TallySlashingProposerAbi';
7
+ import { SlashingProposerAbi } from '@aztec/l1-artifacts/SlashingProposerAbi';
8
8
  import { encodeFunctionData, getContract } from 'viem';
9
9
  /**
10
- * Wrapper around the TallySlashingProposer contract that provides
10
+ * Wrapper around the SlashingProposer contract that provides
11
11
  * a TypeScript interface for interacting with the consensus-based slashing system.
12
- */ export class TallySlashingProposerContract {
12
+ */ export class SlashingProposerContract {
13
13
  client;
14
14
  contract;
15
- type;
16
15
  constructor(client, address){
17
16
  this.client = client;
18
- this.type = 'tally';
19
17
  this.contract = getContract({
20
18
  address: typeof address === 'string' ? address : address.toString(),
21
- abi: TallySlashingProposerAbi,
19
+ abi: SlashingProposerAbi,
22
20
  client
23
21
  });
24
22
  }
@@ -118,10 +116,10 @@ import { encodeFunctionData, getContract } from 'viem';
118
116
  }));
119
117
  }
120
118
  /** Tries to extract a VoteCast event from the given logs. */ tryExtractVoteCastEvent(logs) {
121
- return tryExtractEvent(logs, this.address.toString(), TallySlashingProposerAbi, 'VoteCast');
119
+ return tryExtractEvent(logs, this.address.toString(), SlashingProposerAbi, 'VoteCast');
122
120
  }
123
121
  /** Tries to extract a RoundExecuted event from the given logs. */ tryExtractRoundExecutedEvent(logs) {
124
- return tryExtractEvent(logs, this.address.toString(), TallySlashingProposerAbi, 'RoundExecuted');
122
+ return tryExtractEvent(logs, this.address.toString(), SlashingProposerAbi, 'RoundExecuted');
125
123
  }
126
124
  /**
127
125
  * Create a transaction to vote for slashing offenses
@@ -134,9 +132,9 @@ import { encodeFunctionData, getContract } from 'viem';
134
132
  const signature = Signature.fromString(await signer(typedData));
135
133
  return {
136
134
  to: this.contract.address,
137
- abi: TallySlashingProposerAbi,
135
+ abi: SlashingProposerAbi,
138
136
  data: encodeFunctionData({
139
- abi: TallySlashingProposerAbi,
137
+ abi: SlashingProposerAbi,
140
138
  functionName: 'vote',
141
139
  args: [
142
140
  votes,
@@ -147,7 +145,7 @@ import { encodeFunctionData, getContract } from 'viem';
147
145
  }
148
146
  /** Returns the typed data definition to EIP712-sign for voting */ buildVoteTypedData(votes, slot) {
149
147
  const domain = {
150
- name: 'TallySlashingProposer',
148
+ name: 'SlashingProposer',
151
149
  version: '1',
152
150
  chainId: this.client.chain.id,
153
151
  verifyingContract: this.contract.address
@@ -206,9 +204,9 @@ import { encodeFunctionData, getContract } from 'viem';
206
204
  */ buildVoteRequestWithSignature(votes, signature) {
207
205
  return {
208
206
  to: this.contract.address,
209
- abi: TallySlashingProposerAbi,
207
+ abi: SlashingProposerAbi,
210
208
  data: encodeFunctionData({
211
- abi: TallySlashingProposerAbi,
209
+ abi: SlashingProposerAbi,
212
210
  functionName: 'vote',
213
211
  args: [
214
212
  votes,
@@ -226,11 +224,11 @@ import { encodeFunctionData, getContract } from 'viem';
226
224
  return {
227
225
  to: this.contract.address,
228
226
  abi: mergeAbis([
229
- TallySlashingProposerAbi,
227
+ SlashingProposerAbi,
230
228
  SlasherAbi
231
229
  ]),
232
230
  data: encodeFunctionData({
233
- abi: TallySlashingProposerAbi,
231
+ abi: SlashingProposerAbi,
234
232
  functionName: 'executeRound',
235
233
  args: [
236
234
  round,