Remove web RTC due to memory leak

availproject · Dec 20, 2024 · 4df8f58 · 4df8f58
1 parent b06d05c
commit 4df8f58
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 696 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,7 +33,6 @@ rand = { version = "0.8.5", default-features = false }
 # TODO: Replace with released libp2p version once webrtc-websys compilation issue is resolved
 libp2p = { git = "https://github.com/libp2p/rust-libp2p", rev = "aa9317fbdd88cc4c9a39ea608fa1d57e022297fc", features = ["kad", "identify", "ping", "mdns", "autonat", "relay", "dcutr", "upnp", "noise", "yamux", "dns", "metrics", "tokio", "macros", "tcp", "quic", "serde", "websocket"] }
 libp2p-allow-block-list = { git = "https://github.com/libp2p/rust-libp2p", rev = "aa9317fbdd88cc4c9a39ea608fa1d57e022297fc" }
-libp2p-webrtc = { git = "https://github.com/libp2p/rust-libp2p", rev = "aa9317fbdd88cc4c9a39ea608fa1d57e022297fc" }
 libp2p-webrtc-websys = { git = "https://github.com/libp2p/rust-libp2p", rev = "aa9317fbdd88cc4c9a39ea608fa1d57e022297fc" }
 multihash = { version = "0.14.0", default-features = false, features = ["blake3", "sha3"] }
 semver = "1.0.23"

diff --git a/bootstrap/CHANGELOG.md b/bootstrap/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.4.2](https://github.com/availproject/avail-light/releases/tag/avail-light-bootstrap-v0.4.2) - 2024-12-20
+
+- Temporary remove WebRTC support to reduce memory usage
+
 ## [0.4.1](https://github.com/availproject/avail-light/releases/tag/avail-light-bootstrap-v0.4.1) - 2024-11-29
 
 - Update opentelemetry sdk version

diff --git a/bootstrap/Cargo.toml b/bootstrap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "avail-light-bootstrap"
-version = "0.4.1"
+version = "0.4.2"
 build = "../build.rs"
 edition = "2021"
 description = "Avail network Bootstrap Node for p2p Light Client"
@@ -14,12 +14,11 @@ confy = { workspace = true }
 hex = { workspace = true }
 libp2p = { workspace = true }
 libp2p-allow-block-list = { workspace = true }
-libp2p-webrtc = { workspace = true, features = ["tokio"] }
 multihash = { workspace = true }
 rand = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true }
-tokio = { workspace = true }
+tokio = { workspace = true, features = ["signal"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 void = { workspace = true }

diff --git a/bootstrap/src/main.rs b/bootstrap/src/main.rs
@@ -135,11 +135,6 @@ async fn run() -> Result<()> {
 
 	info!("TCP listener started on port {}.", cfg.port);
 
-	network_client
-		.start_listening(webrtc_multiaddress(cfg.webrtc_port))
-		.await
-		.context("Unable to create WebRTC P2P listener.")?;
-
 	info!("WebRTC listening on port {}.", cfg.webrtc_port);
 
 	info!("Bootstrap node starting ...");
@@ -178,9 +173,3 @@ fn construct_multiaddress(is_websocket: bool, port: u16) -> Multiaddr {
 
 	tcp_multiaddress
 }
-
-fn webrtc_multiaddress(webrtc_port: u16) -> Multiaddr {
-	Multiaddr::from(Ipv4Addr::UNSPECIFIED)
-		.with(Protocol::Udp(webrtc_port))
-		.with(Protocol::WebRTCDirect)
-}
diff --git a/bootstrap/src/p2p.rs b/bootstrap/src/p2p.rs
@@ -8,9 +8,7 @@ use libp2p::{
 	swarm::NetworkBehaviour,
 	tcp, yamux, PeerId, SwarmBuilder,
 };
-use libp2p_webrtc as webrtc;
 use multihash::Hasher;
-use rand::thread_rng;
 use tokio::sync::mpsc;
 
 mod client;
@@ -105,11 +103,6 @@ pub async fn init(
 				noise::Config::new,
 				yamux::Config::default,
 			)?
-			.with_other_transport(|keypair| {
-				use webrtc::tokio::{Certificate, Transport};
-				let certificate = Certificate::generate(&mut thread_rng());
-				Ok(Transport::new(keypair.clone(), certificate?))
-			})?
 			.with_dns()?
 			.with_behaviour(behaviour)?
 			.with_swarm_config(|c| generate_config(c, cfg))

diff --git a/client/CHANGELOG.md b/client/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 1.12.4
+## [1.12.4](https://github.com/availproject/avail-light/releases/tag/avail-light-client-v1.12.4) - 2024-12-20
 
 - Update `avail-light-core` to 1.1.0
 

diff --git a/client/src/main.rs b/client/src/main.rs
@@ -94,20 +94,14 @@ async fn run(
 
 	spawn_in_span(shutdown.with_cancel(p2p_event_loop.run()));
 
-	let addrs = vec![
-		cfg.libp2p.tcp_multiaddress(),
-		cfg.libp2p.webrtc_multiaddress(),
-	];
+	let addrs = vec![cfg.libp2p.tcp_multiaddress()];
 
 	// Start the TCP and WebRTC listeners
 	p2p_client
 		.start_listening(addrs)
 		.await
 		.wrap_err("Error starting listener.")?;
-	info!(
-		"TCP listener started on port {}. WebRTC listening on port {}.",
-		cfg.libp2p.port, cfg.libp2p.webrtc_port
-	);
+	info!("TCP listener started on port {}", cfg.libp2p.port);
 
 	let p2p_clone = p2p_client.to_owned();
 	let cfg_clone = cfg.to_owned();

diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Changelog
 
-## 1.1.0
+## [1.1.0](https://github.com/availproject/avail-light/tree/avail-light-core-v1.1.0) - 2024-12-20
 
+- Temporary remove WebRTC support to reduce memory usage
 - Update opentelemetry sdk version to 0.27.1
 - Enable WASM compilation of the network, light_client and related mods
 

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -35,7 +35,6 @@ smallvec = "1.6.1"
 strip-ansi-escapes = "0.2.0"
 strum = { version = "0.26.3", features = ["derive"] }
 sysinfo = "0.30.12"
-tokio = { workspace = true }
 tokio-retry = "0.3"
 tokio-stream = { workspace = true }
 tracing = { workspace = true }
@@ -50,7 +49,6 @@ hyper = { version = "0.14.23", features = ["full", "http1"] }
 jsonrpsee-core = { version = "0.21.0", features = ["client"] }
 libc = "0.2.150"
 libp2p = { workspace = true }
-libp2p-webrtc = { workspace = true, features = ["tokio"] }
 multihash = { workspace = true }
 num = "0.4.0"
 num_cpus = "1.13.0"
@@ -61,6 +59,7 @@ rocksdb = { version = "0.21.0", features = ["snappy", "multi-threaded-cf"], opti
 strip-ansi-escapes = "0.2.0"
 thiserror = "1.0.64"
 threadpool = "1.8.1"
+tokio = { workspace = true, features = ["signal"] }
 tokio-util = "0.7.10"
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
@@ -82,6 +81,7 @@ libp2p = { workspace = true, features = ["wasm-bindgen"] }
 libp2p-webrtc-websys = { workspace = true }
 rand = { workspace = true, features = ["std_rng"] }
 thiserror-no-std = "2.0.2"
+tokio = { workspace = true }
 tokio_with_wasm = { version = "0.7.1", default-features = false, features = ["sync", "macros", "rt", "time"] }
 wasm-bindgen = "0.2.90"
 web-time = "1.1.0"

diff --git a/core/src/network/p2p.rs b/core/src/network/p2p.rs
@@ -15,11 +15,7 @@ use libp2p::{
 #[cfg(not(target_arch = "wasm32"))]
 use libp2p::{mdns, tcp, upnp};
 #[cfg(not(target_arch = "wasm32"))]
-use libp2p_webrtc as webrtc;
-#[cfg(not(target_arch = "wasm32"))]
 use multihash::{self, Hasher};
-#[cfg(not(target_arch = "wasm32"))]
-use rand::thread_rng;
 use semver::Version;
 use serde::{Deserialize, Serialize};
 #[cfg(not(target_arch = "wasm32"))]
@@ -340,11 +336,6 @@ async fn build_swarm(
 				noise::Config::new,
 				yamux::Config::default,
 			)?
-			.with_other_transport(|keypair| {
-				use webrtc::tokio::{Certificate, Transport};
-				let certificate = Certificate::generate(&mut thread_rng());
-				Ok(Transport::new(keypair.clone(), certificate?))
-			})?
 			.with_dns()?
 			.with_relay_client(noise::Config::new, yamux::Config::default)?
 			.with_behaviour(behaviour)?

diff --git a/fat/CHANGELOG.md b/fat/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 1.12.3
+## [1.12.3](https://github.com/availproject/avail-light/releases/tag/avail-light-fat-v1.12.3) - 2024-12-20
 
 - Update `avail-light-core` to 1.1.0