feat: Allow deletion of terminated dataset, Add getDataSetStatus

This PR allows providers to terminate a dataset that has been terminated
without further approval from the client.
After the rail period elapses, the provider can call PDP.deleteDataSet

It also adds a `getDataSetStatus(dataSetId)` which returns an enum with the following
states:
 - NotFound - dataset either didn't exist, or was terminated
 - Active - dataset and rails are active
 - Terminating - dataset is in pthe rocess of being terminated

The logic of `getDataSetStatus` can easily be reproduced on the client side
using `getDataSet`:
- if `pdpRailId == 0` then `NotFound
- if `pdpEndEpoch != 0` then `Terminating`
- else `Active`

Signed-off-by: Jakub Sztandera <[email protected]>

Author: Kubuxu

service_contracts/abi/FilecoinWarmStorageService.abi.json

@@ -159,7 +159,7 @@
         "internalType": "uint256"
       },
       {
-        "name": "extraData",
+        "name": "",
         "type": "bytes",
         "internalType": "bytes"
       }

service_contracts/abi/FilecoinWarmStorageServiceStateLibrary.abi.json

@@ -434,6 +434,30 @@
     ],
     "stateMutability": "pure"
   },
+  {
+    "type": "function",
+    "name": "getDataSetStatus",
+    "inputs": [
+      {
+        "name": "service",
+        "type": "FilecoinWarmStorageService",
+        "internalType": "contract FilecoinWarmStorageService"
+      },
+      {
+        "name": "dataSetId",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "status",
+        "type": "FilecoinWarmStorageService.DataSetStatus",
+        "internalType": "enum FilecoinWarmStorageService.DataSetStatus"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "getMaxProvingPeriod",

service_contracts/abi/FilecoinWarmStorageServiceStateView.abi.json

@@ -387,6 +387,25 @@
     ],
     "stateMutability": "pure"
   },
+  {
+    "type": "function",
+    "name": "getDataSetStatus",
+    "inputs": [
+      {
+        "name": "dataSetId",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "status",
+        "type": "uint8",
+        "internalType": "enum FilecoinWarmStorageService.DataSetStatus"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "getMaxProvingPeriod",

service_contracts/src/FilecoinWarmStorageService.sol

@@ -126,6 +126,15 @@ contract FilecoinWarmStorageService is
         uint256 dataSetId; // DataSet ID
     }
 
+    enum DataSetStatus {
+        // Data set doesn't yet exist or has been deleted
+        NotFound,
+        // Data set is active
+        Active,
+        // Data set is in the process of being terminated
+        Terminating
+    }
+
     // Decode structure for data set creation extra data
     struct DataSetCreateData {
         address payer;
@@ -611,27 +620,22 @@ contract FilecoinWarmStorageService is
     }
 
     /**
-     * @notice Handles data set deletion and terminates the payment rail
+     * @notice Handles data set deletion after the payment rails were terminated
      * @dev Called by the PDPVerifier contract when a data set is deleted
      * @param dataSetId The ID of the data set being deleted
-     * @param extraData Signature for authentication
      */
     function dataSetDeleted(
         uint256 dataSetId,
         uint256, // deletedLeafCount, - not used
-        bytes calldata extraData
+        bytes calldata // extraData, - not used
     ) external onlyPDPVerifier {
         // Verify the data set exists in our mapping
         DataSetInfo storage info = dataSetInfo[dataSetId];
         require(info.pdpRailId != 0, Errors.DataSetNotRegistered(dataSetId));
-        (bytes memory signature) = abi.decode(extraData, (bytes));
 
         // Get the payer address for this data set
         address payer = dataSetInfo[dataSetId].payer;
 
-        // Verify the client's signature
-        verifyDeleteDataSetSignature(payer, info.clientDataSetId, signature);
-
         // Check if the data set's payment rails have finalized
         require(
             info.pdpEndEpoch != 0 && block.number > info.pdpEndEpoch,

service_contracts/src/FilecoinWarmStorageServiceStateView.sol

@@ -90,6 +90,14 @@ contract FilecoinWarmStorageServiceStateView is IPDPProvingSchedule {
         return FilecoinWarmStorageServiceStateInternalLibrary.getDataSetSizeInBytes(leafCount);
     }
 
+    function getDataSetStatus(uint256 dataSetId)
+        external
+        view
+        returns (FilecoinWarmStorageService.DataSetStatus status)
+    {
+        return service.getDataSetStatus(dataSetId);
+    }
+
     function getMaxProvingPeriod() external view returns (uint64) {
         return service.getMaxProvingPeriod();
     }

service_contracts/src/lib/FilecoinWarmStorageServiceStateInternalLibrary.sol

@@ -112,6 +112,21 @@ library FilecoinWarmStorageServiceStateInternalLibrary {
         info.dataSetId = dataSetId;
     }
 
+    function getDataSetStatus(FilecoinWarmStorageService service, uint256 dataSetId)
+        internal
+        view
+        returns (FilecoinWarmStorageService.DataSetStatus status)
+    {
+        FilecoinWarmStorageService.DataSetInfoView memory info = getDataSet(service, dataSetId);
+        if (info.pdpRailId == 0) {
+            return FilecoinWarmStorageService.DataSetStatus.NotFound;
+        }
+        if (info.pdpEndEpoch != 0) {
+            return FilecoinWarmStorageService.DataSetStatus.Terminating;
+        }
+        return FilecoinWarmStorageService.DataSetStatus.Active;
+    }
+
     function clientDataSets(FilecoinWarmStorageService service, address payer)
         internal
         view

service_contracts/src/lib/FilecoinWarmStorageServiceStateLibrary.sol

@@ -108,6 +108,21 @@ library FilecoinWarmStorageServiceStateLibrary {
         info.dataSetId = dataSetId;
     }
 
+    function getDataSetStatus(FilecoinWarmStorageService service, uint256 dataSetId)
+        public
+        view
+        returns (FilecoinWarmStorageService.DataSetStatus status)
+    {
+        FilecoinWarmStorageService.DataSetInfoView memory info = getDataSet(service, dataSetId);
+        if (info.pdpRailId == 0) {
+            return FilecoinWarmStorageService.DataSetStatus.NotFound;
+        }
+        if (info.pdpEndEpoch != 0) {
+            return FilecoinWarmStorageService.DataSetStatus.Terminating;
+        }
+        return FilecoinWarmStorageService.DataSetStatus.Active;
+    }
+
     function clientDataSets(FilecoinWarmStorageService service, address payer)
         public
         view

service_contracts/test/FilecoinWarmStorageService.t.sol

@@ -877,12 +877,9 @@ contract FilecoinWarmStorageServiceTest is Test {
      * @param dataSetId The ID of the data set to delete
      */
     function deleteDataSetForClient(address provider, address clientAddress, uint256 dataSetId) internal {
-        bytes memory signature = abi.encode(FAKE_SIGNATURE);
-
-        makeSignaturePass(clientAddress);
         // Delete the data set as the provider
         vm.prank(provider);
-        mockPDPVerifier.deleteDataSet(address(pdpServiceWithPayments), dataSetId, signature);
+        mockPDPVerifier.deleteDataSet(address(pdpServiceWithPayments), dataSetId, bytes(""));
     }
 
     function testGetClientDataSets_EmptyClient() public view {
@@ -1160,6 +1157,10 @@ contract FilecoinWarmStorageServiceTest is Test {
     function testTerminateServiceLifecycle() public {
         console.log("=== Test: Data Set Payment Termination Lifecycle ===");
 
+        // 0. Verify that DataSet with ID 1 is not found
+        FilecoinWarmStorageService.DataSetStatus status = viewContract.getDataSetStatus(1);
+        assertEq(uint256(status), uint256(FilecoinWarmStorageService.DataSetStatus.NotFound), "expected NotFound");
+
         // 1. Setup: Create a dataset with CDN enabled.
         console.log("1. Setting up: Creating dataset with service provider");
 
@@ -1197,6 +1198,9 @@ contract FilecoinWarmStorageServiceTest is Test {
         uint256 dataSetId = mockPDPVerifier.createDataSet(pdpServiceWithPayments, encodedData);
         console.log("Created data set with ID:", dataSetId);
 
+        status = viewContract.getDataSetStatus(dataSetId);
+        assertEq(uint256(status), uint256(FilecoinWarmStorageService.DataSetStatus.Active), "expected Active");
+
         // 2. Submit a valid proof.
         console.log("\n2. Starting proving period and submitting proof");
         // Start proving period
@@ -1228,6 +1232,9 @@ contract FilecoinWarmStorageServiceTest is Test {
         );
         console.log("Proof submitted successfully");
 
+        status = viewContract.getDataSetStatus(dataSetId);
+        assertEq(uint256(status), uint256(FilecoinWarmStorageService.DataSetStatus.Active), "expected Active");
+
         // 3. Terminate payment
         console.log("\n3. Terminating payment rails");
         console.log("Current block:", block.number);
@@ -1247,6 +1254,10 @@ contract FilecoinWarmStorageServiceTest is Test {
         assertFalse(exists, "withCDN metadata should not exist after termination");
         assertEq(withCDN, "", "withCDN value should be cleared for dataset");
 
+        // check status is terminating
+        status = viewContract.getDataSetStatus(dataSetId);
+        assertEq(uint256(status), uint256(FilecoinWarmStorageService.DataSetStatus.Terminating), "expected Terminating");
+
         // Ensure piecesAdded reverts
         console.log("\n4. Testing operations after termination");
         console.log("Testing piecesAdded - should revert (payment terminated)");
@@ -1261,12 +1272,25 @@ contract FilecoinWarmStorageServiceTest is Test {
         pdpServiceWithPayments.piecesAdded(dataSetId, 0, pieces, addPiecesExtraData);
         console.log("[OK] piecesAdded correctly reverted after termination");
 
+        console.log("Testing dataSetDeleted - should revert (in grace period)");
+        vm.prank(address(mockPDPVerifier));
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                Errors.PaymentRailsNotFinalized.selector, dataSetId, info.pdpEndEpoch, info.cdnEndEpoch
+            )
+        );
+        pdpServiceWithPayments.dataSetDeleted(dataSetId, 10, bytes(""));
+
         // Wait for payment end epoch to elapse
         console.log("\n5. Rolling past payment end epoch");
         console.log("Current block:", block.number);
         console.log("Rolling to block:", info.pdpEndEpoch + 1);
         vm.roll(info.pdpEndEpoch + 1);
 
+        // check status is still Terminating as data set is not yet deleted from PDP
+        status = viewContract.getDataSetStatus(dataSetId);
+        assertEq(uint256(status), uint256(FilecoinWarmStorageService.DataSetStatus.Terminating), "expected Terminating");
+
         // Ensure other functions also revert now
         console.log("\n6. Testing operations after payment end epoch");
         // piecesScheduledRemove
@@ -1305,7 +1329,12 @@ contract FilecoinWarmStorageServiceTest is Test {
         );
         pdpServiceWithPayments.nextProvingPeriod(dataSetId, block.number + maxProvingPeriod, 100, "");
         console.log("[OK] nextProvingPeriod correctly reverted");
+        console.log("\n7. Testring dataSetDeleted");
+        vm.prank(address(mockPDPVerifier));
+        pdpServiceWithPayments.dataSetDeleted(dataSetId, 10, bytes(""));
 
+        status = viewContract.getDataSetStatus(dataSetId);
+        assertEq(uint256(status), uint256(FilecoinWarmStorageService.DataSetStatus.NotFound), "expected NotFound");
         console.log("\n=== Test completed successfully! ===");
     }