Allow to specify a ChannelConfig upon opening

This is useful/necessary to set forwarding fee rates, as well as allowing for overriding the dust HTLC exposure limit.
lightningdevkit · Jun 15, 2023 · 831a330 · 831a330
1 parent dd4eea9
commit 831a330
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/bindings/kotlin/ldk-node-jvm/lib/src/test/kotlin/org/lightningdevkit/ldknode/LibraryTest.kt b/bindings/kotlin/ldk-node-jvm/lib/src/test/kotlin/org/lightningdevkit/ldknode/LibraryTest.kt
@@ -120,7 +120,7 @@ class LibraryTest {
  assertEquals(100000u, totalBalance1)
  assertEquals(100000u, totalBalance2)
 
- node1.connectOpenChannel(nodeId2, listenAddress2, 50000u, null, true)
+ node1.connectOpenChannel(nodeId2, listenAddress2, 50000u, null, null, true)
 
  val channelPendingEvent1 = node1.waitNextEvent()
  println("Got event: $channelPendingEvent1")

diff --git a/bindings/ldk_node.udl b/bindings/ldk_node.udl
@@ -54,7 +54,7 @@ interface LDKNode {
  [Throws=NodeError]
  void disconnect(PublicKey node_id);
  [Throws=NodeError]
- void connect_open_channel(PublicKey node_id, NetAddress address, u64 channel_amount_sats, u64? push_to_counterparty_msat, boolean announce_channel);
+ void connect_open_channel(PublicKey node_id, NetAddress address, u64 channel_amount_sats, u64? push_to_counterparty_msat, ChannelConfig? channel_config, boolean announce_channel);
  [Throws=NodeError]
  void close_channel([ByRef]ChannelId channel_id, PublicKey counterparty_node_id);
  [Throws=NodeError]

diff --git a/src/lib.rs b/src/lib.rs
@@ -48,7 +48,7 @@
 //!
 //! let node_id = PublicKey::from_str("NODE_ID").unwrap();
 //! let node_addr = NetAddress::from_str("IP_ADDR:PORT").unwrap();
-//! node.connect_open_channel(node_id, node_addr, 10000, None, false).unwrap();
+//! node.connect_open_channel(node_id, node_addr, 10000, None, None, false).unwrap();
 //!
 //! let event = node.wait_next_event();
 //! println!("EVENT: {:?}", event);
@@ -1369,7 +1369,8 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
  /// Returns a temporary channel id.
  pub fn connect_open_channel(
  &self, node_id: PublicKey, address: NetAddress, channel_amount_sats: u64,
- push_to_counterparty_msat: Option<u64>, announce_channel: bool,
+ push_to_counterparty_msat: Option<u64>, channel_config: Option<ChannelConfig>,
+ announce_channel: bool,
  ) -> Result<(), Error> {
  let rt_lock = self.runtime.read().unwrap();
  if rt_lock.is_none() {
@@ -1404,6 +1405,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
  announced_channel: announce_channel,
  ..Default::default()
  },
+ channel_config: channel_config.unwrap_or_default(),
  ..Default::default()
  };
 

diff --git a/src/test/functional_tests.rs b/src/test/functional_tests.rs
@@ -87,6 +87,7 @@ fn do_channel_full_cycle<K: KVStore + Sync + Send>(
  node_b.listening_address().unwrap().into(),
  funding_amount_sat,
  Some(push_msat),
+ None,
  true,
  )
  .unwrap();
@@ -311,7 +312,8 @@ fn channel_open_fails_when_funds_insufficient() {
  node_b.listening_address().unwrap().into(),
  120000,
  None,
- true,
+ None,
+ true
  )
  );
 }