Add EVM tests

.gitignore

@@ -9,7 +9,7 @@
 ## cargo
 /target
 ## npm
-node_modules
+**/node_modules
 
 # Test data
 test-data

node/Cargo.toml

@@ -20,6 +20,7 @@ futures   = { version = "0.3" }
 jsonrpsee = { version = "0.15", features = ["server"] }
 log       = { version = "0.4" }
 serde     = { version = "1.0", features = ["derive"] }
+async-trait = "0.1"
 
 # cumulus
 cumulus-client-cli                      = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.30" }
@@ -65,6 +66,7 @@ sc-chain-spec                  = { git = "https://github.com/paritytech/substrat
 sc-cli                         = { features = ["wasmtime"], git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
 sc-client-api                  = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
 sc-consensus                   = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sc-consensus-manual-seal       = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", optional = true }
 sc-executor                    = { features = ["wasmtime"], git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
 sc-keystore                    = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
 sc-network                     = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
@@ -97,6 +99,10 @@ try-runtime-cli                = { git = "https://github.com/paritytech/substrat
 [features]
 default = []
 
+manual-seal = [
+	"sc-consensus-manual-seal",
+]
+
 runtime-benchmarks = [
 	# darwinia
 	"darwinia-runtime/runtime-benchmarks",

node/build.rs

@@ -20,3 +20,4 @@ fn main() {
 	substrate_build_script_utils::generate_cargo_keys();
 	substrate_build_script_utils::rerun_if_git_head_changed();
 }
+

node/src/cli.rs

@@ -133,14 +133,22 @@ pub struct EthArgs {
 	/// Maximum fee history cache size.
 	#[clap(long, default_value = "2048")]
 	pub fee_history_limit: u64,
+
+	/// Choose sealing method.
+	#[cfg(feature = "manual-seal")]
+	#[clap(long, arg_enum, ignore_case = true)]
+	pub sealing: Sealing,
 }
+
 impl EthArgs {
 	pub fn build_eth_rpc_config(&self) -> EthRpcConfig {
 		EthRpcConfig {
 			eth_statuses_cache: self.eth_statuses_cache,
 			eth_log_block_cache: self.eth_log_block_cache,
 			max_past_logs: self.max_past_logs,
 			fee_history_limit: self.fee_history_limit,
+			#[cfg(feature = "manual-seal")]
+			sealing: self.sealing,
 		}
 	}
 }
@@ -157,4 +165,25 @@ pub struct EthRpcConfig {
 
 	/// Maximum fee history cache size.
 	pub max_past_logs: u32,
+
+	/// Choose sealing method.
+	#[cfg(feature = "manual-seal")]
+	pub sealing: Sealing,
+}
+
+/// Available Sealing methods.
+#[cfg(feature = "manual-seal")]
+#[derive(Debug, Copy, Clone, clap::ArgEnum)]
+pub enum Sealing {
+	// Seal using rpc method.
+	Manual,
+	// Seal when transaction is executed.
+	Instant,
+}
+
+#[cfg(feature = "manual-seal")]
+impl Default for Sealing {
+	fn default() -> Sealing {
+		Sealing::Manual
+	}
 }

node/src/command.rs

@@ -364,7 +364,7 @@ pub fn run() -> Result<()> {
 			let runner = cli.create_runner(cmd)?;
 
 			runner.sync_run(|config| {
-				let PartialComponents { client, other: (frontier_backend, ..), .. } =
+				let PartialComponents { client, other: (_, frontier_backend, ..), .. } =
 					service::new_partial::<RuntimeApi, DarwiniaRuntimeExecutor>(
 						&config,
 						&cli.eth_args.build_eth_rpc_config(),
@@ -470,7 +470,10 @@ pub fn run() -> Result<()> {
 				log::info!("Parachain id: {:?}", id);
 				log::info!("Parachain Account: {}", parachain_account);
 				log::info!("Parachain genesis state: {}", genesis_state);
-				log::info!("Is collating: {}", if config.role.is_authority() { "yes" } else { "no" });
+				log::info!(
+					"Is collating: {}",
+					if config.role.is_authority() { "yes" } else { "no" }
+				);
 
 				crate::service::start_parachain_node(
 					config,

node/src/rpc.rs

@@ -27,6 +27,9 @@ pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor};
 use std::sync::Arc;
 // darwinia
 use dc_primitives::*;
+// substrate
+#[cfg(feature = "manual-seal")]
+use sc_consensus_manual_seal::rpc::{ManualSeal, ManualSealApiServer};
 
 /// A type representing all RPC extensions.
 pub type RpcExtension = jsonrpsee::RpcModule<()>;
@@ -59,6 +62,10 @@ pub struct FullDeps<C, P, A: sc_transaction_pool::ChainApi> {
 	pub overrides: Arc<fc_rpc::OverrideHandle<Block>>,
 	/// Cache for Ethereum block data.
 	pub block_data_cache: Arc<fc_rpc::EthBlockDataCacheTask<Block>>,
+	/// Manual seal command sink
+	#[cfg(feature = "manual-seal")]
+	pub command_sink:
+		Option<futures::channel::mpsc::Sender<sc_consensus_manual_seal::rpc::EngineCommand<Hash>>>,
 }
 
 /// Instantiate all RPC extensions.
@@ -111,6 +118,8 @@ where
 		fee_history_cache_limit,
 		overrides,
 		block_data_cache,
+		#[cfg(feature = "manual-seal")]
+		command_sink,
 	} = deps;
 
 	module.merge(System::new(client.clone(), pool.clone(), deny_unsafe).into_rpc())?;
@@ -169,5 +178,14 @@ where
 	)?;
 	module.merge(Web3::new(client).into_rpc())?;
 
+	#[cfg(feature = "manual-seal")]
+	if let Some(command_sink) = command_sink {
+		module.merge(
+			// We provide the rpc handler with the sending end of the channel to allow the rpc
+			// send EngineCommands to the background block authorship task.
+			ManualSeal::new(command_sink).into_rpc(),
+		)?;
+	}
+
 	Ok(module)
 }