diff options
| author | Gavin Andresen <[email protected]> | 2010-09-23 13:14:52 -0400 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2010-09-23 13:14:52 -0400 |
| commit | 3764c12b1f05c554c8db4af7605302dd21d31325 (patch) | |
| tree | 3088b379ceee6fadebd435a62433c34ae6dfc827 /main.cpp | |
| parent | Add branch README.md (diff) | |
| parent | changed free transactions per block threshold (diff) | |
| download | discoin-3764c12b1f05c554c8db4af7605302dd21d31325.tar.xz discoin-3764c12b1f05c554c8db4af7605302dd21d31325.zip | |
Merge remote branch 'svn/trunk' into svn
Diffstat (limited to 'main.cpp')
| -rw-r--r-- | main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2929,7 +2929,7 @@ void BitcoinMiner() CTxDB txdb("r"); map<uint256, CTxIndex> mapTestPool; vector<char> vfAlreadyAdded(mapTransactions.size()); - uint64 nBlockSize = 10000; + uint64 nBlockSize = 1000; int nBlockSigOps = 100; bool fFoundSomething = true; while (fFoundSomething) @@ -2944,7 +2944,7 @@ void BitcoinMiner() if (tx.IsCoinBase() || !tx.IsFinal()) continue; unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK); - if (nBlockSize + nTxSize >= MAX_BLOCK_SIZE) + if (nBlockSize + nTxSize >= MAX_BLOCK_SIZE_GEN) continue; int nTxSigOps = tx.GetSigOpCount(); if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS) |