highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-26 06:48:53 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,760 Commits 5 Branches 360 Tags
fe26948b7956059933800db4a1badfbc3052e277
Commit Graph

2760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Dashjr
fe26948b79 Merge branch '0.6.0.x' into 0.6.x 2012-09-17 02:07:39 +00:00
Luke Dashjr
e7770992ab Merge branch '0.5.x' into 0.6.0.x 2012-09-17 02:07:03 +00:00
Luke Dashjr
3a9899f6a8 Merge branch '0.4.x' into 0.5.x 2012-09-17 02:06:27 +00:00
Wladimir J. van der Laan
1d89225320 update comment, secure_allocator is defined in allocators.h 2012-09-17 02:05:15 +00:00
Gregory Maxwell
a53b07313f Apply BIP30 checks to all blocks except the two historic violations. 
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.
 2012-09-17 02:03:44 +00:00
Luke Dashjr
6047902934 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/qt/locale/bitcoin_ca_ES.ts
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_fi.ts
	src/qt/locale/bitcoin_fr_CA.ts
	src/qt/locale/bitcoin_he.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_ro_RO.ts
	src/qt/locale/bitcoin_sk.ts
	src/qt/locale/bitcoin_sr.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
 2012-09-11 01:35:36 +00:00
Luke Dashjr
be2e2845ec Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_zh_CN.ts
 2012-09-11 01:32:18 +00:00
Luke Dashjr
ea3e34dc3d Update supported translations 2012-09-11 00:59:16 +00:00
Luke Dashjr
894ce6d88d Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_sv.ts
 2012-09-11 00:02:46 +00:00
Luke Dashjr
6d7b6681b6 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/locale/bitcoin_pt_BR.ts
 2012-09-11 00:02:19 +00:00
Luke Dashjr
cae8742130 Apply MIT license to md2k7 art 
[21:48:14] <md2k7> feel free to make it MIT if you like
 2012-09-11 00:00:25 +00:00
fanquake
82bcb7bf80 Docs Tidy up 
Partial of f00a0dcfed.
 2012-09-10 23:59:42 +00:00
Luke Dashjr
2ff8456c11 Bugfix: Correct doubled-up &amp;amp; in translations and remove extra spaces after ampersand in translations (this fixes hotkeys) 
Partial of upstream 4ee706243c.
 2012-09-10 23:53:28 +00:00
Luke Dashjr
4c1bc22013 Bugfix: Correct doubled-up &amp;amp; in translations and remove extra spaces after ampersand in translations (this fixes hotkeys) 
Partial of upstream 4ee706243c.
 2012-09-10 23:52:27 +00:00
xanatos
7648cd46a4 Wrong address added to collection in test 
The wrong address is added to the collection. As was written a second copy of address1 was added (and so address2 was useless).
 2012-09-10 23:50:18 +00:00
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
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
dd2c101336 Minor documentation update 2012-09-06 20:42:39 +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
Philip Kaufmann
17c94ea886 add missing netbase.h to Qt project-file 2012-09-06 20:27:06 +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
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
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
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
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 9e470585b3, e679ec969c, and 922e8e2929.
 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