Add Sapling v4 transactions to IsStandard
This commit is contained in:
11
src/main.cpp
11
src/main.cpp
@@ -645,9 +645,16 @@ unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) EXCLUSIVE_LOCKS_REQUIRE
|
||||
|
||||
bool IsStandardTx(const CTransaction& tx, string& reason, const int nHeight)
|
||||
{
|
||||
bool isOverwinter = NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER);
|
||||
bool overwinterActive = NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER);
|
||||
bool saplingActive = NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_SAPLING);
|
||||
|
||||
if (isOverwinter) {
|
||||
if (saplingActive) {
|
||||
// Sapling standard rules apply
|
||||
if (tx.nVersion > CTransaction::SAPLING_MAX_CURRENT_VERSION || tx.nVersion < CTransaction::SAPLING_MIN_CURRENT_VERSION) {
|
||||
reason = "sapling-version";
|
||||
return false;
|
||||
}
|
||||
} else if (overwinterActive) {
|
||||
// Overwinter standard rules apply
|
||||
if (tx.nVersion > CTransaction::OVERWINTER_MAX_CURRENT_VERSION || tx.nVersion < CTransaction::OVERWINTER_MIN_CURRENT_VERSION) {
|
||||
reason = "overwinter-version";
|
||||
|
||||
Reference in New Issue
Block a user