chore(upgrade): v1.6.0 to v1.7.0 (#2066)

- Upgrade Polkadot-sdk to v.1.7.0. - Update weights to reflect the new version. Notable Changes: - [Allow custom error types in Jsonrpsee](paritytech/polkadot-sdk#1313) For more details, please refer to: [Release Notes](https://github.com/paritytech/polkadot-sdk/releases/tag/polkadot-v1.7.0) #1870
rustadot · Jul 12, 2024 · f6d8ecb · f6d8ecb
1 parent e05e42e
commit f6d8ecb
Show file tree

Hide file tree

Showing 46 changed files with 1,848 additions and 1,806 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/common/helpers/src/rpc.rs b/common/helpers/src/rpc.rs
@@ -1,19 +1,19 @@
 use core::result::Result as CoreResult;
 use jsonrpsee::{
-	core::{Error as RpcError, RpcResult},
-	types::error::{CallError, ErrorCode, ErrorObject},
+	core::RpcResult,
+	types::error::{ErrorCode, ErrorObject},
 };
 use sp_api::ApiError;
 
 /// Converts CoreResult to Result for RPC calls
 pub fn map_rpc_result<T>(response: CoreResult<T, ApiError>) -> RpcResult<T> {
 	match response {
 		Ok(res) => Ok(res),
-		Err(e) => Err(RpcError::Call(CallError::Custom(ErrorObject::owned(
+		Err(e) => Err(ErrorObject::owned(
 			ErrorCode::ServerError(300).code(), // No real reason for this value
 			"Api Error",
 			Some(format!("{:?}", e)),
-		)))),
+		)),
 	}
 }
 

diff --git a/node/service/src/block_sealing.rs b/node/service/src/block_sealing.rs
@@ -187,7 +187,7 @@ pub fn frequency_dev_sealing(
 			false => None,
 		};
 
-		move |deny_unsafe, _| {
+		Box::new(move |deny_unsafe, _| {
 			let deps = crate::rpc::FullDeps {
 				client: client.clone(),
 				pool: transaction_pool.clone(),
@@ -196,11 +196,11 @@ pub fn frequency_dev_sealing(
 			};
 
 			crate::rpc::create_full(deps, backend.clone()).map_err(Into::into)
-		}
+		})
 	};
 
 	sc_service::spawn_tasks(sc_service::SpawnTasksParams {
-		rpc_builder: Box::new(rpc_extensions_builder),
+		rpc_builder: rpc_extensions_builder,
 		client: client.clone(),
 		transaction_pool: transaction_pool.clone(),
 		task_manager: &mut task_manager,

diff --git a/node/service/src/rpc/frequency_rpc.rs b/node/service/src/rpc/frequency_rpc.rs
@@ -11,7 +11,7 @@ use common_primitives::rpc::RpcEvent;
 use jsonrpsee::{
 	core::{async_trait, RpcResult},
 	proc_macros::rpc,
-	types::error::{CallError, ErrorObject},
+	types::error::ErrorObject,
 };
 use parity_scale_codec::{Codec, Decode, Encode};
 use sc_transaction_pool_api::{InPoolTransaction, TransactionPool};
@@ -73,9 +73,9 @@ where
 		let api = self.client.runtime_api();
 		let best = self.client.info().best_hash;
 
-		let nonce = api.account_nonce(best, account.clone()).map_err(|e| {
-			CallError::Custom(ErrorObject::owned(1, "Unable to query nonce.", Some(e.to_string())))
-		})?;
+		let nonce = api
+			.account_nonce(best, account.clone())
+			.map_err(|e| ErrorObject::owned(1, "Unable to query nonce.", Some(e.to_string())))?;
 		Ok(get_missing_nonces(&*self.pool, account, nonce))
 	}
 }

diff --git a/node/service/src/service.rs b/node/service/src/service.rs
@@ -505,6 +505,7 @@ fn start_consensus(
 		proposer,
 		collator_service,
 		authoring_duration: Duration::from_millis(1500),
+		reinitialize: false,
 	};
 
 	let fut =

diff --git a/pallets/capacity/src/tests/mock.rs b/pallets/capacity/src/tests/mock.rs
@@ -67,7 +67,6 @@ impl pallet_balances::Config for Test {
 	type WeightInfo = ();
 	type FreezeIdentifier = RuntimeFreezeReason;
 	type MaxFreezes = ConstU32<1>;
-	type MaxHolds = ConstU32<0>;
 	type RuntimeHoldReason = ();
 	type RuntimeFreezeReason = ();
 }

diff --git a/pallets/capacity/src/weights.rs b/pallets/capacity/src/weights.rs
@@ -1,10 +1,10 @@
 
 //! Autogenerated weights for `pallet_capacity`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-27, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-07-11, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `ip-10-173-11-138`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! HOSTNAME: `ip-10-173-5-189`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("frequency-bench")`, DB CACHE: `1024`
 
 // Executed Command:
@@ -61,8 +61,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `174`
 		//  Estimated: `6249`
-		// Minimum execution time: 35_780_000 picoseconds.
-		Weight::from_parts(36_737_000, 6249)
+		// Minimum execution time: 37_004_000 picoseconds.
+		Weight::from_parts(37_516_000, 6249)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -78,8 +78,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `285`
 		//  Estimated: `6249`
-		// Minimum execution time: 24_827_000 picoseconds.
-		Weight::from_parts(25_463_000, 6249)
+		// Minimum execution time: 25_485_000 picoseconds.
+		Weight::from_parts(26_449_000, 6249)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -91,8 +91,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `2974`
-		// Minimum execution time: 2_272_000 picoseconds.
-		Weight::from_parts(2_384_000, 2974)
+		// Minimum execution time: 2_327_000 picoseconds.
+		Weight::from_parts(2_446_000, 2974)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -108,8 +108,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `271`
 		//  Estimated: `5071`
-		// Minimum execution time: 23_943_000 picoseconds.
-		Weight::from_parts(24_949_000, 5071)
+		// Minimum execution time: 24_044_000 picoseconds.
+		Weight::from_parts(25_140_000, 5071)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -119,8 +119,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_069_000 picoseconds.
-		Weight::from_parts(4_348_000, 0)
+		// Minimum execution time: 4_537_000 picoseconds.
+		Weight::from_parts(4_889_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
@@ -145,8 +145,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `174`
 		//  Estimated: `6249`
-		// Minimum execution time: 35_780_000 picoseconds.
-		Weight::from_parts(36_737_000, 6249)
+		// Minimum execution time: 37_004_000 picoseconds.
+		Weight::from_parts(37_516_000, 6249)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -162,8 +162,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `285`
 		//  Estimated: `6249`
-		// Minimum execution time: 24_827_000 picoseconds.
-		Weight::from_parts(25_463_000, 6249)
+		// Minimum execution time: 25_485_000 picoseconds.
+		Weight::from_parts(26_449_000, 6249)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -175,8 +175,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `2974`
-		// Minimum execution time: 2_272_000 picoseconds.
-		Weight::from_parts(2_384_000, 2974)
+		// Minimum execution time: 2_327_000 picoseconds.
+		Weight::from_parts(2_446_000, 2974)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -192,8 +192,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `271`
 		//  Estimated: `5071`
-		// Minimum execution time: 23_943_000 picoseconds.
-		Weight::from_parts(24_949_000, 5071)
+		// Minimum execution time: 24_044_000 picoseconds.
+		Weight::from_parts(25_140_000, 5071)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -203,8 +203,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_069_000 picoseconds.
-		Weight::from_parts(4_348_000, 0)
+		// Minimum execution time: 4_537_000 picoseconds.
+		Weight::from_parts(4_889_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 }

diff --git a/pallets/frequency-tx-payment/src/rpc/src/lib.rs b/pallets/frequency-tx-payment/src/rpc/src/lib.rs
@@ -20,12 +20,9 @@
 use std::{convert::TryInto, sync::Arc};
 
 use jsonrpsee::{
-	core::{async_trait, Error as JsonRpseeError, RpcResult},
+	core::{async_trait, RpcResult},
 	proc_macros::rpc,
-	types::{
-		error::{CallError, ErrorCode},
-		ErrorObject,
-	},
+	types::{error::ErrorCode, ErrorObject},
 };
 use pallet_frequency_tx_payment_runtime_api::{FeeDetails, InclusionFee};
 use parity_scale_codec::{Codec, Decode};
@@ -102,27 +99,27 @@ where
 
 		let encoded_len = encoded_xt.len() as u32;
 		let uxt: Block::Extrinsic = Decode::decode(&mut &*encoded_xt).map_err(|e| {
-			CallError::Custom(ErrorObject::owned(
+			ErrorObject::owned(
 				Error::DecodeError.into(),
 				"Unable to query capacity fee details.",
 				Some(format!("{:?}", e)),
-			))
+			)
 		})?;
 		let fee_details = api.compute_capacity_fee(at_hash, uxt, encoded_len).map_err(|e| {
-			CallError::Custom(ErrorObject::owned(
+			ErrorObject::owned(
 				Error::RuntimeError.into(),
 				"Unable to query capacity fee details.",
 				Some(format!("{:?}", e)),
-			))
+			)
 		})?;
 
 		let try_into_rpc_balance = |value: Balance| {
 			value.try_into().map_err(|_| {
-				JsonRpseeError::Call(CallError::Custom(ErrorObject::owned(
+				ErrorObject::owned(
 					ErrorCode::InvalidParams.code(),
 					format!("{} doesn't fit in NumberOrHex representation", value),
 					None::<()>,
-				)))
+				)
 			})
 		};
 

diff --git a/pallets/frequency-tx-payment/src/tests/mock.rs b/pallets/frequency-tx-payment/src/tests/mock.rs
@@ -95,7 +95,6 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = RuntimeFreezeReason;
 	type RuntimeFreezeReason = ();
 	type MaxFreezes = ConstU32<1>;
-	type MaxHolds = ConstU32<0>;
 	type RuntimeHoldReason = ();
 }
 

diff --git a/pallets/frequency-tx-payment/src/weights.rs b/pallets/frequency-tx-payment/src/weights.rs
@@ -1,10 +1,10 @@
 
 //! Autogenerated weights for `pallet_frequency_tx_payment`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-27, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-07-11, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `ip-10-173-11-138`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
+//! HOSTNAME: `ip-10-173-5-189`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("frequency-bench")`, DB CACHE: `1024`
 
 // Executed Command:
@@ -44,18 +44,18 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_154_000 picoseconds.
-		Weight::from_parts(3_326_000, 0)
+		// Minimum execution time: 3_236_000 picoseconds.
+		Weight::from_parts(3_421_000, 0)
 	}
 	/// The range of component `n` is `[0, 10]`.
 	fn pay_with_capacity_batch_all(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_117_000 picoseconds.
-		Weight::from_parts(6_107_676, 0)
-			// Standard Error: 11_748
-			.saturating_add(Weight::from_parts(3_023_884, 0).saturating_mul(n.into()))
+		// Minimum execution time: 5_256_000 picoseconds.
+		Weight::from_parts(6_282_904, 0)
+			// Standard Error: 13_079
+			.saturating_add(Weight::from_parts(3_083_520, 0).saturating_mul(n.into()))
 	}
 }
 
@@ -65,18 +65,18 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_154_000 picoseconds.
-		Weight::from_parts(3_326_000, 0)
+		// Minimum execution time: 3_236_000 picoseconds.
+		Weight::from_parts(3_421_000, 0)
 	}
 	/// The range of component `n` is `[0, 10]`.
 	fn pay_with_capacity_batch_all(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_117_000 picoseconds.
-		Weight::from_parts(6_107_676, 0)
-			// Standard Error: 11_748
-			.saturating_add(Weight::from_parts(3_023_884, 0).saturating_mul(n.into()))
+		// Minimum execution time: 5_256_000 picoseconds.
+		Weight::from_parts(6_282_904, 0)
+			// Standard Error: 13_079
+			.saturating_add(Weight::from_parts(3_083_520, 0).saturating_mul(n.into()))
 	}
 }
 

diff --git a/pallets/handles/src/rpc/src/lib.rs b/pallets/handles/src/rpc/src/lib.rs
@@ -17,8 +17,9 @@ use common_primitives::{
 	msa::MessageSourceId,
 };
 use jsonrpsee::{
-	core::{async_trait, Error as RpcError, RpcResult},
+	core::{async_trait, RpcResult},
 	proc_macros::rpc,
+	types::{error::ErrorObjectOwned, ErrorObject},
 };
 use pallet_handles_runtime_api::HandlesRuntimeApi;
 use sp_api::ProvideRuntimeApi;
@@ -73,9 +74,13 @@ pub enum HandlesRpcError {
 	InvalidHandle,
 }
 
-impl From<HandlesRpcError> for RpcError {
+impl From<HandlesRpcError> for ErrorObjectOwned {
 	fn from(e: HandlesRpcError) -> Self {
-		RpcError::Custom(format!("{:?}", e))
+		let msg = format!("{:?}", e);
+
+		match e {
+			HandlesRpcError::InvalidHandle => ErrorObject::owned(1, msg, None::<()>),
+		}
 	}
 }
 

diff --git a/pallets/handles/src/rpc/src/tests/mod.rs b/pallets/handles/src/rpc/src/tests/mod.rs
@@ -43,7 +43,7 @@ sp_api::mock_impl_runtime_apis! {
 	}
 }
 
-type HandleResult = Result<Option<HandleResponse>, jsonrpsee::core::Error>;
+type HandleResult = Result<Option<HandleResponse>, jsonrpsee::types::ErrorObjectOwned>;
 
 #[tokio::test]
 async fn get_handle_with_non_existent_msa_id_should_return_none() {