Revert "Revert "Multi-runtime support (centrifuge#395)""

This reverts commit a1ba572.
bytetigers · Jun 25, 2021 · 2d0bf8a · 2d0bf8a
1 parent 7adf8f6
commit 2d0bf8a
Show file tree

Hide file tree

Showing 32 changed files with 3,083 additions and 3,165 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,12 +30,14 @@ members = [
 	"pallets/bridge-mapping",
 	"pallets/fees",
 	"pallets/anchors",
-    "pallets/claims",
+	"pallets/claims",
 	"pallets/crowdloan-claim",
 	"pallets/crowdloan-reward",
 	"libs/trait-crowdloan-reward",
 	"libs/proofs",
-	"runtime",
+	"runtime/altair",
+	"runtime/centrifuge",
+	"runtime/common",
 ]
 
 [dependencies]
@@ -127,7 +129,10 @@ polkadot-service = {git = "https://github.com/centrifuge/polkadot", branch = "ce
 polkadot-cli = {git = "https://github.com/centrifuge/polkadot", branch = "centrifuge" }
 
 # node-specific dependencies
-node-runtime = { package = "centrifuge-chain-runtime", path = "runtime" }
+altair-runtime = { path = "runtime/altair" }
+centrifuge-runtime = { path = "runtime/centrifuge" }
+development-runtime = { path = "runtime/development" }
+runtime-common = { path = "runtime/common" }
 node-primitives = { git = "https://github.com/centrifuge/substrate", branch = "master" }
 
 # benchmarking
@@ -154,5 +159,7 @@ std = [
 	"sp-consensus-babe/std"
 ]
 runtime-benchmarks = [
-	"node-runtime/runtime-benchmarks",
+	"altair-runtime/runtime-benchmarks",
+	"centrifuge-runtime/runtime-benchmarks",
+	"development-runtime/runtime-benchmarks",
 ]
diff --git a/runtime/Cargo.toml → runtime/altair/Cargo.toml b/runtime/Cargo.toml → runtime/altair/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "centrifuge-chain-runtime"
+name = "altair-runtime"
 version = "2.0.0"
 authors = ["Centrifuge <admin@centrifuge.io>"]
 edition = "2018"
@@ -94,9 +94,11 @@ pallet-aura = { git = "https://github.com/centrifuge/substrate", default-feature
 pallet-society = { git = "https://github.com/centrifuge/substrate", default-features = false, branch = "master" }
 max-encoded-len = { git = "https://github.com/centrifuge/substrate", default-features = false, features = [ "derive" ] , branch = "master" }
 
-pallet-anchors = { path = "../pallets/anchors", default-features = false }
-pallet-fees = { path = "../pallets/fees", default-features = false }
-pallet-claims = { path = "../pallets/claims", default-features = false }
+runtime-common = { path = "../common", default-features = false }
+
+pallet-anchors = { path = "../../pallets/anchors", default-features = false }
+pallet-fees = { path = "../../pallets/fees", default-features = false }
+pallet-claims = { path = "../../pallets/claims", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder = "3.0.0"
@@ -169,6 +171,7 @@ std = [
     "pallet-claims/std",
     "pallet-sudo/std",
     "pallet-society/std",
+    "runtime-common/std",
 ]
 runtime-benchmarks = [
     "frame-benchmarking",

diff --git a/runtime/build.rs → runtime/altair/build.rs b/runtime/build.rs → runtime/altair/build.rs
diff --git a/runtime/altair/src/constants.rs b/runtime/altair/src/constants.rs
@@ -0,0 +1,12 @@
+//! A set of constant values used in altair runtime
+
+/// Money matters.
+pub mod currency {
+	use node_primitives::Balance;
+	use runtime_common::*;
+
+	pub const MICRO_AIR: Balance = MICRO_CFG;
+	pub const MILLI_AIR: Balance = MILLI_CFG;
+	pub const CENTI_AIR: Balance = CENTI_CFG;
+	pub const AIR: Balance = CFG;
+}
diff --git a/runtime/src/lib.rs → runtime/altair/src/lib.rs b/runtime/src/lib.rs → runtime/altair/src/lib.rs
@@ -25,7 +25,7 @@ pub use pallet_timestamp::Call as TimestampCall;
 pub use pallet_transaction_payment::{CurrencyAdapter, Multiplier, TargetedFeeAdjustment};
 use pallet_transaction_payment_rpc_runtime_api::{FeeDetails, RuntimeDispatchInfo};
 use polkadot_runtime_common::{BlockHashCount, RocksDbWeight, SlowAdjustingFeeUpdate};
-use sp_api::{decl_runtime_apis, impl_runtime_apis};
+use sp_api::impl_runtime_apis;
 use sp_core::u32_trait::{_1, _2, _3, _4};
 use sp_core::OpaqueMetadata;
 use sp_inherents::{CheckInherentsResult, InherentData};
@@ -49,13 +49,10 @@ pub mod constants;
 /// Constant values used within the runtime.
 use constants::currency::*;
 
-mod common;
-/// common types for the runtime..
-pub use common::*;
+/// common types for the runtime.
+pub use runtime_common::*;
 
-pub mod impls;
 use frame_support::traits::Filter;
-use impls::*;
 
 // Make the WASM binary available.
 #[cfg(feature = "std")]
@@ -222,7 +219,7 @@ parameter_types! {
 }
 
 impl pallet_transaction_payment::Config for Runtime {
-	type OnChargeTransaction = CurrencyAdapter<Balances, DealWithFees>;
+	type OnChargeTransaction = CurrencyAdapter<Balances, DealWithFees<Runtime>>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = WeightToFee;
 	type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>;
@@ -714,13 +711,6 @@ pub type Executive = frame_executive::Executive<
 	(),
 >;
 
-decl_runtime_apis! {
-	/// The API to query anchoring info.
-	pub trait AnchorApi {
-		fn get_anchor_by_id(id: Hash) -> Option<AnchorData<Hash, BlockNumber>>;
-	}
-}
-
 impl_runtime_apis! {
 	impl sp_api::Core<Block> for Runtime {
 		fn version() -> RuntimeVersion {
@@ -821,7 +811,7 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl self::AnchorApi<Block> for Runtime {
+	impl runtime_common::AnchorApi<Block> for Runtime {
 		fn get_anchor_by_id(id: Hash) -> Option<AnchorData<Hash, BlockNumber>> {
 			Anchor::get_anchor_by_id(id)
 		}