Update Oracle Storage Layout

src/PufferOracleV2.sol

@@ -3,7 +3,7 @@
 
 import { IGuardianModule } from "puffer/interface/IGuardianModule.sol";
 import { IPufferOracleV2 } from "puffer/interface/IPufferOracleV2.sol";
 import { IPufferOracle } from "pufETH/interface/IPufferOracle.sol";
 import { AccessManaged } from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
 
 /**
@@ -31,22 +31,22 @@
      * @dev Number of active Puffer validators
      * Slot 0
      */
-    uint64 internal _numberOfActivePufferValidators;
+    uint256 internal _numberOfActivePufferValidators;
 
     /**
      * @dev Total number of Validators
-     * Slot 0
+     * Slot 1
      */
-    uint64 internal _totalNumberOfValidators;
+    uint256 internal _totalNumberOfValidators;
     /**
      * @dev Epoch number of the update
-     * Slot 0
+     * Slot 2
      */
-    uint64 internal _epochNumber;
+    uint256 internal _epochNumber;
 
     /**
      * @dev Price in wei to mint one Validator Ticket
-     * Slot 1
+     * Slot 3
      */
     uint256 internal _validatorTicketPrice;
 
@@ -65,7 +65,7 @@
      * @dev Restricted to PufferProtocol contract
      */
     function exitValidators(uint256 numberOfExits) public restricted {
-        _numberOfActivePufferValidators -= uint64(numberOfExits);
+        _numberOfActivePufferValidators -= numberOfExits;
         emit NumberOfActiveValidators(_numberOfActivePufferValidators);
     }
 
@@ -105,8 +105,8 @@
         }
         GUARDIAN_MODULE.validateTotalNumberOfValidators(newTotalNumberOfValidators, epochNumber, guardianEOASignatures);
         emit TotalNumberOfValidatorsUpdated(_totalNumberOfValidators, newTotalNumberOfValidators, epochNumber);
-        _totalNumberOfValidators = uint64(newTotalNumberOfValidators);
-        _epochNumber = uint64(epochNumber);
+        _totalNumberOfValidators = newTotalNumberOfValidators;
+        _epochNumber = epochNumber;
     }
 
     /**
@@ -137,6 +137,13 @@
         return _validatorTicketPrice;
     }
 
+    /**
+     * @inheritdoc IPufferOracleV2
+     */
+    function getNumberOfActiveValidators() external view returns (uint256) {
+        return _numberOfActivePufferValidators;
+    }
+
     function _setMintPrice(uint256 newPrice) internal {
         emit ValidatorTicketMintPriceUpdated(_validatorTicketPrice, newPrice);
         _validatorTicketPrice = newPrice;

src/interface/IPufferOracleV2.sol

@@ -31,6 +31,11 @@ interface IPufferOracleV2 is IPufferOracle {
      */
     function getTotalNumberOfValidators() external view returns (uint256);
 
+    /**
+     * @notice Returns the number of active puffer validators on Ethereum
+     */
+    function getNumberOfActiveValidators() external view returns (uint256);
+
     /**
      * @notice Exits `validatorNumber` validators, decreasing the `lockedETHAmount` by validatorNumber * 32 ETH.
      * It is called when when the validator exits the system in the `batchHandleWithdrawals` on the PufferProtocol.