rpc server: listen to ipv6 socket if available and --experimental-rpc-endpoint CLI option

Cargo.toml

@@ -806,8 +806,8 @@ isahc = { version = "1.2" }
 itertools = { version = "0.11" }
 jobserver = { version = "0.1.26" }
 jsonpath_lib = { version = "0.3" }
-jsonrpsee = { version = "0.23.2" }
-jsonrpsee-core = { version = "0.23.2" }
+jsonrpsee = { version = "0.24.3" }
+jsonrpsee-core = { version = "0.24.3" }
 k256 = { version = "0.13.3", default-features = false }
 kitchensink-runtime = { path = "substrate/bin/node/runtime" }
 kvdb = { version = "0.13.0" }

cumulus/client/cli/src/lib.rs

@@ -21,13 +21,13 @@
 use std::{
 	fs,
 	io::{self, Write},
-	net::SocketAddr,
 	path::PathBuf,
 	sync::Arc,
 };
 
 use codec::Encode;
 use sc_chain_spec::ChainSpec;
+use sc_cli::RpcEndpoint;
 use sc_client_api::HeaderBackend;
 use sc_service::{
 	config::{PrometheusConfig, RpcBatchRequestConfig, TelemetryEndpoints},
@@ -423,7 +423,7 @@ impl sc_cli::CliConfiguration for NormalizedRunCmd {
 		self.base.rpc_cors(is_dev)
 	}
 
-	fn rpc_addr(&self, default_listen_port: u16) -> sc_cli::Result<Option<SocketAddr>> {
+	fn rpc_addr(&self, default_listen_port: u16) -> sc_cli::Result<Option<Vec<RpcEndpoint>>> {
 		self.base.rpc_addr(default_listen_port)
 	}
 

cumulus/polkadot-parachain/src/command.rs

@@ -34,13 +34,13 @@ use log::info;
 use parachains_common::{AssetHubPolkadotAuraId, AuraId};
 use sc_cli::{
 	ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,
-	NetworkParams, Result, SharedParams, SubstrateCli,
+	NetworkParams, Result, RpcListenAddr, SharedParams, SubstrateCli,
 };
 use sc_service::config::{BasePath, PrometheusConfig};
 use sp_runtime::traits::AccountIdConversion;
 #[cfg(feature = "runtime-benchmarks")]
 use sp_runtime::traits::HashingFor;
-use std::{net::SocketAddr, path::PathBuf};
+use std::path::PathBuf;
 
 /// The choice of consensus for the parachain omni-node.
 #[derive(PartialEq, Eq, Debug, Default)]
@@ -652,7 +652,7 @@ impl CliConfiguration<Self> for RelayChainCli {
 			.or_else(|| self.base_path.clone().map(Into::into)))
 	}
 
-	fn rpc_addr(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> {
+	fn rpc_addr(&self, default_listen_port: u16) -> Result<Option<Vec<RpcListenAddr>>> {
 		self.base.base.rpc_addr(default_listen_port)
 	}
 

cumulus/polkadot-parachain/src/rpc.rs

@@ -24,10 +24,7 @@ use crate::{
 };
 use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
 use parachains_common::{AccountId, Balance, Block, Nonce};
-use sc_rpc::{
-	dev::{Dev, DevApiServer},
-	DenyUnsafe,
-};
+use sc_rpc::dev::{Dev, DevApiServer};
 use std::{marker::PhantomData, sync::Arc};
 use substrate_frame_rpc_system::{System, SystemApiServer};
 use substrate_state_trie_migration_rpc::{StateMigration, StateMigrationApiServer};
@@ -37,7 +34,6 @@ pub type RpcExtension = jsonrpsee::RpcModule<()>;
 
 pub(crate) trait BuildRpcExtensions<Client, Backend, Pool> {
 	fn build_rpc_extensions(
-		deny_unsafe: DenyUnsafe,
 		client: Arc<Client>,
 		backend: Arc<Backend>,
 		pool: Arc<Pool>,
@@ -56,7 +52,6 @@ where
 	RuntimeApi: ConstructNodeRuntimeApi<Block, ParachainClient<RuntimeApi>> + Send + Sync + 'static,
 {
 	fn build_rpc_extensions(
-		_deny_unsafe: DenyUnsafe,
 		_client: Arc<ParachainClient<RuntimeApi>>,
 		_backend: Arc<ParachainBackend>,
 		_pool: Arc<sc_transaction_pool::FullPool<Block, ParachainClient<RuntimeApi>>>,
@@ -79,18 +74,17 @@ where
 		+ substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Nonce>,
 {
 	fn build_rpc_extensions(
-		deny_unsafe: DenyUnsafe,
 		client: Arc<ParachainClient<RuntimeApi>>,
 		backend: Arc<ParachainBackend>,
 		pool: Arc<sc_transaction_pool::FullPool<Block, ParachainClient<RuntimeApi>>>,
 	) -> sc_service::error::Result<RpcExtension> {
 		let build = || -> Result<RpcExtension, Box<dyn std::error::Error + Send + Sync>> {
 			let mut module = RpcExtension::new(());
 
-			module.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?;
+			module.merge(System::new(client.clone(), pool).into_rpc())?;
 			module.merge(TransactionPayment::new(client.clone()).into_rpc())?;
-			module.merge(StateMigration::new(client.clone(), backend, deny_unsafe).into_rpc())?;
-			module.merge(Dev::new(client, deny_unsafe).into_rpc())?;
+			module.merge(StateMigration::new(client.clone(), backend).into_rpc())?;
+			module.merge(Dev::new(client).into_rpc())?;
 
 			Ok(module)
 		};