Merge branch 'lightningdevkit:main' into main

Author: febyeji

.github/workflows/0fc-integration.yml

@@ -8,7 +8,7 @@ concurrency:
 
 jobs:
   build-and-test:
-    timeout-minutes: 60
+    timeout-minutes: 120
     runs-on: self-hosted
     steps:
       - name: Checkout source code
@@ -46,4 +46,4 @@ jobs:
           echo "ELECTRS_EXE=$( pwd )/bin/electrs-${{ runner.os }}-${{ runner.arch }}" >> "$GITHUB_ENV"
       - name: Test with 0FC enabled
         run: |
-          RUSTFLAGS="--cfg no_download --cfg cycle_tests --cfg tokio_unstable --cfg zero_fee_commitment_tests" cargo test -- --test-threads=1
+          RUSTFLAGS="--cfg no_download --cfg cycle_tests --cfg tokio_unstable --cfg zero_fee_commitment_tests" cargo test -- --test-threads=1 --no-capture

.github/workflows/audit.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   audit:
-    timeout-minutes: 60
+    timeout-minutes: 120
     permissions:
       issues: write
       checks: write

.github/workflows/benchmarks.yml

@@ -8,7 +8,7 @@ concurrency:
 
 jobs:
   benchmark:
-    timeout-minutes: 60
+    timeout-minutes: 120
     runs-on: self-hosted
     env:
       TOOLCHAIN: stable

.github/workflows/cln-integration.yml

@@ -8,7 +8,7 @@ concurrency:
 
 jobs:
   check-cln:
-    timeout-minutes: 60
+    timeout-minutes: 120
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

.github/workflows/cron-weekly-rustfmt.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   format:
     name: Nightly rustfmt
-    timeout-minutes: 60
+    timeout-minutes: 120
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6

.github/workflows/eclair-integration.yml

@@ -8,8 +8,18 @@ concurrency:
 
 jobs:
   check-eclair:
-    timeout-minutes: 60
+    name: check-eclair (${{ matrix.name }})
+    timeout-minutes: 120
     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

.github/workflows/hrn-integration.yml

@@ -8,7 +8,7 @@ concurrency:
 
 jobs:
   build-and-test:
-    timeout-minutes: 60
+    timeout-minutes: 120
     runs-on: self-hosted
 
     steps:

.github/workflows/kotlin.yml

@@ -8,7 +8,7 @@ concurrency:
 
 jobs:
   check-kotlin:
-    timeout-minutes: 60
+    timeout-minutes: 120
     runs-on: ubuntu-latest
 
     env:

.github/workflows/lnd-integration.yml

@@ -8,7 +8,7 @@ concurrency:
 
 jobs:
   check-lnd:
-    timeout-minutes: 60
+    timeout-minutes: 120
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

.github/workflows/postgres-integration.yml

@@ -9,7 +9,7 @@ concurrency:
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
-    timeout-minutes: 60
+    timeout-minutes: 120
 
     services:
       postgres: