portal-app-demo,portal-cli: fix new Amount type

Author: denmeh

.gitignore

@@ -11,3 +11,5 @@ react-native/portal-app-lib-*.tgz
 
 result
 examples/.env
+
+.cursor/

Cargo.lock

@@ -34,7 +34,7 @@ use portal::protocol::model::auth::AuthResponseStatus;
 use portal::protocol::model::bindings::PublicKey;
 use portal::utils::fetch_nip05_profile;
 use portal::protocol::model::payment::{
-    Currency, ExchangeRate, InvoiceRequestContentWithKey, PaymentResponseContent, PaymentStatus,
+    Amount, Currency, ExchangeRate, InvoiceRequestContentWithKey, PaymentResponseContent, PaymentStatus
 };
 use portal_wallet::{NwcWallet, PortalWallet};
 use serde::{Deserialize, Serialize};
@@ -143,7 +143,7 @@ impl From<Profile> for ProfileDto {
 struct PaymentRequestDto {
     request_id: String,
     event_id: String,
-    amount: u64,
+    amount: Amount,
     amount_formatted: String,
     is_fiat: bool,
     currency: String,
@@ -167,7 +167,7 @@ struct ExchangeRateDto {
 #[derive(Serialize, Clone)]
 struct InvoiceRequestDto {
     request_id: String,
-    amount: u64,
+    amount: Amount,
     amount_formatted: String,
     is_fiat: bool,
     currency: String,
@@ -258,11 +258,11 @@ fn single_request_to_dto(r: &SinglePaymentRequest) -> PaymentRequestDto {
     let amount = r.content.amount;
     let (currency, amount_formatted, is_fiat, exchange_rate, equivalent_sats) = match &r.content.currency {
         Currency::Millisats => {
-            let sats = amount / 1000;
-            (String::from("msat"), format!("{} msat ({} sats)", amount, sats), false, None, None)
+            let sats = amount.as_millisats() / 1000;
+            (String::from("msat"), format!("{} msat ({} sats)", amount.as_millisats(), sats), false, None, None)
         }
         Currency::Fiat(code) => {
-            let major = amount as f64 / 100.0;
+            let major = amount.as_fiat_major();
             let formatted = format!("{:.2} {}", major, code);
             let (er, eq) = match &r.content.current_exchange_rate {
                 Some(ExchangeRate { rate, source, .. }) => {
@@ -296,11 +296,11 @@ fn invoice_request_to_dto(r: &InvoiceRequestContentWithKey) -> InvoiceRequestDto
     let amount = c.amount;
     let (currency, amount_formatted, is_fiat, exchange_rate, equivalent_sats) = match &c.currency {
         Currency::Millisats => {
-            let sats = amount / 1000;
-            (String::from("msat"), format!("{} msat ({} sats)", amount, sats), false, None, None)
+            let sats = amount.as_millisats() / 1000;
+            (String::from("msat"), format!("{} msat ({} sats)", amount.as_millisats(), sats), false, None, None)
         }
         Currency::Fiat(code) => {
-            let major = amount as f64 / 100.0;
+            let major = amount.as_fiat_major();
             let formatted = format!("{:.2} {}", major, code);
             let (er, eq) = match &c.current_exchange_rate {
                 Some(ExchangeRate { rate, source, .. }) => {
@@ -329,9 +329,9 @@ fn invoice_request_to_dto(r: &InvoiceRequestContentWithKey) -> InvoiceRequestDto
 fn invoice_request_amount_msat(r: &InvoiceRequestContentWithKey) -> Option<u64> {
     let c = &r.inner;
     match &c.currency {
-        Currency::Millisats => Some(c.amount),
+        Currency::Millisats => Some(c.amount.as_millisats()),
         Currency::Fiat(_) => {
-            let major = c.amount as f64 / 100.0;
+            let major = c.amount.as_fiat_major();
             c.current_exchange_rate.as_ref().map(|er| ((major / er.rate) * 100_000_000_000.0) as u64)
         }
     }

crates/portal-app-demo/src/main.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use app::nwc::MakeInvoiceResponse;
 use portal_cli::{CliError, create_app_instance};
-use portal::protocol::model::{Timestamp, payment::InvoiceRequestContent};
+use portal::protocol::model::{Timestamp, payment::{Amount, InvoiceRequestContent}};
 
 #[tokio::main]
 async fn main() -> Result<(), CliError> {
@@ -62,7 +62,7 @@ async fn main() -> Result<(), CliError> {
                 receiver_key.public_key(),
                 InvoiceRequestContent {
                     request_id: String::from("my_id"),
-                    amount: 5000,
+                    amount: Amount::new(5000),
                     currency: portal::protocol::model::payment::Currency::Millisats,
                     current_exchange_rate: None,
                     expires_at: Timestamp::now_plus_seconds(120),

crates/portal-cli/src/bin/invoices.rs

@@ -1,5 +1,5 @@
 use portal_cli::{CliError, create_app_instance};
-use portal::protocol::model::payment::{Currency, SinglePaymentRequestContent};
+use portal::protocol::model::payment::{Amount, Currency, SinglePaymentRequestContent};
 
 #[tokio::main]
 async fn main() -> Result<(), CliError> {
@@ -19,12 +19,12 @@ async fn main() -> Result<(), CliError> {
 
     let npub = "ae35195222dbcc280d85a966204bc0e1ce743e99cbcb76216c922edf90cdd3e5";
     let invoice = "lnbc100n1p5nrm73pp5qjsms2tw3mm0jjn8jqex2l9mshnl978d779nstg08fcn2yq3256ssp5rdkyjl7lyewqpfhzyl0w5z6ferjuwxk67p587qv49kmq9zd9vskqxq9z0rgqnp4qvyndeaqzman7h898jxm98dzkm0mlrsx36s93smrur7h0azyyuxc5rzjq25carzepgd4vqsyn44jrk85ezrpju92xyrk9apw4cdjh6yrwt5jgqqqqrt49lmtcqqqqqqqqqqq86qq9qrzjqvx2wstnex2mhar83v3c8gwrrnpek8kfyjznh2ulxt35q03tzrzf3apyqr6zgqqqq8hxk2qqae4jsqyugqcqzpgdqv2pshjmt9de6q9qyyssqcsvavq75ksw6u03nunfyjyeygxk27mph4406vsf9jmdqgcaz59k5emrnh5dctvnzshd6d5x6xrqckrq8rn9a2rc83ywe0sut5829ecqpxrtegn";
-    let amount = 10;
+    let amount = Amount::new(10 * 1000);
 
     app.single_payment_request(
         npub,
         SinglePaymentRequestContent {
-            amount: amount * 1000,
+            amount,
             invoice: invoice.into(),
             auth_token: None,
             currency: Currency::Millisats,