aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | New 'checkpoints' option should default to true.Jeff Garzik2012-11-281-3/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add "checkpoints" option, to permit disabling of checkpoint logic.Jeff Garzik2012-11-282-0/+10
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1861 from jgarzik/coinlockGavin Andresen2012-12-125-3/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new RPC "lockunspent", to prevent spending of selected outputs
| * | | | | | | | | | | | | | | Add new RPC "lockunspent", to prevent spending of selected outputsJeff Garzik2012-11-155-3/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and associated RPC "listlockunspent". This is a memory-only filter, which is empty when a node restarts.
* | | | | | | | | | | | | | | | Merge pull request #2059 from sipa/benchmarkGavin Andresen2012-12-124-0/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add -benchmark for reporting block processing times
| * | | | | | | | | | | | | | | | Add -benchmark for reporting block processing timesPieter Wuille2012-12-053-0/+22
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add GetTimeMicros() for ore accurate benchmarkingPieter Wuille2012-12-051-0/+6
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #2062 from sipa/nocoinsGavin Andresen2012-12-122-14/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconstruct coins/ database when missing
| * | | | | | | | | | | | | | | | | Reconstruct coins/ from scratch when missing.Pieter Wuille2012-12-062-14/+11
| | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #2074 from sipa/minorGavin Andresen2012-12-124-8/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | Two minor inconvenience fixes
| * | | | | | | | | | | | | | | | Allow lengthy block reconnections to be interruptedPieter Wuille2012-12-064-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the coin database is out of date with the block database, the best block in it is automatically switched to. This reconnection process can take time, so allow it to be interrupted. This also stops block connection as soon as shutdown is requested, leading to a faster shutdown.
| * | | | | | | | | | | | | | | | Update the block file counter in database when using -reindexPieter Wuille2012-12-061-0/+1
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This problem is like earth (mostly harmless). After/during a -reindex, it means the statistics about the last block file reported in debug.log are always of blk00000.dat instead of the last file. Apart from that, it means a few more database entries need to be read when finding a file to append to the first time.
* | | | | | | | | | | | | | | | Merge pull request #2068 from Diapolo/CheckDiskSpacePieter Wuille2012-12-071-15/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | some CheckDiskSpace() related changes
| * | | | | | | | | | | | | | | call CheckDiskSpace() before pre-allocating spacePhilip Kaufmann2012-12-051-15/+19
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - even if we are allowed to fail pre-allocating, it's better to check for sufficient space before calling AllocateFileRange() and if we are out of disk space return with error() - the above change allows us to remove the CheckDiskSpace() check in CBlock::AcceptBlock()
* | | | | | | | | | | | | | | Merge pull request #2057 from Diapolo/FlushBlockFilePieter Wuille2012-12-061-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FlushBlockFile(): check for valid FILE pointer
| * | | | | | | | | | | | | | | FlushBlockFile(): check for valid FILE pointerPhilip Kaufmann2012-12-011-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - don't call FileCommit() and fclose() if no valid FILE pointer was returned by OpenBlockFile()
* | | | | | | | | | | | | | | | Merge pull request #2066 from Diapolo/small_uiint_changesWladimir J. van der Laan2012-12-056-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI interface changes
| * | | | | | | | | | | | | | | | rework ThreadSafeAskFee() / askFee() functionsPhilip Kaufmann2012-12-045-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove unused parameter from ThreadSafeAskFee(), which also results in the removal of an orphan translation-string
| * | | | | | | | | | | | | | | | remove unneeded flag from MSG_INFORMATION and fix an indentationPhilip Kaufmann2012-12-042-5/+5
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #2056 from sipa/fix_2052Pieter Wuille2012-12-051-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Fixes for obscure mempool-checkpoint interaction
| * | | | | | | | | | | | | | | Only send reorged txn to mempool after checkpointPieter Wuille2012-12-011-2/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Enable script verification for reorganized mempool txPieter Wuille2012-12-011-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #2063 from Diapolo/CDiskBlockPosPieter Wuille2012-12-053-10/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | add 2 constructors in CDiskBlockPos to simplify class usage
| * | | | | | | | | | | | | | | add 2 constructors in CDiskBlockPos to simplify class usagePhilip Kaufmann2012-12-033-10/+13
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add a default-constructor, which simply calls SetNull() and a constructor to directly pass nFile and nPos - change code to use that new constructors
* | | | | | | | | | | | | | | Merge pull request #2058 from sipa/atomicreorgPieter Wuille2012-12-031-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | Make SetBestChain() atomic
| * | | | | | | | | | | | | | Make SetBestChain() atomicPieter Wuille2012-12-021-11/+11
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case a reorganisation fails, the internal state could become inconsistent (memory only). Previously, a cache per block connect or disconnect action was used, so blocks could not be applied in a partial way. Extend this to a cache for the entire reorganisation, making it atomic entirely. This also simplifies the code a bit.
* | | | | | | | | | | | | | Bitcoin-Qt: remove obsolete modal flag from GUI APIsPhilip Kaufmann2012-12-036-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - as we (can) supply the CClientUIInterface::MODAL flag via the style parameter, we don't need a separate bool for checking the modality
* | | | | | | | | | | | | | Merge pull request #2046 from Diapolo/traymenuWladimir J. van der Laan2012-12-032-9/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | split of createTrayIconMenu() from createTrayIcon() in BitcoinGUI
| * | | | | | | | | | | | | split of createTrayIconMenu() from createTrayIcon() in BitcoinGUIPhilip Kaufmann2012-11-272-9/+24
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this allows to setup the trayicon before we have and want a trayicon menu - should be of great use, when we remove that splash screen - fixes a small bug with the toggleHideAction icon, which is not only used with trayicon but also with the Mac dock
* | | | | | | | | | | | | Merge pull request #2033 from sipa/kickconflictsPieter Wuille2012-11-302-3/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfix: remove conflicting transactions from memory pool
| * | | | | | | | | | | | | Bugfix: remove conflicting transactions from memory poolPieter Wuille2012-11-252-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a transaction A is in the memory pool, while a transaction B (which shares an input with A) gets accepted into a block, A was kept forever in the memory pool. This commit adds a CTxMemPool::removeConflicts method, which removes transactions that conflict with a given transaction, and all their children. This results in less transactions in the memory pool, and faster construction of new blocks.
* | | | | | | | | | | | | | Merge pull request #2037 from luke-jr/printpriorityGavin Andresen2012-11-301-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow -printpriority without -debug
| * | | | | | | | | | | | | | Allow -printpriority without -debugLuke Dashjr2012-11-261-1/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Make test_bitcoin run in a temp datadirPieter Wuille2012-11-291-0/+7
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Add GetTempPath() to utilPieter Wuille2012-11-292-0/+23
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #2044 from Diapolo/backupwalletWladimir J. van der Laan2012-11-271-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | do not silently ignore errors on "backupwallet" RPC cmd
| * | | | | | | | | | | | | do not silently ignore errors on "backupwallet" RPC cmdPhilip Kaufmann2012-11-271-1/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #2006 from robbak/make-leveldb-macroPieter Wuille2012-11-274-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 'make' to $(MAKE) in leveldb make command line
| * | | | | | | | | | | | | Change 'make' to $(MAKE) in leveldb make command lineRobert Backhaus2012-11-134-4/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | update CClientUIInterface and remove orphan Wx stuffPhilip Kaufmann2012-11-2612-66/+133
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix ThreadSafeMessageBox always displays error icon - allow to specify MSG_ERROR / MSG_WARNING or MSG_INFORMATION without a custom caption / title - allow to specify CClientUIInterface::ICON_ERROR / ICON_WARNING and ICON_INFORMATION (which is default) as message box icon - remove CClientUIInterface::OK from ThreadSafeMessageBox-calls, as the OK button will be set as default, if none is specified - prepend "Bitcoin - " to used captions - rename BitcoinGUI::error() -> BitcoinGUI::message() and add function documentation - change all style parameters and enum flags to unsigned - update code to use that new API - update Client- and WalletModel to use new BitcoinGUI::message() and rename the classes error() method into message() - include the possibility to supply the wanted icon for messages from Client- and WalletModel via "style" parameter
* | | | | | | | | | | | | Merge pull request #2004 from alexanderkjeldaas/simplify-cmutexlockPieter Wuille2012-11-241-30/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify CMutexLock
| * | | | | | | | | | | | | Simplify CMutexLockAlexander Kjeldaas2012-11-141-30/+10
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Remove unused Leave and GetLock functions o Make Enter and TryEnter private. o Simplify Enter and TryEnter. boost::unique_lock doesn't really know whether the mutex it wraps is locked or not when the defer_lock option is used. The boost::recursive_mutex does not expose this information, so unique_lock only infers this knowledge. When taking the lock is defered, it (randomly) assumes that the lock is not taken. boost::unique_lock has the following definition: unique_lock(Mutex& m_,defer_lock_t): m(&m_),is_locked(false) {} bool owns_lock() const { return is_locked; } Thus it is a mistake to check owns_lock() in Enter and TryEnter - they will always return false.
* | | | | | | | | | | | | Merge pull request #2013 from sipa/blockheaderPieter Wuille2012-11-245-46/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | Split off CBlockHeader from CBlock
| * | | | | | | | | | | | Split off CBlockHeader from CBlockPieter Wuille2012-11-165-46/+55
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaner and removes the need for the application-specific flags in serialize.h.
* | | | | | | | | | | | Merge pull request #1980 from sipa/noreorgsamePieter Wuille2012-11-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | Do not reorganize if new branch has same amount of work
| * | | | | | | | | | | Do not reorganize if new branch has same amount of workPieter Wuille2012-11-051-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #2024 from Diapolo/fix_qt_crashWladimir J. van der Laan2012-11-222-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Bitcoin-Qt: fix crash on Windows caused by CDBEnv::EnvShutdown()
| * | | | | | | | | | | | Bitcoin-Qt: fix crash on Windows caused by CDBEnv::EnvShutdown()Philip Kaufmann2012-11-182-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - can be triggerd by just adding -proxy=crashme with 0.7.1 - crash occured, when AppInit2() was left with return false; after the first call to bitdb.open() (Step 6 in init) - this is caused by GetDataDir() or .string() in CDBEnv::EnvShutdown() called via the bitdb global destructor - init fDbEnvInit and fMockDb to false in CDBEnv::CDBEnv()
* | | | | | | | | | | | | Add assert and comment for subtle pay-to-script-hash logicGavin Andresen2012-11-211-0/+5
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #2022 from Diapolo/fix_#2018Wladimir J. van der Laan2012-11-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | fix pull #2018