aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Create (MANDATORY|STANDARD)_SCRIPT_VERIFY_FLAGS constantsPeter Todd2014-05-051-1/+1
| |/
* | Merge pull request #3884Wladimir J. van der Laan2014-05-091-71/+153
|\ \ | | | | | | | | | | | | 942b33a Split AcceptBlockHeader from AcceptBlock. (Pieter Wuille) f457347 Split up CheckBlock in a block and header version (Pieter Wuille)
| * | Split AcceptBlockHeader from AcceptBlock.Pieter Wuille2014-04-251-63/+137
| | | | | | | | | | | | Also modify some connection logic to deal with non-full blocks in the index.
| * | Split up CheckBlock in a block and header versionPieter Wuille2014-04-251-9/+17
| | |
* | | Add missing cs_main lock to VerifyDBWladimir J. van der Laan2014-05-071-0/+1
| |/ |/| | | | | Fixes issue #4139.
* | Merge pull request #4109Wladimir J. van der Laan2014-05-011-44/+45
|\ \ | | | | | | | | | 6b29ccc Correct indentation (R E Broadley)
| * | Correct indentationR E Broadley2014-04-301-44/+45
| |/
* / use standard __func__ instead of __PRETTY_FUNCTION__Philip Kaufmann2014-04-301-4/+4
|/
* Add MESSAGE_START_SIZE from chainparams when loading blocks from external files.Simon de la Rouviere2014-04-241-2/+2
|
* Add missing AssertLockHeld in ConnectBlockWladimir J. van der Laan2014-04-231-0/+1
|
* Solve chainActive-related locking issuesWladimir J. van der Laan2014-04-181-7/+8
| | | | | | | | | | | - In wallet and GUI code LOCK cs_main as well as cs_wallet when necessary - In main.cpp SendMessages move the TRY_LOCK(cs_main) up, to encompass the call to IsInitialBlockDownload. - Make ActivateBestChain, AddToBlockIndex, IsInitialBlockDownload, InitBlockIndex acquire the cs_main lock Fixes #3997
* Add AssertLockHeld for cs_main to ChainActive-using functionsWladimir J. van der Laan2014-04-171-0/+15
| | | | | | | | | | All functions that use ChainActive but do not aquire the cs_main lock themselves, need to be called with the cs_main lock held. This commit adds assertions to all externally callable functions that use chainActive or chainMostWork. This will flag usages when built with -DDEBUG_LOCKORDER.
* Move assert(pindexNew); to above where we dereference pindexNew.Gregory Maxwell2014-04-051-1/+1
|
* Merge pull request #3842 from ditto-b/masterGavin Andresen2014-04-021-1/+6
|\ | | | | Fix for GetBlockValue() after block 13,440,000
| * Fix for GetBlockValue() after block 13,440,000ditto-b2014-03-101-1/+6
| | | | | | | | | | Forces the block reward to zero when right shift in GetBlockValue() is undefined, after 64 reward halvings (block height 13,440,000).
* | Fix `-printblocktree` outputWladimir J. van der Laan2014-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | PrintBlockTree output was broken starting from e010af70. Everything appears on one line. PrintWallet() added the newline after a block, but this functionality was removed and no newline was added. Seemingly, no one noticed. Add a newline after the block information to fix this.
* | minor style cleanupsPhilip Kaufmann2014-03-111-9/+9
| |
* | Merge branch 'match_relay_fee' of git://github.com/mikehearn/bitcoinGavin Andresen2014-03-111-1/+1
|\ \
| * | Make mining fee policy match relay fee policy.Mike Hearn2014-03-101-1/+1
| |/ | | | | | | | | | | This resolves a case in which a mismatch could be used to bloat up the mempool by sending transactions that pay enough fee to relay, but not to be mined, with the default policies.
* | Merge pull request #3696Wladimir J. van der Laan2014-03-111-2/+3
|\ \ | |/ |/| | | | | c4656e0 Add progress to initial display of latest block downloaded. (R E Broadley) 75b8953 Display progress of rescan. (R E Broadley)
| * Add progress to initial display of latest block downloaded.R E Broadley2014-02-191-2/+3
| |
* | Merge pull request #3514Wladimir J. van der Laan2014-03-101-27/+122
|\ \ | | | | | | | | | f59d8f0 Per-peer block download tracking and stalled download detection. (Pieter Wuille)
| * | Per-peer block download tracking and stalled download detection.Pieter Wuille2014-02-081-27/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | Keep track of which block is being requested (and to be requested) from each peer, and limit the number of blocks in-flight per peer. In addition, detect stalled downloads, and disconnect if they persist for too long. This means blocks are never requested twice, and should eliminate duplicate downloads during synchronization.
* | | Merge pull request #3694 from gavinandresen/vfspentGavin Andresen2014-02-281-4/+21
|\ \ \ | | | | | | | | Remove CWalletTx::vfSpent
| * | | Remove CWalletTx::vfSpentGavin Andresen2014-02-261-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | Use the spent outpoint multimap to figure out which wallet transaction outputs are unspent, instead of a vfSpent array that is saved to disk.
* | | | Merge pull request #3735 from laanwj/2014_02_remove_PRIx64_completelyGavin Andresen2014-02-261-7/+7
|\ \ \ \ | |/ / / |/| | | Remove PRIx64 usage completely
| * | | Get rid of C99 PRI?64 usage in source filesWladimir J. van der Laan2014-02-241-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amend to d5f1e72. It turns out that BerkelyDB was including inttypes.h indirectly, so we cannot fix this with just macros. Trivial commit: apply the following script to all .cpp and .h files: # Middle sed -i 's/"PRIx64"/x/g' "$1" sed -i 's/"PRIu64"/u/g' "$1" sed -i 's/"PRId64"/d/g' "$1" # Initial sed -i 's/PRIx64"/"x/g' "$1" sed -i 's/PRIu64"/"u/g' "$1" sed -i 's/PRId64"/"d/g' "$1" # Trailing sed -i 's/"PRIx64/x"/g' "$1" sed -i 's/"PRIu64/u"/g' "$1" sed -i 's/"PRId64/d"/g' "$1" After this commit, `git grep` for PRI.64 should turn up nothing except the defines in util.h.
* | | | Merge pull request #3305 from mikehearn/fee_dropJeff Garzik2014-02-241-1/+1
|\ \ \ \ | |/ / / |/| | | Drop fees by 10x due to the persistently higher exchange rate.
| * | | Drop fees by 10x due to the persistently higher exchange rate.Mike Hearn2013-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last fee drop was by 5x (from 50k satoshis to 10k satoshis) in the 0.8.2 release which was about 6 months ago. The current fee is (assuming a $500 exchange rate) about 5 dollar cents. The new fee after this patch is 0.5 cents. Miners who prefer the higher fees are obviously still able to use the command line flags to override this setting. Miners who choose to create smaller blocks will select the highest-fee paying transactions anyway. This would hopefully be the last manual adjustment ever required before floating fees become normal.
* | | | Don't use PRIx64 formatting derives from inttypes.hWladimir J. van der Laan2014-02-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the tinyformat-based formatting system (introduced in b77dfdc) is type-safe, no special format characters are needed to specify sizes. Tinyformat can support (ignore) the C99 prefixes such as "ll" but chokes on MSVC's inttypes.h defines prefixes such as "I64X". So don't include inttypes.h and define our own for compatibility. (an alternative would be to sweep the entire codebase using sed -i to get rid of the size specifiers but this has less diff impact)
* | | | Merge pull request #2910Wladimir J. van der Laan2014-02-201-1/+24
|\ \ \ \ | | | | | | | | | | | | | | | d8b4b49 Don't store or send side-chain blocks lower than last checkpoint. (Ashley Holman)
| * | | | Don't store or send side-chain blocks lower than last checkpoint.Ashley Holman2014-01-191-1/+24
| | | | |
* | | | | Merge pull request #3666Wladimir J. van der Laan2014-02-171-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | bbfce8a fix non-standard reason string in main.cpp (Philip Kaufmann)
| * | | | fix non-standard reason string in main.cppPhilip Kaufmann2014-02-131-1/+1
| | | | |
* | | | | Merge pull request #3646Wladimir J. van der Laan2014-02-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 5770254 Copyright header updates s/2013/2014 on files whose last git commit was done in 2014. contrib/devtools/fix-copyright-headers.py script to be able to perform this maintenance task with ease during the rest of the year, every year. Modifications to contrib/devtools/README.md to document what fix-copyright-headers.py does. (gubatron)
| * | | | | Copyright header updates s/2013/2014 on files whose last git commit was done ↵gubatron2014-02-091-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | in 2014. contrib/devtools/fix-copyright-headers.py script to be able to perform this maintenance task with ease during the rest of the year, every year. Modifications to contrib/devtools/README.md to document what fix-copyright-headers.py does.
* | | | | Handle "conflicted" transactions properlyGavin Andresen2014-02-141-1/+9
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend CMerkleTx::GetDepthInMainChain with the concept of a "conflicted" transaction-- a transaction generated by the wallet that is not in the main chain or in the mempool, and, therefore, will likely never be confirmed. GetDepthInMainChain() now returns -1 for conflicted transactions (0 for unconfirmed-but-in-the-mempool, and >1 for confirmed). This makes getbalance, getbalance '*', and listunspent all agree when there are mutated transactions in the wallet. Before: listunspent: one 49BTC output getbalance: 96 BTC (change counted twice) getbalance '*': 46 BTC (spends counted twice) After: all agree, 49 BTC available to spend.
* | | | Add HasCanonicalPushes(), and use it in IsStandardTxPieter Wuille2014-02-111-0/+4
|/ / /
* | | Limit the number of orphan blocksPieter Wuille2014-01-311-1/+27
| | | | | | | | | | | | | | | | | | | | | In case the total number of orphan blocks in memory exceeds a limit (currently set to 750), a random orphan block (which is not depended on by another orphan block) is dropped. This means it will need to be downloaded again, but it won't consume memory until then.
* | | Merge pull request #3592Wladimir J. van der Laan2014-01-301-43/+43
|\ \ \ | | | | | | | | | | | | | | | | c117d9e Support for error messages and a few more rejection reasons (Luke Dashjr) 14e7ffc Use standard BIP 22 rejection reasons where applicable (Luke Dashjr)
| * | | Support for error messages and a few more rejection reasonsLuke Dashjr2014-01-291-8/+8
| | | |
| * | | Use standard BIP 22 rejection reasons where applicableLuke Dashjr2014-01-291-35/+35
| | | |
* | | | Merge pull request #3370 from sipa/headersfirst3Gavin Andresen2014-01-291-220/+271
|\ \ \ \ | |/ / / |/| | | Prepare block connection logic for headers-first
| * | | Prepare block connection logic for headers-first.Pieter Wuille2014-01-271-195/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the block processing logic from "try to atomically switch to a new block" to a continuous "(dis)connect a block, aiming for the assumed best chain". This means the smallest atomic operations on the chainstate become individual block connections or disconnections, instead of entire reorganizations. It may mean that we try to reorganize to one block, fail, and rereorganize again to the old block. This is slower, but doesn't require unbounded RAM. It also means that a ConnectBlock which fails may be no longer called from the ProcessBlock which knows which node sent it. To deal with that, a mapBlockSource is kept, and invalid blocks cause asynchronous "reject" messages and banning (if necessary).
| * | | Move only: extract WriteChainState and UpdatedTip from SetBestChain.Pieter Wuille2014-01-271-60/+63
| | | |
* | | | use english for all reason strings in IsStandardTx()Philip Kaufmann2014-01-281-1/+1
|/ / /
* | | Fix off-by-one errors in use of IsFinalTx()Peter Todd2014-01-261-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously CreateNewBlock() didn't take into account the fact that IsFinalTx() without any arguments tests if the transaction is considered final in the *current* block, when both those functions really needed to know if the transaction would be final in the *next* block. Additionally the UI had a similar misunderstanding. Also adds some basic tests to check that CreateNewBlock() is in fact mining nLockTime-using transactions correctly. Thanks to Wladimir J. van der Laan for rebase.
* | | Remove redundant .c_str()sWladimir J. van der Laan2014-01-231-74/+74
| | | | | | | | | | | | | | | | | | | | | After the tinyformat switch sprintf() family functions support passing actual std::string objects. Remove unnecessary c_str calls (236 of them) in logging and formatting.
* | | Typesafe strprintf/error/LogPrint functionsWladimir J. van der Laan2014-01-231-1/+1
|/ / | | | | | | | | | | | | Switch to tinyformat-based formatting. Tinyformat is a typesafe drop-in replacement for C99 printf functions: https://github.com/c42f/tinyformat
* | Merge pull request #3490Wladimir J. van der Laan2014-01-181-8/+8
|\ \ | | | | | | | | | 7e08e29 better std::exception logging for block/undo files (Philip Kaufmann)