Moonsong-Labs · ffarall · Jan 23, 2025 · Jan 3, 2025 · Jan 6, 2025 · Jan 6, 2025
diff --git a/.gitignore b/.gitignore
@@ -33,7 +33,7 @@ res/benchmarking
 test/dist/*
 
 # Ignore cSpell config files
-cSpell.json
+cspell.json
 
 # Don't commit your config file
 config.toml
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api-augment/dist/interfaces/lookup.js b/api-augment/dist/interfaces/lookup.js
diff --git a/api-augment/dist/interfaces/lookup.js.map b/api-augment/dist/interfaces/lookup.js.map
diff --git a/api-augment/dist/types/interfaces/augment-api-events.d.ts b/api-augment/dist/types/interfaces/augment-api-events.d.ts
@@ -2121,14 +2121,35 @@ declare module "@polkadot/api-base/types/events" {
         }
       >;
       /**
-       * A set of mutations has been applied to the Forest.
+       * A set of mutations has been applied to a given Forest.
+       * This is the generic version of [`MutationsAppliedForProvider`](Event::MutationsAppliedForProvider)
+       * when [`generic_apply_delta`](ProofsDealerInterface::generic_apply_delta) is used
+       * and the root is not necessarily linked to a specific Provider.
        **/
       MutationsApplied: AugmentedEvent<
         ApiType,
-        [provider: H256, mutations: Vec<ITuple<[H256, ShpTraitsTrieMutation]>>, newRoot: H256],
+        [mutations: Vec<ITuple<[H256, ShpTraitsTrieMutation]>>, oldRoot: H256, newRoot: H256],
         {
-          provider: H256;
           mutations: Vec<ITuple<[H256, ShpTraitsTrieMutation]>>;
+          oldRoot: H256;
+          newRoot: H256;
+        }
+      >;
+      /**
+       * A set of mutations has been applied to the Forest of a given Provider.
+       **/
+      MutationsAppliedForProvider: AugmentedEvent<
+        ApiType,
+        [
+          providerId: H256,
+          mutations: Vec<ITuple<[H256, ShpTraitsTrieMutation]>>,
+          oldRoot: H256,
+          newRoot: H256
+        ],
+        {
+          providerId: H256;
+          mutations: Vec<ITuple<[H256, ShpTraitsTrieMutation]>>;
+          oldRoot: H256;
           newRoot: H256;
         }
       >;

diff --git a/api-augment/dist/types/interfaces/augment-types.d.ts b/api-augment/dist/types/interfaces/augment-types.d.ts
@@ -1348,6 +1348,7 @@ import type {
   QueryProviderMultiaddressesError,
   QueryStorageProviderCapacityError,
   RandomnessOutput,
+  ReputationWeightType,
   SaveFileToDisk,
   ShouldRemoveFile,
   StorageDataUnit,
@@ -2271,6 +2272,7 @@ declare module "@polkadot/types/types/registry" {
     ReportedRoundStates: ReportedRoundStates;
     Reporter: Reporter;
     ReportIdOf: ReportIdOf;
+    ReputationWeightType: ReputationWeightType;
     ReserveData: ReserveData;
     ReserveIdentifier: ReserveIdentifier;
     Response: Response;

diff --git a/api-augment/dist/types/interfaces/lookup.d.ts b/api-augment/dist/types/interfaces/lookup.d.ts
@@ -1668,9 +1668,15 @@ declare const _default: {
         provider: string;
         maybeProviderAccount: string;
       };
+      MutationsAppliedForProvider: {
+        providerId: string;
+        mutations: string;
+        oldRoot: string;
+        newRoot: string;
+      };
       MutationsApplied: {
-        provider: string;
         mutations: string;
+        oldRoot: string;
         newRoot: string;
       };
       ChallengesTickerSet: {

diff --git a/api-augment/dist/types/interfaces/storagehubclient/types.d.ts b/api-augment/dist/types/interfaces/storagehubclient/types.d.ts
@@ -1,14 +1,26 @@
-import type { Bytes, Enum, Null, Struct, U8aFixed, bool, u32, u64 } from "@polkadot/types-codec";
+import type {
+  Bytes,
+  Enum,
+  Null,
+  Struct,
+  U8aFixed,
+  Vec,
+  bool,
+  u32,
+  u64
+} from "@polkadot/types-codec";
 import type { AccountId, BlockNumber, H256 } from "@polkadot/types/interfaces/runtime";
 /** @name BackupStorageProvider */
 export interface BackupStorageProvider extends Struct {
-  readonly capacity: StorageData;
-  readonly data_used: StorageData;
-  readonly multiaddresses: Bytes;
+  readonly capacity: StorageDataUnit;
+  readonly capacity_used: StorageDataUnit;
+  readonly multiaddresses: Multiaddresses;
   readonly root: MerklePatriciaRoot;
   readonly last_capacity_change: BlockNumber;
   readonly owner_account: AccountId;
   readonly payment_account: AccountId;
+  readonly reputation_weight: ReputationWeightType;
+  readonly sign_up_block: BlockNumber;
 }
 /** @name BackupStorageProviderId */
 export interface BackupStorageProviderId extends H256 {}
@@ -126,7 +138,7 @@ export interface MainStorageProviderId extends H256 {}
 /** @name MerklePatriciaRoot */
 export interface MerklePatriciaRoot extends H256 {}
 /** @name Multiaddresses */
-export interface Multiaddresses extends Bytes {}
+export interface Multiaddresses extends Vec<Bytes> {}
 /** @name ProviderId */
 export interface ProviderId extends H256 {}
 /** @name QueryAvailableStorageCapacityError */
@@ -196,6 +208,8 @@ export interface QueryStorageProviderCapacityError extends Enum {
 }
 /** @name RandomnessOutput */
 export interface RandomnessOutput extends H256 {}
+/** @name ReputationWeightType */
+export interface ReputationWeightType extends u32 {}
 /** @name SaveFileToDisk */
 export interface SaveFileToDisk extends Enum {
   readonly isFileNotFound: boolean;
@@ -208,9 +222,9 @@ export interface SaveFileToDisk extends Enum {
 /** @name ShouldRemoveFile */
 export interface ShouldRemoveFile extends bool {}
 /** @name StorageData */
-export interface StorageData extends u32 {}
+export interface StorageData extends u64 {}
 /** @name StorageDataUnit */
-export interface StorageDataUnit extends u32 {}
+export interface StorageDataUnit extends u64 {}
 /** @name StorageProviderId */
 export interface StorageProviderId extends Enum {
   readonly isBackupStorageProvider: boolean;

diff --git a/api-augment/dist/types/interfaces/types-lookup.d.ts b/api-augment/dist/types/interfaces/types-lookup.d.ts
@@ -2156,10 +2156,17 @@ declare module "@polkadot/types/lookup" {
       readonly provider: H256;
       readonly maybeProviderAccount: Option<AccountId32>;
     } & Struct;
+    readonly isMutationsAppliedForProvider: boolean;
+    readonly asMutationsAppliedForProvider: {
+      readonly providerId: H256;
+      readonly mutations: Vec<ITuple<[H256, ShpTraitsTrieMutation]>>;
+      readonly oldRoot: H256;
+      readonly newRoot: H256;
+    } & Struct;
     readonly isMutationsApplied: boolean;
     readonly asMutationsApplied: {
-      readonly provider: H256;
       readonly mutations: Vec<ITuple<[H256, ShpTraitsTrieMutation]>>;
+      readonly oldRoot: H256;
       readonly newRoot: H256;
     } & Struct;
     readonly isChallengesTickerSet: boolean;
@@ -2174,6 +2181,7 @@ declare module "@polkadot/types/lookup" {
       | "SlashableProvider"
       | "NoRecordOfLastSubmittedProof"
       | "NewChallengeCycleInitialised"
+      | "MutationsAppliedForProvider"
       | "MutationsApplied"
       | "ChallengesTickerSet";
   }

diff --git a/api-augment/src/interfaces/augment-api-events.ts b/api-augment/src/interfaces/augment-api-events.ts
@@ -1643,12 +1643,33 @@ declare module "@polkadot/api-base/types/events" {
        **/
       ChallengesTickerSet: AugmentedEvent<ApiType, [paused: bool], { paused: bool }>;
       /**
-       * A set of mutations has been applied to the Forest.
+       * A set of mutations has been applied to a given Forest.
+       * This is the generic version of [`MutationsAppliedForProvider`](Event::MutationsAppliedForProvider)
+       * when [`generic_apply_delta`](ProofsDealerInterface::generic_apply_delta) is used
+       * and the root is not necessarily linked to a specific Provider.
        **/
       MutationsApplied: AugmentedEvent<
         ApiType,
-        [provider: H256, mutations: Vec<ITuple<[H256, ShpTraitsTrieMutation]>>, newRoot: H256],
-        { provider: H256; mutations: Vec<ITuple<[H256, ShpTraitsTrieMutation]>>; newRoot: H256 }
+        [mutations: Vec<ITuple<[H256, ShpTraitsTrieMutation]>>, oldRoot: H256, newRoot: H256],
+        { mutations: Vec<ITuple<[H256, ShpTraitsTrieMutation]>>; oldRoot: H256; newRoot: H256 }
+      >;
+      /**
+       * A set of mutations has been applied to the Forest of a given Provider.
+       **/
+      MutationsAppliedForProvider: AugmentedEvent<
+        ApiType,
+        [
+          providerId: H256,
+          mutations: Vec<ITuple<[H256, ShpTraitsTrieMutation]>>,
+          oldRoot: H256,
+          newRoot: H256
+        ],
+        {
+          providerId: H256;
+          mutations: Vec<ITuple<[H256, ShpTraitsTrieMutation]>>;
+          oldRoot: H256;
+          newRoot: H256;
+        }
       >;
       /**
        * A manual challenge was submitted.

diff --git a/api-augment/src/interfaces/augment-types.ts b/api-augment/src/interfaces/augment-types.ts
@@ -1354,6 +1354,7 @@ import type {
   QueryProviderMultiaddressesError,
   QueryStorageProviderCapacityError,
   RandomnessOutput,
+  ReputationWeightType,
   SaveFileToDisk,
   ShouldRemoveFile,
   StorageDataUnit,
@@ -2278,6 +2279,7 @@ declare module "@polkadot/types/types/registry" {
     ReportedRoundStates: ReportedRoundStates;
     Reporter: Reporter;
     ReportIdOf: ReportIdOf;
+    ReputationWeightType: ReputationWeightType;
     ReserveData: ReserveData;
     ReserveIdentifier: ReserveIdentifier;
     Response: Response;

diff --git a/api-augment/src/interfaces/lookup.ts b/api-augment/src/interfaces/lookup.ts
@@ -1690,9 +1690,15 @@ export default {
         provider: "H256",
         maybeProviderAccount: "Option<AccountId32>"
       },
+      MutationsAppliedForProvider: {
+        providerId: "H256",
+        mutations: "Vec<(H256,ShpTraitsTrieMutation)>",
+        oldRoot: "H256",
+        newRoot: "H256"
+      },
       MutationsApplied: {
-        provider: "H256",
         mutations: "Vec<(H256,ShpTraitsTrieMutation)>",
+        oldRoot: "H256",
         newRoot: "H256"
       },
       ChallengesTickerSet: {

diff --git a/api-augment/src/interfaces/storagehubclient/types.ts b/api-augment/src/interfaces/storagehubclient/types.ts
@@ -1,18 +1,30 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Enum, Null, Struct, U8aFixed, bool, u32, u64 } from "@polkadot/types-codec";
+import type {
+  Bytes,
+  Enum,
+  Null,
+  Struct,
+  U8aFixed,
+  Vec,
+  bool,
+  u32,
+  u64
+} from "@polkadot/types-codec";
 import type { AccountId, BlockNumber, H256 } from "@polkadot/types/interfaces/runtime";
 
 /** @name BackupStorageProvider */
 export interface BackupStorageProvider extends Struct {
-  readonly capacity: StorageData;
-  readonly data_used: StorageData;
-  readonly multiaddresses: Bytes;
+  readonly capacity: StorageDataUnit;
+  readonly capacity_used: StorageDataUnit;
+  readonly multiaddresses: Multiaddresses;
   readonly root: MerklePatriciaRoot;
   readonly last_capacity_change: BlockNumber;
   readonly owner_account: AccountId;
   readonly payment_account: AccountId;
+  readonly reputation_weight: ReputationWeightType;
+  readonly sign_up_block: BlockNumber;
 }
 
 /** @name BackupStorageProviderId */
@@ -149,7 +161,7 @@ export interface MainStorageProviderId extends H256 {}
 export interface MerklePatriciaRoot extends H256 {}
 
 /** @name Multiaddresses */
-export interface Multiaddresses extends Bytes {}
+export interface Multiaddresses extends Vec<Bytes> {}
 
 /** @name ProviderId */
 export interface ProviderId extends H256 {}
@@ -231,6 +243,9 @@ export interface QueryStorageProviderCapacityError extends Enum {
 /** @name RandomnessOutput */
 export interface RandomnessOutput extends H256 {}
 
+/** @name ReputationWeightType */
+export interface ReputationWeightType extends u32 {}
+
 /** @name SaveFileToDisk */
 export interface SaveFileToDisk extends Enum {
   readonly isFileNotFound: boolean;
@@ -245,10 +260,10 @@ export interface SaveFileToDisk extends Enum {
 export interface ShouldRemoveFile extends bool {}
 
 /** @name StorageData */
-export interface StorageData extends u32 {}
+export interface StorageData extends u64 {}
 
 /** @name StorageDataUnit */
-export interface StorageDataUnit extends u32 {}
+export interface StorageDataUnit extends u64 {}
 
 /** @name StorageProviderId */
 export interface StorageProviderId extends Enum {

diff --git a/api-augment/src/interfaces/types-lookup.ts b/api-augment/src/interfaces/types-lookup.ts
@@ -2247,10 +2247,17 @@ declare module "@polkadot/types/lookup" {
       readonly provider: H256;
       readonly maybeProviderAccount: Option<AccountId32>;
     } & Struct;
+    readonly isMutationsAppliedForProvider: boolean;
+    readonly asMutationsAppliedForProvider: {
+      readonly providerId: H256;
+      readonly mutations: Vec<ITuple<[H256, ShpTraitsTrieMutation]>>;
+      readonly oldRoot: H256;
+      readonly newRoot: H256;
+    } & Struct;
     readonly isMutationsApplied: boolean;
     readonly asMutationsApplied: {
-      readonly provider: H256;
       readonly mutations: Vec<ITuple<[H256, ShpTraitsTrieMutation]>>;
+      readonly oldRoot: H256;
       readonly newRoot: H256;
     } & Struct;
     readonly isChallengesTickerSet: boolean;
@@ -2265,6 +2272,7 @@ declare module "@polkadot/types/lookup" {
       | "SlashableProvider"
       | "NoRecordOfLastSubmittedProof"
       | "NewChallengeCycleInitialised"
+      | "MutationsAppliedForProvider"
       | "MutationsApplied"
       | "ChallengesTickerSet";
   }

diff --git a/api-augment/storagehub.json b/api-augment/storagehub.json
diff --git a/client/blockchain-service/Cargo.toml b/client/blockchain-service/Cargo.toml
@@ -38,6 +38,7 @@ sc-network = { workspace = true }
 sc-utils = { workspace = true }
 sc-tracing = { workspace = true }
 sp-api = { workspace = true }
+sp-blockchain = { workspace = true }
 sp-core = { workspace = true, default-features = true }
 sp-keystore = { workspace = true }
 sp-runtime = { workspace = true, default-features = true }

diff --git a/client/blockchain-service/src/commands.rs b/client/blockchain-service/src/commands.rs
@@ -31,7 +31,7 @@ use super::{
     handler::BlockchainService,
     transaction::SubmittedTransaction,
     types::{
-        BestBlockInfo, ConfirmStoringRequest, Extrinsic, ExtrinsicResult, RespondStorageRequest,
+        ConfirmStoringRequest, Extrinsic, ExtrinsicResult, MinimalBlockInfo, RespondStorageRequest,
         RetryStrategy, StopStoringForInsolventUserRequest, SubmitProofRequest, Tip,
     },
 };
@@ -55,7 +55,7 @@ pub enum BlockchainServiceCommand {
         callback: tokio::sync::oneshot::Sender<Result<()>>,
     },
     GetBestBlockInfo {
-        callback: tokio::sync::oneshot::Sender<BestBlockInfo>,
+        callback: tokio::sync::oneshot::Sender<MinimalBlockInfo>,
     },
     WaitForBlock {
         block_number: BlockNumber,