feat: SPRegistry minDealDurationDays maxDealDurationDays (#40)

CodeWarriorr · web-flow · commit a0bef72ff80b · 2026-03-31T13:57:04.000+02:00
* feat(SPRegistry): add deal duration limits - interface, storage, setter, mock

* fix(SPRegistry): add upper-bound validation and missing revert test for duration limits

- Add MAX_DEAL_DURATION_DAYS constant (mirrors PoRepMarket, prevents silent misconfiguration)
- Add DurationExceedsProtocolMax error
- Validate min/max duration against protocol max in setDealDurationLimits and registerProviderFor
- Add testSetDealDurationLimitsRevertsUnregistered (W2 coverage gap)
- Add boundary acceptance/rejection tests for protocol max
- Regenerate ABI

* fix(SPRegistry): move MAX_DEAL_DURATION_DAYS to PoRepTypes and fix guard order

- add MAX_DEAL_DURATION_DAYS constant to PoRepTypes library (single source of truth)
- PoRepMarket and SPRegistry re-export from PoRepTypes (ABIs unchanged)
- reorder duration validation: DurationExceedsProtocolMax before MinDurationExceedsMax
- add guard-order tests confirming correct error precedence on combined-invalid inputs

* refactor(SPRegistry): extract duration validation into _ensureDurationLimitsValid
diff --git a/abis/SPRegistry.json b/abis/SPRegistry.json
@@ -30,6 +30,19 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "MAX_DEAL_DURATION_DAYS",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint32",
+        "internalType": "uint32"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "MAX_PROVIDERS",
@@ -313,6 +326,16 @@
             "name": "pricePerSectorPerMonth",
             "type": "uint256",
             "internalType": "uint256"
+          },
+          {
+            "name": "minDealDurationDays",
+            "type": "uint32",
+            "internalType": "uint32"
+          },
+          {
+            "name": "maxDealDurationDays",
+            "type": "uint32",
+            "internalType": "uint32"
           }
         ]
       }
@@ -575,6 +598,16 @@
         "name": "payee",
         "type": "address",
         "internalType": "address"
+      },
+      {
+        "name": "minDealDurationDays",
+        "type": "uint32",
+        "internalType": "uint32"
+      },
+      {
+        "name": "maxDealDurationDays",
+        "type": "uint32",
+        "internalType": "uint32"
       }
     ],
     "outputs": [],
@@ -692,6 +725,29 @@
     "outputs": [],
     "stateMutability": "nonpayable"
   },
+  {
+    "type": "function",
+    "name": "setDealDurationLimits",
+    "inputs": [
+      {
+        "name": "provider",
+        "type": "uint64",
+        "internalType": "CommonTypes.FilActorId"
+      },
+      {
+        "name": "minDealDurationDays",
+        "type": "uint32",
+        "internalType": "uint32"
+      },
+      {
+        "name": "maxDealDurationDays",
+        "type": "uint32",
+        "internalType": "uint32"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "nonpayable"
+  },
   {
     "type": "function",
     "name": "setPayee",
@@ -920,6 +976,31 @@
     ],
     "anonymous": false
   },
+  {
+    "type": "event",
+    "name": "DealDurationLimitsUpdated",
+    "inputs": [
+      {
+        "name": "provider",
+        "type": "uint64",
+        "indexed": true,
+        "internalType": "CommonTypes.FilActorId"
+      },
+      {
+        "name": "minDealDurationDays",
+        "type": "uint32",
+        "indexed": false,
+        "internalType": "uint32"
+      },
+      {
+        "name": "maxDealDurationDays",
+        "type": "uint32",
+        "indexed": false,
+        "internalType": "uint32"
+      }
+    ],
+    "anonymous": false
+  },
   {
     "type": "event",
     "name": "Initialized",
@@ -1317,6 +1398,22 @@
       }
     ]
   },
+  {
+    "type": "error",
+    "name": "DurationExceedsProtocolMax",
+    "inputs": [
+      {
+        "name": "durationDays",
+        "type": "uint32",
+        "internalType": "uint32"
+      },
+      {
+        "name": "maxDays",
+        "type": "uint32",
+        "internalType": "uint32"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "ERC1967InvalidImplementation",
@@ -1438,6 +1535,22 @@
       }
     ]
   },
+  {
+    "type": "error",
+    "name": "MinDurationExceedsMax",
+    "inputs": [
+      {
+        "name": "minDays",
+        "type": "uint32",
+        "internalType": "uint32"
+      },
+      {
+        "name": "maxDays",
+        "type": "uint32",
+        "internalType": "uint32"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "NotAdminOrOperator",
diff --git a/src/PoRepMarket.sol b/src/PoRepMarket.sol
@@ -27,13 +27,10 @@ contract PoRepMarket is IPoRepMarket, Initializable, AccessControlUpgradeable, U
     bytes32 public constant UPGRADER_ROLE = keccak256("UPGRADER_ROLE");
 
     /**
-     * @notice Maximum Filecoin storage deal duration: 1278 days (~3.5 years),
-     * per FIP-0052 (NV21 actor policy update).
-     * References:
-     * https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0052.md
-     * https://github.com/filecoin-project/core-devs/blob/master/Network%20Upgrades/v21.md
+     * @notice Maximum deal duration in days. See PoRepTypes.MAX_DEAL_DURATION_DAYS.
+     * @dev Any provider limit above this is unreachable: PoRepMarket rejects deals with durationDays > 1278.
      */
-    uint32 public constant MAX_DEAL_DURATION_DAYS = 1278;
+    uint32 public constant MAX_DEAL_DURATION_DAYS = PoRepTypes.MAX_DEAL_DURATION_DAYS;
 
     /// @custom:storage-location erc7201:porepmarket.storage.DealProposalsStorage
     struct DealProposalsStorage {
diff --git a/src/SPRegistry.sol b/src/SPRegistry.sol
@@ -10,6 +10,7 @@ import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet
 import {CommonTypes} from "filecoin-solidity/v0.8/types/CommonTypes.sol";
 import {ISPRegistry} from "./interfaces/ISPRegistry.sol";
 import {SLITypes} from "./types/SLITypes.sol";
+import {PoRepTypes} from "./types/PoRepTypes.sol";
 import {MinerUtils} from "./lib/MinerUtils.sol";
 
 /**
@@ -45,6 +46,13 @@ contract SPRegistry is Initializable, AccessControlUpgradeable, UUPSUpgradeable,
      */
     uint256 public constant MAX_PROVIDERS = 500;
 
+    /**
+     * @notice Maximum deal duration in days, sourced from PoRepTypes.MAX_DEAL_DURATION_DAYS.
+     * @dev Any provider limit above this is unreachable: PoRepMarket rejects deals with durationDays > 1278.
+     */
+    uint32 public constant MAX_DEAL_DURATION_DAYS = PoRepTypes.MAX_DEAL_DURATION_DAYS;
+
+    // solhint-disable-next-line gas-struct-packing
     struct ProviderData {
         address organization;
         address payee;
@@ -55,6 +63,8 @@ contract SPRegistry is Initializable, AccessControlUpgradeable, UUPSUpgradeable,
         uint256 committedBytes;
         uint256 pendingBytes;
         uint256 pricePerSectorPerMonth;
+        uint32 minDealDurationDays;
+        uint32 maxDealDurationDays;
     }
 
     /// @custom:storage-location erc7201:porepmarket.storage.SPRegistryStorage
@@ -185,6 +195,17 @@ contract SPRegistry is Initializable, AccessControlUpgradeable, UUPSUpgradeable,
      */
     event PayeeUpdated(CommonTypes.FilActorId indexed provider, address indexed oldPayee, address indexed newPayee);
 
+    /**
+     * @notice DealDurationLimitsUpdated event
+     * @dev DealDurationLimitsUpdated event is emitted when a provider's deal duration limits change
+     * @param provider The provider actor ID
+     * @param minDealDurationDays The minimum deal duration in days (0 = no minimum)
+     * @param maxDealDurationDays The maximum deal duration in days (0 = no maximum)
+     */
+    event DealDurationLimitsUpdated(
+        CommonTypes.FilActorId indexed provider, uint32 minDealDurationDays, uint32 maxDealDurationDays
+    );
+
     /**
      * @notice Error indicating that a provider is already registered
      * @dev 0xf91794e7
@@ -300,6 +321,8 @@ contract SPRegistry is Initializable, AccessControlUpgradeable, UUPSUpgradeable,
     error AvailableBelowCommittedPlusPending(
         CommonTypes.FilActorId provider, uint256 availableBytes, uint256 committedBytes, uint256 pendingBytes
     );
+    error MinDurationExceedsMax(uint32 minDays, uint32 maxDays);
+    error DurationExceedsProtocolMax(uint32 durationDays, uint32 maxDays);
 
     /**
      * @notice Constructor
@@ -459,7 +482,9 @@ contract SPRegistry is Initializable, AccessControlUpgradeable, UUPSUpgradeable,
             availableBytes: p.availableBytes,
             committedBytes: p.committedBytes,
             pendingBytes: p.pendingBytes,
-            pricePerSectorPerMonth: p.pricePerSectorPerMonth
+            pricePerSectorPerMonth: p.pricePerSectorPerMonth,
+            minDealDurationDays: p.minDealDurationDays,
+            maxDealDurationDays: p.maxDealDurationDays
         });
     }
 
@@ -511,6 +536,9 @@ contract SPRegistry is Initializable, AccessControlUpgradeable, UUPSUpgradeable,
 
             if (!_meetsRequirements(p.capabilities, requirements)) continue;
 
+            if (p.minDealDurationDays != 0 && terms.durationDays < p.minDealDurationDays) continue;
+            if (p.maxDealDurationDays != 0 && terms.durationDays > p.maxDealDurationDays) continue;
+
             if (p.pendingBytes < lowestPending) {
                 lowestPending = p.pendingBytes;
                 bestProvider = CommonTypes.FilActorId.wrap(id);
@@ -619,19 +647,24 @@ contract SPRegistry is Initializable, AccessControlUpgradeable, UUPSUpgradeable,
      * @param availableBytes The provider's available storage capacity
      * @param pricePerSectorPerMonth The provider's auto-approve price per sector per month (0 to skip)
      * @param payee The payment recipient address (address(0) defaults to organization)
+     * @param minDealDurationDays Minimum deal duration in days (0 = no minimum)
+     * @param maxDealDurationDays Maximum deal duration in days (0 = no maximum)
      */
     function registerProviderFor(
         CommonTypes.FilActorId provider,
         address organization,
         SLITypes.SLIThresholds calldata capabilities,
         uint256 availableBytes,
         uint256 pricePerSectorPerMonth,
-        address payee
+        address payee,
+        uint32 minDealDurationDays,
+        uint32 maxDealDurationDays
     ) external {
         _onlyAdminOrOperator();
         if (organization == address(0)) revert InvalidOrganizationAddress();
         if (capabilities.retrievabilityBps > 10_000) revert InvalidRetrievabilityBps(capabilities.retrievabilityBps);
         if (capabilities.indexingPct > 100) revert InvalidIndexingPct(capabilities.indexingPct);
+        _ensureDurationLimitsValid(minDealDurationDays, maxDealDurationDays);
 
         _registerProvider(provider, organization, payee);
 
@@ -640,10 +673,13 @@ contract SPRegistry is Initializable, AccessControlUpgradeable, UUPSUpgradeable,
         $._providers[id].capabilities = capabilities;
         $._providers[id].availableBytes = availableBytes;
         $._providers[id].pricePerSectorPerMonth = pricePerSectorPerMonth;
+        $._providers[id].minDealDurationDays = minDealDurationDays;
+        $._providers[id].maxDealDurationDays = maxDealDurationDays;
 
         emit CapabilitiesUpdated(provider, capabilities);
         emit AvailableSpaceUpdated(provider, availableBytes);
         emit PriceUpdated(provider, 0, pricePerSectorPerMonth);
+        emit DealDurationLimitsUpdated(provider, minDealDurationDays, maxDealDurationDays);
     }
 
     /// @inheritdoc ISPRegistry
@@ -667,6 +703,25 @@ contract SPRegistry is Initializable, AccessControlUpgradeable, UUPSUpgradeable,
         emit PayeeUpdated(provider, oldPayee, payee);
     }
 
+    /// @inheritdoc ISPRegistry
+    function setDealDurationLimits(
+        CommonTypes.FilActorId provider,
+        uint32 minDealDurationDays,
+        uint32 maxDealDurationDays
+    ) external {
+        _ensureProviderRegistered(provider);
+        _ensureProviderNotBlocked(provider);
+        _onlyProviderControllerOrAdmin(provider);
+        _ensureDurationLimitsValid(minDealDurationDays, maxDealDurationDays);
+
+        SPRegistryStorage storage $ = _getSPRegistryStorage();
+        uint64 id = CommonTypes.FilActorId.unwrap(provider);
+        $._providers[id].minDealDurationDays = minDealDurationDays;
+        $._providers[id].maxDealDurationDays = maxDealDurationDays;
+
+        emit DealDurationLimitsUpdated(provider, minDealDurationDays, maxDealDurationDays);
+    }
+
     /// @inheritdoc ISPRegistry
     function getPayee(CommonTypes.FilActorId provider) external view returns (address) {
         SPRegistryStorage storage $ = _getSPRegistryStorage();
@@ -729,6 +784,23 @@ contract SPRegistry is Initializable, AccessControlUpgradeable, UUPSUpgradeable,
         }
     }
 
+    /**
+     * @notice Ensures deal duration limits are within the protocol maximum and internally consistent
+     * @param minDealDurationDays The minimum deal duration to validate
+     * @param maxDealDurationDays The maximum deal duration to validate
+     */
+    function _ensureDurationLimitsValid(uint32 minDealDurationDays, uint32 maxDealDurationDays) internal pure {
+        if (minDealDurationDays > MAX_DEAL_DURATION_DAYS) {
+            revert DurationExceedsProtocolMax(minDealDurationDays, MAX_DEAL_DURATION_DAYS);
+        }
+        if (maxDealDurationDays != 0 && maxDealDurationDays > MAX_DEAL_DURATION_DAYS) {
+            revert DurationExceedsProtocolMax(maxDealDurationDays, MAX_DEAL_DURATION_DAYS);
+        }
+        if (minDealDurationDays != 0 && maxDealDurationDays != 0 && minDealDurationDays > maxDealDurationDays) {
+            revert MinDurationExceedsMax(minDealDurationDays, maxDealDurationDays);
+        }
+    }
+
     /**
      * @notice Ensures a provider is not blocked
      * @param provider The provider actor ID to check
diff --git a/src/interfaces/ISPRegistry.sol b/src/interfaces/ISPRegistry.sol
@@ -9,6 +9,7 @@ import {SLITypes} from "../types/SLITypes.sol";
  * @notice Interface for storage provider registration, matching, and capacity management
  */
 interface ISPRegistry {
+    // solhint-disable-next-line gas-struct-packing
     struct ProviderInfo {
         address organization;
         address payee;
@@ -20,6 +21,8 @@ interface ISPRegistry {
         uint256 pendingBytes;
         /// @notice Monthly ERC20 token price per 32 GiB sector in smallest units (0 = manual approval)
         uint256 pricePerSectorPerMonth;
+        uint32 minDealDurationDays;
+        uint32 maxDealDurationDays;
     }
 
     /**
@@ -157,6 +160,18 @@ interface ISPRegistry {
      */
     function setPayee(CommonTypes.FilActorId provider, address payee) external;
 
+    /**
+     * @notice Set the acceptable deal duration range for a provider
+     * @param provider The provider to update
+     * @param minDealDurationDays Minimum deal duration in days (0 = no minimum)
+     * @param maxDealDurationDays Maximum deal duration in days (0 = no maximum)
+     */
+    function setDealDurationLimits(
+        CommonTypes.FilActorId provider,
+        uint32 minDealDurationDays,
+        uint32 maxDealDurationDays
+    ) external;
+
     /**
      * @notice Get the payment recipient address for a provider
      * @param provider The provider actor ID
diff --git a/src/types/PoRepTypes.sol b/src/types/PoRepTypes.sol
@@ -10,6 +10,15 @@ import {SLITypes} from "./SLITypes.sol";
  * @notice Shared types for PoRepMarket deal proposals and states
  */
 library PoRepTypes {
+    /**
+     * @notice Maximum Filecoin storage deal duration: 1278 days (~3.5 years),
+     * per FIP-0052 (NV21 actor policy update).
+     * References:
+     * https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0052.md
+     * https://github.com/filecoin-project/core-devs/blob/master/Network%20Upgrades/v21.md
+     */
+    uint32 internal constant MAX_DEAL_DURATION_DAYS = 1278;
+
     /**
      * @notice DealState enum
      * @dev Represents the various states a deal can be
diff --git a/test/SPRegistry.t.sol b/test/SPRegistry.t.sol
diff --git a/test/contracts/SPRegistryMock.sol b/test/contracts/SPRegistryMock.sol
