Skip to content
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

update moksha #19

Closed
wants to merge 2 commits into from
Closed

update moksha #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92aaba2
update moksha
elnosh Feb 16, 2024
1456c4a
add test for cashu token parsing
elnosh Feb 16, 2024
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
2 changes: 1 addition & 1 deletion waila/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ lightning = { version = "0.0.121", default-features = false }
rgb-std = { version = "0.10.9", optional = true }
rgb-wallet = { version = "0.10.9", optional = true }
url = "2.4.1"
moksha-core = "0.1.2"
moksha-core = { git = "https://github.com/ngutech21/moksha", rev = "1fca7d2223ab8fb1735408f4fcd42eb1891b16d4" }

[features]
default = ["std"]
Expand Down
20 changes: 19 additions & 1 deletion waila/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use lightning::offers::refund::Refund;
use lightning_invoice::{Bolt11Invoice, Bolt11InvoiceDescription};
use lnurl::lightning_address::LightningAddress;
use lnurl::lnurl::LnUrl;
use moksha_core::model::TokenV3;
use moksha_core::token::TokenV3;
use nostr::FromBech32;

#[cfg(feature = "rgb")]
Expand Down Expand Up @@ -485,6 +485,8 @@ mod tests {
const SAMPLE_FEDI_INVITE_CODE: &str = "fed11jpr3lgm8tuhcky2r3g287tgk9du7dd7kr95fptdsmkca7cwcvyu0lyqeh0e6rgp4u0shxsfaxycpwqpfwaehxw309askcurgvyhx6at5d9h8jmn9wsknqvfwv3jhvtnxv4jxjcn5vvhxxmmd9udpnpn49yg9w98dejw9u76hmm9";
const SAMPLE_NWA: &str = "nostr+walletauth://b889ff5b1513b641e2a139f661a661364979c5beee91842f8f0ef42ab558e9d4?relay=wss%3A%2F%2Frelay.damus.io&secret=b8a30fafa48d4795b6c0eec169a383de&required_commands=pay_invoice&optional_commands=get_balance&budget=10000%2Fdaily";
const SAMPLE_CASHU_TOKEN: &str = "cashuAeyJ0b2tlbiI6W3sibWludCI6Imh0dHBzOi8vODMzMy5zcGFjZTozMzM4IiwicHJvb2ZzIjpbeyJhbW91bnQiOjIsImlkIjoiMDA5YTFmMjkzMjUzZTQxZSIsInNlY3JldCI6IjQwNzkxNWJjMjEyYmU2MWE3N2UzZTZkMmFlYjRjNzI3OTgwYmRhNTFjZDA2YTZhZmMyOWUyODYxNzY4YTc4MzciLCJDIjoiMDJiYzkwOTc5OTdkODFhZmIyY2M3MzQ2YjVlNDM0NWE5MzQ2YmQyYTUwNmViNzk1ODU5OGE3MmYwY2Y4NTE2M2VhIn0seyJhbW91bnQiOjgsImlkIjoiMDA5YTFmMjkzMjUzZTQxZSIsInNlY3JldCI6ImZlMTUxMDkzMTRlNjFkNzc1NmIwZjhlZTBmMjNhNjI0YWNhYTNmNGUwNDJmNjE0MzNjNzI4YzcwNTdiOTMxYmUiLCJDIjoiMDI5ZThlNTA1MGI4OTBhN2Q2YzA5NjhkYjE2YmMxZDVkNWZhMDQwZWExZGUyODRmNmVjNjlkNjEyOTlmNjcxMDU5In1dfV0sInVuaXQiOiJzYXQiLCJtZW1vIjoiVGhhbmsgeW91LiJ9";
const SAMPLE_CASHU_TOKEN_NO_PAD: &str = "cashuAeyJ0b2tlbiI6W3sibWludCI6Imh0dHBzOi8vODMzMy5zcGFjZTozMzM4IiwicHJvb2ZzIjpbeyJpZCI6IjAwNzU5ZTNmOGIwNmIzNmYiLCJhbW91bnQiOjEsInNlY3JldCI6IjRvRllDQkpKMGRRK1p3L1BqWlFuTDc2WVhEL1Zjb3l3bk9xazA4dkxkUzQ9IiwiQyI6IjAyYTNkZWUyZWEzMmY2ZDQ1YWFmNDQzMTUyNjhmYWFmMzllYjU5ZGI3NmE4OTE3YmY3ZDA5NmFmMDM1MzdhZGYwOSJ9LHsiaWQiOiIwMDc1OWUzZjhiMDZiMzZmIiwiYW1vdW50IjoxLCJzZWNyZXQiOiJNSjg5K2JDdTZrOFU2bGo2bGNqTzcxMUZuUm1sUmZuWlllSFhnS0o4RmNZPSIsIkMiOiIwMzQxZTU4MjBlNGZlODBkOWVmMDJhOWM4MjQ5ZTAyZjVkNDg5ZGUyMWU4N2QwYzUwMjQ2NGQ1ZmI5ZTRkYzY2NDIifV19XSwibWVtbyI6IlNlbnQgdmlhIGVOdXRzLiJ9";

#[cfg(feature = "rgb")]
const SAMPLE_RGB_INVOICE: &str = "rgb:Cbw1h3zbHgRhA6sxb4FS3Z7GTpdj9MLb7Do88qh5TUH1/RGB20/1+utxob0KPoUVTWL3WqyY6zsJY5giaugWHt5n4hEeWMQymQJmPRFPXL2n";

Expand Down Expand Up @@ -847,6 +849,22 @@ mod tests {
)
}

#[test]
fn parse_cashu_token_no_pad() {
let parsed = PaymentParams::from_str(SAMPLE_CASHU_TOKEN_NO_PAD).unwrap();

assert_eq!(parsed.address(), None);
assert_eq!(parsed.memo(), None);
assert_eq!(parsed.network(), None);
assert_eq!(parsed.invoice(), None);
assert_eq!(parsed.node_pubkey(), None);
assert_eq!(parsed.amount(), Some(Amount::from_sat(2)));
assert_eq!(
parsed.cashu_token(),
Some(TokenV3::try_from(SAMPLE_CASHU_TOKEN_NO_PAD.to_string()).unwrap())
)
}

#[test]
fn parse_nwa() {
let parsed = PaymentParams::from_str(SAMPLE_NWA).unwrap();
Expand Down
Loading