aljaz/cdk
1
0
Fork 0
mirror of https://github.com/aljazceru/cdk.git synced 2026-02-23 14:06:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: mint/quote v1 urls

Browse Source
This commit is contained in:
thesimplekid
2023-12-27 21:02:32 +00:00
parent 40f6bc6bd9
commit 2508f4ed36
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/cashu-sdk/src/client/gloo_client.rs
View File

@@ -62,7 +62,7 @@ impl Client for HttpClient {
amount: Amount,
unit: CurrencyUnit,
) -> Result<MintQuoteBolt11Response, Error> {
let url = join_url(mint_url, &["v1", "quote", "bolt11"])?;
let url = join_url(mint_url, &["v1", "mint", "quote", "bolt11"])?;
let request = MintQuoteBolt11Request { amount, unit };
let res = Request::post(url.as_str())
@@ -91,7 +91,7 @@ impl Client for HttpClient {
quote: &str,
premint_secrets: PreMintSecrets,
) -> Result<MintBolt11Response, Error> {
let url = join_url(mint_url, &["v1", "mint"])?;
let url = join_url(mint_url, &["v1", "mint", "bolt11"])?;
let request = MintBolt11Request {
quote: quote.to_string(),
@@ -126,7 +126,7 @@ impl Client for HttpClient {
inputs: Vec<Proof>,
outputs: Option<Vec<BlindedMessage>>,
) -> Result<MeltBolt11Response, Error> {
let url = join_url(mint_url, &["melt"])?;
let url = join_url(mint_url, &["v1", "melt", "bolt11"])?;
let request = MeltBolt11Request {
quote,

30
crates/cashu-sdk/src/client/minreq_client.rs
View File

@@ -4,8 +4,9 @@ use std::println;
use async_trait::async_trait;
use cashu::nuts::{
BlindedMessage, Keys, MeltBolt11Request, MeltBolt11Response, MintBolt11Request,
MintBolt11Response, MintInfo, PreMintSecrets, Proof, SwapRequest, SwapResponse, *,
nut00, BlindedMessage, CurrencyUnit, Keys, KeysResponse, KeysetResponse, MeltBolt11Request,
MeltBolt11Response, MintBolt11Request, MintBolt11Response, MintInfo, MintQuoteBolt11Request,
MintQuoteBolt11Response, PreMintSecrets, Proof, SwapRequest, SwapResponse,
};
#[cfg(feature = "nut07")]
use cashu::nuts::{CheckSpendableRequest, CheckSpendableResponse};
@@ -27,8 +28,10 @@ impl Client for HttpClient {
let url = join_url(mint_url, &["v1", "keys"])?;
let keys = minreq::get(url).send()?.json::<Value>()?;
let keys: Keys = serde_json::from_str(&keys.to_string())?;
Ok(keys)
println!("{}", keys);
let keys: KeysResponse = serde_json::from_str(&keys.to_string())?;
Ok(keys.keysets[0].keys.clone())
}
/// Get Keysets [NUT-02]
@@ -52,23 +55,22 @@ impl Client for HttpClient {
amount: Amount,
unit: CurrencyUnit,
) -> Result<MintQuoteBolt11Response, Error> {
let url = join_url(mint_url, &["v1", "quote", "bolt11"])?;
let url = join_url(mint_url, &["v1", "mint", "quote", "bolt11"])?;
let request = MintQuoteBolt11Request { amount, unit };
let res = minreq::post(url)
.with_json(&request)?
.send()?
.json::<Value>()?;
let res = minreq::post(url).with_json(&request)?.send()?;
print!("r: {:?}", res);
let response: Result<MintQuoteBolt11Response, serde_json::Error> =
serde_json::from_value(res.clone());
serde_json::from_value(res.json()?);
match response {
Ok(res) => Ok(res),
Err(_) => {
warn!("Bolt11 Mint Quote Unexpected response: {}", res);
Err(Error::from_json(&res.to_string())?)
warn!("Bolt11 Mint Quote Unexpected response: {:?}", res);
Err(Error::from_json(&res.status_code.to_string())?)
}
}
}
@@ -80,7 +82,7 @@ impl Client for HttpClient {
quote: &str,
premint_secrets: PreMintSecrets,
) -> Result<MintBolt11Response, Error> {
let url = join_url(mint_url, &["v1", "mint"])?;
let url = join_url(mint_url, &["v1", "mint", "bolt11"])?;
let request = MintBolt11Request {
quote: quote.to_string(),
@@ -110,7 +112,7 @@ impl Client for HttpClient {
inputs: Vec<Proof>,
outputs: Option<Vec<BlindedMessage>>,
) -> Result<MeltBolt11Response, Error> {
let url = join_url(mint_url, &["v1", "melt"])?;
let url = join_url(mint_url, &["v1", "melt", "bolt11"])?;
let request = MeltBolt11Request {
quote,

1
crates/cashu/Cargo.toml
View File

@@ -26,6 +26,7 @@ bitcoin = { version = "0.30.0", features=["serde", "rand"] }
hex = "0.4.3"
k256 = { version = "0.13.1", features=["arithmetic", "serde", "schnorr"] }
lightning-invoice = { version = "0.25.0", features=["serde"] }
log = "0.4.2"
rand = "0.8.5"
getrandom = { version = "0.2", features = ["js"] }
serde = { workspace = true }