Merge branch 'main' into feat/remove-bsp-with-no-files

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

@@ -206,10 +206,18 @@ declare module "@polkadot/api-base/types/errors" {
        * Cannot hold the required deposit from the user
        **/
       CannotHoldDeposit: AugmentedError<ApiType>;
+      /**
+       * Collection ID was not found.
+       **/
+      CollectionNotFound: AugmentedError<ApiType>;
       /**
        * 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-events.d.ts

@@ -2141,9 +2141,9 @@ declare module "@polkadot/api-base/types/events" {
        **/
       ProofAccepted: AugmentedEvent<
         ApiType,
-        [provider: H256, proof: PalletProofsDealerProof, lastTickProven: u32],
+        [providerId: H256, proof: PalletProofsDealerProof, lastTickProven: u32],
         {
-          provider: H256;
+          providerId: H256;
           proof: PalletProofsDealerProof;
           lastTickProven: u32;
         }

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

@@ -37,6 +37,7 @@ import type {
   PalletCollatorSelectionCandidateInfo,
   PalletFileSystemMoveBucketRequestMetadata,
   PalletFileSystemPendingFileDeletionRequest,
+  PalletFileSystemPendingStopStoringRequest,
   PalletFileSystemStorageRequestBspsMetadata,
   PalletFileSystemStorageRequestMetadata,
   PalletMessageQueueBookState,
@@ -53,6 +54,7 @@ import type {
   PalletPaymentStreamsDynamicRatePaymentStream,
   PalletPaymentStreamsFixedRatePaymentStream,
   PalletPaymentStreamsProviderLastChargeableInfo,
+  PalletProofsDealerProofSubmissionRecord,
   PalletStorageProvidersBackupStorageProvider,
   PalletStorageProvidersBucket,
   PalletStorageProvidersMainStorageProvider,
@@ -382,11 +384,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 +412,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]>;
@@ -1376,23 +1381,6 @@ declare module "@polkadot/api-base/types/storage" {
        **/
       lastDeletedTick: AugmentedQuery<ApiType, () => Observable<u32>, []> &
         QueryableStorageEntry<ApiType, []>;
-      /**
-       * A mapping from a Provider to the last tick for which they SHOULD have submitted a proof.
-       * If for a Provider `p`, `LastTickProviderSubmittedAProofFor[p]` is `n`, then the
-       * Provider should submit a proof for tick `n + stake_to_challenge_period(p)`.
-       *
-       * This gets updated when a Provider submits a proof successfully and is used to determine the
-       * next tick for which the Provider should submit a proof, and it's deadline.
-       *
-       * If the Provider fails to submit a proof in time and is slashed, this will still get updated
-       * to the tick it should have submitted a proof for.
-       **/
-      lastTickProviderSubmittedAProofFor: AugmentedQuery<
-        ApiType,
-        (arg: H256 | string | Uint8Array) => Observable<Option<u32>>,
-        [H256]
-      > &
-        QueryableStorageEntry<ApiType, [H256]>;
       /**
        * The number of blocks that have been considered _not_ full in the last [`Config::BlockFullnessPeriod`].
        *
@@ -1430,6 +1418,27 @@ declare module "@polkadot/api-base/types/storage" {
         []
       > &
         QueryableStorageEntry<ApiType, []>;
+      /**
+       * A mapping from a Provider to its [`ProofSubmissionRecord`], which stores the last tick
+       * the Provider submitted a proof for, and the next tick the Provider should submit a proof for.
+       *
+       * Normally the difference between these two ticks is equal to the Provider's challenge period,
+       * but if the Provider's period is changed, this change only affects the next cycle. In other words,
+       * for one cycle, `next_tick_to_submit_proof_for - last_tick_proven ≠ provider_challenge_period`.
+       *
+       * If a Provider submits a proof successfully, both fields are updated.
+       *
+       * If the Provider fails to submit a proof in time and is slashed, only `next_tick_to_submit_proof_for`
+       * is updated.
+       **/
+      providerToProofSubmissionRecord: AugmentedQuery<
+        ApiType,
+        (
+          arg: H256 | string | Uint8Array
+        ) => Observable<Option<PalletProofsDealerProofSubmissionRecord>>,
+        [H256]
+      > &
+        QueryableStorageEntry<ApiType, [H256]>;
       slashableProviders: AugmentedQuery<
         ApiType,
         (arg: H256 | string | Uint8Array) => Observable<Option<u32>>,