Remove unused fScriptChecks parameter from CheckInputs
fScriptChecks = false just short-circuits the entire function, so passing it in is entirely useless.
This commit is contained in:
parent
48e5bfe224
commit
9b92538ade
2 changed files with 90 additions and 94 deletions
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
#include <boost/test/unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
|
|
||||||
bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsViewCache &inputs, bool fScriptChecks, unsigned int flags, bool cacheSigStore, bool cacheFullScriptStore, PrecomputedTransactionData& txdata, std::vector<CScriptCheck> *pvChecks);
|
bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsViewCache &inputs, unsigned int flags, bool cacheSigStore, bool cacheFullScriptStore, PrecomputedTransactionData& txdata, std::vector<CScriptCheck> *pvChecks);
|
||||||
|
|
||||||
BOOST_AUTO_TEST_SUITE(tx_validationcache_tests)
|
BOOST_AUTO_TEST_SUITE(tx_validationcache_tests)
|
||||||
|
|
||||||
|
@ -125,7 +125,7 @@ static void ValidateCheckInputsForAllFlags(const CTransaction &tx, uint32_t fail
|
||||||
// WITNESS requires P2SH
|
// WITNESS requires P2SH
|
||||||
test_flags |= SCRIPT_VERIFY_P2SH;
|
test_flags |= SCRIPT_VERIFY_P2SH;
|
||||||
}
|
}
|
||||||
bool ret = CheckInputs(tx, state, &::ChainstateActive().CoinsTip(), true, test_flags, true, add_to_cache, txdata, nullptr);
|
bool ret = CheckInputs(tx, state, &::ChainstateActive().CoinsTip(), test_flags, true, add_to_cache, txdata, nullptr);
|
||||||
// CheckInputs should succeed iff test_flags doesn't intersect with
|
// CheckInputs should succeed iff test_flags doesn't intersect with
|
||||||
// failing_flags
|
// failing_flags
|
||||||
bool expected_return_value = !(test_flags & failing_flags);
|
bool expected_return_value = !(test_flags & failing_flags);
|
||||||
|
@ -135,13 +135,13 @@ static void ValidateCheckInputsForAllFlags(const CTransaction &tx, uint32_t fail
|
||||||
if (ret && add_to_cache) {
|
if (ret && add_to_cache) {
|
||||||
// Check that we get a cache hit if the tx was valid
|
// Check that we get a cache hit if the tx was valid
|
||||||
std::vector<CScriptCheck> scriptchecks;
|
std::vector<CScriptCheck> scriptchecks;
|
||||||
BOOST_CHECK(CheckInputs(tx, state, &::ChainstateActive().CoinsTip(), true, test_flags, true, add_to_cache, txdata, &scriptchecks));
|
BOOST_CHECK(CheckInputs(tx, state, &::ChainstateActive().CoinsTip(), test_flags, true, add_to_cache, txdata, &scriptchecks));
|
||||||
BOOST_CHECK(scriptchecks.empty());
|
BOOST_CHECK(scriptchecks.empty());
|
||||||
} else {
|
} else {
|
||||||
// Check that we get script executions to check, if the transaction
|
// Check that we get script executions to check, if the transaction
|
||||||
// was invalid, or we didn't add to cache.
|
// was invalid, or we didn't add to cache.
|
||||||
std::vector<CScriptCheck> scriptchecks;
|
std::vector<CScriptCheck> scriptchecks;
|
||||||
BOOST_CHECK(CheckInputs(tx, state, &::ChainstateActive().CoinsTip(), true, test_flags, true, add_to_cache, txdata, &scriptchecks));
|
BOOST_CHECK(CheckInputs(tx, state, &::ChainstateActive().CoinsTip(), test_flags, true, add_to_cache, txdata, &scriptchecks));
|
||||||
BOOST_CHECK_EQUAL(scriptchecks.size(), tx.vin.size());
|
BOOST_CHECK_EQUAL(scriptchecks.size(), tx.vin.size());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -204,13 +204,13 @@ BOOST_FIXTURE_TEST_CASE(checkinputs_test, TestChain100Setup)
|
||||||
CValidationState state;
|
CValidationState state;
|
||||||
PrecomputedTransactionData ptd_spend_tx(spend_tx);
|
PrecomputedTransactionData ptd_spend_tx(spend_tx);
|
||||||
|
|
||||||
BOOST_CHECK(!CheckInputs(CTransaction(spend_tx), state, &::ChainstateActive().CoinsTip(), true, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_DERSIG, true, true, ptd_spend_tx, nullptr));
|
BOOST_CHECK(!CheckInputs(CTransaction(spend_tx), state, &::ChainstateActive().CoinsTip(), SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_DERSIG, true, true, ptd_spend_tx, nullptr));
|
||||||
|
|
||||||
// If we call again asking for scriptchecks (as happens in
|
// If we call again asking for scriptchecks (as happens in
|
||||||
// ConnectBlock), we should add a script check object for this -- we're
|
// ConnectBlock), we should add a script check object for this -- we're
|
||||||
// not caching invalidity (if that changes, delete this test case).
|
// not caching invalidity (if that changes, delete this test case).
|
||||||
std::vector<CScriptCheck> scriptchecks;
|
std::vector<CScriptCheck> scriptchecks;
|
||||||
BOOST_CHECK(CheckInputs(CTransaction(spend_tx), state, &::ChainstateActive().CoinsTip(), true, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_DERSIG, true, true, ptd_spend_tx, &scriptchecks));
|
BOOST_CHECK(CheckInputs(CTransaction(spend_tx), state, &::ChainstateActive().CoinsTip(), SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_DERSIG, true, true, ptd_spend_tx, &scriptchecks));
|
||||||
BOOST_CHECK_EQUAL(scriptchecks.size(), 1U);
|
BOOST_CHECK_EQUAL(scriptchecks.size(), 1U);
|
||||||
|
|
||||||
// Test that CheckInputs returns true iff DERSIG-enforcing flags are
|
// Test that CheckInputs returns true iff DERSIG-enforcing flags are
|
||||||
|
@ -272,7 +272,7 @@ BOOST_FIXTURE_TEST_CASE(checkinputs_test, TestChain100Setup)
|
||||||
invalid_with_cltv_tx.vin[0].scriptSig = CScript() << vchSig << 100;
|
invalid_with_cltv_tx.vin[0].scriptSig = CScript() << vchSig << 100;
|
||||||
CValidationState state;
|
CValidationState state;
|
||||||
PrecomputedTransactionData txdata(invalid_with_cltv_tx);
|
PrecomputedTransactionData txdata(invalid_with_cltv_tx);
|
||||||
BOOST_CHECK(CheckInputs(CTransaction(invalid_with_cltv_tx), state, ::ChainstateActive().CoinsTip(), true, SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY, true, true, txdata, nullptr));
|
BOOST_CHECK(CheckInputs(CTransaction(invalid_with_cltv_tx), state, ::ChainstateActive().CoinsTip(), SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY, true, true, txdata, nullptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
// TEST CHECKSEQUENCEVERIFY
|
// TEST CHECKSEQUENCEVERIFY
|
||||||
|
@ -300,7 +300,7 @@ BOOST_FIXTURE_TEST_CASE(checkinputs_test, TestChain100Setup)
|
||||||
invalid_with_csv_tx.vin[0].scriptSig = CScript() << vchSig << 100;
|
invalid_with_csv_tx.vin[0].scriptSig = CScript() << vchSig << 100;
|
||||||
CValidationState state;
|
CValidationState state;
|
||||||
PrecomputedTransactionData txdata(invalid_with_csv_tx);
|
PrecomputedTransactionData txdata(invalid_with_csv_tx);
|
||||||
BOOST_CHECK(CheckInputs(CTransaction(invalid_with_csv_tx), state, &::ChainstateActive().CoinsTip(), true, SCRIPT_VERIFY_CHECKSEQUENCEVERIFY, true, true, txdata, nullptr));
|
BOOST_CHECK(CheckInputs(CTransaction(invalid_with_csv_tx), state, &::ChainstateActive().CoinsTip(), SCRIPT_VERIFY_CHECKSEQUENCEVERIFY, true, true, txdata, nullptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: add tests for remaining script flags
|
// TODO: add tests for remaining script flags
|
||||||
|
@ -362,12 +362,12 @@ BOOST_FIXTURE_TEST_CASE(checkinputs_test, TestChain100Setup)
|
||||||
CValidationState state;
|
CValidationState state;
|
||||||
PrecomputedTransactionData txdata(tx);
|
PrecomputedTransactionData txdata(tx);
|
||||||
// This transaction is now invalid under segwit, because of the second input.
|
// This transaction is now invalid under segwit, because of the second input.
|
||||||
BOOST_CHECK(!CheckInputs(CTransaction(tx), state, &::ChainstateActive().CoinsTip(), true, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, true, true, txdata, nullptr));
|
BOOST_CHECK(!CheckInputs(CTransaction(tx), state, &::ChainstateActive().CoinsTip(), SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, true, true, txdata, nullptr));
|
||||||
|
|
||||||
std::vector<CScriptCheck> scriptchecks;
|
std::vector<CScriptCheck> scriptchecks;
|
||||||
// Make sure this transaction was not cached (ie because the first
|
// Make sure this transaction was not cached (ie because the first
|
||||||
// input was valid)
|
// input was valid)
|
||||||
BOOST_CHECK(CheckInputs(CTransaction(tx), state, &::ChainstateActive().CoinsTip(), true, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, true, true, txdata, &scriptchecks));
|
BOOST_CHECK(CheckInputs(CTransaction(tx), state, &::ChainstateActive().CoinsTip(), SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, true, true, txdata, &scriptchecks));
|
||||||
// Should get 2 script checks back -- caching is on a whole-transaction basis.
|
// Should get 2 script checks back -- caching is on a whole-transaction basis.
|
||||||
BOOST_CHECK_EQUAL(scriptchecks.size(), 2U);
|
BOOST_CHECK_EQUAL(scriptchecks.size(), 2U);
|
||||||
}
|
}
|
||||||
|
|
|
@ -184,7 +184,7 @@ std::unique_ptr<CBlockTreeDB> pblocktree;
|
||||||
// See definition for documentation
|
// See definition for documentation
|
||||||
static void FindFilesToPruneManual(std::set<int>& setFilesToPrune, int nManualPruneHeight);
|
static void FindFilesToPruneManual(std::set<int>& setFilesToPrune, int nManualPruneHeight);
|
||||||
static void FindFilesToPrune(std::set<int>& setFilesToPrune, uint64_t nPruneAfterHeight);
|
static void FindFilesToPrune(std::set<int>& setFilesToPrune, uint64_t nPruneAfterHeight);
|
||||||
bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsViewCache &inputs, bool fScriptChecks, unsigned int flags, bool cacheSigStore, bool cacheFullScriptStore, PrecomputedTransactionData& txdata, std::vector<CScriptCheck> *pvChecks = nullptr);
|
bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsViewCache &inputs, unsigned int flags, bool cacheSigStore, bool cacheFullScriptStore, PrecomputedTransactionData& txdata, std::vector<CScriptCheck> *pvChecks = nullptr);
|
||||||
static FILE* OpenUndoFile(const FlatFilePos &pos, bool fReadOnly = false);
|
static FILE* OpenUndoFile(const FlatFilePos &pos, bool fReadOnly = false);
|
||||||
static FlatFileSeq BlockFileSeq();
|
static FlatFileSeq BlockFileSeq();
|
||||||
static FlatFileSeq UndoFileSeq();
|
static FlatFileSeq UndoFileSeq();
|
||||||
|
@ -425,7 +425,7 @@ static bool CheckInputsFromMempoolAndCache(const CTransaction& tx, CValidationSt
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return CheckInputs(tx, state, view, true, flags, cacheSigStore, true, txdata);
|
return CheckInputs(tx, state, view, flags, cacheSigStore, true, txdata);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -773,15 +773,17 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool
|
||||||
constexpr unsigned int scriptVerifyFlags = STANDARD_SCRIPT_VERIFY_FLAGS;
|
constexpr unsigned int scriptVerifyFlags = STANDARD_SCRIPT_VERIFY_FLAGS;
|
||||||
|
|
||||||
// Check against previous transactions
|
// Check against previous transactions
|
||||||
// This is done last to help prevent CPU exhaustion denial-of-service attacks.
|
// The first loop above does all the inexpensive checks.
|
||||||
|
// Only if ALL inputs pass do we perform expensive ECDSA signature checks.
|
||||||
|
// Helps prevent CPU exhaustion denial-of-service attacks.
|
||||||
PrecomputedTransactionData txdata(tx);
|
PrecomputedTransactionData txdata(tx);
|
||||||
if (!CheckInputs(tx, state, view, true, scriptVerifyFlags, true, false, txdata)) {
|
if (!CheckInputs(tx, state, view, scriptVerifyFlags, true, false, txdata)) {
|
||||||
// SCRIPT_VERIFY_CLEANSTACK requires SCRIPT_VERIFY_WITNESS, so we
|
// SCRIPT_VERIFY_CLEANSTACK requires SCRIPT_VERIFY_WITNESS, so we
|
||||||
// need to turn both off, and compare against just turning off CLEANSTACK
|
// need to turn both off, and compare against just turning off CLEANSTACK
|
||||||
// to see if the failure is specifically due to witness validation.
|
// to see if the failure is specifically due to witness validation.
|
||||||
CValidationState stateDummy; // Want reported failures to be from first CheckInputs
|
CValidationState stateDummy; // Want reported failures to be from first CheckInputs
|
||||||
if (!tx.HasWitness() && CheckInputs(tx, stateDummy, view, true, scriptVerifyFlags & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true, false, txdata) &&
|
if (!tx.HasWitness() && CheckInputs(tx, stateDummy, view, scriptVerifyFlags & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true, false, txdata) &&
|
||||||
!CheckInputs(tx, stateDummy, view, true, scriptVerifyFlags & ~SCRIPT_VERIFY_CLEANSTACK, true, false, txdata)) {
|
!CheckInputs(tx, stateDummy, view, scriptVerifyFlags & ~SCRIPT_VERIFY_CLEANSTACK, true, false, txdata)) {
|
||||||
// Only the witness is missing, so the transaction itself may be fine.
|
// Only the witness is missing, so the transaction itself may be fine.
|
||||||
state.Invalid(ValidationInvalidReason::TX_WITNESS_MUTATED, false,
|
state.Invalid(ValidationInvalidReason::TX_WITNESS_MUTATED, false,
|
||||||
state.GetRejectCode(), state.GetRejectReason(), state.GetDebugMessage());
|
state.GetRejectCode(), state.GetRejectReason(), state.GetDebugMessage());
|
||||||
|
@ -1298,90 +1300,79 @@ void InitScriptExecutionCache() {
|
||||||
*
|
*
|
||||||
* Non-static (and re-declared) in src/test/txvalidationcache_tests.cpp
|
* Non-static (and re-declared) in src/test/txvalidationcache_tests.cpp
|
||||||
*/
|
*/
|
||||||
bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsViewCache &inputs, bool fScriptChecks, unsigned int flags, bool cacheSigStore, bool cacheFullScriptStore, PrecomputedTransactionData& txdata, std::vector<CScriptCheck> *pvChecks) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
|
bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsViewCache &inputs, unsigned int flags, bool cacheSigStore, bool cacheFullScriptStore, PrecomputedTransactionData& txdata, std::vector<CScriptCheck> *pvChecks) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
|
||||||
{
|
{
|
||||||
if (!tx.IsCoinBase())
|
if (tx.IsCoinBase()) return true;
|
||||||
{
|
|
||||||
if (pvChecks)
|
|
||||||
pvChecks->reserve(tx.vin.size());
|
|
||||||
|
|
||||||
// The first loop above does all the inexpensive checks.
|
if (pvChecks) {
|
||||||
// Only if ALL inputs pass do we perform expensive ECDSA signature checks.
|
pvChecks->reserve(tx.vin.size());
|
||||||
// Helps prevent CPU exhaustion attacks.
|
}
|
||||||
|
|
||||||
// Skip script verification when connecting blocks under the
|
// First check if script executions have been cached with the same
|
||||||
// assumevalid block. Assuming the assumevalid block is valid this
|
// flags. Note that this assumes that the inputs provided are
|
||||||
// is safe because block merkle hashes are still computed and checked,
|
// correct (ie that the transaction hash which is in tx's prevouts
|
||||||
// Of course, if an assumed valid block is invalid due to false scriptSigs
|
// properly commits to the scriptPubKey in the inputs view of that
|
||||||
// this optimization would allow an invalid chain to be accepted.
|
// transaction).
|
||||||
if (fScriptChecks) {
|
uint256 hashCacheEntry;
|
||||||
// First check if script executions have been cached with the same
|
// We only use the first 19 bytes of nonce to avoid a second SHA
|
||||||
// flags. Note that this assumes that the inputs provided are
|
// round - giving us 19 + 32 + 4 = 55 bytes (+ 8 + 1 = 64)
|
||||||
// correct (ie that the transaction hash which is in tx's prevouts
|
static_assert(55 - sizeof(flags) - 32 >= 128/8, "Want at least 128 bits of nonce for script execution cache");
|
||||||
// properly commits to the scriptPubKey in the inputs view of that
|
CSHA256().Write(scriptExecutionCacheNonce.begin(), 55 - sizeof(flags) - 32).Write(tx.GetWitnessHash().begin(), 32).Write((unsigned char*)&flags, sizeof(flags)).Finalize(hashCacheEntry.begin());
|
||||||
// transaction).
|
AssertLockHeld(cs_main); //TODO: Remove this requirement by making CuckooCache not require external locks
|
||||||
uint256 hashCacheEntry;
|
if (scriptExecutionCache.contains(hashCacheEntry, !cacheFullScriptStore)) {
|
||||||
// We only use the first 19 bytes of nonce to avoid a second SHA
|
return true;
|
||||||
// round - giving us 19 + 32 + 4 = 55 bytes (+ 8 + 1 = 64)
|
}
|
||||||
static_assert(55 - sizeof(flags) - 32 >= 128/8, "Want at least 128 bits of nonce for script execution cache");
|
|
||||||
CSHA256().Write(scriptExecutionCacheNonce.begin(), 55 - sizeof(flags) - 32).Write(tx.GetWitnessHash().begin(), 32).Write((unsigned char*)&flags, sizeof(flags)).Finalize(hashCacheEntry.begin());
|
for (unsigned int i = 0; i < tx.vin.size(); i++) {
|
||||||
AssertLockHeld(cs_main); //TODO: Remove this requirement by making CuckooCache not require external locks
|
const COutPoint &prevout = tx.vin[i].prevout;
|
||||||
if (scriptExecutionCache.contains(hashCacheEntry, !cacheFullScriptStore)) {
|
const Coin& coin = inputs.AccessCoin(prevout);
|
||||||
return true;
|
assert(!coin.IsSpent());
|
||||||
}
|
|
||||||
|
// We very carefully only pass in things to CScriptCheck which
|
||||||
for (unsigned int i = 0; i < tx.vin.size(); i++) {
|
// are clearly committed to by tx' witness hash. This provides
|
||||||
const COutPoint &prevout = tx.vin[i].prevout;
|
// a sanity check that our caching is not introducing consensus
|
||||||
const Coin& coin = inputs.AccessCoin(prevout);
|
// failures through additional data in, eg, the coins being
|
||||||
assert(!coin.IsSpent());
|
// spent being checked as a part of CScriptCheck.
|
||||||
|
|
||||||
// We very carefully only pass in things to CScriptCheck which
|
// Verify signature
|
||||||
// are clearly committed to by tx' witness hash. This provides
|
CScriptCheck check(coin.out, tx, i, flags, cacheSigStore, &txdata);
|
||||||
// a sanity check that our caching is not introducing consensus
|
if (pvChecks) {
|
||||||
// failures through additional data in, eg, the coins being
|
pvChecks->push_back(CScriptCheck());
|
||||||
// spent being checked as a part of CScriptCheck.
|
check.swap(pvChecks->back());
|
||||||
|
} else if (!check()) {
|
||||||
// Verify signature
|
if (flags & STANDARD_NOT_MANDATORY_VERIFY_FLAGS) {
|
||||||
CScriptCheck check(coin.out, tx, i, flags, cacheSigStore, &txdata);
|
// Check whether the failure was caused by a
|
||||||
if (pvChecks) {
|
// non-mandatory script verification check, such as
|
||||||
pvChecks->push_back(CScriptCheck());
|
// non-standard DER encodings or non-null dummy
|
||||||
check.swap(pvChecks->back());
|
// arguments; if so, ensure we return NOT_STANDARD
|
||||||
} else if (!check()) {
|
// instead of CONSENSUS to avoid downstream users
|
||||||
if (flags & STANDARD_NOT_MANDATORY_VERIFY_FLAGS) {
|
// splitting the network between upgraded and
|
||||||
// Check whether the failure was caused by a
|
// non-upgraded nodes by banning CONSENSUS-failing
|
||||||
// non-mandatory script verification check, such as
|
// data providers.
|
||||||
// non-standard DER encodings or non-null dummy
|
CScriptCheck check2(coin.out, tx, i,
|
||||||
// arguments; if so, ensure we return NOT_STANDARD
|
flags & ~STANDARD_NOT_MANDATORY_VERIFY_FLAGS, cacheSigStore, &txdata);
|
||||||
// instead of CONSENSUS to avoid downstream users
|
if (check2())
|
||||||
// splitting the network between upgraded and
|
return state.Invalid(ValidationInvalidReason::TX_NOT_STANDARD, false, REJECT_NONSTANDARD, strprintf("non-mandatory-script-verify-flag (%s)", ScriptErrorString(check.GetScriptError())));
|
||||||
// non-upgraded nodes by banning CONSENSUS-failing
|
|
||||||
// data providers.
|
|
||||||
CScriptCheck check2(coin.out, tx, i,
|
|
||||||
flags & ~STANDARD_NOT_MANDATORY_VERIFY_FLAGS, cacheSigStore, &txdata);
|
|
||||||
if (check2())
|
|
||||||
return state.Invalid(ValidationInvalidReason::TX_NOT_STANDARD, false, REJECT_NONSTANDARD, strprintf("non-mandatory-script-verify-flag (%s)", ScriptErrorString(check.GetScriptError())));
|
|
||||||
}
|
|
||||||
// MANDATORY flag failures correspond to
|
|
||||||
// ValidationInvalidReason::CONSENSUS. Because CONSENSUS
|
|
||||||
// failures are the most serious case of validation
|
|
||||||
// failures, we may need to consider using
|
|
||||||
// RECENT_CONSENSUS_CHANGE for any script failure that
|
|
||||||
// could be due to non-upgraded nodes which we may want to
|
|
||||||
// support, to avoid splitting the network (but this
|
|
||||||
// depends on the details of how net_processing handles
|
|
||||||
// such errors).
|
|
||||||
return state.Invalid(ValidationInvalidReason::CONSENSUS, false, REJECT_INVALID, strprintf("mandatory-script-verify-flag-failed (%s)", ScriptErrorString(check.GetScriptError())));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cacheFullScriptStore && !pvChecks) {
|
|
||||||
// We executed all of the provided scripts, and were told to
|
|
||||||
// cache the result. Do so now.
|
|
||||||
scriptExecutionCache.insert(hashCacheEntry);
|
|
||||||
}
|
}
|
||||||
|
// MANDATORY flag failures correspond to
|
||||||
|
// ValidationInvalidReason::CONSENSUS. Because CONSENSUS
|
||||||
|
// failures are the most serious case of validation
|
||||||
|
// failures, we may need to consider using
|
||||||
|
// RECENT_CONSENSUS_CHANGE for any script failure that
|
||||||
|
// could be due to non-upgraded nodes which we may want to
|
||||||
|
// support, to avoid splitting the network (but this
|
||||||
|
// depends on the details of how net_processing handles
|
||||||
|
// such errors).
|
||||||
|
return state.Invalid(ValidationInvalidReason::CONSENSUS, false, REJECT_INVALID, strprintf("mandatory-script-verify-flag-failed (%s)", ScriptErrorString(check.GetScriptError())));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (cacheFullScriptStore && !pvChecks) {
|
||||||
|
// We executed all of the provided scripts, and were told to
|
||||||
|
// cache the result. Do so now.
|
||||||
|
scriptExecutionCache.insert(hashCacheEntry);
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1769,6 +1760,11 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
|
||||||
pindexBestHeader->GetAncestor(pindex->nHeight) == pindex &&
|
pindexBestHeader->GetAncestor(pindex->nHeight) == pindex &&
|
||||||
pindexBestHeader->nChainWork >= nMinimumChainWork) {
|
pindexBestHeader->nChainWork >= nMinimumChainWork) {
|
||||||
// This block is a member of the assumed verified chain and an ancestor of the best header.
|
// This block is a member of the assumed verified chain and an ancestor of the best header.
|
||||||
|
// Script verification is skipped when connecting blocks under the
|
||||||
|
// assumevalid block. Assuming the assumevalid block is valid this
|
||||||
|
// is safe because block merkle hashes are still computed and checked,
|
||||||
|
// Of course, if an assumed valid block is invalid due to false scriptSigs
|
||||||
|
// this optimization would allow an invalid chain to be accepted.
|
||||||
// The equivalent time check discourages hash power from extorting the network via DOS attack
|
// The equivalent time check discourages hash power from extorting the network via DOS attack
|
||||||
// into accepting an invalid block through telling users they must manually set assumevalid.
|
// into accepting an invalid block through telling users they must manually set assumevalid.
|
||||||
// Requiring a software change or burying the invalid block, regardless of the setting, makes
|
// Requiring a software change or burying the invalid block, regardless of the setting, makes
|
||||||
|
@ -1952,7 +1948,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
|
||||||
{
|
{
|
||||||
std::vector<CScriptCheck> vChecks;
|
std::vector<CScriptCheck> vChecks;
|
||||||
bool fCacheResults = fJustCheck; /* Don't cache results if we're actually connecting blocks (still consult the cache, though) */
|
bool fCacheResults = fJustCheck; /* Don't cache results if we're actually connecting blocks (still consult the cache, though) */
|
||||||
if (!CheckInputs(tx, state, view, fScriptChecks, flags, fCacheResults, fCacheResults, txdata[i], nScriptCheckThreads ? &vChecks : nullptr)) {
|
if (fScriptChecks && !CheckInputs(tx, state, view, flags, fCacheResults, fCacheResults, txdata[i], nScriptCheckThreads ? &vChecks : nullptr)) {
|
||||||
if (state.GetReason() == ValidationInvalidReason::TX_NOT_STANDARD) {
|
if (state.GetReason() == ValidationInvalidReason::TX_NOT_STANDARD) {
|
||||||
// CheckInputs may return NOT_STANDARD for extra flags we passed,
|
// CheckInputs may return NOT_STANDARD for extra flags we passed,
|
||||||
// but we can't return that, as it's not defined for a block, so
|
// but we can't return that, as it's not defined for a block, so
|
||||||
|
|
Loading…
Reference in a new issue