Commit Graph

1960 Commits

Author SHA1 Message Date
Luke Dashjr
fc1cd74b86 Update supported translations 2012-09-06 22:49:23 +00:00
Luke Dashjr
f210c74398 Merge branch '0.4.x' into 0.5.x 2012-09-06 22:09:37 +00:00
xanatos
c1124277c5 Correct LoadWallet() return value (false -> DB_LOAD_OK)
Equivalent code. (false == 0 == DB_LOAD_OK). Fixes #1706.
2012-09-06 20:39:12 +00:00
Wladimir J. van der Laan
9631ac1214 Remove json/*.cpp from Qt build system
They are unneeded as jsonspirit is always used as template library,
the other makefiles don't include them either.
2012-09-06 20:20:20 +00:00
Luke Dashjr
d011dc270a Update supported translations 2012-08-28 03:12:43 +00:00
Luke Dashjr
d31e24aeaa Merge branch '0.4.x' into 0.5.x
Conflicts:
	contrib/Bitcoin.app/Contents/Info.plist
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h
2012-08-27 19:10:41 +00:00
Luke Dashjr
b9b15578bb Bump version to 0.4.8 2012-08-27 19:07:05 +00:00
Gavin Andresen
e0adf13897 Special-case the last alert for alert-key-compromised case
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.
2012-08-27 19:01:17 +00:00
Gavin Andresen
e1c2163fb7 Alert system DoS prevention
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.
2012-08-27 18:56:54 +00:00
Luke Dashjr
2eaeb17fe1 Merge branch '0.4.x' into 0.5.x 2012-08-26 22:44:23 +00:00
Luke Dashjr
01cc7bf0c5 Support sending to script (P2SH) addresses
Upstream partials from 9e470585b3, e679ec969c, and 922e8e2929.
2012-08-26 22:43:42 +00:00
Luke Dashjr
f498701444 Merge branch '0.4.x' into 0.5.x 2012-08-26 22:14:37 +00:00
Gavin Andresen
bfd2ddfc47 Checkpoint at block 185333 (and remove a couple of intermediate checkpoints) 2012-08-26 22:14:06 +00:00
Wladimir J. van der Laan
bfe7cc638d Override progress bar on platforms with segmented progress bars
Windows & WindowsXP style have a problem with displaying the block progress.
Add a custom stylesheet as workaround, but only when one of those renderers is active,
otherwise leave the theme alone (issue #1071).
2012-08-26 22:13:34 +00:00
Luke Dashjr
52153a6e08 Minimal adaptations to getmemorypool for BIP 34
- As long as version 1 blocks are valid, provide them to getmemorypool clients (only)
- Include BIP 22 "height" key in getmemorypool output
2012-08-26 21:51:41 +00:00
Luke Dashjr
689b878c33 Merge branch '0.4.x' into 0.5.x
Conflicts:
	src/main.cpp
2012-08-26 21:10:06 +00:00
Gavin Andresen
2d57b561c2 Reject block.nVersion<=1 blocks if network has upgraded to version=2
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.
2012-08-26 21:07:08 +00:00
Gavin Andresen
9adab76e0a Block height in coinbase as a new block rule
"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.
2012-08-26 21:06:26 +00:00
Gavin Andresen
d710ed5b63 Add CBlock::CURRENT_VERSION and CTransaction::CURRENT_VERSION constants.
Partial of upstream dae3e10a5a
2012-08-26 21:02:57 +00:00
Matt Corallo
b958999af1 Work around a distcc bug where -MMD output isn't copied. 2012-08-26 20:44:40 +00:00
Philip Kaufmann
a259baa955 update some strings used as warning messages in sendcoinsdialog.cpp 2012-08-26 20:33:21 +00:00
Luke Dashjr
5ebc168006 Bugfix: Make USE_UPNP=- work with makefile.{linux-mingw,mingw,osx} too 2012-08-24 03:42:16 +00:00
Philip Kaufmann
f51b175e3c fix a compiler sign warning in OpenBlockFile() 2012-08-22 17:17:42 +00:00
Philip Kaufmann
08344c735f fix further spelling errors / remove a tab in the source 2012-08-12 17:41:24 +00:00
Luke Dashjr
566f556c40 Bugfix: Correct English grammar regarding "'s" 2012-08-12 17:34:23 +00:00
Luke Dashjr
8ddc257a4b Merge branch '0.4.x' into 0.5.x 2012-08-12 17:33:03 +00:00
Luke Dashjr
448f6b3d9b Bugfix: Correct English grammar regarding "'s" 2012-08-12 17:30:36 +00:00
Luke Dashjr
8911ac0b27 Bugfix: Use standard BTC unit in comments 2012-08-12 17:27:46 +00:00
Luke Dashjr
982f4fd301 Bugfix: Fix a variety of misspellings 2012-08-12 17:13:48 +00:00
Luke Dashjr
797d0b231b Merge branch '0.4.x' into 0.5.x
Conflicts:
	src/net.cpp
2012-08-12 17:02:38 +00:00
Luke Dashjr
9e98fe6f58 Bugfix: Fix a variety of misspellings
(PARTIAL: Left out anything changing debug.log)
2012-08-12 17:00:02 +00:00
Luke Dashjr
5951d9fe32 Merge branch 'bugfix_CNBerr' into 0.5.x 2012-08-12 16:40:59 +00:00
Luke Dashjr
9b1b1a06a1 Merge branch '0.4.x' into 0.5.x 2012-08-12 16:39:46 +00:00
Luke Dashjr
ae8ccfd24b Merge branch 'bugfix_CNBerr_daggy' into 0.4.x 2012-08-12 16:39:03 +00:00
Michael Ford
7543a5611b Typo 2012-07-26 03:37:12 +00:00
Stephane Glondu
0a9972bf1b Fix spelling of successfully 2012-07-26 00:41:56 +00:00
fanquake
895191b9a8 Typo 2012-07-26 00:39:46 +00:00
fanquake
b8dcb38b4e Fix Typo 2012-07-26 00:39:21 +00:00
fanquake
fb4dbbd188 Docs Tidy up
(PARTIAL cherry pick)
2012-07-22 23:38:26 +00:00
Luke Dashjr
4f620dd0f0 Merge branch '0.4.x' into 0.5.x 2012-07-22 23:15:22 +00:00
Philip Kaufmann
ec9a3c04ed fix OpenSSL not written as proper noun in some comments 2012-07-22 22:09:49 +00:00
Rune K. Svendsen
63f319353c Let the comment in GetBlockValue() reflect the uncertainty about the time interval between subsidy reductions 2012-07-22 21:45:32 +00:00
Wladimir J. van der Laan
b2848bf08a Make sort and filters for transactions and labels case-insensitive 2012-07-22 21:45:04 +00:00
Philip Kaufmann
bb583e3c11 when on testnet, set testnet icon for about dialog
- add a comment
2012-07-22 21:18:48 +00:00
Luke Dashjr
7a161e4847 CBigNum: Convert negative int64 values in a more well-defined way
Since the minimum signed integer cannot be represented as positive so long as its type is signed, and it's not well-defined what happens if you make it unsigned before negating it, we instead increment the negative integer by 1, convert it, then increment the (now positive) unsigned integer by 1 to compensate
2012-07-22 21:10:19 +00:00
Ricardo M. Correia
3bd1d6645e Fix signed subtraction overflow in CBigNum::setint64().
As noticed by sipa (Pieter Wuille), this can happen when CBigNum::setint64() is
called with an integer value of INT64_MIN (-2^63).

When compiled with -ftrapv, the program would crash. Otherwise, it would
execute an undefined operation (although in practice, usually the correct one).
2012-07-22 21:10:15 +00:00
Luke Dashjr
f1830a9a22 Merge branch '0.4.x' into 0.5.x 2012-07-06 00:41:57 +00:00
Gregory Maxwell
580f7cd731 Do not consider inbound peers for outbound network group exclusion.
Bitcoin will not make an outbound connection to a network group
(/16 for IPv4) that it is already connected to. This means that
if an attacker wants good odds of capturing all a nodes outbound
connections he must have hosts on a a large number of distinct
groups.

Previously both inbound and outbound connections were used to
feed this exclusion. The use of inbound connections, which can be
controlled by the attacker, actually has the potential of making
sibyl attacks _easier_: An attacker can start up hosts in groups
which house many honest nodes and make outbound connections to
the victim to exclude big swaths of honest nodes. Because the
attacker chooses to make the outbound connection he can always
beat out honest nodes for the consumption of inbound slots.

At _best_ the old behavior increases attacker costs by a single
group (e.g. one distinct group to use to fill up all your inbound
slots), but at worst it allows the attacker to select whole
networks you won't connect to.

This commit makes the nodes use only outbound links to exclude
network groups for outbound connections. Fancier things could
be done, like weaker exclusion for inbound groups... but
simplicity is good and I don't believe more complexity is
currently needed.
2012-07-06 00:28:30 +00:00
fanquake
cf6ab20d8b Fix a couple more typos 2012-07-06 00:21:18 +00:00
Philip Kaufmann
a1816267e6 fix a typo in OptionsDialog 2012-07-06 00:17:23 +00:00