zec
/
librustzcash
mirror of https://github.com/zcash/librustzcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Check all transaction versions in has_sprout and uses_groth_proof checks.

This commit is contained in:
Kris Nuttycombe 2020-12-17 09:16:29 -07:00
parent 06cd91059f
commit 1dd5a6dbcb
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
zcash_primitives/src/transaction/mod.rs
View File

@ -96,13 +96,14 @@ impl TxVersion {
_ => 1 << 31,
};
overwintered | match self {
TxVersion::Sprout(v) => *v,
TxVersion::Overwinter => OVERWINTER_TX_VERSION,
TxVersion::Sapling => SAPLING_TX_VERSION,
#[cfg(feature = "zfuture")]
TxVersion::ZFuture => ZFUTURE_TX_VERSION,
}
overwintered
| match self {
TxVersion::Sprout(v) => *v,
TxVersion::Overwinter => OVERWINTER_TX_VERSION,
TxVersion::Sapling => SAPLING_TX_VERSION,
#[cfg(feature = "zfuture")]
TxVersion::ZFuture => ZFUTURE_TX_VERSION,
}
}
pub fn version_group_id(&self) -> u32 {
@ -126,14 +127,18 @@ impl TxVersion {
pub fn has_sprout(&self) -> bool {
match self {
TxVersion::Sprout(v) => *v >= 2u32,
_ => true,
TxVersion::Overwinter | TxVersion::Sapling => true,
#[cfg(feature = "zfuture")]
TxVersion::ZFuture => true,
}
}
pub fn uses_groth_proofs(&self) -> bool {
match self {
TxVersion::Sprout(_) | TxVersion::Overwinter => false,
_ => true,
TxVersion::Sapling => true,
#[cfg(feature = "zfuture")]
TxVersion::ZFuture => true,
}
}
}
@ -576,7 +581,7 @@ pub mod testing {
BranchId::Heartwood,
BranchId::Canopy,
#[cfg(feature = "zfuture")]
BranchId::ZFuture
BranchId::ZFuture,
])
}