aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add Linux script to limit outgoing bandwidth used by BitcoinRune K. Svendsen2013-06-032-0/+44
| | | | | | | | | This commit adds a Linux script that uses tc and iptables to limit outgoing bandwidth to Bitcoin nodes. All tcp connections with a source or destination port of 8333 are limited to the chosen rate. It does not alter the incoming bandwidth. Additionally, outgoing bandwidth to a host on a local LAN (defined by the LOCALNET variable) is not limited.
* Merge pull request #2672 from Diapolo/Qt_testnetWladimir J. van der Laan2013-06-023-48/+47
|\ | | | | Bitcoin-Qt: setup testnet GUI directly
| * Bitcoin-Qt: setup testnet GUI directlyPhilip Kaufmann2013-06-023-48/+47
|/ | | | | | | - this directly sets up all GUI elements that have testnet special-casing without first setting up main net stuff and changing afterwards (titles, icons etc.) - also fixes 2 wrong icons shown during testnet usage on our toolbar
* Merge pull request #2588 from Diapolo/GetBoolArgWladimir J. van der Laan2013-06-0210-76/+61
|\ | | | | remove GetBoolArg() fDefault parameter defaulting to false
| * remove GetBoolArg() fDefault parameter defaulting to falsePhilip Kaufmann2013-06-0110-76/+61
| | | | | | | | | | | | | | | | - explicitly set the default of all GetBoolArg() calls - rework getarg_test.cpp and util_tests.cpp to cover this change - some indentation fixes - move macdockiconhandler.h include in bitcoin.cpp to the "our headers" section
* | Merge pull request #2721 from laanwj/2013_05_qt5Wladimir J. van der Laan2013-06-0217-14/+90
|\ \ | |/ |/| Qt5 compatibility
| * Qt5 compatibilityWladimir J. van der Laan2013-06-0117-14/+90
| | | | | | | | | | | | | | | | | | | | | | | | This commit squashes all the changes in the Qt5 branch relative to master. Backward compatibility with Qt4 is retained. Original authors: - Philip Kaufmann <[email protected]> - Jonas Schnelli <[email protected]>
* | Merge pull request #2722 from trapp/masterWladimir J. van der Laan2013-05-311-0/+2
|\ \ | |/ |/| Add NSHighResolutionCapable flag to Info.plist for better font rendering on Retina displays
| * Added NSHighResolutionCapable flag to Info.plist for better font rendering ↵Timon Rapp2013-05-311-0/+2
|/ | | | on Retina displays.
* Merge pull request #2616 from vinniefalco/leveldb-as-subtreePieter Wuille2013-05-300-0/+0
|\ | | | | Leveldb as subtree
| * Merge commit 'c25e98186d0f716451ef000e55646d25e014f573' as 'src/leveldb'Vinnie Falco2013-05-03136-0/+27582
| |\
| | * Squashed 'src/leveldb/' content from commit aca1ffcVinnie Falco2013-05-03136-0/+27582
| | | | | | | | | | git-subtree-dir: src/leveldb git-subtree-split: aca1ffc4b65be5e099b2088c6e6a308d69e1ad73
| * Remove leveldb in preparation for git-subtreeVinnie Falco2013-05-03136-27582/+0
| |
* | Merge pull request #2552 from Diapolo/win-typedefJeff Garzik2013-05-301-2/+0
|\ \ | | | | | | remove obsolete and unused typedef for Windows
| * | remove obsolete and unused typedef for WindowsPhilip Kaufmann2013-04-231-2/+0
| | |
* | | Merge pull request #2615 from jonasschnelli/mac10_8_not_centerWladimir J. van der Laan2013-05-305-21/+128
|\ \ \ | | | | | | | | osx: make use of the 10.8+ user notification center to display growl lik...
| * | | osx: make use of the 10.8+ user notification center to display growl like ↵Jonas Schnelli2013-05-245-21/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifications - if 10.8, use user notification center, if <10.8, use growl Signed-off-by: Jonas Schnelli <[email protected]>
* | | | Merge pull request #2716 from laanwj/2013_05_30_getworkJeff Garzik2013-05-304-10/+21
|\ \ \ \ | | | | | | | | | | Move pMiningKey init out of StartRPCThreads
| * | | | Move pMiningKey init out of StartRPCThreadsWladimir J. van der Laan2013-05-304-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit decouples the pMiningKey initialization and shutdown from the RPC threads. `getwork` and `getblocktemplate` rely on pMiningKey, and can also be ran from the debug window in the UI even when the RPC server is not running. Solves issue #2706.
* | | | | Merge pull request #2705 from robbak/crash_zero_size_peers.datJeff Garzik2013-05-301-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Don't attempt to resize vector to negative size.
| * | | | | Don't attempt to resize vector to negative size.Robert Backhaus2013-05-291-0/+2
| | | | | |
* | | | | | Merge pull request #2644 from sipa/constfindblockJeff Garzik2013-05-305-51/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make FindBlockByHeight constant-time
| * | | | | | Make FindBlockByHeight constant-time.Pieter Wuille2013-05-125-51/+36
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the pnext pointer in CBlockIndex, and replace it with a vBlockIndexByHeight vector (no effect on memory usage). pnext can now be replaced by vBlockIndexByHeight[nHeight+1], but FindBlockByHeight becomes constant-time. This also means the entire mapBlockIndex structure and the block index entries in it become purely blocktree-related data, and independent from the currently active chain, potentially allowing them to be protected by separate mutexes in the future.
* | | | | | Merge pull request #2642 from sipa/rightgenesisJeff Garzik2013-05-301-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Check for correct genesis
| * | | | | | Check for correct genesisPieter Wuille2013-05-121-0/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At startup, check that the expected genesis is loaded. This should prevent cases where accidentally a datadir from the wrong network is loaded (testnet vs mainnet, e.g.).
* | | | | | Merge pull request #2625 from gavinandresen/walletlock_asioJeff Garzik2013-05-304-63/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use boost::asio::deadline_timer for walletpassphrase timeout
| * | | | | | Use boost::asio::deadline_timer for walletpassphrase timeoutGavin Andresen2013-05-074-63/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New method in bitcoinrpc: RunLater, that uses a map of deadline timers to run a function later. Behavior of walletpassphrase is changed; before, calling walletpassphrase again before the lock timeout passed would result in: Error: Wallet is already unlocked. You would have to call lockwallet before walletpassphrase. Now: the last walletpassphrase with correct password wins, and overrides any previous timeout. Fixes issue# 1961 which was caused by spawning too many threads. Test plan: Start with encrypted wallet, password 'foo' NOTE: python -c 'import time; print("%d"%time.time())' ... will tell you current unix timestamp. Try: walletpassphrase foo 600 getinfo EXPECT: unlocked_until is about 10 minutes in the future walletpassphrase foo 1 sleep 2 sendtoaddress mun74Bvba3B1PF2YkrF4NsgcJwHXXh12LF 11 EXPECT: Error: Please enter the wallet passphrase with walletpassphrase first. walletpassphrase foo 600 walletpassphrase foo 0 getinfo EXPECT: wallet is locked (unlocked_until is 0) walletpassphrase foo 10 walletpassphrase foo 600 getinfo EXPECT: wallet is unlocked until 10 minutes in future walletpassphrase foo 60 walletpassphrase bar 600 EXPECT: Error, incorrect passphrase getinfo EXPECT: wallet still scheduled to lock 60 seconds from first (successful) walletpassphrase
* | | | | | | Merge pull request #2600 from sipa/keyrefactorJeff Garzik2013-05-3028-595/+641
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactor key.cpp/.h
| * | | | | | | Make signature cache store CPubKeysPieter Wuille2013-05-303-12/+19
| | | | | | | |
| * | | | | | | CSecret/CKey -> CKey/CPubKey split/refactorPieter Wuille2013-05-3026-595/+564
| | | | | | | |
| * | | | | | | Make CPubKey statically allocatedPieter Wuille2013-05-307-28/+98
| | | | | | | |
* | | | | | | | Merge pull request #2693 from jgarzik/checkpoint-boolJeff Garzik2013-05-303-3/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Replace repeated GetBoolArg() calls with Checkpoint::fEnabled variable set once at init time
| * | | | | | | | Replace repeated GetBoolArg() calls with Checkpoint::fEnabled variableJeff Garzik2013-05-243-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set once at init time.
* | | | | | | | | Merge pull request #2104 from al42and/listreceivedbyaddress_txidsJeff Garzik2013-05-302-8/+41
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | listreceivedbyaddress now provides tx ids (issue #1149)
| * | | | | | | | | Updated help and tests for getreceivedby(account|address)Andrey2012-12-162-10/+35
| | | | | | | | | |
| * | | | | | | | | listreceivedbyaddress now provides tx ids (issue #1149)Andrey2012-12-131-0/+8
| | | | | | | | | |
* | | | | | | | | | Merge pull request #2657 from gmaxwell/its_after_may15_foreverJeff Garzik2013-05-305-190/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | It's after 2013-05-15 forever now, so remove the code for the May 15 fork
| * | | | | | | | | It's after 2013-05-15 forever now, so remove the code for the May 15 fork.Gregory Maxwell2013-05-165-190/+0
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2697 from Michagogo/masterWladimir J. van der Laan2013-05-301-5/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Make release-process.md more generic
| * | | | | | | | Made more generic by removing specific version referencesMichagogo2013-05-301-5/+5
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tweaked a little bit to provide examples. Squashed commits into 1, while hoping not to break anything
* | | | | | | | Merge pull request #2671 from bytemaster/masterPieter Wuille2013-05-291-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix Memory Leak
| * | | | | | | | Fix memory leak on exception in Key::SignCompactDaniel Larimer2013-05-191-0/+3
| | | | | | | | |
| * | | | | | | | fix memory leak in CKey::SetCompactSignature()Daniel Larimer2013-05-191-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2713 from sipa/zerodotninePieter Wuille2013-05-292-80/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Prepare for 0.9 merge window
| * | | | | | | | Prepare for 0.9 merge windowPieter Wuille2013-05-302-80/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2695 from robbak/init_cpp-explicit_castPieter Wuille2013-05-291-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Explictly cast calculation to int, to allow std::min to work.
| * | | | | | | Explictly cast calculation to int, to allow std::max to work.Robert Backhaus2013-05-241-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #2696 from robbak/util_h-Add_stdarg_includev0.8.2Wladimir J. van der Laan2013-05-251-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Explicitly #include stdarg.h, for access to va_list
| * | | | | | | Explicitly #include stdarg.h, for access to va_listRobert Backhaus2013-05-241-0/+2
| |/ / / / / /
* | | | | | | Bump build number to 0.8.2.2 for v0.8.2rc3v0.8.2rc3Gavin Andresen2013-05-242-2/+2
| | | | | | |