Refact dev chain

- reuse asgard for dev and clean unused codes
- integrate rpc api

Author: herryho

.gitignore

@@ -16,3 +16,4 @@ output
 deploy
 snapshot.bin
 *.wasm
+data

Cargo.lock

@@ -125,13 +125,9 @@ deploy-bifrost-live:
 	pm2 deploy scripts/bifrost-ecosystem.config.js production
 
 # Run dev chain
-.PHONY: run-dev
-run-dev:
-	RUST_LOG=debug cargo run -p node-cli --locked --features "with-dev-runtime" -- --tmp --dev
-
 .PHONY: run-dev-manual-seal
-run-dev-manual-seal:
-	RUST_LOG=debug cargo run -p node-cli --locked --features "with-dev-runtime" -- --tmp --dev --sealing instant --rpc-cors all --unsafe-ws-external
+run-dev:
+	RUST_LOG=debug CARGO_INCREMENTAL=0 cargo run -p node-cli --locked --features "with-asgard-runtime" -- --tmp --dev --sealing instant --rpc-cors all --unsafe-ws-external
 
 # Build docker image
 .PHONY: build-docker-image

Makefile

@@ -66,7 +66,7 @@ make try-bifrost-runtime-upgrade
 ## Run development chain
 
 ```bash
-RUST_LOG=debug cargo run -p node-cli --locked --features "with-dev-runtime" -- --tmp --dev 
+make run-dev
 ```
 
 ## Run local testnet with polkadot-launch

README.md

@@ -73,9 +73,6 @@ with-asgard-runtime = [
 with-bifrost-runtime = [
 	"node-service/with-bifrost-runtime",
 ]
-with-dev-runtime = [
-	"node-service/with-dev-runtime"
-]
 with-all-runtime = [
 	"with-asgard-runtime",
 	"with-bifrost-runtime",

node/cli/Cargo.toml

@@ -73,8 +73,8 @@ fn load_spec(
 		"bifrost-genesis" => Box::new(service::chain_spec::bifrost::chainspec_config(para_id)),
 		#[cfg(feature = "with-bifrost-runtime")]
 		"bifrost-local" => Box::new(service::chain_spec::bifrost::local_testnet_config(para_id)?),
-		#[cfg(feature = "with-dev-runtime")]
-		"dev" => Box::new(service::chain_spec::dev::development_config(para_id)?),
+		#[cfg(feature = "with-asgard-runtime")]
+		"dev" => Box::new(service::chain_spec::asgard::development_config(para_id)?),
 		path => {
 			let path = std::path::PathBuf::from(path);
 			if path.to_str().map(|s| s.contains("asgard")) == Some(true) {
@@ -91,13 +91,6 @@ fn load_spec(
 				}
 				#[cfg(not(feature = "with-bifrost-runtime"))]
 				return Err(service::BIFROST_RUNTIME_NOT_AVAILABLE.into());
-			} else if path.to_str().map(|s| s.contains("asgard-dev")) == Some(true) {
-				#[cfg(feature = "with-dev-runtime")]
-				{
-					Box::new(service::chain_spec::dev::ChainSpec::from_json_file(path)?)
-				}
-				#[cfg(not(feature = "with-dev-runtime"))]
-				return Err(service::DEV_RUNTIME_NOT_AVAILABLE.into());
 			} else {
 				return Err("Unknown runtime is not available.".into());
 			}
@@ -141,7 +134,7 @@ impl SubstrateCli for Cli {
 	}
 
 	fn native_runtime_version(spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
-		if spec.is_asgard() {
+		if spec.is_asgard() || spec.is_dev() {
 			#[cfg(feature = "with-asgard-runtime")]
 			{
 				&service::collator::asgard_runtime::VERSION
@@ -156,12 +149,7 @@ impl SubstrateCli for Cli {
 			#[cfg(not(feature = "with-bifrost-runtime"))]
 			panic!("{}", service::BIFROST_RUNTIME_NOT_AVAILABLE);
 		} else {
-			#[cfg(feature = "with-dev-runtime")]
-			{
-				&service::dev::dev_runtime::VERSION
-			}
-			#[cfg(not(feature = "with-dev-runtime"))]
-			panic!("{}", service::DEV_RUNTIME_NOT_AVAILABLE);
+			panic!("{}", "unknown runtime!");
 		}
 	}
 }
@@ -240,14 +228,6 @@ macro_rules! construct_async_run {
 				let task_manager = $components.task_manager;
 				{ $( $code )* }.map(|v| (v, task_manager))
 			});
-			#[cfg(feature = "with-dev-runtime")]
-			return runner.async_run(|$config| {
-				let $components = crate::service::dev::new_partial(
-					&$config,
-				)?;
-				let task_manager = $components.task_manager;
-				{ $( $code )* }.map(|v| (v, task_manager))
-			});
 	}}
 }
 
@@ -265,7 +245,7 @@ macro_rules! with_runtime_or_err {
 
 			#[cfg(not(feature = "with-bifrost-runtime"))]
 			return Err(service::BIFROST_RUNTIME_NOT_AVAILABLE.into());
-		} else if $chain_spec.is_asgard() {
+		} else if $chain_spec.is_asgard() || $chain_spec.is_dev() {
 			#[cfg(feature = "with-asgard-runtime")]
 			#[allow(unused_imports)]
 			use asgard_runtime::{Block, RuntimeApi};
@@ -277,8 +257,9 @@ macro_rules! with_runtime_or_err {
 
 			#[cfg(not(feature = "with-asgard-runtime"))]
 			return Err(service::ASGARD_RUNTIME_NOT_AVAILABLE.into());
-		} else {
-			return Err(service::DEV_RUNTIME_NOT_AVAILABLE.into());
+		}
+		else {
+			return Err(service::UNKNOWN_RUNTIME.into());
 		}
 	}
 }
@@ -304,8 +285,8 @@ pub fn run() -> Result<()> {
 		None => {
 			let runner = cli.create_runner(&cli.run.normalize())?;
 			runner.run_node_until_exit(|config| async move {
-				if config.chain_spec.is_asgard_dev() {
-					#[cfg(feature = "with-dev-runtime")]
+				if config.chain_spec.is_dev() {
+					#[cfg(feature = "with-asgard-runtime")]
 					{
 						return service::dev::new_full(config).map_err(Into::into);
 					}

node/cli/src/command.rs

@@ -41,7 +41,6 @@ use bifrost_salp_rpc_api::{SalpRpcApi, SalpRpcWrapper};
 use bifrost_salp_rpc_runtime_api::SalpRuntimeApi;
 use node_primitives::{AccountId, Balance, Block, Nonce, ParaId, PoolId};
 use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi};
-use sc_client_api::AuxStore;
 use sc_rpc_api::DenyUnsafe;
 use sc_transaction_pool_api::TransactionPool;
 use sp_api::ProvideRuntimeApi;
@@ -64,15 +63,49 @@ pub struct FullDeps<C, P> {
 /// A IO handler that uses all Full RPC extensions.
 pub type RpcExtension = jsonrpc_core::IoHandler<sc_rpc::Metadata>;
 
-/// Instantiate all Full RPC extensions.
-///
-/// NOTE: It's a `PATCH` for the RPC of asgard runtime.
+/// RPC of bifrost runtime.
 #[allow(non_snake_case)]
-pub fn create_full<C, P>(deps: FullDeps<C, P>) -> RpcExtension
+pub fn create_bifrost_rpc<C, P>(deps: FullDeps<C, P>) -> RpcExtension
+where
+	C: ProvideRuntimeApi<Block>
+		+ HeaderBackend<Block>
+		+ HeaderMetadata<Block, Error = BlockChainError>
+		+ Send
+		+ Sync
+		+ 'static,
+	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
+	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Nonce>,
+	C::Api: FeeRuntimeApi<Block, AccountId>,
+	C::Api: SalpRuntimeApi<Block, ParaId, AccountId>,
+	C::Api: LiquidityMiningRuntimeApi<Block, AccountId, PoolId>,
+	C::Api: ZenlinkProtocolRuntimeApi<Block, AccountId>,
+	C::Api: BlockBuilder<Block>,
+	P: TransactionPool + Sync + Send + 'static,
+{
+	let mut io = jsonrpc_core::IoHandler::default();
+	let FullDeps { client, pool, deny_unsafe } = deps;
+
+	io.extend_with(SystemApi::to_delegate(FullSystem::new(client.clone(), pool, deny_unsafe)));
+	io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new(client.clone())));
+
+	io.extend_with(FeeRpcApi::to_delegate(FlexibleFeeStruct::new(client.clone())));
+
+	io.extend_with(SalpRpcApi::to_delegate(SalpRpcWrapper::new(client.clone())));
+
+	io.extend_with(LiquidityMiningRpcApi::to_delegate(LiquidityMiningRpcWrapper::new(
+		client.clone(),
+	)));
+
+	io.extend_with(ZenlinkProtocolApi::to_delegate(ZenlinkProtocol::new(client.clone())));
+
+	io
+}
+
+/// RPC of asgard runtime.
+pub fn create_asgard_rpc<C, P>(deps: FullDeps<C, P>) -> RpcExtension
 where
 	C: ProvideRuntimeApi<Block>
 		+ HeaderBackend<Block>
-		+ AuxStore
 		+ HeaderMetadata<Block, Error = BlockChainError>
 		+ Send
 		+ Sync

node/rpc/src/lib.rs

@@ -48,6 +48,7 @@ pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrat
 
 # Substrate Other
 frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" }
 substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" }
 substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" }
 try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", optional = true }
@@ -77,7 +78,6 @@ log = '0.4'
 bifrost-runtime-common = { path = "../../runtime/common"}
 asgard-runtime = { path = "../../runtime/asgard", optional = true }
 bifrost-runtime = { path = "../../runtime/bifrost", optional = true }
-dev-runtime = { path = "../../runtime/dev", optional = true }
 node-primitives = { path = "../primitives" }
 node-rpc = { path = "../rpc" }
 
@@ -105,9 +105,6 @@ with-asgard-runtime = [
 with-bifrost-runtime = [
 	"bifrost-runtime",
 ]
-with-dev-runtime = [
-	"dev-runtime",
-]
 with-all-runtime = [
 	"with-asgard-runtime",
 	"with-bifrost-runtime",