feature

Author: RafalMagrys

src/Client.sol

@@ -145,18 +145,24 @@ contract Client is Initializable, AccessControlUpgradeable, UUPSUpgradeable {
      * @notice Thrown if beneficiary expiration is insufficient
      */
     error InsufficientBeneficiaryExpiration(
-        CommonTypes.FilActorId provider, int64 beneficiaryExpiration, int128 requiredExpiration
+        CommonTypes.FilActorId provider, int64 beneficiaryExpiration, int64 requiredExpiration
     );
 
+    /**
+     * @notice Thrown if no allocation or claim is found
+     */
+    error NoAllocationOrClaim();
+
     struct ProviderAllocation {
         CommonTypes.FilActorId provider;
         uint64 size;
-        int128 allocationTime;
+        int64 allocationTime;
     }
 
     struct ProviderClaim {
         CommonTypes.FilActorId provider;
         CommonTypes.FilActorId claim;
+        int64 termMax;
     }
 
     struct ClientDataUsage {
@@ -243,10 +249,11 @@ contract Client is Initializable, AccessControlUpgradeable, UUPSUpgradeable {
         (
             ProviderAllocation[] memory allocations,
             ProviderClaim[] memory claimExtensions,
-            ProviderAllocation memory longestAllocation
+            ProviderAllocation memory longestAllocation,
+            ProviderClaim memory longestClaimExtension
         ) = _deserializeVerifregOperatorData(params.operator_data);
 
-        _verifyBeneficiaryExpiration(longestAllocation);
+        _verifyBeneficiaryExpiration(longestAllocation, longestClaimExtension);
         _verifyAndRegisterAllocations(allocations);
         _verifyAndRegisterClaimExtensions(claimExtensions);
         emit DatacapSpent(msg.sender, datacapAmount);
@@ -346,19 +353,42 @@ contract Client is Initializable, AccessControlUpgradeable, UUPSUpgradeable {
      * @param longestAllocation The longest allocation.
      * @dev Reverts with InsufficientBeneficiaryExpiration if the beneficiary expiration is insufficient.
      */
-    function _verifyBeneficiaryExpiration(ProviderAllocation memory longestAllocation) internal {
-        MinerTypes.GetBeneficiaryReturn memory beneficiary =
-            MinerUtils.getBeneficiaryWithChecks(longestAllocation.provider, beneficiaryFactory, true, true, true);
-        if (
-            longestAllocation.allocationTime
-                > int128(CommonTypes.ChainEpoch.unwrap(beneficiary.active.term.expiration) + 180 days)
-        ) {
-            revert InsufficientBeneficiaryExpiration(
-                longestAllocation.provider,
-                CommonTypes.ChainEpoch.unwrap(beneficiary.active.term.expiration),
-                longestAllocation.allocationTime
+    function _verifyBeneficiaryExpiration(
+        ProviderAllocation memory longestAllocation,
+        ProviderClaim memory longestClaimExtension
+    ) internal {
+        MinerTypes.GetBeneficiaryReturn memory beneficiary;
+        int64 beneficiaryExpiration;
+
+        if (longestClaimExtension.termMax != 0) {
+            beneficiary = MinerUtils.getBeneficiaryWithChecks(
+                longestClaimExtension.provider, beneficiaryFactory, true, true, true
             );
+            int64 beneficiaryExpiration = CommonTypes.ChainEpoch.unwrap(beneficiary.active.term.expiration);
+
+            if (int64(longestClaimExtension.termMax) > beneficiaryExpiration + 250 weeks) {
+                revert InsufficientBeneficiaryExpiration(
+                    longestClaimExtension.provider, beneficiaryExpiration, longestClaimExtension.termMax
+                );
+            }
+            return;
+        }
+
+        if (longestAllocation.allocationTime != 0) {
+            beneficiary =
+                MinerUtils.getBeneficiaryWithChecks(longestAllocation.provider, beneficiaryFactory, true, true, true);
+            beneficiaryExpiration = CommonTypes.ChainEpoch.unwrap(beneficiary.active.term.expiration);
+
+            if (int64(longestAllocation.allocationTime) > beneficiaryExpiration + 180 days) {
+                revert InsufficientBeneficiaryExpiration(
+                    longestAllocation.provider, beneficiaryExpiration, longestAllocation.allocationTime
+                );
+            }
+
+            return;
         }
+
+        revert NoAllocationOrClaim();
     }
 
     // solhint-disable function-max-lines
@@ -368,14 +398,16 @@ contract Client is Initializable, AccessControlUpgradeable, UUPSUpgradeable {
      * @return allocations Array of provider allocations.
      * @return claimExtensions Array of provider claims.
      * @return longestAllocation Allocation with the longest term.
+     * @return longestClaimExtension Claim extension with the longest term.
      */
     function _deserializeVerifregOperatorData(bytes memory cborData)
         internal
         pure
         returns (
             ProviderAllocation[] memory allocations,
             ProviderClaim[] memory claimExtensions,
-            ProviderAllocation memory longestAllocation
+            ProviderAllocation memory longestAllocation,
+            ProviderClaim memory longestClaimExtension
         )
     {
         uint256 operatorDataLength;
@@ -406,13 +438,13 @@ contract Client is Initializable, AccessControlUpgradeable, UUPSUpgradeable {
             (, byteIdx) = CBORDecoder.readBytes(cborData, byteIdx); // data (CID)
             (size, byteIdx) = CBORDecoder.readUInt64(cborData, byteIdx);
             (, byteIdx) = CBORDecoder.readInt64(cborData, byteIdx); // termMin
+            // slither-disable-end unused-return
             (termMax, byteIdx) = CBORDecoder.readInt64(cborData, byteIdx);
             (expiration, byteIdx) = CBORDecoder.readInt64(cborData, byteIdx);
-            // slither-disable-end unused-return
 
             allocations[i].provider = CommonTypes.FilActorId.wrap(provider);
             allocations[i].size = size;
-            allocations[i].allocationTime = int128(termMax + expiration);
+            allocations[i].allocationTime = termMax + expiration;
 
             if (allocations[i].allocationTime > longestAllocation.allocationTime) {
                 longestAllocation = allocations[i];
@@ -431,12 +463,15 @@ contract Client is Initializable, AccessControlUpgradeable, UUPSUpgradeable {
 
             (provider, byteIdx) = CBORDecoder.readUInt64(cborData, byteIdx);
             (claimId, byteIdx) = CBORDecoder.readUInt64(cborData, byteIdx);
-            // slither-disable-start unused-return
-            (, byteIdx) = CBORDecoder.readInt64(cborData, byteIdx); // termMax
-            // slither-disable-end unused-return
+            (termMax, byteIdx) = CBORDecoder.readInt64(cborData, byteIdx);
 
             claimExtensions[i].provider = CommonTypes.FilActorId.wrap(provider);
             claimExtensions[i].claim = CommonTypes.FilActorId.wrap(claimId);
+            claimExtensions[i].termMax = termMax;
+
+            if (termMax > longestClaimExtension.termMax) {
+                longestClaimExtension = claimExtensions[i];
+            }
         }
     }