To polkadot-v0.9.37 (#266)

* Anchor polkadot-v0.9.37 * Companion for paritytech/substrate#12307 * Companion for paritytech/cumulus#2057 * Use prepare branch for test * Companion for polkadot-evm/frontier#981 * Remove collator selection in bench * Fix BenchmarkHelper * Fix compile * Format * Fix compile * Fix compile feature benchmark * Fix test * Format toml * Format * Pangoro2 0.9.37 * Fix try-runtime * Fix try-runtime cmd * Format * Fix review * Use `Vec` * Typo --------- Co-authored-by: Xavier Lau <[email protected]>
darwinia-network · Feb 15, 2023 · e6c048c · e6c048c
1 parent 49a48eb
commit e6c048c
Show file tree

Hide file tree

Showing 40 changed files with 1,865 additions and 1,058 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -43,7 +43,7 @@ fc-cli          = { workspace = true }
 fc-consensus    = { workspace = true }
 fc-db           = { workspace = true }
 fc-mapping-sync = { workspace = true }
-fc-rpc          = { features = ["rpc_binary_search_estimate"], workspace = true }
+fc-rpc          = { features = ["rpc-binary-search-estimate"], workspace = true }
 fc-rpc-core     = { workspace = true }
 fp-evm          = { workspace = true }
 fp-rpc          = { workspace = true }

diff --git a/node/src/command.rs b/node/src/command.rs
@@ -614,24 +614,28 @@ pub fn run() -> Result<()> {
 			let task_manager = TaskManager::new(runner.config().tokio_handle.clone(), *registry)
 				.map_err(|e| format!("Error: {:?}", e))?;
 
+			#[cfg(feature = "crab-native")]
 			if chain_spec.is_crab() {
 				return runner.async_run(|_| {
 					Ok((cmd.run::<Block, HostFunctionsOf<CrabRuntimeExecutor>>(), task_manager))
 				});
 			}
 
+			#[cfg(feature = "darwinia-native")]
 			if chain_spec.is_darwinia() {
 				return runner.async_run(|_| {
 					Ok((cmd.run::<Block, HostFunctionsOf<DarwiniaRuntimeExecutor>>(), task_manager))
 				});
 			}
 
+			#[cfg(feature = "pangolin-native")]
 			if chain_spec.is_pangolin() {
 				return runner.async_run(|_| {
 					Ok((cmd.run::<Block, HostFunctionsOf<PangolinRuntimeExecutor>>(), task_manager))
 				});
 			}
 
+			#[cfg(feature = "pangoro-native")]
 			if chain_spec.is_pangoro() {
 				return runner.async_run(|_| {
 					Ok((cmd.run::<Block, HostFunctionsOf<PangoroRuntimeExecutor>>(), task_manager))

diff --git a/pallet/account-migration/tests/mock.rs b/pallet/account-migration/tests/mock.rs
@@ -111,6 +111,7 @@ impl pallet_assets::Config for Runtime {
 	type AssetId = AssetId;
 	type AssetIdParameter = codec::Compact<AssetId>;
 	type Balance = Balance;
+	type CallbackHandle = ();
 	type CreateOrigin =
 		frame_support::traits::AsEnsureOriginWithArg<frame_system::EnsureSigned<AccountId>>;
 	type Currency = Balances;

diff --git a/pallet/deposit/tests/mock.rs b/pallet/deposit/tests/mock.rs
@@ -75,6 +75,7 @@ impl pallet_assets::Config for Runtime {
 	type AssetId = AssetId;
 	type AssetIdParameter = codec::Compact<AssetId>;
 	type Balance = Balance;
+	type CallbackHandle = ();
 	type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg<
 		frame_system::EnsureSignedBy<frame_support::traits::IsInVec<()>, u32>,
 	>;

diff --git a/pallet/message-gadget/src/lib.rs b/pallet/message-gadget/src/lib.rs
@@ -27,7 +27,7 @@ use frame_support::{log, pallet_prelude::*, traits::Get};
 use frame_system::pallet_prelude::*;
 use sp_core::{H160, H256};
 use sp_io::hashing;
-use sp_std::vec;
+use sp_std::prelude::*;
 
 #[frame_support::pallet]
 pub mod pallet {
@@ -88,7 +88,7 @@ where
 			None,
 			None,
 			None,
-			vec![],
+			Vec::new(),
 			false,
 			false,
 			<T as pallet_evm::Config>::config(),

diff --git a/pallet/message-gadget/tests/tests.rs b/pallet/message-gadget/tests/tests.rs
@@ -76,6 +76,7 @@ impl pallet_evm::Config for Runtime {
 	type FindAuthor = ();
 	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type OnChargeTransaction = ();
+	type OnCreate = ();
 	type PrecompilesType = ();
 	type PrecompilesValue = ();
 	type Runner = pallet_evm::runner::stack::Runner<Self>;

diff --git a/pallet/message-transact/src/mock.rs b/pallet/message-transact/src/mock.rs
@@ -125,6 +125,7 @@ impl pallet_evm::Config for TestRuntime {
 	type FindAuthor = ();
 	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type OnChargeTransaction = ();
+	type OnCreate = ();
 	type PrecompilesType = ();
 	type PrecompilesValue = ();
 	type Runner = pallet_evm::runner::stack::Runner<Self>;

diff --git a/pallet/staking/tests/mock.rs b/pallet/staking/tests/mock.rs
@@ -77,6 +77,7 @@ impl pallet_assets::Config for Runtime {
 	type AssetId = AssetId;
 	type AssetIdParameter = codec::Compact<AssetId>;
 	type Balance = Balance;
+	type CallbackHandle = ();
 	type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg<
 		frame_system::EnsureSignedBy<frame_support::traits::IsInVec<()>, u32>,
 	>;

diff --git a/precompile/assets/src/mock.rs b/precompile/assets/src/mock.rs
@@ -162,6 +162,7 @@ impl pallet_evm::Config for TestRuntime {
 	type FindAuthor = ();
 	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type OnChargeTransaction = ();
+	type OnCreate = ();
 	type PrecompilesType = TestPrecompiles<Self>;
 	type PrecompilesValue = PrecompilesValue;
 	type Runner = pallet_evm::runner::stack::Runner<Self>;
@@ -177,6 +178,7 @@ impl pallet_assets::Config for TestRuntime {
 	type AssetId = AssetId;
 	type AssetIdParameter = codec::Compact<AssetId>;
 	type Balance = Balance;
+	type CallbackHandle = ();
 	type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg<
 		frame_system::EnsureSignedBy<frame_support::traits::IsInVec<()>, AccountId>,
 	>;

diff --git a/precompile/bls12-381/src/lib.rs b/precompile/bls12-381/src/lib.rs
@@ -25,7 +25,7 @@ use milagro_bls::{AggregatePublicKey, AggregateSignature, PublicKey, Signature};
 // moonbeam
 use precompile_utils::prelude::*;
 // substrate
-use sp_std::vec::Vec;
+use sp_std::prelude::*;
 
 pub(crate) const VERIFY_ESTIMATED_COST: u64 = 100_000;
 pub struct BLS12381<T>(PhantomData<T>);

diff --git a/precompile/deposit/src/mock.rs b/precompile/deposit/src/mock.rs
@@ -164,6 +164,7 @@ impl pallet_evm::Config for TestRuntime {
 	type FindAuthor = ();
 	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type OnChargeTransaction = ();
+	type OnCreate = ();
 	type PrecompilesType = TestPrecompiles<Self>;
 	type PrecompilesValue = PrecompilesValue;
 	type Runner = pallet_evm::runner::stack::Runner<Self>;

diff --git a/precompile/staking/src/lib.rs b/precompile/staking/src/lib.rs
@@ -36,7 +36,7 @@ use frame_support::{
 };
 use sp_core::{H160, U256};
 use sp_runtime::Perbill;
-use sp_std::vec::Vec;
+use sp_std::prelude::*;
 
 pub struct Staking<Runtime>(PhantomData<Runtime>);
 

diff --git a/precompile/staking/src/mock.rs b/precompile/staking/src/mock.rs
@@ -168,6 +168,7 @@ impl pallet_evm::Config for TestRuntime {
 	type FindAuthor = ();
 	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type OnChargeTransaction = ();
+	type OnCreate = ();
 	type PrecompilesType = TestPrecompiles<Self>;
 	type PrecompilesValue = PrecompilesValue;
 	type Runner = pallet_evm::runner::stack::Runner<Self>;

diff --git a/precompile/state-storage/src/mock.rs b/precompile/state-storage/src/mock.rs
@@ -149,6 +149,7 @@ impl pallet_evm::Config for TestRuntime {
 	type FindAuthor = ();
 	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type OnChargeTransaction = ();
+	type OnCreate = ();
 	type PrecompilesType = TestPrecompiles<Self>;
 	type PrecompilesValue = PrecompilesValue;
 	type Runner = pallet_evm::runner::stack::Runner<Self>;

diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
@@ -28,6 +28,7 @@ xcm-executor = { workspace = true }
 # substrate
 frame-support     = { workspace = true }
 frame-system      = { workspace = true }
+pallet-assets     = { workspace = true }
 pallet-balances   = { workspace = true }
 pallet-collective = { workspace = true }
 pallet-treasury   = { workspace = true }
@@ -58,6 +59,7 @@ std = [
 	# substrate
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-assets/std",
 	"pallet-balances/std",
 	"pallet-collective/std",
 	"pallet-treasury/std",
@@ -67,3 +69,7 @@ std = [
 ]
 
 test = []
+
+runtime-benchmarks = [
+	"pallet-assets/runtime-benchmarks"
+]
diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
@@ -204,3 +204,13 @@ macro_rules! impl_self_contained_call {
 		}
 	};
 }
+
+/// Helper for pallet-assets benchmarking.
+#[cfg(feature = "runtime-benchmarks")]
+pub struct AssetsBenchmarkHelper;
+#[cfg(feature = "runtime-benchmarks")]
+impl pallet_assets::BenchmarkHelper<codec::Compact<u64>> for AssetsBenchmarkHelper {
+	fn create_asset_id_parameter(id: u32) -> codec::Compact<u64> {
+		u64::from(id).into()
+	}
+}
diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml
@@ -257,6 +257,9 @@ runtime-benchmarks = [
 	# cumulus optional
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 
+	# darwinia
+	"darwinia-common-runtime/runtime-benchmarks",
+
 	# darwinia-messages-substrate
 	"bridge-runtime-common/runtime-benchmarks",
 	"pallet-bridge-grandpa/runtime-benchmarks",

diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
@@ -172,7 +172,6 @@ frame_benchmarking::define_benchmarks! {
 	[pallet_balances, Balances]
 	[pallet_session, SessionBench::<Runtime>]
 	[pallet_timestamp, Timestamp]
-	[pallet_collator_selection, CollatorSelection]
 	[cumulus_pallet_xcmp_queue, XcmpQueue]
 }
 
@@ -547,7 +546,7 @@ sp_api::impl_runtime_apis! {
 
 	#[cfg(feature = "try-runtime")]
 	impl frame_try_runtime::TryRuntime<Block> for Runtime {
-		fn on_runtime_upgrade(checks: bool) -> (Weight, frame_support::weights::Weight) {
+		fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (frame_support::weights::Weight, frame_support::weights::Weight) {
 			// substrate
 			use frame_support::log;
 
@@ -563,7 +562,7 @@ sp_api::impl_runtime_apis! {
 			state_root_check: bool,
 			signature_check: bool,
 			select: frame_try_runtime::TryStateSelect,
-		) -> Weight {
+		) -> frame_support::weights::Weight {
 			// NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
 			// have a backtrace here.
 			Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap()

diff --git a/runtime/crab/src/pallets/assets.rs b/runtime/crab/src/pallets/assets.rs
@@ -36,7 +36,8 @@ impl pallet_assets::Config for Runtime {
 	type AssetIdParameter = codec::Compact<AssetId>;
 	type Balance = Balance;
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = ();
+	type BenchmarkHelper = AssetsBenchmarkHelper;
+	type CallbackHandle = ();
 	type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg<
 		frame_system::EnsureSignedBy<frame_support::traits::IsInVec<Creators>, AccountId>,
 	>;

diff --git a/runtime/crab/src/pallets/evm.rs b/runtime/crab/src/pallets/evm.rs
@@ -181,6 +181,7 @@ impl pallet_evm::Config for Runtime {
 	type FindAuthor = FindAuthorTruncated<Aura>;
 	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type OnChargeTransaction = ();
+	type OnCreate = ();
 	type PrecompilesType = CrabPrecompiles<Self>;
 	type PrecompilesValue = PrecompilesValue;
 	type Runner = pallet_evm::runner::stack::Runner<Self>;

diff --git a/runtime/crab/src/pallets/proxy.rs b/runtime/crab/src/pallets/proxy.rs
@@ -78,7 +78,9 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 			ProxyType::Staking => {
 				matches!(
 					c,
-					RuntimeCall::Session(..) | RuntimeCall::Deposit(..) | RuntimeCall::DarwiniaStaking(..)
+					RuntimeCall::Session(..)
+						| RuntimeCall::Deposit(..)
+						| RuntimeCall::DarwiniaStaking(..)
 				)
 			},
 			ProxyType::IdentityJudgement =>

diff --git a/runtime/darwinia/Cargo.toml b/runtime/darwinia/Cargo.toml
@@ -258,6 +258,9 @@ runtime-benchmarks = [
 	# cumulus optional
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 
+	# darwinia
+	"darwinia-common-runtime/runtime-benchmarks",
+
 	# darwinia-messages-substrate
 	"bridge-runtime-common/runtime-benchmarks",
 	"pallet-bridge-grandpa/runtime-benchmarks",

diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs
@@ -172,7 +172,6 @@ frame_benchmarking::define_benchmarks! {
 	[pallet_balances, Balances]
 	[pallet_session, SessionBench::<Runtime>]
 	[pallet_timestamp, Timestamp]
-	[pallet_collator_selection, CollatorSelection]
 	[cumulus_pallet_xcmp_queue, XcmpQueue]
 }
 
@@ -548,7 +547,7 @@ sp_api::impl_runtime_apis! {
 
 	#[cfg(feature = "try-runtime")]
 	impl frame_try_runtime::TryRuntime<Block> for Runtime {
-		fn on_runtime_upgrade(checks: bool) -> (Weight, frame_support::weights::Weight) {
+		fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (frame_support::weights::Weight, frame_support::weights::Weight) {
 			// substrate
 			use frame_support::log;
 
@@ -564,7 +563,7 @@ sp_api::impl_runtime_apis! {
 			state_root_check: bool,
 			signature_check: bool,
 			select: frame_try_runtime::TryStateSelect,
-		) -> Weight {
+		) -> frame_support::weights::Weight {
 			// NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
 			// have a backtrace here.
 			Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap()

diff --git a/runtime/darwinia/src/pallets/assets.rs b/runtime/darwinia/src/pallets/assets.rs
@@ -36,7 +36,8 @@ impl pallet_assets::Config for Runtime {
 	type AssetIdParameter = codec::Compact<AssetId>;
 	type Balance = Balance;
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = ();
+	type BenchmarkHelper = AssetsBenchmarkHelper;
+	type CallbackHandle = ();
 	type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg<
 		frame_system::EnsureSignedBy<frame_support::traits::IsInVec<Creators>, AccountId>,
 	>;

diff --git a/runtime/darwinia/src/pallets/evm.rs b/runtime/darwinia/src/pallets/evm.rs
@@ -181,6 +181,7 @@ impl pallet_evm::Config for Runtime {
 	type FindAuthor = FindAuthorTruncated<Aura>;
 	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type OnChargeTransaction = ();
+	type OnCreate = ();
 	type PrecompilesType = DarwiniaPrecompiles<Self>;
 	type PrecompilesValue = PrecompilesValue;
 	type Runner = pallet_evm::runner::stack::Runner<Self>;

diff --git a/runtime/darwinia/src/pallets/proxy.rs b/runtime/darwinia/src/pallets/proxy.rs
@@ -78,7 +78,9 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 			ProxyType::Staking => {
 				matches!(
 					c,
-					RuntimeCall::Session(..) | RuntimeCall::Deposit(..) | RuntimeCall::DarwiniaStaking(..)
+					RuntimeCall::Session(..)
+						| RuntimeCall::Deposit(..)
+						| RuntimeCall::DarwiniaStaking(..)
 				)
 			},
 			ProxyType::IdentityJudgement =>

diff --git a/runtime/pangolin/Cargo.toml b/runtime/pangolin/Cargo.toml
@@ -256,6 +256,9 @@ runtime-benchmarks = [
 	# cumulus optional
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 
+	# darwinia
+	"darwinia-common-runtime/runtime-benchmarks",
+
 	# darwinia-messages-substrate
 	"bridge-runtime-common/runtime-benchmarks",
 	"pallet-bridge-grandpa/runtime-benchmarks",

diff --git a/runtime/pangolin/src/lib.rs b/runtime/pangolin/src/lib.rs
@@ -163,7 +163,6 @@ frame_benchmarking::define_benchmarks! {
 	[pallet_balances, Balances]
 	[pallet_session, SessionBench::<Runtime>]
 	[pallet_timestamp, Timestamp]
-	[pallet_collator_selection, CollatorSelection]
 	[cumulus_pallet_xcmp_queue, XcmpQueue]
 }
 
@@ -529,7 +528,7 @@ sp_api::impl_runtime_apis! {
 
 	#[cfg(feature = "try-runtime")]
 	impl frame_try_runtime::TryRuntime<Block> for Runtime {
-		fn on_runtime_upgrade(checks: bool) -> (Weight, frame_support::weights::Weight) {
+		fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (frame_support::weights::Weight, frame_support::weights::Weight) {
 			// substrate
 			use frame_support::log;
 
@@ -545,7 +544,7 @@ sp_api::impl_runtime_apis! {
 			state_root_check: bool,
 			signature_check: bool,
 			select: frame_try_runtime::TryStateSelect,
-		) -> Weight {
+		) -> frame_support::weights::Weight {
 			// NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
 			// have a backtrace here.
 			Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap()

diff --git a/runtime/pangolin/src/migration.rs b/runtime/pangolin/src/migration.rs
@@ -1,12 +1,13 @@
 // darwinia
 #[allow(unused_imports)]
 use crate::*;
+// substrate
 
 pub struct CustomOnRuntimeUpgrade;
 impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 	#[cfg(feature = "try-runtime")]
-	fn pre_upgrade() -> Result<(), &'static str> {
-		Ok(())
+	fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
+		Ok(Vec::new())
 	}
 
 	#[cfg(feature = "try-runtime")]

diff --git a/runtime/pangolin/src/pallets/assets.rs b/runtime/pangolin/src/pallets/assets.rs
@@ -36,7 +36,8 @@ impl pallet_assets::Config for Runtime {
 	type AssetIdParameter = codec::Compact<AssetId>;
 	type Balance = Balance;
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = ();
+	type BenchmarkHelper = AssetsBenchmarkHelper;
+	type CallbackHandle = ();
 	type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg<
 		frame_system::EnsureSignedBy<frame_support::traits::IsInVec<Creators>, AccountId>,
 	>;

diff --git a/runtime/pangolin/src/pallets/evm.rs b/runtime/pangolin/src/pallets/evm.rs
@@ -181,6 +181,7 @@ impl pallet_evm::Config for Runtime {
 	type FindAuthor = FindAuthorTruncated<Aura>;
 	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type OnChargeTransaction = ();
+	type OnCreate = ();
 	type PrecompilesType = PangolinPrecompiles<Self>;
 	type PrecompilesValue = PrecompilesValue;
 	type Runner = pallet_evm::runner::stack::Runner<Self>;