diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-03-03 13:59:19 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-03-03 13:59:19 -0500 |
| commit | 7013cc3d9710c0a03f6587c854e4e50c358ea70c (patch) | |
| tree | 35e3c2ff533126be6d8d495eb6cf33d62b609014 /src/main.h | |
| parent | ef48e9b7dfde66368c27ed34f5f42de1b8e781f9 (diff) | |
| parent | 88aa771536014919e955c4f7b2cada9a0dcf8561 (diff) | |
| download | bitcoin-7013cc3d9710c0a03f6587c854e4e50c358ea70c.tar.xz | |
Merge branch '0.4.x' into 0.5.0.x
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main.h b/src/main.h index 4232d2a0f7..a1fb548f08 100644 --- a/src/main.h +++ b/src/main.h @@ -30,6 +30,7 @@ class CBlockIndex; static const unsigned int MAX_BLOCK_SIZE = 1000000; static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2; static const int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; +static const int MAX_ORPHAN_TRANSACTIONS = MAX_BLOCK_SIZE/100; static const int64 COIN = 100000000; static const int64 CENT = 1000000; static const int64 MIN_TX_FEE = 50000; |