aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '0.6.x' into 0.7.xLuke Dashjr2012-11-171-1/+1
|\ | | | | | | | | Conflicts: src/main.cpp
| * Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-11-171-1/+1
| |\
| | * Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-11-171-1/+1
| | |\
| | | * Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-11-171-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-171-1/+1
| | | | | | | | | | | | | | | | | | | | - fixes 2 warnings I observed while compiling on Windows with MinGW
* | | | | Merge branch '0.6.x' into 0.7.xLuke Dashjr2012-11-161-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main.cpp
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-11-161-1/+1
| |\| | |
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-11-161-1/+1
| | |\| |
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-11-161-1/+1
| | | |\|
| | | | * Print error for coinbase-pays-too-much case of ConnectBlock failingLuke Dashjr2012-11-161-1/+1
| | | | |
* | | | | Merge branch '0.6.x' into 0.7.xLuke Dashjr2012-11-141-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/bitcoinrpc.cpp src/crypter.h src/main.cpp src/qt/bitcoin.cpp src/qt/qtipcserver.cpp src/util.cpp
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-11-141-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/init.cpp src/main.cpp src/serialize.h
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-11-141-1/+2
| | |\| |
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-11-141-1/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/bitcoinrpc.cpp
| | | | * Fixes a race condition in CreateNewBlock.Gregory Maxwell2012-11-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. (Partial of faff50d129b6d4b9e6397ac989218e83a26ae692)
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-09-171-2/+11
| |\| | |
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-09-171-2/+11
| | |\| |
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-09-171-2/+11
| | | |\|
| | | | * Apply BIP30 checks to all blocks except the two historic violations.Gregory Maxwell2012-09-171-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Matt pointed out some time ago that there existed a minor DOS attack where a node in its initial block download could be wedged by an overwrite attack in a fork created between checkpoints before a time where BIP30 was enforced. Now that the BIP30 timestamp is irreversibly past the check can be more aggressive and apply to all blocks except the two historic violations.
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-08-271-0/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bitcoin-qt.pro doc/README doc/README_windows.txt share/setup.nsi src/main.cpp src/main.h
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-08-271-6/+41
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bitcoin-qt.pro doc/README doc/README_windows.txt share/setup.nsi src/serialize.h
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-08-271-0/+22
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: contrib/Bitcoin.app/Contents/Info.plist doc/README doc/README_windows.txt share/setup.nsi src/serialize.h
| | | | * Special-case the last alert for alert-key-compromised caseGavin Andresen2012-08-271-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hard-code a special nId=max int alert, to be broadcast if the alert key is ever compromised. It applies to all versions, never expires, cancels all previous alerts, and has a fixed message: URGENT: Alert key compromised, upgrade required Variations are not allowed (ignored), so an attacker with the private key cannot broadcast empty-message nId=max alerts.
| | | * | Alert system DoS preventionGavin Andresen2012-08-271-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes two alert system vulnerabilities found by Sergio Lerner; you could send peers unlimited numbers of invalid alert message to try to either fill up their debug.log with messages and/or keep their CPU busy checking signatures. Fixed by disconnecting/banning peers if they send 10 or more bad (invalid/expired/cancelled) alerts.
| * | | | Alert system DoS preventionGavin Andresen2012-08-271-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes two alert system vulnerabilities found by Sergio Lerner; you could send peers unlimited numbers of invalid alert message to try to either fill up their debug.log with messages and/or keep their CPU busy checking signatures. Fixed by disconnecting/banning peers if they send 10 or more bad (invalid/expired/cancelled) alerts.
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-08-261-2/+37
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/init.cpp
| | * | | Merge commit '689b878' into 0.6.0.xLuke Dashjr2012-08-261-1/+10
| | |\| |
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-08-261-2/+37
| | | |\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/main.cpp
| | | | * Reject block.nVersion<=1 blocks if network has upgraded to version=2Gavin Andresen2012-08-261-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If 950 of the last 1,000 blocks are nVersion=2, reject nVersion=1 (or zero, but no bitcoin release has created block.nVersion=0) blocks -- 75 of last 100 on testnet3. This rule is being put in place now so that we don't have to go through another "express support" process to get what we really want, which is for every single new block to include the block height in the coinbase.
| | * | | Merge commit '9adab76' into 0.6.0.xLuke Dashjr2012-08-261-1/+27
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | Conflicts: src/main.cpp
| | | * | Block height in coinbase as a new block ruleGavin Andresen2012-08-261-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Version 2" blocks are blocks that have nVersion=2 and have the block height as the first item in their coinbase. Block-height-in-the-coinbase is strictly enforced when version=2 blocks are a supermajority in the block chain (750 of the last 1,000 blocks on main net, 51 of 100 for testnet). This does not affect old clients/miners at all, which will continue producing nVersion=1 blocks, and which will continue to be valid.
| | * | | Merge commit 'd710ed5' into 0.6.0.xLuke Dashjr2012-08-261-1/+1
| | |\| |
| | | * | fix a compiler sign warning in OpenBlockFile()Philip Kaufmann2012-08-221-1/+1
| | | | |
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-08-121-3/+3
| |\| | |
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-08-121-3/+3
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | Conflicts: doc/unit-tests.txt
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-08-121-3/+3
| | | |\|
| | | | * Bugfix: Correct English grammar regarding "'s"Luke Dashjr2012-08-121-3/+3
| | | | |
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-08-121-14/+14
| |\| | |
| | * | | Bugfix: Fix a variety of misspellingsLuke Dashjr2012-08-121-1/+1
| | | | |
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-08-121-13/+13
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/key.h src/keystore.h src/net.h src/protocol.cpp src/qt/guiutil.h src/test/DoS_tests.cpp
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-08-121-13/+13
| | | |\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/net.cpp
| | | | * Bugfix: Fix a variety of misspellingsLuke Dashjr2012-08-121-13/+13
| | | | | | | | | | | | | | | | | | | | (PARTIAL: Left out anything changing debug.log)
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-07-221-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/init.cpp src/util.cpp
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-07-221-1/+1
| | |\| |
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-07-221-1/+1
| | | |\|
| | | | * Let the comment in GetBlockValue() reflect the uncertainty about the time ↵Rune K. Svendsen2012-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | interval between subsidy reductions
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-06-211-23/+58
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/unit-tests.txt src/serialize.h
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-06-201-23/+58
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main.cpp src/serialize.h
| | | | * print large orphan warning BEFORE deleting pvMsgGavin Andresen2012-06-201-1/+1
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-04 01:19:40 +0000