temp

Author: RafalMagrys

src/Client.sol

@@ -15,6 +15,7 @@ import {VerifRegAPI} from "filecoin-solidity/v0.8/VerifRegAPI.sol";
 import {UtilsHandlers} from "filecoin-solidity/v0.8/utils/UtilsHandlers.sol";
 import {MinerUtils} from "./libs/MinerUtils.sol";
 import {BeneficiaryFactory} from "./BeneficiaryFactory.sol";
+import {MinerTypes} from "filecoin-solidity/v0.8/types/MinerTypes.sol";
 
 /**
  * @title Client
@@ -140,9 +141,17 @@ contract Client is Initializable, AccessControlUpgradeable, UUPSUpgradeable {
      */
     error InvalidBeneficiary(address beneficiary, address expectedBeneficiary);
 
+    /**
+     * @notice Thrown if beneficiary expiration is insufficient
+     */
+    error InsufficientBeneficiaryExpiration(
+        CommonTypes.FilActorId provider, int64 beneficiaryExpiration, int128 requiredExpiration
+    );
+
     struct ProviderAllocation {
         CommonTypes.FilActorId provider;
         uint64 size;
+        int128 allocationTime;
     }
 
     struct ProviderClaim {
@@ -231,9 +240,13 @@ contract Client is Initializable, AccessControlUpgradeable, UUPSUpgradeable {
         if (failed) revert InvalidAmount();
         uint256 datacapAmount = tokenAmount / TOKEN_PRECISION;
 
-        (ProviderAllocation[] memory allocations, ProviderClaim[] memory claimExtensions) =
-            _deserializeVerifregOperatorData(params.operator_data);
+        (
+            ProviderAllocation[] memory allocations,
+            ProviderClaim[] memory claimExtensions,
+            ProviderAllocation memory longestAllocation
+        ) = _deserializeVerifregOperatorData(params.operator_data);
 
+        _verifyBeneficiaryExpiration(longestAllocation);
         _verifyAndRegisterAllocations(allocations);
         _verifyAndRegisterClaimExtensions(claimExtensions);
         emit DatacapSpent(msg.sender, datacapAmount);
@@ -328,24 +341,51 @@ contract Client is Initializable, AccessControlUpgradeable, UUPSUpgradeable {
         }
     }
 
+    /**
+     * @notice Verifies that the beneficiary expiration is sufficient for the longest allocation.
+     * @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
+            );
+        }
+    }
+
     // solhint-disable function-max-lines
     /**
      * @notice Deserialize Verifreg Operator Data.
      * @param cborData The cbor encoded operator data.
      * @return allocations Array of provider allocations.
      * @return claimExtensions Array of provider claims.
+     * @return longestAllocation Allocation with the longest term.
      */
     function _deserializeVerifregOperatorData(bytes memory cborData)
         internal
         pure
-        returns (ProviderAllocation[] memory allocations, ProviderClaim[] memory claimExtensions)
+        returns (
+            ProviderAllocation[] memory allocations,
+            ProviderClaim[] memory claimExtensions,
+            ProviderAllocation memory longestAllocation
+        )
     {
         uint256 operatorDataLength;
         uint256 allocationRequestsLength;
         uint256 claimExtensionRequestsLength;
         uint64 provider;
         uint64 claimId;
         uint64 size;
+        int64 termMax;
+        int64 expiration;
         uint256 byteIdx = 0;
 
         (operatorDataLength, byteIdx) = CBORDecoder.readFixedArray(cborData, byteIdx);
@@ -366,12 +406,17 @@ 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
-            (, byteIdx) = CBORDecoder.readInt64(cborData, byteIdx); // termMax
-            (, byteIdx) = CBORDecoder.readInt64(cborData, byteIdx); // expiration
+            (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);
+
+            if (allocations[i].allocationTime > longestAllocation.allocationTime) {
+                longestAllocation = allocations[i];
+            }
         }
 
         (claimExtensionRequestsLength, byteIdx) = CBORDecoder.readFixedArray(cborData, byteIdx);

test/Client.t.sol

@@ -292,6 +292,7 @@ contract ClientTest is Test {
 
     function testClaimExtensionNonExistent() public {
         // 0 success_count
+        resolveAddress.setId(uint64(20000));
         actorIdMock.setGetClaimsResult(hex"8282008080");
         transferParams.operator_data = hex"82808183194E20011A005034AC";
         vm.prank(clientAddress);
@@ -303,6 +304,7 @@ contract ClientTest is Test {
         // params taken directly from `boost extend-deal` message
         // no allocations
         // 1 extension for provider 20000 and claim id 1
+        resolveAddress.setId(uint64(20000));
         vm.prank(allocator);
         client.increaseAllowance(clientAddress, SP2, 4096);
         transferParams.operator_data = hex"82808183194E20011A005034AC";