fix

Author: Maddiaa0

l1-contracts/gas_benchmark.md

@@ -1,15 +1,15 @@
 | src/core/Rollup.sol:Rollup contract |                 |          |          |          |         |
 |-------------------------------------|-----------------|----------|----------|----------|---------|
 | Deployment Cost                     | Deployment Size |          |          |          |         |
-| 8134336                             | 39726           |          |          |          |         |
+| 8154934                             | 39929           |          |          |          |         |
 | Function Name                       | min             | avg      | median   | max      | # calls |
-| cheat__InitialiseValidatorSet       | 15870313        | 15870313 | 15870313 | 15870313 | 1       |
+| cheat__InitialiseValidatorSet       | 15884661        | 15884661 | 15884661 | 15884661 | 1       |
 | getBlock                            | 1230            | 1230     | 1230     | 1230     | 12      |
 | getBurnAddress                      | 369             | 369      | 369      | 369      | 1       |
 | getCurrentEpoch                     | 979             | 979      | 979      | 979      | 397     |
-| getCurrentProposer                  | 135981          | 143439   | 136210   | 379571   | 200     |
+| getCurrentProposer                  | 135981          | 143548   | 136210   | 383219   | 200     |
 | getCurrentSlot                      | 735             | 740      | 735      | 2735     | 397     |
-| getEpochCommittee                   | 135880          | 143181   | 135892   | 379027   | 100     |
+| getEpochCommittee                   | 135880          | 143291   | 135892   | 382675   | 100     |
 | getEpochForBlock                    | 1065            | 1065     | 1065     | 1065     | 196     |
 | getFeeHeader                        | 1457            | 1457     | 1457     | 1457     | 95      |
 | getManaBaseFeeAt                    | 20381           | 26792    | 27121    | 32242    | 195     |
@@ -23,4 +23,4 @@
 | Deployment Cost                                | Deployment Size |        |        |         |         |
 | 358690                                         | 1553            |        |        |         |         |
 | Function Name                                  | min             | avg    | median | max     | # calls |
-| forward                                        | 630841          | 685327 | 641834 | 2054339 | 100     |
+| forward                                        | 630841          | 685437 | 641834 | 2057987 | 100     |

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 {
   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 = uint128(_genesisTime);
-    store.slotDuration = uint32(_slotDuration);
-    store.epochDuration = uint32(_epochDuration);
+    store.genesisTime = _genesisTime.toUint128();
+    store.slotDuration = _slotDuration.toUint32();
+    store.epochDuration = _epochDuration.toUint32();
   }
 
   function toTimestamp(Slot _a) internal view returns (Timestamp) {

l1-contracts/src/core/libraries/staking/AddressSnapshotLib.sol

@@ -4,6 +4,7 @@ pragma solidity >=0.8.27;
 
 import {Errors} from "@aztec/core/libraries/Errors.sol";
 import {Timestamp, Epoch, TimeLib} from "@aztec/core/libraries/TimeLib.sol";
+import {SafeCast} from "@oz/utils/math/SafeCast.sol";
 
 /**
  * @notice Structure to store a set of addresses with their historical snapshots
@@ -35,6 +36,8 @@ struct AddressSnapshot {
  *      and allows querying the state of addresses at any point in time
  */
 library AddressSnapshotLib {
+  using SafeCast for uint256;
+
   /**
    * @notice Bit mask used to indicate presence of a validator in the set
    */
@@ -61,7 +64,7 @@ library AddressSnapshotLib {
 
     _self.validatorToIndex[_validator] = indexWithBit;
     _self.checkpoints[index].push(
-      AddressSnapshot({addr: _validator, epochNumber: uint96(Epoch.unwrap(_epochNumber))})
+      AddressSnapshot({addr: _validator, epochNumber: Epoch.unwrap(_epochNumber).toUint96()})
     );
     _self.size += 1;
     return true;
@@ -83,20 +86,19 @@ library AddressSnapshotLib {
     AddressSnapshot memory lastSnapshot = _self.checkpoints[lastIndex][lastSnapshotLength - 1];
 
     address lastValidator = lastSnapshot.addr;
-    uint256 newLocationWithMask = _index | PRESENCE_BIT;
-
-    _self.validatorToIndex[lastValidator] = newLocationWithMask; // Remove the last validator from the index
+    uint256 newLocation = _index | PRESENCE_BIT;
 
     // If we are removing the last item, we cannot swap it with anything
     // so we append a new address of zero for this epoch
+    // And since we are removing it, we set the location to 0
     if (lastIndex == _index) {
       lastSnapshot.addr = address(0);
-
-      // TODO: reuse value above, only insert once
-      _self.validatorToIndex[lastValidator] = 0;
+      newLocation = 0;
     }
 
-    lastSnapshot.epochNumber = uint96(epochNow);
+    _self.validatorToIndex[lastValidator] = 0;
+
+    lastSnapshot.epochNumber = epochNow.toUint96();
     // Check if there's already a checkpoint for this index in the current epoch
     uint256 checkpointCount = _self.checkpoints[_index].length;
     if (
@@ -164,7 +166,7 @@ library AddressSnapshotLib {
     Epoch _epoch
   ) internal view returns (address) {
     uint256 numCheckpoints = _self.checkpoints[_index].length;
-    uint96 epoch = uint96(Epoch.unwrap(_epoch));
+    uint96 epoch = Epoch.unwrap(_epoch).toUint96();
 
     if (numCheckpoints == 0) {
       return address(0);