diff options
| author | Jorge Timón <jtimon@jtimon.cc> | 2015-06-24 07:25:30 +0200 |
|---|---|---|
| committer | Jorge Timón <jtimon@jtimon.cc> | 2015-06-26 17:59:07 +0200 |
| commit | 627b9deff4e8e18fc6d001b6eb9818c13c648820 (patch) | |
| tree | e8e3f715765fe9d1136814c587038d68ecc5a45c /src/script | |
| parent | 24f24896d602bef3323c5ff66bbccc92448e89d5 (diff) | |
| download | bitcoin-627b9deff4e8e18fc6d001b6eb9818c13c648820.tar.xz | |
Policy: MOVEONLY: Create policy/policy.h with some constants
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/sign.cpp | 3 | ||||
| -rw-r--r-- | src/script/standard.h | 17 |
2 files changed, 2 insertions, 18 deletions
diff --git a/src/script/sign.cpp b/src/script/sign.cpp index 4543ca303f..8b43183b6d 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -5,9 +5,10 @@ #include "script/sign.h" -#include "primitives/transaction.h" #include "key.h" #include "keystore.h" +#include "policy/policy.h" +#include "primitives/transaction.h" #include "script/standard.h" #include "uint256.h" diff --git a/src/script/standard.h b/src/script/standard.h index 3b401dfe4f..c4ad17dd8f 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -39,23 +39,6 @@ extern unsigned nMaxDatacarrierBytes; */ static const unsigned int MANDATORY_SCRIPT_VERIFY_FLAGS = SCRIPT_VERIFY_P2SH; -/** - * Standard script verification flags that standard transactions will comply - * with. However scripts violating these flags may still be present in valid - * blocks and we must accept those blocks. - */ -static const unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VERIFY_FLAGS | - SCRIPT_VERIFY_DERSIG | - SCRIPT_VERIFY_STRICTENC | - SCRIPT_VERIFY_MINIMALDATA | - SCRIPT_VERIFY_NULLDUMMY | - SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS | - SCRIPT_VERIFY_CLEANSTACK | - SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY; - -/** For convenience, standard but not mandatory verify flags. */ -static const unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS = STANDARD_SCRIPT_VERIFY_FLAGS & ~MANDATORY_SCRIPT_VERIFY_FLAGS; - enum txnouttype { TX_NONSTANDARD, |