To polkadot-v0.9.38

node/Cargo.toml

@@ -13,7 +13,7 @@ substrate-build-script-utils = { workspace = true }
 # crates.io
 array-bytes = { workspace = true }
 async-trait = { version = "0.1" }
-clap        = { version = "4.0", features = ["derive"] }
+clap        = { version = "4.1", features = ["derive"] }
 codec       = { workspace = true, package = "parity-scale-codec" }
 futures     = { version = "0.3" }
 jsonrpsee   = { version = "0.16", features = ["server"] }
@@ -52,12 +52,11 @@ fp-storage      = { workspace = true }
 # polkadot
 polkadot-cli        = { workspace = true }
 polkadot-primitives = { workspace = true }
-polkadot-service    = { workspace = true }
 xcm                 = { workspace = true }
 
 # substrate
 frame-benchmarking             = { workspace = true, optional = true }
-frame-benchmarking-cli         = { workspace = true, optional = true }
+frame-benchmarking-cli         = { workspace = true }
 pallet-transaction-payment-rpc = { workspace = true }
 sc-basic-authorship            = { workspace = true }
 sc-chain-spec                  = { workspace = true }
@@ -119,7 +118,6 @@ runtime-benchmarks = [
 
 	# substrate
 	"frame-benchmarking",
-	"frame-benchmarking-cli",
 ]
 
 try-runtime = [

node/src/command.rs

@@ -652,14 +652,11 @@ pub fn run() -> Result<()> {
 
 			runner.run_node_until_exit(|config| async move {
 				let chain_spec = &config.chain_spec;
-				let hwbench = if !cli.no_hardware_benchmarks {
+				let hwbench = (!cli.no_hardware_benchmarks).then_some(
 					config.database.path().map(|database_path| {
 						let _ = std::fs::create_dir_all(database_path);
 						sc_sysinfo::gather_hwbench(Some(database_path))
-					})
-				} else {
-					None
-				};
+					})).flatten();
 
 				set_default_ss58_version(chain_spec);
 
@@ -672,7 +669,7 @@ pub fn run() -> Result<()> {
 				);
 				let id = ParaId::from(para_id);
 				let parachain_account =
-					AccountIdConversion::<polkadot_primitives::v2::AccountId>::into_account_truncating(&id);
+					AccountIdConversion::<polkadot_primitives::AccountId>::into_account_truncating(&id);
 				let state_version = Cli::native_runtime_version(&config.chain_spec).state_version();
 				let block: Block =
 					cumulus_client_cli::generate_genesis_block(&*config.chain_spec, state_version)

node/src/service/mod.rs

@@ -312,12 +312,7 @@ where
 			hwbench.clone(),
 		)
 		.await
-		.map_err(|e| match e {
-			cumulus_relay_chain_interface::RelayChainError::ServiceError(
-				polkadot_service::Error::Sub(x),
-			) => x,
-			s => s.to_string().into(),
-		})?;
+		.map_err(|e| sc_service::Error::Application(Box::new(e) as Box<_>))?;
 
 	let block_announce_validator =
 		cumulus_client_network::BlockAnnounceValidator::new(relay_chain_interface.clone(), para_id);
@@ -418,6 +413,16 @@ where
 
 	if let Some(hwbench) = hwbench {
 		sc_sysinfo::print_hwbench(&hwbench);
+		// Here you can check whether the hardware meets your chains' requirements. Putting a link
+		// in there and swapping out the requirements for your own are probably a good idea. The
+		// requirements for a para-chain are dictated by its relay-chain.
+		if !frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench)
+			&& validator
+		{
+			log::warn!(
+				"⚠️  The hardware does not meet the minimal requirements for role 'Authority'."
+			);
+		}
 
 		if let Some(ref mut telemetry) = telemetry {
 			let telemetry_handle = telemetry.handle();

pallet/message-gadget/Cargo.toml

@@ -48,4 +48,7 @@ std = [
 	"sp-io/std",
 ]
 
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	# substrate
+	"frame-support/try-runtime",
+]

pallet/message-transact/Cargo.toml

@@ -64,4 +64,9 @@ std = [
 	"sp-std/std",
 ]
 
-try-runtime = ["frame-support/try-runtime"]
+runtime-benchmarks = []
+
+try-runtime = [
+	# substrate
+	"frame-support/try-runtime",
+]

pallet/message-transact/src/lib.rs

@@ -36,7 +36,9 @@ use fp_ethereum::{TransactionData, ValidatedTransaction};
 use fp_evm::{CheckEvmTransaction, CheckEvmTransactionConfig, InvalidEvmTransactionError};
 use pallet_evm::{FeeCalculator, GasWeightMapping};
 // substrate
-use frame_support::{traits::EnsureOrigin, PalletError, RuntimeDebug};
+use frame_support::{
+	sp_runtime::traits::BadOrigin, traits::EnsureOrigin, PalletError, RuntimeDebug,
+};
 use sp_core::{H160, U256};
 use sp_std::boxed::Box;
 
@@ -63,15 +65,19 @@ impl<O: Into<Result<LcmpEthOrigin, O>> + From<LcmpEthOrigin>> EnsureOrigin<O>
 {
 	type Success = H160;
 
+	fn ensure_origin(o: O) -> Result<Self::Success, BadOrigin> {
+		Self::try_origin(o).map_err(|_| BadOrigin)
+	}
+
 	fn try_origin(o: O) -> Result<Self::Success, O> {
 		o.into().map(|o| match o {
 			LcmpEthOrigin::MessageTransact(id) => id,
 		})
 	}
 
 	#[cfg(feature = "runtime-benchmarks")]
-	fn successful_origin() -> O {
-		O::from(LcmpEthOrigin::MessageTransact(Default::default()))
+	fn try_successful_origin() -> Result<O, ()> {
+		Ok(O::from(LcmpEthOrigin::MessageTransact(Default::default())))
 	}
 }
 

pallet/staking/src/lib.rs

@@ -992,14 +992,6 @@ where
 	fn note_author(author: T::AccountId) {
 		Self::reward_by_ids(&[(author, 20)])
 	}
-
-	fn note_uncle(uncle_author: T::AccountId, _age: T::BlockNumber) {
-		if let Some(block_author) = <pallet_authorship::Pallet<T>>::author() {
-			Self::reward_by_ids(&[(block_author, 2), (uncle_author, 1)])
-		} else {
-			log::error!("[pallet::staking] block author not set, this should never happen; qed");
-		}
-	}
 }
 
 // Play the role of the session manager.

runtime/common/src/xcm_configs.rs

@@ -69,9 +69,9 @@ where
 {
 	fn should_execute<RuntimeCall>(
 		origin: &MultiLocation,
-		message: &mut Xcm<RuntimeCall>,
-		max_weight: XcmWeight,
-		weight_credit: &mut XcmWeight,
+		message: &mut [Instruction<RuntimeCall>],
+		max_weight: Weight,
+		weight_credit: &mut Weight,
 	) -> Result<(), ()> {
 		Deny::should_execute(origin, message, max_weight, weight_credit)?;
 		Allow::should_execute(origin, message, max_weight, weight_credit)
@@ -83,12 +83,11 @@ pub struct DenyReserveTransferToRelayChain;
 impl ShouldExecute for DenyReserveTransferToRelayChain {
 	fn should_execute<RuntimeCall>(
 		origin: &MultiLocation,
-
-		message: &mut Xcm<RuntimeCall>,
-		_max_weight: XcmWeight,
-		_weight_credit: &mut XcmWeight,
+		message: &mut [Instruction<RuntimeCall>],
+		_max_weight: Weight,
+		_weight_credit: &mut Weight,
 	) -> Result<(), ()> {
-		if message.0.iter().any(|inst| {
+		if message.iter().any(|inst| {
 			matches!(
 				inst,
 				InitiateReserveWithdraw {
@@ -107,7 +106,7 @@ impl ShouldExecute for DenyReserveTransferToRelayChain {
 		// An unexpected reserve transfer has arrived from the Relay Chain. Generally, `IsReserve`
 		// should not allow this, but we just log it here.
 		if matches!(origin, MultiLocation { parents: 1, interior: Here })
-			&& message.0.iter().any(|inst| matches!(inst, ReserveAssetDeposited { .. }))
+			&& message.iter().any(|inst| matches!(inst, ReserveAssetDeposited { .. }))
 		{
 			log::warn!(
 				target: "xcm::barriers",
@@ -147,7 +146,7 @@ pub struct LocalAssetTrader<
 	OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,
 	R: TakeRevenue,
 >(
-	XcmWeight,
+	Weight,
 	Currency::Balance,
 	PhantomData<(WeightToFee, AssetId, AccountId, Currency, OnUnbalanced, R)>,
 );
@@ -161,12 +160,12 @@ impl<
 	> WeightTrader for LocalAssetTrader<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced, R>
 {
 	fn new() -> Self {
-		Self(0, Zero::zero(), PhantomData)
+		Self(Weight::zero(), Zero::zero(), PhantomData)
 	}
 
 	fn buy_weight(&mut self, weight: XcmWeight, payment: Assets) -> Result<Assets, XcmError> {
 		log::trace!(target: "xcm::weight", "LocalAssetTrader::buy_weight weight: {:?}, payment: {:?}", weight, payment);
-		let amount = WeightToFee::weight_to_fee(&Weight::from_ref_time(weight));
+		let amount = WeightToFee::weight_to_fee(&weight);
 		let u128_amount: u128 = amount.try_into().map_err(|_| XcmError::Overflow)?;
 		let required: MultiAsset = (Concrete(AssetId::get()), u128_amount).into();
 		let unused = payment.checked_sub(required.clone()).map_err(|_| XcmError::TooExpensive)?;
@@ -179,7 +178,7 @@ impl<
 	fn refund_weight(&mut self, weight: XcmWeight) -> Option<MultiAsset> {
 		log::trace!(target: "xcm::weight", "LocalAssetTrader::refund_weight weight: {:?}", weight);
 		let weight = weight.min(self.0);
-		let amount = WeightToFee::weight_to_fee(&Weight::from_ref_time(weight));
+		let amount = WeightToFee::weight_to_fee(&weight);
 		self.0 -= weight;
 		self.1 = self.1.saturating_sub(amount);
 		let amount: u128 = amount.saturated_into();

runtime/crab/Cargo.toml

@@ -265,6 +265,7 @@ runtime-benchmarks = [
 	"darwinia-common-runtime/runtime-benchmarks",
 	"darwinia-deposit/runtime-benchmarks",
 	"darwinia-ecdsa-authority/runtime-benchmarks",
+	"darwinia-message-transact/runtime-benchmarks",
 	"darwinia-staking/runtime-benchmarks",
 
 	# darwinia-messages-substrate

runtime/crab/src/bridges_message/darwinia.rs

@@ -96,7 +96,6 @@ impl MessageBridge for WithDarwiniaMessageBridge {
 	const BRIDGED_CHAIN_ID: bp_runtime::ChainId = DARWINIA_CHAIN_ID;
 	const BRIDGED_MESSAGES_PALLET_NAME: &'static str =
 		bridge_runtime_common::pallets::WITH_CRAB_MESSAGES_PALLET_NAME;
-	const RELAYER_FEE_PERCENT: u32 = 10;
 	const THIS_CHAIN_ID: bp_runtime::ChainId = CRAB_CHAIN_ID;
 }
 

runtime/crab/src/lib.rs

@@ -312,6 +312,12 @@ sp_api::impl_runtime_apis! {
 		) -> pallet_transaction_payment::FeeDetails<Balance> {
 			TransactionPayment::query_fee_details(uxt, len)
 		}
+		fn query_weight_to_fee(weight: frame_support::weights::Weight) -> Balance {
+			TransactionPayment::weight_to_fee(weight)
+		}
+		fn query_length_to_fee(length: u32) -> Balance {
+			TransactionPayment::length_to_fee(length)
+		}
 	}
 
 	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi<Block, Balance, RuntimeCall>
@@ -329,6 +335,12 @@ sp_api::impl_runtime_apis! {
 		) -> pallet_transaction_payment::FeeDetails<Balance> {
 			TransactionPayment::query_call_fee_details(call, len)
 		}
+		fn query_weight_to_fee(weight: frame_support::weights::Weight) -> Balance {
+			TransactionPayment::weight_to_fee(weight)
+		}
+		fn query_length_to_fee(length: u32) -> Balance {
+			TransactionPayment::length_to_fee(length)
+		}
 	}
 
 	impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {

runtime/crab/src/pallets/authorship.rs

@@ -21,7 +21,5 @@ use crate::*;
 
 impl pallet_authorship::Config for Runtime {
 	type EventHandler = (DarwiniaStaking,);
-	type FilterUncle = ();
 	type FindAuthor = pallet_session::FindAccountFromAuthorIndex<Self, Aura>;
-	type UncleGenerations = ConstU32<0>;
 }