aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1641 from jgarzik/mempoolJeff Garzik2012-08-201-3/+32
|\ | | | | Add 'mempool' P2P command, and extend 'getdata' behavior
| * Add 'mempool' P2P command, and extend 'getdata' behaviorJeff Garzik2012-07-311-3/+32
| | | | | | | | to permit downloading of mempool transactions from the remote peer.
* | Merge pull request #1678 from Diapolo/LoadExternalBlockFile_add_timerJeff Garzik2012-08-171-1/+3
|\ \ | | | | | | log how long LoadExternalBlockFile() takes in ms (Benchmark)
| * | log how long LoadExternalBlockFile() takes in ms (Benchmark)Philip Kaufmann2012-08-171-1/+3
| | |
* | | fix a compiler sign warning in OpenBlockFile()Philip Kaufmann2012-08-171-1/+1
|/ /
* | Merge pull request #1612 from luke-jr/opti_getblkhashGregory Maxwell2012-08-011-0/+19
|\ \ | | | | | | Optimize JSON-RPC getblockhash
| * | Optimize JSON-RPC getblockhashLuke Dashjr2012-08-011-0/+19
| | | | | | | | | | | | | | | - If the height is in the first half, start at the genesis block and go up, rather than at the top - Cache the last lookup and use it as a reference point if it's close to the next request, to make linear lookups always fast
* | | Merge pull request #1632 from luke-jr/spellingJeff Garzik2012-08-011-18/+18
|\ \ \ | | | | | | | | Fix spelling and grammar errors
| * | | Bugfix: Correct English grammar regarding "'s"Luke Dashjr2012-08-011-3/+3
| | | |
| * | | Bugfix: Fix a variety of misspellingsLuke Dashjr2012-08-011-15/+15
| | |/ | |/|
* / | Update Warning-strings to use a standard-formatPhilip Kaufmann2012-08-011-4/+4
|/ / | | | | | | | | | | | | | | | | - ensure warnings always start with "Warning:" and that the first character after ":" is written uppercase - ensure the first sentence in warnings ends with an "!" - remove unneeded spaces from Warning-strings - add missing Warning-string translation - remove a "\n" and replace with untranslatable "<br><br>"
* | Switch testnet3's message bytes to avoid connecting to old nodes.Gregory Maxwell2012-07-261-4/+4
| | | | | | | | | | | | | | | | The new bytes are based on "11" to appeal to Gavin's 11 fetish. This breaks existing testnet3 nodes as the blockchain files are also versioned. To upgrade a node delete everything except wallet.dat from your .bitcoin/testnet3 folder.
* | Handle should-never-happen case of orphan in mempoolGavin Andresen2012-07-261-0/+15
| |
* | When creating new blocks, sort 'paid' area by fee-per-kbGavin Andresen2012-07-261-31/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | Modify CreateNewBlock so that instead of processing all transactions in priority order, process the first 27K of transactions in priority order and then process the rest in fee-per-kilobyte order. This is the first, minimal step towards better a better fee-handling system for both miners and end-users; this patch should be easy to backport to the old versions of Bitcoin, and accomplishes the most important goal-- allow users to "buy their way in" to blocks using transaction fees.
* | Merge branch 'checknewblock' of git://github.com/luke-jr/bitcoinGavin Andresen2012-07-261-12/+40
|\ \
| * | Tests for CreateNewBlockLuke Dashjr2012-07-121-0/+9
| | |
| * | Merge branch 'checknewblock_0.6.0' into checknewblockLuke Dashjr2012-07-111-12/+31
| |\ \ | | |/ | |/| | | | | | | Conflicts: src/main.cpp
| | * CreateNewBlock: Check that the produced CBlock is acceptable (except for ↵Luke Dashjr2012-05-271-12/+31
| | | | | | | | | | | | | | | | | | proof-of-work and merkletree, since those need to be provided later) This throws an exception from CreateNewBlock otherwise, which is not safe without #1245!
* | | Let the comment in GetBlockValue() reflect the uncertainty about the time ↵Rune K. Svendsen2012-07-181-1/+1
| | | | | | | | | | | | interval between subsidy reductions
* | | Fix thread names after reviewGiel van Schijndel2012-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | * Fix wrong thread name for wallet *relocking* thread - Was named the unlocking thread * Use consistent naming Signed-off-by: Giel van Schijndel <[email protected]>
* | | Give threads a recognisable name to aid in debuggingGiel van Schijndel2012-07-171-0/+3
|/ / | | | | | | | | | | | | | | NOTE: These thread names are visible in gdb when using 'info threads'. Additionally both 'top' and 'ps' show these names *unless* told to display the command-line instead of task name. Signed-off-by: Giel van Schijndel <[email protected]>
* | Warn if blockchain majority doesn't match CBlock::CURRENT_VERSIONGavin Andresen2012-07-061-0/+18
| | | | | | | | | | | | This adds a warning "this version is obsolete, upgrade required" if more than 50 of the previous 100 blocks in the blockchain are a new version.
* | Treat non-version-1 transactions as non-standardGavin Andresen2012-07-061-0/+3
| | | | | | | | | | | | Adds CBlock::CURRENT_VERSION and CTransaction::CURRENT_VERSION constants, and makes non-CURRENT_VERSION transactions nonstandard. This will help make future upgrades smoother.
* | Merge pull request #1304 from rebroad/ShowBlockTimestampJeff Garzik2012-07-051-3/+10
|\ \ | | | | | | Show block timestamp
| * | Show the timestamp for the block.R E Broadley2012-05-291-3/+10
| | | | | | | | | | | | wrap lines
* | | CTxMemPool: eliminate redundant lock, GetHash() callJeff Garzik2012-07-041-4/+2
| | | | | | | | | | | | | | | ::addUnchecked()'s only caller already takes the necessary lock, and has already calculated the TX's hash.
* | | Remove duplicate GetHash() in ConnectBlockMatt Corallo2012-07-041-14/+14
| | |
* | | Merge pull request #1511 from jgarzik/quieten2Jeff Garzik2012-06-271-1/+5
|\ \ \ | | | | | | | | Quieten 'getdata' P2P message output
| * | | Quieten 'getdata' P2P message outputJeff Garzik2012-06-231-1/+5
| | | | | | | | | | | | | | | | Output one message per getdata, not one message per 'inv' entry.
* | | | Merge pull request #1347 from rebroad/FixAlreadyAskedForPieter Wuille2012-06-271-1/+1
|\ \ \ \ | | | | | | | | | | mapAlreadyAskedFor gets additions when AlreadyHave()
| * | | | Should only be mapped when the getdata is done.R E Broadley2012-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | Without this change, mappings will be created even after AlreadyHave equals true, and will never be erased.
* | | | | Stop processing messages on full send buffer and dont disconnect.Matt Corallo2012-06-271-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also decrease default send/receive buffer sizes from 10 to 5 mb as this patch makes it easy for a node to fill both instead of only send.
* | | | | Merge pull request #1174 from sipa/torhsGregory Maxwell2012-06-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Tor hidden service support
| * | | | | Debug version messagesPieter Wuille2012-06-231-1/+1
| | | | | |
* | | | | | Merge pull request #1503 from gmaxwell/testnet_tweaksGregory Maxwell2012-06-231-4/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Remove some rule differences which aren't needed with testnet3.
| * | | | | Remove some rule differences which aren't needed with testnet3.Gregory Maxwell2012-06-221-4/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Bip16 and Bip30 had early activation dates for testnet, but with the reset they might as well use the same dates as the main network.
* | | | | Merge pull request #1458 from jgarzik/tracenetJeff Garzik2012-06-221-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Introduce -tracenet option, thereby quieting some redundant debug messages
| * | | | | Introduce -debugnet option, thereby quieting some redundant debug messagesJeff Garzik2012-06-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, each TX typically generated 3+ debug messages, askfor tx 8644cc97480ba1537214 0 sending getdata: tx 8644cc97480ba1537214 askfor tx 8644cc97480ba1537214 1339640761000000 askfor tx 8644cc97480ba1537214 1339640881000000 CTxMemPool::accept() : accepted 8644cc9748 (poolsz 6857) After this change, there is only one message for each valid TX received CTxMemPool::accept() : accepted 22a73c5d8c (poolsz 42) and two messages for each orphan tx received ERROR: FetchInputs() : 673dc195aa mempool Tx prev not found 1e439346fc stored orphan tx 673dc195aa (mapsz 19) The -debugnet option, or its superset -debug, will restore the full debug output.
* | | | | | RPC: add 'getrawmempool', listing all transaction ids in memory poolJeff Garzik2012-06-221-0/+8
| |/ / / / |/| | | |
* | | | | print large orphan warning BEFORE deleting pvMsgGavin Andresen2012-06-191-1/+1
| | | | |
* | | | | Merge branch 'signbugs' of https://github.com/wizeman/bitcoinGavin Andresen2012-06-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Resolved minor conflict in main.cpp
| * | | | | Make CNetAddr::GetHash() return an unsigned val.Ricardo M. Correia2012-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents an undefined operation in main.cpp, when shifting the hash value left by 32 bits. Shifting a signed int left into the sign bit is undefined in C++11.
* | | | | | Use a 64-bit nonce in pingPieter Wuille2012-06-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Former code sent '0' as nonce, which was serialized as 32-bit.
* | | | | | introduce a new StartShutdown() function, which starts a thread with ↵Philip Kaufmann2012-06-121-1/+1
| |/ / / / |/| | | | | | | | | | | | | | Shutdown() if no GUI is used and calls uiInterface.QueueShutdown() if a GUI is used / all direct uiInterface.QueueShutdown() calls are replaced with Shutdown() - this ensures a clean GUI shutdown, even when catching a SIGTERM and allows the BitcoinGUI destructor to get called (which fixes a tray-icon issue and keeps the tray-icon until Bitcoin-Qt exits)
* | | | | Rework network config settingsPieter Wuille2012-05-311-2/+2
| |_|/ / |/| | |
* | | | Merge pull request #1392 from gavinandresen/testnet_resetGregory Maxwell2012-05-271-7/+5
|\ \ \ \ | | | | | | | | | | Testnet reset
| * | | | Fix issue#1082, testnet difficulty unsigned integer underflowGavin Andresen2012-05-251-3/+3
| | | | |
| * | | | Testnet, Mark IIIGavin Andresen2012-05-251-4/+2
| | | | |
* | | | | Encapsulate public keys in CPubKeyPieter Wuille2012-05-241-1/+1
|/ / / /
* | | | Merge pull request #1383 from jgarzik/rawtxJeff Garzik2012-05-241-1/+1
|\ \ \ \ | | | | | | | | | | JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network