Murisi+grarco/multi tx masp vp rebased2

.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,8 +122,8 @@ libc = "0.2.97"
 libloading = "0.7.2"
 linkme = "0.3.24"
 # branch = "murisi/namada-integration"
-masp_primitives = { git = "https://github.com/anoma/masp", rev = "d1e0876b304968edfa36707ffe4fb8fbbee131d2" }
-masp_proofs = { git = "https://github.com/anoma/masp", rev = "d1e0876b304968edfa36707ffe4fb8fbbee131d2", default-features = false, features = ["local-prover"] }
+masp_primitives = { git = "https://github.com/anoma/masp", rev = "6fc4692841a2241633792c429cc66b42023e5bf3" }
+masp_proofs = { git = "https://github.com/anoma/masp", rev = "6fc4692841a2241633792c429cc66b42023e5bf3", 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)
-        }
-    }
-}