phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-10 20:03:34 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Move MANDATORY_SCRIPT_VERIFY_FLAGS from script/standard.h to policy/policy.h

Browse source
This commit is contained in:
Anthony Towns 2022-10-11 14:20:22 +10:00 committed by Andrew Chow
parent b565485c24
commit cba69dda3d
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/policy/policy.h
View file

@ -69,10 +69,22 @@ static constexpr unsigned int DEFAULT_DESCENDANT_SIZE_LIMIT_KVB{101};
* configurable as it doesn't materially change DoS parameters. * configurable as it doesn't materially change DoS parameters.
*/ */
static constexpr unsigned int EXTRA_DESCENDANT_TX_SIZE_LIMIT{10000}; static constexpr unsigned int EXTRA_DESCENDANT_TX_SIZE_LIMIT{10000};
/**
* Mandatory script verification flags that all new transactions must comply with for
* them to be valid. Failing one of these tests may trigger a DoS ban;
* see CheckInputScripts() for details.
*
* Note that this does not affect consensus validity; see GetBlockScriptFlags()
* for that.
*/
static const unsigned int MANDATORY_SCRIPT_VERIFY_FLAGS = SCRIPT_VERIFY_P2SH;
/** /**
* Standard script verification flags that standard transactions will comply * Standard script verification flags that standard transactions will comply
* with. However scripts violating these flags may still be present in valid * with. However we do not ban/disconnect nodes that forward txs violating
* blocks and we must accept those blocks. * these rules, for better forwards and backwards compatability.
*/ */
static constexpr unsigned int STANDARD_SCRIPT_VERIFY_FLAGS{MANDATORY_SCRIPT_VERIFY_FLAGS | static constexpr unsigned int STANDARD_SCRIPT_VERIFY_FLAGS{MANDATORY_SCRIPT_VERIFY_FLAGS |
SCRIPT_VERIFY_DERSIG | SCRIPT_VERIFY_DERSIG |

10
src/script/standard.h
View file

@ -38,16 +38,6 @@ public:
*/ */
static const unsigned int MAX_OP_RETURN_RELAY = 83; static const unsigned int MAX_OP_RETURN_RELAY = 83;
/**
* Mandatory script verification flags that all new blocks must comply with for
* them to be valid. (but old blocks may not comply with) Currently just P2SH,
* but in the future other flags may be added.
*
* Failing one of these tests may trigger a DoS ban - see CheckInputScripts() for
* details.
*/
static const unsigned int MANDATORY_SCRIPT_VERIFY_FLAGS = SCRIPT_VERIFY_P2SH;
enum class TxoutType { enum class TxoutType {
NONSTANDARD, NONSTANDARD,
// 'standard' transaction types: // 'standard' transaction types: