aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #2760 from cozz/cozz2Jeff Garzik2013-06-181-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix comment about dust logic
| * | | | | | fix comment about dust logicCozz Lovan2013-06-111-2/+2
| |/ / / / /
* | | | | | Merge pull request #2763 from bitsofproof/masterPieter Wuille2013-06-171-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Send tx relay flag with version message
| * | | | | send tx relay flag with versionbitsofproof2013-06-111-1/+1
| |/ / / /
* | | | | Merge pull request #2648 from Diapolo/txindexPieter Wuille2013-06-152-5/+8
|\ \ \ \ \ | | | | | | | | | | | | allow txindex to be removed and add a reindex dialog
| * | | | | allow txindex to be removed and add a reindex dialogPhilip Kaufmann2013-06-102-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - adds a reindex dialog for Bitcoin-Qt to change -txindex without the need to supply -reindex - now also does a -reindex, when removing the -txindex switch
* | | | | | Merge pull request #2766 from theuni/fix-shutdown-deadlockPieter Wuille2013-06-151-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix shutdown deadlock, ticket #2690
| * | | | | | fixed: don't use thread::sleep_for where it's known to be brokentheuni2013-06-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2690.
| * | | | | | fixed: include boost header as necessarytheuni2013-06-131-0/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this include, sometimes BOOST_VERSION was defined and sometimes it was not, depending on which includes came before it. The result was a random mix of sleep or sleep_for for boost versions >= 1.50.
* / | | | | Remove broken option to skip input checking for wallet txn.Matt Corallo2013-06-135-16/+15
|/ / / / /
* | | | | Merge pull request #2553 from Diapolo/threadsJeff Garzik2013-06-103-27/+5
|\ \ \ \ \ | | | | | | | | | | | | changes to thread code (directly use boost::thread)
| * | | | | changes to thread code (directly use boost::thread)Philip Kaufmann2013-06-103-27/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - removes our NewThread() function an replaces remaining calls with boost::thread with our TraceThread template - remove ExitThread() function - fix THREAD_PRIORITY_ABOVE_NORMAL for non Windows OSes
* | | | | Merge pull request #1863 from jgarzik/keytimePieter Wuille2013-06-104-38/+142
|\ \ \ \ \ | |/ / / / |/| | | | "Wallet birthdays": store key create time; calc whole-wallet birthday
| * | | | Wallet: optimize rescan to skip blocks prior to birthdayJeff Garzik2013-06-101-0/+7
| | | | |
| * | | | Wallet: store key creation time. Calculate whole-wallet birthday.Jeff Garzik2013-06-104-38/+135
| | | | | | | | | | | | | | | | | | | | This also encapsulate wallet-read state information into CWalletScanState.
* | | | | Merge pull request #2747 from luke-jr/getblock_verbose0Jeff Garzik2013-06-102-3/+18
|\ \ \ \ \ | |/ / / / |/| | | | Add verbose flag to getblock RPC so it is possible to get hex dumps of blocks
| * | | | RPC: getblock(): Accept 2nd "verbose" parameter, similar to ↵Luke Dashjr2013-06-072-3/+18
| | | | | | | | | | | | | | | | | | | | getrawtransaction, but defaulting to 1 for backward compatibility
* | | | | Merge pull request #2154 from CodeShark/dependencycleanupJeff Garzik2013-06-1029-1023/+1101
|\ \ \ \ \ | | | | | | | | | | | | Clean up code dependencies
| * | | | | Removed the main.h include from net.cpp.Eric Lombrozo2013-06-063-9/+4
| | | | | |
| * | | | | Using boost::signals2 to message main from net.cpp.Eric Lombrozo2013-06-055-37/+37
| | | | | |
| * | | | | Moved UpdateTime out of CBlockHeader and moved CBlockHeader into core.Eric Lombrozo2013-06-054-70/+71
| | | | | |
| * | | | | Removed script.cpp's dependence on main.hEric Lombrozo2013-06-051-1/+1
| | | | | |
| * | | | | Moved CCoins, CTxOutCompressor, CTxInUndo, and CTxUndo to core.Eric Lombrozo2013-06-052-330/+332
| | | | | |
| * | | | | Removed AcceptToMemoryPool method from CTransaction. This method belongs to ↵Eric Lombrozo2013-06-0517-524/+527
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the mempool instance. Removed AreInputsStandard from CTransaction, made it a regular function in main. Moved CTransaction::GetOutputFor to CCoinsViewCache. Moved GetLegacySigOpCount and GetP2SHSigOpCount out of CTransaction into regular functions in main. Moved GetValueIn and HaveInputs from CTransaction into CCoinsViewCache. Moved AllowFree, ClientCheckInputs, CheckInputs, UpdateCoins, and CheckTransaction out of CTransaction and into main. Moved IsStandard and IsFinal out of CTransaction and put them in main as IsStandardTx and IsFinalTx. Moved GetValueOut out of CTransaction into main. Moved CTxIn, CTxOut, and CTransaction into core. Added minimum fee parameter to CTxOut::IsDust() temporarily until CTransaction is moved to core.h so that CTxOut needn't know about CTransaction.
| * | | | | Moved CInPoint to core. Removed GetMinFee from CTransaction and made it a ↵Eric Lombrozo2013-06-054-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | regular function in main.
| * | | | | Created core.h/core.cpp, added to makefiles. Started moving core structures ↵Eric Lombrozo2013-06-057-41/+64
| | | | | | | | | | | | | | | | | | | | | | | | from main to core beginning with COutPoint.
| * | | | | Removed net.cpp's dependency on init.h.Eric Lombrozo2013-06-054-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added explicit include of main.h in init.cpp, changed include of init.h to include of main.h in net.cpp. Added function registration for net.cpp in init.cpp's network initialization. Removed protocol.cpp's dependency on main.h. TODO: Remove main.h include in net.cpp.
| * | | | | Moved unrelated-to-network calls in StartNode and StopNode into init.cppEric Lombrozo2013-06-052-1/+2
| | | | | |
| * | | | | Moved PushGetBlocks to main.cpp to eliminate dependence of net.cpp on ↵Eric Lombrozo2013-06-054-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | CBlockLocator.
| * | | | | Get rid of db dependencies on mainEric Lombrozo2013-06-055-8/+22
| | | | | |
* | | | | | Merge pull request #2749 from laanwj/2013_06_addtotalbalanceWladimir J. van der Laan2013-06-092-3/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | qt: Add total balance in overview page
| * | | | | | qt: Add total balance in overview pageWladimir J. van der Laan2013-06-072-3/+40
| |/ / / / /
* / / / / / Create parent directories if needed in GetDataDirWladimir J. van der Laan2013-06-081-1/+1
|/ / / / / | | | | | | | | | | | | | | | One-line change. Fixes #2752.
* | | | | Merge pull request #2700 from theuni/gui-splitJeff Garzik2013-06-0510-227/+239
|\ \ \ \ \ | | | | | | | | | | | | autotools: Gui split
| * | | | | build: cosmetics after last commitCory Fields2013-06-041-12/+12
| | | | | |
| * | | | | build: use runtime setting for wallet rather than QT_GUI defineCory Fields2013-06-041-2/+3
| | | | | |
| * | | | | build: use runtime setting for displaying the help message rather than ↵Cory Fields2013-06-041-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | QT_GUI define
| * | | | | build: cosmetic: split usage string for easier formattingCory Fields2013-06-041-70/+70
| | | | | |
| * | | | | build: add global var for whether or not the gui is enabledCory Fields2013-06-044-0/+5
| | | | | |
| * | | | | build: split the non-gui startup routines into a new fileCory Fields2013-06-046-138/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow each to have its own main(), meaning that we can build a common base client and simply link in the correct startup object to create the appropriate binary.
| * | | | | build: prepare to move DetectShutdownThreadCory Fields2013-06-041-3/+5
| | |_|/ / | |/| | |
* | | | | Merge pull request #2731 from Diapolo/rpcconsoleWladimir J. van der Laan2013-06-051-2/+4
|\ \ \ \ \ | | | | | | | | | | | | Bitcoin-Qt: harmonize 2 setClientModel() functions
| * | | | | Bitcoin-Qt: harmonize 2 setClientModel() functionsPhilip Kaufmann2013-06-031-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - harmonize BitcoinGUI::setClientModel() and RPCConsole::setClientModel() - now RPCConsole::setClientModel() also includes a direct call to setNumBlocks()
* | | | | | osx: fix bitcoin-qt startup crash when clicking dock iconCory Fields2013-06-041-2/+6
| |/ / / / |/| | | | | | | | | | | | | | | | | | | Crash probably introduced by 4d17a1b0. Inialize the window to NULL and verify it before use.
* | | | | Merge pull request #2613 from jonasschnelli/prefsFixWladimir J. van der Laan2013-06-033-4/+59
|\ \ \ \ \ | | | | | | | | | | | | MaxOSX: settings fixes (#2371)
| * | | | | Merge branch 'master' of git://github.com/bitcoin/bitcoin into prefsFixJonas Schnelli2013-06-03123-7860/+13059
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonas Schnelli <[email protected]> Conflicts: bitcoin-qt.pro
| * | | | | MaxOSX: settings fixes (#2371)Jonas Schnelli2013-06-033-4/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Launch-At-Startup implementation for mac - Remove "Window" tab in settings Signed-off-by: Jonas Schnelli <[email protected]>
* | | | | | Merge pull request #2727 from TheBlueMatt/masterWladimir J. van der Laan2013-06-031-1/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | One more data-driven test-case
| * | | | | Add new data-driven test-case.Matt Corallo2013-06-021-1/+7
| | | | | |
* | | | | | 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