Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/benchmarks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
uses: actions/cache@v4
with:
path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
- name: Enable caching for electrs
id: cache-electrs
uses: actions/cache@v4
Expand All@@ -34,7 +34,7 @@ jobs:
if: "(steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
run: |
source ./scripts/download_bitcoind_electrs.sh
mkdir bin
mkdir -p bin
mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
- name: Set bitcoind/electrs environment variables
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cln-integration.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ jobs:
sudo apt-get install -y socat

- name: Start bitcoind, electrs, and lightningd
run: docker compose -f docker-compose-cln.yml up -d
run: docker compose -p ldk-node -f tests/docker/docker-compose-cln.yml up -d

- name: Forward lightningd RPC socket
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lnd-integration.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ jobs:
run: echo "LND_DATA_DIR=$(mktemp -d)" >> $GITHUB_ENV

- name: Start bitcoind, electrs, and LND
run: docker compose -f docker-compose-lnd.yml up -d
run: docker compose -p ldk-node -f tests/docker/docker-compose-lnd.yml up -d
env:
LND_DATA_DIR: ${{ env.LND_DATA_DIR }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ jobs:
uses: actions/cache@v4
with:
path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
- name: Enable caching for electrs
id: cache-electrs
uses: actions/cache@v4
Expand All@@ -64,7 +64,7 @@ jobs:
if: "matrix.platform != 'windows-latest' && (steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
run: |
source ./scripts/download_bitcoind_electrs.sh
mkdir bin
mkdir -p bin
mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
- name: Set bitcoind/electrs environment variables
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,17 +94,17 @@ ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }
ldk-node-070 = { package = "ldk-node", version = "=0.7.0" }

[target.'cfg(not(no_download))'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_29_0"] }

[target.'cfg(no_download)'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy"] }
corepc-node = { version = "0.10.0", default-features = false, features = ["27_2"] }
corepc-node = { version = "0.10.1", default-features = false, features = ["29_0"] }

[target.'cfg(cln_test)'.dev-dependencies]
clightningrpc = { version = "0.3.0-beta.8", default-features = false }

[target.'cfg(lnd_test)'.dev-dependencies]
lnd_grpc_rust = { version = "2.10.0", default-features = false }
lnd_grpc_rust = { version = "2.14.0", default-features = false }
tokio = { version = "1.37", features = ["fs"] }

[build-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions scripts/download_bitcoind_electrs.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,17 +10,17 @@ HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"
ELECTRS_DL_ENDPOINT="https://github.com/RCasatta/electrsd/releases/download/electrs_releases"
ELECTRS_VERSION="esplora_a33e97e1a1fc63fa9c20a116bb92579bbf43b254"
BITCOIND_DL_ENDPOINT="https://bitcoincore.org/bin/"
BITCOIND_VERSION="27.2"
BITCOIND_VERSION="29.0"
if [[ "$HOST_PLATFORM" == *linux* ]]; then
ELECTRS_DL_FILE_NAME=electrs_linux_"$ELECTRS_VERSION".zip
ELECTRS_DL_HASH="865e26a96e8df77df01d96f2f569dcf9622fc87a8d99a9b8fe30861a4db9ddf1"
BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-linux-gnu.tar.gz
BITCOIND_DL_HASH="acc223af46c178064c132b235392476f66d486453ddbd6bca6f1f8411547da78"
BITCOIND_DL_HASH="a681e4f6ce524c338a105f214613605bac6c33d58c31dc5135bbc02bc458bb6c"
elif [[ "$HOST_PLATFORM" == *darwin* ]]; then
ELECTRS_DL_FILE_NAME=electrs_macos_"$ELECTRS_VERSION".zip
ELECTRS_DL_HASH="2d5ff149e8a2482d3658e9b386830dfc40c8fbd7c175ca7cbac58240a9505bcd"
BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-apple-darwin.tar.gz
BITCOIND_DL_HASH="6ebc56ca1397615d5a6df2b5cf6727b768e3dcac320c2d5c2f321dcaabc7efa2"
BITCOIND_DL_HASH="5bb824fc86a15318d6a83a1b821ff4cd4b3d3d0e1ec3d162b805ccf7cae6fca8"
else
printf "\n\n"
echo "Unsupported platform: $HOST_PLATFORM Exiting.."
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
services:
bitcoin:
image: blockstream/bitcoind:27.2
image: blockstream/bitcoind:29.1
platform: linux/amd64
command:
[
Expand DownExpand Up@@ -48,7 +48,7 @@ services:
- bitcoin-electrs

cln:
image: blockstream/lightningd:v23.08
image: elementsproject/lightningd:v25.12.1
platform: linux/amd64
depends_on:
bitcoin:
Expand All@@ -60,7 +60,6 @@ services:
"--bitcoin-rpcuser=user",
"--bitcoin-rpcpassword=pass",
"--regtest",
"--experimental-anchors",
]
ports:
- "19846:19846"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
services:
bitcoin:
image: blockstream/bitcoind:27.2
image: blockstream/bitcoind:29.1
platform: linux/amd64
command:
[
Expand DownExpand Up@@ -52,7 +52,7 @@ services:
- bitcoin-electrs

lnd:
image: lightninglabs/lnd:v0.18.5-beta
image: lightninglabs/lnd:v0.20.1-beta
container_name: ldk-node-lnd
depends_on:
- bitcoin
Expand Down
13 changes: 12 additions & 1 deletion tests/integration_tests_cln.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,18 @@ async fn test_cln() {
cln_client.pay(&ldk_invoice.to_string(), Default::default()).unwrap();
common::expect_event!(node, PaymentReceived);

node.close_channel(&user_channel_id, cln_node_id).unwrap();
// Retry close until monitor updates settle (avoids flaky sleep).
for i in 0..10 {
match node.close_channel(&user_channel_id, cln_node_id) {
Ok(()) => break,
Err(e) => {
if i == 9 {
panic!("close_channel failed after 10 attempts: {:?}", e);
}
std::thread::sleep(std::time::Duration::from_secs(1));
},
}
}
common::expect_event!(node, ChannelClosed);
node.stop().unwrap();
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Bump test dependencies and reorganize Docker files by febyeji · Pull Request #869 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/benchmarks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
uses: actions/cache@v4
with:
path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
- name: Enable caching for electrs
id: cache-electrs
uses: actions/cache@v4
Expand All@@ -34,7 +34,7 @@ jobs:
if: "(steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
run: |
source ./scripts/download_bitcoind_electrs.sh
mkdir bin
mkdir -p bin
mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
- name: Set bitcoind/electrs environment variables
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cln-integration.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ jobs:
sudo apt-get install -y socat

- name: Start bitcoind, electrs, and lightningd
run: docker compose -f docker-compose-cln.yml up -d
run: docker compose -p ldk-node -f tests/docker/docker-compose-cln.yml up -d

- name: Forward lightningd RPC socket
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lnd-integration.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ jobs:
run: echo "LND_DATA_DIR=$(mktemp -d)" >> $GITHUB_ENV

- name: Start bitcoind, electrs, and LND
run: docker compose -f docker-compose-lnd.yml up -d
run: docker compose -p ldk-node -f tests/docker/docker-compose-lnd.yml up -d
env:
LND_DATA_DIR: ${{ env.LND_DATA_DIR }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ jobs:
uses: actions/cache@v4
with:
path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
- name: Enable caching for electrs
id: cache-electrs
uses: actions/cache@v4
Expand All@@ -64,7 +64,7 @@ jobs:
if: "matrix.platform != 'windows-latest' && (steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
run: |
source ./scripts/download_bitcoind_electrs.sh
mkdir bin
mkdir -p bin
mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
- name: Set bitcoind/electrs environment variables
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,17 +94,17 @@ ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }
ldk-node-070 = { package = "ldk-node", version = "=0.7.0" }

[target.'cfg(not(no_download))'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_29_0"] }

[target.'cfg(no_download)'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy"] }
corepc-node = { version = "0.10.0", default-features = false, features = ["27_2"] }
corepc-node = { version = "0.10.1", default-features = false, features = ["29_0"] }

[target.'cfg(cln_test)'.dev-dependencies]
clightningrpc = { version = "0.3.0-beta.8", default-features = false }

[target.'cfg(lnd_test)'.dev-dependencies]
lnd_grpc_rust = { version = "2.10.0", default-features = false }
lnd_grpc_rust = { version = "2.14.0", default-features = false }
tokio = { version = "1.37", features = ["fs"] }

[build-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions scripts/download_bitcoind_electrs.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,17 +10,17 @@ HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"
ELECTRS_DL_ENDPOINT="https://github.com/RCasatta/electrsd/releases/download/electrs_releases"
ELECTRS_VERSION="esplora_a33e97e1a1fc63fa9c20a116bb92579bbf43b254"
BITCOIND_DL_ENDPOINT="https://bitcoincore.org/bin/"
BITCOIND_VERSION="27.2"
BITCOIND_VERSION="29.0"
if [[ "$HOST_PLATFORM" == *linux* ]]; then
ELECTRS_DL_FILE_NAME=electrs_linux_"$ELECTRS_VERSION".zip
ELECTRS_DL_HASH="865e26a96e8df77df01d96f2f569dcf9622fc87a8d99a9b8fe30861a4db9ddf1"
BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-linux-gnu.tar.gz
BITCOIND_DL_HASH="acc223af46c178064c132b235392476f66d486453ddbd6bca6f1f8411547da78"
BITCOIND_DL_HASH="a681e4f6ce524c338a105f214613605bac6c33d58c31dc5135bbc02bc458bb6c"
elif [[ "$HOST_PLATFORM" == *darwin* ]]; then
ELECTRS_DL_FILE_NAME=electrs_macos_"$ELECTRS_VERSION".zip
ELECTRS_DL_HASH="2d5ff149e8a2482d3658e9b386830dfc40c8fbd7c175ca7cbac58240a9505bcd"
BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-apple-darwin.tar.gz
BITCOIND_DL_HASH="6ebc56ca1397615d5a6df2b5cf6727b768e3dcac320c2d5c2f321dcaabc7efa2"
BITCOIND_DL_HASH="5bb824fc86a15318d6a83a1b821ff4cd4b3d3d0e1ec3d162b805ccf7cae6fca8"
else
printf "\n\n"
echo "Unsupported platform: $HOST_PLATFORM Exiting.."
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
services:
bitcoin:
image: blockstream/bitcoind:27.2
image: blockstream/bitcoind:29.1
platform: linux/amd64
command:
[
Expand DownExpand Up@@ -48,7 +48,7 @@ services:
- bitcoin-electrs

cln:
image: blockstream/lightningd:v23.08
image: elementsproject/lightningd:v25.12.1
platform: linux/amd64
depends_on:
bitcoin:
Expand All@@ -60,7 +60,6 @@ services:
"--bitcoin-rpcuser=user",
"--bitcoin-rpcpassword=pass",
"--regtest",
"--experimental-anchors",
]
ports:
- "19846:19846"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
services:
bitcoin:
image: blockstream/bitcoind:27.2
image: blockstream/bitcoind:29.1
platform: linux/amd64
command:
[
Expand DownExpand Up@@ -52,7 +52,7 @@ services:
- bitcoin-electrs

lnd:
image: lightninglabs/lnd:v0.18.5-beta
image: lightninglabs/lnd:v0.20.1-beta
container_name: ldk-node-lnd
depends_on:
- bitcoin
Expand Down
13 changes: 12 additions & 1 deletion tests/integration_tests_cln.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,18 @@ async fn test_cln() {
cln_client.pay(&ldk_invoice.to_string(), Default::default()).unwrap();
common::expect_event!(node, PaymentReceived);

node.close_channel(&user_channel_id, cln_node_id).unwrap();
// Retry close until monitor updates settle (avoids flaky sleep).
for i in 0..10 {
match node.close_channel(&user_channel_id, cln_node_id) {
Ok(()) => break,
Err(e) => {
if i == 9 {
panic!("close_channel failed after 10 attempts: {:?}", e);
}
std::thread::sleep(std::time::Duration::from_secs(1));
},
}
}
common::expect_event!(node, ChannelClosed);
node.stop().unwrap();
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Bump test dependencies and reorganize Docker files by febyeji · Pull Request #869 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/benchmarks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
uses: actions/cache@v4
with:
path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
- name: Enable caching for electrs
id: cache-electrs
uses: actions/cache@v4
Expand All@@ -34,7 +34,7 @@ jobs:
if: "(steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
run: |
source ./scripts/download_bitcoind_electrs.sh
mkdir bin
mkdir -p bin
mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
- name: Set bitcoind/electrs environment variables
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cln-integration.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ jobs:
sudo apt-get install -y socat

- name: Start bitcoind, electrs, and lightningd
run: docker compose -f docker-compose-cln.yml up -d
run: docker compose -p ldk-node -f tests/docker/docker-compose-cln.yml up -d

- name: Forward lightningd RPC socket
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lnd-integration.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ jobs:
run: echo "LND_DATA_DIR=$(mktemp -d)" >> $GITHUB_ENV

- name: Start bitcoind, electrs, and LND
run: docker compose -f docker-compose-lnd.yml up -d
run: docker compose -p ldk-node -f tests/docker/docker-compose-lnd.yml up -d
env:
LND_DATA_DIR: ${{ env.LND_DATA_DIR }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ jobs:
uses: actions/cache@v4
with:
path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
- name: Enable caching for electrs
id: cache-electrs
uses: actions/cache@v4
Expand All@@ -64,7 +64,7 @@ jobs:
if: "matrix.platform != 'windows-latest' && (steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
run: |
source ./scripts/download_bitcoind_electrs.sh
mkdir bin
mkdir -p bin
mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
- name: Set bitcoind/electrs environment variables
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,17 +94,17 @@ ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }
ldk-node-070 = { package = "ldk-node", version = "=0.7.0" }

[target.'cfg(not(no_download))'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_29_0"] }

[target.'cfg(no_download)'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy"] }
corepc-node = { version = "0.10.0", default-features = false, features = ["27_2"] }
corepc-node = { version = "0.10.1", default-features = false, features = ["29_0"] }

[target.'cfg(cln_test)'.dev-dependencies]
clightningrpc = { version = "0.3.0-beta.8", default-features = false }

[target.'cfg(lnd_test)'.dev-dependencies]
lnd_grpc_rust = { version = "2.10.0", default-features = false }
lnd_grpc_rust = { version = "2.14.0", default-features = false }
tokio = { version = "1.37", features = ["fs"] }

[build-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions scripts/download_bitcoind_electrs.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,17 +10,17 @@ HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"
ELECTRS_DL_ENDPOINT="https://github.com/RCasatta/electrsd/releases/download/electrs_releases"
ELECTRS_VERSION="esplora_a33e97e1a1fc63fa9c20a116bb92579bbf43b254"
BITCOIND_DL_ENDPOINT="https://bitcoincore.org/bin/"
BITCOIND_VERSION="27.2"
BITCOIND_VERSION="29.0"
if [[ "$HOST_PLATFORM" == *linux* ]]; then
ELECTRS_DL_FILE_NAME=electrs_linux_"$ELECTRS_VERSION".zip
ELECTRS_DL_HASH="865e26a96e8df77df01d96f2f569dcf9622fc87a8d99a9b8fe30861a4db9ddf1"
BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-linux-gnu.tar.gz
BITCOIND_DL_HASH="acc223af46c178064c132b235392476f66d486453ddbd6bca6f1f8411547da78"
BITCOIND_DL_HASH="a681e4f6ce524c338a105f214613605bac6c33d58c31dc5135bbc02bc458bb6c"
elif [[ "$HOST_PLATFORM" == *darwin* ]]; then
ELECTRS_DL_FILE_NAME=electrs_macos_"$ELECTRS_VERSION".zip
ELECTRS_DL_HASH="2d5ff149e8a2482d3658e9b386830dfc40c8fbd7c175ca7cbac58240a9505bcd"
BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-apple-darwin.tar.gz
BITCOIND_DL_HASH="6ebc56ca1397615d5a6df2b5cf6727b768e3dcac320c2d5c2f321dcaabc7efa2"
BITCOIND_DL_HASH="5bb824fc86a15318d6a83a1b821ff4cd4b3d3d0e1ec3d162b805ccf7cae6fca8"
else
printf "\n\n"
echo "Unsupported platform: $HOST_PLATFORM Exiting.."
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
services:
bitcoin:
image: blockstream/bitcoind:27.2
image: blockstream/bitcoind:29.1
platform: linux/amd64
command:
[
Expand DownExpand Up@@ -48,7 +48,7 @@ services:
- bitcoin-electrs

cln:
image: blockstream/lightningd:v23.08
image: elementsproject/lightningd:v25.12.1
platform: linux/amd64
depends_on:
bitcoin:
Expand All@@ -60,7 +60,6 @@ services:
"--bitcoin-rpcuser=user",
"--bitcoin-rpcpassword=pass",
"--regtest",
"--experimental-anchors",
]
ports:
- "19846:19846"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
services:
bitcoin:
image: blockstream/bitcoind:27.2
image: blockstream/bitcoind:29.1
platform: linux/amd64
command:
[
Expand DownExpand Up@@ -52,7 +52,7 @@ services:
- bitcoin-electrs

lnd:
image: lightninglabs/lnd:v0.18.5-beta
image: lightninglabs/lnd:v0.20.1-beta
container_name: ldk-node-lnd
depends_on:
- bitcoin
Expand Down
13 changes: 12 additions & 1 deletion tests/integration_tests_cln.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,18 @@ async fn test_cln() {
cln_client.pay(&ldk_invoice.to_string(), Default::default()).unwrap();
common::expect_event!(node, PaymentReceived);

node.close_channel(&user_channel_id, cln_node_id).unwrap();
// Retry close until monitor updates settle (avoids flaky sleep).
for i in 0..10 {
match node.close_channel(&user_channel_id, cln_node_id) {
Ok(()) => break,
Err(e) => {
if i == 9 {
panic!("close_channel failed after 10 attempts: {:?}", e);
}
std::thread::sleep(std::time::Duration::from_secs(1));
},
}
}
common::expect_event!(node, ChannelClosed);
node.stop().unwrap();
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Bump test dependencies and reorganize Docker files by febyeji · Pull Request #869 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/benchmarks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
uses: actions/cache@v4
with:
path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
- name: Enable caching for electrs
id: cache-electrs
uses: actions/cache@v4
Expand All@@ -34,7 +34,7 @@ jobs:
if: "(steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
run: |
source ./scripts/download_bitcoind_electrs.sh
mkdir bin
mkdir -p bin
mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
- name: Set bitcoind/electrs environment variables
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cln-integration.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ jobs:
sudo apt-get install -y socat

- name: Start bitcoind, electrs, and lightningd
run: docker compose -f docker-compose-cln.yml up -d
run: docker compose -p ldk-node -f tests/docker/docker-compose-cln.yml up -d

- name: Forward lightningd RPC socket
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lnd-integration.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ jobs:
run: echo "LND_DATA_DIR=$(mktemp -d)" >> $GITHUB_ENV

- name: Start bitcoind, electrs, and LND
run: docker compose -f docker-compose-lnd.yml up -d
run: docker compose -p ldk-node -f tests/docker/docker-compose-lnd.yml up -d
env:
LND_DATA_DIR: ${{ env.LND_DATA_DIR }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ jobs:
uses: actions/cache@v4
with:
path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
- name: Enable caching for electrs
id: cache-electrs
uses: actions/cache@v4
Expand All@@ -64,7 +64,7 @@ jobs:
if: "matrix.platform != 'windows-latest' && (steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
run: |
source ./scripts/download_bitcoind_electrs.sh
mkdir bin
mkdir -p bin
mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
- name: Set bitcoind/electrs environment variables
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,17 +94,17 @@ ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }
ldk-node-070 = { package = "ldk-node", version = "=0.7.0" }

[target.'cfg(not(no_download))'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_29_0"] }

[target.'cfg(no_download)'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy"] }
corepc-node = { version = "0.10.0", default-features = false, features = ["27_2"] }
corepc-node = { version = "0.10.1", default-features = false, features = ["29_0"] }

[target.'cfg(cln_test)'.dev-dependencies]
clightningrpc = { version = "0.3.0-beta.8", default-features = false }

[target.'cfg(lnd_test)'.dev-dependencies]
lnd_grpc_rust = { version = "2.10.0", default-features = false }
lnd_grpc_rust = { version = "2.14.0", default-features = false }
tokio = { version = "1.37", features = ["fs"] }

[build-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions scripts/download_bitcoind_electrs.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,17 +10,17 @@ HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"
ELECTRS_DL_ENDPOINT="https://github.com/RCasatta/electrsd/releases/download/electrs_releases"
ELECTRS_VERSION="esplora_a33e97e1a1fc63fa9c20a116bb92579bbf43b254"
BITCOIND_DL_ENDPOINT="https://bitcoincore.org/bin/"
BITCOIND_VERSION="27.2"
BITCOIND_VERSION="29.0"
if [[ "$HOST_PLATFORM" == *linux* ]]; then
ELECTRS_DL_FILE_NAME=electrs_linux_"$ELECTRS_VERSION".zip
ELECTRS_DL_HASH="865e26a96e8df77df01d96f2f569dcf9622fc87a8d99a9b8fe30861a4db9ddf1"
BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-linux-gnu.tar.gz
BITCOIND_DL_HASH="acc223af46c178064c132b235392476f66d486453ddbd6bca6f1f8411547da78"
BITCOIND_DL_HASH="a681e4f6ce524c338a105f214613605bac6c33d58c31dc5135bbc02bc458bb6c"
elif [[ "$HOST_PLATFORM" == *darwin* ]]; then
ELECTRS_DL_FILE_NAME=electrs_macos_"$ELECTRS_VERSION".zip
ELECTRS_DL_HASH="2d5ff149e8a2482d3658e9b386830dfc40c8fbd7c175ca7cbac58240a9505bcd"
BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-apple-darwin.tar.gz
BITCOIND_DL_HASH="6ebc56ca1397615d5a6df2b5cf6727b768e3dcac320c2d5c2f321dcaabc7efa2"
BITCOIND_DL_HASH="5bb824fc86a15318d6a83a1b821ff4cd4b3d3d0e1ec3d162b805ccf7cae6fca8"
else
printf "\n\n"
echo "Unsupported platform: $HOST_PLATFORM Exiting.."
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
services:
bitcoin:
image: blockstream/bitcoind:27.2
image: blockstream/bitcoind:29.1
platform: linux/amd64
command:
[
Expand DownExpand Up@@ -48,7 +48,7 @@ services:
- bitcoin-electrs

cln:
image: blockstream/lightningd:v23.08
image: elementsproject/lightningd:v25.12.1
platform: linux/amd64
depends_on:
bitcoin:
Expand All@@ -60,7 +60,6 @@ services:
"--bitcoin-rpcuser=user",
"--bitcoin-rpcpassword=pass",
"--regtest",
"--experimental-anchors",
]
ports:
- "19846:19846"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
services:
bitcoin:
image: blockstream/bitcoind:27.2
image: blockstream/bitcoind:29.1
platform: linux/amd64
command:
[
Expand DownExpand Up@@ -52,7 +52,7 @@ services:
- bitcoin-electrs

lnd:
image: lightninglabs/lnd:v0.18.5-beta
image: lightninglabs/lnd:v0.20.1-beta
container_name: ldk-node-lnd
depends_on:
- bitcoin
Expand Down
13 changes: 12 additions & 1 deletion tests/integration_tests_cln.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,18 @@ async fn test_cln() {
cln_client.pay(&ldk_invoice.to_string(), Default::default()).unwrap();
common::expect_event!(node, PaymentReceived);

node.close_channel(&user_channel_id, cln_node_id).unwrap();
// Retry close until monitor updates settle (avoids flaky sleep).
for i in 0..10 {
match node.close_channel(&user_channel_id, cln_node_id) {
Ok(()) => break,
Err(e) => {
if i == 9 {
panic!("close_channel failed after 10 attempts: {:?}", e);
}
std::thread::sleep(std::time::Duration::from_secs(1));
},
}
}
common::expect_event!(node, ChannelClosed);
node.stop().unwrap();
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Bump test dependencies and reorganize Docker files by febyeji · Pull Request #869 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/benchmarks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
uses: actions/cache@v4
with:
path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
- name: Enable caching for electrs
id: cache-electrs
uses: actions/cache@v4
Expand All@@ -34,7 +34,7 @@ jobs:
if: "(steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
run: |
source ./scripts/download_bitcoind_electrs.sh
mkdir bin
mkdir -p bin
mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
- name: Set bitcoind/electrs environment variables
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cln-integration.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ jobs:
sudo apt-get install -y socat

- name: Start bitcoind, electrs, and lightningd
run: docker compose -f docker-compose-cln.yml up -d
run: docker compose -p ldk-node -f tests/docker/docker-compose-cln.yml up -d

- name: Forward lightningd RPC socket
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lnd-integration.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ jobs:
run: echo "LND_DATA_DIR=$(mktemp -d)" >> $GITHUB_ENV

- name: Start bitcoind, electrs, and LND
run: docker compose -f docker-compose-lnd.yml up -d
run: docker compose -p ldk-node -f tests/docker/docker-compose-lnd.yml up -d
env:
LND_DATA_DIR: ${{ env.LND_DATA_DIR }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ jobs:
uses: actions/cache@v4
with:
path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
- name: Enable caching for electrs
id: cache-electrs
uses: actions/cache@v4
Expand All@@ -64,7 +64,7 @@ jobs:
if: "matrix.platform != 'windows-latest' && (steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
run: |
source ./scripts/download_bitcoind_electrs.sh
mkdir bin
mkdir -p bin
mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
- name: Set bitcoind/electrs environment variables
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,17 +94,17 @@ ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }
ldk-node-070 = { package = "ldk-node", version = "=0.7.0" }

[target.'cfg(not(no_download))'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_29_0"] }

[target.'cfg(no_download)'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy"] }
corepc-node = { version = "0.10.0", default-features = false, features = ["27_2"] }
corepc-node = { version = "0.10.1", default-features = false, features = ["29_0"] }

[target.'cfg(cln_test)'.dev-dependencies]
clightningrpc = { version = "0.3.0-beta.8", default-features = false }

[target.'cfg(lnd_test)'.dev-dependencies]
lnd_grpc_rust = { version = "2.10.0", default-features = false }
lnd_grpc_rust = { version = "2.14.0", default-features = false }
tokio = { version = "1.37", features = ["fs"] }

[build-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions scripts/download_bitcoind_electrs.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,17 +10,17 @@ HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"
ELECTRS_DL_ENDPOINT="https://github.com/RCasatta/electrsd/releases/download/electrs_releases"
ELECTRS_VERSION="esplora_a33e97e1a1fc63fa9c20a116bb92579bbf43b254"
BITCOIND_DL_ENDPOINT="https://bitcoincore.org/bin/"
BITCOIND_VERSION="27.2"
BITCOIND_VERSION="29.0"
if [[ "$HOST_PLATFORM" == *linux* ]]; then
ELECTRS_DL_FILE_NAME=electrs_linux_"$ELECTRS_VERSION".zip
ELECTRS_DL_HASH="865e26a96e8df77df01d96f2f569dcf9622fc87a8d99a9b8fe30861a4db9ddf1"
BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-linux-gnu.tar.gz
BITCOIND_DL_HASH="acc223af46c178064c132b235392476f66d486453ddbd6bca6f1f8411547da78"
BITCOIND_DL_HASH="a681e4f6ce524c338a105f214613605bac6c33d58c31dc5135bbc02bc458bb6c"
elif [[ "$HOST_PLATFORM" == *darwin* ]]; then
ELECTRS_DL_FILE_NAME=electrs_macos_"$ELECTRS_VERSION".zip
ELECTRS_DL_HASH="2d5ff149e8a2482d3658e9b386830dfc40c8fbd7c175ca7cbac58240a9505bcd"
BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-apple-darwin.tar.gz
BITCOIND_DL_HASH="6ebc56ca1397615d5a6df2b5cf6727b768e3dcac320c2d5c2f321dcaabc7efa2"
BITCOIND_DL_HASH="5bb824fc86a15318d6a83a1b821ff4cd4b3d3d0e1ec3d162b805ccf7cae6fca8"
else
printf "\n\n"
echo "Unsupported platform: $HOST_PLATFORM Exiting.."
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
services:
bitcoin:
image: blockstream/bitcoind:27.2
image: blockstream/bitcoind:29.1
platform: linux/amd64
command:
[
Expand DownExpand Up@@ -48,7 +48,7 @@ services:
- bitcoin-electrs

cln:
image: blockstream/lightningd:v23.08
image: elementsproject/lightningd:v25.12.1
platform: linux/amd64
depends_on:
bitcoin:
Expand All@@ -60,7 +60,6 @@ services:
"--bitcoin-rpcuser=user",
"--bitcoin-rpcpassword=pass",
"--regtest",
"--experimental-anchors",
]
ports:
- "19846:19846"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
services:
bitcoin:
image: blockstream/bitcoind:27.2
image: blockstream/bitcoind:29.1
platform: linux/amd64
command:
[
Expand DownExpand Up@@ -52,7 +52,7 @@ services:
- bitcoin-electrs

lnd:
image: lightninglabs/lnd:v0.18.5-beta
image: lightninglabs/lnd:v0.20.1-beta
container_name: ldk-node-lnd
depends_on:
- bitcoin
Expand Down
13 changes: 12 additions & 1 deletion tests/integration_tests_cln.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,18 @@ async fn test_cln() {
cln_client.pay(&ldk_invoice.to_string(), Default::default()).unwrap();
common::expect_event!(node, PaymentReceived);

node.close_channel(&user_channel_id, cln_node_id).unwrap();
// Retry close until monitor updates settle (avoids flaky sleep).
for i in 0..10 {
match node.close_channel(&user_channel_id, cln_node_id) {
Ok(()) => break,
Err(e) => {
if i == 9 {
panic!("close_channel failed after 10 attempts: {:?}", e);
}
std::thread::sleep(std::time::Duration::from_secs(1));
},
}
}
common::expect_event!(node, ChannelClosed);
node.stop().unwrap();
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Bump test dependencies and reorganize Docker files by febyeji · Pull Request #869 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/benchmarks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
uses: actions/cache@v4
with:
path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
- name: Enable caching for electrs
id: cache-electrs
uses: actions/cache@v4
Expand All@@ -34,7 +34,7 @@ jobs:
if: "(steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
run: |
source ./scripts/download_bitcoind_electrs.sh
mkdir bin
mkdir -p bin
mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
- name: Set bitcoind/electrs environment variables
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cln-integration.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ jobs:
sudo apt-get install -y socat

- name: Start bitcoind, electrs, and lightningd
run: docker compose -f docker-compose-cln.yml up -d
run: docker compose -p ldk-node -f tests/docker/docker-compose-cln.yml up -d

- name: Forward lightningd RPC socket
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lnd-integration.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ jobs:
run: echo "LND_DATA_DIR=$(mktemp -d)" >> $GITHUB_ENV

- name: Start bitcoind, electrs, and LND
run: docker compose -f docker-compose-lnd.yml up -d
run: docker compose -p ldk-node -f tests/docker/docker-compose-lnd.yml up -d
env:
LND_DATA_DIR: ${{ env.LND_DATA_DIR }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ jobs:
uses: actions/cache@v4
with:
path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
- name: Enable caching for electrs
id: cache-electrs
uses: actions/cache@v4
Expand All@@ -64,7 +64,7 @@ jobs:
if: "matrix.platform != 'windows-latest' && (steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
run: |
source ./scripts/download_bitcoind_electrs.sh
mkdir bin
mkdir -p bin
mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
- name: Set bitcoind/electrs environment variables
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,17 +94,17 @@ ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }
ldk-node-070 = { package = "ldk-node", version = "=0.7.0" }

[target.'cfg(not(no_download))'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_29_0"] }

[target.'cfg(no_download)'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy"] }
corepc-node = { version = "0.10.0", default-features = false, features = ["27_2"] }
corepc-node = { version = "0.10.1", default-features = false, features = ["29_0"] }

[target.'cfg(cln_test)'.dev-dependencies]
clightningrpc = { version = "0.3.0-beta.8", default-features = false }

[target.'cfg(lnd_test)'.dev-dependencies]
lnd_grpc_rust = { version = "2.10.0", default-features = false }
lnd_grpc_rust = { version = "2.14.0", default-features = false }
tokio = { version = "1.37", features = ["fs"] }

[build-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions scripts/download_bitcoind_electrs.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,17 +10,17 @@ HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"
ELECTRS_DL_ENDPOINT="https://github.com/RCasatta/electrsd/releases/download/electrs_releases"
ELECTRS_VERSION="esplora_a33e97e1a1fc63fa9c20a116bb92579bbf43b254"
BITCOIND_DL_ENDPOINT="https://bitcoincore.org/bin/"
BITCOIND_VERSION="27.2"
BITCOIND_VERSION="29.0"
if [[ "$HOST_PLATFORM" == *linux* ]]; then
ELECTRS_DL_FILE_NAME=electrs_linux_"$ELECTRS_VERSION".zip
ELECTRS_DL_HASH="865e26a96e8df77df01d96f2f569dcf9622fc87a8d99a9b8fe30861a4db9ddf1"
BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-linux-gnu.tar.gz
BITCOIND_DL_HASH="acc223af46c178064c132b235392476f66d486453ddbd6bca6f1f8411547da78"
BITCOIND_DL_HASH="a681e4f6ce524c338a105f214613605bac6c33d58c31dc5135bbc02bc458bb6c"
elif [[ "$HOST_PLATFORM" == *darwin* ]]; then
ELECTRS_DL_FILE_NAME=electrs_macos_"$ELECTRS_VERSION".zip
ELECTRS_DL_HASH="2d5ff149e8a2482d3658e9b386830dfc40c8fbd7c175ca7cbac58240a9505bcd"
BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-apple-darwin.tar.gz
BITCOIND_DL_HASH="6ebc56ca1397615d5a6df2b5cf6727b768e3dcac320c2d5c2f321dcaabc7efa2"
BITCOIND_DL_HASH="5bb824fc86a15318d6a83a1b821ff4cd4b3d3d0e1ec3d162b805ccf7cae6fca8"
else
printf "\n\n"
echo "Unsupported platform: $HOST_PLATFORM Exiting.."
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
services:
bitcoin:
image: blockstream/bitcoind:27.2
image: blockstream/bitcoind:29.1
platform: linux/amd64
command:
[
Expand DownExpand Up@@ -48,7 +48,7 @@ services:
- bitcoin-electrs

cln:
image: blockstream/lightningd:v23.08
image: elementsproject/lightningd:v25.12.1
platform: linux/amd64
depends_on:
bitcoin:
Expand All@@ -60,7 +60,6 @@ services:
"--bitcoin-rpcuser=user",
"--bitcoin-rpcpassword=pass",
"--regtest",
"--experimental-anchors",
]
ports:
- "19846:19846"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
services:
bitcoin:
image: blockstream/bitcoind:27.2
image: blockstream/bitcoind:29.1
platform: linux/amd64
command:
[
Expand DownExpand Up@@ -52,7 +52,7 @@ services:
- bitcoin-electrs

lnd:
image: lightninglabs/lnd:v0.18.5-beta
image: lightninglabs/lnd:v0.20.1-beta
container_name: ldk-node-lnd
depends_on:
- bitcoin
Expand Down
13 changes: 12 additions & 1 deletion tests/integration_tests_cln.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,18 @@ async fn test_cln() {
cln_client.pay(&ldk_invoice.to_string(), Default::default()).unwrap();
common::expect_event!(node, PaymentReceived);

node.close_channel(&user_channel_id, cln_node_id).unwrap();
// Retry close until monitor updates settle (avoids flaky sleep).
for i in 0..10 {
match node.close_channel(&user_channel_id, cln_node_id) {
Ok(()) => break,
Err(e) => {
if i == 9 {
panic!("close_channel failed after 10 attempts: {:?}", e);
}
std::thread::sleep(std::time::Duration::from_secs(1));
},
}
}
common::expect_event!(node, ChannelClosed);
node.stop().unwrap();
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Bump test dependencies and reorganize Docker files by febyeji · Pull Request #869 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/benchmarks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
uses: actions/cache@v4
with:
path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
- name: Enable caching for electrs
id: cache-electrs
uses: actions/cache@v4
Expand All@@ -34,7 +34,7 @@ jobs:
if: "(steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
run: |
source ./scripts/download_bitcoind_electrs.sh
mkdir bin
mkdir -p bin
mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
- name: Set bitcoind/electrs environment variables
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cln-integration.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ jobs:
sudo apt-get install -y socat

- name: Start bitcoind, electrs, and lightningd
run: docker compose -f docker-compose-cln.yml up -d
run: docker compose -p ldk-node -f tests/docker/docker-compose-cln.yml up -d

- name: Forward lightningd RPC socket
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lnd-integration.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ jobs:
run: echo "LND_DATA_DIR=$(mktemp -d)" >> $GITHUB_ENV

- name: Start bitcoind, electrs, and LND
run: docker compose -f docker-compose-lnd.yml up -d
run: docker compose -p ldk-node -f tests/docker/docker-compose-lnd.yml up -d
env:
LND_DATA_DIR: ${{ env.LND_DATA_DIR }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ jobs:
uses: actions/cache@v4
with:
path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
- name: Enable caching for electrs
id: cache-electrs
uses: actions/cache@v4
Expand All@@ -64,7 +64,7 @@ jobs:
if: "matrix.platform != 'windows-latest' && (steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
run: |
source ./scripts/download_bitcoind_electrs.sh
mkdir bin
mkdir -p bin
mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
- name: Set bitcoind/electrs environment variables
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,17 +94,17 @@ ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }
ldk-node-070 = { package = "ldk-node", version = "=0.7.0" }

[target.'cfg(not(no_download))'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_29_0"] }

[target.'cfg(no_download)'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy"] }
corepc-node = { version = "0.10.0", default-features = false, features = ["27_2"] }
corepc-node = { version = "0.10.1", default-features = false, features = ["29_0"] }

[target.'cfg(cln_test)'.dev-dependencies]
clightningrpc = { version = "0.3.0-beta.8", default-features = false }

[target.'cfg(lnd_test)'.dev-dependencies]
lnd_grpc_rust = { version = "2.10.0", default-features = false }
lnd_grpc_rust = { version = "2.14.0", default-features = false }
tokio = { version = "1.37", features = ["fs"] }

[build-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions scripts/download_bitcoind_electrs.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,17 +10,17 @@ HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"
ELECTRS_DL_ENDPOINT="https://github.com/RCasatta/electrsd/releases/download/electrs_releases"
ELECTRS_VERSION="esplora_a33e97e1a1fc63fa9c20a116bb92579bbf43b254"
BITCOIND_DL_ENDPOINT="https://bitcoincore.org/bin/"
BITCOIND_VERSION="27.2"
BITCOIND_VERSION="29.0"
if [[ "$HOST_PLATFORM" == *linux* ]]; then
ELECTRS_DL_FILE_NAME=electrs_linux_"$ELECTRS_VERSION".zip
ELECTRS_DL_HASH="865e26a96e8df77df01d96f2f569dcf9622fc87a8d99a9b8fe30861a4db9ddf1"
BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-linux-gnu.tar.gz
BITCOIND_DL_HASH="acc223af46c178064c132b235392476f66d486453ddbd6bca6f1f8411547da78"
BITCOIND_DL_HASH="a681e4f6ce524c338a105f214613605bac6c33d58c31dc5135bbc02bc458bb6c"
elif [[ "$HOST_PLATFORM" == *darwin* ]]; then
ELECTRS_DL_FILE_NAME=electrs_macos_"$ELECTRS_VERSION".zip
ELECTRS_DL_HASH="2d5ff149e8a2482d3658e9b386830dfc40c8fbd7c175ca7cbac58240a9505bcd"
BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-apple-darwin.tar.gz
BITCOIND_DL_HASH="6ebc56ca1397615d5a6df2b5cf6727b768e3dcac320c2d5c2f321dcaabc7efa2"
BITCOIND_DL_HASH="5bb824fc86a15318d6a83a1b821ff4cd4b3d3d0e1ec3d162b805ccf7cae6fca8"
else
printf "\n\n"
echo "Unsupported platform: $HOST_PLATFORM Exiting.."
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
services:
bitcoin:
image: blockstream/bitcoind:27.2
image: blockstream/bitcoind:29.1
platform: linux/amd64
command:
[
Expand DownExpand Up@@ -48,7 +48,7 @@ services:
- bitcoin-electrs

cln:
image: blockstream/lightningd:v23.08
image: elementsproject/lightningd:v25.12.1
platform: linux/amd64
depends_on:
bitcoin:
Expand All@@ -60,7 +60,6 @@ services:
"--bitcoin-rpcuser=user",
"--bitcoin-rpcpassword=pass",
"--regtest",
"--experimental-anchors",
]
ports:
- "19846:19846"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
services:
bitcoin:
image: blockstream/bitcoind:27.2
image: blockstream/bitcoind:29.1
platform: linux/amd64
command:
[
Expand DownExpand Up@@ -52,7 +52,7 @@ services:
- bitcoin-electrs

lnd:
image: lightninglabs/lnd:v0.18.5-beta
image: lightninglabs/lnd:v0.20.1-beta
container_name: ldk-node-lnd
depends_on:
- bitcoin
Expand Down
13 changes: 12 additions & 1 deletion tests/integration_tests_cln.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,18 @@ async fn test_cln() {
cln_client.pay(&ldk_invoice.to_string(), Default::default()).unwrap();
common::expect_event!(node, PaymentReceived);

node.close_channel(&user_channel_id, cln_node_id).unwrap();
// Retry close until monitor updates settle (avoids flaky sleep).
for i in 0..10 {
match node.close_channel(&user_channel_id, cln_node_id) {
Ok(()) => break,
Err(e) => {
if i == 9 {
panic!("close_channel failed after 10 attempts: {:?}", e);
}
std::thread::sleep(std::time::Duration::from_secs(1));
},
}
}
common::expect_event!(node, ChannelClosed);
node.stop().unwrap();
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Bump test dependencies and reorganize Docker files by febyeji · Pull Request #869 · lightningdevkit/ldk-node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/benchmarks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
uses: actions/cache@v4
with:
path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
- name: Enable caching for electrs
id: cache-electrs
uses: actions/cache@v4
Expand All@@ -34,7 +34,7 @@ jobs:
if: "(steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
run: |
source ./scripts/download_bitcoind_electrs.sh
mkdir bin
mkdir -p bin
mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
- name: Set bitcoind/electrs environment variables
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cln-integration.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ jobs:
sudo apt-get install -y socat

- name: Start bitcoind, electrs, and lightningd
run: docker compose -f docker-compose-cln.yml up -d
run: docker compose -p ldk-node -f tests/docker/docker-compose-cln.yml up -d

- name: Forward lightningd RPC socket
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lnd-integration.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ jobs:
run: echo "LND_DATA_DIR=$(mktemp -d)" >> $GITHUB_ENV

- name: Start bitcoind, electrs, and LND
run: docker compose -f docker-compose-lnd.yml up -d
run: docker compose -p ldk-node -f tests/docker/docker-compose-lnd.yml up -d
env:
LND_DATA_DIR: ${{ env.LND_DATA_DIR }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ jobs:
uses: actions/cache@v4
with:
path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-${{ runner.os }}-${{ runner.arch }}
key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
- name: Enable caching for electrs
id: cache-electrs
uses: actions/cache@v4
Expand All@@ -64,7 +64,7 @@ jobs:
if: "matrix.platform != 'windows-latest' && (steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true')"
run: |
source ./scripts/download_bitcoind_electrs.sh
mkdir bin
mkdir -p bin
mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
- name: Set bitcoind/electrs environment variables
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,17 +94,17 @@ ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }
ldk-node-070 = { package = "ldk-node", version = "=0.7.0" }

[target.'cfg(not(no_download))'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
electrsd = { version = "0.36.1", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_29_0"] }

[target.'cfg(no_download)'.dev-dependencies]
electrsd = { version = "0.36.1", default-features = false, features = ["legacy"] }
corepc-node = { version = "0.10.0", default-features = false, features = ["27_2"] }
corepc-node = { version = "0.10.1", default-features = false, features = ["29_0"] }

[target.'cfg(cln_test)'.dev-dependencies]
clightningrpc = { version = "0.3.0-beta.8", default-features = false }

[target.'cfg(lnd_test)'.dev-dependencies]
lnd_grpc_rust = { version = "2.10.0", default-features = false }
lnd_grpc_rust = { version = "2.14.0", default-features = false }
tokio = { version = "1.37", features = ["fs"] }

[build-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions scripts/download_bitcoind_electrs.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,17 +10,17 @@ HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')"
ELECTRS_DL_ENDPOINT="https://github.com/RCasatta/electrsd/releases/download/electrs_releases"
ELECTRS_VERSION="esplora_a33e97e1a1fc63fa9c20a116bb92579bbf43b254"
BITCOIND_DL_ENDPOINT="https://bitcoincore.org/bin/"
BITCOIND_VERSION="27.2"
BITCOIND_VERSION="29.0"
if [[ "$HOST_PLATFORM" == *linux* ]]; then
ELECTRS_DL_FILE_NAME=electrs_linux_"$ELECTRS_VERSION".zip
ELECTRS_DL_HASH="865e26a96e8df77df01d96f2f569dcf9622fc87a8d99a9b8fe30861a4db9ddf1"
BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-linux-gnu.tar.gz
BITCOIND_DL_HASH="acc223af46c178064c132b235392476f66d486453ddbd6bca6f1f8411547da78"
BITCOIND_DL_HASH="a681e4f6ce524c338a105f214613605bac6c33d58c31dc5135bbc02bc458bb6c"
elif [[ "$HOST_PLATFORM" == *darwin* ]]; then
ELECTRS_DL_FILE_NAME=electrs_macos_"$ELECTRS_VERSION".zip
ELECTRS_DL_HASH="2d5ff149e8a2482d3658e9b386830dfc40c8fbd7c175ca7cbac58240a9505bcd"
BITCOIND_DL_FILE_NAME=bitcoin-"$BITCOIND_VERSION"-x86_64-apple-darwin.tar.gz
BITCOIND_DL_HASH="6ebc56ca1397615d5a6df2b5cf6727b768e3dcac320c2d5c2f321dcaabc7efa2"
BITCOIND_DL_HASH="5bb824fc86a15318d6a83a1b821ff4cd4b3d3d0e1ec3d162b805ccf7cae6fca8"
else
printf "\n\n"
echo "Unsupported platform: $HOST_PLATFORM Exiting.."
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
services:
bitcoin:
image: blockstream/bitcoind:27.2
image: blockstream/bitcoind:29.1
platform: linux/amd64
command:
[
Expand DownExpand Up@@ -48,7 +48,7 @@ services:
- bitcoin-electrs

cln:
image: blockstream/lightningd:v23.08
image: elementsproject/lightningd:v25.12.1
platform: linux/amd64
depends_on:
bitcoin:
Expand All@@ -60,7 +60,6 @@ services:
"--bitcoin-rpcuser=user",
"--bitcoin-rpcpassword=pass",
"--regtest",
"--experimental-anchors",
]
ports:
- "19846:19846"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
services:
bitcoin:
image: blockstream/bitcoind:27.2
image: blockstream/bitcoind:29.1
platform: linux/amd64
command:
[
Expand DownExpand Up@@ -52,7 +52,7 @@ services:
- bitcoin-electrs

lnd:
image: lightninglabs/lnd:v0.18.5-beta
image: lightninglabs/lnd:v0.20.1-beta
container_name: ldk-node-lnd
depends_on:
- bitcoin
Expand Down
13 changes: 12 additions & 1 deletion tests/integration_tests_cln.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,18 @@ async fn test_cln() {
cln_client.pay(&ldk_invoice.to_string(), Default::default()).unwrap();
common::expect_event!(node, PaymentReceived);

node.close_channel(&user_channel_id, cln_node_id).unwrap();
// Retry close until monitor updates settle (avoids flaky sleep).
for i in 0..10 {
match node.close_channel(&user_channel_id, cln_node_id) {
Ok(()) => break,
Err(e) => {
if i == 9 {
panic!("close_channel failed after 10 attempts: {:?}", e);
}
std::thread::sleep(std::time::Duration::from_secs(1));
},
}
}
common::expect_event!(node, ChannelClosed);
node.stop().unwrap();
}
Loading