aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4787Wladimir J. van der Laan2014-09-222-33/+19
|\ | | | | | | 4b0deb3 Clean up CMerkleTx::SetMerkleBranch. (Daniel Kraft)
| * Clean up CMerkleTx::SetMerkleBranch.Daniel Kraft2014-08-302-33/+19
| | | | | | | | | | | | The case SetMerkleBranch(NULL) was never actually used, and thus the involved code (loading the block from disk) can be removed and the implementation simplified.
* | Merge pull request #4852Wladimir J. van der Laan2014-09-2215-25/+39
|\ \ | | | | | | | | | 5e83bc4 [Qt] include and file header cleanup (Philip Kaufmann)
| * | [Qt] include and file header cleanupPhilip Kaufmann2014-09-1815-25/+39
| | | | | | | | | | | | | | | - alphabetical ordering - correct ordering own headers before normal headers etc.
* | | Merge pull request #4947Wladimir J. van der Laan2014-09-221-2/+0
|\ \ \ | | | | | | | | | | | | 6134b43 Fixing condition 'sabotaging' MSVC build (ENikS)
| * | | Fixing condition 'sabotaging' MSVC buildENikS2014-09-191-2/+0
| | | |
* | | | Merge pull request #4951Wladimir J. van der Laan2014-09-224-4/+9
|\ \ \ \ | | | | | | | | | | | | | | | d6712db Also create pid file in non-daemon mode (Wladimir J. van der Laan)
| * | | | Also create pid file in non-daemon modeWladimir J. van der Laan2014-09-204-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always make a pid file, not only when `-daemon` specified. This is useful for troubleshooting, for attaching debuggers and loggers and such. - Write the pid file only after the datadir lock was acquired - Don't create or remove a pid file on WIN32, and also don't show the option
* | | | | qt: Make splash and shutdown window ignore close eventsWladimir J. van der Laan2014-09-225-11/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's strange to be able to close these windows while there is work in progress. Also set Qt::WA_DeleteOnClose on both windows to make sure that they are deleted eventually, no matter what happens.
* | | | | Merge pull request #4941Wladimir J. van der Laan2014-09-223-19/+58
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | a49f11d qt: Change splash screen to normal window (Wladimir J. van der Laan)
| * | | | | qt: Change splash screen to normal windowWladimir J. van der Laan2014-09-183-19/+58
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Makes it possible to move, minimize, unminimize the window while Bitcoin Core is initializing.
* | | | | Merge pull request #4952Wladimir J. van der Laan2014-09-221-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 01c2807 Add warning about the merkle-tree algorithm duplicate txid flaw (Peter Todd)
| * | | | | Add warning about the merkle-tree algorithm duplicate txid flawPeter Todd2014-09-201-0/+7
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Lots of people read the Bitcoin Core codebase to learn more about crypto; better to warn about flaws explicitly so they don't blindly copy the code for other uses and create broken systems.
* | | | | Merge pull request #4950Wladimir J. van der Laan2014-09-211-3/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 33a2771 test: Fix DoS tests after c74332c (Wladimir J. van der Laan)
| * | | | | test: Fix DoS tests after c74332cWladimir J. van der Laan2014-09-201-3/+7
| |/ / / / | | | | | | | | | | | | | | | Fix data structure mismatch ... The mind boggles that they were still passing at all.
* | | | | Merge pull request #4933Pieter Wuille2014-09-2130-744/+847
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | 20e01b1 Apply clang-format on some infrequently-updated files (Pieter Wuille)
| * | | | Apply clang-format on some infrequently-updated filesPieter Wuille2014-09-1930-744/+847
| | |/ / | |/| |
* | | | Merge pull request #4835Pieter Wuille2014-09-201-8/+11
|\ \ \ \ | |/ / / |/| | | | | | | ab15b2e Avoid copying undo data (Pieter Wuille)
| * | | Avoid copying undo dataPieter Wuille2014-09-171-8/+11
| | | |
* | | | Fixing 'vector out of bounds' issue in base 32 and 64ENikS2014-09-181-2/+2
| |/ / |/| |
* | | Merge pull request #4667Wladimir J. van der Laan2014-09-182-19/+16
|\ \ \ | | | | | | | | | | | | | | | | bbad683 [Qt] simplify return code and return values in txtablemodel (Philip Kaufmann) 21f1516 [Qt] add all used colors in txtablemodel to guiconstants (Philip Kaufmann)
| * | | [Qt] simplify return code and return values in txtablemodelPhilip Kaufmann2014-08-281-16/+6
| | | | | | | | | | | | | | | | - also move an added space in a string where it belongs
| * | | [Qt] add all used colors in txtablemodel to guiconstantsPhilip Kaufmann2014-08-282-3/+10
| | | | | | | | | | | | | | | | - add colors used in TX status decoration
* | | | Merge pull request #4936Wladimir J. van der Laan2014-09-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | c15e483 typo fix of booleamn to boolean (imharrywu)
| * | | | typo fix of booleamn to booleanimharrywu2014-09-181-1/+1
| | |/ / | |/| |
* | | | cleanup class private and public areas in walletdbPhilip Kaufmann2014-09-182-11/+10
| | | | | | | | | | | | | | | | - only code movement
* | | | prefer const string& over char* in CDB and CWalletDB constructorPhilip Kaufmann2014-09-183-14/+16
|/ / / | | | | | | | | | - also make parameter of CDBEnv::CheckpointLSN a constant reference
* | | Merge pull request #4555Wladimir J. van der Laan2014-09-1711-70/+57
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-125-21/+18
| | | |
| * | | Don't pass nHashType to VerifyScriptjtimon2014-09-1210-37/+36
| | | |
| * | | Remove CScriptCheck::nHashType (was always 0)jtimon2014-09-123-9/+7
| | | |
| * | | Remove unused function main:VerifySignaturejtimon2014-09-123-8/+1
| | | |
* | | | Merge pull request #4863Wladimir J. van der Laan2014-09-172-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 1a61396 fix missing gettransaction entries in rpcclient (Benedict Chan) 57e1716 update rpc help message for gettransaction to add includeWatchonly param (Benedict Chan)
| * | | | fix missing gettransaction entries in rpcclientBenedict Chan2014-09-161-0/+1
| | | | |
| * | | | update rpc help message for gettransaction to add includeWatchonly paramBenedict Chan2014-09-161-1/+2
| | | | |
* | | | | Merge pull request #4899Wladimir J. van der Laan2014-09-1722-122/+122
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 0be990b Move CTxDestination from script/script to script/standard (Pieter Wuille)
| * | | | | Move CTxDestination from script/script to script/standardPieter Wuille2014-09-1622-122/+122
| | | | | |
* | | | | | Merge pull request #4927Pieter Wuille2014-09-161-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | ee304b6 minor changes for help message of getpeerinfo (Philip Kaufmann)
| * | | | | minor changes for help message of getpeerinfoPhilip Kaufmann2014-09-161-2/+2
| | | | | |
* | | | | | Merge pull request #4928Pieter Wuille2014-09-161-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | e9992fb remove include of chainparams.h (imharrywu)
| * | | | | | remove include of chainparams.himharrywu2014-09-161-1/+0
| |/ / / / / | | | | | | | | | | | | chainparams.h has not been used in this cpp file already, consider to remove it for clean.
* | | | | | 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 #4930Wladimir J. van der Laan2014-09-161-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | f4fe205 add nModSize init to default constructor of CTxMemPoolEntry (Philip Kaufmann)
| * | | | | | add nModSize init to default constructor of CTxMemPoolEntryPhilip Kaufmann2014-09-161-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4719Wladimir J. van der Laan2014-09-1614-2072/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 52a5f90 Create the common location for all m4 autotool build scripts, build-aux/m4.
| * | | | | | Create the common location for all m4 autotool build scripts, build-aux/m4.randy-waterhouse2014-09-1614-2072/+0
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Update .gitignore.
* | | | | | 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 #4853Wladimir J. van der Laan2014-09-169-193/+241
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | 2605b94 [Qt] update form files for setting autoDefault explicitly to false (Philip Kaufmann)