feat: cleanup deposits

src/Fees.sol

@@ -4,11 +4,8 @@ pragma solidity ^0.8.20;
 /// @title PDPFees
 /// @notice A library for calculating fees for the PDP.
 library PDPFees {
-    uint256 constant ATTO_FIL = 1;
-    uint256 constant FIL_TO_ATTO_FIL = 1e18 * ATTO_FIL;
-
-    // 0.1 FIL
-    uint256 constant SYBIL_FEE = FIL_TO_ATTO_FIL / 10;
+    // 0.1 FIL cleanup bond held per data set, returned to whoever finalizes cleanup
+    uint256 constant CLEANUP_DEPOSIT = 0.1 ether;
 
     // Default FIL-based proof fee: 0.00023 FIL per TiB (used for initialization)
     // Based on: 0.00067 USD per TiB / 2.88 USD per FIL = 0.00023 FIL per TiB
@@ -29,9 +26,8 @@ library PDPFees {
         return (feePerTiB * rawSize) >> 40;
     }
 
-    // sybil fee adds cost to adding state to the pdp verifier contract to prevent
-    // wasteful state growth. 0.1 FIL
-    function sybilFee() internal pure returns (uint256) {
-        return SYBIL_FEE;
+    // cleanup deposit is held per data set and paid out to whoever completes cleanup. 0.1 FIL
+    function cleanupDeposit() internal pure returns (uint256) {
+        return CLEANUP_DEPOSIT;
     }
 }

src/PDPVerifierLayout.json

@@ -1,6 +1,6 @@
 [
   {
-    "label": "challengeFinality",
+    "label": "deprecatedChallengeFinality",
     "offset": 0,
     "slot": "0",
     "type": {
@@ -409,5 +409,45 @@
       ],
       "numberOfBytes": "32"
     }
+  },
+  {
+    "label": "cleanupDeposit",
+    "offset": 0,
+    "slot": "17",
+    "type": {
+      "encoding": "mapping",
+      "key": {
+        "encoding": "inplace",
+        "label": "uint256",
+        "numberOfBytes": "32"
+      },
+      "label": "mapping(uint256 => uint256)",
+      "numberOfBytes": "32",
+      "value": {
+        "encoding": "inplace",
+        "label": "uint256",
+        "numberOfBytes": "32"
+      }
+    }
+  },
+  {
+    "label": "cleanupModeEpoch",
+    "offset": 0,
+    "slot": "18",
+    "type": {
+      "encoding": "mapping",
+      "key": {
+        "encoding": "inplace",
+        "label": "uint256",
+        "numberOfBytes": "32"
+      },
+      "label": "mapping(uint256 => uint256)",
+      "numberOfBytes": "32",
+      "value": {
+        "encoding": "inplace",
+        "label": "uint256",
+        "numberOfBytes": "32"
+      }
+    }
   }
 ]

src/PDPVerifierLayout.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.20;
 // This file is a generated binding and any changes will be lost.
 // Generated with tools/generate_storage_layout.sh
 
-bytes32 constant CHALLENGE_FINALITY_SLOT = bytes32(uint256(0));
+bytes32 constant DEPRECATED_CHALLENGE_FINALITY_SLOT = bytes32(uint256(0));
 bytes32 constant NEXT_DATA_SET_ID_SLOT = bytes32(uint256(1));
 bytes32 constant PIECE_CIDS_SLOT = bytes32(uint256(2));
 bytes32 constant PIECE_LEAF_COUNTS_SLOT = bytes32(uint256(3));
@@ -22,3 +22,5 @@ bytes32 constant DATA_SET_PROPOSED_STORAGE_PROVIDER_SLOT = bytes32(uint256(13));
 bytes32 constant DATA_SET_LAST_PROVEN_EPOCH_SLOT = bytes32(uint256(14));
 bytes32 constant FEE_STATUS_SLOT = bytes32(uint256(15));
 bytes32 constant NEXT_UPGRADE_SLOT = bytes32(uint256(16));
+bytes32 constant CLEANUP_DEPOSIT_SLOT = bytes32(uint256(17));
+bytes32 constant CLEANUP_MODE_EPOCH_SLOT = bytes32(uint256(18));

src/interfaces/IPDPVerifier.sol

@@ -30,6 +30,7 @@ interface IPDPVerifier is IPDPEvents {
     function claimDataSetStorageProvider(uint256 setId, bytes calldata extraData) external;
     function createDataSet(address listenerAddr, bytes calldata extraData) external payable returns (uint256);
     function deleteDataSet(uint256 setId, bytes calldata extraData) external;
+    function cleanupPieces(uint256 setId, uint256 maxPieces) external returns (bool done);
     function addPieces(uint256 setId, address listenerAddr, Cids.Cid[] calldata pieceData, bytes calldata extraData)
         external
         payable
@@ -45,9 +46,6 @@ interface IPDPVerifier is IPDPEvents {
     // Fee view: returns the current effective fee per TiB
     function feePerTiB() external view returns (uint96);
 
-    // USDFC sybil fee amount
-    function USDFC_SYBIL_FEE() external view returns (uint256);
-
-    // FIL sybil fee amount
-    function FIL_SYBIL_FEE() external pure returns (uint256);
+    // FIL cleanup deposit amount held per data set
+    function FIL_CLEANUP_DEPOSIT() external pure returns (uint256);
 }