Add Eclair interop test for zero-fee-commitments

Co-Authored-By: HAL 9000

Author: tankyleo

.github/workflows/eclair-integration.yml

@@ -8,8 +8,18 @@ concurrency:
 
 jobs:
   check-eclair:
+    name: check-eclair (${{ matrix.name }})
     timeout-minutes: 60
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - name: standard
+            eclair_extra_java_opts: ""
+            rustflags: "--cfg eclair_test"
+          - name: zero-fee-commitments
+            eclair_extra_java_opts: "-Declair.features.zero_fee_commitments=optional"
+            rustflags: "--cfg eclair_test --cfg zero_fee_commitment_tests"
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -37,6 +47,8 @@ jobs:
           docker compose -p ldk-node -f tests/docker/docker-compose-eclair.yml exec bitcoin bitcoin-cli -regtest -rpcuser=user -rpcpassword=pass createwallet ldk_node_test
 
       - name: Start Eclair
+        env:
+          ECLAIR_EXTRA_JAVA_OPTS: ${{ matrix.eclair_extra_java_opts }}
         run: docker compose -p ldk-node -f tests/docker/docker-compose-eclair.yml up -d eclair
 
       - name: Wait for Eclair to be ready
@@ -54,4 +66,5 @@ jobs:
           exit 1
 
       - name: Run Eclair integration tests
-        run: RUSTFLAGS="--cfg eclair_test" cargo test --test integration_tests_eclair -- --show-output --test-threads=1
+        run: |
+          RUSTFLAGS="${{ matrix.rustflags }}" cargo test --test integration_tests_eclair -- --show-output --test-threads=1

tests/common/scenarios/channel.rs

@@ -9,6 +9,8 @@ use std::time::Duration;
 
 use electrsd::corepc_node::Client as BitcoindClient;
 use electrsd::electrum_client::ElectrumApi;
+#[cfg(all(eclair_test, zero_fee_commitment_tests))]
+use ldk_node::ReserveType;
 use ldk_node::{Event, Node};
 
 use super::super::external_node::ExternalNode;
@@ -41,6 +43,21 @@ pub(crate) async fn open_channel_to_external<E: ElectrumApi>(
 		.map(|ch| ch.channel_id.clone())
 		.unwrap_or_else(|| panic!("Could not find channel on external node {}", peer.name()));
 
+	#[cfg(all(eclair_test, zero_fee_commitment_tests))]
+	{
+		let channel = node
+			.list_channels()
+			.into_iter()
+			.find(|channel| channel.user_channel_id == user_channel_id)
+			.expect("opened channel should be listed");
+		let channel_type = channel.channel_type.as_ref().expect("channel type should be set");
+		assert_eq!(channel.counterparty.node_id, ext_node_id);
+		assert!(channel.counterparty.features.supports_anchor_zero_fee_commitments());
+		assert!(channel_type.requires_anchor_zero_fee_commitments());
+		assert_eq!(channel.feerate_sat_per_1000_weight, 0);
+		assert_eq!(channel.reserve_type, Some(ReserveType::Adaptive));
+	}
+
 	(user_channel_id, ext_channel_id)
 }
 

tests/common/scenarios/mod.rs

@@ -87,15 +87,15 @@ pub(crate) async fn wait_for_htlcs_settled(
 	panic!("HTLCs did not settle on {} channel {} within 15s", peer.name(), ext_channel_id);
 }
 
-/// Build a fresh LDK node configured for interop tests. Uses electrum at the
+/// Build a fresh LDK node configured for interop tests. Uses esplora at the
 /// docker-compose default port and bumps sync timeouts for combo stress.
 pub(crate) fn setup_ldk_node() -> Node {
 	let config = crate::common::random_config();
 	let mut builder = ldk_node::Builder::from_config(config.node_config);
-	let mut sync_config = ldk_node::config::ElectrumSyncConfig::default();
+	let mut sync_config = ldk_node::config::EsploraSyncConfig::default();
 	sync_config.timeouts_config.onchain_wallet_sync_timeout_secs = 180;
 	sync_config.timeouts_config.lightning_wallet_sync_timeout_secs = 120;
-	builder.set_chain_source_electrum("tcp://127.0.0.1:50001".to_string(), Some(sync_config));
+	builder.set_chain_source_esplora("http://127.0.0.1:3002".to_string(), Some(sync_config));
 	let node = builder.build(config.node_entropy).unwrap();
 	node.start().unwrap();
 	node

tests/docker/docker-compose-eclair.yml

@@ -77,4 +77,5 @@ services:
         -Declair.bitcoind.zmqtx=tcp://127.0.0.1:28333
         -Declair.features.keysend=optional
         -Declair.on-chain-fees.confirmation-priority.funding=slow
+        ${ECLAIR_EXTRA_JAVA_OPTS:-}
         -Declair.printToConsole