aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
* fix a lock indentation in main.cppPhilip Kaufmann2014-10-061-5/+5
| | | | - also ensure alphabetical ordering in file header
* Merge pull request #5036Wladimir J. van der Laan2014-10-061-18/+20
|\ | | | | | | | | eb6b3b2 Update English translation (Wladimir J. van der Laan) b9b2e3f Don't translate state.Abort() messages (Wladimir J. van der Laan)
| * Don't translate state.Abort() messagesWladimir J. van der Laan2014-10-021-18/+20
| | | | | | | | | | | | | | | | There is only one message passed to AbortNode() that makes sense to translate to the user specifically: Disk space is low. For the others show a generic message and refer to debug.log for details. Reduces the number of confusing jargon translation messages.
* | Merge pull request #4890Wladimir J. van der Laan2014-10-061-9/+8
|\ \ | | | | | | | | | | | | | | | e790c37 Replace SCRIPT_VERIFY_NOCACHE by flag directly to checker (Pieter Wuille) 5c1e798 Make signature cache optional (Pieter Wuille) c7829ea Abstract out SignatureChecker (Pieter Wuille)
| * | Replace SCRIPT_VERIFY_NOCACHE by flag directly to checkerPieter Wuille2014-10-021-8/+7
| | |
| * | Make signature cache optionalPieter Wuille2014-10-021-1/+1
| |/
* | Merge pull request #4887Pieter Wuille2014-10-031-9/+9
|\ \ | | | | | | | | | 4bb30a1 Correct logging AcceptBlock()->AcceptBlockHeader() (R E Broadley)
| * | Correct logging AcceptBlock()->AcceptBlockHeader()R E Broadley2014-10-031-9/+9
| |/
* | Merge pull request #4978Wladimir J. van der Laan2014-10-021-1/+1
|\ \ | |/ |/| | | | | | | 938bcce CAutoFile: make file private (Philip Kaufmann) 0c35486 CBufferedFile: add explicit close function (Philip Kaufmann) c9fb27d CBufferedFile: convert into a non-refcounted RAII wrapper (Philip Kaufmann)
| * CBufferedFile: convert into a non-refcounted RAII wrapperPhilip Kaufmann2014-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | - it now takes over the passed file descriptor and closes it in the destructor - this fixes a leak in LoadExternalBlockFile(), where an exception could cause the file to not getting closed - disallow copies (like recently added for CAutoFile) - make nType and nVersion private
* | Switch testing framework from MAIN to new UNITTEST networkSergioDemianLerner2014-10-021-1/+2
| | | | | | | | UNITTEST inherites from MAIN but allows synamically changing its parameters using the ModifiableParams() interface
* | Revert merge of pull #4845Wladimir J. van der Laan2014-10-021-2/+1
| | | | | | | | | | | | | | | | | | | | | | It breaks the new mingw tests! See - https://travis-ci.org/bitcoin/bitcoin/jobs/36845581 - https://travis-ci.org/bitcoin/bitcoin/jobs/36845582 This reverts commit 470590277782cce2fe73275c74523aef59a51eab, 5e2e7fcb99738d9254d4030d53e4f711b2fc5ee0, a25fd6be138ff2bff7e2ad6a1a789db523c0193f.
* | Merge pull request #4845Wladimir J. van der Laan2014-10-021-1/+2
|\ \ | |/ |/| | | | | | | 4705902 Avoid introducing a virtual into CChainParams (Wladimir J. van der Laan) 5e2e7fc Suggested corrections on comments, variable names. Also new test case testing the PoW skip in UNITTEST. (SergioDemianLerner) a25fd6b Switch testing framework from MAIN to new UNITTEST network (SergioDemianLerner)
| * Suggested corrections on comments, variable names.SergioDemianLerner2014-09-291-2/+2
| | | | | | | | Also new test case testing the PoW skip in UNITTEST.
| * Switch testing framework from MAIN to new UNITTEST networkSergioDemianLerner2014-09-291-0/+1
| | | | | | | | UNITTEST inherites from MAIN but allows synamically changing its parameters using the ModifiableParams() interface
* | Merge pull request #5017Wladimir J. van der Laan2014-10-021-2/+4
|\ \ | | | | | | | | | | | | f74fc9b Print input index when signature validation fails, to aid debugging. (Mark Friedenbach) 217a5c9 When transaction outputs exceed inputs, show the offending amounts so as to aid debugging. (Mark Friedenbach)
| * | Print input index when signature validation fails, to aid debugging.Mark Friedenbach2014-10-011-1/+1
| | |
| * | When transaction outputs exceed inputs, show the offending amounts so as to ↵Mark Friedenbach2014-10-011-1/+3
| |/ | | | | | | aid debugging.
* | Merge pull request #4926Pieter Wuille2014-10-021-8/+7
|\ \ | | | | | | | | | 584a358 Do merkle root and txid duplicates check simultaneously (Pieter Wuille)
| * | Do merkle root and txid duplicates check simultaneouslyPieter Wuille2014-09-241-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the txid duplicates check into BuildMerkleTree, where it can be done much more efficiently (without needing to build a full txid set to detect duplicates). The previous version (using the std::set<uint256> to detect duplicates) was also slightly too weak. A block mined with actual duplicate transactions (which is invalid, due to the inputs of the duplicated transactions being seen as double spends) would trigger the duplicates logic, resulting in the block not being stored on disk, and rerequested. This change fixes that by only triggering in the case of duplicated transactions that can actually result in an identical merkle root.
* | | Merge pull request #4234Wladimir J. van der Laan2014-10-011-13/+13
|\ \ \ | |_|/ |/| | | | | | | | c122f55 qt: Register CAmount metatype (Wladimir J. van der Laan) a372168 Use a typedef for monetary values (Mark Friedenbach)
| * | Use a typedef for monetary valuesMark Friedenbach2014-09-261-13/+13
| | |
* | | Merge pull request #4796Pieter Wuille2014-09-291-59/+6
|\ \ \ | |/ / |/| | | | | | | | e8b5f0d Move CBlockIndex, CChain and related code out of main (jtimon) 6db83db Decouple CChain from mapBlockIndex (jtimon)
| * | Move CBlockIndex, CChain and related code out of mainjtimon2014-09-081-54/+0
| | |
| * | Decouple CChain from mapBlockIndexjtimon2014-09-081-5/+6
| | |
* | | autofile: don't copy CAutoFile by valueCory Fields2014-09-251-4/+4
| |/ |/|
* | Avoid copying undo dataPieter Wuille2014-09-171-8/+11
| |
* | Merge pull request #4555Wladimir J. van der Laan2014-09-171-9/+4
|\ \ | | | | | | | | | | | | | | | | | | 6dcfda2 Don't pass nHashType to EvalScript nor CheckSig (jtimon) 2b23a87 Don't pass nHashType to VerifyScript (jtimon) ce3649fb Remove CScriptCheck::nHashType (was always 0) (jtimon) 358562b Remove unused function main:VerifySignature (jtimon)
| * | Don't pass nHashType to EvalScript nor CheckSigjtimon2014-09-121-1/+1
| | |
| * | Don't pass nHashType to VerifyScriptjtimon2014-09-121-1/+1
| | |
| * | Remove CScriptCheck::nHashType (was always 0)jtimon2014-09-121-3/+3
| | |
| * | Remove unused function main:VerifySignaturejtimon2014-09-121-5/+0
| | |
* | | Merge pull request #4903Pieter Wuille2014-09-161-12/+16
|\ \ \ | | | | | | | | | | | | efad808 Avoid reject message feedback loops (Pieter Wuille)
| * | | Avoid reject message feedback loopsPieter Wuille2014-09-121-12/+16
| |/ /
* | | Merge pull request #4460Wladimir J. van der Laan2014-09-161-3/+3
|\ \ \ | | | | | | | | | | | | 604ee2a Remove tx from AlreadyAskedFor list once we receive it, not when we process it. (R E Broadley)
| * | | Remove tx from AlreadyAskedFor list once we receive it, not when we process it.R E Broadley2014-07-161-3/+3
| | | |
* | | | Merge pull request #4875Pieter Wuille2014-09-161-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f7e3637 Eliminate extra assignment (Suhas Daftuar) ec7eb0f When reindexing check for file before trying to open (refactored) (Suhas Daftuar)
| * | | | Eliminate extra assignmentSuhas Daftuar2014-09-151-2/+1
| | | | |
| * | | | When reindexing check for file before trying to open (refactored)Suhas Daftuar2014-09-101-1/+7
| | |_|/ | |/| |
* | | | Fixing compiler warning C4101ENikS2014-09-151-1/+1
| | | | | | | | | | | | | | | | Github-Pull: #4856
* | | | Merge pull request #4798Wladimir J. van der Laan2014-09-151-6/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | d920f7d Move g_signals.SetBestChain(..) below SyncWithWallets (Cozz Lovan)
| * | | Move g_signals.SetBestChain(..) below SyncWithWalletsCozz Lovan2014-08-311-6/+6
| | | |
* | | | Store fewer orphan tx by default, add -maxorphantx optionGavin Andresen2014-09-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason to store thousands of orphan transactions; normally an orphan's parents will either be broadcast or mined reasonably quickly. This pull drops the maximum number of orphans from 10,000 down to 100, and adds a command-line option (-maxorphantx) that is just like -maxorphanblocks to override the default.
* | | | Stricter handling of orphan transactionsGavin Andresen2014-09-101-13/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent denial-of-service attacks by banning peers that send us invalid orphan transactions and only storing orphan transactions given to us by a peer while the peer is connected.
* | | | Fix crashing bug caused by orphan(s) with duplicate prevout.hashGavin Andresen2014-09-101-0/+2
| | | |
* | | | Merge pull request #4878Wladimir J. van der Laan2014-09-101-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 540ac45 Avoid returning many "inv" orphans (Jeff Garzik) d4168c8 Limit CNode::mapAskFor (Wladimir J. van der Laan)
| * | | | Avoid returning many "inv" orphansJeff Garzik2014-09-091-0/+5
| | | | |
* | | | | Merge pull request #4822Pieter Wuille2014-09-101-14/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 629d75f Combine CCoinsViewCache's HaveCoins and const GetCoins into AccessCoins. (Pieter Wuille)
| * | | | | Combine CCoinsViewCache's HaveCoins and const GetCoins into AccessCoins.Pieter Wuille2014-09-031-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The efficient version of CCoinsViewCache::GetCoins only works for known-to-exist cache entries, requiring a separate HaveCoins call beforehand. This is inefficient as both perform a hashtable lookup. Replace the non-mutable GetCoins with AccessCoins, which returns a potentially-NULL pointer. This also decreases the overloading of GetCoins. Also replace some copying (inefficient) GetCoins calls with equivalent AccessCoins, decreasing the copying.
* | | | | | Merge pull request #4868Pieter Wuille2014-09-091-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | 2c2cc5d Remove some unnecessary c_strs() in logging and the GUI (Philip Kaufmann) f7d0a86 netbase: Use .data() instead of .c_str() on binary string (Wladimir J. van der Laan)