Skip to content

Switch to bitreq::Url #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tankyleo merged 1 commit into from
Feb 18, 2026
Merged

Switch to bitreq::Url #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,16 @@ build = "build.rs"

[features]
default = ["lnurl-auth", "sigs-auth"]
lnurl-auth = ["dep:bitcoin", "dep:url", "dep:serde", "dep:serde_json"]
lnurl-auth = ["dep:bitcoin", "dep:serde", "dep:serde_json"]
sigs-auth = ["dep:bitcoin"]

[dependencies]
prost = "0.11.6"
bitreq = { version = "0.3", default-features = false, features = ["async-https"] }
bitreq = { version = "0.3.4", default-features = false, features = ["async-https"] }
tokio = { version = "1", default-features = false, features = ["time"] }
rand = "0.8.5"
async-trait = "0.1.77"
bitcoin = { version = "0.32.2", default-features = false, features = ["std", "rand-std"], optional = true }
url = { version = "2.5.0", default-features = false, optional = true, features = ["std"] }
base64 = { version = "0.22", default-features = false, features = ["std"]}
serde = { version = "1.0.196", default-features = false, features = ["serde_derive"], optional = true }
serde_json = { version = "1.0.113", default-features = false, features = ["std"], optional = true }
Expand Down
13 changes: 7 additions & 6 deletions src/headers/lnurl_auth_jwt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ use bitcoin::hashes::sha256;
use bitcoin::hashes::{Hash, HashEngine, Hmac, HmacEngine};
use bitcoin::secp256k1::{Message, Secp256k1, SignOnly};
use bitcoin::PrivateKey;
use bitreq::Url;
use serde::Deserialize;
use std::collections::HashMap;
use std::sync::RwLock;
use std::time::{Duration, SystemTime};
use url::Url;

// Derivation index of the hashing private key as defined by LUD-05.
const HASHING_DERIVATION_INDEX: u32 = 0;
Expand Down Expand Up @@ -195,7 +195,7 @@ fn sign_lnurl(
error: format!("invalid lnurl: {}", lnurl_str.escape_debug()),
};
let mut lnurl = Url::parse(lnurl_str).map_err(|_| invalid_lnurl())?;
let domain = lnurl.domain().ok_or(invalid_lnurl())?;
let domain = lnurl.base_url();
let k1_str = lnurl
.query_pairs()
.find(|(k, _)| k == K1_QUERY_PARAM)
Expand All @@ -218,10 +218,11 @@ fn sign_lnurl(
let sig = engine.sign_ecdsa(&message, &linking_private_key.inner);

// Compose LNURL with signature and linking public key.
lnurl
.query_pairs_mut()
.append_pair(SIG_QUERY_PARAM, &sig.serialize_der().to_string())
.append_pair(KEY_QUERY_PARAM, &linking_public_key.to_string());
let serialized_sig = sig.serialize_der().to_string();
let serialized_pubkey = linking_public_key.to_string();
let query_params =
[(SIG_QUERY_PARAM, serialized_sig.as_str()), (KEY_QUERY_PARAM, serialized_pubkey.as_str())];
lnurl.append_query_params(query_params.into_iter());
Ok(lnurl.to_string())
}

Expand Down
Loading