feat: ✨ remove file deletion requests expiration

api-augment/dist/types/interfaces/augment-api-consts.d.ts

@@ -113,10 +113,6 @@ declare module "@polkadot/api-base/types/consts" {
        * Time-to-live for a move bucket request, after which the request is considered expired.
        **/
       moveBucketRequestTtl: u32 & AugmentedConst<ApiType>;
-      /**
-       * Time-to-live for a pending file deletion request, after which a priority challenge is sent out to enforce the deletion.
-       **/
-      pendingFileDeletionRequestTtl: u32 & AugmentedConst<ApiType>;
       /**
        * Deposit held from the User when creating a new storage request
        **/

api-augment/dist/types/interfaces/augment-api-events.d.ts

@@ -580,26 +580,6 @@ declare module "@polkadot/api-base/types/events" {
           private: bool;
         }
       >;
-      /**
-       * Failed to decrease bucket size for expired file deletion request
-       **/
-      FailedToDecreaseBucketSize: AugmentedEvent<
-        ApiType,
-        [
-          user: AccountId32,
-          bucketId: H256,
-          fileKey: H256,
-          fileSize: u64,
-          error: SpRuntimeDispatchError
-        ],
-        {
-          user: AccountId32;
-          bucketId: H256;
-          fileKey: H256;
-          fileSize: u64;
-          error: SpRuntimeDispatchError;
-        }
-      >;
       /**
        * Notifies that a priority challenge failed to be queued for pending file deletion.
        **/

api-augment/dist/types/interfaces/augment-api-query.d.ts

@@ -305,17 +305,6 @@ declare module "@polkadot/api-base/types/storage" {
         [H256, H256]
       > &
         QueryableStorageEntry<ApiType, [H256, H256]>;
-      /**
-       * A map of blocks to expired file deletion requests.
-       **/
-      fileDeletionRequestExpirations: AugmentedQuery<
-        ApiType,
-        (
-          arg: u32 | AnyNumber | Uint8Array
-        ) => Observable<Vec<PalletFileSystemPendingFileDeletionRequest>>,
-        [u32]
-      > &
-        QueryableStorageEntry<ApiType, [u32]>;
       /**
        * Maximum number replication target allowed to be set for a storage request to be fulfilled.
        **/
@@ -331,16 +320,18 @@ declare module "@polkadot/api-base/types/storage" {
       > &
         QueryableStorageEntry<ApiType, [u32]>;
       /**
-       * A pointer to the earliest available block to insert a new file deletion request expiration.
+       * Mapping from MSPs to the amount of pending file deletion requests they have.
        *
-       * This should always be greater or equal than current block + [`Config::PendingFileDeletionRequestTtl`].
+       * This is used to keep track of the amount of pending file deletion requests each MSP has, so that MSPs are removed
+       * from the privileged providers list if they have at least one, and are added back if they have none.
+       * This is to ensure that MSPs are correctly incentivised to submit the required proofs for file deletions.
        **/
-      nextAvailableFileDeletionRequestExpirationBlock: AugmentedQuery<
+      mspsAmountOfPendingFileDeletionRequests: AugmentedQuery<
         ApiType,
-        () => Observable<u32>,
-        []
+        (arg: H256 | string | Uint8Array) => Observable<u32>,
+        [H256]
       > &
-        QueryableStorageEntry<ApiType, []>;
+        QueryableStorageEntry<ApiType, [H256]>;
       /**
        * A pointer to the earliest available block to insert a new move bucket request expiration.
        *
@@ -384,7 +375,7 @@ declare module "@polkadot/api-base/types/storage" {
       /**
        * Pending file deletion requests.
        *
-       * A mapping from a user Account ID to a list of pending file deletion requests, holding a tuple of the file key, file size and Bucket ID.
+       * A mapping from a user Account ID to a list of pending file deletion requests (which have the file information).
        **/
       pendingFileDeletionRequests: AugmentedQuery<
         ApiType,

api-augment/dist/types/interfaces/augment-api-rpc.d.ts

@@ -1076,6 +1076,24 @@ declare module "@polkadot/rpc-core/types/jsonrpc" {
       addToExcludeList: AugmentedRpc<
         (file_key: H256 | string | Uint8Array) => Observable<ITuple<[]>>
       >;
+      /**
+       * Generate a SCALE-encoded proof for a file key to allow a BSP to confirm storing it.
+       **/
+      generateFileKeyProofBspConfirm: AugmentedRpc<
+        (
+          bsp_id: H256 | string | Uint8Array,
+          file_key: H256 | string | Uint8Array
+        ) => Observable<Bytes>
+      >;
+      /**
+       * Generate a SCALE-encoded proof for a file key to allow a MSP to accept storing it.
+       **/
+      generateFileKeyProofMspAccept: AugmentedRpc<
+        (
+          msp_id: H256 | string | Uint8Array,
+          file_key: H256 | string | Uint8Array
+        ) => Observable<Bytes>
+      >;
       /**
        * Generate a SCALE-encoded proof for a group of file keys that might or might not be in the forest.
        **/

api-augment/dist/types/interfaces/augment-api-tx.d.ts

@@ -13,6 +13,7 @@ import type {
   CumulusPrimitivesParachainInherentParachainInherentData,
   PalletBalancesAdjustmentDirection,
   PalletFileSystemBucketMoveRequestResponse,
+  PalletFileSystemFileKeyWithProof,
   PalletFileSystemStorageRequestMspBucketResponse,
   PalletNftsAttributeNamespace,
   PalletNftsCancelAttributesApprovalWitness,
@@ -26,7 +27,6 @@ import type {
   PalletNftsPreSignedMint,
   PalletNftsPriceWithDirection,
   PalletProofsDealerProof,
-  ShpFileKeyVerifierFileKeyProof,
   SpRuntimeMultiSignature,
   SpTrieStorageProofCompactProof,
   SpWeightsWeightV2Weight,
@@ -524,21 +524,18 @@ declare module "@polkadot/api-base/types/submittable" {
             | string
             | Uint8Array,
           fileKeysAndProofs:
-            | Vec<ITuple<[H256, ShpFileKeyVerifierFileKeyProof]>>
-            | [
-                H256 | string | Uint8Array,
-                (
-                  | ShpFileKeyVerifierFileKeyProof
-                  | {
-                      fileMetadata?: any;
-                      proof?: any;
-                    }
-                  | string
-                  | Uint8Array
-                )
-              ][]
-        ) => SubmittableExtrinsic<ApiType>,
-        [SpTrieStorageProofCompactProof, Vec<ITuple<[H256, ShpFileKeyVerifierFileKeyProof]>>]
+            | Vec<PalletFileSystemFileKeyWithProof>
+            | (
+                | PalletFileSystemFileKeyWithProof
+                | {
+                    fileKey?: any;
+                    proof?: any;
+                  }
+                | string
+                | Uint8Array
+              )[]
+        ) => SubmittableExtrinsic<ApiType>,
+        [SpTrieStorageProofCompactProof, Vec<PalletFileSystemFileKeyWithProof>]
       >;
       /**
        * Executed by a BSP to request to stop storing a file.