Merge pull request #295 from paritytech/upgrade-polkadot-stable2503

Author: Moliholy

Cargo.lock

@@ -378,7 +378,7 @@ pub fn run() -> Result<()> {
 							testnet_runtime::RuntimeApi,
 							TestnetRuntimeExecutor,
 							sc_network::NetworkWorker<_, _>
-						>(config, polkadot_config, collator_options, id, hwbench)
+						>(config, polkadot_config, collator_options, id, hwbench, cli.run.experimental_max_pov_percentage)
 						.await
 						.map(|r| r.0)
 						.map_err(Into::into)
@@ -391,7 +391,7 @@ pub fn run() -> Result<()> {
 							mainnet_runtime::RuntimeApi,
 							MainnetRuntimeExecutor,
 							sc_network::NetworkWorker<_, _>
-						>(config, polkadot_config, collator_options, id, hwbench)
+						>(config, polkadot_config, collator_options, id, hwbench, cli.run.experimental_max_pov_percentage)
 						.await
 						.map(|r| r.0)
 						.map_err(Into::into)

Cargo.toml

@@ -211,6 +211,7 @@ async fn start_node_impl<RuntimeApi, Executor, BIQ, SC, Net>(
 	build_import_queue: BIQ,
 	start_consensus: SC,
 	hwbench: Option<sc_sysinfo::HwBench>,
+	max_pov_percentage: Option<u32>,
 ) -> sc_service::error::Result<(TaskManager, Arc<ParachainClient<RuntimeApi>>)>
 where
 	RuntimeApi: ConstructRuntimeApi<Block, ParachainClient<RuntimeApi>> + Send + Sync + 'static,
@@ -253,6 +254,7 @@ where
 		CollatorPair,
 		OverseerHandle,
 		Arc<dyn Fn(Hash, Option<Vec<u8>>) + Send + Sync>,
+		Option<u32>,
 	) -> Result<(), sc_service::Error>,
 	Net: NetworkBackend<Block, Hash>,
 {
@@ -286,7 +288,7 @@ where
 	let transaction_pool = params.transaction_pool.clone();
 	let import_queue_service = params.import_queue.service();
 
-	let (network, system_rpc_tx, tx_handler_controller, start_network, sync_service) =
+	let (network, system_rpc_tx, tx_handler_controller, sync_service) =
 		build_network(BuildNetworkParams {
 			parachain_config: &parachain_config,
 			net_config,
@@ -419,11 +421,10 @@ where
 			collator_key.expect("Command line arguments do not allow this. qed"),
 			overseer_handle,
 			announce_block,
+			max_pov_percentage,
 		)?;
 	}
 
-	start_network.start_network();
-
 	Ok((task_manager, client))
 }
 
@@ -485,6 +486,7 @@ fn start_consensus<RuntimeApi>(
 	collator_key: CollatorPair,
 	overseer_handle: OverseerHandle,
 	announce_block: Arc<dyn Fn(Hash, Option<Vec<u8>>) + Send + Sync>,
+	max_pov_percentage: Option<u32>,
 ) -> Result<(), sc_service::Error>
 where
 	RuntimeApi: ConstructRuntimeApi<Block, ParachainClient<RuntimeApi>> + Send + Sync + 'static,
@@ -539,6 +541,7 @@ where
 		collator_service,
 		authoring_duration: Duration::from_millis(2000),
 		reinitialize: false,
+		max_pov_percentage,
 	};
 
 	let fut = aura::run::<Block, sp_consensus_aura::sr25519::AuthorityPair, _, _, _, _, _, _, _, _>(
@@ -556,6 +559,7 @@ pub async fn start_parachain_node<RuntimeApi, Executor, Net: NetworkBackend<Bloc
 	collator_options: CollatorOptions,
 	para_id: ParaId,
 	hwbench: Option<sc_sysinfo::HwBench>,
+	max_pov_percentage: Option<u32>,
 ) -> sc_service::error::Result<(TaskManager, Arc<ParachainClient<RuntimeApi>>)>
 where
 	Executor: NativeExecutionDispatch + 'static,
@@ -580,6 +584,7 @@ where
 		build_import_queue::<RuntimeApi>,
 		start_consensus::<RuntimeApi>,
 		hwbench,
+		max_pov_percentage,
 	)
 	.await
 }

node/src/command.rs

@@ -1,6 +1,6 @@
 use crate::Config;
 use frame_support::traits::fungible::Inspect;
-use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
+use parity_scale_codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 
 pub type BalanceOf<T> =
@@ -9,7 +9,7 @@ pub type BalanceOf<T> =
 pub type Item = u128;
 pub type Domain = [u8; 8];
 
-#[derive(Clone, Encode, Decode, Debug, Eq, PartialEq, TypeInfo)]
+#[derive(Clone, Encode, Decode, DecodeWithMemTracking, Debug, Eq, PartialEq, TypeInfo)]
 pub struct TradeParams<Amount, ItemId, Expiration> {
 	pub price: Amount,
 	pub fee: Amount,
@@ -24,7 +24,7 @@ pub type TradeParamsOf<T> = TradeParams<
 	<T as pallet_timestamp::Config>::Moment,
 >;
 
-#[derive(Clone, Encode, Decode, Debug, Eq, PartialEq, TypeInfo)]
+#[derive(Clone, Encode, Decode, DecodeWithMemTracking, Debug, Eq, PartialEq, TypeInfo)]
 pub struct TradeSignatures<OffchainSignature> {
 	pub ask_signature: OffchainSignature,
 	pub bid_signature: OffchainSignature,

node/src/service.rs

@@ -1,5 +1,5 @@
 use frame_support::{pallet_prelude::DispatchResult, traits::fungible::Inspect};
-use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
+use parity_scale_codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_std::vec::Vec;
 
@@ -43,7 +43,7 @@ pub struct Bid<AccountId, Amount, Expiration> {
 	pub fee: Amount,
 }
 
-#[derive(Clone, Encode, Decode, Debug, Eq, PartialEq, TypeInfo)]
+#[derive(Clone, Encode, Decode, DecodeWithMemTracking, Debug, Eq, PartialEq, TypeInfo)]
 pub enum OrderType {
 	Ask,
 	Bid,
@@ -55,7 +55,7 @@ pub enum ExecOrder<AccountId, Amount, Expiration, Agent> {
 	Bid(Bid<AccountId, Amount, Expiration>),
 }
 
-#[derive(Clone, Encode, Decode, Debug, Eq, PartialEq, TypeInfo)]
+#[derive(Clone, Encode, Decode, DecodeWithMemTracking, Debug, Eq, PartialEq, TypeInfo)]
 pub struct Order<CollectionId, ItemId, Amount, Expiration, OffchainSignature, Agent, BoundedString>
 {
 	pub order_type: OrderType,
@@ -68,7 +68,7 @@ pub struct Order<CollectionId, ItemId, Amount, Expiration, OffchainSignature, Ag
 	pub signature_data: SignatureData<OffchainSignature, BoundedString>,
 }
 
-#[derive(Clone, Encode, Decode, Debug, Eq, PartialEq, TypeInfo)]
+#[derive(Clone, Encode, Decode, DecodeWithMemTracking, Debug, Eq, PartialEq, TypeInfo)]
 pub struct SignatureData<OffchainSignature, BoundedString> {
 	pub signature: OffchainSignature,
 	pub nonce: BoundedString,
@@ -105,7 +105,7 @@ impl<CollectionId, ItemId, Amount, Expiration, OffchainSignature, Agent, Bounded
 	}
 }
 
-#[derive(Clone, Encode, Decode, Debug, Eq, PartialEq, TypeInfo)]
+#[derive(Clone, Encode, Decode, DecodeWithMemTracking, Debug, Eq, PartialEq, TypeInfo)]
 pub enum Execution {
 	/// The order must be executed otherwise it should fail
 	Force,

pallets/dmarket/src/types.rs

@@ -94,7 +94,9 @@ pub mod pallet {
 	}
 
 	/// A call in a batch.
-	#[derive(Clone, Encode, Decode, PartialEq, Eq, TypeInfo, MaxEncodedLen)]
+	#[derive(
+		Clone, Encode, Decode, DecodeWithMemTracking, PartialEq, Eq, TypeInfo, MaxEncodedLen,
+	)]
 	#[scale_info(skip_type_params(T))]
 	pub struct BatchedCall<T: Config> {
 		/// The public key that will be the origin of this call.
@@ -114,7 +116,7 @@ pub mod pallet {
 	}
 
 	/// A signature of a batch by one of its participants.
-	#[derive(Clone, Encode, Decode, PartialEq, TypeInfo, MaxEncodedLen)]
+	#[derive(Clone, Encode, Decode, DecodeWithMemTracking, PartialEq, TypeInfo, MaxEncodedLen)]
 	#[scale_info(skip_type_params(T))]
 	pub struct Approval<T: Config> {
 		pub from: T::Signer,

pallets/marketplace/src/types.rs

@@ -41,6 +41,7 @@ impl pallet_balances::Config for Test {
 	PartialOrd,
 	Encode,
 	Decode,
+	DecodeWithMemTracking,
 	RuntimeDebug,
 	MaxEncodedLen,
 	scale_info::TypeInfo,