CheckTransaction does not call overwinter checks

This commit is contained in:
blackjok3r
2019-01-12 01:15:19 +08:00
parent a963718c7c
commit 94593ce8fd

View File

@@ -486,12 +486,9 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
auto verifier = libzcash::ProofVerifier::Strict(); auto verifier = libzcash::ProofVerifier::Strict();
if (!(CheckTransaction(0,wtx, state, verifier) && (wtx.GetHash() == hash) && state.IsValid())) if (!(CheckTransaction(0,wtx, state, verifier) && (wtx.GetHash() == hash) && state.IsValid()))
{ {
if (state.GetRejectReason() != "tx-overwinter-expired" && state.GetRejectReason() != "tx-overwinter-active") fprintf(stderr, "Removing corrupt tx from wallet.%s\n", hash.ToString().c_str());
{ deadTxns.push_back(hash);
fprintf(stderr, "Removing corrupt tx from wallet.%s\n", hash.ToString().c_str()); return false;
deadTxns.push_back(hash);
return false;
}
} }
// Undo serialize changes in 31600 // Undo serialize changes in 31600
if (31404 <= wtx.fTimeReceivedIsTxTime && wtx.fTimeReceivedIsTxTime <= 31703) if (31404 <= wtx.fTimeReceivedIsTxTime && wtx.fTimeReceivedIsTxTime <= 31703)