Extract darwinia-runtime (#32)

* Skeleton * XCM configs * Bump toolchain * Code cleaning part.1 * Code cleaning part.2 * Update SS58 * Rename * Update token decimals * Format * Extract darwinia core primitives * License * Benchmarks * Extract constants * Docs * CI part.1 * Adjust the runtime pallets structure (#29) * frame-system * pallet-timestamp * pallet-authorship * pallet-balances * pallet-transaction-payment * pallet-parachain-system * pallet-parachain-info * pallet-aura-ext * pallet-xcmp-queue * pallet-dmp-queue * pallet-session * pallet-aura * pallet-collator-selection * format * deal ambiguous name * fix compile * clear imports * update visibility for pallets * add license for pallets * update darwinia comments * CI part.2 Signed-off-by: Xavier Lau <xavier@inv.cafe> * CI part.3 * CI part.4 * Add missing features * Case * Setup build environment * CI part.5 * init * adjust structure & fix compile * Move`type Barrier` out of `common` because of different runtimes may require different barriers * Add required xcm barriers * format * remove redundant files * format * format * try fix ci * merge main * fix ci * Format * remove unused dependencies * format * format * format * Format Signed-off-by: Xavier Lau <xavier@inv.cafe> Co-authored-by: Xavier Lau <xavier@inv.cafe>
darwinia-network · Nov 15, 2022 · 4e5fac1 · 4e5fac1
1 parent 56b31f8
commit 4e5fac1
Show file tree

Hide file tree

Showing 40 changed files with 103 additions and 49 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -113,7 +113,7 @@ jobs:
       - name: Check
         run: |
           unset RUSTC_WRAPPER
-          subalfred check features runtime
+          subalfred check features runtime/darwinia
 
   runtime-checks:
     name: Task check runtime

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,5 +5,5 @@ panic = "unwind"
 members = [
 	"core/*",
 	"node",
-	"runtime",
+	"runtime/*",
 ]
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -35,7 +35,7 @@ cumulus-relay-chain-interface           = { git = "https://github.com/paritytech
 cumulus-relay-chain-rpc-interface       = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.30" }
 
 # darwinia
-darwinia-runtime = { path = "../runtime" }
+darwinia-runtime = { path = "../runtime/darwinia" }
 dc-primitives    = { path = "../core/primitives" }
 
 # frontier

diff --git a/node/src/command.rs b/node/src/command.rs
@@ -362,7 +362,7 @@ pub fn run() -> Result<()> {
 		// TODO: https://github.com/darwinia-network/darwinia-2.0/issues/35
 		Some(Subcommand::FrontierDb(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
-			runner.sync_run(|config| {
+			runner.sync_run(|_config| {
 				// let PartialComponents { client, other, .. } = service::new_partial(&config,
 				// &cli)?; let frontier_backend = other.2;
 				// cmd.run::<_, Block>(client, frontier_backend)

diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+authors     = ["Darwinia Network <hello@darwinia.network>"]
+description = "Darwinia Common Runtime"
+edition     = "2021"
+homepage    = "https://darwinia.network/"
+license     = "GPL-3.0"
+name        = "darwinia-common-runtime"
+readme      = "README.md"
+repository  = "https://github.com/darwinia-network/darwinia"
+version     = "6.0.0"
+
+[dependencies]
+# polkadot
+xcm          = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" }
+xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" }
+# substrate
+frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+
+[features]
+default = ["std"]
+std = [
+	# polkadot
+	"xcm/std",
+	"xcm-executor/std",
+	# substrate
+	"frame-support/std",
+]
diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
@@ -0,0 +1,21 @@
+// This file is part of Darwinia.
+//
+// Copyright (C) 2018-2022 Darwinia Network
+// SPDX-License-Identifier: GPL-3.0
+//
+// Darwinia is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Darwinia is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+pub mod xcm_barrier;
diff --git a/runtime/src/xcm_config/barrier.rs → runtime/common/src/xcm_barrier.rs b/runtime/src/xcm_config/barrier.rs → runtime/common/src/xcm_barrier.rs
@@ -20,16 +20,19 @@
 use core::marker::PhantomData;
 // polkadot
 use xcm::latest::{prelude::*, Weight as XCMWeight};
-use xcm_builder::*;
 use xcm_executor::traits::ShouldExecute;
 // substrate
-use frame_support::{log, traits::Everything};
+use frame_support::log;
 
 frame_support::match_types! {
 	pub type ParentOrParentsExecutivePlurality: impl Contains<MultiLocation> = {
 		MultiLocation { parents: 1, interior: Here } |
 		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Executive, .. }) }
 	};
+	pub type ParentOrSiblings: impl Contains<MultiLocation> = {
+		MultiLocation { parents: 1, interior: Here } |
+		MultiLocation { parents: 1, interior: X1(_) }
+	};
 }
 
 //TODO: move DenyThenTry to polkadot's xcm module.
@@ -96,13 +99,3 @@ impl ShouldExecute for DenyReserveTransferToRelayChain {
 		Ok(())
 	}
 }
-
-pub type Barrier = DenyThenTry<
-	DenyReserveTransferToRelayChain,
-	(
-		TakeWeightCredit,
-		AllowTopLevelPaidExecutionFrom<Everything>,
-		AllowUnpaidExecutionFrom<ParentOrParentsExecutivePlurality>,
-		// ^^^ Parent and its exec plurality get free execution
-	),
->;
diff --git a/runtime/Cargo.toml → runtime/darwinia/Cargo.toml b/runtime/Cargo.toml → runtime/darwinia/Cargo.toml
@@ -35,7 +35,8 @@ parachain-info                  = { default-features = false, git = "https://git
 cumulus-pallet-session-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" }
 
 # darwinia
-dc-primitives = { default-features = false, path = "../core/primitives" }
+darwinia-common-runtime = { default-features = false, path = "../common" }
+dc-primitives           = { default-features = false, path = "../../core/primitives" }
 
 # frontier
 fp-evm                       = { default-features = false, git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.30" }
@@ -88,9 +89,7 @@ frame-system-benchmarking = { optional = true, default-features = false, git = "
 frame-try-runtime         = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
 
 [features]
-default = [
-	"std",
-]
+default = ["std"]
 std = [
 	# crates.io
 	"codec/std",
@@ -111,6 +110,7 @@ std = [
 	"cumulus-pallet-session-benchmarking?/std",
 
 	# darwinia
+	"darwinia-common-runtime/std",
 	"dc-primitives/std",
 
 	# frontier

diff --git a/runtime/build.rs → runtime/darwinia/build.rs b/runtime/build.rs → runtime/darwinia/build.rs
diff --git a/runtime/src/lib.rs → runtime/darwinia/src/lib.rs b/runtime/src/lib.rs → runtime/darwinia/src/lib.rs
@@ -29,9 +29,6 @@ pub use pallets::*;
 
 mod weights;
 
-mod xcm_config;
-use xcm_config::{XcmConfig, XcmOriginToTransactDispatchOrigin};
-
 pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 
 // crates.io

diff --git a/runtime/src/pallets/aura.rs → runtime/darwinia/src/pallets/aura.rs b/runtime/src/pallets/aura.rs → runtime/darwinia/src/pallets/aura.rs
diff --git a/runtime/src/pallets/aura_ext.rs → runtime/darwinia/src/pallets/aura_ext.rs b/runtime/src/pallets/aura_ext.rs → runtime/darwinia/src/pallets/aura_ext.rs
diff --git a/runtime/src/pallets/authorship.rs → runtime/darwinia/src/pallets/authorship.rs b/runtime/src/pallets/authorship.rs → runtime/darwinia/src/pallets/authorship.rs
diff --git a/runtime/src/pallets/balances.rs → runtime/darwinia/src/pallets/balances.rs b/runtime/src/pallets/balances.rs → runtime/darwinia/src/pallets/balances.rs
diff --git a/runtime/src/pallets/base_fee.rs → runtime/darwinia/src/pallets/base_fee.rs b/runtime/src/pallets/base_fee.rs → runtime/darwinia/src/pallets/base_fee.rs
diff --git a/runtime/src/pallets/collator_selection.rs → ...arwinia/src/pallets/collator_selection.rs b/runtime/src/pallets/collator_selection.rs → ...arwinia/src/pallets/collator_selection.rs
diff --git a/runtime/src/pallets/dmp_queue.rs → runtime/darwinia/src/pallets/dmp_queue.rs b/runtime/src/pallets/dmp_queue.rs → runtime/darwinia/src/pallets/dmp_queue.rs
diff --git a/runtime/src/pallets/ethereum.rs → runtime/darwinia/src/pallets/ethereum.rs b/runtime/src/pallets/ethereum.rs → runtime/darwinia/src/pallets/ethereum.rs
diff --git a/runtime/src/pallets/evm.rs → runtime/darwinia/src/pallets/evm.rs b/runtime/src/pallets/evm.rs → runtime/darwinia/src/pallets/evm.rs
diff --git a/runtime/src/pallets/mod.rs → runtime/darwinia/src/pallets/mod.rs b/runtime/src/pallets/mod.rs → runtime/darwinia/src/pallets/mod.rs
@@ -63,3 +63,6 @@ pub use evm::*;
 
 mod base_fee;
 pub use base_fee::*;
+
+mod polkadot_xcm;
+pub use polkadot_xcm::*;
diff --git a/runtime/src/pallets/parachain_info_.rs → ...e/darwinia/src/pallets/parachain_info_.rs b/runtime/src/pallets/parachain_info_.rs → ...e/darwinia/src/pallets/parachain_info_.rs
diff --git a/runtime/src/pallets/parachain_system.rs → .../darwinia/src/pallets/parachain_system.rs b/runtime/src/pallets/parachain_system.rs → .../darwinia/src/pallets/parachain_system.rs
diff --git a/runtime/src/xcm_config/mod.rs → runtime/darwinia/src/pallets/polkadot_xcm.rs b/runtime/src/xcm_config/mod.rs → runtime/darwinia/src/pallets/polkadot_xcm.rs
@@ -16,11 +16,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
 
-mod barrier;
-use barrier::Barrier;
-
 // darwinia
 use crate::*;
+use darwinia_common_runtime::xcm_barrier::*;
 // polkadot
 use pallet_xcm::XcmPassthrough;
 use polkadot_parachain::primitives::Sibling;
@@ -81,6 +79,20 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	XcmPassthrough<RuntimeOrigin>,
 );
 
+pub type Barrier = DenyThenTry<
+	DenyReserveTransferToRelayChain,
+	(
+		TakeWeightCredit,
+		AllowTopLevelPaidExecutionFrom<Everything>,
+		// Parent and its exec plurality get free execution
+		AllowUnpaidExecutionFrom<ParentOrParentsExecutivePlurality>,
+		// Expected responses are OK.
+		AllowKnownQueryResponses<PolkadotXcm>,
+		// Subscriptions for version tracking are OK.
+		AllowSubscriptionsFrom<ParentOrSiblings>,
+	),
+>;
+
 frame_support::parameter_types! {
 	pub const RelayLocation: MultiLocation = MultiLocation::parent();
 	pub const MaxInstructions: u32 = 100;

diff --git a/runtime/src/pallets/session.rs → runtime/darwinia/src/pallets/session.rs b/runtime/src/pallets/session.rs → runtime/darwinia/src/pallets/session.rs
diff --git a/runtime/src/pallets/system.rs → runtime/darwinia/src/pallets/system.rs b/runtime/src/pallets/system.rs → runtime/darwinia/src/pallets/system.rs
diff --git a/runtime/src/pallets/timestamp.rs → runtime/darwinia/src/pallets/timestamp.rs b/runtime/src/pallets/timestamp.rs → runtime/darwinia/src/pallets/timestamp.rs
diff --git a/runtime/src/pallets/transaction_payment.rs → ...rwinia/src/pallets/transaction_payment.rs b/runtime/src/pallets/transaction_payment.rs → ...rwinia/src/pallets/transaction_payment.rs
diff --git a/runtime/src/pallets/xcmp_queue.rs → runtime/darwinia/src/pallets/xcmp_queue.rs b/runtime/src/pallets/xcmp_queue.rs → runtime/darwinia/src/pallets/xcmp_queue.rs
diff --git a/runtime/src/weights/block_weights.rs → ...ime/darwinia/src/weights/block_weights.rs b/runtime/src/weights/block_weights.rs → ...ime/darwinia/src/weights/block_weights.rs
diff --git a/.../src/weights/cumulus_pallet_xcmp_queue.rs → .../src/weights/cumulus_pallet_xcmp_queue.rs b/.../src/weights/cumulus_pallet_xcmp_queue.rs → .../src/weights/cumulus_pallet_xcmp_queue.rs
diff --git a/runtime/src/weights/extrinsic_weights.rs → ...darwinia/src/weights/extrinsic_weights.rs b/runtime/src/weights/extrinsic_weights.rs → ...darwinia/src/weights/extrinsic_weights.rs
diff --git a/runtime/src/weights/frame_system.rs → runtime/darwinia/src/weights/frame_system.rs b/runtime/src/weights/frame_system.rs → runtime/darwinia/src/weights/frame_system.rs
diff --git a/runtime/src/weights/mod.rs → runtime/darwinia/src/weights/mod.rs b/runtime/src/weights/mod.rs → runtime/darwinia/src/weights/mod.rs
diff --git a/runtime/src/weights/pallet_balances.rs → ...e/darwinia/src/weights/pallet_balances.rs b/runtime/src/weights/pallet_balances.rs → ...e/darwinia/src/weights/pallet_balances.rs
diff --git a/.../src/weights/pallet_collator_selection.rs → .../src/weights/pallet_collator_selection.rs b/.../src/weights/pallet_collator_selection.rs → .../src/weights/pallet_collator_selection.rs
diff --git a/runtime/src/weights/pallet_session.rs → ...me/darwinia/src/weights/pallet_session.rs b/runtime/src/weights/pallet_session.rs → ...me/darwinia/src/weights/pallet_session.rs
diff --git a/runtime/src/weights/pallet_timestamp.rs → .../darwinia/src/weights/pallet_timestamp.rs b/runtime/src/weights/pallet_timestamp.rs → .../darwinia/src/weights/pallet_timestamp.rs
diff --git a/runtime/src/weights/paritydb_weights.rs → .../darwinia/src/weights/paritydb_weights.rs b/runtime/src/weights/paritydb_weights.rs → .../darwinia/src/weights/paritydb_weights.rs
diff --git a/runtime/src/weights/rocksdb_weights.rs → ...e/darwinia/src/weights/rocksdb_weights.rs b/runtime/src/weights/rocksdb_weights.rs → ...e/darwinia/src/weights/rocksdb_weights.rs