feat: add WebRTC transport

bin/node/cli/benches/block_production.rs

@@ -28,7 +28,7 @@ use sc_consensus::{
 use sc_service::{
 	config::{
 		BlocksPruning, DatabaseSource, KeystoreConfig, NetworkConfiguration, OffchainWorkerConfig,
-		PruningMode, WasmExecutionMethod, WasmtimeInstantiationStrategy,
+		PruningMode, WasmExecutionMethod, WasmtimeInstantiationStrategy, WebRTCConfig,
 	},
 	BasePath, Configuration, Role,
 };
@@ -50,6 +50,7 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
 		Sr25519Keyring::Alice.to_seed(),
 		"network/test/0.1",
 		Default::default(),
+		WebRTCConfig::Ephemeral,
 		None,
 	);
 

bin/node/cli/benches/transaction_pool.rs

@@ -26,7 +26,7 @@ use node_primitives::AccountId;
 use sc_service::{
 	config::{
 		BlocksPruning, DatabaseSource, KeystoreConfig, NetworkConfiguration, OffchainWorkerConfig,
-		PruningMode, TransactionPoolOptions,
+		PruningMode, TransactionPoolOptions, WebRTCConfig,
 	},
 	BasePath, Configuration, Role,
 };
@@ -45,6 +45,7 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
 		Sr25519Keyring::Alice.to_seed(),
 		"network/test/0.1",
 		Default::default(),
+		WebRTCConfig::Ephemeral,
 		None,
 	);
 

client/cli/Cargo.toml

@@ -18,7 +18,7 @@ chrono = "0.4.10"
 clap = { version = "4.2.5", features = ["derive", "string"] }
 fdlimit = "0.2.1"
 futures = "0.3.21"
-libp2p-identity = { version = "0.2.0", features = ["peerid", "ed25519"]}
+libp2p-identity = { version = "0.2.0", features = ["peerid", "ed25519"] }
 log = "0.4.17"
 names = { version = "0.13.0", default-features = false }
 parity-scale-codec = "3.6.1"
@@ -29,7 +29,11 @@ serde = "1.0.163"
 serde_json = "1.0.85"
 thiserror = "1.0.30"
 tiny-bip39 = "1.0.0"
-tokio = { version = "1.22.0", features = ["signal", "rt-multi-thread", "parking_lot"] }
+tokio = { version = "1.22.0", features = [
+    "signal",
+    "rt-multi-thread",
+    "parking_lot",
+] }
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sc-client-db = { version = "0.10.0-dev", default-features = false, path = "../db" }
 sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
@@ -50,6 +54,7 @@ sp-version = { version = "22.0.0", path = "../../primitives/version" }
 tempfile = "3.1.0"
 futures-timer = "3.0.1"
 sp-tracing = { version = "10.0.0", path = "../../primitives/tracing" }
+libp2p-webrtc = { version = "0.6.0-alpha", features = ["tokio", "pem"] }
 
 [features]
 default = ["rocksdb"]

client/cli/src/config.rs

@@ -21,14 +21,15 @@
 use crate::{
 	arg_enums::Database, error::Result, DatabaseParams, ImportParams, KeystoreParams,
 	NetworkParams, NodeKeyParams, OffchainWorkerParams, PruningParams, SharedParams, SubstrateCli,
+	WebRTCCertificateParams,
 };
 use log::warn;
 use names::{Generator, Name};
 use sc_service::{
 	config::{
 		BasePath, Configuration, DatabaseSource, KeystoreConfig, NetworkConfiguration,
 		NodeKeyConfig, OffchainWorkerConfig, PrometheusConfig, PruningMode, Role, RpcMethods,
-		TelemetryEndpoints, TransactionPoolOptions, WasmExecutionMethod,
+		TelemetryEndpoints, TransactionPoolOptions, WasmExecutionMethod, WebRTCConfig,
 	},
 	BlocksPruning, ChainSpec, TracingReceiver,
 };
@@ -119,6 +120,11 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		self.network_params().map(|x| &x.node_key_params)
 	}
 
+	/// Get the [`WebRTCCertificateParams`] for this object.
+	fn webrtc_certificate_params(&self) -> Option<&WebRTCCertificateParams> {
+		self.network_params().map(|x| &x.webrtc_certificate_params)
+	}
+
 	/// Get the DatabaseParams for this object
 	fn database_params(&self) -> Option<&DatabaseParams> {
 		self.import_params().map(|x| &x.database_params)
@@ -166,6 +172,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		client_id: &str,
 		node_name: &str,
 		node_key: NodeKeyConfig,
+		webrtc: WebRTCConfig,
 		default_listen_port: u16,
 	) -> Result<NetworkConfiguration> {
 		Ok(if let Some(network_params) = self.network_params() {
@@ -177,10 +184,11 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 				client_id,
 				node_name,
 				node_key,
+				webrtc,
 				default_listen_port,
 			)
 		} else {
-			NetworkConfiguration::new(node_name, client_id, node_key, Some(net_config_dir))
+			NetworkConfiguration::new(node_name, client_id, node_key, webrtc, Some(net_config_dir))
 		})
 	}
 
@@ -414,6 +422,16 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			.unwrap_or_else(|| Ok(Default::default()))
 	}
 
+	/// Get the WebRTC config from the current object.
+	///
+	/// By default this is retrieved from [`WebRTCCertificateParams`] if it is available. Otherwise
+	/// its [`WebRTCConfig::Ephemeral`].
+	fn webrtc(&self, config_dir: &PathBuf) -> Result<WebRTCConfig> {
+		self.webrtc_certificate_params()
+			.map(|x| x.webrtc_certificate(config_dir))
+			.unwrap_or_else(|| Ok(WebRTCConfig::Ephemeral))
+	}
+
 	/// Get maximum runtime instances
 	///
 	/// By default this is `None`.
@@ -462,6 +480,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			},
 		);
 		let node_key = self.node_key(&net_config_dir)?;
+		let webrtc = self.webrtc(&config_dir)?;
 		let role = self.role(is_dev)?;
 		let max_runtime_instances = self.max_runtime_instances()?.unwrap_or(8);
 		let is_validator = role.is_authority();
@@ -482,6 +501,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 				client_id.as_str(),
 				self.node_name()?.as_str(),
 				node_key,
+				webrtc,
 				DCV::p2p_listen_port(),
 			)?,
 			keystore,

client/cli/src/params/mod.rs

@@ -28,6 +28,7 @@ mod runtime_params;
 mod shared_params;
 mod telemetry_params;
 mod transaction_pool_params;
+mod webrtc_certificate_params;
 
 use crate::arg_enums::{CryptoScheme, OutputType};
 use clap::Args;
@@ -42,6 +43,7 @@ pub use crate::params::{
 	database_params::*, import_params::*, keystore_params::*, message_params::*, network_params::*,
 	node_key_params::*, offchain_worker_params::*, prometheus_params::*, pruning_params::*,
 	runtime_params::*, shared_params::*, telemetry_params::*, transaction_pool_params::*,
+	webrtc_certificate_params::*,
 };
 
 /// Parse Ss58AddressFormat

client/cli/src/params/network_params.rs

@@ -16,11 +16,15 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{arg_enums::SyncMode, params::node_key_params::NodeKeyParams};
+use crate::{
+	arg_enums::SyncMode,
+	params::{node_key_params::NodeKeyParams, webrtc_certificate_params::WebRTCCertificateParams},
+};
 use clap::Args;
 use sc_network::{
 	config::{
 		NetworkConfiguration, NodeKeyConfig, NonReservedPeerMode, SetConfig, TransportConfig,
+		WebRTCConfig,
 	},
 	multiaddr::Protocol,
 };
@@ -108,6 +112,10 @@ pub struct NetworkParams {
 	#[clap(flatten)]
 	pub node_key_params: NodeKeyParams,
 
+	#[allow(missing_docs)]
+	#[clap(flatten)]
+	pub webrtc_certificate_params: WebRTCCertificateParams,
+
 	/// Enable peer discovery on local networks.
 	/// By default this option is `true` for `--dev` or when the chain type is
 	/// `Local`/`Development` and false otherwise.
@@ -162,12 +170,13 @@ impl NetworkParams {
 		client_id: &str,
 		node_name: &str,
 		node_key: NodeKeyConfig,
+		webrtc: WebRTCConfig,
 		default_listen_port: u16,
 	) -> NetworkConfiguration {
 		let port = self.port.unwrap_or(default_listen_port);
 
 		let listen_addresses = if self.listen_addr.is_empty() {
-			if is_validator || is_dev {
+			let mut addrs = if is_validator || is_dev {
 				vec![
 					Multiaddr::empty()
 						.with(Protocol::Ip6([0, 0, 0, 0, 0, 0, 0, 0].into()))
@@ -187,7 +196,25 @@ impl NetworkParams {
 						.with(Protocol::Tcp(port))
 						.with(Protocol::Ws(Cow::Borrowed("/"))),
 				]
+			};
+
+			// Enable WebRTC for developers by default.
+			if is_dev {
+				addrs.push(
+					Multiaddr::empty()
+						.with(Protocol::Ip6([0, 0, 0, 0, 0, 0, 0, 0].into()))
+						.with(Protocol::Udp(port))
+						.with(Protocol::WebRTCDirect),
+				);
+				addrs.push(
+					Multiaddr::empty()
+						.with(Protocol::Ip4([0, 0, 0, 0].into()))
+						.with(Protocol::Udp(port))
+						.with(Protocol::WebRTCDirect),
+				);
 			}
+
+			addrs
 		} else {
 			self.listen_addr.clone()
 		};
@@ -229,6 +256,7 @@ impl NetworkParams {
 			listen_addresses,
 			public_addresses,
 			node_key,
+			webrtc,
 			node_name: node_name.to_string(),
 			client_version: client_id.to_string(),
 			transport: TransportConfig::Normal {