aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #3356Wladimir J. van der Laan2013-12-051-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3ef9b0 Prevent empty transactions from being added to vtxPrev (Wladimir J. van der Laan)
| * | | | | | | | | | Prevent empty transactions from being added to vtxPrevWladimir J. van der Laan2013-12-041-0/+4
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CWalletTx::AddSupportingTransactions() was adding empty transaction to vtxPrev in some cases. Skip over these. Part one of the solution to #3190. This prevents invalid vtxPrev from entering the wallet, but not current ones being transmitted.
* | | | | | | | | | Merge pull request #3357Wladimir J. van der Laan2013-12-041-1/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | 4ef92a9 Refuse to retransmit transactions without vins (Wladimir J. van der Laan)
| * | | | | | | | | Refuse to retransmit transactions without vinsWladimir J. van der Laan2013-12-041-1/+4
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Versions of bitcoin before 0.8.6 have a bug that inserted empty transactions into the vtxPrev in the wallet, which will cause the node to be banned when retransmitted, hence add a check for !tx.vin.empty() before RelayTransaction.
* | | | | | | | | Merge pull request #3355Wladimir J. van der Laan2013-12-041-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | 6c98cca qt: use deleteLater to remove send entries (Wladimir J. van der Laan)
| * | | | | | | | qt: use deleteLater to remove send entriesWladimir J. van der Laan2013-12-041-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use deleteLater() instead of delete, as it is not allowed to delete widgets directly in an event handler. Should solve the MacOSX random crashes on send with coincontrol.
* | | | | | | | Merge pull request #3285Wladimir J. van der Laan2013-12-034-101/+147
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | d3207b6 [Qt] coin-control features GUI cleanup 3 (Philip Kaufmann) 834e14e [Qt] coin-control features GUI cleanup 2 (Philip Kaufmann)
| * | | | | | | [Qt] coin-control features GUI cleanup 3Philip Kaufmann2013-12-023-42/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove style sheets from ui files and use Qt attributes instead - make some more strings untranslatable, to make life for translators easier - split up long tooltips an rework the texts a little
| * | | | | | | [Qt] coin-control features GUI cleanup 2Philip Kaufmann2013-12-022-59/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove monospace labels from sendcoinsdialog also - use a validated line edit for the change address - add a tooltip to change address switch - ensure we have a valid change address in CoinControlDialog::coinControl->destChange or just CNoDestination() - some small ui file changes
* | | | | | | | Merge pull request #3320 from laanwj/2013_11_cli_splitGavin Andresen2013-12-0313-107/+144
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | bitcoin-cli: remove unneeded dependencies (only minor code movement)
| * | | | | | | | bitcoin-cli: remove unneeded dependencies (only code movement)Wladimir J. van der Laan2013-12-0313-107/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary dependencies for bitcoin-cli (leveldb, berkelydb, wallet, RPC server) Build system changes: - split libbitcoin.a into libbitcoin_common.a, libbitcoin_server.a and libbitcoin_cli.a Code changes (movement only): - split up HelpMessage into HelpMessage in init.cpp and HelpMessageCli in rpcclient.cpp - move uiInterface from init.cpp to util.cpp
* | | | | | | | | Merge pull request #3345 from Michagogo/gitian-descriptor-deps-input-typoGavin Andresen2013-12-021-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix file hash verification error in deps-win32.yml
| * | | | | | | | | Fix file hash verification error in deps-win32.ymlMichagogo2013-12-031-1/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | libpng was being sha256summed twice, and miniupnpc wasn't being checked at all.
* | | | | | | | | Merge pull request #3344 from gmaxwell/assert_hazardsGavin Andresen2013-12-023-7/+23
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Sanitize assert usage and refuse to compile with NDEBUG.
| * | | | | | | | Sanitize assert usage and refuse to compile with NDEBUG.Gregory Maxwell2013-12-023-7/+23
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were quite a few places where assert() was used with side effects, making operation with NDEBUG non-functional. This commit fixes all the cases I know about, but also adds an #error on NDEBUG because the code is untested without assertions and may still have vulnerabilities if used without assert.
* | | | | | | | Merge pull request #3341 from Need4Video/masterPieter Wuille2013-12-0250-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Lossless image optimization
| * | | | | | | | Lossless image optimizationSined2013-12-0250-0/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | less bytes, same images
* | | | | | | | Merge pull request #3339Wladimir J. van der Laan2013-12-021-2/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | bae6c7e Fix a rare crash on Mac OS X, by removing a setFocus on the payTo field that was not necessary, as the field still receives focus without it. (Ryan Niebur)
| * | | | | | | | Fix a rare crash on Mac OS X, by removing a setFocus on the payTo field that ↵Ryan Niebur2013-12-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was not necessary, as the field still receives focus without it.
* | | | | | | | | Make unit tests succeed with -DDEBUG_LOCKORDERGavin Andresen2013-12-021-0/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #3329 from gavinandresen/syncdebugGavin Andresen2013-12-013-0/+23
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | mutex debugging routines: LocksHeld() and AssertLockHeld()
| * | | | | | | | mutex debugging routines: LocksHeld() and AssertLockHeld()Gavin Andresen2013-11-293-0/+23
| | | | | | | | |
* | | | | | | | | Merge pull request #3306Wladimir J. van der Laan2013-12-015-130/+158
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84b695c [Qt] allow deletion of payment-requests in sendcoins (Philip Kaufmann)
| * | | | | | | | | [Qt] allow deletion of payment-requests in sendcoinsPhilip Kaufmann2013-11-245-130/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this adds a delete button for insecure and secure payment requests in the sendcoins dialog - it also enables the delete button even for single and empty entries, as this is much easier to handle and doesn't need to special case single entries - big parts of the ui file were changed, because I copied the delete button and had to delete the layout too and created it from scratch (which seems to cleanup the rows and colums in the layout also, which is nice IMHO)
* | | | | | | | | | Merge pull request #3239 from gavinandresen/mempool_verboseGavin Andresen2013-11-2916-139/+244
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Add verbose flag to getrawmempool
| * | | | | | | | | Add verbose boolean to getrawmempoolGavin Andresen2013-11-3012-76/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changes mempool to store CTxMemPoolEntries to keep track of when they enter/exit the pool.
| * | | | | | | | | Refactor: move GetValueIn(tx) to tx.GetValueIn()Gavin Andresen2013-11-3010-36/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetValueIn makes more sense as a CTransaction member.
| * | | | | | | | | Remove dead transaction replacement codeGavin Andresen2013-11-301-29/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This dead code can be resurrected from git history if transaction replacement is ever implemented. Keeping dead code in the source is a bad idea, because it implies it was tested and worked at some point, which is not true.
* | | | | | | | | Merge pull request #3309Wladimir J. van der Laan2013-11-291-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ac5a01 Move types.h include before ifaddres.h for u_int declaration (Robert Backhaus)
| * | | | | | | | | Move types.h include before ifaddres.h for u_int declarationRobert Backhaus2013-11-221-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3328Wladimir J. van der Laan2013-11-291-0/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | 9d2b73d bitcoin-cli: Add missing SelectParamsFromCommandLine (Wladimir J. van der Laan)
| * | | | | | | | | bitcoin-cli: Add missing SelectParamsFromCommandLineWladimir J. van der Laan2013-11-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SelectParamsFromCommandLine call was missing in bitcoin-cli, which caused `-testnet` and `-regtest` to be ignored. Add this call just like in bitcoind.cpp.
* | | | | | | | | | Merge pull request #3295Wladimir J. van der Laan2013-11-284-0/+190
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | 9e7776b Integration tests via RPC calls (Gavin Andresen)
| * | | | | | | | | Integration tests via RPC callsGavin Andresen2013-11-274-0/+190
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qa/rpc-tests/wallet.sh runs a three-node -regtest network, generates a fresh blockchain, and then exercises basic wallet sending/receiving functionality using command-line RPC.
* | | | | | | | | Merge pull request #3321Wladimir J. van der Laan2013-11-281-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | 0078841 prevent Windows redefinition warning cause by compat.h (Philip Kaufmann)
| * | | | | | | | prevent Windows redefinition warning cause by compat.hPhilip Kaufmann2013-11-271-0/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #3284Wladimir J. van der Laan2013-11-2718-629/+692
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | fb78cc2 Split up bitcoinrpc (code movement only) (Wladimir J. van der Laan)
| * | | | | | | | Split up bitcoinrpc (code movement only)Wladimir J. van der Laan2013-11-2718-629/+692
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split bitcoinrpc up into - rpcserver: bitcoind RPC server - rpcclient: bitcoin-cli RPC client - rpcprotocol: shared common HTTP/JSON-RPC protocol code One step towards making bitcoin-cli independent from the rest of the code, and thus a smaller executable that doesn't have to be linked against leveldb. This commit only does code movement, there are no functional changes.
* | | | | | | | Merge pull request #3296Wladimir J. van der Laan2013-11-274-11/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a946aa8 Store and use a sanitized subVer (Mike Hearn) ba6a4ea Add some additional logging to give extra network insight. (Mike Hearn)
| * | | | | | | | Store and use a sanitized subVerMike Hearn2013-11-264-9/+18
| | | | | | | | |
| * | | | | | | | Add some additional logging to give extra network insight.Mike Hearn2013-11-261-5/+11
| |/ / / / / / /
* | | | | | | | Merge pull request #3319Wladimir J. van der Laan2013-11-271-1/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | 871ac37 qt: restore icon dock menu (theuni)
| * | | | | | | qt: restore icon dock menutheuni2013-11-261-1/+7
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was removed by 25c0cce7f. It was apparently removed in qt5, but may return for 5.1.
* | | | | | | Merge pull request #3316Wladimir J. van der Laan2013-11-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 106f133 Fix uninitialized variable added in b33b9a6fe (theuni)
| * | | | | | | Fix uninitialized variable added in b33b9a6fetheuni2013-11-251-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After discussing with BlueMatt, this appears to be harmless in its current state since it's always set before it's used. Initialize it anyway for readability and future safety.
* | | | | | | Merge pull request #3294Wladimir J. van der Laan2013-11-255-11/+45
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | c8b7425 setgenerate creates multiple blocks in -regtest mode (Gavin Andresen)
| * | | | | | setgenerate creates multiple blocks in -regtest modeGavin Andresen2013-11-225-11/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm writing some wallet regression tests using -regtest mode, and need to generate an initial multi-hundred-block chain. Repeatedly calling setgenerate to generate one block is slow and doesn't work properly, because block creation happens asynchronously. This adds two features to setgenerate in -regtest mode: 1) Instead of being interpreted as number of threads to start, the third argument is the number of blocks to generate. 2) setgenerate will not return until the block creation threads have created the requested number of blocks.
* | | | | | | Merge pull request #3302Wladimir J. van der Laan2013-11-243-0/+215
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e5adec3 contrib: add sipa's github-merge script (Wladimir J. van der Laan)
| * | | | | | | contrib: add sipa's github-merge scriptWladimir J. van der Laan2013-11-243-0/+215
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #3300Wladimir J. van der Laan2013-11-241-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | 848fe68 cleanup error message consistency (Julian Langschaedel)