fix: 🚑 add missing update_payment_stream calls when deleting files

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

@@ -210,6 +210,10 @@ declare module "@polkadot/api-base/types/errors" {
        * Divided by 0
        **/
       DividedByZero: AugmentedError<ApiType>;
+      /**
+       * Failed to fetch the dynamic-rate payment stream.
+       **/
+      DynamicRatePaymentStreamNotFound: AugmentedError<ApiType>;
       /**
        * Failed to verify proof: required to provide a proof of inclusion.
        **/

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

@@ -37,6 +37,7 @@ import type {
   PalletCollatorSelectionCandidateInfo,
   PalletFileSystemMoveBucketRequestMetadata,
   PalletFileSystemPendingFileDeletionRequest,
+  PalletFileSystemPendingStopStoringRequest,
   PalletFileSystemStorageRequestBspsMetadata,
   PalletFileSystemStorageRequestMetadata,
   PalletMessageQueueBookState,
@@ -382,11 +383,13 @@ 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 and bucket id.
+       * 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.
        **/
       pendingFileDeletionRequests: AugmentedQuery<
         ApiType,
-        (arg: AccountId32 | string | Uint8Array) => Observable<Vec<ITuple<[H256, H256]>>>,
+        (
+          arg: AccountId32 | string | Uint8Array
+        ) => Observable<Vec<PalletFileSystemPendingFileDeletionRequest>>,
         [AccountId32]
       > &
         QueryableStorageEntry<ApiType, [AccountId32]>;
@@ -408,17 +411,18 @@ declare module "@polkadot/api-base/types/storage" {
       /**
        * Pending file stop storing requests.
        *
-       * A double mapping from BSP IDs to a list of file keys pending stop storing requests to the block in which those requests were opened
-       * and the proven size of the file.
+       * A double mapping from BSP IDs to a list of file keys pending stop storing requests to the block in which those requests were opened,
+       * the proven size of the file and the owner of the file.
        * The block number is used to avoid BSPs being able to stop storing files immediately which would allow them to avoid challenges
        * of missing files. The size is to be able to decrease their used capacity when they confirm to stop storing the file.
+       * The owner is to be able to update the payment stream between the user and the BSP.
        **/
       pendingStopStoringRequests: AugmentedQuery<
         ApiType,
         (
           arg1: H256 | string | Uint8Array,
           arg2: H256 | string | Uint8Array
-        ) => Observable<Option<ITuple<[u32, u64]>>>,
+        ) => Observable<Option<PalletFileSystemPendingStopStoringRequest>>,
         [H256, H256]
       > &
         QueryableStorageEntry<ApiType, [H256, H256]>;

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

@@ -692,6 +692,7 @@ declare module "@polkadot/api-base/types/submittable" {
         (
           user: AccountId32 | string | Uint8Array,
           fileKey: H256 | string | Uint8Array,
+          fileSize: u64 | AnyNumber | Uint8Array,
           bucketId: H256 | string | Uint8Array,
           forestProof:
             | SpTrieStorageProofCompactProof
@@ -701,7 +702,7 @@ declare module "@polkadot/api-base/types/submittable" {
             | string
             | Uint8Array
         ) => SubmittableExtrinsic<ApiType>,
-        [AccountId32, H256, H256, SpTrieStorageProofCompactProof]
+        [AccountId32, H256, u64, H256, SpTrieStorageProofCompactProof]
       >;
       requestMoveBucket: AugmentedSubmittable<
         (

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

@@ -3475,6 +3475,7 @@ declare const _default: {
       pending_file_deletion_request_submit_proof: {
         user: string;
         fileKey: string;
+        fileSize: string;
         bucketId: string;
         forestProof: string;
       };
@@ -4219,6 +4220,14 @@ declare const _default: {
     bucketId: string;
     fileSize: string;
   };
+  /**
+   * Lookup463: pallet_file_system::types::PendingStopStoringRequest<T>
+   **/
+  PalletFileSystemPendingStopStoringRequest: {
+    tickWhenRequested: string;
+    fileOwner: string;
+    fileSize: string;
+  };
   /**
    * Lookup464: pallet_file_system::types::MoveBucketRequestMetadata<T>
    **/

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

@@ -72,6 +72,7 @@ import type {
   PalletFileSystemHoldReason,
   PalletFileSystemMoveBucketRequestMetadata,
   PalletFileSystemPendingFileDeletionRequest,
+  PalletFileSystemPendingStopStoringRequest,
   PalletFileSystemRejectedStorageRequest,
   PalletFileSystemRejectedStorageRequestReason,
   PalletFileSystemStorageRequestBspsMetadata,
@@ -363,6 +364,7 @@ declare module "@polkadot/types/types/registry" {
     PalletFileSystemHoldReason: PalletFileSystemHoldReason;
     PalletFileSystemMoveBucketRequestMetadata: PalletFileSystemMoveBucketRequestMetadata;
     PalletFileSystemPendingFileDeletionRequest: PalletFileSystemPendingFileDeletionRequest;
+    PalletFileSystemPendingStopStoringRequest: PalletFileSystemPendingStopStoringRequest;
     PalletFileSystemRejectedStorageRequest: PalletFileSystemRejectedStorageRequest;
     PalletFileSystemRejectedStorageRequestReason: PalletFileSystemRejectedStorageRequestReason;
     PalletFileSystemStorageRequestBspsMetadata: PalletFileSystemStorageRequestBspsMetadata;

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

@@ -4249,6 +4249,7 @@ declare module "@polkadot/types/lookup" {
     readonly asPendingFileDeletionRequestSubmitProof: {
       readonly user: AccountId32;
       readonly fileKey: H256;
+      readonly fileSize: u64;
       readonly bucketId: H256;
       readonly forestProof: SpTrieStorageProofCompactProof;
     } & Struct;
@@ -5365,6 +5366,12 @@ declare module "@polkadot/types/lookup" {
     readonly bucketId: H256;
     readonly fileSize: u64;
   }
+  /** @name PalletFileSystemPendingStopStoringRequest (463) */
+  interface PalletFileSystemPendingStopStoringRequest extends Struct {
+    readonly tickWhenRequested: u32;
+    readonly fileOwner: AccountId32;
+    readonly fileSize: u64;
+  }
   /** @name PalletFileSystemMoveBucketRequestMetadata (464) */
   interface PalletFileSystemMoveBucketRequestMetadata extends Struct {
     readonly requester: AccountId32;
@@ -5436,6 +5443,7 @@ declare module "@polkadot/types/lookup" {
     readonly isInvalidBucketIdFileKeyPair: boolean;
     readonly isInconsistentStateKeyAlreadyExists: boolean;
     readonly isFixedRatePaymentStreamNotFound: boolean;
+    readonly isDynamicRatePaymentStreamNotFound: boolean;
     readonly isCannotHoldDeposit: boolean;
     readonly isFailedToQueryEarliestFileVolunteerTick: boolean;
     readonly isFailedToGetOwnerAccount: boolean;
@@ -5509,6 +5517,7 @@ declare module "@polkadot/types/lookup" {
       | "InvalidBucketIdFileKeyPair"
       | "InconsistentStateKeyAlreadyExists"
       | "FixedRatePaymentStreamNotFound"
+      | "DynamicRatePaymentStreamNotFound"
       | "CannotHoldDeposit"
       | "FailedToQueryEarliestFileVolunteerTick"
       | "FailedToGetOwnerAccount"

api-augment/src/interfaces/augment-api-errors.ts

@@ -218,6 +218,10 @@ declare module "@polkadot/api-base/types/errors" {
        * Divided by 0
        **/
       DividedByZero: AugmentedError<ApiType>;
+      /**
+       * Failed to fetch the dynamic-rate payment stream.
+       **/
+      DynamicRatePaymentStreamNotFound: AugmentedError<ApiType>;
       /**
        * Failed to verify proof: required to provide a proof of inclusion.
        **/

api-augment/src/interfaces/augment-api-query.ts

@@ -43,6 +43,7 @@ import type {
   PalletCollatorSelectionCandidateInfo,
   PalletFileSystemMoveBucketRequestMetadata,
   PalletFileSystemPendingFileDeletionRequest,
+  PalletFileSystemPendingStopStoringRequest,
   PalletFileSystemStorageRequestBspsMetadata,
   PalletFileSystemStorageRequestMetadata,
   PalletMessageQueueBookState,
@@ -391,11 +392,13 @@ 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 and bucket id.
+       * 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.
        **/
       pendingFileDeletionRequests: AugmentedQuery<
         ApiType,
-        (arg: AccountId32 | string | Uint8Array) => Observable<Vec<ITuple<[H256, H256]>>>,
+        (
+          arg: AccountId32 | string | Uint8Array
+        ) => Observable<Vec<PalletFileSystemPendingFileDeletionRequest>>,
         [AccountId32]
       > &
         QueryableStorageEntry<ApiType, [AccountId32]>;
@@ -417,17 +420,18 @@ declare module "@polkadot/api-base/types/storage" {
       /**
        * Pending file stop storing requests.
        *
-       * A double mapping from BSP IDs to a list of file keys pending stop storing requests to the block in which those requests were opened
-       * and the proven size of the file.
+       * A double mapping from BSP IDs to a list of file keys pending stop storing requests to the block in which those requests were opened,
+       * the proven size of the file and the owner of the file.
        * The block number is used to avoid BSPs being able to stop storing files immediately which would allow them to avoid challenges
        * of missing files. The size is to be able to decrease their used capacity when they confirm to stop storing the file.
+       * The owner is to be able to update the payment stream between the user and the BSP.
        **/
       pendingStopStoringRequests: AugmentedQuery<
         ApiType,
         (
           arg1: H256 | string | Uint8Array,
           arg2: H256 | string | Uint8Array
-        ) => Observable<Option<ITuple<[u32, u64]>>>,
+        ) => Observable<Option<PalletFileSystemPendingStopStoringRequest>>,
         [H256, H256]
       > &
         QueryableStorageEntry<ApiType, [H256, H256]>;

api-augment/src/interfaces/augment-api-tx.ts

@@ -605,10 +605,11 @@ declare module "@polkadot/api-base/types/submittable" {
         (
           user: AccountId32 | string | Uint8Array,
           fileKey: H256 | string | Uint8Array,
+          fileSize: u64 | AnyNumber | Uint8Array,
           bucketId: H256 | string | Uint8Array,
           forestProof: SpTrieStorageProofCompactProof | { encodedNodes?: any } | string | Uint8Array
         ) => SubmittableExtrinsic<ApiType>,
-        [AccountId32, H256, H256, SpTrieStorageProofCompactProof]
+        [AccountId32, H256, u64, H256, SpTrieStorageProofCompactProof]
       >;
       requestMoveBucket: AugmentedSubmittable<
         (

api-augment/src/interfaces/lookup.ts

@@ -3555,6 +3555,7 @@ export default {
       pending_file_deletion_request_submit_proof: {
         user: "AccountId32",
         fileKey: "H256",
+        fileSize: "u64",
         bucketId: "H256",
         forestProof: "SpTrieStorageProofCompactProof"
       },
@@ -4445,6 +4446,14 @@ export default {
     bucketId: "H256",
     fileSize: "u64"
   },
+  /**
+   * Lookup463: pallet_file_system::types::PendingStopStoringRequest<T>
+   **/
+  PalletFileSystemPendingStopStoringRequest: {
+    tickWhenRequested: "u32",
+    fileOwner: "AccountId32",
+    fileSize: "u64"
+  },
   /**
    * Lookup464: pallet_file_system::types::MoveBucketRequestMetadata<T>
    **/
@@ -4521,6 +4530,7 @@ export default {
       "InvalidBucketIdFileKeyPair",
       "InconsistentStateKeyAlreadyExists",
       "FixedRatePaymentStreamNotFound",
+      "DynamicRatePaymentStreamNotFound",
       "CannotHoldDeposit",
       "FailedToQueryEarliestFileVolunteerTick",
       "FailedToGetOwnerAccount",

api-augment/src/interfaces/registry.ts

@@ -78,6 +78,7 @@ import type {
   PalletFileSystemHoldReason,
   PalletFileSystemMoveBucketRequestMetadata,
   PalletFileSystemPendingFileDeletionRequest,
+  PalletFileSystemPendingStopStoringRequest,
   PalletFileSystemRejectedStorageRequest,
   PalletFileSystemRejectedStorageRequestReason,
   PalletFileSystemStorageRequestBspsMetadata,
@@ -370,6 +371,7 @@ declare module "@polkadot/types/types/registry" {
     PalletFileSystemHoldReason: PalletFileSystemHoldReason;
     PalletFileSystemMoveBucketRequestMetadata: PalletFileSystemMoveBucketRequestMetadata;
     PalletFileSystemPendingFileDeletionRequest: PalletFileSystemPendingFileDeletionRequest;
+    PalletFileSystemPendingStopStoringRequest: PalletFileSystemPendingStopStoringRequest;
     PalletFileSystemRejectedStorageRequest: PalletFileSystemRejectedStorageRequest;
     PalletFileSystemRejectedStorageRequestReason: PalletFileSystemRejectedStorageRequestReason;
     PalletFileSystemStorageRequestBspsMetadata: PalletFileSystemStorageRequestBspsMetadata;

api-augment/src/interfaces/types-lookup.ts

@@ -4459,6 +4459,7 @@ declare module "@polkadot/types/lookup" {
     readonly asPendingFileDeletionRequestSubmitProof: {
       readonly user: AccountId32;
       readonly fileKey: H256;
+      readonly fileSize: u64;
       readonly bucketId: H256;
       readonly forestProof: SpTrieStorageProofCompactProof;
     } & Struct;
@@ -5630,6 +5631,13 @@ declare module "@polkadot/types/lookup" {
     readonly fileSize: u64;
   }
 
+  /** @name PalletFileSystemPendingStopStoringRequest (463) */
+  interface PalletFileSystemPendingStopStoringRequest extends Struct {
+    readonly tickWhenRequested: u32;
+    readonly fileOwner: AccountId32;
+    readonly fileSize: u64;
+  }
+
   /** @name PalletFileSystemMoveBucketRequestMetadata (464) */
   interface PalletFileSystemMoveBucketRequestMetadata extends Struct {
     readonly requester: AccountId32;
@@ -5702,6 +5710,7 @@ declare module "@polkadot/types/lookup" {
     readonly isInvalidBucketIdFileKeyPair: boolean;
     readonly isInconsistentStateKeyAlreadyExists: boolean;
     readonly isFixedRatePaymentStreamNotFound: boolean;
+    readonly isDynamicRatePaymentStreamNotFound: boolean;
     readonly isCannotHoldDeposit: boolean;
     readonly isFailedToQueryEarliestFileVolunteerTick: boolean;
     readonly isFailedToGetOwnerAccount: boolean;
@@ -5775,6 +5784,7 @@ declare module "@polkadot/types/lookup" {
       | "InvalidBucketIdFileKeyPair"
       | "InconsistentStateKeyAlreadyExists"
       | "FixedRatePaymentStreamNotFound"
+      | "DynamicRatePaymentStreamNotFound"
       | "CannotHoldDeposit"
       | "FailedToQueryEarliestFileVolunteerTick"
       | "FailedToGetOwnerAccount"

pallets/file-system/src/lib.rs

@@ -402,30 +402,31 @@
 
     /// 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 and bucket id.
+    /// 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.
     #[pallet::storage]
     pub type PendingFileDeletionRequests<T: Config> = StorageMap<
         _,
         Blake2_128Concat,
         T::AccountId,
-        BoundedVec<(MerkleHash<T>, BucketIdFor<T>), T::MaxUserPendingDeletionRequests>,
+        BoundedVec<PendingFileDeletionRequest<T>, T::MaxUserPendingDeletionRequests>,
         ValueQuery,
     >;
 
     /// Pending file stop storing requests.
     ///
-    /// A double mapping from BSP IDs to a list of file keys pending stop storing requests to the block in which those requests were opened
-    /// and the proven size of the file.
+    /// A double mapping from BSP IDs to a list of file keys pending stop storing requests to the block in which those requests were opened,
+    /// the proven size of the file and the owner of the file.
     /// The block number is used to avoid BSPs being able to stop storing files immediately which would allow them to avoid challenges
     /// of missing files. The size is to be able to decrease their used capacity when they confirm to stop storing the file.
+    /// The owner is to be able to update the payment stream between the user and the BSP.
     #[pallet::storage]
     pub type PendingStopStoringRequests<T: Config> = StorageDoubleMap<
         _,
         Blake2_128Concat,
         ProviderIdFor<T>,
         Blake2_128Concat,
         MerkleHash<T>,
-        (BlockNumberFor<T>, StorageData<T>),
+        PendingStopStoringRequest<T>,
     >;
 
     /// Pending move bucket requests.
@@ -802,6 +803,8 @@
         InconsistentStateKeyAlreadyExists,
         /// Failed to fetch the rate for the payment stream.
         FixedRatePaymentStreamNotFound,
+        /// Failed to fetch the dynamic-rate payment stream.
+        DynamicRatePaymentStreamNotFound,
         /// Cannot hold the required deposit from the user
         CannotHoldDeposit,
         /// Failed to query earliest volunteer tick
@@ -1277,6 +1280,7 @@
             origin: OriginFor<T>,
             user: T::AccountId,
             file_key: MerkleHash<T>,
+            file_size: StorageData<T>,
             bucket_id: BucketIdFor<T>,
             forest_proof: ForestProof<T>,
         ) -> DispatchResult {
@@ -1286,6 +1290,7 @@
                 who.clone(),
                 user.clone(),
                 file_key,
+                file_size,
                 bucket_id,
                 forest_proof,
             )?;
@@ -1338,7 +1343,7 @@
         }
     }
 
     #[pallet::hooks]
     impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T>
     where
         u32: TryFrom<BlockNumberFor<T>>,