Bladeren bron

feat: update ldk-node to 0.7 (#1399)

tsk 4 weken geleden
bovenliggende
commit
12f38623c0

+ 125 - 169
Cargo.lock

@@ -729,7 +729,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b59a3f7fbe678874fa34354097644a171276e02a49934c13b3d61c54610ddf39"
 dependencies = [
  "bdk_core",
- "electrum-client 0.24.1",
+ "electrum-client",
 ]
 
 [[package]]
@@ -740,7 +740,7 @@ checksum = "0c9f5961444b5f51b9c3937e729a212363d0e4cde6390ded6e01e16292078df4"
 dependencies = [
  "async-trait",
  "bdk_core",
- "esplora-client 0.12.1",
+ "esplora-client",
  "futures",
 ]
 
@@ -1086,8 +1086,8 @@ dependencies = [
  "bitcoin 0.32.8",
  "cbor-diag",
  "ciborium",
- "lightning",
- "lightning-invoice",
+ "lightning 0.2.0",
+ "lightning-invoice 0.34.0",
  "once_cell",
  "regex",
  "serde",
@@ -1176,12 +1176,12 @@ dependencies = [
  "http 0.2.12",
  "hyper 0.14.32",
  "jsonwebtoken",
- "lightning",
- "lightning-invoice",
+ "lightning 0.2.0",
+ "lightning-invoice 0.34.0",
  "nostr-sdk",
  "rand 0.9.2",
  "regex",
- "reqwest 0.12.25",
+ "reqwest",
  "ring 0.17.14",
  "rustls 0.23.35",
  "serde",
@@ -1238,9 +1238,9 @@ dependencies = [
  "cdk-sqlite",
  "clap",
  "home",
- "lightning",
+ "lightning 0.2.0",
  "nostr-sdk",
- "reqwest 0.12.25",
+ "reqwest",
  "serde",
  "serde_json",
  "serde_with",
@@ -1282,8 +1282,8 @@ dependencies = [
  "criterion",
  "futures",
  "getrandom 0.2.16",
- "lightning",
- "lightning-invoice",
+ "lightning 0.2.0",
+ "lightning-invoice 0.34.0",
  "parking_lot",
  "rand 0.9.2",
  "serde",
@@ -1309,9 +1309,9 @@ dependencies = [
  "bitcoin 0.32.8",
  "cdk-common",
  "futures",
- "lightning",
- "lightning-invoice",
- "reqwest 0.12.25",
+ "lightning 0.2.0",
+ "lightning-invoice 0.34.0",
+ "reqwest",
  "serde",
  "serde_json",
  "thiserror 2.0.17",
@@ -1370,11 +1370,11 @@ dependencies = [
  "futures",
  "getrandom 0.2.16",
  "ldk-node",
- "lightning-invoice",
+ "lightning-invoice 0.34.0",
  "ln-regtest-rs",
  "once_cell",
  "rand 0.9.2",
- "reqwest 0.12.25",
+ "reqwest",
  "serde",
  "serde_json",
  "tokio",
@@ -1502,7 +1502,7 @@ dependencies = [
  "config",
  "futures",
  "home",
- "lightning-invoice",
+ "lightning-invoice 0.34.0",
  "serde",
  "tokio",
  "tower 0.5.2",
@@ -1531,8 +1531,8 @@ dependencies = [
  "clap",
  "futures",
  "hex",
- "lightning",
- "lightning-invoice",
+ "lightning 0.2.0",
+ "lightning-invoice 0.34.0",
  "prost 0.13.5",
  "rand 0.9.2",
  "serde",
@@ -1559,7 +1559,7 @@ dependencies = [
  "cdk-common",
  "cdk-sql-common",
  "futures-util",
- "lightning-invoice",
+ "lightning-invoice 0.34.0",
  "native-tls",
  "once_cell",
  "postgres-native-tls",
@@ -1580,7 +1580,7 @@ dependencies = [
  "futures",
  "once_cell",
  "prometheus",
- "reqwest 0.12.25",
+ "reqwest",
  "serde",
  "serde_json",
  "sysinfo",
@@ -1596,7 +1596,7 @@ version = "0.14.0"
 dependencies = [
  "async-trait",
  "cdk-common",
- "lightning-invoice",
+ "lightning-invoice 0.34.0",
  "redb",
  "serde",
  "serde_json",
@@ -1639,7 +1639,7 @@ dependencies = [
  "bitcoin 0.32.8",
  "cdk-common",
  "cdk-prometheus",
- "lightning-invoice",
+ "lightning-invoice 0.34.0",
  "once_cell",
  "serde",
  "serde_json",
@@ -1658,7 +1658,7 @@ dependencies = [
  "cdk-common",
  "cdk-prometheus",
  "cdk-sql-common",
- "lightning-invoice",
+ "lightning-invoice 0.34.0",
  "rusqlite",
  "serde",
  "serde_json",
@@ -1692,6 +1692,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "chacha20-poly1305"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b4b0fc281743d80256607bd65e8beedc42cb0787ea119c85b81b4c0eab85e5f"
+
+[[package]]
 name = "chacha20poly1305"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1822,9 +1828,9 @@ dependencies = [
 
 [[package]]
 name = "cmake"
-version = "0.1.54"
+version = "0.1.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
+checksum = "b042e5d8a74ae91bb0961acd039822472ec99f8ab0948cbf6d1369588f8be586"
 dependencies = [
  "cc",
 ]
@@ -2554,23 +2560,6 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "electrum-client"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a0bd443023f9f5c4b7153053721939accc7113cbdf810a024434eed454b3db1"
-dependencies = [
- "bitcoin 0.32.8",
- "byteorder",
- "libc",
- "log",
- "rustls 0.23.35",
- "serde",
- "serde_json",
- "webpki-roots 0.25.4",
- "winapi",
-]
-
-[[package]]
-name = "electrum-client"
 version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5059f13888a90486e7268bbce59b175f5f76b1c55e5b9c568ceaa42d2b8507c"
@@ -2681,20 +2670,6 @@ dependencies = [
 
 [[package]]
 name = "esplora-client"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0da3c186d286e046253ccdc4bb71aa87ef872e4eff2045947c0c4fe3d2b2efc"
-dependencies = [
- "bitcoin 0.32.8",
- "hex-conservative 0.2.2",
- "log",
- "reqwest 0.11.27",
- "serde",
- "tokio",
-]
-
-[[package]]
-name = "esplora-client"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0af349d96a5d9ad77ba59f1437aa6f348b03c5865d4f7d6e7a662d60aedce39"
@@ -2702,7 +2677,7 @@ dependencies = [
  "bitcoin 0.32.8",
  "hex-conservative 0.2.2",
  "log",
- "reqwest 0.12.25",
+ "reqwest",
  "serde",
  "tokio",
 ]
@@ -3931,9 +3906,9 @@ dependencies = [
 
 [[package]]
 name = "ldk-node"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78165f06c94ecdb568b1850cf075d60049c7b395dce65266ba1362da01511670"
+checksum = "d830ef2d6b00f089fb6e3ac845370ebf0f35f9d11ce81b3a097c1580d2dce358"
 dependencies = [
  "base64 0.22.1",
  "bdk_chain",
@@ -3944,30 +3919,30 @@ dependencies = [
  "bip39",
  "bitcoin 0.32.8",
  "chrono",
- "electrum-client 0.24.1",
- "esplora-client 0.11.0",
- "esplora-client 0.12.1",
+ "electrum-client",
+ "esplora-client",
  "libc",
- "lightning",
+ "lightning 0.2.0",
  "lightning-background-processor",
  "lightning-block-sync",
- "lightning-invoice",
+ "lightning-invoice 0.34.0",
  "lightning-liquidity",
+ "lightning-macros",
  "lightning-net-tokio",
  "lightning-persister",
  "lightning-rapid-gossip-sync",
  "lightning-transaction-sync",
- "lightning-types",
+ "lightning-types 0.3.0",
  "log",
  "prost 0.11.9",
- "rand 0.8.5",
- "reqwest 0.12.25",
+ "rand 0.9.2",
+ "reqwest",
  "rusqlite",
  "rustls 0.23.35",
  "serde",
  "serde_json",
  "tokio",
- "vss-client",
+ "vss-client-ng",
  "winapi",
 ]
 
@@ -4045,33 +4020,52 @@ dependencies = [
  "dnssec-prover",
  "hashbrown 0.13.2",
  "libm",
- "lightning-invoice",
- "lightning-types",
+ "lightning-invoice 0.33.2",
+ "lightning-types 0.2.0",
+ "possiblyrandom",
+]
+
+[[package]]
+name = "lightning"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4342d07db2b3fe7c9a73849e94d012ebcfa3588c25097daf0b5ff2857c04e0e1"
+dependencies = [
+ "bech32 0.11.1",
+ "bitcoin 0.32.8",
+ "dnssec-prover",
+ "hashbrown 0.13.2",
+ "libm",
+ "lightning-invoice 0.34.0",
+ "lightning-macros",
+ "lightning-types 0.3.0",
  "possiblyrandom",
 ]
 
 [[package]]
 name = "lightning-background-processor"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04231b97fd7509d73ce9857a416eb1477a55d076d4e22cbf26c649a772bde909"
+checksum = "abdc5450264184deba88b1dc61fa8d2ca905e21748bad556915757ac73d91103"
 dependencies = [
  "bitcoin 0.32.8",
  "bitcoin-io",
  "bitcoin_hashes 0.14.1",
- "lightning",
+ "lightning 0.2.0",
+ "lightning-liquidity",
  "lightning-rapid-gossip-sync",
+ "possiblyrandom",
 ]
 
 [[package]]
 name = "lightning-block-sync"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baab5bdee174a2047d939a4ca0dc2e1c23caa0f8cab0b4380aed77a20e116f1e"
+checksum = "ee5069846b07a62aaecdaf25233e067bc69f245b7c8fd00cc9c217053221f875"
 dependencies = [
  "bitcoin 0.32.8",
  "chunked_transfer",
- "lightning",
+ "lightning 0.2.0",
  "serde_json",
  "tokio",
 ]
@@ -4084,30 +4078,42 @@ checksum = "11209f386879b97198b2bfc9e9c1e5d42870825c6bd4376f17f95357244d6600"
 dependencies = [
  "bech32 0.11.1",
  "bitcoin 0.32.8",
- "lightning-types",
+ "lightning-types 0.2.0",
+]
+
+[[package]]
+name = "lightning-invoice"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b85e5e14bcdb30d746e9785b04f27938292e8944f78f26517e01e91691f6b3f2"
+dependencies = [
+ "bech32 0.11.1",
+ "bitcoin 0.32.8",
+ "lightning-types 0.3.0",
  "serde",
 ]
 
 [[package]]
 name = "lightning-liquidity"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfbed71e656557185f25e006c1bcd8773c5c83387c727166666d3b0bce0f0ca5"
+checksum = "58a6480d4d7726c49b4cd170b18a39563bbe897d0b8960be11d5e4a0cebd43b0"
 dependencies = [
  "bitcoin 0.32.8",
  "chrono",
- "lightning",
- "lightning-invoice",
- "lightning-types",
+ "lightning 0.2.0",
+ "lightning-invoice 0.34.0",
+ "lightning-macros",
+ "lightning-types 0.3.0",
  "serde",
  "serde_json",
 ]
 
 [[package]]
 name = "lightning-macros"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d44a6fb8c698180c758fd391ae9631be92a4dbf0a82121e7dd8b1a28d0cfa75"
+checksum = "80bd6063f4d0c34320f1db9193138c878e64142e6d1c42bd5f0124936e8764ec"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4116,49 +4122,50 @@ dependencies = [
 
 [[package]]
 name = "lightning-net-tokio"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6a6c93b1e592f1d46bb24233cac4a33b4015c99488ee229927a81d16226e45"
+checksum = "8055737e3d2d06240a3fdf10e26b2716110fcea90011a0839e8e82fc6e58ff5e"
 dependencies = [
  "bitcoin 0.32.8",
- "lightning",
+ "lightning 0.2.0",
  "tokio",
 ]
 
 [[package]]
 name = "lightning-persister"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d80558dc398eb4609b1079044d8eb5760a58724627ff57c6d7c194c78906e026"
+checksum = "e6d78990de56ca75c5535c3f8e6f86b183a1aa8f521eb32afb9e8181f3bd91d7"
 dependencies = [
  "bitcoin 0.32.8",
- "lightning",
+ "lightning 0.2.0",
+ "tokio",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "lightning-rapid-gossip-sync"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78dacdef3e2f5d727754f902f4e6bbc43bfc886fec8e71f36757711060916ebe"
+checksum = "b094f79f22713aa95194a166c77b2f6c7d68f9d76622a43552a29b8fe6fa92d0"
 dependencies = [
  "bitcoin 0.32.8",
  "bitcoin-io",
  "bitcoin_hashes 0.14.1",
- "lightning",
+ "lightning 0.2.0",
 ]
 
 [[package]]
 name = "lightning-transaction-sync"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "031493ff20f40c9bbf80dde70ca5bb5ce86f65d6fda939bfecb5a2d59dc54767"
+checksum = "2f16c2cc74a73e29295bb5c0de61f4a0e6fe7151562ebdd48ee9935fcaa59bd8"
 dependencies = [
  "bitcoin 0.32.8",
- "electrum-client 0.21.0",
- "esplora-client 0.11.0",
+ "electrum-client",
+ "esplora-client",
  "futures",
- "lightning",
+ "lightning 0.2.0",
  "lightning-macros",
 ]
 
@@ -4172,6 +4179,15 @@ dependencies = [
 ]
 
 [[package]]
+name = "lightning-types"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5681708d3075bdff3a1b4daa400590e2703e7871bdc14e94ee7334fb6314ae40"
+dependencies = [
+ "bitcoin 0.32.8",
+]
+
+[[package]]
 name = "linux-raw-sys"
 version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4205,7 +4221,7 @@ dependencies = [
  "bitcoincore-rpc",
  "cln-rpc",
  "fedimint-tonic-lnd",
- "lightning",
+ "lightning 0.1.8",
  "serde",
  "serde_json",
  "tempfile",
@@ -4225,7 +4241,7 @@ dependencies = [
  "chrono",
  "futures-util",
  "log",
- "reqwest 0.12.25",
+ "reqwest",
  "serde",
  "serde_json",
  "tokio",
@@ -5780,55 +5796,15 @@ checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "reqwest"
-version = "0.11.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.3.27",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.32",
- "hyper-rustls 0.24.2",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls 0.21.12",
- "rustls-pemfile 1.0.4",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration",
- "tokio",
- "tokio-rustls 0.24.1",
- "tokio-socks",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots 0.25.4",
- "winreg",
-]
-
-[[package]]
-name = "reqwest"
 version = "0.12.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6eff9328d40131d43bd911d42d79eb6a47312002a4daefc9e37f17e74a7701a"
 dependencies = [
  "base64 0.22.1",
  "bytes",
+ "futures-channel",
  "futures-core",
+ "futures-util",
  "http 1.4.0",
  "http-body 1.0.1",
  "http-body-util",
@@ -6916,27 +6892,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.9.4",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
 name = "tagptr"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -8830,19 +8785,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
-name = "vss-client"
-version = "0.3.1"
+name = "vss-client-ng"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d787f7640ceae8caef95434f1b14936402b73e18d34868b052a502a5d5085490"
+checksum = "52c6bf7f2c3e22e62c638ad7d8c48dd5dc7e79033c5e088bdd797bbc815b29bb"
 dependencies = [
  "async-trait",
- "base64 0.21.7",
+ "base64 0.22.1",
  "bitcoin 0.32.8",
  "bitcoin_hashes 0.14.1",
+ "chacha20-poly1305",
  "prost 0.11.9",
  "prost-build 0.11.9",
  "rand 0.8.5",
- "reqwest 0.11.27",
+ "reqwest",
  "serde",
  "serde_json",
  "tokio",

+ 125 - 169
Cargo.lock.msrv

@@ -729,7 +729,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b59a3f7fbe678874fa34354097644a171276e02a49934c13b3d61c54610ddf39"
 dependencies = [
  "bdk_core",
- "electrum-client 0.24.1",
+ "electrum-client",
 ]
 
 [[package]]
@@ -740,7 +740,7 @@ checksum = "0c9f5961444b5f51b9c3937e729a212363d0e4cde6390ded6e01e16292078df4"
 dependencies = [
  "async-trait",
  "bdk_core",
- "esplora-client 0.12.1",
+ "esplora-client",
  "futures",
 ]
 
@@ -1086,8 +1086,8 @@ dependencies = [
  "bitcoin 0.32.8",
  "cbor-diag",
  "ciborium",
- "lightning",
- "lightning-invoice",
+ "lightning 0.2.0",
+ "lightning-invoice 0.34.0",
  "once_cell",
  "regex",
  "serde",
@@ -1176,12 +1176,12 @@ dependencies = [
  "http 0.2.12",
  "hyper 0.14.32",
  "jsonwebtoken",
- "lightning",
- "lightning-invoice",
+ "lightning 0.2.0",
+ "lightning-invoice 0.34.0",
  "nostr-sdk",
  "rand 0.9.2",
  "regex",
- "reqwest 0.12.25",
+ "reqwest",
  "ring 0.17.14",
  "rustls 0.23.35",
  "serde",
@@ -1238,9 +1238,9 @@ dependencies = [
  "cdk-sqlite",
  "clap",
  "home",
- "lightning",
+ "lightning 0.2.0",
  "nostr-sdk",
- "reqwest 0.12.25",
+ "reqwest",
  "serde",
  "serde_json",
  "serde_with",
@@ -1282,8 +1282,8 @@ dependencies = [
  "criterion",
  "futures",
  "getrandom 0.2.16",
- "lightning",
- "lightning-invoice",
+ "lightning 0.2.0",
+ "lightning-invoice 0.34.0",
  "parking_lot",
  "rand 0.9.2",
  "serde",
@@ -1309,9 +1309,9 @@ dependencies = [
  "bitcoin 0.32.8",
  "cdk-common",
  "futures",
- "lightning",
- "lightning-invoice",
- "reqwest 0.12.25",
+ "lightning 0.2.0",
+ "lightning-invoice 0.34.0",
+ "reqwest",
  "serde",
  "serde_json",
  "thiserror 2.0.17",
@@ -1370,11 +1370,11 @@ dependencies = [
  "futures",
  "getrandom 0.2.16",
  "ldk-node",
- "lightning-invoice",
+ "lightning-invoice 0.34.0",
  "ln-regtest-rs",
  "once_cell",
  "rand 0.9.2",
- "reqwest 0.12.25",
+ "reqwest",
  "serde",
  "serde_json",
  "tokio",
@@ -1502,7 +1502,7 @@ dependencies = [
  "config",
  "futures",
  "home",
- "lightning-invoice",
+ "lightning-invoice 0.34.0",
  "serde",
  "tokio",
  "tower 0.5.2",
@@ -1531,8 +1531,8 @@ dependencies = [
  "clap",
  "futures",
  "hex",
- "lightning",
- "lightning-invoice",
+ "lightning 0.2.0",
+ "lightning-invoice 0.34.0",
  "prost 0.13.5",
  "rand 0.9.2",
  "serde",
@@ -1559,7 +1559,7 @@ dependencies = [
  "cdk-common",
  "cdk-sql-common",
  "futures-util",
- "lightning-invoice",
+ "lightning-invoice 0.34.0",
  "native-tls",
  "once_cell",
  "postgres-native-tls",
@@ -1580,7 +1580,7 @@ dependencies = [
  "futures",
  "once_cell",
  "prometheus",
- "reqwest 0.12.25",
+ "reqwest",
  "serde",
  "serde_json",
  "sysinfo",
@@ -1596,7 +1596,7 @@ version = "0.14.0"
 dependencies = [
  "async-trait",
  "cdk-common",
- "lightning-invoice",
+ "lightning-invoice 0.34.0",
  "redb",
  "serde",
  "serde_json",
@@ -1639,7 +1639,7 @@ dependencies = [
  "bitcoin 0.32.8",
  "cdk-common",
  "cdk-prometheus",
- "lightning-invoice",
+ "lightning-invoice 0.34.0",
  "once_cell",
  "serde",
  "serde_json",
@@ -1658,7 +1658,7 @@ dependencies = [
  "cdk-common",
  "cdk-prometheus",
  "cdk-sql-common",
- "lightning-invoice",
+ "lightning-invoice 0.34.0",
  "rusqlite",
  "serde",
  "serde_json",
@@ -1692,6 +1692,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "chacha20-poly1305"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b4b0fc281743d80256607bd65e8beedc42cb0787ea119c85b81b4c0eab85e5f"
+
+[[package]]
 name = "chacha20poly1305"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1822,9 +1828,9 @@ dependencies = [
 
 [[package]]
 name = "cmake"
-version = "0.1.54"
+version = "0.1.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
+checksum = "b042e5d8a74ae91bb0961acd039822472ec99f8ab0948cbf6d1369588f8be586"
 dependencies = [
  "cc",
 ]
@@ -2554,23 +2560,6 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "electrum-client"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a0bd443023f9f5c4b7153053721939accc7113cbdf810a024434eed454b3db1"
-dependencies = [
- "bitcoin 0.32.8",
- "byteorder",
- "libc",
- "log",
- "rustls 0.23.35",
- "serde",
- "serde_json",
- "webpki-roots 0.25.4",
- "winapi",
-]
-
-[[package]]
-name = "electrum-client"
 version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5059f13888a90486e7268bbce59b175f5f76b1c55e5b9c568ceaa42d2b8507c"
@@ -2681,20 +2670,6 @@ dependencies = [
 
 [[package]]
 name = "esplora-client"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0da3c186d286e046253ccdc4bb71aa87ef872e4eff2045947c0c4fe3d2b2efc"
-dependencies = [
- "bitcoin 0.32.8",
- "hex-conservative 0.2.2",
- "log",
- "reqwest 0.11.27",
- "serde",
- "tokio",
-]
-
-[[package]]
-name = "esplora-client"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0af349d96a5d9ad77ba59f1437aa6f348b03c5865d4f7d6e7a662d60aedce39"
@@ -2702,7 +2677,7 @@ dependencies = [
  "bitcoin 0.32.8",
  "hex-conservative 0.2.2",
  "log",
- "reqwest 0.12.25",
+ "reqwest",
  "serde",
  "tokio",
 ]
@@ -3931,9 +3906,9 @@ dependencies = [
 
 [[package]]
 name = "ldk-node"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78165f06c94ecdb568b1850cf075d60049c7b395dce65266ba1362da01511670"
+checksum = "d830ef2d6b00f089fb6e3ac845370ebf0f35f9d11ce81b3a097c1580d2dce358"
 dependencies = [
  "base64 0.22.1",
  "bdk_chain",
@@ -3944,30 +3919,30 @@ dependencies = [
  "bip39",
  "bitcoin 0.32.8",
  "chrono",
- "electrum-client 0.24.1",
- "esplora-client 0.11.0",
- "esplora-client 0.12.1",
+ "electrum-client",
+ "esplora-client",
  "libc",
- "lightning",
+ "lightning 0.2.0",
  "lightning-background-processor",
  "lightning-block-sync",
- "lightning-invoice",
+ "lightning-invoice 0.34.0",
  "lightning-liquidity",
+ "lightning-macros",
  "lightning-net-tokio",
  "lightning-persister",
  "lightning-rapid-gossip-sync",
  "lightning-transaction-sync",
- "lightning-types",
+ "lightning-types 0.3.0",
  "log",
  "prost 0.11.9",
- "rand 0.8.5",
- "reqwest 0.12.25",
+ "rand 0.9.2",
+ "reqwest",
  "rusqlite",
  "rustls 0.23.35",
  "serde",
  "serde_json",
  "tokio",
- "vss-client",
+ "vss-client-ng",
  "winapi",
 ]
 
@@ -4045,33 +4020,52 @@ dependencies = [
  "dnssec-prover",
  "hashbrown 0.13.2",
  "libm",
- "lightning-invoice",
- "lightning-types",
+ "lightning-invoice 0.33.2",
+ "lightning-types 0.2.0",
+ "possiblyrandom",
+]
+
+[[package]]
+name = "lightning"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4342d07db2b3fe7c9a73849e94d012ebcfa3588c25097daf0b5ff2857c04e0e1"
+dependencies = [
+ "bech32 0.11.1",
+ "bitcoin 0.32.8",
+ "dnssec-prover",
+ "hashbrown 0.13.2",
+ "libm",
+ "lightning-invoice 0.34.0",
+ "lightning-macros",
+ "lightning-types 0.3.0",
  "possiblyrandom",
 ]
 
 [[package]]
 name = "lightning-background-processor"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04231b97fd7509d73ce9857a416eb1477a55d076d4e22cbf26c649a772bde909"
+checksum = "abdc5450264184deba88b1dc61fa8d2ca905e21748bad556915757ac73d91103"
 dependencies = [
  "bitcoin 0.32.8",
  "bitcoin-io",
  "bitcoin_hashes 0.14.1",
- "lightning",
+ "lightning 0.2.0",
+ "lightning-liquidity",
  "lightning-rapid-gossip-sync",
+ "possiblyrandom",
 ]
 
 [[package]]
 name = "lightning-block-sync"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baab5bdee174a2047d939a4ca0dc2e1c23caa0f8cab0b4380aed77a20e116f1e"
+checksum = "ee5069846b07a62aaecdaf25233e067bc69f245b7c8fd00cc9c217053221f875"
 dependencies = [
  "bitcoin 0.32.8",
  "chunked_transfer",
- "lightning",
+ "lightning 0.2.0",
  "serde_json",
  "tokio",
 ]
@@ -4084,30 +4078,42 @@ checksum = "11209f386879b97198b2bfc9e9c1e5d42870825c6bd4376f17f95357244d6600"
 dependencies = [
  "bech32 0.11.1",
  "bitcoin 0.32.8",
- "lightning-types",
+ "lightning-types 0.2.0",
+]
+
+[[package]]
+name = "lightning-invoice"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b85e5e14bcdb30d746e9785b04f27938292e8944f78f26517e01e91691f6b3f2"
+dependencies = [
+ "bech32 0.11.1",
+ "bitcoin 0.32.8",
+ "lightning-types 0.3.0",
  "serde",
 ]
 
 [[package]]
 name = "lightning-liquidity"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfbed71e656557185f25e006c1bcd8773c5c83387c727166666d3b0bce0f0ca5"
+checksum = "58a6480d4d7726c49b4cd170b18a39563bbe897d0b8960be11d5e4a0cebd43b0"
 dependencies = [
  "bitcoin 0.32.8",
  "chrono",
- "lightning",
- "lightning-invoice",
- "lightning-types",
+ "lightning 0.2.0",
+ "lightning-invoice 0.34.0",
+ "lightning-macros",
+ "lightning-types 0.3.0",
  "serde",
  "serde_json",
 ]
 
 [[package]]
 name = "lightning-macros"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d44a6fb8c698180c758fd391ae9631be92a4dbf0a82121e7dd8b1a28d0cfa75"
+checksum = "80bd6063f4d0c34320f1db9193138c878e64142e6d1c42bd5f0124936e8764ec"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4116,49 +4122,50 @@ dependencies = [
 
 [[package]]
 name = "lightning-net-tokio"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6a6c93b1e592f1d46bb24233cac4a33b4015c99488ee229927a81d16226e45"
+checksum = "8055737e3d2d06240a3fdf10e26b2716110fcea90011a0839e8e82fc6e58ff5e"
 dependencies = [
  "bitcoin 0.32.8",
- "lightning",
+ "lightning 0.2.0",
  "tokio",
 ]
 
 [[package]]
 name = "lightning-persister"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d80558dc398eb4609b1079044d8eb5760a58724627ff57c6d7c194c78906e026"
+checksum = "e6d78990de56ca75c5535c3f8e6f86b183a1aa8f521eb32afb9e8181f3bd91d7"
 dependencies = [
  "bitcoin 0.32.8",
- "lightning",
+ "lightning 0.2.0",
+ "tokio",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "lightning-rapid-gossip-sync"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78dacdef3e2f5d727754f902f4e6bbc43bfc886fec8e71f36757711060916ebe"
+checksum = "b094f79f22713aa95194a166c77b2f6c7d68f9d76622a43552a29b8fe6fa92d0"
 dependencies = [
  "bitcoin 0.32.8",
  "bitcoin-io",
  "bitcoin_hashes 0.14.1",
- "lightning",
+ "lightning 0.2.0",
 ]
 
 [[package]]
 name = "lightning-transaction-sync"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "031493ff20f40c9bbf80dde70ca5bb5ce86f65d6fda939bfecb5a2d59dc54767"
+checksum = "2f16c2cc74a73e29295bb5c0de61f4a0e6fe7151562ebdd48ee9935fcaa59bd8"
 dependencies = [
  "bitcoin 0.32.8",
- "electrum-client 0.21.0",
- "esplora-client 0.11.0",
+ "electrum-client",
+ "esplora-client",
  "futures",
- "lightning",
+ "lightning 0.2.0",
  "lightning-macros",
 ]
 
@@ -4172,6 +4179,15 @@ dependencies = [
 ]
 
 [[package]]
+name = "lightning-types"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5681708d3075bdff3a1b4daa400590e2703e7871bdc14e94ee7334fb6314ae40"
+dependencies = [
+ "bitcoin 0.32.8",
+]
+
+[[package]]
 name = "linux-raw-sys"
 version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4205,7 +4221,7 @@ dependencies = [
  "bitcoincore-rpc",
  "cln-rpc",
  "fedimint-tonic-lnd",
- "lightning",
+ "lightning 0.1.8",
  "serde",
  "serde_json",
  "tempfile",
@@ -4225,7 +4241,7 @@ dependencies = [
  "chrono",
  "futures-util",
  "log",
- "reqwest 0.12.25",
+ "reqwest",
  "serde",
  "serde_json",
  "tokio",
@@ -5780,55 +5796,15 @@ checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "reqwest"
-version = "0.11.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.3.27",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.32",
- "hyper-rustls 0.24.2",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls 0.21.12",
- "rustls-pemfile 1.0.4",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration",
- "tokio",
- "tokio-rustls 0.24.1",
- "tokio-socks",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots 0.25.4",
- "winreg",
-]
-
-[[package]]
-name = "reqwest"
 version = "0.12.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6eff9328d40131d43bd911d42d79eb6a47312002a4daefc9e37f17e74a7701a"
 dependencies = [
  "base64 0.22.1",
  "bytes",
+ "futures-channel",
  "futures-core",
+ "futures-util",
  "http 1.4.0",
  "http-body 1.0.1",
  "http-body-util",
@@ -6916,27 +6892,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.9.4",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
 name = "tagptr"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -8830,19 +8785,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
-name = "vss-client"
-version = "0.3.1"
+name = "vss-client-ng"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d787f7640ceae8caef95434f1b14936402b73e18d34868b052a502a5d5085490"
+checksum = "52c6bf7f2c3e22e62c638ad7d8c48dd5dc7e79033c5e088bdd797bbc815b29bb"
 dependencies = [
  "async-trait",
- "base64 0.21.7",
+ "base64 0.22.1",
  "bitcoin 0.32.8",
  "bitcoin_hashes 0.14.1",
+ "chacha20-poly1305",
  "prost 0.11.9",
  "prost-build 0.11.9",
  "rand 0.8.5",
- "reqwest 0.11.27",
+ "reqwest",
  "serde",
  "serde_json",
  "tokio",

+ 3 - 3
Cargo.toml

@@ -68,9 +68,9 @@ cbor-diag = "0.1.12"
 config = { version = "0.15.11", features = ["toml"] }
 criterion = "0.6.0"
 futures = { version = "0.3.28", default-features = false, features = ["async-await"] }
-lightning-invoice = { version = "0.33.0", features = ["serde", "std"] }
-lightning = { version = "0.1.2", default-features = false, features = ["std"]}
-ldk-node = "0.6.2"
+lightning-invoice = { version = "0.34.0", features = ["serde", "std"] }
+lightning = { version = "0.2.0", default-features = false, features = ["std"]}
+ldk-node = "0.7.0"
 serde = { version = "1", features = ["derive", "rc"] }
 serde_json = "1"
 thiserror = { version = "2" }

+ 1 - 1
crates/cashu/src/amount.rs

@@ -372,7 +372,7 @@ pub fn amount_for_offer(offer: &Offer, unit: &CurrencyUnit) -> Result<Amount, Er
             amount,
         } => (
             amount,
-            CurrencyUnit::from_str(&String::from_utf8(iso4217_code.to_vec())?)
+            CurrencyUnit::from_str(&String::from_utf8(iso4217_code.as_bytes().to_vec())?)
                 .map_err(|_| Error::CannotConvertUnits)?,
         ),
     };

+ 0 - 1
crates/cdk-integration-tests/src/bin/start_regtest.rs

@@ -69,7 +69,6 @@ async fn main() -> Result<()> {
             addr: [127, 0, 0, 1],
             port: 8092,
         }],
-        None,
     )?;
 
     let inner_node = cdk_ldk.node();

+ 0 - 1
crates/cdk-integration-tests/src/bin/start_regtest_mints.rs

@@ -355,7 +355,6 @@ fn main() -> Result<()> {
                 addr: [127, 0, 0, 1],
                 port: 8092,
             }],
-            Some(Arc::clone(&rt_clone)),
         )?;
 
         let inner_node = cdk_ldk.node();

+ 11 - 22
crates/cdk-ldk-node/src/lib.rs

@@ -18,11 +18,11 @@ use ldk_node::bitcoin::hashes::Hash;
 use ldk_node::bitcoin::Network;
 use ldk_node::lightning::ln::channelmanager::PaymentId;
 use ldk_node::lightning::ln::msgs::SocketAddress;
+use ldk_node::lightning::routing::router::RouteParametersConfig;
 use ldk_node::lightning_invoice::{Bolt11InvoiceDescription, Description};
 use ldk_node::lightning_types::payment::PaymentHash;
-use ldk_node::payment::{PaymentDirection, PaymentKind, PaymentStatus, SendingParameters};
+use ldk_node::payment::{PaymentDirection, PaymentKind, PaymentStatus};
 use ldk_node::{Builder, Event, Node};
-use tokio::runtime::Runtime;
 use tokio_stream::wrappers::BroadcastStream;
 use tokio_util::sync::CancellationToken;
 use tracing::instrument;
@@ -45,7 +45,6 @@ pub struct CdkLdkNode {
     sender: tokio::sync::broadcast::Sender<WaitPaymentResponse>,
     receiver: Arc<tokio::sync::broadcast::Receiver<WaitPaymentResponse>>,
     events_cancel_token: CancellationToken,
-    runtime: Option<Arc<Runtime>>,
     web_addr: Option<SocketAddr>,
 }
 
@@ -120,7 +119,6 @@ impl CdkLdkNode {
         storage_dir_path: String,
         fee_reserve: FeeReserve,
         listening_address: Vec<SocketAddress>,
-        runtime: Option<Arc<Runtime>>,
     ) -> Result<Self, Error> {
         let mut builder = Builder::new();
         builder.set_network(network);
@@ -178,7 +176,6 @@ impl CdkLdkNode {
             sender,
             receiver: Arc::new(receiver),
             events_cancel_token: CancellationToken::new(),
-            runtime,
             web_addr: None,
         })
     }
@@ -210,16 +207,8 @@ impl CdkLdkNode {
     /// # Errors
     /// Returns an error if the LDK node fails to start or event handling setup fails
     pub fn start_ldk_node(&self) -> Result<(), Error> {
-        match &self.runtime {
-            Some(runtime) => {
-                tracing::info!("Starting cdk-ldk node with existing runtime");
-                self.inner.start_with_runtime(Arc::clone(runtime))?
-            }
-            None => {
-                tracing::info!("Starting cdk-ldk-node with new runtime");
-                self.inner.start()?
-            }
-        };
+        tracing::info!("Starting cdk-ldk node");
+        self.inner.start()?;
         let node_config = self.inner.config();
 
         tracing::info!("Starting node with network {}", node_config.network);
@@ -653,11 +642,11 @@ impl MintPayment for CdkLdkNode {
                 let send_params = match bolt11_options
                     .max_fee_amount
                     .map(|f| {
-                        to_unit(f, unit, &CurrencyUnit::Msat).map(|amount_msat| SendingParameters {
-                            max_total_routing_fee_msat: Some(Some(amount_msat.into())),
-                            max_channel_saturation_power_of_half: None,
-                            max_total_cltv_expiry_delta: None,
-                            max_path_count: None,
+                        to_unit(f, unit, &CurrencyUnit::Msat).map(|amount_msat| {
+                            RouteParametersConfig {
+                                max_total_routing_fee_msat: Some(amount_msat.into()),
+                                ..Default::default()
+                            }
                         })
                     })
                     .transpose()
@@ -751,12 +740,12 @@ impl MintPayment for CdkLdkNode {
                     Some(MeltOptions::Amountless { amountless }) => self
                         .inner
                         .bolt12_payment()
-                        .send_using_amount(&offer, amountless.amount_msat.into(), None, None)
+                        .send_using_amount(&offer, amountless.amount_msat.into(), None, None, None)
                         .map_err(Error::LdkNode)?,
                     None => self
                         .inner
                         .bolt12_payment()
-                        .send(&offer, None, None)
+                        .send(&offer, None, None, None)
                         .map_err(Error::LdkNode)?,
                     _ => return Err(payment::Error::UnsupportedPaymentOption),
                 };

+ 12 - 6
crates/cdk-ldk-node/src/web/handlers/payments.rs

@@ -545,7 +545,11 @@ pub async fn post_pay_bolt12(
     let payment_id = match offer.amount() {
         Some(_) => {
             // Fixed amount offer - use send() method, ignore user input amount
-            state.node.inner.bolt12_payment().send(&offer, None, None)
+            state
+                .node
+                .inner
+                .bolt12_payment()
+                .send(&offer, None, None, None)
         }
         None => {
             // Variable amount offer - requires user to specify amount via send_using_amount()
@@ -569,11 +573,13 @@ pub async fn post_pay_bolt12(
                 }
             };
             let amount_msats = amount_btc * 1_000;
-            state
-                .node
-                .inner
-                .bolt12_payment()
-                .send_using_amount(&offer, amount_msats, None, None)
+            state.node.inner.bolt12_payment().send_using_amount(
+                &offer,
+                amount_msats,
+                None,
+                None,
+                None,
+            )
         }
     };
 

+ 1 - 2
crates/cdk-mintd/src/setup.rs

@@ -235,7 +235,7 @@ impl LnBackendSetup for config::LdkNode {
         &self,
         _settings: &Settings,
         _unit: CurrencyUnit,
-        runtime: Option<std::sync::Arc<tokio::runtime::Runtime>>,
+        _runtime: Option<std::sync::Arc<tokio::runtime::Runtime>>,
         work_dir: &Path,
         _kv_store: Option<Arc<dyn MintKVStore<Err = cdk::cdk_database::Error> + Send + Sync>>,
     ) -> anyhow::Result<cdk_ldk_node::CdkLdkNode> {
@@ -337,7 +337,6 @@ impl LnBackendSetup for config::LdkNode {
             storage_dir_path,
             fee_reserve,
             listen_address,
-            runtime,
         )?;
 
         // Configure webserver address if specified