refactor(amount): use Amount wrapper in payment request structs

Author: portal-wheatley

crates/portal-rest/src/handlers.rs

@@ -326,7 +326,7 @@ pub async fn request_recurring_payment(
 
     let payment_request = RecurringPaymentRequestContent {
         description: req.payment_request.description,
-        amount: req.payment_request.amount,
+        amount: Amount::new(req.payment_request.amount),
         currency: req.payment_request.currency,
         auth_token: req.payment_request.auth_token,
         recurrence: req.payment_request.recurrence,
@@ -399,7 +399,7 @@ pub async fn request_single_payment(
     let request_id = req.payment_request.request_id.clone().unwrap_or_else(|| Uuid::new_v4().to_string());
     let expires_at = Timestamp::now_plus_seconds(300);
     let payment_request = SinglePaymentRequestContent {
-        amount,
+        amount: Amount::new(amount),
         currency: req.payment_request.currency,
         expires_at,
         invoice: invoice.clone(),
@@ -585,7 +585,7 @@ pub async fn request_invoice(
 
     let sdk_content = InvoiceRequestContent {
         request_id,
-        amount: req.content.amount,
+        amount: Amount::new(req.content.amount),
         currency: req.content.currency.clone(),
         current_exchange_rate,
         expires_at: req.content.expires_at,
@@ -727,7 +727,7 @@ pub async fn request_cashu(
     let content = CashuRequestContent {
         mint_url: req.mint_url,
         unit: req.unit,
-        amount: req.amount,
+        amount: Amount::new(req.amount),
         request_id: Uuid::new_v4().to_string(),
         expires_at,
     };
@@ -1057,7 +1057,7 @@ async fn spawn_verification_token_request(
     let content = CashuRequestContent {
         mint_url: VERIFICATION_MINT_URL.to_string(),
         unit: VERIFICATION_TICKET_UNIT.to_string(),
-        amount: VERIFICATION_TOKEN_AMOUNT,
+        amount: Amount::new(VERIFICATION_TOKEN_AMOUNT),
         request_id: Uuid::new_v4().to_string(),
         expires_at,
     };

crates/portal/src/conversation/app/payments.rs

@@ -133,8 +133,8 @@ impl PaymentRequestContent {
 
     pub fn amount(&self) -> u64 {
         match self {
-            Self::Single(content) => content.amount,
-            Self::Recurring(content) => content.amount,
+            Self::Single(content) => content.amount.as_u64(),
+            Self::Recurring(content) => content.amount.as_u64(),
         }
     }
 }

crates/portal/src/conversation/sdk/payments.rs

@@ -32,7 +32,7 @@ impl RecurringPaymentRequestSenderConversation {
         subkey_proof: Option<SubkeyProof>,
         payment_request: RecurringPaymentRequestContent,
     ) -> Result<Self, String> {
-        if payment_request.amount == 0 {
+        if payment_request.amount.as_u64() == 0 {
             return Err("Recurring payment amount must be greater than zero".to_string());
         }
 
@@ -125,7 +125,7 @@ impl SinglePaymentRequestSenderConversation {
         subkey_proof: Option<SubkeyProof>,
         payment_request: SinglePaymentRequestContent,
     ) -> Result<Self, String> {
-        if payment_request.amount == 0 {
+        if payment_request.amount.as_u64() == 0 {
             return Err("Payment amount must be greater than zero".to_string());
         }
 

crates/portal/src/protocol/model.rs

@@ -289,7 +289,7 @@ pub mod payment {
     #[derive(Debug, Clone, Serialize, Deserialize)]
     #[cfg_attr(feature = "bindings", derive(uniffi::Record))]
     pub struct SinglePaymentRequestContent {
-        pub amount: u64,
+        pub amount: Amount,
         pub currency: Currency,
         pub current_exchange_rate: Option<ExchangeRate>,
         pub invoice: String,
@@ -338,7 +338,7 @@ pub mod payment {
     #[derive(Debug, Clone, Serialize, Deserialize)]
     #[cfg_attr(feature = "bindings", derive(uniffi::Record))]
     pub struct RecurringPaymentRequestContent {
-        pub amount: u64,
+        pub amount: Amount,
         pub currency: Currency,
         pub recurrence: RecurrenceInfo,
         pub current_exchange_rate: Option<ExchangeRate>,
@@ -379,7 +379,7 @@ pub mod payment {
     pub enum RecurringPaymentStatus {
         Confirmed {
             subscription_id: String,
-            authorized_amount: u64,
+            authorized_amount: Amount,
             authorized_currency: Currency,
             authorized_recurrence: RecurrenceInfo,
         },
@@ -414,7 +414,7 @@ pub mod payment {
     #[cfg_attr(feature = "bindings", derive(uniffi::Record))]
     pub struct InvoiceRequestContent {
         pub request_id: String,
-        pub amount: u64,
+        pub amount: Amount,
         pub currency: Currency,
         pub current_exchange_rate: Option<ExchangeRate>,
         pub expires_at: Timestamp,
@@ -444,7 +444,7 @@ pub mod payment {
         pub request_id: String,
         pub mint_url: String,
         pub unit: String,
-        pub amount: u64,
+        pub amount: Amount,
         pub expires_at: Timestamp,
     }