@aztec/ethereum 0.0.1-commit.b2a5d0dd1 → 0.0.1-commit.b3d3157a

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 (72) hide show
  1. package/dest/client.d.ts +11 -3
  2. package/dest/client.d.ts.map +1 -1
  3. package/dest/client.js +35 -3
  4. package/dest/contracts/chain_state_override.d.ts +47 -7
  5. package/dest/contracts/chain_state_override.d.ts.map +1 -1
  6. package/dest/contracts/chain_state_override.js +57 -20
  7. package/dest/contracts/empire_base.d.ts +1 -3
  8. package/dest/contracts/empire_base.d.ts.map +1 -1
  9. package/dest/contracts/fee_asset_price_oracle.d.ts +6 -2
  10. package/dest/contracts/fee_asset_price_oracle.d.ts.map +1 -1
  11. package/dest/contracts/fee_asset_price_oracle.js +11 -6
  12. package/dest/contracts/governance.d.ts +108 -33
  13. package/dest/contracts/governance.d.ts.map +1 -1
  14. package/dest/contracts/governance.js +193 -12
  15. package/dest/contracts/governance_proposer.d.ts +33 -3
  16. package/dest/contracts/governance_proposer.d.ts.map +1 -1
  17. package/dest/contracts/governance_proposer.js +51 -9
  18. package/dest/contracts/inbox.js +1 -1
  19. package/dest/contracts/multicall.d.ts +79 -13
  20. package/dest/contracts/multicall.d.ts.map +1 -1
  21. package/dest/contracts/multicall.js +117 -95
  22. package/dest/contracts/outbox.d.ts +27 -4
  23. package/dest/contracts/outbox.d.ts.map +1 -1
  24. package/dest/contracts/outbox.js +34 -7
  25. package/dest/contracts/rollup.d.ts +327 -57
  26. package/dest/contracts/rollup.d.ts.map +1 -1
  27. package/dest/contracts/rollup.js +102 -40
  28. package/dest/l1_artifacts.d.ts +5108 -155
  29. package/dest/l1_artifacts.d.ts.map +1 -1
  30. package/dest/l1_contract_addresses.d.ts +61 -61
  31. package/dest/l1_contract_addresses.d.ts.map +1 -1
  32. package/dest/l1_contract_addresses.js +101 -76
  33. package/dest/l1_reader.d.ts +3 -5
  34. package/dest/l1_reader.d.ts.map +1 -1
  35. package/dest/l1_reader.js +3 -6
  36. package/dest/l1_tx_utils/l1_tx_utils.d.ts +7 -1
  37. package/dest/l1_tx_utils/l1_tx_utils.d.ts.map +1 -1
  38. package/dest/l1_tx_utils/l1_tx_utils.js +21 -10
  39. package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts +1 -1
  40. package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts.map +1 -1
  41. package/dest/l1_tx_utils/readonly_l1_tx_utils.js +2 -1
  42. package/dest/l1_tx_utils/tx_delayer.d.ts +5 -3
  43. package/dest/l1_tx_utils/tx_delayer.d.ts.map +1 -1
  44. package/dest/l1_tx_utils/tx_delayer.js +7 -5
  45. package/dest/test/eth_cheat_codes.d.ts +7 -1
  46. package/dest/test/eth_cheat_codes.d.ts.map +1 -1
  47. package/dest/test/eth_cheat_codes.js +11 -0
  48. package/dest/test/rollup_cheat_codes.d.ts +27 -3
  49. package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
  50. package/dest/test/rollup_cheat_codes.js +50 -6
  51. package/dest/utils.d.ts +9 -2
  52. package/dest/utils.d.ts.map +1 -1
  53. package/dest/utils.js +34 -6
  54. package/package.json +6 -6
  55. package/src/client.ts +39 -1
  56. package/src/contracts/chain_state_override.ts +77 -24
  57. package/src/contracts/empire_base.ts +0 -2
  58. package/src/contracts/fee_asset_price_oracle.ts +10 -5
  59. package/src/contracts/governance.ts +266 -9
  60. package/src/contracts/governance_proposer.ts +52 -5
  61. package/src/contracts/inbox.ts +1 -1
  62. package/src/contracts/multicall.ts +179 -105
  63. package/src/contracts/outbox.ts +42 -8
  64. package/src/contracts/rollup.ts +124 -42
  65. package/src/l1_contract_addresses.ts +120 -87
  66. package/src/l1_reader.ts +4 -9
  67. package/src/l1_tx_utils/l1_tx_utils.ts +27 -14
  68. package/src/l1_tx_utils/readonly_l1_tx_utils.ts +2 -1
  69. package/src/l1_tx_utils/tx_delayer.ts +16 -7
  70. package/src/test/eth_cheat_codes.ts +10 -0
  71. package/src/test/rollup_cheat_codes.ts +53 -5
  72. package/src/utils.ts +30 -6
@@ -53,6 +53,15 @@ export declare class RollupCheatCodes {
53
53
  advanceToNextEpoch(): Promise<void>;
54
54
  /** Warps time in L1 until the beginning of the next slot. */
55
55
  advanceToNextSlot(): Promise<(bigint | SlotNumber)[]>;
56
+ /**
57
+ * Warps L1 time to the start of an explicit absolute slot. Unlike `advanceSlots(N)` which is
58
+ * relative to the current L1 timestamp at call time and therefore races with real-time
59
+ * progression between query and warp, this lands at the slot regardless of latency.
60
+ *
61
+ * Throws if the requested slot is in the past relative to current L1 time (anvil cannot
62
+ * rewind).
63
+ */
64
+ advanceToSlot(slot: SlotNumber): Promise<bigint>;
56
65
  /**
57
66
  * Warps time in L1 equivalent to however many slots.
58
67
  * @param howMany - The number of slots to advance.
@@ -68,7 +77,7 @@ export declare class RollupCheatCodes {
68
77
  * @param howMuch - How many checkpoints to move it forward
69
78
  */
70
79
  advanceInboxInProgress(howMuch: number | bigint): Promise<bigint>;
71
- insertOutbox(epoch: EpochNumber, outHash: bigint): Promise<void>;
80
+ insertOutbox(epoch: EpochNumber, numCheckpointsInEpoch: number, outHash: bigint): Promise<void>;
72
81
  /**
73
82
  * Executes an action impersonated as the owner of the Rollup contract.
74
83
  * @param action - The action to execute
@@ -86,9 +95,24 @@ export declare class RollupCheatCodes {
86
95
  */
87
96
  bumpProvingCostPerMana(bumper: (before: bigint) => bigint): Promise<void>;
88
97
  /**
89
- * Directly updates proving cost per mana.
98
+ * Directly updates proving cost per mana. Throws if the on-chain tx reverts
99
+ * (e.g. rate-limit cooldown, step cap, or floor) instead of silently succeeding.
90
100
  * @param ethValue - The new proving cost per mana in ETH
91
101
  */
92
102
  setProvingCostPerMana(ethValue: bigint): Promise<void>;
103
+ /**
104
+ * Resets the 30-day proving-cost update cooldown enforced by FeeLib.updateProvingCostPerMana
105
+ * by zeroing `FeeStore.provingCostLastUpdate` directly in contract storage. Use between
106
+ * successive setProvingCostPerMana / bumpProvingCostPerMana calls so the later update can
107
+ * land instead of reverting. Does not touch L1 time, so PXE/tx-expiration state stays intact.
108
+ *
109
+ * @note This is tightly coupled to the `FeeStore` layout in
110
+ * l1-contracts/src/core/libraries/rollup/FeeLib.sol:
111
+ * slot + 0: CompressedFeeConfig config (uint256)
112
+ * slot + 1: L1GasOracleValues l1GasOracleValues (14+14+4 bytes, packed)
113
+ * slot + 2: uint64 provingCostLastUpdate (only member — zeroing the slot is safe)
114
+ * If the struct layout changes, update the offset below.
115
+ */
116
+ clearProvingCostCooldown(): Promise<void>;
93
117
  }
94
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9sbHVwX2NoZWF0X2NvZGVzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9yb2xsdXBfY2hlYXRfY29kZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzlELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFHNUYsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTFELE9BQU8sRUFDTCxLQUFLLHFCQUFxQixFQUMxQixLQUFLLEdBQUcsRUFNVCxNQUFNLE1BQU0sQ0FBQztBQUVkLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVyRCw4Q0FBOEM7QUFDOUMscUJBQWEsZ0JBQWdCO0lBT3pCLE9BQU8sQ0FBQyxhQUFhO0lBTnZCLE9BQU8sQ0FBQyxNQUFNLENBQW1CO0lBQ2pDLE9BQU8sQ0FBQyxNQUFNLENBQTREO0lBRTFFLE9BQU8sQ0FBQyxNQUFNLENBQXVDO0lBRXJELFlBQ1UsYUFBYSxFQUFFLGFBQWEsRUFDcEMsU0FBUyxFQUFFLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxlQUFlLENBQUMsRUFXdEQ7SUFFRCxNQUFNLENBQUMsTUFBTSxDQUNYLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFDakIsU0FBUyxFQUFFLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxlQUFlLENBQUMsRUFDckQsWUFBWSxFQUFFLFlBQVksR0FDekIsZ0JBQWdCLENBR2xCO0lBRUQsK0JBQStCO0lBQ2xCLE9BQU8sSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLENBRzFDO0lBRUQsb0RBQW9EO0lBQ3ZDLFNBQVMsQ0FBQyxTQUFTLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FFN0Q7SUFFRCwyREFBMkQ7SUFDOUMsbUJBQW1CLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBRWxFO0lBRUQsbUdBQW1HO0lBQ3RGLG1CQUFtQixDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQU1sRTtJQUVELGdDQUFnQztJQUNuQixRQUFRLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUc1QztJQUVEOzs7T0FHRztJQUNVLE9BQU8sSUFBSSxPQUFPLENBQUM7UUFDOUIsNEJBQTRCLENBQUMsT0FBTyxFQUFFLGdCQUFnQixDQUFDO1FBQ3ZELDJCQUEyQixDQUFDLE1BQU0sRUFBRSxnQkFBZ0IsQ0FBQztLQUN0RCxDQUFDLENBTUQ7SUFFRDs7T0FFRztJQUNVLFdBQVcsa0JBaUJ2QjtJQUVELDBFQUEwRTtJQUM3RCxTQUFTLElBQUksT0FBTyxDQUFDO1FBQ2hDLHFCQUFxQixDQUFDLGFBQWEsRUFBRSxNQUFNLENBQUM7UUFDNUMsb0JBQW9CLENBQUMsWUFBWSxFQUFFLE1BQU0sQ0FBQztLQUMzQyxDQUFDLENBTUQ7SUFFRDs7OztPQUlHO0lBQ1UsY0FBYyxDQUN6QixLQUFLLEVBQUUsV0FBVyxFQUNsQixJQUFJLEdBQUU7UUFDSix3QkFBd0I7UUFDeEIsTUFBTSxDQUFDLEVBQUUsTUFBTSxDQUFDO0tBQ1osbUJBWVA7SUFFRCw0Q0FBNEM7SUFDL0Isa0JBQWtCLGtCQVc5QjtJQUVELDZEQUE2RDtJQUNoRCxpQkFBaUIscUNBTzdCO0lBRUQ7OztPQUdHO0lBQ1UsWUFBWSxDQUFDLE9BQU8sRUFBRSxNQUFNLGlCQU94QztJQUVEOzs7T0FHRztJQUNJLFlBQVksQ0FBQyxxQkFBcUIsQ0FBQyxFQUFFLGdCQUFnQixpQkErQjNEO0lBRUQ7OztPQUdHO0lBQ0ksc0JBQXNCLENBQUMsT0FBTyxFQUFFLE1BQU0sR0FBRyxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQW1DdkU7SUFFTSxZQUFZLENBQUMsS0FBSyxFQUFFLFdBQVcsRUFBRSxPQUFPLEVBQUUsTUFBTSxpQkFPdEQ7SUFFRDs7O09BR0c7SUFDVSxPQUFPLENBQ2xCLE1BQU0sRUFBRSxDQUFDLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLHFCQUFxQixDQUFDLE9BQU8sU0FBUyxFQUFFLGdCQUFnQixDQUFDLEtBQUssT0FBTyxDQUFDLElBQUksQ0FBQyxpQkFNekc7SUFFRDs7T0FFRztJQUNVLFVBQVUsa0JBT3RCO0lBRUQsNENBQTRDO0lBQy9CLG9CQUFvQixrQkFNaEM7SUFFRDs7O09BR0c7SUFDVSxzQkFBc0IsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxLQUFLLE1BQU0saUJBSXJFO0lBRUQ7OztPQUdHO0lBQ1UscUJBQXFCLENBQUMsUUFBUSxFQUFFLE1BQU0saUJBVWxEO0NBQ0YifQ==
118
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9sbHVwX2NoZWF0X2NvZGVzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9yb2xsdXBfY2hlYXRfY29kZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzlELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFHNUYsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTFELE9BQU8sRUFDTCxLQUFLLHFCQUFxQixFQUMxQixLQUFLLEdBQUcsRUFPVCxNQUFNLE1BQU0sQ0FBQztBQUVkLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVyRCw4Q0FBOEM7QUFDOUMscUJBQWEsZ0JBQWdCO0lBT3pCLE9BQU8sQ0FBQyxhQUFhO0lBTnZCLE9BQU8sQ0FBQyxNQUFNLENBQW1CO0lBQ2pDLE9BQU8sQ0FBQyxNQUFNLENBQTREO0lBRTFFLE9BQU8sQ0FBQyxNQUFNLENBQXVDO0lBRXJELFlBQ1UsYUFBYSxFQUFFLGFBQWEsRUFDcEMsU0FBUyxFQUFFLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxlQUFlLENBQUMsRUFXdEQ7SUFFRCxNQUFNLENBQUMsTUFBTSxDQUNYLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFDakIsU0FBUyxFQUFFLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxlQUFlLENBQUMsRUFDckQsWUFBWSxFQUFFLFlBQVksR0FDekIsZ0JBQWdCLENBR2xCO0lBRUQsK0JBQStCO0lBQ2xCLE9BQU8sSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLENBRzFDO0lBRUQsb0RBQW9EO0lBQ3ZDLFNBQVMsQ0FBQyxTQUFTLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FFN0Q7SUFFRCwyREFBMkQ7SUFDOUMsbUJBQW1CLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBRWxFO0lBRUQsbUdBQW1HO0lBQ3RGLG1CQUFtQixDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQU1sRTtJQUVELGdDQUFnQztJQUNuQixRQUFRLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUc1QztJQUVEOzs7T0FHRztJQUNVLE9BQU8sSUFBSSxPQUFPLENBQUM7UUFDOUIsNEJBQTRCLENBQUMsT0FBTyxFQUFFLGdCQUFnQixDQUFDO1FBQ3ZELDJCQUEyQixDQUFDLE1BQU0sRUFBRSxnQkFBZ0IsQ0FBQztLQUN0RCxDQUFDLENBTUQ7SUFFRDs7T0FFRztJQUNVLFdBQVcsa0JBaUJ2QjtJQUVELDBFQUEwRTtJQUM3RCxTQUFTLElBQUksT0FBTyxDQUFDO1FBQ2hDLHFCQUFxQixDQUFDLGFBQWEsRUFBRSxNQUFNLENBQUM7UUFDNUMsb0JBQW9CLENBQUMsWUFBWSxFQUFFLE1BQU0sQ0FBQztLQUMzQyxDQUFDLENBTUQ7SUFFRDs7OztPQUlHO0lBQ1UsY0FBYyxDQUN6QixLQUFLLEVBQUUsV0FBVyxFQUNsQixJQUFJLEdBQUU7UUFDSix3QkFBd0I7UUFDeEIsTUFBTSxDQUFDLEVBQUUsTUFBTSxDQUFDO0tBQ1osbUJBWVA7SUFFRCw0Q0FBNEM7SUFDL0Isa0JBQWtCLGtCQVc5QjtJQUVELDZEQUE2RDtJQUNoRCxpQkFBaUIscUNBTzdCO0lBRUQ7Ozs7Ozs7T0FPRztJQUNVLGFBQWEsQ0FBQyxJQUFJLEVBQUUsVUFBVSxtQkFLMUM7SUFFRDs7O09BR0c7SUFDVSxZQUFZLENBQUMsT0FBTyxFQUFFLE1BQU0saUJBT3hDO0lBRUQ7OztPQUdHO0lBQ0ksWUFBWSxDQUFDLHFCQUFxQixDQUFDLEVBQUUsZ0JBQWdCLGlCQStCM0Q7SUFFRDs7O09BR0c7SUFDSSxzQkFBc0IsQ0FBQyxPQUFPLEVBQUUsTUFBTSxHQUFHLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBbUN2RTtJQUVNLFlBQVksQ0FBQyxLQUFLLEVBQUUsV0FBVyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsTUFBTSxpQkFTckY7SUFFRDs7O09BR0c7SUFDVSxPQUFPLENBQ2xCLE1BQU0sRUFBRSxDQUFDLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLHFCQUFxQixDQUFDLE9BQU8sU0FBUyxFQUFFLGdCQUFnQixDQUFDLEtBQUssT0FBTyxDQUFDLElBQUksQ0FBQyxpQkFNekc7SUFFRDs7T0FFRztJQUNVLFVBQVUsa0JBT3RCO0lBRUQsNENBQTRDO0lBQy9CLG9CQUFvQixrQkFNaEM7SUFFRDs7O09BR0c7SUFDVSxzQkFBc0IsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxLQUFLLE1BQU0saUJBSXJFO0lBRUQ7Ozs7T0FJRztJQUNVLHFCQUFxQixDQUFDLFFBQVEsRUFBRSxNQUFNLGlCQWlCbEQ7SUFFRDs7Ozs7Ozs7Ozs7O09BWUc7SUFDVSx3QkFBd0Isa0JBT3BDO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"rollup_cheat_codes.d.ts","sourceRoot":"","sources":["../../src/test/rollup_cheat_codes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rollup_cheat_codes.d.ts","sourceRoot":"","sources":["../../src/test/rollup_cheat_codes.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,7 @@ import { CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/bra
3
3
  import { EthAddress } from '@aztec/foundation/eth-address';
4
4
  import { createLogger } from '@aztec/foundation/log';
5
5
  import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
6
- import { createPublicClient, fallback, getContract, hexToBigInt, http } from 'viem';
6
+ import { createPublicClient, fallback, getContract, hexToBigInt, http, keccak256 } from 'viem';
7
7
  import { EthCheatCodes } from './eth_cheat_codes.js';
8
8
  /** Cheat codes for the L1 rollup contract. */ export class RollupCheatCodes {
9
9
  ethCheatCodes;
@@ -151,6 +151,26 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
151
151
  ];
152
152
  }
153
153
  /**
154
+ * Warps L1 time to the start of an explicit absolute slot. Unlike `advanceSlots(N)` which is
155
+ * relative to the current L1 timestamp at call time and therefore races with real-time
156
+ * progression between query and warp, this lands at the slot regardless of latency.
157
+ *
158
+ * Throws if the requested slot is in the past relative to current L1 time (anvil cannot
159
+ * rewind).
160
+ */ async advanceToSlot(slot) {
161
+ const timestamp = await this.rollup.read.getTimestampForSlot([
162
+ BigInt(slot)
163
+ ]);
164
+ await this.ethCheatCodes.warp(Number(timestamp), {
165
+ silent: true,
166
+ resetBlockInterval: true
167
+ });
168
+ this.logger.warn(`Advanced to slot ${slot}`, {
169
+ timestamp
170
+ });
171
+ return timestamp;
172
+ }
173
+ /**
154
174
  * Warps time in L1 equivalent to however many slots.
155
175
  * @param howMany - The number of slots to advance.
156
176
  */ async advanceSlots(howMany) {
@@ -228,12 +248,12 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
228
248
  return newInProgress;
229
249
  });
230
250
  }
231
- insertOutbox(epoch, outHash) {
251
+ insertOutbox(epoch, numCheckpointsInEpoch, outHash) {
232
252
  return this.ethCheatCodes.execWithPausedAnvil(async ()=>{
233
253
  const outboxAddress = await this.rollup.read.getOutbox();
234
- const epochRootSlot = OutboxContract.getEpochRootStorageSlot(epoch);
254
+ const epochRootSlot = OutboxContract.getEpochRootStorageSlot(epoch, numCheckpointsInEpoch);
235
255
  await this.ethCheatCodes.store(EthAddress.fromString(outboxAddress), epochRootSlot, outHash);
236
- this.logger.warn(`Advanced outbox to epoch ${epoch} with out hash ${outHash}`);
256
+ this.logger.warn(`Advanced outbox to epoch ${epoch} numCheckpointsInEpoch ${numCheckpointsInEpoch} with out hash ${outHash}`);
237
257
  });
238
258
  }
239
259
  /**
@@ -280,7 +300,8 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
280
300
  await this.setProvingCostPerMana(newCost);
281
301
  }
282
302
  /**
283
- * Directly updates proving cost per mana.
303
+ * Directly updates proving cost per mana. Throws if the on-chain tx reverts
304
+ * (e.g. rate-limit cooldown, step cap, or floor) instead of silently succeeding.
284
305
  * @param ethValue - The new proving cost per mana in ETH
285
306
  */ async setProvingCostPerMana(ethValue) {
286
307
  await this.asOwner(async (account, rollup)=>{
@@ -291,10 +312,33 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
291
312
  chain: this.client.chain,
292
313
  gasLimit: 1000000n
293
314
  });
294
- await this.client.waitForTransactionReceipt({
315
+ const receipt = await this.client.waitForTransactionReceipt({
295
316
  hash
296
317
  });
318
+ if (receipt.status !== 'success') {
319
+ throw new Error(`setProvingCostPerMana(${ethValue}) reverted on L1 (tx ${hash}). ` + `Likely FeeLib rate-limit (30-day cooldown or 1.5x step cap); ` + `use clearProvingCostCooldown() between successive updates.`);
320
+ }
297
321
  this.logger.warn(`Updated proving cost per mana to ${ethValue}`);
298
322
  });
299
323
  }
324
+ /**
325
+ * Resets the 30-day proving-cost update cooldown enforced by FeeLib.updateProvingCostPerMana
326
+ * by zeroing `FeeStore.provingCostLastUpdate` directly in contract storage. Use between
327
+ * successive setProvingCostPerMana / bumpProvingCostPerMana calls so the later update can
328
+ * land instead of reverting. Does not touch L1 time, so PXE/tx-expiration state stays intact.
329
+ *
330
+ * @note This is tightly coupled to the `FeeStore` layout in
331
+ * l1-contracts/src/core/libraries/rollup/FeeLib.sol:
332
+ * slot + 0: CompressedFeeConfig config (uint256)
333
+ * slot + 1: L1GasOracleValues l1GasOracleValues (14+14+4 bytes, packed)
334
+ * slot + 2: uint64 provingCostLastUpdate (only member — zeroing the slot is safe)
335
+ * If the struct layout changes, update the offset below.
336
+ */ async clearProvingCostCooldown() {
337
+ const feeStoreBaseSlot = hexToBigInt(keccak256(Buffer.from('aztec.fee.storage', 'utf-8')));
338
+ const provingCostLastUpdateSlot = feeStoreBaseSlot + 2n;
339
+ await this.ethCheatCodes.store(EthAddress.fromString(this.rollup.address), provingCostLastUpdateSlot, 0n, {
340
+ silent: true
341
+ });
342
+ this.logger.warn(`Cleared proving-cost update cooldown`);
343
+ }
300
344
  }
package/dest/utils.d.ts CHANGED
@@ -9,7 +9,7 @@ export interface L2Claim {
9
9
  }
10
10
  export declare class FormattedViemError extends Error {
11
11
  metaMessages?: any[];
12
- constructor(message: string, metaMessages?: any[]);
12
+ constructor(message: string, metaMessages?: any[], options?: ErrorOptions);
13
13
  }
14
14
  export declare function extractEvent<const TAbi extends Abi | readonly unknown[], TEventName extends ContractEventName<TAbi>, TEventType = DecodeEventLogReturnType<TAbi, TEventName, Hex[], undefined, true>>(logs: Log[], address: Hex, abi: TAbi, eventName: TEventName, filter?: (log: TEventType) => boolean, logger?: Logger): TEventType;
15
15
  export declare function tryExtractEvent<const TAbi extends Abi | readonly unknown[], TEventName extends ContractEventName<TAbi>, TEventType = DecodeEventLogReturnType<TAbi, TEventName, Hex[], undefined, true>>(logs: Log[], address: Hex, abi: TAbi, eventName: TEventName, filter?: (log: TEventType) => boolean, logger?: Logger): TEventType | undefined;
@@ -22,6 +22,13 @@ export declare function mergeAbis(abis: Abi[]): Abi;
22
22
  * @returns A FormattedViemError instance.
23
23
  */
24
24
  export declare function formatViemError(error: any, abi?: Abi): FormattedViemError;
25
+ /**
26
+ * Best-effort decode of a raw revert payload (`0x...`) against an ABI.
27
+ * Returns a human-readable `ErrorName(arg1, arg2, ...)` string, or `undefined` if the selector
28
+ * is unknown or the payload is empty. Use to surface decoded error names alongside the raw
29
+ * payload in log lines for operators.
30
+ */
31
+ export declare function tryDecodeRevertReason(data: Hex | undefined, abi: Abi): string | undefined;
25
32
  export declare function tryGetCustomErrorName(err: any): string | undefined;
26
33
  /**
27
34
  * Type guard to check if a transaction is a blob transaction (EIP-4844).
@@ -35,4 +42,4 @@ export declare function isBlobTransaction(tx: FormattedTransaction): tx is Forma
35
42
  * Calculates a percentile from an array of bigints
36
43
  */
37
44
  export declare function calculatePercentile(values: bigint[], percentile: number): bigint;
38
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRCxPQUFPLEVBQ0wsS0FBSyxHQUFHLEVBR1IsS0FBSyxpQkFBaUIsRUFFdEIsS0FBSyx3QkFBd0IsRUFDN0IsS0FBSyxvQkFBb0IsRUFDekIsS0FBSyxHQUFHLEVBQ1IsS0FBSyxHQUFHLEVBR1QsTUFBTSxNQUFNLENBQUM7QUFHZCxNQUFNLFdBQVcsT0FBTztJQUN0QixXQUFXLEVBQUUsRUFBRSxDQUFDO0lBQ2hCLFdBQVcsRUFBRSxFQUFFLENBQUM7SUFDaEIsV0FBVyxFQUFFLEdBQUcsQ0FBQztJQUNqQixnQkFBZ0IsRUFBRSxNQUFNLENBQUM7Q0FDMUI7QUFFRCxxQkFBYSxrQkFBbUIsU0FBUSxLQUFLO0lBQzNDLFlBQVksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO0lBRXJCLFlBQVksT0FBTyxFQUFFLE1BQU0sRUFBRSxZQUFZLENBQUMsRUFBRSxHQUFHLEVBQUUsRUFJaEQ7Q0FDRjtBQUVELHdCQUFnQixZQUFZLENBQzFCLEtBQUssQ0FBQyxJQUFJLFNBQVMsR0FBRyxHQUFHLFNBQVMsT0FBTyxFQUFFLEVBQzNDLFVBQVUsU0FBUyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsRUFDMUMsVUFBVSxHQUFHLHdCQUF3QixDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksQ0FBQyxFQUUvRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQ1gsT0FBTyxFQUFFLEdBQUcsRUFDWixHQUFHLEVBQUUsSUFBSSxFQUNULFNBQVMsRUFBRSxVQUFVLEVBQ3JCLE1BQU0sQ0FBQyxFQUFFLENBQUMsR0FBRyxFQUFFLFVBQVUsS0FBSyxPQUFPLEVBQ3JDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sR0FDZCxVQUFVLENBTVo7QUFFRCx3QkFBZ0IsZUFBZSxDQUM3QixLQUFLLENBQUMsSUFBSSxTQUFTLEdBQUcsR0FBRyxTQUFTLE9BQU8sRUFBRSxFQUMzQyxVQUFVLFNBQVMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEVBQzFDLFVBQVUsR0FBRyx3QkFBd0IsQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLENBQUMsRUFFL0UsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUNYLE9BQU8sRUFBRSxHQUFHLEVBQ1osR0FBRyxFQUFFLElBQUksRUFDVCxTQUFTLEVBQUUsVUFBVSxFQUNyQixNQUFNLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxVQUFVLEtBQUssT0FBTyxFQUNyQyxNQUFNLENBQUMsRUFBRSxNQUFNLEdBQ2QsVUFBVSxHQUFHLFNBQVMsQ0FnQnhCO0FBRUQsd0JBQWdCLHFCQUFxQixDQUFDLEdBQUcsRUFBRSxHQUFHLE9BVzdDO0FBRUQsd0JBQWdCLFNBQVMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEdBQUcsR0FBRyxDQWUxQztBQTJFRDs7Ozs7R0FLRztBQUNILHdCQUFnQixlQUFlLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBRSxHQUFHLEdBQUUsR0FBZSxHQUFHLGtCQUFrQixDQTREcEY7QUF5QkQsd0JBQWdCLHFCQUFxQixDQUFDLEdBQUcsRUFBRSxHQUFHLHNCQWE3QztBQUVEOzs7R0FHRztBQUNILHdCQUFnQixpQkFBaUIsQ0FBQyxFQUFFLEVBQUUsb0JBQW9CLEdBQUcsRUFBRSxJQUFJLG9CQUFvQixHQUFHO0lBQ3hGLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztJQUN6QixtQkFBbUIsRUFBRSxTQUFTLEdBQUcsRUFBRSxDQUFDO0NBQ3JDLENBT0E7QUFFRDs7R0FFRztBQUNILHdCQUFnQixtQkFBbUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEVBQUUsVUFBVSxFQUFFLE1BQU0sR0FBRyxNQUFNLENBT2hGIn0=
45
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRCxPQUFPLEVBQ0wsS0FBSyxHQUFHLEVBR1IsS0FBSyxpQkFBaUIsRUFFdEIsS0FBSyx3QkFBd0IsRUFDN0IsS0FBSyxvQkFBb0IsRUFDekIsS0FBSyxHQUFHLEVBQ1IsS0FBSyxHQUFHLEVBR1QsTUFBTSxNQUFNLENBQUM7QUFHZCxNQUFNLFdBQVcsT0FBTztJQUN0QixXQUFXLEVBQUUsRUFBRSxDQUFDO0lBQ2hCLFdBQVcsRUFBRSxFQUFFLENBQUM7SUFDaEIsV0FBVyxFQUFFLEdBQUcsQ0FBQztJQUNqQixnQkFBZ0IsRUFBRSxNQUFNLENBQUM7Q0FDMUI7QUFFRCxxQkFBYSxrQkFBbUIsU0FBUSxLQUFLO0lBQzNDLFlBQVksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO0lBRXJCLFlBQVksT0FBTyxFQUFFLE1BQU0sRUFBRSxZQUFZLENBQUMsRUFBRSxHQUFHLEVBQUUsRUFBRSxPQUFPLENBQUMsRUFBRSxZQUFZLEVBSXhFO0NBQ0Y7QUFFRCx3QkFBZ0IsWUFBWSxDQUMxQixLQUFLLENBQUMsSUFBSSxTQUFTLEdBQUcsR0FBRyxTQUFTLE9BQU8sRUFBRSxFQUMzQyxVQUFVLFNBQVMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEVBQzFDLFVBQVUsR0FBRyx3QkFBd0IsQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLENBQUMsRUFFL0UsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUNYLE9BQU8sRUFBRSxHQUFHLEVBQ1osR0FBRyxFQUFFLElBQUksRUFDVCxTQUFTLEVBQUUsVUFBVSxFQUNyQixNQUFNLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxVQUFVLEtBQUssT0FBTyxFQUNyQyxNQUFNLENBQUMsRUFBRSxNQUFNLEdBQ2QsVUFBVSxDQU1aO0FBRUQsd0JBQWdCLGVBQWUsQ0FDN0IsS0FBSyxDQUFDLElBQUksU0FBUyxHQUFHLEdBQUcsU0FBUyxPQUFPLEVBQUUsRUFDM0MsVUFBVSxTQUFTLGlCQUFpQixDQUFDLElBQUksQ0FBQyxFQUMxQyxVQUFVLEdBQUcsd0JBQXdCLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxHQUFHLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxDQUFDLEVBRS9FLElBQUksRUFBRSxHQUFHLEVBQUUsRUFDWCxPQUFPLEVBQUUsR0FBRyxFQUNaLEdBQUcsRUFBRSxJQUFJLEVBQ1QsU0FBUyxFQUFFLFVBQVUsRUFDckIsTUFBTSxDQUFDLEVBQUUsQ0FBQyxHQUFHLEVBQUUsVUFBVSxLQUFLLE9BQU8sRUFDckMsTUFBTSxDQUFDLEVBQUUsTUFBTSxHQUNkLFVBQVUsR0FBRyxTQUFTLENBZ0J4QjtBQUVELHdCQUFnQixxQkFBcUIsQ0FBQyxHQUFHLEVBQUUsR0FBRyxPQVc3QztBQUVELHdCQUFnQixTQUFTLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFHLEdBQUcsQ0FlMUM7QUEyRUQ7Ozs7O0dBS0c7QUFDSCx3QkFBZ0IsZUFBZSxDQUFDLEtBQUssRUFBRSxHQUFHLEVBQUUsR0FBRyxHQUFFLEdBQWUsR0FBRyxrQkFBa0IsQ0FrRXBGO0FBeUJEOzs7OztHQUtHO0FBQ0gsd0JBQWdCLHFCQUFxQixDQUFDLElBQUksRUFBRSxHQUFHLEdBQUcsU0FBUyxFQUFFLEdBQUcsRUFBRSxHQUFHLEdBQUcsTUFBTSxHQUFHLFNBQVMsQ0FVekY7QUFFRCx3QkFBZ0IscUJBQXFCLENBQUMsR0FBRyxFQUFFLEdBQUcsc0JBYTdDO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLGlCQUFpQixDQUFDLEVBQUUsRUFBRSxvQkFBb0IsR0FBRyxFQUFFLElBQUksb0JBQW9CLEdBQUc7SUFDeEYsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDO0lBQ3pCLG1CQUFtQixFQUFFLFNBQVMsR0FBRyxFQUFFLENBQUM7Q0FDckMsQ0FPQTtBQUVEOztHQUVHO0FBQ0gsd0JBQWdCLG1CQUFtQixDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsRUFBRSxVQUFVLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FPaEYifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,GAAG,EAGR,KAAK,iBAAiB,EAEtB,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EACzB,KAAK,GAAG,EACR,KAAK,GAAG,EAGT,MAAM,MAAM,CAAC;AAGd,MAAM,WAAW,OAAO;IACtB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IAErB,YAAY,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,EAIhD;CACF;AAED,wBAAgB,YAAY,CAC1B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,CAMZ;AAED,wBAAgB,eAAe,CAC7B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,GAAG,SAAS,CAgBxB;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,OAW7C;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAe1C;AA2ED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,GAAE,GAAe,GAAG,kBAAkB,CA4DpF;AAyBD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,sBAa7C;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,oBAAoB,GAAG,EAAE,IAAI,oBAAoB,GAAG;IACxF,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,SAAS,GAAG,EAAE,CAAC;CACrC,CAOA;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAOhF"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,GAAG,EAGR,KAAK,iBAAiB,EAEtB,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EACzB,KAAK,GAAG,EACR,KAAK,GAAG,EAGT,MAAM,MAAM,CAAC;AAGd,MAAM,WAAW,OAAO;IACtB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IAErB,YAAY,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE,YAAY,EAIxE;CACF;AAED,wBAAgB,YAAY,CAC1B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,CAMZ;AAED,wBAAgB,eAAe,CAC7B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,GAAG,SAAS,CAgBxB;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,OAW7C;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAe1C;AA2ED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,GAAE,GAAe,GAAG,kBAAkB,CAkEpF;AAyBD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,GAAG,SAAS,EAAE,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS,CAUzF;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,sBAa7C;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,oBAAoB,GAAG,EAAE,IAAI,oBAAoB,GAAG;IACxF,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,SAAS,GAAG,EAAE,CAAC;CACrC,CAOA;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAOhF"}
package/dest/utils.js CHANGED
@@ -3,8 +3,8 @@ import { BaseError, ContractFunctionRevertedError, decodeErrorResult, decodeEven
3
3
  import { formatAbiItem, formatAbiParams } from 'viem/utils';
4
4
  export class FormattedViemError extends Error {
5
5
  metaMessages;
6
- constructor(message, metaMessages){
7
- super(message);
6
+ constructor(message, metaMessages, options){
7
+ super(message, options);
8
8
  this.name = 'FormattedViemError';
9
9
  this.metaMessages = metaMessages;
10
10
  }
@@ -135,6 +135,7 @@ function getNestedErrorData(error) {
135
135
  if (error instanceof FormattedViemError) {
136
136
  return error;
137
137
  }
138
+ const originalError = error;
138
139
  // First try to decode as a custom error using the ABI
139
140
  try {
140
141
  const data = getNestedErrorData(error);
@@ -145,7 +146,9 @@ function getNestedErrorData(error) {
145
146
  data: data
146
147
  });
147
148
  if (decoded) {
148
- return new FormattedViemError(`${decoded.errorName}(${decoded.args?.join(', ') ?? ''})`, error?.metaMessages);
149
+ return new FormattedViemError(`${decoded.errorName}(${decoded.args?.join(', ') ?? ''})`, error?.metaMessages, {
150
+ cause: originalError
151
+ });
149
152
  }
150
153
  }
151
154
  // If it's a BaseError, try to get the custom error through ContractFunctionRevertedError
@@ -157,7 +160,9 @@ function getNestedErrorData(error) {
157
160
  errorName = revertError.signature ?? '';
158
161
  }
159
162
  const args = revertError.metaMessages && revertError.metaMessages?.length > 1 ? revertError.metaMessages[1].trimStart() : '';
160
- return new FormattedViemError(`${errorName}${args}`, error?.metaMessages);
163
+ return new FormattedViemError(`${errorName}${args}`, error?.metaMessages, {
164
+ cause: originalError
165
+ });
161
166
  }
162
167
  }
163
168
  } catch {
@@ -175,9 +180,13 @@ function getNestedErrorData(error) {
175
180
  }
176
181
  // If it's a regular Error instance, return it with its message
177
182
  if (error instanceof Error) {
178
- return new FormattedViemError(truncateErrorMessage(error.message), error?.metaMessages);
183
+ return new FormattedViemError(truncateErrorMessage(error.message), error?.metaMessages, {
184
+ cause: originalError
185
+ });
179
186
  }
180
- return new FormattedViemError(truncateErrorMessage(String(error)));
187
+ return new FormattedViemError(truncateErrorMessage(String(error)), undefined, {
188
+ cause: originalError
189
+ });
181
190
  }
182
191
  function stripAbis(obj) {
183
192
  if (!obj || typeof obj !== 'object') {
@@ -198,6 +207,25 @@ function stripAbis(obj) {
198
207
  }
199
208
  });
200
209
  }
210
+ /**
211
+ * Best-effort decode of a raw revert payload (`0x...`) against an ABI.
212
+ * Returns a human-readable `ErrorName(arg1, arg2, ...)` string, or `undefined` if the selector
213
+ * is unknown or the payload is empty. Use to surface decoded error names alongside the raw
214
+ * payload in log lines for operators.
215
+ */ export function tryDecodeRevertReason(data, abi) {
216
+ if (!data || data === '0x') {
217
+ return undefined;
218
+ }
219
+ try {
220
+ const decoded = decodeErrorResult({
221
+ abi,
222
+ data
223
+ });
224
+ return `${decoded.errorName}(${decoded.args?.join(', ') ?? ''})`;
225
+ } catch {
226
+ return undefined;
227
+ }
228
+ }
201
229
  export function tryGetCustomErrorName(err) {
202
230
  try {
203
231
  // See https://viem.sh/docs/contract/simulateContract#handling-custom-errors
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/ethereum",
3
- "version": "0.0.1-commit.b2a5d0dd1",
3
+ "version": "0.0.1-commit.b3d3157a",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  "./account": "./dest/account.js",
@@ -50,16 +50,16 @@
50
50
  "../package.common.json"
51
51
  ],
52
52
  "dependencies": {
53
- "@aztec/blob-lib": "0.0.1-commit.b2a5d0dd1",
54
- "@aztec/constants": "0.0.1-commit.b2a5d0dd1",
55
- "@aztec/foundation": "0.0.1-commit.b2a5d0dd1",
56
- "@aztec/l1-artifacts": "0.0.1-commit.b2a5d0dd1",
53
+ "@aztec/blob-lib": "0.0.1-commit.b3d3157a",
54
+ "@aztec/constants": "0.0.1-commit.b3d3157a",
55
+ "@aztec/foundation": "0.0.1-commit.b3d3157a",
56
+ "@aztec/l1-artifacts": "0.0.1-commit.b3d3157a",
57
57
  "dotenv": "^16.0.3",
58
58
  "lodash.chunk": "^4.2.0",
59
59
  "lodash.pickby": "^4.5.0",
60
60
  "tslib": "^2.4.0",
61
61
  "viem": "npm:@aztec/viem@2.38.2",
62
- "zod": "^3.23.8"
62
+ "zod": "^4"
63
63
  },
64
64
  "devDependencies": {
65
65
  "@jest/globals": "^30.0.0",
package/src/client.ts CHANGED
@@ -1,9 +1,13 @@
1
1
  import type { Logger } from '@aztec/foundation/log';
2
2
  import { retryUntil } from '@aztec/foundation/retry';
3
+ import { getErrorCause } from '@aztec/foundation/types';
3
4
 
4
5
  import {
5
6
  type Chain,
7
+ type FallbackTransport,
6
8
  type HDAccount,
9
+ HttpRequestError,
10
+ type HttpTransport,
7
11
  type LocalAccount,
8
12
  type PrivateKeyAccount,
9
13
  createPublicClient,
@@ -31,9 +35,43 @@ type Config = {
31
35
 
32
36
  export type { Config as EthereumClientConfig };
33
37
 
38
+ /** Error exposed by L1 RPC transports without including provider URLs in its message. */
39
+ export class L1RpcError extends Error {
40
+ constructor(message: string, options?: ErrorOptions) {
41
+ super(message, options);
42
+ this.name = 'L1RpcError';
43
+ }
44
+ }
45
+
34
46
  /** Creates a viem fallback HTTP transport for the given L1 RPC URLs. */
35
47
  export function makeL1HttpTransport(rpcUrls: string[], opts?: { timeout?: number }) {
36
- return fallback(rpcUrls.map(url => http(url, { batch: false, timeout: opts?.timeout })));
48
+ return wrapL1RpcTransport(fallback(rpcUrls.map(url => http(url, { batch: false, timeout: opts?.timeout }))));
49
+ }
50
+
51
+ /** Returns the HTTP status from an L1 RPC error's cause chain, if one is available. */
52
+ export function getL1RpcHttpStatus(err: unknown): number | undefined {
53
+ return getErrorCause(err, HttpRequestError)?.status;
54
+ }
55
+
56
+ /** Returns true when an L1 RPC error's cause chain contains the given HTTP status. */
57
+ export function isL1RpcHttpStatus(err: unknown, status: number): boolean {
58
+ return getL1RpcHttpStatus(err) === status;
59
+ }
60
+
61
+ function wrapL1RpcTransport(transport: FallbackTransport<HttpTransport[]>): FallbackTransport<HttpTransport[]> {
62
+ const wrappedTransport: FallbackTransport<HttpTransport[]> = parameters => {
63
+ const fallbackTransport = transport(parameters);
64
+ const request: typeof fallbackTransport.request = async args => {
65
+ try {
66
+ return await fallbackTransport.request(args);
67
+ } catch (err) {
68
+ throw err instanceof L1RpcError ? err : new L1RpcError('L1 RPC request failed', { cause: err });
69
+ }
70
+ };
71
+ return { ...fallbackTransport, request };
72
+ };
73
+
74
+ return wrappedTransport;
37
75
  }
38
76
 
39
77
  /**
@@ -1,26 +1,43 @@
1
1
  import { toHex as toPaddedHex } from '@aztec/foundation/bigint-buffer';
2
- import type { CheckpointNumber } from '@aztec/foundation/branded-types';
2
+ import type { CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
3
+ import type { Buffer32 } from '@aztec/foundation/buffer';
4
+ import { merge } from '@aztec/foundation/collection';
3
5
  import type { Fr } from '@aztec/foundation/curves/bn254';
4
6
 
5
7
  import type { StateOverride } from 'viem';
6
8
 
7
9
  import { type FeeHeader, RollupContract } from './rollup.js';
8
10
 
11
+ /**
12
+ * Override values for the pending checkpoint that the simulation should treat as already applied.
13
+ * Every field is optional at plan-building time so callers can populate them incrementally; whatever
14
+ * is present at translation time is forwarded to the partial `tempCheckpointLogs` helper so the
15
+ * load-bearing `slotNumber` can land even if other fields could not be derived locally.
16
+ */
9
17
  export type PendingCheckpointOverrideState = {
10
18
  archive?: Fr;
11
19
  feeHeader?: FeeHeader;
20
+ headerHash?: Fr;
21
+ outHash?: Fr;
22
+ payloadDigest?: Buffer32;
23
+ slotNumber?: SlotNumber;
24
+ };
25
+
26
+ export type ChainTipsOverride = {
27
+ pending?: CheckpointNumber;
28
+ proven?: CheckpointNumber;
12
29
  };
13
30
 
14
31
  /** Describes the simulated L1 rollup state that downstream calls should observe. */
15
32
  export type SimulationOverridesPlan = {
16
- pendingCheckpointNumber?: CheckpointNumber;
33
+ chainTipsOverride?: ChainTipsOverride;
17
34
  pendingCheckpointState?: PendingCheckpointOverrideState;
18
35
  disableBlobCheck?: boolean;
19
36
  };
20
37
 
21
38
  /** Builds a single-checkpoint simulation plan before it is translated into a viem state override. */
22
39
  export class SimulationOverridesBuilder {
23
- private pendingCheckpointNumber?: CheckpointNumber;
40
+ private chainTipsOverride?: ChainTipsOverride;
24
41
  private pendingCheckpointState?: PendingCheckpointOverrideState;
25
42
  private disableBlobCheck = false;
26
43
 
@@ -29,24 +46,34 @@ export class SimulationOverridesBuilder {
29
46
  return new SimulationOverridesBuilder().merge(plan);
30
47
  }
31
48
 
32
- /** Merges another plan into this builder. Later values win. */
49
+ /**
50
+ * Merges another plan into this builder. Later values win on a per-half basis for chain tips,
51
+ * but explicit `undefined` fields in the incoming plan are ignored so they cannot erase a
52
+ * previously-set value.
53
+ */
33
54
  public merge(plan: SimulationOverridesPlan | undefined): this {
34
55
  if (!plan) {
35
56
  return this;
36
57
  }
37
58
 
38
- this.pendingCheckpointNumber = plan.pendingCheckpointNumber;
39
- this.pendingCheckpointState = plan.pendingCheckpointState
40
- ? { ...(this.pendingCheckpointState ?? {}), ...plan.pendingCheckpointState }
41
- : this.pendingCheckpointState;
59
+ if (plan.chainTipsOverride) {
60
+ this.chainTipsOverride = merge(this.chainTipsOverride ?? {}, plan.chainTipsOverride);
61
+ }
62
+ if (plan.pendingCheckpointState) {
63
+ this.pendingCheckpointState = merge(this.pendingCheckpointState ?? {}, plan.pendingCheckpointState);
64
+ }
42
65
  this.disableBlobCheck = this.disableBlobCheck || (plan.disableBlobCheck ?? false);
43
66
 
44
67
  return this;
45
68
  }
46
69
 
47
- /** Sets the checkpoint number that archive and fee header overrides should attach to. */
48
- public forPendingCheckpoint(pendingCheckpointNumber: CheckpointNumber | undefined): this {
49
- this.pendingCheckpointNumber = pendingCheckpointNumber;
70
+ /**
71
+ * Sets the pending and/or proven checkpoint number overrides. Subsequent calls merge into the existing
72
+ * override on a per-half basis, so callers can set pending in one call and proven in another without
73
+ * clobbering each other.
74
+ */
75
+ public withChainTips(override: ChainTipsOverride): this {
76
+ this.chainTipsOverride = { ...(this.chainTipsOverride ?? {}), ...override };
50
77
  return this;
51
78
  }
52
79
 
@@ -64,6 +91,28 @@ export class SimulationOverridesBuilder {
64
91
  return this;
65
92
  }
66
93
 
94
+ /**
95
+ * Overrides one or more `tempCheckpointLogs` cell fields for the configured pending checkpoint.
96
+ * Fields are independent: any subset can be provided. The translator (`makeTempCheckpointLogOverride`)
97
+ * emits a stateDiff entry per field actually set, so unspecified fields stay at their on-chain
98
+ * values.
99
+ *
100
+ * `slotNumber` is load-bearing for `STFLib.canPruneAtTime`: when the simulation overrides `pending`
101
+ * to a checkpoint that has no on-chain `tempCheckpointLogs` entry yet, the missing slotNumber falls
102
+ * back to 0 and the contract treats the pending tip as belonging to epoch 0, triggering a phantom
103
+ * prune that silently undoes the `pending` override.
104
+ */
105
+ public withPendingTempCheckpointLogFields(fields: {
106
+ headerHash?: Fr;
107
+ outHash?: Fr;
108
+ payloadDigest?: Buffer32;
109
+ slotNumber?: SlotNumber;
110
+ }): this {
111
+ this.assertPendingCheckpointNumber();
112
+ this.pendingCheckpointState = { ...(this.pendingCheckpointState ?? {}), ...fields };
113
+ return this;
114
+ }
115
+
67
116
  /** Disables blob checking for simulations that cannot provide DA inputs. */
68
117
  public withoutBlobCheck(): this {
69
118
  this.disableBlobCheck = true;
@@ -72,20 +121,20 @@ export class SimulationOverridesBuilder {
72
121
 
73
122
  /** Builds the final plan, or `undefined` when no overrides were configured. */
74
123
  public build(): SimulationOverridesPlan | undefined {
75
- if (!this.pendingCheckpointState && this.pendingCheckpointNumber === undefined && !this.disableBlobCheck) {
124
+ if (!this.pendingCheckpointState && !this.chainTipsOverride && !this.disableBlobCheck) {
76
125
  return undefined;
77
126
  }
78
127
 
79
128
  return {
80
- pendingCheckpointNumber: this.pendingCheckpointNumber,
129
+ chainTipsOverride: this.chainTipsOverride,
81
130
  pendingCheckpointState: this.pendingCheckpointState,
82
131
  disableBlobCheck: this.disableBlobCheck || undefined,
83
132
  };
84
133
  }
85
134
 
86
135
  private assertPendingCheckpointNumber(): void {
87
- if (this.pendingCheckpointNumber === undefined) {
88
- throw new Error('pendingCheckpointNumber must be set before attaching archive or fee header overrides');
136
+ if (this.chainTipsOverride?.pending === undefined) {
137
+ throw new Error('withChainTips({ pending }) must be called before attaching archive or fee header overrides');
89
138
  }
90
139
  }
91
140
  }
@@ -101,28 +150,32 @@ export async function buildSimulationOverridesStateOverride(
101
150
 
102
151
  const rollupStateDiff: NonNullable<StateOverride[number]['stateDiff']> = [];
103
152
 
104
- if (plan.pendingCheckpointNumber !== undefined) {
105
- rollupStateDiff.push(
106
- ...extractRollupStateDiff(await rollup.makePendingCheckpointNumberOverride(plan.pendingCheckpointNumber)),
107
- );
153
+ if (plan.chainTipsOverride) {
154
+ rollupStateDiff.push(...extractRollupStateDiff(await rollup.makeChainTipsOverride(plan.chainTipsOverride)));
108
155
  }
109
156
 
110
- if (plan.pendingCheckpointState && plan.pendingCheckpointNumber === undefined) {
111
- throw new Error('pendingCheckpointState requires pendingCheckpointNumber to be set');
157
+ if (plan.pendingCheckpointState && plan.chainTipsOverride?.pending === undefined) {
158
+ throw new Error('pendingCheckpointState requires chainTipsOverride.pending to be set');
112
159
  }
113
160
 
114
161
  if (plan.pendingCheckpointState?.archive) {
115
162
  rollupStateDiff.push(
116
163
  ...extractRollupStateDiff(
117
- rollup.makeArchiveOverride(plan.pendingCheckpointNumber!, plan.pendingCheckpointState.archive),
164
+ rollup.makeArchiveOverride(plan.chainTipsOverride!.pending!, plan.pendingCheckpointState.archive),
118
165
  ),
119
166
  );
120
167
  }
121
168
 
122
- if (plan.pendingCheckpointState?.feeHeader) {
169
+ if (plan.pendingCheckpointState) {
123
170
  rollupStateDiff.push(
124
171
  ...extractRollupStateDiff(
125
- await rollup.makeFeeHeaderOverride(plan.pendingCheckpointNumber!, plan.pendingCheckpointState.feeHeader),
172
+ await rollup.makeTempCheckpointLogOverride(plan.chainTipsOverride!.pending!, {
173
+ headerHash: plan.pendingCheckpointState.headerHash,
174
+ outHash: plan.pendingCheckpointState.outHash,
175
+ payloadDigest: plan.pendingCheckpointState.payloadDigest,
176
+ slotNumber: plan.pendingCheckpointState.slotNumber,
177
+ feeHeader: plan.pendingCheckpointState.feeHeader,
178
+ }),
126
179
  ),
127
180
  );
128
181
  }
@@ -22,8 +22,6 @@ export interface IEmpireBase {
22
22
  signerAddress: Hex,
23
23
  signer: (msg: TypedDataDefinition) => Promise<Hex>,
24
24
  ): Promise<L1TxRequest>;
25
- /** Checks if a payload was ever submitted to governance via submitRoundWinner. */
26
- hasPayloadBeenProposed(payload: Hex, fromBlock: bigint): Promise<boolean>;
27
25
  }
28
26
 
29
27
  export function encodeSignal(payload: Hex): Hex {
@@ -63,28 +63,33 @@ export class FeeAssetPriceOracle {
63
63
  *
64
64
  * Returns 0 if not on mainnet or if the oracle query fails.
65
65
  *
66
+ * @param currentPriceE12 - Optional override for the parent checkpoint's eth-per-fee-asset
67
+ * (E12 scale). When omitted, the latest published value is read from L1. Pipelined
68
+ * proposers should supply the predicted parent value so the modifier they emit aligns
69
+ * with the parent fee header L1 will see when the previous pipelined checkpoint lands.
66
70
  * @returns The price modifier in basis points (positive to increase price, negative to decrease)
67
71
  */
68
- async computePriceModifier(): Promise<bigint> {
72
+ async computePriceModifier(currentPriceE12?: bigint): Promise<bigint> {
69
73
  const uniswapOracle = await this.getUniswapOracle();
70
74
  if (!uniswapOracle) {
71
75
  return 0n;
72
76
  }
73
77
 
74
78
  try {
75
- // Get current on-chain price (ETH per fee asset, E12)
76
- const currentPriceE12 = await this.rollupContract.getEthPerFeeAsset();
79
+ // Get current on-chain price (ETH per fee asset, E12), preferring the caller-supplied value.
80
+ const resolvedCurrentPriceE12 = currentPriceE12 ?? (await this.rollupContract.getEthPerFeeAsset());
77
81
 
78
82
  // Get oracle price (median of last N blocks, ETH per fee asset, E12)
79
83
  const oraclePriceE12 = await uniswapOracle.getMeanEthPerFeeAssetE12();
80
84
 
81
85
  // Compute modifier in basis points
82
- const modifier = this.computePriceModifierBps(currentPriceE12, oraclePriceE12);
86
+ const modifier = this.computePriceModifierBps(resolvedCurrentPriceE12, oraclePriceE12);
83
87
 
84
88
  this.log.debug('Computed price modifier', {
85
- currentPriceE12: currentPriceE12.toString(),
89
+ currentPriceE12: resolvedCurrentPriceE12.toString(),
86
90
  oraclePriceE12: oraclePriceE12.toString(),
87
91
  modifierBps: modifier.toString(),
92
+ currentPriceFromCaller: currentPriceE12 !== undefined,
88
93
  });
89
94
 
90
95
  return modifier;