zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move sapling version group checks back inside of saplingActive check.

This commit is contained in:
Kris Nuttycombe 2021-03-11 14:58:15 -07:00
parent e49fa53ea9
commit 04f9f23255
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main.cpp
View File

@ -889,6 +889,24 @@ bool ContextualCheckTransaction(
error("ContextualCheckTransaction(): Sapling version too low"),
REJECT_INVALID, "bad-tx-sapling-version-too-low");
}
if (!futureActive) {
// Sapling version group is the most recent available version group ID
if (tx.nVersionGroupId != SAPLING_VERSION_GROUP_ID) {
return state.DoS(
dosLevelPotentiallyRelaxing,
error("ContextualCheckTransaction(): invalid Sapling tx version"),
REJECT_INVALID, "bad-sapling-tx-version-group-id");
}
// Sapling version is the most recent available version
if (tx.nVersion > SAPLING_MAX_TX_VERSION) {
return state.DoS(
dosLevelPotentiallyRelaxing,
error("ContextualCheckTransaction(): Sapling version too high"),
REJECT_INVALID, "bad-tx-sapling-version-too-high");
}
}
} else {
// Rules that apply generally before Sapling. These were
// previously noncontextual checks that became contextual
@ -1023,22 +1041,6 @@ bool ContextualCheckTransaction(
if (futureActive) {
} else {
// Rules that apply generally before the next release epoch
// Sapling version group is the most recent available version group ID
if (tx.nVersionGroupId != SAPLING_VERSION_GROUP_ID) {
return state.DoS(
dosLevelPotentiallyRelaxing,
error("ContextualCheckTransaction(): invalid Sapling tx version"),
REJECT_INVALID, "bad-sapling-tx-version-group-id");
}
// Sapling version is the most recent available version
if (tx.nVersion > SAPLING_MAX_TX_VERSION) {
return state.DoS(
dosLevelPotentiallyRelaxing,
error("ContextualCheckTransaction(): Sapling version too high"),
REJECT_INVALID, "bad-tx-sapling-version-too-high");
}
}
auto consensusBranchId = CurrentEpochBranchId(nHeight, consensus);