-
Notifications
You must be signed in to change notification settings - Fork 947
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'murisi+grarco/multi-tx-masp-vp-rebased2' (#3264)
- Loading branch information
Showing
39 changed files
with
1,186 additions
and
824 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
- Updated the masp vp to accept multiple transfers in a single transaction. | ||
([\#2690](https://github.com/anoma/namada/pull/2690)) |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.