Luke Dashjr
cfa880f8e3
Merge branch '0.6.0.x' into 0.6.x
...
Conflicts:
src/net.cpp
2012-09-10 23:48:18 +00:00
Luke Dashjr
9c82c574a0
Merge branch '0.5.x' into 0.6.0.x
...
Conflicts:
src/net.cpp
2012-09-10 23:42:59 +00:00
Luke Dashjr
6321b515f2
Merge branch '0.4.x' into 0.5.x
2012-09-10 23:42:15 +00:00
Jeff Garzik and Luke Dashjr
4ad495c243
select(): Use precise fd presence check, rather than imprecise hSocketMax test
2012-09-10 23:42:06 +00:00
Luke Dashjr
1ce15535f0
Bugfix: Don't consider invalid listening socket in hSocketMax
...
Fixed upstream in 8f10a28890
2012-09-10 23:40:27 +00:00
Luke Dashjr
8b11bff10a
Merge branch '0.6.0.x' into 0.6.x
...
Conflicts:
bitcoin-qt.pro
src/qt/locale/bitcoin_ca_ES.ts
src/qt/locale/bitcoin_cs.ts
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_de.ts
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_es_CL.ts
src/qt/locale/bitcoin_eu_ES.ts
src/qt/locale/bitcoin_fa.ts
src/qt/locale/bitcoin_fa_IR.ts
src/qt/locale/bitcoin_fi.ts
src/qt/locale/bitcoin_fr_FR.ts
src/qt/locale/bitcoin_he.ts
src/qt/locale/bitcoin_hr.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_lt.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pl.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_ro_RO.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_sk.ts
src/qt/locale/bitcoin_sr.ts
src/qt/locale/bitcoin_sv.ts
src/qt/locale/bitcoin_tr.ts
src/qt/locale/bitcoin_uk.ts
src/qt/locale/bitcoin_zh_CN.ts
src/qt/locale/bitcoin_zh_TW.ts
2012-09-07 03:45:21 +00:00
Luke Dashjr
423cece29d
Update supported translations
2012-09-07 00:32:15 +00:00
Luke Dashjr
3b5c5b817f
Merge branch '0.5.x' into 0.6.0.x
...
Conflicts:
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_de.ts
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_es_CL.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_uk.ts
src/qt/locale/bitcoin_zh_CN.ts
src/qt/locale/bitcoin_zh_TW.ts
2012-09-06 23:14:53 +00:00
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
Gavin Andresen and Luke Dashjr
dd2c101336
Minor documentation update
2012-09-06 20:42:39 +00:00
xanatos and Luke Dashjr
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
Philip Kaufmann and Luke Dashjr
17c94ea886
add missing netbase.h to Qt project-file
2012-09-06 20:27:06 +00:00
Wladimir J. van der Laan and Luke Dashjr
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
392d30f0de
Tree-Merge branch '0.6.0.x' into 0.6.x
...
Conflicts:
src/qt/bitcoinstrings.cpp
src/qt/locale/bitcoin_ca_ES.ts
src/qt/locale/bitcoin_cs.ts
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_de.ts
src/qt/locale/bitcoin_en.ts
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_es_CL.ts
src/qt/locale/bitcoin_et.ts
src/qt/locale/bitcoin_eu_ES.ts
src/qt/locale/bitcoin_fa.ts
src/qt/locale/bitcoin_fa_IR.ts
src/qt/locale/bitcoin_fi.ts
src/qt/locale/bitcoin_fr_CA.ts
src/qt/locale/bitcoin_fr_FR.ts
src/qt/locale/bitcoin_he.ts
src/qt/locale/bitcoin_hr.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_lt.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pl.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_ro_RO.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_sk.ts
src/qt/locale/bitcoin_sr.ts
src/qt/locale/bitcoin_sv.ts
src/qt/locale/bitcoin_tr.ts
src/qt/locale/bitcoin_uk.ts
src/qt/locale/bitcoin_zh_CN.ts
src/qt/locale/bitcoin_zh_TW.ts
2012-08-28 23:39:34 +00:00
Luke Dashjr
367f2873bc
Update supported translations
2012-08-28 23:39:17 +00:00
Luke Dashjr
7355f00756
Update supported translations
2012-08-28 21:21:30 +00:00
Luke Dashjr
7181bda15d
Tree-Merge branch '0.5.x' into 0.6.0.x
...
Conflicts:
src/qt/bitcoinstrings.cpp
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_de.ts
src/qt/locale/bitcoin_en.ts
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_es_CL.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_uk.ts
src/qt/locale/bitcoin_zh_CN.ts
src/qt/locale/bitcoin_zh_TW.ts
2012-08-28 07:31:01 +00:00
Luke Dashjr
4c93f17e9e
Update supported translations
2012-08-28 07:30:52 +00:00
Luke Dashjr
d011dc270a
Update supported translations
2012-08-28 03:12:43 +00:00
Luke Dashjr
3dbe71bd35
Revert "Revert "Update gitian descriptors to point at stable git repo""
...
This reverts commit 6e0c5e3778
2012-08-27 19:22:29 +00:00
Luke Dashjr
661ca4136c
Merge branch '0.6.0.x' into 0.6.x
...
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/main.cpp
src/main.h
2012-08-27 19:20:30 +00:00
Luke Dashjr
f08ad34e0c
Merge branch '0.5.x' into 0.6.0.x
...
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h
2012-08-27 19:14:59 +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 and Luke Dashjr
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 and Luke Dashjr
7b66ece1e5
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:57:15 +00:00
Gavin Andresen and Luke Dashjr
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
802bc904ba
Tree-Merge branch '0.5.x' into 0.6.0.x
...
Conflicts:
src/base58.h
src/script.h
2012-08-26 22:45:20 +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 9e470585b3e679ec969c922e8e2929
2012-08-26 22:43:42 +00:00
Luke Dashjr
f31f7770d9
Merge branch '0.6.0.x' into 0.6.x
...
Conflicts:
src/init.cpp
2012-08-26 22:22:19 +00:00
Luke Dashjr
12217fb61d
Merge branch '0.5.x' into 0.6.0.x
2012-08-26 22:20:34 +00:00
Luke Dashjr
cd76166b4b
Merge commit '52153a6' into 0.6.0.x
...
Conflicts:
src/bitcoinrpc.cpp
2012-08-26 22:20:26 +00:00
Luke Dashjr
680c3c8565
Merge commit '689b878' into 0.6.0.x
2012-08-26 22:19:46 +00:00
Luke Dashjr
4c063c11ff
Merge commit '9adab76' into 0.6.0.x
...
Conflicts:
src/main.cpp
2012-08-26 22:19:14 +00:00
Luke Dashjr
0eca21c5fa
Merge commit 'd710ed5' into 0.6.0.x
2012-08-26 22:18:26 +00:00
Luke Dashjr
cd24f37092
Merge commit 'b958999' into 0.6.0.x
...
Conflicts:
src/makefile.osx
src/makefile.unix
2012-08-26 22:17:35 +00:00
Luke Dashjr
7c08c1a5df
Merge commit 'a259baa' into 0.6.0.x
2012-08-26 22:15:56 +00:00
Luke Dashjr
f498701444
Merge branch '0.4.x' into 0.5.x
2012-08-26 22:14:37 +00:00
Gavin Andresen and Luke Dashjr
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 and Luke Dashjr
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 and Luke Dashjr
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 and Luke Dashjr
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 and Luke Dashjr
d710ed5b63
Add CBlock::CURRENT_VERSION and CTransaction::CURRENT_VERSION constants.
...
Partial of upstream dae3e10a5a
2012-08-26 21:02:57 +00:00
Matt Corallo and Luke Dashjr
b958999af1
Work around a distcc bug where -MMD output isn't copied.
2012-08-26 20:44:40 +00:00
Philip Kaufmann and Luke Dashjr
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
Luke Dashjr