feat: MSP reject storage requests for existing file keys

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

@@ -1073,7 +1073,7 @@ declare module "@polkadot/rpc-core/types/jsonrpc" {
        **/
       generateForestProof: AugmentedRpc<
         (
-          forest_key: Option<Text> | null | Uint8Array | Text | string,
+          forest_key: Option<H256> | null | Uint8Array | H256 | string,
           challenged_file_keys: Vec<H256> | (H256 | string | Uint8Array)[]
         ) => Observable<Bytes>
       >;
@@ -1082,7 +1082,7 @@ declare module "@polkadot/rpc-core/types/jsonrpc" {
        **/
       getFileMetadata: AugmentedRpc<
         (
-          forest_key: Option<Text> | null | Uint8Array | Text | string,
+          forest_key: Option<H256> | null | Uint8Array | H256 | string,
           file_key: H256 | string | Uint8Array
         ) => Observable<Option<FileMetadata>>
       >;
@@ -1109,7 +1109,7 @@ declare module "@polkadot/rpc-core/types/jsonrpc" {
        **/
       isFileInForest: AugmentedRpc<
         (
-          forest_key: Option<Text> | null | Uint8Array | Text | string,
+          forest_key: Option<H256> | null | Uint8Array | H256 | string,
           file_key: H256 | string | Uint8Array
         ) => Observable<bool>
       >;

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

@@ -1996,8 +1996,13 @@ declare module "@polkadot/types/lookup" {
   interface PalletFileSystemRejectedStorageRequestReason extends Enum {
     readonly isReachedMaximumCapacity: boolean;
     readonly isReceivedInvalidProof: boolean;
+    readonly isFileKeyAlreadyStored: boolean;
     readonly isInternalError: boolean;
-    readonly type: "ReachedMaximumCapacity" | "ReceivedInvalidProof" | "InternalError";
+    readonly type:
+      | "ReachedMaximumCapacity"
+      | "ReceivedInvalidProof"
+      | "FileKeyAlreadyStored"
+      | "InternalError";
   }
   /** @name PalletFileSystemMspFailedBatchStorageRequests (145) */
   interface PalletFileSystemMspFailedBatchStorageRequests extends Struct {

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

@@ -1031,7 +1031,7 @@ declare module "@polkadot/rpc-core/types/jsonrpc" {
        **/
       generateForestProof: AugmentedRpc<
         (
-          forest_key: Option<Text> | null | Uint8Array | Text | string,
+          forest_key: Option<H256> | null | Uint8Array | H256 | string,
           challenged_file_keys: Vec<H256> | (H256 | string | Uint8Array)[]
         ) => Observable<Bytes>
       >;
@@ -1040,7 +1040,7 @@ declare module "@polkadot/rpc-core/types/jsonrpc" {
        **/
       getFileMetadata: AugmentedRpc<
         (
-          forest_key: Option<Text> | null | Uint8Array | Text | string,
+          forest_key: Option<H256> | null | Uint8Array | H256 | string,
           file_key: H256 | string | Uint8Array
         ) => Observable<Option<FileMetadata>>
       >;
@@ -1067,7 +1067,7 @@ declare module "@polkadot/rpc-core/types/jsonrpc" {
        **/
       isFileInForest: AugmentedRpc<
         (
-          forest_key: Option<Text> | null | Uint8Array | Text | string,
+          forest_key: Option<H256> | null | Uint8Array | H256 | string,
           file_key: H256 | string | Uint8Array
         ) => Observable<bool>
       >;

api-augment/src/interfaces/lookup.ts

@@ -1577,7 +1577,12 @@ export default {
    * Lookup143: pallet_file_system::types::RejectedStorageRequestReason
    **/
   PalletFileSystemRejectedStorageRequestReason: {
-    _enum: ["ReachedMaximumCapacity", "ReceivedInvalidProof", "InternalError"]
+    _enum: [
+      "ReachedMaximumCapacity",
+      "ReceivedInvalidProof",
+      "FileKeyAlreadyStored",
+      "InternalError"
+    ]
   },
   /**
    * Lookup145: pallet_file_system::types::MspFailedBatchStorageRequests<T>

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

@@ -2087,8 +2087,13 @@ declare module "@polkadot/types/lookup" {
   interface PalletFileSystemRejectedStorageRequestReason extends Enum {
     readonly isReachedMaximumCapacity: boolean;
     readonly isReceivedInvalidProof: boolean;
+    readonly isFileKeyAlreadyStored: boolean;
     readonly isInternalError: boolean;
-    readonly type: "ReachedMaximumCapacity" | "ReceivedInvalidProof" | "InternalError";
+    readonly type:
+      | "ReachedMaximumCapacity"
+      | "ReceivedInvalidProof"
+      | "FileKeyAlreadyStored"
+      | "InternalError";
   }
 
   /** @name PalletFileSystemMspFailedBatchStorageRequests (145) */

client/file-transfer-service/src/handler.rs

@@ -434,7 +434,7 @@ impl FileTransferService {
                     // Send the response back.
                     pending_response.send(response).unwrap();
                 } else {
-                    error!(
+                    debug!(
                         target: LOG_TARGET,
                         "Received unexpected upload request from {} for file key {:?}",
                         peer,

node/src/services/forest_storage.rs

@@ -46,7 +46,7 @@ impl
             StorageProofsMerkleTrieLayout,
             kvdb_rocksdb::Database,
         >::rocksdb_storage(storage_path.clone())
-        .expect("Failed to create RocksDB for BspProvider");
+        .expect("Failed to create RocksDB");
 
         let fs = RocksDBForestStorage::new(fs).expect("Failed to create Forest Storage");
 
@@ -107,7 +107,7 @@ impl ForestStorageHandler
             StorageProofsMerkleTrieLayout,
             kvdb_rocksdb::Database,
         >::rocksdb_storage(self.storage_path.clone().expect("Storage path should be set for RocksDB implementation"))
-        .expect("Failed to create RocksDB for BspProvider");
+        .expect("Failed to create RocksDB");
 
         let fs = RocksDBForestStorage::new(fs).expect("Failed to create Forest Storage");
 
@@ -184,14 +184,19 @@ where
     }
 
     async fn insert(&mut self, key: &Self::Key) -> Arc<RwLock<Self::FS>> {
+        let mut fs_instances = self.fs_instances.write().await;
+
+        // Return potentially existing instance since we waited for the lock
+        if let Some(fs) = fs_instances.get(key) {
+            return fs.clone();
+        }
+
         let fs = InMemoryForestStorage::new();
 
         let fs = Arc::new(RwLock::new(fs));
 
-        self.fs_instances
-            .write()
-            .await
-            .insert(key.clone(), fs.clone());
+        fs_instances.insert(key.clone(), fs.clone());
+
         fs
     }
 
@@ -217,20 +222,25 @@ where
     }
 
     async fn insert(&mut self, key: &Self::Key) -> Arc<RwLock<Self::FS>> {
+        let mut fs_instances = self.fs_instances.write().await;
+
+        // Return potentially existing instance since we waited for the lock
+        if let Some(fs) = fs_instances.get(key) {
+            return fs.clone();
+        }
+
         let fs = RocksDBForestStorage::<
             StorageProofsMerkleTrieLayout,
             kvdb_rocksdb::Database,
         >::rocksdb_storage(self.storage_path.clone().expect("Storage path should be set for RocksDB implementation"))
-        .expect("Failed to create RocksDB for BspProvider");
+        .expect("Failed to create RocksDB");
 
         let fs = RocksDBForestStorage::new(fs).expect("Failed to create Forest Storage");
 
         let fs = Arc::new(RwLock::new(fs));
 
-        self.fs_instances
-            .write()
-            .await
-            .insert(key.clone(), fs.clone());
+        fs_instances.insert(key.clone(), fs.clone());
+
         fs
     }
 

node/src/tasks/msp_upload_file.rs

@@ -190,7 +190,6 @@ where
                     },
                 );
 
-                // Send extrinsic and wait for it to be included in the block.
                 self.storage_hub_handler
                     .blockchain
                     .send_extrinsic(call, Tip::from(0))
@@ -244,7 +243,6 @@ where
                         },
                     );
 
-                    // Send extrinsic and wait for it to be included in the block.
                     self.storage_hub_handler
                         .blockchain
                         .send_extrinsic(call, Tip::from(0))
@@ -284,7 +282,6 @@ where
                         },
                     );
 
-                    // Send extrinsic and wait for it to be included in the block.
                     self.storage_hub_handler
                         .blockchain
                         .send_extrinsic(call, Tip::from(0))
@@ -319,7 +316,6 @@ where
                         },
                     );
 
-                    // Send extrinsic and wait for it to be included in the block.
                     self.storage_hub_handler
                         .blockchain
                         .send_extrinsic(call, Tip::from(0))
@@ -354,7 +350,6 @@ where
                         },
                     );
 
-                    // Send extrinsic and wait for it to be included in the block.
                     self.storage_hub_handler
                         .blockchain
                         .send_extrinsic(call, Tip::from(0))
@@ -712,6 +707,61 @@ where
             location: event.location.to_vec(),
         };
 
+        // Get the file key.
+        let file_key: FileKey = metadata
+            .file_key::<HashT<StorageProofsMerkleTrieLayout>>()
+            .as_ref()
+            .try_into()?;
+
+        let fs = match self
+            .storage_hub_handler
+            .forest_storage_handler
+            .get(&event.bucket_id.as_ref().to_vec())
+            .await
+        {
+            Some(fs) => fs,
+            None => {
+                self.storage_hub_handler
+                    .forest_storage_handler
+                    .insert(&event.bucket_id.as_ref().to_vec())
+                    .await
+            }
+        };
+
+        let read_fs = fs.read().await;
+
+        // Reject the storage request if file key already exists in the forest storage.
+        if read_fs.contains_file_key(&file_key.into())? {
+            let err_msg = format!("File key {:?} already exists in forest storage.", file_key);
+            debug!(target: LOG_TARGET, "{}", err_msg);
+
+            // Reject the storage request.
+            let call = storage_hub_runtime::RuntimeCall::FileSystem(
+                pallet_file_system::Call::msp_respond_storage_requests_multiple_buckets {
+                    file_key_responses_input: bounded_vec![(
+                        event.bucket_id,
+                        MspStorageRequestResponse {
+                            accept: None,
+                            reject: Some(bounded_vec![(
+                                H256(file_key.into()),
+                                RejectedStorageRequestReason::FileKeyAlreadyStored,
+                            )])
+                        }
+                    )],
+                },
+            );
+
+            self.storage_hub_handler
+                .blockchain
+                .send_extrinsic(call, Tip::from(0))
+                .await?
+                .with_timeout(Duration::from_secs(60))
+                .watch_for_success(&self.storage_hub_handler.blockchain)
+                .await?;
+
+            return Ok(());
+        }
+
         let available_capacity = self
             .storage_hub_handler
             .blockchain
@@ -824,15 +874,7 @@ where
                 let call = storage_hub_runtime::RuntimeCall::FileSystem(
                     pallet_file_system::Call::msp_respond_storage_requests_multiple_buckets {
                         file_key_responses_input: bounded_vec![(
-                            H256(metadata.bucket_id.try_into().map_err(|e| {
-                                let err_msg =
-                                    format!("Failed to convert bucket ID to [u8; 32]: {:?}", e);
-                                error!(
-                                    target: LOG_TARGET,
-                                    err_msg
-                                );
-                                anyhow::anyhow!(err_msg)
-                            })?),
+                            event.bucket_id,
                             MspStorageRequestResponse {
                                 accept: None,
                                 reject: Some(bounded_vec![(
@@ -844,7 +886,6 @@ where
                     },
                 );
 
-                // Send extrinsic and wait for it to be included in the block.
                 self.storage_hub_handler
                     .blockchain
                     .send_extrinsic(call, Tip::from(0))
@@ -857,12 +898,6 @@ where
             }
         }
 
-        // Get the file key.
-        let file_key: FileKey = metadata
-            .file_key::<HashT<StorageProofsMerkleTrieLayout>>()
-            .as_ref()
-            .try_into()?;
-
         self.file_key_cleanup = Some(file_key.into());
 
         // Register the file for upload in the file transfer service.

pallets/file-system/src/types.rs

@@ -152,6 +152,7 @@ pub struct AcceptedStorageRequestParameters<T: Config> {
 pub enum RejectedStorageRequestReason {
     ReachedMaximumCapacity,
     ReceivedInvalidProof,
+    FileKeyAlreadyStored,
     InternalError,
 }
 

test/scripts/fullNetBootstrap.ts

@@ -6,7 +6,7 @@ import {
   type ToxicInfo
 } from "../util";
 import * as ShConsts from "../util/bspNet/consts";
-import { runFullNet } from "../util/fullNet/helpers";
+import { runSimpleFullNet } from "../util/fullNet/helpers";
 
 let api: EnrichedBspApi | undefined;
 const fullNetConfig: BspNetConfig = {
@@ -21,7 +21,7 @@ const CONFIG = {
 };
 
 async function bootStrapNetwork() {
-  await runFullNet(fullNetConfig);
+  await runSimpleFullNet(fullNetConfig);
 
   if (fullNetConfig.noisy) {
     // For more info on the kind of toxics you can register,