feat(contracts): static + snapshotted validator set

l1-contracts/bootstrap.sh

@@ -106,6 +106,7 @@ function inspect {
     done
 }
 
+
 function gas_report {
   check=${1:-"no"}
   echo_header "l1-contracts gas report"

l1-contracts/gas_benchmark.md

@@ -1,62 +1,34 @@
-| src/core/Rollup.sol:Rollup Contract |                 |          |          |          |         |
+| src/core/Rollup.sol:Rollup contract |                 |          |          |          |         |
+|-------------------------------------|-----------------|----------|----------|----------|---------|
 | Deployment Cost                     | Deployment Size |          |          |          |         |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| 13939212                            | 72687           |          |          |          |         |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-|                                     |                 |          |          |          |         |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| Function Name                       | Min             | Avg      | Median   | Max      | # Calls |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| cheat__InitialiseValidatorSet       | 13825170        | 13825170 | 13825170 | 13825170 | 1       |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| getBlock                            | 2028            | 2028     | 2028     | 2028     | 12      |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| getBurnAddress                      | 543             | 543      | 543      | 543      | 1       |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| getCurrentEpoch                     | 1662            | 1662     | 1662     | 1662     | 397     |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| getCurrentProposer                  | 142276          | 147339   | 142555   | 304940   | 200     |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| getCurrentSlot                      | 1308            | 1318     | 1308     | 5308     | 397     |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| getEpochCommittee                   | 147323          | 152191   | 147335   | 309356   | 100     |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| getEpochForBlock                    | 1776            | 1776     | 1776     | 1776     | 196     |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| getFeeAssetPortal                   | 881             | 881      | 881      | 881      | 1       |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| getFeeHeader                        | 2890            | 2890     | 2890     | 2890     | 95      |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| getManaBaseFeeAt                    | 33313           | 53419    | 54478    | 55593    | 195     |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| getPendingBlockNumber               | 666             | 670      | 666      | 2666     | 401     |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| getProvenBlockNumber                | 644             | 644      | 644      | 644      | 3       |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| getTimestampForSlot                 | 1599            | 1599     | 1599     | 1599     | 195     |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| getVersion                          | 648             | 668      | 648      | 2648     | 100     |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| setProvingCostPerMana               | 26257           | 26284    | 26257    | 29057    | 101     |
-|-------------------------------------+-----------------+----------+----------+----------+---------|
-| submitEpochRootProof                | 1189968         | 1200782  | 1189992  | 1222388  | 3       |
-| src/core/messagebridge/Inbox.sol:Inbox Contract |                 |     |        |     |         |
+| 8905012                             | 44009           |          |          |          |         |
+| Function Name                       | min             | avg      | median   | max      | # calls |
+| cheat__InitialiseValidatorSet       | 14773538        | 14773538 | 14773538 | 14773538 | 1       |
+| getBlock                            | 1252            | 1252     | 1252     | 1252     | 12      |
+| getBurnAddress                      | 280             | 280      | 280      | 280      | 1       |
+| getCurrentEpoch                     | 870             | 870      | 870      | 870      | 490     |
+| getCurrentProposer                  | 137000          | 164906   | 137000   | 1532365  | 200     |
+| getCurrentSlot                      | 625             | 629      | 625      | 2625     | 490     |
+| getEpochCommittee                   | 138682          | 138682   | 138682   | 138682   | 100     |
+| getEpochForBlock                    | 1087            | 1087     | 1087     | 1087     | 196     |
+| getFeeAssetPortal                   | 541             | 541      | 541      | 541      | 1       |
+| getFeeHeader                        | 1479            | 1479     | 1479     | 1479     | 95      |
+| getManaBaseFeeAt                    | 15466           | 20025    | 20350    | 24662    | 195     |
+| getPendingBlockNumber               | 398             | 402      | 398      | 2398     | 494     |
+| getProvenBlockNumber                | 512             | 512      | 512      | 512      | 3       |
+| getTimestampForSlot                 | 824             | 824      | 824      | 824      | 195     |
+| getVersion                          | 404             | 424      | 404      | 2404     | 100     |
+| setProvingCostPerMana               | 25937           | 25964    | 25937    | 28737    | 101     |
+| submitEpochRootProof                | 783299          | 796011   | 783311   | 821423   | 3       |
+| src/core/messagebridge/Inbox.sol:Inbox contract |                 |     |        |     |         |
+|-------------------------------------------------|-----------------|-----|--------|-----|---------|
 | Deployment Cost                                 | Deployment Size |     |        |     |         |
-|-------------------------------------------------+-----------------+-----+--------+-----+---------|
-| 0                                               | 12636           |     |        |     |         |
-|-------------------------------------------------+-----------------+-----+--------+-----+---------|
-|                                                 |                 |     |        |     |         |
-|-------------------------------------------------+-----------------+-----+--------+-----+---------|
-| Function Name                                   | Min             | Avg | Median | Max | # Calls |
-|-------------------------------------------------+-----------------+-----+--------+-----+---------|
-| getFeeAssetPortal                               | 402             | 402 | 402    | 402 | 1       |
-| src/periphery/Forwarder.sol:Forwarder Contract |                 |        |        |         |         |
-| Deployment Cost                                | Deployment Size |        |        |         |         |
-|------------------------------------------------+-----------------+--------+--------+---------+---------|
-| 583246                                         | 2909            |        |        |         |         |
-|------------------------------------------------+-----------------+--------+--------+---------+---------|
-|                                                |                 |        |        |         |         |
-|------------------------------------------------+-----------------+--------+--------+---------+---------|
-| Function Name                                  | Min             | Avg    | Median | Max     | # Calls |
-|------------------------------------------------+-----------------+--------+--------+---------+---------|
-| forward                                        | 758446          | 831897 | 792800 | 2103821 | 100     |
+| 0                                               | 0               |     |        |     |         |
+| Function Name                                   | min             | avg | median | max | # calls |
+| getFeeAssetPortal                               | 234             | 234 | 234    | 234 | 1       |
+| src/periphery/Forwarder.sol:Forwarder contract |                 |        |        |        |         |
+|------------------------------------------------|-----------------|--------|--------|--------|---------|
+| Deployment Cost                                | Deployment Size |        |        |        |         |
+| 358690                                         | 1553            |        |        |        |         |
+| Function Name                                  | min             | avg    | median | max    | # calls |
+| forward                                        | 624506          | 630841 | 629469 | 640840 | 100     |

l1-contracts/src/core/Rollup.sol

@@ -15,18 +15,17 @@ import {
   FeeHeader,
   RollupConfigInput
 } from "@aztec/core/interfaces/IRollup.sol";
-import {
-  IStaking,
-  ValidatorInfo,
-  Exit,
-  OperatorInfo,
-  EnumerableSet
-} from "@aztec/core/interfaces/IStaking.sol";
+import {IStaking, ValidatorInfo, Exit, OperatorInfo} from "@aztec/core/interfaces/IStaking.sol";
 import {IValidatorSelection} from "@aztec/core/interfaces/IValidatorSelection.sol";
 import {
   FeeLib, FeeHeaderLib, FeeAssetValue, PriceLib
 } from "@aztec/core/libraries/rollup/FeeLib.sol";
 import {HeaderLib} from "@aztec/core/libraries/rollup/HeaderLib.sol";
+import {
+  AddressSnapshotLib,
+  SnapshottedAddressSet
+} from "@aztec/core/libraries/staking/AddressSnapshotLib.sol";
+
 import {EpochProofLib} from "./libraries/rollup/EpochProofLib.sol";
 import {ProposeLib, ValidateHeaderArgs} from "./libraries/rollup/ProposeLib.sol";
 import {ValidatorSelectionLib} from "./libraries/validator-selection/ValidatorSelectionLib.sol";
@@ -59,7 +58,7 @@ import {
  *         about the state of the rollup and test it.
  */
 contract Rollup is IStaking, IValidatorSelection, IRollup, RollupCore {
-  using EnumerableSet for EnumerableSet.AddressSet;
+  using AddressSnapshotLib for SnapshottedAddressSet;
 
   using TimeLib for Timestamp;
   using TimeLib for Slot;

l1-contracts/src/core/RollupCore.sol

@@ -176,7 +176,6 @@ contract RollupCore is
     external
     override(IStakingCore)
   {
-    setupEpoch();
     StakingLib.deposit(_attester, _proposer, _withdrawer, _amount);
   }
 
@@ -185,7 +184,6 @@ contract RollupCore is
     override(IStakingCore)
     returns (bool)
   {
-    setupEpoch();
     return StakingLib.initiateWithdraw(_attester, _recipient);
   }
 

l1-contracts/src/core/interfaces/IStaking.sol

@@ -2,9 +2,9 @@
 // Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.27;
 
+import {SnapshottedAddressSet} from "@aztec/core/libraries/staking/AddressSnapshotLib.sol";
 import {Timestamp} from "@aztec/core/libraries/TimeMath.sol";
 import {IERC20} from "@oz/token/ERC20/IERC20.sol";
-import {EnumerableSet} from "@oz/utils/structs/EnumerableSet.sol";
 
 // None -> Does not exist in our setup
 // Validating -> Participating as validator
@@ -40,7 +40,7 @@ struct StakingStorage {
   address slasher;
   uint256 minimumStake;
   Timestamp exitDelay;
-  EnumerableSet.AddressSet attesters;
+  SnapshottedAddressSet attesters;
   mapping(address attester => ValidatorInfo) info;
   mapping(address attester => Exit) exits;
 }

l1-contracts/src/core/interfaces/IValidatorSelection.sol

@@ -11,6 +11,7 @@ import {Timestamp, Slot, Epoch} from "@aztec/core/libraries/TimeLib.sol";
  * @param nextSeed - The seed used to influence the NEXT epoch
  */
 struct EpochData {
+  // TODO: remove in favor of commitment to comittee
   address[] committee;
   uint256 sampleSeed;
   uint256 nextSeed;

l1-contracts/src/core/libraries/Errors.sol

@@ -134,4 +134,7 @@ library Errors {
 
   // FeeLib
   error FeeLib__InvalidFeeAssetPriceModifier(); // 0xf2fb32ad
+
+  // AddressSnapshotLib
+  error AddressSnapshotLib__IndexOutOfBounds(uint256 index, uint256 size); // 0xd789b71a
 }

l1-contracts/src/core/libraries/TimeLib.sol

@@ -5,20 +5,24 @@ pragma solidity >=0.8.27;
 // solhint-disable-next-line no-unused-import
 import {Timestamp, Slot, Epoch, SlotLib, EpochLib} from "@aztec/core/libraries/TimeMath.sol";
 
+import {SafeCast} from "@oz/utils/math/SafeCast.sol";
+
 struct TimeStorage {
-  uint256 genesisTime;
-  uint256 slotDuration; // Number of seconds in a slot
-  uint256 epochDuration; // Number of slots in an epoch
+  uint128 genesisTime;
+  uint32 slotDuration; // Number of seconds in a slot
+  uint32 epochDuration; // Number of slots in an epoch
 }
 
 library TimeLib {
+  using SafeCast for uint256;
+
   bytes32 private constant TIME_STORAGE_POSITION = keccak256("aztec.time.storage");
 
   function initialize(uint256 _genesisTime, uint256 _slotDuration, uint256 _epochDuration) internal {
     TimeStorage storage store = getStorage();
-    store.genesisTime = _genesisTime;
-    store.slotDuration = _slotDuration;
-    store.epochDuration = _epochDuration;
+    store.genesisTime = _genesisTime.toUint128();
+    store.slotDuration = _slotDuration.toUint32();
+    store.epochDuration = _epochDuration.toUint32();
   }
 
   function toTimestamp(Slot _a) internal view returns (Timestamp) {
@@ -45,6 +49,7 @@ library TimeLib {
 
   function epochFromTimestamp(Timestamp _a) internal view returns (Epoch) {
     TimeStorage storage store = getStorage();
+
     return Epoch.wrap(
       (Timestamp.unwrap(_a) - store.genesisTime) / (store.epochDuration * store.slotDuration)
     );