Luke Dashjr
78b9d2de40
Merge branch '0.4.x' into 0.5.0.x
...
Conflicts:
contrib/Bitcoin.app/Contents/Info.plist
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h
2012-03-16 16:44:00 -04:00
Gavin Andresen
27960a36de
Fix issue #848 : broken mining on testnet
2012-03-16 16:40:38 -04:00
Gavin Andresen
91aadbdacf
Fix issue #848 : broken mining on testnet
2012-03-16 16:39:52 -04:00
Gavin Andresen
4986c35d74
Code cleanup: use ECDSA_size() instead of fixed 10,000 byte sig buffer, and explicity init static var
2012-03-13 19:08:42 -04:00
Luke Dashjr
7013cc3d97
Merge branch '0.4.x' into 0.5.0.x
2012-03-03 13:59:19 -05:00
Luke Dashjr
e9865a41d6
Merge remote branch 'sipa/nooverwritetx_v0.4.0' into 0.4.x
2012-03-03 12:59:09 -05:00
Pieter Wuille
d7962747c4
Do not allow overwriting unspent transactions (BIP 30)
...
Introduce the following network rule:
* a block is not valid if it contains a transaction whose hash
already exists in the block chain, unless all that transaction's
outputs were already spent before said block.
Warning: this is effectively a network rule change, with potential
risk for forking the block chain. Leaving this unfixed carries the
same risk however, for attackers that can cause a reorganisation
in part of the network.
Thanks to Russell O'Connor and Ben Reeves.
2012-03-03 18:51:18 +01:00
Gavin Andresen
3108aed0f2
DoS fix for mapOrphanTransactions
2012-03-02 13:04:39 -05:00
Pieter Wuille
1be5779124
ProcessBlock is sometimes called with pfrom==NULL
2012-02-27 12:58:53 -05:00
Luke Dashjr
4bbd72cca1
Update copyrights to 2012 for files modified this year
2012-02-07 22:43:39 -05:00
Luke Dashjr
4664aae3fe
Update copyrights to 2012 for files modified this year
2012-02-07 22:30:50 -05:00
Luke Dashjr
882e00e215
Merge branch '0.4.x' into 0.5.0.x
...
Conflicts:
src/main.cpp
2012-02-02 20:17:41 -05:00
Gavin Andresen
c11e2b8679
Only store transactions with missing inputs in the orphan pool.
...
All previous versions of bitcoin could store some types of
invalid transactions in the orphan-transaction list.
2012-02-02 20:03:33 -05:00
Gavin Andresen
edb563e8a5
Testnet difficulty calculation changes, to take effect Feb 15 2012
...
Allow mining of min-difficulty blocks if 20 minutes have gone by without mining a regular-difficulty block.
Normal rules apply every 2016 blocks, though, so there may be a very-slow-to-confirm block at the difficulty-adjustment blocks.
2012-02-02 17:44:04 -05:00
Luke Dashjr
3b8051864b
Be more conservative: check all transactions in blocks after last checkpoint.
2011-12-25 09:26:12 -05:00
Luke Dashjr
ab4b52a239
Merge branch '0.4.x' into 0.5.0.x
2011-12-23 10:08:53 -05:00
Luke Dashjr
027d149352
Bugfix: fForRelay should be false when deciding required fee to include in blocks
...
During the rushed transition from 0.01 BTC to 0.0005 BTC fees, we took the
approach of dropping the relay and block-inclusion fee to 0.0005 BTC
immediately, and only delayed adjusting the sending fee for the next release.
Afterward, the relay fee was lowered to 0.0001 BTC to avoid having the same
problem in the future. However, the block inclusion code was left setting
fForRelay to true! This fixes that, so the lower 0.0001 BTC allowance is (as
intended) only permitted for real relaying.
2011-12-20 17:05:04 -05:00
Gavin Andresen
5d901f1ba0
Orphan block fill-up-memory attack prevention
2011-12-01 23:20:32 -05:00
Gavin Andresen
0e6425da4a
Moved checkpoints out of main, to prep for using them to help prevent DoS attacks
2011-12-01 23:12:47 -05:00
Gavin Andresen
f8c3eb9568
Orphan block fill-up-memory attack prevention
2011-12-01 15:48:27 -05:00
Gavin Andresen
d27be1f557
Moved checkpoints out of main, to prep for using them to help prevent DoS attacks
2011-12-01 15:48:20 -05:00
Pieter Wuille
d825e6a31b
Some extra comments
2011-11-07 00:11:34 +01:00
Gavin Andresen
32ebde4612
Merge pull request #564 from luke-jr/optimize_remove_CheckWork_delay
...
Remove 2 second sleep from CheckWork
2011-10-06 07:54:50 -07:00
Gavin Andresen
b898c8fce6
Merge branch 'no-cryptopp' of https://github.com/tcatm/bitcoin
2011-10-05 10:38:10 -04:00
David Joel Schwartz
514b18722a
Remove 2 second sleep from CheckWork
2011-10-04 00:04:43 -04:00
Forrest Voight
074d584a04
Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution
...
getmemorypool [data]
If [data] is not specified, returns data needed to construct a block to work on:
"version" : block version
"previousblockhash" : hash of current highest block
"transactions" : contents of non-coinbase transactions that should be included in the next block
"coinbasevalue" : maximum allowable input to coinbase transaction, including the generation award and transaction fees
"time" : timestamp appropriate for next block
"bits" : compressed target of next block
If [data] is specified, tries to solve the block and returns true if it was successful.
2011-10-01 14:42:54 -04:00
Nils Schneider
6ccff2cbde
remove cryptopp dependency, add simple unittest for SHA256Transform()
2011-09-30 20:00:22 +02:00
Wladimir J. van der Laan
002a4dcad0
Merge branch 'master' of https://github.com/bitcoin/bitcoin
...
Conflicts:
.gitignore (used upstream version)
bitcoin-qt.pro
2011-09-28 21:52:32 +02:00
Wladimir J. van der Laan
a8b95ce6ed
use median filter for peer-reported reported number of blocks
...
- fixes problem that one misconfigured or malicious node can mess up progress bar
- implementation in src/util.h
- testcase in src/test/util_tests.cpp
2011-09-28 21:35:58 +02:00
Gavin Andresen
a8c108bca1
Remove DoS penalty for SigOpCount or immature transactions
2011-09-27 11:19:57 -04:00
Gavin Andresen
b14bd4df58
Skip verifying transaction signatures during initial block-chain download
2011-09-26 09:20:22 -04:00
Gavin Andresen
17e2c24645
Merge pull request #517 from gavinandresen/DoSprevention
...
Denial-of-service prevention
2011-09-26 06:06:16 -07:00
Gavin Andresen
f7f2a36925
Merge pull request #521 from laanwj/qt
...
Qt GUI
2011-09-26 06:05:11 -07:00
Wladimir J. van der Laan
0961c2fc0d
Merge branch 'master' of https://github.com/bitcoin/bitcoin
2011-09-23 13:42:04 +02:00
Gavin Andresen
806704c237
More denial-of-service misbehavior detection: version/addr/inv/getdata messages
2011-09-21 12:50:13 -04:00
Gavin Andresen
3e52aaf212
Transaction/Block denial-of-service detection/response
2011-09-21 12:50:12 -04:00
Nils Schneider
59090133c0
log low-level network messages only when fDebug is set
2011-09-17 18:29:41 +02:00
Wladimir J. van der Laan
5dd7318db7
Merge branch 'master' of https://github.com/bitcoin/bitcoin
2011-09-16 06:55:47 +02:00
Wladimir J. van der Laan
d33cc2b5e3
clarify function signature (GetNumBlocksOfPeers) and use number of 'frozen' blocks as initial value for number of peer blocks
2011-09-11 10:49:30 +02:00
Wladimir J. van der Laan
a0d2f9a12d
Merge branch 'master' of https://github.com/bitcoin/bitcoin
...
Conflicts:
.gitignore
2011-09-07 18:57:11 +02:00
Gavin Andresen
5a3dea451d
Merge branch 'unique_coinbase' of git://gitorious.org/~Luke-Jr/bitcoin/luke-jr-bitcoin into unique_coinbase
2011-09-07 10:51:57 -04:00
Luke Dashjr
83f4cd156e
Bugfix: Use timestamp in coinbase rather than "bits", needed to ensure coinbase txn is unique even if address is the same
2011-09-06 16:43:40 -04:00
Luke Dashjr
b760e25458
Merge branch 'getwork_dedupe' into unique_coinbase
2011-09-06 16:43:32 -04:00
Gavin Andresen
e077cce617
Optimize database writes for transactions with lots of TxIns.
...
Patch from ArtForz, who discovered the problem.
2011-09-05 14:33:07 -04:00
Wladimir J. van der Laan
0a70a3f4d8
Merge branch 'master' of https://github.com/bitcoin/bitcoin
2011-09-03 09:09:34 +02:00
Gavin Andresen
ec74e8a443
Versions 0.3.20 THROUGH 0.3.23 have trouble with blockchain downloads; avoid them
2011-09-02 12:56:10 -04:00
Wladimir J. van der Laan
c5aa1b139a
update to work with new lock system, add protocol.* to build system
2011-09-02 18:02:22 +02:00
Gavin Andresen
fb45259967
Do not try to download blockchain from 0.3.23 nodes
2011-09-02 12:00:01 -04:00
Wladimir J. van der Laan
7a15d4ff67
Merge branch 'master' of https://github.com/bitcoin/bitcoin
...
Conflicts:
src/main.cpp
2011-09-02 17:35:30 +02:00
Gavin Andresen
783c636c73
Merge pull request #467 from gavinandresen/keypoolzero
...
Logic running with -keypool=0 was wrong (empty keys were being returned).
2011-09-01 12:01:29 -07:00