Merge branch 'murisi+grarco/multi-tx-masp-vp-rebased2' (#3264)

.changelog/unreleased/improvements/2690-multi-tx-masp-vp.md

@@ -0,0 +1,2 @@
+- Updated the masp vp to accept multiple transfers in a single transaction.
+  ([\#2690](https://github.com/anoma/namada/pull/2690))

Cargo.toml

@@ -122,9 +122,9 @@ ledger-transport-hid = "0.10.0"
 libc = "0.2.97"
 libloading = "0.7.2"
 linkme = "0.3.24"
-# branch = "main"
-masp_primitives = { git = "https://github.com/anoma/masp", rev = "b5e87a01c5928ce341f2d2a63a6fa6c4033be395" }
-masp_proofs = { git = "https://github.com/anoma/masp", rev = "b5e87a01c5928ce341f2d2a63a6fa6c4033be395", default-features = false, features = ["local-prover"] }
+# branch = "murisi/alternative-num-traits"
+masp_primitives = { git = "https://github.com/anoma/masp", rev = "3aacc707c5948e7423589ac617305448bead9842" }
+masp_proofs = { git = "https://github.com/anoma/masp", rev = "3aacc707c5948e7423589ac617305448bead9842", default-features = false, features = ["local-prover"] }
 num256 = "0.3.5"
 num_cpus = "1.13.0"
 num-derive = "0.3.3"

crates/core/src/arith.rs

@@ -1,23 +1,9 @@
 //! Arithmetics helpers
 
+pub use masp_primitives::num_traits::ops::checked::{
+    CheckedAdd, CheckedDiv, CheckedMul, CheckedNeg, CheckedRem, CheckedSub,
+};
+pub use masp_primitives::num_traits::ops::overflowing::{
+    OverflowingAdd, OverflowingSub,
+};
 pub use smooth_operator::{checked, Error};
-
-/// Performs addition that returns `None` instead of wrapping around on
-/// overflow.
-pub trait CheckedAdd: Sized + Copy {
-    /// Adds two numbers, checking for overflow. If overflow happens, `None` is
-    /// returned.
-    fn checked_add(&self, rhs: Self) -> Option<Self>;
-}
-
-/// Helpers for testing.
-#[cfg(feature = "testing")]
-pub mod testing {
-    use super::*;
-
-    impl CheckedAdd for u64 {
-        fn checked_add(&self, rhs: Self) -> Option<Self> {
-            u64::checked_add(*self, rhs)
-        }
-    }
-}

crates/core/src/token.rs

@@ -14,7 +14,7 @@ use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
 use crate::address::Address;
-use crate::arith::{self, checked, CheckedAdd};
+use crate::arith::{self, checked, CheckedAdd, CheckedSub};
 use crate::dec::{Dec, POS_DECIMAL_PRECISION};
 use crate::hash::Hash;
 use crate::ibc::apps::transfer::types::Amount as IbcAmount;
@@ -336,8 +336,38 @@ impl Amount {
 }
 
 impl CheckedAdd for Amount {
-    fn checked_add(&self, rhs: Self) -> Option<Self> {
-        self.checked_add(rhs)
+    type Output = Amount;
+
+    fn checked_add(self, rhs: Self) -> Option<Self::Output> {
+        Amount::checked_add(&self, rhs)
+    }
+}
+
+impl CheckedAdd for &Amount {
+    type Output = Amount;
+
+    fn checked_add(self, rhs: Self) -> Option<Self::Output> {
+        self.checked_add(*rhs)
+    }
+}
+
+impl CheckedSub for Amount {
+    type Output = Amount;
+
+    fn checked_sub(self, amount: Self) -> Option<Self::Output> {
+        self.raw
+            .checked_sub(amount.raw)
+            .map(|result| Self { raw: result })
+    }
+}
+
+impl CheckedSub for &Amount {
+    type Output = Amount;
+
+    fn checked_sub(self, amount: Self) -> Option<Self::Output> {
+        self.raw
+            .checked_sub(amount.raw)
+            .map(|result| Amount { raw: result })
     }
 }