Modify CDN payment rails and add methods for usage-based payments

service_contracts/abi/FilecoinWarmStorageService.abi.json

@@ -679,6 +679,29 @@
     "outputs": [],
     "stateMutability": "nonpayable"
   },
+  {
+    "type": "function",
+    "name": "settleCDNPaymentRails",
+    "inputs": [
+      {
+        "name": "dataSetId",
+        "type": "uint256",
+        "internalType": "uint256"
+      },
+      {
+        "name": "cdnAmount",
+        "type": "uint256",
+        "internalType": "uint256"
+      },
+      {
+        "name": "cacheMissAmount",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "nonpayable"
+  },
   {
     "type": "function",
     "name": "storageProviderChanged",
@@ -733,6 +756,29 @@
     "outputs": [],
     "stateMutability": "nonpayable"
   },
+  {
+    "type": "function",
+    "name": "topUpCDNPaymentRails",
+    "inputs": [
+      {
+        "name": "dataSetId",
+        "type": "uint256",
+        "internalType": "uint256"
+      },
+      {
+        "name": "cdnAmountToAdd",
+        "type": "uint256",
+        "internalType": "uint256"
+      },
+      {
+        "name": "cacheMissAmountToAdd",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "nonpayable"
+  },
   {
     "type": "function",
     "name": "transferFilBeamController",
@@ -872,6 +918,31 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "event",
+    "name": "CDNPaymentRailsToppedUp",
+    "inputs": [
+      {
+        "name": "dataSetId",
+        "type": "uint256",
+        "indexed": true,
+        "internalType": "uint256"
+      },
+      {
+        "name": "totalCdnLockup",
+        "type": "uint256",
+        "indexed": false,
+        "internalType": "uint256"
+      },
+      {
+        "name": "totalCacheMissLockup",
+        "type": "uint256",
+        "indexed": false,
+        "internalType": "uint256"
+      }
+    ],
+    "anonymous": false
+  },
   {
     "type": "event",
     "name": "CDNPaymentTerminated",
@@ -1377,6 +1448,49 @@
       }
     ]
   },
+  {
+    "type": "error",
+    "name": "CDNPaymentAlreadyTerminated",
+    "inputs": [
+      {
+        "name": "dataSetId",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "CacheMissPaymentAlreadyTerminated",
+    "inputs": [
+      {
+        "name": "dataSetId",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "CallerNotPayer",
+    "inputs": [
+      {
+        "name": "dataSetId",
+        "type": "uint256",
+        "internalType": "uint256"
+      },
+      {
+        "name": "expectedPayer",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "caller",
+        "type": "address",
+        "internalType": "address"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "CallerNotPayerOrPayee",
@@ -1562,17 +1676,6 @@
     "name": "FailedCall",
     "inputs": []
   },
-  {
-    "type": "error",
-    "name": "FilBeamPaymentAlreadyTerminated",
-    "inputs": [
-      {
-        "name": "dataSetId",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ]
-  },
   {
     "type": "error",
     "name": "FilBeamServiceNotConfigured",
@@ -1711,6 +1814,17 @@
       }
     ]
   },
+  {
+    "type": "error",
+    "name": "InvalidTopUpAmount",
+    "inputs": [
+      {
+        "name": "dataSetId",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "MaxProvingPeriodZero",
@@ -1931,11 +2045,6 @@
         "name": "pdpEndEpoch",
         "type": "uint256",
         "internalType": "uint256"
-      },
-      {
-        "name": "cdnEndEpoch",
-        "type": "uint256",
-        "internalType": "uint256"
       }
     ]
   },

service_contracts/abi/FilecoinWarmStorageServiceStateLibrary.abi.json

@@ -280,11 +280,6 @@
             "type": "uint256",
             "internalType": "uint256"
           },
-          {
-            "name": "cdnEndEpoch",
-            "type": "uint256",
-            "internalType": "uint256"
-          },
           {
             "name": "dataSetId",
             "type": "uint256",
@@ -366,11 +361,6 @@
             "type": "uint256",
             "internalType": "uint256"
           },
-          {
-            "name": "cdnEndEpoch",
-            "type": "uint256",
-            "internalType": "uint256"
-          },
           {
             "name": "dataSetId",
             "type": "uint256",

service_contracts/abi/FilecoinWarmStorageServiceStateView.abi.json

@@ -243,11 +243,6 @@
             "type": "uint256",
             "internalType": "uint256"
           },
-          {
-            "name": "cdnEndEpoch",
-            "type": "uint256",
-            "internalType": "uint256"
-          },
           {
             "name": "dataSetId",
             "type": "uint256",
@@ -324,11 +319,6 @@
             "type": "uint256",
             "internalType": "uint256"
           },
-          {
-            "name": "cdnEndEpoch",
-            "type": "uint256",
-            "internalType": "uint256"
-          },
           {
             "name": "dataSetId",
             "type": "uint256",

service_contracts/src/Errors.sol

@@ -128,6 +128,18 @@ library Errors {
     /// @param dataSetId The data set ID
     error DataSetPaymentAlreadyTerminated(uint256 dataSetId);
 
+    /// @notice CDN payment is already terminated
+    /// @param dataSetId The data set ID
+    error CDNPaymentAlreadyTerminated(uint256 dataSetId);
+
+    /// @notice Cache-miss payment is already terminated
+    /// @param dataSetId The data set ID
+    error CacheMissPaymentAlreadyTerminated(uint256 dataSetId);
+
+    /// @notice Invalid top-up amount - both CDN and cache miss amounts are zero
+    /// @param dataSetId The data set ID
+    error InvalidTopUpAmount(uint256 dataSetId);
+
     /// @notice The specified data set does not exist or is not valid
     /// @param dataSetId The data set ID that was invalid or unregistered
     error InvalidDataSetId(uint256 dataSetId);
@@ -139,6 +151,12 @@ library Errors {
     /// @param caller The actual caller
     error CallerNotPayerOrPayee(uint256 dataSetId, address expectedPayer, address expectedPayee, address caller);
 
+    /// @notice Only payer can top-up CDN payment rail balance
+    /// @param dataSetId The data set ID
+    /// @param expectedPayer The payer address
+    /// @param caller The actual caller
+    error CallerNotPayer(uint256 dataSetId, address expectedPayer, address caller);
+
     /// @notice Data set is beyond its payment end epoch
     /// @param dataSetId The data set ID
     /// @param pdpEndEpoch The payment end epoch for the data set
@@ -246,13 +264,8 @@ library Errors {
     /// @param actual The caller address
     error OnlyFilBeamControllerAllowed(address expected, address actual);
 
-    /// @notice CDN payment is already terminated
-    /// @param dataSetId The data set ID
-    error FilBeamPaymentAlreadyTerminated(uint256 dataSetId);
-
     /// @notice Payment rails have not finalized yet, so the data set can't be deleted
     /// @param dataSetId The data set ID
     /// @param pdpEndEpoch The end epoch when the PDP payment rail will finalize
-    /// @param cdnEndEpoch The end epoch when the CDN payment rail will finalize (0 if no CDN)
-    error PaymentRailsNotFinalized(uint256 dataSetId, uint256 pdpEndEpoch, uint256 cdnEndEpoch);
+    error PaymentRailsNotFinalized(uint256 dataSetId, uint256 pdpEndEpoch);
 }