diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2014-06-27 10:53:24 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-06-27 10:53:24 -0400 |
| commit | 62599373883a66a958136f48ab0e2b826e3d5bf8 (patch) | |
| tree | 6a4ba3c3f9e3815b4b5ad8c0b89d8a63869a4adf /src/main.h | |
| parent | 4684c883bba5733576695676b8ac9ca7726784ea (diff) | |
| parent | 7f3b4e95695d50a4970e6eb91faa956ab276f161 (diff) | |
| download | bitcoin-62599373883a66a958136f48ab0e2b826e3d5bf8.tar.xz | |
Merge pull request #4365 from gavinandresen/relax_isstandard
Relax IsStandard rules for pay-to-script-hash transactions
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main.h b/src/main.h index 9858bcfd69..0332db2163 100644 --- a/src/main.h +++ b/src/main.h @@ -43,6 +43,8 @@ static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 50000; static const unsigned int MAX_STANDARD_TX_SIZE = 100000; /** The maximum allowed number of signature check operations in a block (network rule) */ static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; +/** Maxiumum number of signature check operations in an IsStandard() P2SH script */ +static const unsigned int MAX_P2SH_SIGOPS = 15; /** The maximum number of orphan transactions kept in memory */ static const unsigned int MAX_ORPHAN_TRANSACTIONS = MAX_BLOCK_SIZE/100; /** Default for -maxorphanblocks, maximum number of orphan blocks kept in memory */ |