diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-26 14:33:12 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-26 14:42:09 +0200 |
| commit | 1d9d314573ee48f6f51107265f1cf1fa9e36c998 (patch) | |
| tree | 6c1946ec948bf2dbd9f4bc1bf37bfe14d79808f3 /src/main.h | |
| parent | 1623f6e3375430b42e7120dc02e8df8c7c22fc16 (diff) | |
| parent | 691161d419fe3d82d7a49b511ef80e2b24332aac (diff) | |
| download | bitcoin-1d9d314573ee48f6f51107265f1cf1fa9e36c998.tar.xz | |
Merge pull request #5696
691161d Consensus: Create consensus/consensus.h with some constants (jtimon)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/main.h b/src/main.h index d34f6c30d1..b0aec6662d 100644 --- a/src/main.h +++ b/src/main.h @@ -14,9 +14,10 @@ #include "chain.h" #include "chainparams.h" #include "coins.h" +#include "consensus/consensus.h" +#include "net.h" #include "primitives/block.h" #include "primitives/transaction.h" -#include "net.h" #include "script/script.h" #include "script/sigcache.h" #include "script/standard.h" @@ -53,8 +54,6 @@ static const unsigned int DEFAULT_BLOCK_MIN_SIZE = 0; static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 50000; /** The maximum size for transactions we're willing to relay/mine */ 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; /** Maximum number of signature check operations in an IsStandard() P2SH script */ static const unsigned int MAX_P2SH_SIGOPS = 15; /** The maximum number of sigops we're willing to relay/mine in a single tx */ @@ -67,10 +66,6 @@ static const unsigned int MAX_BLOCKFILE_SIZE = 0x8000000; // 128 MiB static const unsigned int BLOCKFILE_CHUNK_SIZE = 0x1000000; // 16 MiB /** The pre-allocation chunk size for rev?????.dat files (since 0.8) */ static const unsigned int UNDOFILE_CHUNK_SIZE = 0x100000; // 1 MiB -/** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */ -static const int COINBASE_MATURITY = 100; -/** Threshold for nLockTime: below this value it is interpreted as block number, otherwise as UNIX timestamp. */ -static const unsigned int LOCKTIME_THRESHOLD = 500000000; // Tue Nov 5 00:53:20 1985 UTC /** Maximum number of script-checking threads allowed */ static const int MAX_SCRIPTCHECK_THREADS = 16; /** -par default (number of script-checking threads, 0 = auto) */ |