Improve withdrawal/deposit API to include replay_protection

src/deposit.rs

@@ -1,7 +1,7 @@
 use crate::{Context, Handler};
 use axum::{extract::State, http::StatusCode, Json};
 use serde::Deserialize;
-use verax::{AccountId, AnyAmount, ReplayProtection, Status, Tag, Transaction};
+use verax::{AccountId, AnyAmount, ReplayProtection, Status, Tag};
 
 #[derive(Deserialize)]
 pub struct Deposit {
@@ -20,19 +20,15 @@ impl Handler for Deposit {
     type Err = verax::Error;
 
     async fn handle(self, ctx: &Context) -> Result<Self::Ok, Self::Err> {
-        let new_deposit = Transaction::new_external_deposit(
-            self.memo,
-            self.status,
-            self.tags,
-            vec![(self.account.clone(), self.amount.try_into()?)],
-        )?;
-
         ctx.ledger
-            .store(if let Some(replay_protection) = self.replay_protection {
-                new_deposit.set_replay_protection(replay_protection)?
-            } else {
-                new_deposit
-            })
+            .deposit(
+                &self.account,
+                self.amount.try_into()?,
+                self.status,
+                self.tags,
+                self.memo,
+                self.replay_protection,
+            )
             .await
     }
 }

utxo/src/ledger.rs

@@ -449,13 +449,20 @@ where
         status: Status,
         tags: Vec<Tag>,
         reference: String,
+        replay_protection: Option<ReplayProtection>,
     ) -> Result<Transaction, Error> {
-        self.store(Transaction::new_external_deposit(
+        let deposit = Transaction::new_external_deposit(
             reference,
             status,
             tags,
             vec![(account.clone(), amount)],
-        )?)
+        )?;
+
+        self.store(if let Some(replay_protection) = replay_protection {
+            deposit.set_replay_protection(replay_protection)?
+        } else {
+            deposit
+        })
         .await
     }
 
@@ -471,6 +478,7 @@ where
         amount: Amount,
         status: Status,
         reference: String,
+        replay_protection: Option<ReplayProtection>,
     ) -> Result<Transaction, Error> {
         let (change_transactions, payments) = self
             .select_payments_from_accounts(vec![(account.clone(), amount)])
@@ -478,9 +486,12 @@ where
         for change_tx in change_transactions.into_iter() {
             self.store(change_tx).await?;
         }
-        self.store(Transaction::new_external_withdrawal(
-            reference, status, payments,
-        )?)
+        let withdrawal = Transaction::new_external_withdrawal(reference, status, payments)?;
+        self.store(if let Some(replay_protection) = replay_protection {
+            withdrawal.set_replay_protection(replay_protection)?
+        } else {
+            withdrawal
+        })
         .await
     }
 

utxo/src/storage/cache/mod.rs

@@ -188,6 +188,7 @@ mod test {
                     (dest.clone(), usd.from_human("12.5").expect("amount")),
                     (fee.clone(), usd.from_human("0.5").expect("amount")),
                 ],
+                None,
             )
             .await
             .expect("valid tx");

utxo/src/storage/mod.rs

@@ -789,6 +789,7 @@ pub mod test {
                     "settled".into(),
                     vec![],
                     format!("test deposit {}", i),
+                    None,
                 )
                 .await
                 .expect("valid deposit");
@@ -853,6 +854,7 @@ pub mod test {
                 "settled".into(),
                 vec!["even".parse().expect("valid tag")],
                 "test deposit after the subscription listener is dropped".to_owned(),
+                None,
             )
             .await
             .expect("valid deposit");
@@ -886,6 +888,7 @@ pub mod test {
                     "settled".into(),
                     vec![],
                     format!("test deposit {}", i),
+                    None,
                 )
                 .await
                 .expect("valid deposit");
@@ -982,6 +985,7 @@ pub mod test {
                     },
                     vec![],
                     format!("test deposit {}", i),
+                    None,
                 )
                 .await
                 .expect("valid deposit");

utxo/src/tests/deposit.rs

@@ -13,6 +13,7 @@ async fn pending_deposit_and_failure() {
             "processing".into(),
             vec![],
             "Test".to_owned(),
+            None,
         )
         .await
         .expect("valid tx")
@@ -69,6 +70,7 @@ async fn deposit_and_transfer() {
                 (dest.clone(), usd.from_human("12.5").expect("amount")),
                 (fee.clone(), usd.from_human("0.5").expect("amount")),
             ],
+            None,
         )
         .await
         .expect("valid tx");
@@ -117,6 +119,7 @@ async fn balance_decreases_while_pending_spending_and_confirm() {
                 (dest.clone(), usd.from_human("12.5").expect("amount")),
                 (fee.clone(), usd.from_human("0.5").expect("amount")),
             ],
+            None,
         )
         .await
         .expect("valid tx")
@@ -174,6 +177,7 @@ async fn balance_decreases_while_pending_spending_and_cancel() {
                 (dest.clone(), usd.from_human("12.5").expect("amount")),
                 (fee.clone(), usd.from_human("0.5").expect("amount")),
             ],
+            None,
         )
         .await
         .expect("valid tx")
@@ -230,6 +234,7 @@ async fn balance_decreases_while_pending_spending_and_failed() {
                 (dest.clone(), usd.from_human("12.5").expect("amount")),
                 (fee.clone(), usd.from_human("0.5").expect("amount")),
             ],
+            None,
         )
         .await
         .expect("valid tx")

utxo/src/tests/mod.rs

@@ -41,7 +41,7 @@ pub async fn withdrawal(
     amount: Amount,
 ) -> Result<RevId, Error> {
     Ok(ledger
-        .withdrawal(account_id, amount, status, "Test".to_owned())
+        .withdrawal(account_id, amount, status, "Test".to_owned(), None)
         .await?
         .revision_id
         .clone())
@@ -58,6 +58,7 @@ where
             "settled".into(),
             vec![],
             "Test".to_owned(),
+            None,
         )
         .await
         .expect("valid tx")

utxo/src/tests/tx.rs

@@ -30,6 +30,7 @@ async fn multi_account_transfers() {
             "settled".into(),
             from,
             vec![(target.clone(), usd.from_human("50500").expect("amount"))],
+            None,
         )
         .await
         .expect("valid tx");

utxo/src/tests/withdrawal.rs

@@ -26,6 +26,7 @@ async fn deposit_transfer_and_withdrawal() {
                 (dest.clone(), usd.from_human("12.5").expect("amount")),
                 (fee.clone(), usd.from_human("0.5").expect("amount")),
             ],
+            None,
         )
         .await
         .expect("valid tx");
@@ -92,6 +93,7 @@ async fn fail_to_overwithdrawal() {
                 (dest.clone(), usd.from_human("12.5").expect("amount")),
                 (fee.clone(), usd.from_human("0.5").expect("amount")),
             ],
+            None,
         )
         .await
         .expect("valid tx");
@@ -157,6 +159,7 @@ async fn cancelled_withdrawal() {
                 (dest.clone(), usd.from_human("12.5").expect("amount")),
                 (fee.clone(), usd.from_human("0.5").expect("amount")),
             ],
+            None,
         )
         .await
         .expect("valid tx");

utxo/src/transaction/mod.rs

@@ -178,7 +178,7 @@ impl Transaction {
     /// All transactions must be balanced, same amounts that are spent should be
     /// created. There are two exceptions, external deposits and withdrawals.
     /// The idea is to mimic external operations, where new assets enter the system.
-    pub fn new_external_deposit(
+    pub(crate) fn new_external_deposit(
         reference: String,
         status: Status,
         tags: Vec<Tag>,
@@ -205,7 +205,7 @@ impl Transaction {
     /// Creates a new external withdrawal transaction
     ///
     /// Burns assets to reflect external withdrawals
-    pub fn new_external_withdrawal(
+    pub(crate) fn new_external_withdrawal(
         reference: String,
         status: Status,
         spends: Vec<PaymentFrom>,