aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Add -benchmark for reporting block processing timesPieter Wuille2012-12-051-0/+20
| | |
* | | Merge pull request #2062 from sipa/nocoinsGavin Andresen2012-12-121-13/+10
|\ \ \ | | | | | | | | Reconstruct coins/ database when missing
| * | | Reconstruct coins/ from scratch when missing.Pieter Wuille2012-12-061-13/+10
| | | |
* | | | Merge pull request #2074 from sipa/minorGavin Andresen2012-12-121-2/+6
|\ \ \ \ | |_|_|/ |/| | | Two minor inconvenience fixes
| * | | Allow lengthy block reconnections to be interruptedPieter Wuille2012-12-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #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-051-3/+1
|\ \ \ \ | |_|_|/ |/| | | add 2 constructors in CDiskBlockPos to simplify class usage
| * | | add 2 constructors in CDiskBlockPos to simplify class usagePhilip Kaufmann2012-12-031-3/+1
| | |/ | |/| | | | | | | | | | | | | - add a default-constructor, which simply calls SetNull() and a constructor to directly pass nFile and nPos - change code to use that new constructors
* / | 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.
* | Merge pull request #2033 from sipa/kickconflictsPieter Wuille2012-11-301-2/+26
|\ \ | | | | | | Bugfix: remove conflicting transactions from memory pool
| * | Bugfix: remove conflicting transactions from memory poolPieter Wuille2012-11-251-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |
* | | update CClientUIInterface and remove orphan Wx stuffPhilip Kaufmann2012-11-261-3/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 #2013 from sipa/blockheaderPieter Wuille2012-11-241-10/+6
|\ \ | |/ |/| Split off CBlockHeader from CBlock
| * Split off CBlockHeader from CBlockPieter Wuille2012-11-161-10/+6
| | | | | | | | | | 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
| | |
* | | ConnectBlock(): fix error() format to be unsignedPhilip Kaufmann2012-11-171-1/+1
| | | | | | | | | | | | | | | - I introduced the wrong format macro with my former patch (#2018), this needs to be signed not unsigned (thanks Luke-Jr)
* | | ensure we use our format macros to avoid compilation warningsPhilip Kaufmann2012-11-161-1/+1
| | | | | | | | | | | | - fixes 2 warnings I observed while compiling on Windows with MinGW
* | | Merge pull request #1670 from luke-jr/blksubstrJeff Garzik2012-11-151-17/+17
|\ \ \ | | | | | | | | Use full block hash as unique identifier in debug.log
| * | | Abstract block hash substr extraction (for debug.log) into BlockHashStr inlineLuke Dashjr2012-11-131-17/+17
| | |/ | |/|
* | | Merge pull request #2005 from Diapolo/fixes_mainJeff Garzik2012-11-151-4/+4
|\ \ \ | | | | | | | | some small fixes for main.cpp/.h
| * | | some small fixes for main.cpp/.hPhilip Kaufmann2012-11-111-4/+4
| |/ / | | | | | | | | | | | | | | | - remove an unwanted ";" at the end of the ~CCoinsView() destructor - in FindBlockPos() and FindUndoPos() only call fclose(), is file is open - fix an error string in the CBlockUndo class
* | | Merge pull request #2012 from luke-jr/invblk_errsJeff Garzik2012-11-151-1/+1
|\ \ \ | | | | | | | | Print error for coinbase-pays-too-much case of ConnectBlock failing
| * | | Print error for coinbase-pays-too-much case of ConnectBlock failingLuke Dashjr2012-11-141-1/+1
| |/ /
* / / Introduce script verification flagsPieter Wuille2012-11-151-6/+6
|/ / | | | | | | | | | | | | | | These flags select features to be enabled/disabled during script evaluation/checking, instead of several booleans passed along. Currently these flags are defined: * SCRIPT_VERIFY_P2SH: enable BIP16-style subscript evaluation * SCRIPT_VERIFY_STRICTENC: enforce strict adherence to pubkey/sig encoding standards.
* | fix some missing indentations in main.cpp for better readabilityPhilip Kaufmann2012-11-101-41/+40
| |
* | Add -reindex, to perform in-place reindexing of block chain filesPieter Wuille2012-11-091-43/+89
| | | | | | | | | | | | | | Flushes the blktree/ and coins/ databases, and reindexes the block chain files, as if their contents was loaded via -loadblock. Based on earlier work by Jeff Garzik.
* | Move ThreadImport to init.cppPieter Wuille2012-11-091-44/+0
| |
* | LoadExternalBlockFile switched to CBufferedFilePieter Wuille2012-11-091-40/+25
| |
* | Cache size optimizationsPieter Wuille2012-11-041-1/+2
|/
* Remove P2SH transition code: P2SH violations may cause DoS triggerPieter Wuille2012-10-291-7/+1
|
* Merge pull request #1904 from laanwj/2012_10_remove_getorderPieter Wuille2012-10-251-48/+0
|\ | | | | remove "checkorder" P2P command
| * remove "checkorder" and "reply" P2P commandsWladimir J. van der Laan2012-10-031-48/+0
| | | | | | | | | | | | | | These command are a leftover from send-to-IP transactions, which have been removed a long time ago. Also removes CNode::mapRequests and CNode::PushRequests, as these were only used for the mentioned commands.
* | Merge pull request #1953 from gmaxwell/createnewblock-racePieter Wuille2012-10-251-2/+3
|\ \ | | | | | | Fixes a race condition in CreateNewBlock and a future null deref on testnet.
| * | Fixes a race condition in CreateNewBlock and a future null deref on testnet.Gregory Maxwell2012-10-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CreateNewBlock was reading pindexBest at the start before taking the lock so it was possible to have the the block content not match the prevheader and this can also trigger a newly added assert in ConnectBlock. I noticed this during a code review after twobitcoins reported that ab91bf39 (BIP30 for all blocks) could cause a null dereference on a modified node that mined during the IBD, or on testnet when it reached heights 91842 and 91880 due to CreateNewBlock calling ConnectBlock with pindex->phashBlock NULL.
* | | Merge pull request #1926 from laanwj/2012_10_maindummyboundsWladimir J. van der Laan2012-10-251-4/+1
|\ \ \ | | | | | | | | Fix out-of-bounds read in main (issue #1924)
| * | | Fix out-of-bounds read noticed by Ricardo CorreiaWladimir J. van der Laan2012-10-241-4/+1
| |/ / | | | | | | | | | | | | Sizeof() returned the size of a pointer instead of the size of the buffer. Fixes issue #1924.
* / / Show warning when using prerelease versionWladimir J. van der Laan2012-10-251-0/+4
|/ / | | | | | | | | | | | | | | | | | | | | Implements #1948 - Add macro `CLIENT_VERSION_IS_RELEASE` to clientversion.h - When running a prerelease (the above macro is `false`): - In UI, show an orange warning bar at the top. This will be used for other warnings (and alerts) as well, instead of the status bar. - For `bitcoind`, show the warning in the "errors" field in `getinfo` response.
* | Bugfix: actually use CCoinsViewMemPoolPieter Wuille2012-10-231-2/+14
| |
* | Added some commentsPieter Wuille2012-10-231-1/+8
| | | | | | | | Some clarifications after a code review by Mike Hearn.
* | Bugfix: off-by-one in priority calculationPieter Wuille2012-10-231-1/+1
| |