Enable 0conf and 0reserve on channels with trusted peers

Author: tankyleo

Cargo.toml

@@ -39,17 +39,17 @@ default = []
 #lightning-liquidity = { version = "0.2.0", features = ["std"] }
 #lightning-macros = { version = "0.2.0" }
 
-lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
-lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
-lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
-lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
-lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["tokio"] }
-lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
-lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
-lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["rest-client", "rpc-client", "tokio"] }
-lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
-lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
-lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
+lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "688544da72cb348e4405d39a75e4d81102c1278a", features = ["std"] }
+lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "688544da72cb348e4405d39a75e4d81102c1278a" }
+lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "688544da72cb348e4405d39a75e4d81102c1278a", features = ["std"] }
+lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "688544da72cb348e4405d39a75e4d81102c1278a" }
+lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "688544da72cb348e4405d39a75e4d81102c1278a", features = ["tokio"] }
+lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "688544da72cb348e4405d39a75e4d81102c1278a" }
+lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "688544da72cb348e4405d39a75e4d81102c1278a" }
+lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "688544da72cb348e4405d39a75e4d81102c1278a", features = ["rest-client", "rpc-client", "tokio"] }
+lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "688544da72cb348e4405d39a75e4d81102c1278a", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
+lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "688544da72cb348e4405d39a75e4d81102c1278a", features = ["std"] }
+lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "688544da72cb348e4405d39a75e4d81102c1278a" }
 
 bdk_chain = { version = "0.23.0", default-features = false, features = ["std"] }
 bdk_esplora = { version = "0.22.0", default-features = false, features = ["async-https-rustls", "tokio"]}
@@ -79,13 +79,13 @@ async-trait = { version = "0.1", default-features = false }
 vss-client = { package = "vss-client-ng", version = "0.5" }
 prost = { version = "0.11.6", default-features = false}
 #bitcoin-payment-instructions = { version = "0.6" }
-bitcoin-payment-instructions = { git = "https://github.com/joostjager/bitcoin-payment-instructions", branch = "ldk-dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
+bitcoin-payment-instructions = { git = "https://github.com/tankyleo/bitcoin-payment-instructions", branch = "ldk-688544da72cb348e4405d39a75e4d81102c1278a" }
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["winbase"] }
 
 [dev-dependencies]
-lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std", "_test_utils"] }
+lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "688544da72cb348e4405d39a75e4d81102c1278a", features = ["std", "_test_utils"] }
 rand = { version = "0.9.2", default-features = false, features = ["std", "thread_rng", "os_rng"] }
 proptest = "1.0.0"
 regex = "1.5.6"

src/builder.rs

@@ -435,16 +435,16 @@ impl NodeBuilder {
 	/// Configures the [`Node`] instance to source inbound liquidity from the given
 	/// [bLIP-51 / LSPS1] service.
 	///
-	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
+	/// Will mark the LSP as trusted for 0-confirmation, 0-reserve channels, see [`Config::trusted_peers_0conf_0reserve`].
 	///
 	/// The given `token` will be used by the LSP to authenticate the user.
 	///
 	/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
 	pub fn set_liquidity_source_lsps1(
 		&mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 	) -> &mut Self {
-		// Mark the LSP as trusted for 0conf
-		self.config.trusted_peers_0conf.push(node_id.clone());
+		// Mark the LSP as trusted for 0conf, 0reserve
+		self.config.trusted_peers_0conf_0reserve.push(node_id.clone());
 
 		let liquidity_source_config =
 			self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
@@ -456,16 +456,16 @@ impl NodeBuilder {
 	/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
 	/// [bLIP-52 / LSPS2] service.
 	///
-	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
+	/// Will mark the LSP as trusted for 0-confirmation, 0-reserve channels, see [`Config::trusted_peers_0conf_0reserve`].
 	///
 	/// The given `token` will be used by the LSP to authenticate the user.
 	///
 	/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
 	pub fn set_liquidity_source_lsps2(
 		&mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 	) -> &mut Self {
-		// Mark the LSP as trusted for 0conf
-		self.config.trusted_peers_0conf.push(node_id.clone());
+		// Mark the LSP as trusted for 0conf, 0reserve
+		self.config.trusted_peers_0conf_0reserve.push(node_id.clone());
 
 		let liquidity_source_config =
 			self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
@@ -956,7 +956,7 @@ impl ArcedNodeBuilder {
 	/// Configures the [`Node`] instance to source inbound liquidity from the given
 	/// [bLIP-51 / LSPS1] service.
 	///
-	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
+	/// Will mark the LSP as trusted for 0-confirmation, 0-reserve channels, see [`Config::trusted_peers_0conf_0reserve`].
 	///
 	/// The given `token` will be used by the LSP to authenticate the user.
 	///
@@ -970,7 +970,7 @@ impl ArcedNodeBuilder {
 	/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
 	/// [bLIP-52 / LSPS2] service.
 	///
-	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
+	/// Will mark the LSP as trusted for 0-confirmation, 0-reserve channels, see [`Config::trusted_peers_0conf_0reserve`].
 	///
 	/// The given `token` will be used by the LSP to authenticate the user.
 	///

src/config.rs

@@ -123,7 +123,7 @@ pub(crate) const LNURL_AUTH_TIMEOUT_SECS: u64 = 15;
 /// | `listening_addresses`                  | None               |
 /// | `announcement_addresses`               | None               |
 /// | `node_alias`                           | None               |
-/// | `trusted_peers_0conf`                  | []                 |
+/// | `trusted_peers_0conf_0reserve`         | []                 |
 /// | `probing_liquidity_limit_multiplier`   | 3                  |
 /// | `anchor_channels_config`               | Some(..)           |
 /// | `route_parameters`                     | None               |
@@ -156,12 +156,19 @@ pub struct Config {
 	/// **Note**: We will only allow opening and accepting public channels if the `node_alias` and the
 	/// `listening_addresses` are set.
 	pub node_alias: Option<NodeAlias>,
-	/// A list of peers that we allow to establish zero confirmation channels to us.
-	///
-	/// **Note:** Allowing payments via zero-confirmation channels is potentially insecure if the
-	/// funding transaction ends up never being confirmed on-chain. Zero-confirmation channels
-	/// should therefore only be accepted from trusted peers.
-	pub trusted_peers_0conf: Vec<PublicKey>,
+	/// A list of peers that we trust. If a peer on this list opens a channel to us, we will
+	/// forward their HTLCs before any confirmations of the funding transaction (zero-conf), and
+	/// allow them to spend their entire balance (zero-reserve). If we open a channel to a peer
+	/// on this list, we will allow them to spend their entire channel balance (note that for
+	/// channels *we* open, the decision of whether to accept HTLC forwards with no
+	/// confirmations of the funding transaction is *the peer's* decision).
+	///
+	/// **Note:** Allowing payments via zero-confirmation channels is potentially insecure if
+	/// the funding transaction never gets confirmed on-chain. Zero-reserve channels
+	/// allow the counterparty to make cheating attempts with no financial penalty.
+	/// Zero-confirmation, and zero-reserve channels should therefore only be accepted from and
+	/// opened to trusted peers.
+	pub trusted_peers_0conf_0reserve: Vec<PublicKey>,
 	/// The liquidity factor by which we filter the outgoing channels used for sending probes.
 	///
 	/// Channels with available liquidity less than the required amount times this value won't be
@@ -208,7 +215,7 @@ impl Default for Config {
 			network: DEFAULT_NETWORK,
 			listening_addresses: None,
 			announcement_addresses: None,
-			trusted_peers_0conf: Vec::new(),
+			trusted_peers_0conf_0reserve: Vec::new(),
 			probing_liquidity_limit_multiplier: DEFAULT_PROBING_LIQUIDITY_LIMIT_MULTIPLIER,
 			anchor_channels_config: Some(AnchorChannelsConfig::default()),
 			tor_config: None,

src/event.rs

@@ -22,7 +22,7 @@ use lightning::events::{
 	ReplayEvent,
 };
 use lightning::impl_writeable_tlv_based_enum;
-use lightning::ln::channelmanager::PaymentId;
+use lightning::ln::channelmanager::{PaymentId, TrustedChannelFeatures};
 use lightning::ln::types::ChannelId;
 use lightning::routing::gossip::NodeId;
 use lightning::sign::EntropySource;
@@ -1258,7 +1258,6 @@ where
 				let user_channel_id: u128 = u128::from_ne_bytes(
 					self.keys_manager.get_secure_random_bytes()[..16].try_into().unwrap(),
 				);
-				let allow_0conf = self.config.trusted_peers_0conf.contains(&counterparty_node_id);
 				let mut channel_override_config = None;
 				if let Some((lsp_node_id, _)) = self
 					.liquidity_source
@@ -1284,11 +1283,14 @@ where
 						});
 					}
 				}
-				let res = if allow_0conf {
-					self.channel_manager.accept_inbound_channel_from_trusted_peer_0conf(
+				let is_trusted_peer =
+					self.config.trusted_peers_0conf_0reserve.contains(&counterparty_node_id);
+				let res = if is_trusted_peer {
+					self.channel_manager.accept_inbound_channel_from_trusted_peer(
 						&temporary_channel_id,
 						&counterparty_node_id,
 						user_channel_id,
+						TrustedChannelFeatures::ZeroConfZeroReserve,
 						channel_override_config,
 					)
 				} else {
@@ -1305,21 +1307,21 @@ where
 						log_info!(
 							self.logger,
 							"Accepting inbound{}{} channel of {}sats from{} peer {}",
-							if allow_0conf { " 0conf" } else { "" },
+							if is_trusted_peer { " 0conf, 0reserve" } else { "" },
 							if anchor_channel { " Anchor" } else { "" },
 							funding_satoshis,
-							if allow_0conf { " trusted" } else { "" },
+							if is_trusted_peer { " trusted" } else { "" },
 							counterparty_node_id,
 						);
 					},
 					Err(e) => {
 						log_error!(
 							self.logger,
 							"Error while accepting inbound{}{} channel from{} peer {}: {:?}",
-							if allow_0conf { " 0conf" } else { "" },
+							if is_trusted_peer { " 0conf, 0reserve" } else { "" },
 							if anchor_channel { " Anchor" } else { "" },
 							counterparty_node_id,
-							if allow_0conf { " trusted" } else { "" },
+							if is_trusted_peer { " trusted" } else { "" },
 							e,
 						);
 					},

src/lib.rs

@@ -1196,27 +1196,57 @@ impl Node {
 			self.keys_manager.get_secure_random_bytes()[..16].try_into().unwrap(),
 		);
 
-		match self.channel_manager.create_channel(
-			peer_info.node_id,
-			channel_amount_sats,
-			push_msat,
-			user_channel_id,
-			None,
-			Some(user_config),
-		) {
-			Ok(_) => {
-				log_info!(
-					self.logger,
-					"Initiated channel creation with peer {}. ",
-					peer_info.node_id
-				);
-				self.peer_store.add_peer(peer_info)?;
-				Ok(UserChannelId(user_channel_id))
-			},
-			Err(e) => {
-				log_error!(self.logger, "Failed to initiate channel creation: {:?}", e);
-				Err(Error::ChannelCreationFailed)
-			},
+		let is_trusted_peer = self.config.trusted_peers_0conf_0reserve.contains(&node_id);
+		if is_trusted_peer {
+			match self.channel_manager.create_channel_to_trusted_peer_0reserve(
+				peer_info.node_id,
+				channel_amount_sats,
+				push_msat,
+				user_channel_id,
+				None,
+				Some(user_config),
+			) {
+				Ok(_) => {
+					log_info!(
+						self.logger,
+						"Initiated 0reserve channel creation with peer {}. ",
+						peer_info.node_id
+					);
+					self.peer_store.add_peer(peer_info)?;
+					Ok(UserChannelId(user_channel_id))
+				},
+				Err(e) => {
+					log_error!(
+						self.logger,
+						"Failed to initiate 0reserve channel creation: {:?}",
+						e
+					);
+					Err(Error::ChannelCreationFailed)
+				},
+			}
+		} else {
+			match self.channel_manager.create_channel(
+				peer_info.node_id,
+				channel_amount_sats,
+				push_msat,
+				user_channel_id,
+				None,
+				Some(user_config),
+			) {
+				Ok(_) => {
+					log_info!(
+						self.logger,
+						"Initiated channel creation with peer {}. ",
+						peer_info.node_id
+					);
+					self.peer_store.add_peer(peer_info)?;
+					Ok(UserChannelId(user_channel_id))
+				},
+				Err(e) => {
+					log_error!(self.logger, "Failed to initiate channel creation: {:?}", e);
+					Err(Error::ChannelCreationFailed)
+				},
+			}
 		}
 	}
 

tests/common/mod.rs

@@ -381,20 +381,20 @@ macro_rules! setup_builder {
 pub(crate) use setup_builder;
 
 pub(crate) fn setup_two_nodes(
-	chain_source: &TestChainSource, allow_0conf: bool, anchor_channels: bool,
+	chain_source: &TestChainSource, allow_0conf_0reserve: bool, anchor_channels: bool,
 	anchors_trusted_no_reserve: bool,
 ) -> (TestNode, TestNode) {
 	setup_two_nodes_with_store(
 		chain_source,
-		allow_0conf,
+		allow_0conf_0reserve,
 		anchor_channels,
 		anchors_trusted_no_reserve,
 		TestStoreType::TestSyncStore,
 	)
 }
 
 pub(crate) fn setup_two_nodes_with_store(
-	chain_source: &TestChainSource, allow_0conf: bool, anchor_channels: bool,
+	chain_source: &TestChainSource, allow_0conf_0reserve: bool, anchor_channels: bool,
 	anchors_trusted_no_reserve: bool, store_type: TestStoreType,
 ) -> (TestNode, TestNode) {
 	println!("== Node A ==");
@@ -405,8 +405,8 @@ pub(crate) fn setup_two_nodes_with_store(
 	println!("\n== Node B ==");
 	let mut config_b = random_config(anchor_channels);
 	config_b.store_type = store_type;
-	if allow_0conf {
-		config_b.node_config.trusted_peers_0conf.push(node_a.node_id());
+	if allow_0conf_0reserve {
+		config_b.node_config.trusted_peers_0conf_0reserve.push(node_a.node_id());
 	}
 	if anchor_channels && anchors_trusted_no_reserve {
 		config_b
@@ -789,8 +789,8 @@ pub async fn splice_in_with_all(
 }
 
 pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
-	node_a: TestNode, node_b: TestNode, bitcoind: &BitcoindClient, electrsd: &E, allow_0conf: bool,
-	expect_anchor_channel: bool, force_close: bool,
+	node_a: TestNode, node_b: TestNode, bitcoind: &BitcoindClient, electrsd: &E,
+	allow_0conf_0reserve: bool, expect_anchor_channel: bool, force_close: bool,
 ) {
 	let addr_a = node_a.onchain_payment().new_address().unwrap();
 	let addr_b = node_b.onchain_payment().new_address().unwrap();
@@ -864,7 +864,7 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
 
 	wait_for_tx(electrsd, funding_txo_a.txid).await;
 
-	if !allow_0conf {
+	if !allow_0conf_0reserve {
 		generate_blocks_and_wait(&bitcoind, electrsd, 6).await;
 	}
 

tests/integration_tests_rust.rs

@@ -71,7 +71,7 @@ async fn channel_full_cycle_force_close_trusted_no_reserve() {
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
-async fn channel_full_cycle_0conf() {
+async fn channel_full_cycle_0conf_0reserve() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
 	let chain_source = random_chain_source(&bitcoind, &electrsd);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, true, true, false);