NODE-84, chore: bifrost-frontier/pull/12 (#37)

node/common/src/rpc.rs

@@ -86,6 +86,8 @@ pub struct GrandpaDeps<B> {
 
 /// Full client dependencies.
 pub struct FullDevDeps<C, P, BE, SC, A: ChainApi, CIDP> {
+	/// Client version.
+	pub client_version: String,
 	/// The client instance to use.
 	pub client: Arc<C>,
 	/// Transaction pool instance.
@@ -136,6 +138,8 @@ pub struct FullDevDeps<C, P, BE, SC, A: ChainApi, CIDP> {
 
 /// Mainnet/Testnet client dependencies.
 pub struct FullDeps<C, P, BE, SC, A: ChainApi, CIDP> {
+	/// Client version.
+	pub client_version: String,
 	/// The client instance to use.
 	pub client: Arc<C>,
 	/// Transaction pool instance.

node/core/src/command.rs

@@ -55,7 +55,7 @@ impl SubstrateCli for Cli {
 	}
 
 	fn support_url() -> String {
-		"support.anonymous.an".into()
+		env!("CARGO_PKG_HOMEPAGE").into()
 	}
 
 	fn copyright_start_year() -> i32 {

node/dev/src/rpc.rs

@@ -81,6 +81,7 @@ where
 
 	let mut io = RpcModule::new(());
 	let FullDevDeps {
+		client_version,
 		client,
 		pool,
 		select_chain: _,
@@ -169,7 +170,7 @@ where
 	)
 	.ok();
 
-	io.merge(Web3::new(Arc::clone(&client)).into_rpc()).ok();
+	io.merge(Web3::new(&client_version).into_rpc()).ok();
 
 	if ethapi_cmd.contains(&EthApiCmd::Txpool) {
 		io.merge(TxPool::new(Arc::clone(&client), graph.clone()).into_rpc()).ok();

node/dev/src/service.rs

@@ -632,6 +632,7 @@ pub fn build_rpc_extensions_builder(
 		Some(shared_authority_set.clone()),
 	);
 
+	let client_version = config.impl_version.clone();
 	let client = builder.client.clone();
 	let pool = builder.transaction_pool.clone();
 	let network = builder.network.clone();
@@ -774,6 +775,7 @@ pub fn build_rpc_extensions_builder(
 
 	let rpc_extensions_builder = move |deny_unsafe, subscription_executor| {
 		let deps = FullDevDeps {
+			client_version: client_version.clone(),
 			client: client.clone(),
 			pool: pool.clone(),
 			graph: pool.pool().clone(),

node/mainnet/src/rpc.rs

@@ -80,6 +80,7 @@ where
 
 	let mut io = RpcModule::new(());
 	let FullDeps {
+		client_version,
 		client,
 		pool,
 		select_chain: _,
@@ -167,7 +168,7 @@ where
 	)
 	.ok();
 
-	io.merge(Web3::new(Arc::clone(&client)).into_rpc()).ok();
+	io.merge(Web3::new(&client_version).into_rpc()).ok();
 
 	if ethapi_cmd.contains(&EthApiCmd::Txpool) {
 		io.merge(TxPool::new(Arc::clone(&client), graph.clone()).into_rpc()).ok();

node/mainnet/src/service.rs

@@ -430,6 +430,7 @@ pub fn build_rpc_extensions_builder(
 		Some(shared_authority_set.clone()),
 	);
 
+	let client_version = config.impl_version.clone();
 	let client = builder.client.clone();
 	let pool = builder.transaction_pool.clone();
 	let network = builder.network.clone();
@@ -571,6 +572,7 @@ pub fn build_rpc_extensions_builder(
 
 	let rpc_extensions_builder = move |deny_unsafe, subscription_executor| {
 		let deps = FullDeps {
+			client_version: client_version.clone(),
 			client: client.clone(),
 			pool: pool.clone(),
 			graph: pool.pool().clone(),

node/testnet/src/rpc.rs

@@ -80,6 +80,7 @@ where
 
 	let mut io = RpcModule::new(());
 	let FullDeps {
+		client_version,
 		client,
 		pool,
 		select_chain: _,
@@ -154,7 +155,7 @@ where
 	)
 	.ok();
 
-	io.merge(Web3::new(Arc::clone(&client)).into_rpc()).ok();
+	io.merge(Web3::new(&client_version).into_rpc()).ok();
 
 	io.merge(
 		EthPubSub::new(

node/testnet/src/service.rs

@@ -430,6 +430,7 @@ pub fn build_rpc_extensions_builder(
 		Some(shared_authority_set.clone()),
 	);
 
+	let client_version = config.impl_version.clone();
 	let client = builder.client.clone();
 	let pool = builder.transaction_pool.clone();
 	let network = builder.network.clone();
@@ -571,6 +572,7 @@ pub fn build_rpc_extensions_builder(
 
 	let rpc_extensions_builder = move |deny_unsafe, subscription_executor| {
 		let deps = FullDeps {
+			client_version: client_version.clone(),
 			client: client.clone(),
 			pool: pool.clone(),
 			graph: pool.pool().clone(),