Restrict _sinceTime to uint64 and add assertion for checkpointExists

Author: kanewallmann

contracts/contract/megapool/RocketMegapoolDelegate.sol

@@ -507,8 +507,9 @@ contract RocketMegapoolDelegate is RocketMegapoolDelegateBase, RocketMegapoolDel
         if (lastDistributionTime == 0) return (_amount, 0, 0, 0);
         // Calculate split based on capital ratio and average commission since last distribute
         RocketNetworkRevenuesInterface rocketNetworkRevenues = RocketNetworkRevenuesInterface(getContractAddress("rocketNetworkRevenues"));
-        (, uint256 voterShare, uint256 protocolDAOShare, uint256 rethShare) = rocketNetworkRevenues.calculateSplit(lastDistributionTime);
-        uint256 averageCapitalRatio = rocketNetworkRevenues.getNodeAverageCapitalRatioSince(nodeAddress, lastDistributionTime);
+        uint64 lastDistributionTime64 = uint64(lastDistributionTime);
+        (, uint256 voterShare, uint256 protocolDAOShare, uint256 rethShare) = rocketNetworkRevenues.calculateSplit(lastDistributionTime64);
+        uint256 averageCapitalRatio = rocketNetworkRevenues.getNodeAverageCapitalRatioSince(nodeAddress, lastDistributionTime64);
         // Sanity check input values
         require(averageCapitalRatio >= calcBase, "Invalid average capital ratio");
         require(voterShare + protocolDAOShare + rethShare <= calcBase, "Invalid shares");

contracts/contract/megapool/RocketMegapoolPenalties.sol

@@ -137,7 +137,7 @@ contract RocketMegapoolPenalties is RocketBase, RocketMegapoolPenaltiesInterface
         if (block.timestamp > penaltyMaximumPeriod) {
             earlierTime = block.timestamp - penaltyMaximumPeriod;
         }
-        uint256 earlierRunningTotal = rocketNetworkSnapshotsTime.lookup(penaltyKey, uint32(earlierTime));
+        uint256 earlierRunningTotal = rocketNetworkSnapshotsTime.lookup(penaltyKey, uint64(earlierTime));
         // Get current running total
         (,, uint192 currentRunningTotal) = rocketNetworkSnapshotsTime.latest(penaltyKey);
         // Prevent the running penalty total from exceeding the maximum amount

contracts/contract/network/RocketNetworkRevenues.sol

@@ -105,7 +105,7 @@ contract RocketNetworkRevenues is RocketBase, RocketNetworkRevenuesInterface {
 
     /// @notice Calculates the time-weighted average revenue split values between the supplied timestamp and now
     /// @param _sinceTime The starting block timestamp for the calculation
-    function calculateSplit(uint256 _sinceTime) external override view returns (uint256 nodeShare, uint256 voterShare, uint256 protocolDAOShare, uint256 rethShare) {
+    function calculateSplit(uint64 _sinceTime) external override view returns (uint256 nodeShare, uint256 voterShare, uint256 protocolDAOShare, uint256 rethShare) {
         RocketNetworkSnapshotsTimeInterface rocketNetworkSnapshotsTime = RocketNetworkSnapshotsTimeInterface(getContractAddress("rocketNetworkSnapshotsTime"));
         if (_sinceTime == block.timestamp) {
             nodeShare = _getCurrentShare(rocketNetworkSnapshotsTime, nodeShareKey, true);
@@ -150,7 +150,7 @@ contract RocketNetworkRevenues is RocketBase, RocketNetworkRevenuesInterface {
     /// @notice Returns the average capital ratio of the given node operator since a given block
     /// @param _nodeAddress Address of the node operator to query the value for
     /// @param _sinceTime The timestamp to calculate the average since
-    function getNodeAverageCapitalRatioSince(address _nodeAddress, uint256 _sinceTime) external override view returns (uint256) {
+    function getNodeAverageCapitalRatioSince(address _nodeAddress, uint64 _sinceTime) external override view returns (uint256) {
         RocketNetworkSnapshotsTimeInterface rocketNetworkSnapshotsTime = RocketNetworkSnapshotsTimeInterface(getContractAddress("rocketNetworkSnapshotsTime"));
         bytes32 key = keccak256(abi.encodePacked("node.capital.ratio", _nodeAddress));
         if (_sinceTime == block.timestamp) {
@@ -162,7 +162,7 @@ contract RocketNetworkRevenues is RocketBase, RocketNetworkRevenuesInterface {
     }
 
     /// @notice Calculates the time-weighted average since a given block
-    function _getAverageSince(RocketNetworkSnapshotsTimeInterface _rocketNetworkSnapshotsTime, uint256 _sinceTime, bytes32 _key, bool _mustExist) internal view returns (uint256) {
+    function _getAverageSince(RocketNetworkSnapshotsTimeInterface _rocketNetworkSnapshotsTime, uint64 _sinceTime, bytes32 _key, bool _mustExist) internal view returns (uint256) {
         (bool checkpointExists, uint64 checkpointTime, uint192 checkpointValue) = _rocketNetworkSnapshotsTime.latest(_key);
         require(!_mustExist || checkpointExists, "Snapshot does not exist");
         if (!checkpointExists) return 0;
@@ -178,6 +178,7 @@ contract RocketNetworkRevenues is RocketBase, RocketNetworkRevenuesInterface {
         uint256 currentAccum = uint256(checkpointValue) + (valueAtTime * durationSinceCheckpoint);
         // Calculate the accumulator at _sinceTime
         (checkpointExists, checkpointTime, checkpointValue) = _rocketNetworkSnapshotsTime.lookupCheckpoint(_key, uint64(_sinceTime));
+        require(!_mustExist || checkpointExists, "Snapshot does not exist");
         valueKey = bytes32(uint256(_key) + checkpointTime);
         valueAtTime = getUint(valueKey);
         durationSinceCheckpoint = (_sinceTime - checkpointTime);

contracts/interface/network/RocketNetworkRevenuesInterface.sol

@@ -9,8 +9,8 @@ interface RocketNetworkRevenuesInterface {
     function setNodeShare(uint256 _newShare) external;
     function setVoterShare(uint256 _newShare) external;
     function setProtocolDAOShare(uint256 _newShare) external;
-    function calculateSplit(uint256 _sinceBlock) external view returns (uint256 nodeShare, uint256 voterShare, uint256 protocolDAOShare, uint256 rethShare);
+    function calculateSplit(uint64 _sinceTime) external view returns (uint256 nodeShare, uint256 voterShare, uint256 protocolDAOShare, uint256 rethShare);
     function setNodeCapitalRatio(address _nodeAddress, uint256 _value) external;
     function getNodeCapitalRatio(address _nodeAddress) external view returns (uint256);
-    function getNodeAverageCapitalRatioSince(address _nodeAddress, uint256 _sinceBlock) external view returns (uint256);
+    function getNodeAverageCapitalRatioSince(address _nodeAddress, uint64 _sinceTime) external view returns (uint256);
 }