diff --git a/clients/tfchain-client-go/utils.go b/clients/tfchain-client-go/utils.go
index 1151a489d..af13735c6 100644
--- a/clients/tfchain-client-go/utils.go
+++ b/clients/tfchain-client-go/utils.go
@@ -246,6 +246,7 @@ var tfgridModuleErrors = []string{
 	"NodeHasActiveContracts",
 	"InvalidRelayAddress",
 	"InvalidTimestampHint",
+	"InvalidStorageInput",
 }
 
 // https://github.com/threefoldtech/tfchain/blob/development/substrate-node/pallets/pallet-tft-bridge/src/lib.rs#L152
diff --git a/substrate-node/pallets/pallet-burning/src/weights.rs b/substrate-node/pallets/pallet-burning/src/weights.rs
index d98c3e26b..0a0354124 100644
--- a/substrate-node/pallets/pallet-burning/src/weights.rs
+++ b/substrate-node/pallets/pallet-burning/src/weights.rs
@@ -2,9 +2,9 @@
 //! Autogenerated weights for pallet_burning
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-05-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `3144932f6af7`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
+//! HOSTNAME: `7f09c44a8947`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
 //! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -45,8 +45,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `1594`
-		// Minimum execution time: 42_280_000 picoseconds.
-		Weight::from_parts(42_982_000, 1594)
+		// Minimum execution time: 27_162_000 picoseconds.
+		Weight::from_parts(27_532_000, 1594)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -60,8 +60,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `1594`
-		// Minimum execution time: 42_280_000 picoseconds.
-		Weight::from_parts(42_982_000, 1594)
+		// Minimum execution time: 27_162_000 picoseconds.
+		Weight::from_parts(27_532_000, 1594)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
diff --git a/substrate-node/pallets/pallet-dao/src/weights.rs b/substrate-node/pallets/pallet-dao/src/weights.rs
index 0adb7f7bc..2ebca45d3 100644
--- a/substrate-node/pallets/pallet-dao/src/weights.rs
+++ b/substrate-node/pallets/pallet-dao/src/weights.rs
@@ -2,9 +2,9 @@
 //! Autogenerated weights for pallet_dao
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-05-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `3144932f6af7`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
+//! HOSTNAME: `7f09c44a8947`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
 //! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -58,8 +58,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `4687`
-		// Minimum execution time: 60_124_000 picoseconds.
-		Weight::from_parts(61_897_000, 4687)
+		// Minimum execution time: 19_226_000 picoseconds.
+		Weight::from_parts(19_677_000, 4687)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -77,8 +77,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `979`
 		//  Estimated: `4444`
-		// Minimum execution time: 35_097_000 picoseconds.
-		Weight::from_parts(35_647_000, 4444)
+		// Minimum execution time: 26_420_000 picoseconds.
+		Weight::from_parts(26_761_000, 4444)
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -92,8 +92,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `487`
 		//  Estimated: `4687`
-		// Minimum execution time: 25_068_000 picoseconds.
-		Weight::from_parts(25_618_000, 4687)
+		// Minimum execution time: 18_605_000 picoseconds.
+		Weight::from_parts(18_945_000, 4687)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -111,8 +111,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `469`
 		//  Estimated: `4687`
-		// Minimum execution time: 34_275_000 picoseconds.
-		Weight::from_parts(34_786_000, 4687)
+		// Minimum execution time: 23_945_000 picoseconds.
+		Weight::from_parts(24_396_000, 4687)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -136,8 +136,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `4687`
-		// Minimum execution time: 60_124_000 picoseconds.
-		Weight::from_parts(61_897_000, 4687)
+		// Minimum execution time: 19_226_000 picoseconds.
+		Weight::from_parts(19_677_000, 4687)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -155,8 +155,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `979`
 		//  Estimated: `4444`
-		// Minimum execution time: 35_097_000 picoseconds.
-		Weight::from_parts(35_647_000, 4444)
+		// Minimum execution time: 26_420_000 picoseconds.
+		Weight::from_parts(26_761_000, 4444)
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -170,8 +170,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `487`
 		//  Estimated: `4687`
-		// Minimum execution time: 25_068_000 picoseconds.
-		Weight::from_parts(25_618_000, 4687)
+		// Minimum execution time: 18_605_000 picoseconds.
+		Weight::from_parts(18_945_000, 4687)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -189,8 +189,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `469`
 		//  Estimated: `4687`
-		// Minimum execution time: 34_275_000 picoseconds.
-		Weight::from_parts(34_786_000, 4687)
+		// Minimum execution time: 23_945_000 picoseconds.
+		Weight::from_parts(24_396_000, 4687)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
diff --git a/substrate-node/pallets/pallet-kvstore/src/weights.rs b/substrate-node/pallets/pallet-kvstore/src/weights.rs
index 2508659b7..0bc1314a1 100644
--- a/substrate-node/pallets/pallet-kvstore/src/weights.rs
+++ b/substrate-node/pallets/pallet-kvstore/src/weights.rs
@@ -2,9 +2,9 @@
 //! Autogenerated weights for pallet_kvstore
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-05-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `3144932f6af7`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
+//! HOSTNAME: `7f09c44a8947`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
 //! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -46,8 +46,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_647_000 picoseconds.
-		Weight::from_parts(11_722_000, 0)
+		// Minimum execution time: 6_763_000 picoseconds.
+		Weight::from_parts(7_043_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `TFKVStore::TFKVStore` (r:1 w:1)
@@ -56,8 +56,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `146`
 		//  Estimated: `3611`
-		// Minimum execution time: 20_228_000 picoseconds.
-		Weight::from_parts(21_210_000, 3611)
+		// Minimum execution time: 12_313_000 picoseconds.
+		Weight::from_parts(12_654_000, 3611)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -71,8 +71,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_647_000 picoseconds.
-		Weight::from_parts(11_722_000, 0)
+		// Minimum execution time: 6_763_000 picoseconds.
+		Weight::from_parts(7_043_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `TFKVStore::TFKVStore` (r:1 w:1)
@@ -81,8 +81,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `146`
 		//  Estimated: `3611`
-		// Minimum execution time: 20_228_000 picoseconds.
-		Weight::from_parts(21_210_000, 3611)
+		// Minimum execution time: 12_313_000 picoseconds.
+		Weight::from_parts(12_654_000, 3611)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
diff --git a/substrate-node/pallets/pallet-smart-contract/src/weights.rs b/substrate-node/pallets/pallet-smart-contract/src/weights.rs
index efdc05598..79f4310bf 100644
--- a/substrate-node/pallets/pallet-smart-contract/src/weights.rs
+++ b/substrate-node/pallets/pallet-smart-contract/src/weights.rs
@@ -2,9 +2,9 @@
 //! Autogenerated weights for pallet_smart_contract
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-05-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `3144932f6af7`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
+//! HOSTNAME: `7f09c44a8947`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
 //! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -95,8 +95,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `868`
 		//  Estimated: `4333`
-		// Minimum execution time: 102_203_000 picoseconds.
-		Weight::from_parts(104_197_000, 4333)
+		// Minimum execution time: 48_782_000 picoseconds.
+		Weight::from_parts(49_754_000, 4333)
 			.saturating_add(T::DbWeight::get().reads(12_u64))
 			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
@@ -112,8 +112,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `892`
 		//  Estimated: `4357`
-		// Minimum execution time: 26_891_000 picoseconds.
-		Weight::from_parts(27_472_000, 4357)
+		// Minimum execution time: 27_191_000 picoseconds.
+		Weight::from_parts(27_723_000, 4357)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -145,8 +145,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1203`
 		//  Estimated: `4668`
-		// Minimum execution time: 60_284_000 picoseconds.
-		Weight::from_parts(61_346_000, 4668)
+		// Minimum execution time: 61_075_000 picoseconds.
+		Weight::from_parts(62_097_000, 4668)
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
@@ -170,8 +170,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `340`
 		//  Estimated: `3805`
-		// Minimum execution time: 24_977_000 picoseconds.
-		Weight::from_parts(25_658_000, 3805)
+		// Minimum execution time: 24_636_000 picoseconds.
+		Weight::from_parts(25_037_000, 3805)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -197,8 +197,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `919`
 		//  Estimated: `4384`
-		// Minimum execution time: 46_538_000 picoseconds.
-		Weight::from_parts(47_230_000, 4384)
+		// Minimum execution time: 46_498_000 picoseconds.
+		Weight::from_parts(47_310_000, 4384)
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -220,8 +220,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1292`
 		//  Estimated: `4757`
-		// Minimum execution time: 38_072_000 picoseconds.
-		Weight::from_parts(38_763_000, 4757)
+		// Minimum execution time: 38_082_000 picoseconds.
+		Weight::from_parts(39_114_000, 4757)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -237,8 +237,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `771`
 		//  Estimated: `4236`
-		// Minimum execution time: 23_194_000 picoseconds.
-		Weight::from_parts(23_485_000, 4236)
+		// Minimum execution time: 23_054_000 picoseconds.
+		Weight::from_parts(23_495_000, 4236)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -268,8 +268,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `776`
 		//  Estimated: `4241`
-		// Minimum execution time: 34_876_000 picoseconds.
-		Weight::from_parts(35_417_000, 4241)
+		// Minimum execution time: 35_056_000 picoseconds.
+		Weight::from_parts(35_547_000, 4241)
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -303,8 +303,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1284`
 		//  Estimated: `4749`
-		// Minimum execution time: 60_275_000 picoseconds.
-		Weight::from_parts(60_955_000, 4749)
+		// Minimum execution time: 60_054_000 picoseconds.
+		Weight::from_parts(60_945_000, 4749)
 			.saturating_add(T::DbWeight::get().reads(12_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -316,8 +316,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `37`
 		//  Estimated: `1522`
-		// Minimum execution time: 10_290_000 picoseconds.
-		Weight::from_parts(10_560_000, 1522)
+		// Minimum execution time: 9_808_000 picoseconds.
+		Weight::from_parts(10_179_000, 1522)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -327,8 +327,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `215`
 		//  Estimated: `3680`
-		// Minimum execution time: 13_215_000 picoseconds.
-		Weight::from_parts(13_535_000, 3680)
+		// Minimum execution time: 12_614_000 picoseconds.
+		Weight::from_parts(13_024_000, 3680)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -368,8 +368,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1608`
 		//  Estimated: `5073`
-		// Minimum execution time: 80_642_000 picoseconds.
-		Weight::from_parts(81_735_000, 5073)
+		// Minimum execution time: 80_311_000 picoseconds.
+		Weight::from_parts(81_725_000, 5073)
 			.saturating_add(T::DbWeight::get().reads(16_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -383,8 +383,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `395`
 		//  Estimated: `6335`
-		// Minimum execution time: 18_926_000 picoseconds.
-		Weight::from_parts(19_386_000, 6335)
+		// Minimum execution time: 18_405_000 picoseconds.
+		Weight::from_parts(18_976_000, 6335)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -396,8 +396,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `489`
 		//  Estimated: `3954`
-		// Minimum execution time: 16_892_000 picoseconds.
-		Weight::from_parts(17_293_000, 3954)
+		// Minimum execution time: 16_491_000 picoseconds.
+		Weight::from_parts(16_752_000, 3954)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -409,8 +409,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `489`
 		//  Estimated: `3954`
-		// Minimum execution time: 16_562_000 picoseconds.
-		Weight::from_parts(16_732_000, 3954)
+		// Minimum execution time: 16_351_000 picoseconds.
+		Weight::from_parts(16_602_000, 3954)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -422,8 +422,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `502`
 		//  Estimated: `3967`
-		// Minimum execution time: 16_821_000 picoseconds.
-		Weight::from_parts(17_292_000, 3967)
+		// Minimum execution time: 16_602_000 picoseconds.
+		Weight::from_parts(16_782_000, 3967)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -435,8 +435,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `502`
 		//  Estimated: `3967`
-		// Minimum execution time: 17_693_000 picoseconds.
-		Weight::from_parts(18_014_000, 3967)
+		// Minimum execution time: 17_192_000 picoseconds.
+		Weight::from_parts(17_733_000, 3967)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -448,8 +448,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `502`
 		//  Estimated: `3967`
-		// Minimum execution time: 16_401_000 picoseconds.
-		Weight::from_parts(16_662_000, 3967)
+		// Minimum execution time: 15_990_000 picoseconds.
+		Weight::from_parts(16_492_000, 3967)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -467,8 +467,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `841`
 		//  Estimated: `6781`
-		// Minimum execution time: 30_327_000 picoseconds.
-		Weight::from_parts(31_189_000, 6781)
+		// Minimum execution time: 30_478_000 picoseconds.
+		Weight::from_parts(30_958_000, 6781)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -478,8 +478,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `37`
 		//  Estimated: `1522`
-		// Minimum execution time: 7_855_000 picoseconds.
-		Weight::from_parts(8_076_000, 1522)
+		// Minimum execution time: 7_754_000 picoseconds.
+		Weight::from_parts(7_965_000, 1522)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -493,8 +493,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `971`
 		//  Estimated: `4436`
-		// Minimum execution time: 22_222_000 picoseconds.
-		Weight::from_parts(22_462_000, 4436)
+		// Minimum execution time: 21_721_000 picoseconds.
+		Weight::from_parts(22_172_000, 4436)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -514,8 +514,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `733`
 		//  Estimated: `4198`
-		// Minimum execution time: 23_424_000 picoseconds.
-		Weight::from_parts(23_775_000, 4198)
+		// Minimum execution time: 23_384_000 picoseconds.
+		Weight::from_parts(24_056_000, 4198)
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -547,8 +547,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1203`
 		//  Estimated: `4668`
-		// Minimum execution time: 58_861_000 picoseconds.
-		Weight::from_parts(59_413_000, 4668)
+		// Minimum execution time: 59_172_000 picoseconds.
+		Weight::from_parts(60_705_000, 4668)
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
@@ -590,8 +590,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `868`
 		//  Estimated: `4333`
-		// Minimum execution time: 102_203_000 picoseconds.
-		Weight::from_parts(104_197_000, 4333)
+		// Minimum execution time: 48_782_000 picoseconds.
+		Weight::from_parts(49_754_000, 4333)
 			.saturating_add(RocksDbWeight::get().reads(12_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
@@ -607,8 +607,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `892`
 		//  Estimated: `4357`
-		// Minimum execution time: 26_891_000 picoseconds.
-		Weight::from_parts(27_472_000, 4357)
+		// Minimum execution time: 27_191_000 picoseconds.
+		Weight::from_parts(27_723_000, 4357)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -640,8 +640,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1203`
 		//  Estimated: `4668`
-		// Minimum execution time: 60_284_000 picoseconds.
-		Weight::from_parts(61_346_000, 4668)
+		// Minimum execution time: 61_075_000 picoseconds.
+		Weight::from_parts(62_097_000, 4668)
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
@@ -665,8 +665,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `340`
 		//  Estimated: `3805`
-		// Minimum execution time: 24_977_000 picoseconds.
-		Weight::from_parts(25_658_000, 3805)
+		// Minimum execution time: 24_636_000 picoseconds.
+		Weight::from_parts(25_037_000, 3805)
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -692,8 +692,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `919`
 		//  Estimated: `4384`
-		// Minimum execution time: 46_538_000 picoseconds.
-		Weight::from_parts(47_230_000, 4384)
+		// Minimum execution time: 46_498_000 picoseconds.
+		Weight::from_parts(47_310_000, 4384)
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -715,8 +715,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1292`
 		//  Estimated: `4757`
-		// Minimum execution time: 38_072_000 picoseconds.
-		Weight::from_parts(38_763_000, 4757)
+		// Minimum execution time: 38_082_000 picoseconds.
+		Weight::from_parts(39_114_000, 4757)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -732,8 +732,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `771`
 		//  Estimated: `4236`
-		// Minimum execution time: 23_194_000 picoseconds.
-		Weight::from_parts(23_485_000, 4236)
+		// Minimum execution time: 23_054_000 picoseconds.
+		Weight::from_parts(23_495_000, 4236)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -763,8 +763,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `776`
 		//  Estimated: `4241`
-		// Minimum execution time: 34_876_000 picoseconds.
-		Weight::from_parts(35_417_000, 4241)
+		// Minimum execution time: 35_056_000 picoseconds.
+		Weight::from_parts(35_547_000, 4241)
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -798,8 +798,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1284`
 		//  Estimated: `4749`
-		// Minimum execution time: 60_275_000 picoseconds.
-		Weight::from_parts(60_955_000, 4749)
+		// Minimum execution time: 60_054_000 picoseconds.
+		Weight::from_parts(60_945_000, 4749)
 			.saturating_add(RocksDbWeight::get().reads(12_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -811,8 +811,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `37`
 		//  Estimated: `1522`
-		// Minimum execution time: 10_290_000 picoseconds.
-		Weight::from_parts(10_560_000, 1522)
+		// Minimum execution time: 9_808_000 picoseconds.
+		Weight::from_parts(10_179_000, 1522)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -822,8 +822,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `215`
 		//  Estimated: `3680`
-		// Minimum execution time: 13_215_000 picoseconds.
-		Weight::from_parts(13_535_000, 3680)
+		// Minimum execution time: 12_614_000 picoseconds.
+		Weight::from_parts(13_024_000, 3680)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -863,8 +863,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1608`
 		//  Estimated: `5073`
-		// Minimum execution time: 80_642_000 picoseconds.
-		Weight::from_parts(81_735_000, 5073)
+		// Minimum execution time: 80_311_000 picoseconds.
+		Weight::from_parts(81_725_000, 5073)
 			.saturating_add(RocksDbWeight::get().reads(16_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -878,8 +878,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `395`
 		//  Estimated: `6335`
-		// Minimum execution time: 18_926_000 picoseconds.
-		Weight::from_parts(19_386_000, 6335)
+		// Minimum execution time: 18_405_000 picoseconds.
+		Weight::from_parts(18_976_000, 6335)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -891,8 +891,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `489`
 		//  Estimated: `3954`
-		// Minimum execution time: 16_892_000 picoseconds.
-		Weight::from_parts(17_293_000, 3954)
+		// Minimum execution time: 16_491_000 picoseconds.
+		Weight::from_parts(16_752_000, 3954)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -904,8 +904,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `489`
 		//  Estimated: `3954`
-		// Minimum execution time: 16_562_000 picoseconds.
-		Weight::from_parts(16_732_000, 3954)
+		// Minimum execution time: 16_351_000 picoseconds.
+		Weight::from_parts(16_602_000, 3954)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -917,8 +917,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `502`
 		//  Estimated: `3967`
-		// Minimum execution time: 16_821_000 picoseconds.
-		Weight::from_parts(17_292_000, 3967)
+		// Minimum execution time: 16_602_000 picoseconds.
+		Weight::from_parts(16_782_000, 3967)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -930,8 +930,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `502`
 		//  Estimated: `3967`
-		// Minimum execution time: 17_693_000 picoseconds.
-		Weight::from_parts(18_014_000, 3967)
+		// Minimum execution time: 17_192_000 picoseconds.
+		Weight::from_parts(17_733_000, 3967)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -943,8 +943,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `502`
 		//  Estimated: `3967`
-		// Minimum execution time: 16_401_000 picoseconds.
-		Weight::from_parts(16_662_000, 3967)
+		// Minimum execution time: 15_990_000 picoseconds.
+		Weight::from_parts(16_492_000, 3967)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -962,8 +962,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `841`
 		//  Estimated: `6781`
-		// Minimum execution time: 30_327_000 picoseconds.
-		Weight::from_parts(31_189_000, 6781)
+		// Minimum execution time: 30_478_000 picoseconds.
+		Weight::from_parts(30_958_000, 6781)
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -973,8 +973,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `37`
 		//  Estimated: `1522`
-		// Minimum execution time: 7_855_000 picoseconds.
-		Weight::from_parts(8_076_000, 1522)
+		// Minimum execution time: 7_754_000 picoseconds.
+		Weight::from_parts(7_965_000, 1522)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -988,8 +988,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `971`
 		//  Estimated: `4436`
-		// Minimum execution time: 22_222_000 picoseconds.
-		Weight::from_parts(22_462_000, 4436)
+		// Minimum execution time: 21_721_000 picoseconds.
+		Weight::from_parts(22_172_000, 4436)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1009,8 +1009,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `733`
 		//  Estimated: `4198`
-		// Minimum execution time: 23_424_000 picoseconds.
-		Weight::from_parts(23_775_000, 4198)
+		// Minimum execution time: 23_384_000 picoseconds.
+		Weight::from_parts(24_056_000, 4198)
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1042,8 +1042,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1203`
 		//  Estimated: `4668`
-		// Minimum execution time: 58_861_000 picoseconds.
-		Weight::from_parts(59_413_000, 4668)
+		// Minimum execution time: 59_172_000 picoseconds.
+		Weight::from_parts(60_705_000, 4668)
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
diff --git a/substrate-node/pallets/pallet-tfgrid/src/lib.rs b/substrate-node/pallets/pallet-tfgrid/src/lib.rs
index 1fea9fcca..55c032ef9 100644
--- a/substrate-node/pallets/pallet-tfgrid/src/lib.rs
+++ b/substrate-node/pallets/pallet-tfgrid/src/lib.rs
@@ -572,6 +572,8 @@ pub mod pallet {
         NodeHasActiveContracts,
         InvalidRelayAddress,
         InvalidTimestampHint,
+
+        InvalidStorageInput,
     }
 
     #[pallet::genesis_config]
diff --git a/substrate-node/pallets/pallet-tfgrid/src/node.rs b/substrate-node/pallets/pallet-tfgrid/src/node.rs
index 2a219319b..caf4e369f 100644
--- a/substrate-node/pallets/pallet-tfgrid/src/node.rs
+++ b/substrate-node/pallets/pallet-tfgrid/src/node.rs
@@ -392,8 +392,7 @@ impl<T: Config> Pallet<T> {
     fn get_resources(
         resources: pallet::ResourcesInput,
     ) -> Result<Resources, DispatchErrorWithPostInfo> {
-        ensure!(resources.validate_hru(), Error::<T>::InvalidHRUInput);
-        ensure!(resources.validate_sru(), Error::<T>::InvalidSRUInput);
+        ensure!(resources.validate_storage(), Error::<T>::InvalidStorageInput);
         ensure!(resources.validate_cru(), Error::<T>::InvalidCRUInput);
         ensure!(resources.validate_mru(), Error::<T>::InvalidMRUInput);
 
diff --git a/substrate-node/pallets/pallet-tfgrid/src/weights.rs b/substrate-node/pallets/pallet-tfgrid/src/weights.rs
index 1e883699a..dba3a9033 100644
--- a/substrate-node/pallets/pallet-tfgrid/src/weights.rs
+++ b/substrate-node/pallets/pallet-tfgrid/src/weights.rs
@@ -2,9 +2,9 @@
 //! Autogenerated weights for pallet_tfgrid
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-05-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `3144932f6af7`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
+//! HOSTNAME: `7f09c44a8947`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
 //! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -76,8 +76,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_857_000 picoseconds.
-		Weight::from_parts(4_047_000, 0)
+		// Minimum execution time: 2_555_000 picoseconds.
+		Weight::from_parts(2_625_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `TfgridModule::TwinIdByAccountID` (r:1 w:0)
@@ -94,8 +94,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `496`
 		//  Estimated: `3961`
-		// Minimum execution time: 32_251_000 picoseconds.
-		Weight::from_parts(32_712_000, 3961)
+		// Minimum execution time: 19_907_000 picoseconds.
+		Weight::from_parts(20_369_000, 3961)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -109,8 +109,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `507`
 		//  Estimated: `3972`
-		// Minimum execution time: 34_135_000 picoseconds.
-		Weight::from_parts(35_327_000, 3972)
+		// Minimum execution time: 21_481_000 picoseconds.
+		Weight::from_parts(21_921_000, 3972)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -124,8 +124,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `453`
 		//  Estimated: `3918`
-		// Minimum execution time: 18_865_000 picoseconds.
-		Weight::from_parts(25_378_000, 3918)
+		// Minimum execution time: 15_690_000 picoseconds.
+		Weight::from_parts(16_100_000, 3918)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -135,8 +135,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `412`
 		//  Estimated: `3877`
-		// Minimum execution time: 13_105_000 picoseconds.
-		Weight::from_parts(13_406_000, 3877)
+		// Minimum execution time: 13_024_000 picoseconds.
+		Weight::from_parts(13_345_000, 3877)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -148,8 +148,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `569`
 		//  Estimated: `4034`
-		// Minimum execution time: 17_734_000 picoseconds.
-		Weight::from_parts(18_165_000, 4034)
+		// Minimum execution time: 17_704_000 picoseconds.
+		Weight::from_parts(17_894_000, 4034)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -161,8 +161,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `569`
 		//  Estimated: `4034`
-		// Minimum execution time: 16_922_000 picoseconds.
-		Weight::from_parts(17_473_000, 4034)
+		// Minimum execution time: 16_992_000 picoseconds.
+		Weight::from_parts(17_153_000, 4034)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -190,8 +190,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `905`
 		//  Estimated: `11795`
-		// Minimum execution time: 47_360_000 picoseconds.
-		Weight::from_parts(48_562_000, 11795)
+		// Minimum execution time: 47_981_000 picoseconds.
+		Weight::from_parts(49_514_000, 11795)
 			.saturating_add(T::DbWeight::get().reads(12_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -207,8 +207,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `661`
 		//  Estimated: `4126`
-		// Minimum execution time: 27_062_000 picoseconds.
-		Weight::from_parts(27_723_000, 4126)
+		// Minimum execution time: 26_710_000 picoseconds.
+		Weight::from_parts(27_422_000, 4126)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -222,8 +222,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `956`
 		//  Estimated: `11846`
-		// Minimum execution time: 34_295_000 picoseconds.
-		Weight::from_parts(35_096_000, 11846)
+		// Minimum execution time: 34_064_000 picoseconds.
+		Weight::from_parts(34_926_000, 11846)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -239,8 +239,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `454`
 		//  Estimated: `3919`
-		// Minimum execution time: 18_635_000 picoseconds.
-		Weight::from_parts(19_006_000, 3919)
+		// Minimum execution time: 18_475_000 picoseconds.
+		Weight::from_parts(18_886_000, 3919)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 	}
 	/// Storage: `TfgridModule::Farms` (r:1 w:0)
@@ -253,8 +253,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `779`
 		//  Estimated: `4244`
-		// Minimum execution time: 24_637_000 picoseconds.
-		Weight::from_parts(25_277_000, 4244)
+		// Minimum execution time: 24_246_000 picoseconds.
+		Weight::from_parts(24_957_000, 4244)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -274,8 +274,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `682`
 		//  Estimated: `4147`
-		// Minimum execution time: 27_362_000 picoseconds.
-		Weight::from_parts(27_943_000, 4147)
+		// Minimum execution time: 27_592_000 picoseconds.
+		Weight::from_parts(28_203_000, 4147)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -291,8 +291,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `235`
 		//  Estimated: `3700`
-		// Minimum execution time: 14_568_000 picoseconds.
-		Weight::from_parts(14_808_000, 3700)
+		// Minimum execution time: 14_087_000 picoseconds.
+		Weight::from_parts(14_357_000, 3700)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -304,8 +304,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `428`
 		//  Estimated: `3893`
-		// Minimum execution time: 15_088_000 picoseconds.
-		Weight::from_parts(15_479_000, 3893)
+		// Minimum execution time: 14_868_000 picoseconds.
+		Weight::from_parts(15_249_000, 3893)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -319,8 +319,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `134`
 		//  Estimated: `3599`
-		// Minimum execution time: 12_373_000 picoseconds.
-		Weight::from_parts(12_624_000, 3599)
+		// Minimum execution time: 12_093_000 picoseconds.
+		Weight::from_parts(12_463_000, 3599)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -334,8 +334,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `382`
 		//  Estimated: `3847`
-		// Minimum execution time: 16_632_000 picoseconds.
-		Weight::from_parts(17_143_000, 3847)
+		// Minimum execution time: 16_180_000 picoseconds.
+		Weight::from_parts(16_611_000, 3847)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -347,8 +347,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `134`
 		//  Estimated: `1619`
-		// Minimum execution time: 10_439_000 picoseconds.
-		Weight::from_parts(10_610_000, 1619)
+		// Minimum execution time: 10_150_000 picoseconds.
+		Weight::from_parts(10_430_000, 1619)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -360,8 +360,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `140`
 		//  Estimated: `3605`
-		// Minimum execution time: 7_514_000 picoseconds.
-		Weight::from_parts(7_644_000, 3605)
+		// Minimum execution time: 7_364_000 picoseconds.
+		Weight::from_parts(7_504_000, 3605)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -385,8 +385,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `828`
 		//  Estimated: `4293`
-		// Minimum execution time: 32_582_000 picoseconds.
-		Weight::from_parts(33_443_000, 4293)
+		// Minimum execution time: 32_271_000 picoseconds.
+		Weight::from_parts(32_913_000, 4293)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -396,8 +396,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `412`
 		//  Estimated: `3877`
-		// Minimum execution time: 13_716_000 picoseconds.
-		Weight::from_parts(14_277_000, 3877)
+		// Minimum execution time: 13_174_000 picoseconds.
+		Weight::from_parts(13_505_000, 3877)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -407,8 +407,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `412`
 		//  Estimated: `3877`
-		// Minimum execution time: 13_846_000 picoseconds.
-		Weight::from_parts(14_117_000, 3877)
+		// Minimum execution time: 13_515_000 picoseconds.
+		Weight::from_parts(13_796_000, 3877)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -418,8 +418,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_721_000 picoseconds.
-		Weight::from_parts(5_861_000, 0)
+		// Minimum execution time: 5_551_000 picoseconds.
+		Weight::from_parts(5_721_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `TfgridModule::AllowedNodeCertifiers` (r:1 w:1)
@@ -428,8 +428,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `355`
 		//  Estimated: `1840`
-		// Minimum execution time: 9_819_000 picoseconds.
-		Weight::from_parts(10_039_000, 1840)
+		// Minimum execution time: 9_478_000 picoseconds.
+		Weight::from_parts(9_668_000, 1840)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -439,8 +439,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `413`
 		//  Estimated: `1898`
-		// Minimum execution time: 11_982_000 picoseconds.
-		Weight::from_parts(12_323_000, 1898)
+		// Minimum execution time: 11_772_000 picoseconds.
+		Weight::from_parts(12_133_000, 1898)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -450,8 +450,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `294`
 		//  Estimated: `3759`
-		// Minimum execution time: 13_335_000 picoseconds.
-		Weight::from_parts(13_675_000, 3759)
+		// Minimum execution time: 12_985_000 picoseconds.
+		Weight::from_parts(13_175_000, 3759)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -465,8 +465,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `572`
 		//  Estimated: `4037`
-		// Minimum execution time: 22_172_000 picoseconds.
-		Weight::from_parts(22_693_000, 4037)
+		// Minimum execution time: 21_661_000 picoseconds.
+		Weight::from_parts(22_332_000, 4037)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -476,8 +476,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `134`
 		//  Estimated: `1619`
-		// Minimum execution time: 8_055_000 picoseconds.
-		Weight::from_parts(8_216_000, 1619)
+		// Minimum execution time: 7_894_000 picoseconds.
+		Weight::from_parts(8_075_000, 1619)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -493,8 +493,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `621`
 		//  Estimated: `4086`
-		// Minimum execution time: 22_723_000 picoseconds.
-		Weight::from_parts(23_154_000, 4086)
+		// Minimum execution time: 22_282_000 picoseconds.
+		Weight::from_parts(22_843_000, 4086)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -514,8 +514,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `792`
 		//  Estimated: `4257`
-		// Minimum execution time: 26_440_000 picoseconds.
-		Weight::from_parts(27_042_000, 4257)
+		// Minimum execution time: 25_709_000 picoseconds.
+		Weight::from_parts(26_310_000, 4257)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -527,8 +527,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `387`
 		//  Estimated: `3852`
-		// Minimum execution time: 11_832_000 picoseconds.
-		Weight::from_parts(12_083_000, 3852)
+		// Minimum execution time: 11_652_000 picoseconds.
+		Weight::from_parts(12_063_000, 3852)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -544,8 +544,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `454`
 		//  Estimated: `3919`
-		// Minimum execution time: 18_144_000 picoseconds.
-		Weight::from_parts(18_385_000, 3919)
+		// Minimum execution time: 17_613_000 picoseconds.
+		Weight::from_parts(18_114_000, 3919)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 	}
 }
@@ -558,8 +558,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_857_000 picoseconds.
-		Weight::from_parts(4_047_000, 0)
+		// Minimum execution time: 2_555_000 picoseconds.
+		Weight::from_parts(2_625_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `TfgridModule::TwinIdByAccountID` (r:1 w:0)
@@ -576,8 +576,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `496`
 		//  Estimated: `3961`
-		// Minimum execution time: 32_251_000 picoseconds.
-		Weight::from_parts(32_712_000, 3961)
+		// Minimum execution time: 19_907_000 picoseconds.
+		Weight::from_parts(20_369_000, 3961)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -591,8 +591,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `507`
 		//  Estimated: `3972`
-		// Minimum execution time: 34_135_000 picoseconds.
-		Weight::from_parts(35_327_000, 3972)
+		// Minimum execution time: 21_481_000 picoseconds.
+		Weight::from_parts(21_921_000, 3972)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -606,8 +606,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `453`
 		//  Estimated: `3918`
-		// Minimum execution time: 18_865_000 picoseconds.
-		Weight::from_parts(25_378_000, 3918)
+		// Minimum execution time: 15_690_000 picoseconds.
+		Weight::from_parts(16_100_000, 3918)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -617,8 +617,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `412`
 		//  Estimated: `3877`
-		// Minimum execution time: 13_105_000 picoseconds.
-		Weight::from_parts(13_406_000, 3877)
+		// Minimum execution time: 13_024_000 picoseconds.
+		Weight::from_parts(13_345_000, 3877)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -630,8 +630,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `569`
 		//  Estimated: `4034`
-		// Minimum execution time: 17_734_000 picoseconds.
-		Weight::from_parts(18_165_000, 4034)
+		// Minimum execution time: 17_704_000 picoseconds.
+		Weight::from_parts(17_894_000, 4034)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -643,8 +643,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `569`
 		//  Estimated: `4034`
-		// Minimum execution time: 16_922_000 picoseconds.
-		Weight::from_parts(17_473_000, 4034)
+		// Minimum execution time: 16_992_000 picoseconds.
+		Weight::from_parts(17_153_000, 4034)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -672,8 +672,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `905`
 		//  Estimated: `11795`
-		// Minimum execution time: 47_360_000 picoseconds.
-		Weight::from_parts(48_562_000, 11795)
+		// Minimum execution time: 47_981_000 picoseconds.
+		Weight::from_parts(49_514_000, 11795)
 			.saturating_add(RocksDbWeight::get().reads(12_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -689,8 +689,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `661`
 		//  Estimated: `4126`
-		// Minimum execution time: 27_062_000 picoseconds.
-		Weight::from_parts(27_723_000, 4126)
+		// Minimum execution time: 26_710_000 picoseconds.
+		Weight::from_parts(27_422_000, 4126)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -704,8 +704,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `956`
 		//  Estimated: `11846`
-		// Minimum execution time: 34_295_000 picoseconds.
-		Weight::from_parts(35_096_000, 11846)
+		// Minimum execution time: 34_064_000 picoseconds.
+		Weight::from_parts(34_926_000, 11846)
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -721,8 +721,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `454`
 		//  Estimated: `3919`
-		// Minimum execution time: 18_635_000 picoseconds.
-		Weight::from_parts(19_006_000, 3919)
+		// Minimum execution time: 18_475_000 picoseconds.
+		Weight::from_parts(18_886_000, 3919)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 	}
 	/// Storage: `TfgridModule::Farms` (r:1 w:0)
@@ -735,8 +735,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `779`
 		//  Estimated: `4244`
-		// Minimum execution time: 24_637_000 picoseconds.
-		Weight::from_parts(25_277_000, 4244)
+		// Minimum execution time: 24_246_000 picoseconds.
+		Weight::from_parts(24_957_000, 4244)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -756,8 +756,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `682`
 		//  Estimated: `4147`
-		// Minimum execution time: 27_362_000 picoseconds.
-		Weight::from_parts(27_943_000, 4147)
+		// Minimum execution time: 27_592_000 picoseconds.
+		Weight::from_parts(28_203_000, 4147)
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -773,8 +773,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `235`
 		//  Estimated: `3700`
-		// Minimum execution time: 14_568_000 picoseconds.
-		Weight::from_parts(14_808_000, 3700)
+		// Minimum execution time: 14_087_000 picoseconds.
+		Weight::from_parts(14_357_000, 3700)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -786,8 +786,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `428`
 		//  Estimated: `3893`
-		// Minimum execution time: 15_088_000 picoseconds.
-		Weight::from_parts(15_479_000, 3893)
+		// Minimum execution time: 14_868_000 picoseconds.
+		Weight::from_parts(15_249_000, 3893)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -801,8 +801,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `134`
 		//  Estimated: `3599`
-		// Minimum execution time: 12_373_000 picoseconds.
-		Weight::from_parts(12_624_000, 3599)
+		// Minimum execution time: 12_093_000 picoseconds.
+		Weight::from_parts(12_463_000, 3599)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -816,8 +816,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `382`
 		//  Estimated: `3847`
-		// Minimum execution time: 16_632_000 picoseconds.
-		Weight::from_parts(17_143_000, 3847)
+		// Minimum execution time: 16_180_000 picoseconds.
+		Weight::from_parts(16_611_000, 3847)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -829,8 +829,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `134`
 		//  Estimated: `1619`
-		// Minimum execution time: 10_439_000 picoseconds.
-		Weight::from_parts(10_610_000, 1619)
+		// Minimum execution time: 10_150_000 picoseconds.
+		Weight::from_parts(10_430_000, 1619)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -842,8 +842,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `140`
 		//  Estimated: `3605`
-		// Minimum execution time: 7_514_000 picoseconds.
-		Weight::from_parts(7_644_000, 3605)
+		// Minimum execution time: 7_364_000 picoseconds.
+		Weight::from_parts(7_504_000, 3605)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -867,8 +867,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `828`
 		//  Estimated: `4293`
-		// Minimum execution time: 32_582_000 picoseconds.
-		Weight::from_parts(33_443_000, 4293)
+		// Minimum execution time: 32_271_000 picoseconds.
+		Weight::from_parts(32_913_000, 4293)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -878,8 +878,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `412`
 		//  Estimated: `3877`
-		// Minimum execution time: 13_716_000 picoseconds.
-		Weight::from_parts(14_277_000, 3877)
+		// Minimum execution time: 13_174_000 picoseconds.
+		Weight::from_parts(13_505_000, 3877)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -889,8 +889,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `412`
 		//  Estimated: `3877`
-		// Minimum execution time: 13_846_000 picoseconds.
-		Weight::from_parts(14_117_000, 3877)
+		// Minimum execution time: 13_515_000 picoseconds.
+		Weight::from_parts(13_796_000, 3877)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -900,8 +900,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_721_000 picoseconds.
-		Weight::from_parts(5_861_000, 0)
+		// Minimum execution time: 5_551_000 picoseconds.
+		Weight::from_parts(5_721_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `TfgridModule::AllowedNodeCertifiers` (r:1 w:1)
@@ -910,8 +910,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `355`
 		//  Estimated: `1840`
-		// Minimum execution time: 9_819_000 picoseconds.
-		Weight::from_parts(10_039_000, 1840)
+		// Minimum execution time: 9_478_000 picoseconds.
+		Weight::from_parts(9_668_000, 1840)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -921,8 +921,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `413`
 		//  Estimated: `1898`
-		// Minimum execution time: 11_982_000 picoseconds.
-		Weight::from_parts(12_323_000, 1898)
+		// Minimum execution time: 11_772_000 picoseconds.
+		Weight::from_parts(12_133_000, 1898)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -932,8 +932,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `294`
 		//  Estimated: `3759`
-		// Minimum execution time: 13_335_000 picoseconds.
-		Weight::from_parts(13_675_000, 3759)
+		// Minimum execution time: 12_985_000 picoseconds.
+		Weight::from_parts(13_175_000, 3759)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -947,8 +947,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `572`
 		//  Estimated: `4037`
-		// Minimum execution time: 22_172_000 picoseconds.
-		Weight::from_parts(22_693_000, 4037)
+		// Minimum execution time: 21_661_000 picoseconds.
+		Weight::from_parts(22_332_000, 4037)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -958,8 +958,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `134`
 		//  Estimated: `1619`
-		// Minimum execution time: 8_055_000 picoseconds.
-		Weight::from_parts(8_216_000, 1619)
+		// Minimum execution time: 7_894_000 picoseconds.
+		Weight::from_parts(8_075_000, 1619)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -975,8 +975,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `621`
 		//  Estimated: `4086`
-		// Minimum execution time: 22_723_000 picoseconds.
-		Weight::from_parts(23_154_000, 4086)
+		// Minimum execution time: 22_282_000 picoseconds.
+		Weight::from_parts(22_843_000, 4086)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -996,8 +996,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `792`
 		//  Estimated: `4257`
-		// Minimum execution time: 26_440_000 picoseconds.
-		Weight::from_parts(27_042_000, 4257)
+		// Minimum execution time: 25_709_000 picoseconds.
+		Weight::from_parts(26_310_000, 4257)
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1009,8 +1009,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `387`
 		//  Estimated: `3852`
-		// Minimum execution time: 11_832_000 picoseconds.
-		Weight::from_parts(12_083_000, 3852)
+		// Minimum execution time: 11_652_000 picoseconds.
+		Weight::from_parts(12_063_000, 3852)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1026,8 +1026,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `454`
 		//  Estimated: `3919`
-		// Minimum execution time: 18_144_000 picoseconds.
-		Weight::from_parts(18_385_000, 3919)
+		// Minimum execution time: 17_613_000 picoseconds.
+		Weight::from_parts(18_114_000, 3919)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 	}
 }
diff --git a/substrate-node/pallets/pallet-tft-bridge/src/weights.rs b/substrate-node/pallets/pallet-tft-bridge/src/weights.rs
index a1284a98e..780f318b8 100644
--- a/substrate-node/pallets/pallet-tft-bridge/src/weights.rs
+++ b/substrate-node/pallets/pallet-tft-bridge/src/weights.rs
@@ -2,9 +2,9 @@
 //! Autogenerated weights for pallet_tft_bridge
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-05-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `3144932f6af7`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
+//! HOSTNAME: `7f09c44a8947`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
 //! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -55,8 +55,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `256`
 		//  Estimated: `1741`
-		// Minimum execution time: 15_099_000 picoseconds.
-		Weight::from_parts(16_281_000, 1741)
+		// Minimum execution time: 7_504_000 picoseconds.
+		Weight::from_parts(7_695_000, 1741)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -66,8 +66,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `289`
 		//  Estimated: `1774`
-		// Minimum execution time: 15_049_000 picoseconds.
-		Weight::from_parts(15_810_000, 1774)
+		// Minimum execution time: 7_404_000 picoseconds.
+		Weight::from_parts(7_655_000, 1774)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -77,8 +77,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_939_000 picoseconds.
-		Weight::from_parts(5_350_000, 0)
+		// Minimum execution time: 2_385_000 picoseconds.
+		Weight::from_parts(2_515_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `TFTBridgeModule::WithdrawFee` (r:0 w:1)
@@ -87,8 +87,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_729_000 picoseconds.
-		Weight::from_parts(4_939_000, 0)
+		// Minimum execution time: 2_324_000 picoseconds.
+		Weight::from_parts(2_395_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `TFTBridgeModule::DepositFee` (r:0 w:1)
@@ -97,8 +97,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_739_000 picoseconds.
-		Weight::from_parts(4_980_000, 0)
+		// Minimum execution time: 2_304_000 picoseconds.
+		Weight::from_parts(2_405_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `TFTBridgeModule::WithdrawFee` (r:1 w:0)
@@ -115,8 +115,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `253`
 		//  Estimated: `3593`
-		// Minimum execution time: 43_242_000 picoseconds.
-		Weight::from_parts(43_893_000, 3593)
+		// Minimum execution time: 44_634_000 picoseconds.
+		Weight::from_parts(45_366_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -136,8 +136,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `499`
 		//  Estimated: `3964`
-		// Minimum execution time: 60_305_000 picoseconds.
-		Weight::from_parts(61_196_000, 3964)
+		// Minimum execution time: 62_268_000 picoseconds.
+		Weight::from_parts(63_359_000, 3964)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -151,8 +151,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `631`
 		//  Estimated: `4096`
-		// Minimum execution time: 25_719_000 picoseconds.
-		Weight::from_parts(26_300_000, 4096)
+		// Minimum execution time: 26_369_000 picoseconds.
+		Weight::from_parts(26_811_000, 4096)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -166,8 +166,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `571`
 		//  Estimated: `4036`
-		// Minimum execution time: 18_425_000 picoseconds.
-		Weight::from_parts(18_805_000, 4036)
+		// Minimum execution time: 18_816_000 picoseconds.
+		Weight::from_parts(19_237_000, 4036)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -179,8 +179,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `385`
 		//  Estimated: `3850`
-		// Minimum execution time: 21_671_000 picoseconds.
-		Weight::from_parts(22_232_000, 3850)
+		// Minimum execution time: 22_011_000 picoseconds.
+		Weight::from_parts(22_423_000, 3850)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -194,8 +194,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `560`
 		//  Estimated: `4025`
-		// Minimum execution time: 18_926_000 picoseconds.
-		Weight::from_parts(19_217_000, 4025)
+		// Minimum execution time: 19_286_000 picoseconds.
+		Weight::from_parts(19_847_000, 4025)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -209,8 +209,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `256`
 		//  Estimated: `1741`
-		// Minimum execution time: 15_099_000 picoseconds.
-		Weight::from_parts(16_281_000, 1741)
+		// Minimum execution time: 7_504_000 picoseconds.
+		Weight::from_parts(7_695_000, 1741)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -220,8 +220,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `289`
 		//  Estimated: `1774`
-		// Minimum execution time: 15_049_000 picoseconds.
-		Weight::from_parts(15_810_000, 1774)
+		// Minimum execution time: 7_404_000 picoseconds.
+		Weight::from_parts(7_655_000, 1774)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -231,8 +231,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_939_000 picoseconds.
-		Weight::from_parts(5_350_000, 0)
+		// Minimum execution time: 2_385_000 picoseconds.
+		Weight::from_parts(2_515_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `TFTBridgeModule::WithdrawFee` (r:0 w:1)
@@ -241,8 +241,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_729_000 picoseconds.
-		Weight::from_parts(4_939_000, 0)
+		// Minimum execution time: 2_324_000 picoseconds.
+		Weight::from_parts(2_395_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `TFTBridgeModule::DepositFee` (r:0 w:1)
@@ -251,8 +251,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_739_000 picoseconds.
-		Weight::from_parts(4_980_000, 0)
+		// Minimum execution time: 2_304_000 picoseconds.
+		Weight::from_parts(2_405_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `TFTBridgeModule::WithdrawFee` (r:1 w:0)
@@ -269,8 +269,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `253`
 		//  Estimated: `3593`
-		// Minimum execution time: 43_242_000 picoseconds.
-		Weight::from_parts(43_893_000, 3593)
+		// Minimum execution time: 44_634_000 picoseconds.
+		Weight::from_parts(45_366_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -290,8 +290,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `499`
 		//  Estimated: `3964`
-		// Minimum execution time: 60_305_000 picoseconds.
-		Weight::from_parts(61_196_000, 3964)
+		// Minimum execution time: 62_268_000 picoseconds.
+		Weight::from_parts(63_359_000, 3964)
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -305,8 +305,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `631`
 		//  Estimated: `4096`
-		// Minimum execution time: 25_719_000 picoseconds.
-		Weight::from_parts(26_300_000, 4096)
+		// Minimum execution time: 26_369_000 picoseconds.
+		Weight::from_parts(26_811_000, 4096)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -320,8 +320,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `571`
 		//  Estimated: `4036`
-		// Minimum execution time: 18_425_000 picoseconds.
-		Weight::from_parts(18_805_000, 4036)
+		// Minimum execution time: 18_816_000 picoseconds.
+		Weight::from_parts(19_237_000, 4036)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -333,8 +333,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `385`
 		//  Estimated: `3850`
-		// Minimum execution time: 21_671_000 picoseconds.
-		Weight::from_parts(22_232_000, 3850)
+		// Minimum execution time: 22_011_000 picoseconds.
+		Weight::from_parts(22_423_000, 3850)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -348,8 +348,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `560`
 		//  Estimated: `4025`
-		// Minimum execution time: 18_926_000 picoseconds.
-		Weight::from_parts(19_217_000, 4025)
+		// Minimum execution time: 19_286_000 picoseconds.
+		Weight::from_parts(19_847_000, 4025)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
diff --git a/substrate-node/pallets/pallet-tft-price/src/weights.rs b/substrate-node/pallets/pallet-tft-price/src/weights.rs
index ec8658215..0422bfe36 100644
--- a/substrate-node/pallets/pallet-tft-price/src/weights.rs
+++ b/substrate-node/pallets/pallet-tft-price/src/weights.rs
@@ -2,9 +2,9 @@
 //! Autogenerated weights for pallet_tft_price
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-05-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `3144932f6af7`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
+//! HOSTNAME: `7f09c44a8947`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
 //! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -61,8 +61,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `235`
 		//  Estimated: `6175`
-		// Minimum execution time: 47_901_000 picoseconds.
-		Weight::from_parts(48_943_000, 6175)
+		// Minimum execution time: 30_177_000 picoseconds.
+		Weight::from_parts(30_969_000, 6175)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -74,8 +74,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `93`
 		//  Estimated: `1578`
-		// Minimum execution time: 8_166_000 picoseconds.
-		Weight::from_parts(8_315_000, 1578)
+		// Minimum execution time: 5_080_000 picoseconds.
+		Weight::from_parts(5_250_000, 1578)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -87,8 +87,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `93`
 		//  Estimated: `1578`
-		// Minimum execution time: 7_975_000 picoseconds.
-		Weight::from_parts(8_235_000, 1578)
+		// Minimum execution time: 5_150_000 picoseconds.
+		Weight::from_parts(5_310_000, 1578)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -116,8 +116,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `235`
 		//  Estimated: `6175`
-		// Minimum execution time: 47_901_000 picoseconds.
-		Weight::from_parts(48_943_000, 6175)
+		// Minimum execution time: 30_177_000 picoseconds.
+		Weight::from_parts(30_969_000, 6175)
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -129,8 +129,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `93`
 		//  Estimated: `1578`
-		// Minimum execution time: 8_166_000 picoseconds.
-		Weight::from_parts(8_315_000, 1578)
+		// Minimum execution time: 5_080_000 picoseconds.
+		Weight::from_parts(5_250_000, 1578)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -142,8 +142,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `93`
 		//  Estimated: `1578`
-		// Minimum execution time: 7_975_000 picoseconds.
-		Weight::from_parts(8_235_000, 1578)
+		// Minimum execution time: 5_150_000 picoseconds.
+		Weight::from_parts(5_310_000, 1578)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
diff --git a/substrate-node/pallets/pallet-validator/src/weights.rs b/substrate-node/pallets/pallet-validator/src/weights.rs
index 75627294f..a5d6155b4 100644
--- a/substrate-node/pallets/pallet-validator/src/weights.rs
+++ b/substrate-node/pallets/pallet-validator/src/weights.rs
@@ -2,9 +2,9 @@
 //! Autogenerated weights for pallet_validator
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-05-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `3144932f6af7`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
+//! HOSTNAME: `7f09c44a8947`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
 //! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -50,8 +50,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `3507`
-		// Minimum execution time: 19_757_000 picoseconds.
-		Weight::from_parts(20_619_000, 3507)
+		// Minimum execution time: 9_348_000 picoseconds.
+		Weight::from_parts(9_638_000, 3507)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -65,8 +65,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `365`
 		//  Estimated: `3830`
-		// Minimum execution time: 51_608_000 picoseconds.
-		Weight::from_parts(52_960_000, 3830)
+		// Minimum execution time: 24_526_000 picoseconds.
+		Weight::from_parts(25_128_000, 3830)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -80,8 +80,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `431`
 		//  Estimated: `3896`
-		// Minimum execution time: 32_050_000 picoseconds.
-		Weight::from_parts(33_082_000, 3896)
+		// Minimum execution time: 34_004_000 picoseconds.
+		Weight::from_parts(34_556_000, 3896)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -91,8 +91,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `3507`
-		// Minimum execution time: 8_316_000 picoseconds.
-		Weight::from_parts(8_536_000, 3507)
+		// Minimum execution time: 8_426_000 picoseconds.
+		Weight::from_parts(8_787_000, 3507)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -110,8 +110,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `494`
 		//  Estimated: `4687`
-		// Minimum execution time: 24_236_000 picoseconds.
-		Weight::from_parts(24_727_000, 4687)
+		// Minimum execution time: 24_958_000 picoseconds.
+		Weight::from_parts(25_338_000, 4687)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -131,8 +131,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `558`
 		//  Estimated: `4687`
-		// Minimum execution time: 21_611_000 picoseconds.
-		Weight::from_parts(22_112_000, 4687)
+		// Minimum execution time: 22_091_000 picoseconds.
+		Weight::from_parts(22_783_000, 4687)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -146,8 +146,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `3507`
-		// Minimum execution time: 19_757_000 picoseconds.
-		Weight::from_parts(20_619_000, 3507)
+		// Minimum execution time: 9_348_000 picoseconds.
+		Weight::from_parts(9_638_000, 3507)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -161,8 +161,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `365`
 		//  Estimated: `3830`
-		// Minimum execution time: 51_608_000 picoseconds.
-		Weight::from_parts(52_960_000, 3830)
+		// Minimum execution time: 24_526_000 picoseconds.
+		Weight::from_parts(25_128_000, 3830)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -176,8 +176,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `431`
 		//  Estimated: `3896`
-		// Minimum execution time: 32_050_000 picoseconds.
-		Weight::from_parts(33_082_000, 3896)
+		// Minimum execution time: 34_004_000 picoseconds.
+		Weight::from_parts(34_556_000, 3896)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -187,8 +187,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `3507`
-		// Minimum execution time: 8_316_000 picoseconds.
-		Weight::from_parts(8_536_000, 3507)
+		// Minimum execution time: 8_426_000 picoseconds.
+		Weight::from_parts(8_787_000, 3507)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -206,8 +206,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `494`
 		//  Estimated: `4687`
-		// Minimum execution time: 24_236_000 picoseconds.
-		Weight::from_parts(24_727_000, 4687)
+		// Minimum execution time: 24_958_000 picoseconds.
+		Weight::from_parts(25_338_000, 4687)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -227,8 +227,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `558`
 		//  Estimated: `4687`
-		// Minimum execution time: 21_611_000 picoseconds.
-		Weight::from_parts(22_112_000, 4687)
+		// Minimum execution time: 22_091_000 picoseconds.
+		Weight::from_parts(22_783_000, 4687)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
diff --git a/substrate-node/pallets/substrate-validator-set/src/weights.rs b/substrate-node/pallets/substrate-validator-set/src/weights.rs
index 3c337f315..d1564eb88 100644
--- a/substrate-node/pallets/substrate-validator-set/src/weights.rs
+++ b/substrate-node/pallets/substrate-validator-set/src/weights.rs
@@ -2,9 +2,9 @@
 //! Autogenerated weights for substrate_validator_set
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-05-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `3144932f6af7`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
+//! HOSTNAME: `7f09c44a8947`, CPU: `AMD Ryzen 7 5800X 8-Core Processor`
 //! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -49,8 +49,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `139`
 		//  Estimated: `1624`
-		// Minimum execution time: 29_295_000 picoseconds.
-		Weight::from_parts(30_498_000, 1624)
+		// Minimum execution time: 14_668_000 picoseconds.
+		Weight::from_parts(14_868_000, 1624)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -62,8 +62,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `205`
 		//  Estimated: `1690`
-		// Minimum execution time: 23_144_000 picoseconds.
-		Weight::from_parts(23_956_000, 1690)
+		// Minimum execution time: 11_642_000 picoseconds.
+		Weight::from_parts(12_063_000, 1690)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -75,8 +75,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `172`
 		//  Estimated: `1657`
-		// Minimum execution time: 26_600_000 picoseconds.
-		Weight::from_parts(27_993_000, 1657)
+		// Minimum execution time: 12_804_000 picoseconds.
+		Weight::from_parts(13_235_000, 1657)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -92,8 +92,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `139`
 		//  Estimated: `1624`
-		// Minimum execution time: 29_295_000 picoseconds.
-		Weight::from_parts(30_498_000, 1624)
+		// Minimum execution time: 14_668_000 picoseconds.
+		Weight::from_parts(14_868_000, 1624)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -105,8 +105,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `205`
 		//  Estimated: `1690`
-		// Minimum execution time: 23_144_000 picoseconds.
-		Weight::from_parts(23_956_000, 1690)
+		// Minimum execution time: 11_642_000 picoseconds.
+		Weight::from_parts(12_063_000, 1690)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -118,8 +118,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `172`
 		//  Estimated: `1657`
-		// Minimum execution time: 26_600_000 picoseconds.
-		Weight::from_parts(27_993_000, 1657)
+		// Minimum execution time: 12_804_000 picoseconds.
+		Weight::from_parts(13_235_000, 1657)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
diff --git a/substrate-node/support/src/resources.rs b/substrate-node/support/src/resources.rs
index 2dd9d8545..fb4081f2f 100644
--- a/substrate-node/support/src/resources.rs
+++ b/substrate-node/support/src/resources.rs
@@ -15,6 +15,7 @@ pub struct Resources {
 
 pub const ONE_THOUSAND: u128 = 1_000;
 pub const GIGABYTE: u128 = 1024 * 1024 * 1024;
+pub const MINIMUM_STORAGE_CAPACITY: u128 = 100 * GIGABYTE;
 
 impl Resources {
     pub fn empty() -> Resources {
@@ -35,13 +36,18 @@ impl Resources {
     }
 
     pub fn validate_hru(&self) -> bool {
-        // No HRU minimun requirement
-        true
+        // HRU minimum of 100 GB
+        self.hru as u128 >= MINIMUM_STORAGE_CAPACITY
     }
 
     pub fn validate_sru(&self) -> bool {
         // SRU minimum of 100 GB
-        self.sru as u128 >= 100 * GIGABYTE
+        self.sru as u128 >= MINIMUM_STORAGE_CAPACITY
+    }
+
+    pub fn validate_storage(&self) -> bool {
+        // At least one type of storage (HDD or SSD) must have minimum capacity size 
+        self.validate_hru() || self.validate_sru()
     }
 
     pub fn validate_cru(&self) -> bool {
diff --git a/substrate-node/support/src/tests.rs b/substrate-node/support/src/tests.rs
index f62fc71ff..0e213b169 100644
--- a/substrate-node/support/src/tests.rs
+++ b/substrate-node/support/src/tests.rs
@@ -1,4 +1,4 @@
-use crate::resources::{Resources, GIGABYTE};
+use crate::resources::{Resources, GIGABYTE, MINIMUM_STORAGE_CAPACITY};
 use crate::types::{PublicIpError, IP4, IP6};
 use frame_support::storage::bounded_vec::BoundedVec;
 use frame_support::{assert_err, assert_ok};
@@ -94,6 +94,36 @@ fn test_calc_su_4() {
     assert_eq!(su, 3);
 }
 
+#[test]
+fn test_validate_storage() {
+    // SSD only node
+    let resources = Resources {
+        hru: 0,
+        cru: 0,
+        mru: 0,
+        sru: MINIMUM_STORAGE_CAPACITY as u64,
+    };
+    assert_eq!(resources.validate_storage(), true);
+
+    // HDD only node
+    let resources = Resources {
+        hru: MINIMUM_STORAGE_CAPACITY as u64,
+        cru: 0,
+        mru: 0,
+        sru: 0,
+    };
+    assert_eq!(resources.validate_storage(), true);
+
+    // Storage capacities are both under minimum requirement
+    let resources = Resources {
+        hru: MINIMUM_STORAGE_CAPACITY as u64 - 1,
+        cru: 0,
+        mru: 0,
+        sru: MINIMUM_STORAGE_CAPACITY as u64 - 1,
+    };
+    assert_eq!(resources.validate_storage(), false);
+}
+
 #[test]
 fn test_resources_diff() {
     let resources = Resources {