diff --git a/crates/cdk-cln/Cargo.toml b/crates/cdk-cln/Cargo.toml index 0131c165..534ac0f0 100644 --- a/crates/cdk-cln/Cargo.toml +++ b/crates/cdk-cln/Cargo.toml @@ -13,7 +13,7 @@ description = "CDK ln backend for cln" async-trait = "0.1" bitcoin = { version = "0.32.2", default-features = false } cdk = { path = "../cdk", version = "0.6.0", default-features = false, features = ["mint"] } -cln-rpc = "0.2.0" +cln-rpc = "0.3.0" futures = { version = "0.3.28", default-features = false } tokio = { version = "1", default-features = false } tokio-util = { version = "0.7.11", default-features = false } diff --git a/crates/cdk-cln/src/lib.rs b/crates/cdk-cln/src/lib.rs index 1d5f076b..a5cde64f 100644 --- a/crates/cdk-cln/src/lib.rs +++ b/crates/cdk-cln/src/lib.rs @@ -418,6 +418,9 @@ impl MintLightning for Cln { payment_hash: Some(payment_hash.parse().map_err(|_| Error::InvalidHash)?), bolt11: None, status: None, + start: None, + index: None, + limit: None, })) .await .map_err(Error::from)?; diff --git a/crates/cdk-integration-tests/Cargo.toml b/crates/cdk-integration-tests/Cargo.toml index 064c363c..6914fc00 100644 --- a/crates/cdk-integration-tests/Cargo.toml +++ b/crates/cdk-integration-tests/Cargo.toml @@ -34,7 +34,7 @@ uuid = { version = "1", features = ["v4"] } serde = "1" serde_json = "1" # ln-regtest-rs = { path = "../../../../ln-regtest-rs" } -ln-regtest-rs = { git = "https://github.com/thesimplekid/ln-regtest-rs", rev = "e0ac418675" } +ln-regtest-rs = { git = "https://github.com/thesimplekid/ln-regtest-rs", rev = "166038b5" } lightning-invoice = { version = "0.32.0", features = ["serde", "std"] } tracing = { version = "0.1", default-features = false, features = [ "attributes", diff --git a/crates/cdk-integration-tests/src/bin/regtest_mint.rs b/crates/cdk-integration-tests/src/bin/regtest_mint.rs index 5bd2c9d5..27faddb1 100644 --- a/crates/cdk-integration-tests/src/bin/regtest_mint.rs +++ b/crates/cdk-integration-tests/src/bin/regtest_mint.rs @@ -75,6 +75,7 @@ async fn main() -> Result<()> { let mut lnd = init_lnd().await; lnd.start_lnd().unwrap(); + tracing::info!("Started lnd node"); let lnd_client = init_lnd_client().await.unwrap(); diff --git a/crates/cdk-integration-tests/src/init_mint.rs b/crates/cdk-integration-tests/src/init_mint.rs index e2475f7e..0ca0d883 100644 --- a/crates/cdk-integration-tests/src/init_mint.rs +++ b/crates/cdk-integration-tests/src/init_mint.rs @@ -26,7 +26,7 @@ pub async fn start_mint(addr: &str, port: u16, mint: Mint) -> Result<()> { async move { mint.wait_for_paid_invoices(shutdown).await } }); - println!("Staring Axum server"); + tracing::info!("Staring Axum server"); axum::Server::bind(&format!("{}:{}", addr, port).as_str().parse().unwrap()) .serve(mint_service.into_make_service()) .await?; diff --git a/flake.lock b/flake.lock index 06b08ea8..dc6e7eba 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1736101677, - "narHash": "sha256-iKOPq86AOWCohuzxwFy/MtC8PcSVGnrxBOvxpjpzrAY=", + "lastModified": 1737250794, + "narHash": "sha256-bdIPhvsAKyYQzqAIeay4kOxTHGwLGkhM+IlBIsmMYFI=", "owner": "ipetkov", "repo": "crane", - "rev": "61ba163d85e5adeddc7b3a69bb174034965965b2", + "rev": "c5b7075f4a6d523fe8204618aa9754e56478c0e0", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "rust-analyzer-src": [] }, "locked": { - "lastModified": 1736145356, - "narHash": "sha256-XCmys9ELmm1w3+vDhoO9CQOS3/qBY4D1VzFnDpC8uPQ=", + "lastModified": 1737527504, + "narHash": "sha256-Z8S5gLPdIYeKwBXDaSxlJ72ZmiilYhu3418h3RSQZA0=", "owner": "nix-community", "repo": "fenix", - "rev": "bcbb8d5046d6ca9e35eb54f4d36f303ac9bd89e8", + "rev": "aa13f23e3e91b95377a693ac655bbc6545ebec0d", "type": "github" }, "original": { @@ -93,16 +93,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", + "lastModified": 1737404927, + "narHash": "sha256-e1WgPJpIYbOuokjgylcsuoEUCB4Jl2rQXa2LUD6XAG8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", + "rev": "ae584d90cbd0396a422289ee3efb1f1c9d141dc3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -130,11 +130,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1736130662, - "narHash": "sha256-z+WGez9oTR2OsiUWE5ZhIpETqM1ogrv6Xcd24WFi6KQ=", + "lastModified": 1737512878, + "narHash": "sha256-dgF6htdmfNnZzVInifks6npnCAyVsIHWSpWNs10RSW0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2f5d4d9cd31cc02c36e51cb2e21c4b25c4f78c52", + "rev": "06b8ed0eee289fe94c66f1202ced9a6a2c59a14c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0ecd721e..f8d3fb20 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "CDK Flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; rust-overlay = { url = "github:oxalica/rust-overlay";