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

- 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) issue-1870
frequency-chain · Jul 10, 2024 · a7b2675 · a7b2675
1 parent 1b583a7
commit a7b2675
Show file tree

Hide file tree

Showing 22 changed files with 1,072 additions and 1,027 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: true, // look into this one
 	};
 
 	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/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/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() {

diff --git a/pallets/messages/src/rpc/src/lib.rs b/pallets/messages/src/rpc/src/lib.rs
@@ -13,8 +13,9 @@ use common_helpers::rpc::map_rpc_result;
 use common_primitives::{messages::*, schema::*};
 use frame_support::{ensure, fail};
 use jsonrpsee::{
-	core::{async_trait, Error as JsonRpseeError, RpcResult},
+	core::{async_trait, RpcResult},
 	proc_macros::rpc,
+	types::{ErrorObject, ErrorObjectOwned},
 };
 use pallet_messages_runtime_api::MessagesRuntimeApi;
 use sp_api::ProvideRuntimeApi;
@@ -61,9 +62,14 @@ pub enum MessageRpcError {
 	InvalidSchemaId,
 }
 
-impl From<MessageRpcError> for JsonRpseeError {
+impl From<MessageRpcError> for ErrorObjectOwned {
 	fn from(e: MessageRpcError) -> Self {
-		JsonRpseeError::Custom(format!("{:?}", e))
+		let msg = format!("{:?}", e);
+		match e {
+			MessageRpcError::InvalidPaginationRequest => ErrorObject::owned(1, msg, None::<()>),
+			MessageRpcError::TypeConversionOverflow => ErrorObject::owned(2, msg, None::<()>),
+			MessageRpcError::InvalidSchemaId => ErrorObject::owned(3, msg, None::<()>),
+		}
 	}
 }
 

diff --git a/pallets/messages/src/rpc/src/tests/mod.rs b/pallets/messages/src/rpc/src/tests/mod.rs
@@ -63,7 +63,7 @@ type GetMessagesBySchemaResult = Result<
 	common_primitives::messages::BlockPaginationResponse<
 		common_primitives::messages::MessageResponse,
 	>,
-	jsonrpsee::core::Error,
+	jsonrpsee::types::ErrorObjectOwned,
 >;
 
 #[tokio::test]

diff --git a/pallets/msa/src/rpc/src/lib.rs b/pallets/msa/src/rpc/src/lib.rs
@@ -18,9 +18,10 @@ use common_primitives::{
 	schema::SchemaId,
 };
 use jsonrpsee::{
-	core::{async_trait, Error as JsonRpseeError, RpcResult},
+	core::{async_trait, RpcResult},
 	proc_macros::rpc,
 	tracing::warn,
+	types::{error::ErrorObjectOwned, ErrorObject},
 };
 use pallet_msa_runtime_api::MsaRuntimeApi;
 use parity_scale_codec::{Codec, Decode};
@@ -101,9 +102,16 @@ pub enum MsaOffchainRpcError {
 	OffchainIndexingNotEnabled,
 }
 
-impl From<MsaOffchainRpcError> for JsonRpseeError {
+impl From<MsaOffchainRpcError> for ErrorObjectOwned {
 	fn from(e: MsaOffchainRpcError) -> Self {
-		JsonRpseeError::Custom(format!("{:?}", e))
+		let msg = format!("{:?}", e);
+
+		match e {
+			MsaOffchainRpcError::ErrorAcquiringLock => ErrorObject::owned(1, msg, None::<()>),
+			MsaOffchainRpcError::ErrorDecodingData => ErrorObject::owned(2, msg, None::<()>),
+			MsaOffchainRpcError::OffchainIndexingNotEnabled =>
+				ErrorObject::owned(3, msg, None::<()>),
+		}
 	}
 }
 

diff --git a/pallets/passkey/src/mock.rs b/pallets/passkey/src/mock.rs
@@ -110,7 +110,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/schemas/src/rpc/src/lib.rs b/pallets/schemas/src/rpc/src/lib.rs
@@ -11,9 +11,9 @@
 use common_helpers::{avro, rpc::map_rpc_result};
 use common_primitives::schema::*;
 use jsonrpsee::{
-	core::{async_trait, Error as RpcError, RpcResult},
+	core::{async_trait, RpcResult},
 	proc_macros::rpc,
-	types::error::{CallError, ErrorObject},
+	types::error::ErrorObject,
 };
 use pallet_schemas_runtime_api::SchemasRuntimeApi;
 use sp_api::ProvideRuntimeApi;
@@ -89,11 +89,11 @@ where
 		let validated_schema = avro::validate_raw_avro_schema(&model);
 		match validated_schema {
 			Ok(_) => Ok(true),
-			Err(e) => Err(RpcError::Call(CallError::Custom(ErrorObject::owned(
+			Err(e) => Err(ErrorObject::owned(
 				SchemaRpcError::SchemaValidationError.into(),
 				"Unable to validate schema",
 				Some(format!("{:?}", e)),
-			)))),
+			)),
 		}
 	}
 

diff --git a/pallets/schemas/src/rpc/src/tests/mod.rs b/pallets/schemas/src/rpc/src/tests/mod.rs
@@ -50,8 +50,8 @@ sp_api::mock_impl_runtime_apis! {
 	}
 }
 
-type SchemaResult = Result<Option<SchemaResponse>, jsonrpsee::core::Error>;
-type VersionResult = Result<Option<Vec<SchemaVersionResponse>>, jsonrpsee::core::Error>;
+type SchemaResult = Result<Option<SchemaResponse>, jsonrpsee::types::ErrorObjectOwned>;
+type VersionResult = Result<Option<Vec<SchemaVersionResponse>>, jsonrpsee::types::ErrorObjectOwned>;
 
 #[tokio::test]
 async fn get_schema_with_non_existent_schema_id_should_return_none() {

diff --git a/pallets/stateful-storage/src/rpc/src/lib.rs b/pallets/stateful-storage/src/rpc/src/lib.rs
@@ -14,9 +14,9 @@ use common_primitives::{
 	stateful_storage::{ItemizedStoragePageResponse, PaginatedStorageResponse},
 };
 use jsonrpsee::{
-	core::{async_trait, Error as RpcError, RpcResult},
+	core::{async_trait, RpcResult},
 	proc_macros::rpc,
-	types::error::{CallError, ErrorCode, ErrorObject},
+	types::error::{ErrorCode, ErrorObject},
 };
 use pallet_stateful_storage_runtime_api::StatefulStorageRuntimeApi;
 use sp_api::{ApiError, ProvideRuntimeApi};
@@ -95,15 +95,15 @@ where
 fn map_result<T>(api_result: Result<Result<T, DispatchError>, ApiError>) -> RpcResult<T> {
 	match api_result {
 		Ok(Ok(result)) => Ok(result),
-		Ok(Err(e)) => Err(RpcError::Call(CallError::Custom(ErrorObject::owned(
+		Ok(Err(e)) => Err(ErrorObject::owned(
 			ErrorCode::ServerError(300).code(), // No real reason for this value
 			"Runtime Error",
 			Some(format!("{:?}", e)),
-		)))),
-		Err(e) => Err(RpcError::Call(CallError::Custom(ErrorObject::owned(
+		)),
+		Err(e) => Err(ErrorObject::owned(
 			ErrorCode::ServerError(301).code(), // No real reason for this value
 			"Api Error",
 			Some(format!("{:?}", e)),
-		)))),
+		)),
 	}
 }
diff --git a/pallets/stateful-storage/src/rpc/src/tests/mod.rs b/pallets/stateful-storage/src/rpc/src/tests/mod.rs
@@ -45,8 +45,9 @@ sp_api::mock_impl_runtime_apis! {
 	}
 }
 
-type PaginatedStateResult = Result<Vec<PaginatedStorageResponse>, jsonrpsee::core::Error>;
-type ItemizedStateResult = Result<ItemizedStoragePageResponse, jsonrpsee::core::Error>;
+type PaginatedStateResult =
+	Result<Vec<PaginatedStorageResponse>, jsonrpsee::types::ErrorObjectOwned>;
+type ItemizedStateResult = Result<ItemizedStoragePageResponse, jsonrpsee::types::ErrorObjectOwned>;
 
 #[tokio::test]
 async fn get_paginated_storage_with_non_existent_schema_id_should_return_error() {

diff --git a/pallets/time-release/src/mock.rs b/pallets/time-release/src/mock.rs
@@ -53,7 +53,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/runtime/common/src/weights/pallet_balances.rs b/runtime/common/src/weights/pallet_balances.rs
@@ -33,6 +33,16 @@ use core::marker::PhantomData;
 /// Weights for `pallet_balances` using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_balances::WeightInfo for SubstrateWeight<T> {
+	fn force_adjust_total_issuance () -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `5078`
+		// Minimum execution time: 43_182_000 picoseconds.
+		Weight::from_parts(43_728_000, 5078)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+
+	}
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn transfer_allow_death() -> Weight {

diff --git a/runtime/frequency/src/lib.rs b/runtime/frequency/src/lib.rs
@@ -357,7 +357,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("frequency"),
 	impl_name: create_runtime_str!("frequency"),
 	authoring_version: 1,
-	spec_version: 93,
+	spec_version: 94,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -371,7 +371,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("frequency-testnet"),
 	impl_name: create_runtime_str!("frequency"),
 	authoring_version: 1,
-	spec_version: 93,
+	spec_version: 94,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -606,7 +606,6 @@ impl pallet_balances::Config for Runtime {
 	type WeightInfo = weights::pallet_balances::SubstrateWeight<Runtime>;
 	type MaxReserves = BalancesMaxReserves;
 	type ReserveIdentifier = [u8; 8];
-	type MaxHolds = ConstU32<1>;
 	type MaxFreezes = BalancesMaxFreezes;
 	type RuntimeHoldReason = RuntimeHoldReason;
 	type RuntimeFreezeReason = RuntimeFreezeReason;