UdjinM6
865b63e52d
Merge branch '0.10' into merge_btc010
...
Conflicts:
doc/release-notes.md
doc/release-process.md
2015-04-08 06:15:17 +03:00
UdjinM6
41f592aec7
Explicitly convert mutable txes to immutable before calling AcceptableInputs
2015-04-07 05:59:56 +03:00
UdjinM6
955865481e
link to btc 0.10 in release notes
2015-04-07 04:50:32 +03:00
Gavin Andresen
1c62e84099
Keep mempool consistent during block-reorgs
...
This fixes a subtle bug involving block re-orgs and non-standard transactions.
Start with a block containing a non-standard transaction, and
one or more transactions spending it in the memory pool.
Then re-org away from that block to another chain that does
not contain the non-standard transaction.
Result before this fix: the dependent transactions get stuck
in the mempool without their parent, putting the mempool
in an inconsistent state.
Tested with a new unit test (adapted for 0.10).
Rebased-From: ad9e86dca1#5945
2015-04-06 11:38:43 +02:00
Wladimir J. van der Laan
149c1d890d
doc: Credit Jonas Nick in release notes
...
For discovering the vulnerability and discussing the fix that led to PR #5860 .
2015-04-06 09:27:41 +02:00
UdjinM6
bdee4cd3c5
fix cmd help for -masternodeminprotocol
2015-04-06 06:46:53 +03:00
UdjinM6
cddd69444f
small rpc description fixes
2015-04-06 00:59:25 +03:00
UdjinM6
f26aff36cd
unify copyright
2015-04-06 00:58:13 +03:00
UdjinM6
fabca0a428
more bitcoin->dash fixes
2015-04-06 00:56:58 +03:00
UdjinM6
8bd7e1d181
relax restrictions on AcceptableInputs
2015-04-05 22:37:15 +03:00
UdjinM6
d5f7a89097
update .pro
2015-04-05 03:14:25 +03:00
UdjinM6
f08ddc5eea
fix DSdenom/watchonly
2015-04-05 02:45:22 +03:00
UdjinM6
4c129040fe
fix unit icons (ugly but works, need to repaint however)
2015-04-05 02:25:32 +03:00
UdjinM6
b9d826a213
cleanup
2015-04-05 01:58:51 +03:00
UdjinM6
e54c11aabb
tests should compile now
2015-04-05 01:58:10 +03:00
UdjinM6
3f3b6bb3cb
rpc fixes
2015-04-05 01:57:25 +03:00
UdjinM6
4a325e7ebe
fix CreateNewBlock
2015-04-05 01:56:29 +03:00
UdjinM6
df12ef8601
move x11 algos to crypto/
2015-04-04 23:00:03 +03:00
UdjinM6
23129a063f
Merge branch 'master' into merge_btc010
2015-04-04 20:15:38 +03:00
UdjinM6
dd39898a6b
Merge branch 'master' into HEAD
...
Resolved conflicts:
configure.ac
src/clientversion.h
src/qt/locale/dash_bg.ts
src/qt/locale/dash_cmn.ts
src/qt/locale/dash_de.ts
src/qt/locale/dash_es.ts
src/qt/locale/dash_fi.ts
src/qt/locale/dash_pt.ts
src/qt/locale/dash_ru.ts
src/qt/locale/dash_sv.ts
src/qt/locale/dash_vi.ts
src/qt/res/icons/toolbar.png
src/qt/res/icons/toolbar_testnet.png
2015-04-04 19:45:02 +03:00
UdjinM6
64eebc3316
0.12 dirty merge'n'fix (bitcoin 0.10)
2015-04-04 19:24:37 +03:00
Evan Duffield
09a898769a
remove donations to multisig addresses
2015-04-03 20:26:55 -07:00
evan82
d14c302b85
Merge pull request #296 from crowning-/master
...
Several UI improvements
2015-04-03 10:07:48 -07:00
crowning-
c97d8fb1f9
"Recent Transactions" font-size reduced by 1
2015-04-03 11:10:28 +02:00
crowning-
7c57a2ed80
Disable "Try Mix" and "Reset" buttons in Masternode mode
2015-04-03 10:25:14 +02:00
Wladimir J. van der Laan
24e48991d3
Merge pull request #5961
...
bf1cc80
2015-04-03 07:49:39 +02:00
crowning-
eb42ea204e
Centered in/out TX icons for a more harmonic look
2015-04-03 06:14:03 +02:00
crowning-
15e931b254
Off-centered vertical "About" image fixed
2015-04-03 05:51:55 +02:00
evan82
b2f895ee08
Merge pull request #295 from UdjinM6/fix_possible_MN_breakage
...
fix possible MN breakage during mixing
2015-04-02 09:31:17 -07:00
UdjinM6
c8657cbb4d
fix possible MN breakage during mixing
2015-04-02 19:26:45 +03:00
David A. Harding
bf1cc80372
Docs: Use new Bitcoin.org download URLs
...
To give the torrents (which use web seeds) better names, we updated the
URL scheme on bitcoin.org/bin. This updates the release notes and
release doc accordingly, plus updates some other details based on recent
changes to the site.
[skip ci]
2015-04-02 10:38:38 -04:00
Evan Duffield
e29b66d1dc
Merge branch 'master' of https://github.com/darkcoin/darkcoin
2015-04-01 20:33:27 -07:00
Evan Duffield
af6bf0f947
version bump
2015-04-01 20:32:57 -07:00
Wladimir J. van der Laan
9e1cc16296
doc: add historical release notes for 0.10.0
...
Rebased-From: 15facb4aca
2015-04-01 18:44:49 +02:00
Wladimir J. van der Laan
fe3122580e
update release notes for #5953/#5900
2015-04-01 17:27:54 +02:00
Wladimir J. van der Laan
2b7636c3d6
Merge pull request #5953
...
a1f425b#5900 to 0.10.
Github-Pull: #5900
2015-04-01 17:26:33 +02:00
Wladimir J. van der Laan
ae1479a114
update release notes after #5941
2015-04-01 16:48:23 +02:00
Pieter Wuille
aa587d4cae
Scale up addrman
...
This change was suggested as Countermeasure 6 in
Eclipse Attacks on Bitcoin’s Peer-to-Peer Network, Ethan Heilman,
Alison Kendler, Aviv Zohar, Sharon Goldberg. ePrint Archive Report
2015/263. March 2015.
Rebased-From: 1d21ba2f5e#5941
2015-04-01 16:39:55 +02:00
Pieter Wuille
0c6f334c32
Always use a 50% chance to choose between tried and new entries
...
This change was suggested as Countermeasure 2 in
Eclipse Attacks on Bitcoin’s Peer-to-Peer Network, Ethan Heilman,
Alison Kendler, Aviv Zohar, Sharon Goldberg. ePrint Archive Report
2015/263. March 2015.
Rebased-From: c6a63ceeb4#5941
2015-04-01 16:39:36 +02:00
Pieter Wuille
214154e6fc
Do not bias outgoing connections towards fresh addresses
...
This change was suggested as Countermeasure 2 in
Eclipse Attacks on Bitcoin’s Peer-to-Peer Network, Ethan Heilman,
Alison Kendler, Aviv Zohar, Sharon Goldberg. ePrint Archive Report
2015/263. March 2015.
Rebased-From: 68ba3f67bd500a64fb8932c6b41924ddc31d76f
Github-Pull: #5941
2015-04-01 16:39:30 +02:00
Pieter Wuille
2218d4bbe0
Simplify hashing code
...
Conflicts:
src/addrman.cpp
Rebased-From: a8ff7c62ed#5941
2015-04-01 16:38:54 +02:00
Pieter Wuille
cf0218f8b2
Make addrman's bucket placement deterministic.
...
Give each address a single fixed location in the new and tried tables,
which become simple fixed-size arrays instead of sets and vectors.
This prevents attackers from having an advantages by inserting an
address multiple times.
This change was suggested as Countermeasure 1 in
Eclipse Attacks on Bitcoin’s Peer-to-Peer Network, Ethan Heilman,
Alison Kendler, Aviv Zohar, Sharon Goldberg. ePrint Archive Report
2015/263. March 2015.
It is also more efficient.
Conflicts:
src/addrman.cpp
src/addrman.h
Rebased-From: e6b343d880#5941
2015-04-01 16:38:47 +02:00
Pieter Wuille
b788994256
Switch addrman key from vector to uint256
...
Conflicts:
src/addrman.cpp
Rebased-From: b23add5521#5941
2015-04-01 16:38:31 +02:00
evan82
fd357be174
Merge pull request #293 from UdjinM6/fix_rpc_mn_list
...
Fixes for "masternode list"
2015-03-31 15:31:54 -07:00
evan82
24cd4665ba
Merge pull request #292 from UdjinM6/fix_UI_masternode_litemode
...
Fix UI in masternode and lite modes
2015-03-31 15:29:53 -07:00
evan82
00fcbceeab
Merge pull request #291 from crowning-/master
...
Images in share/pixmaps updated to Dash
2015-03-31 15:29:37 -07:00
Evan Duffield
ef96abcde4
Merge branch 'master' of https://github.com/darkcoin/darkcoin
2015-03-31 14:22:27 -07:00
Evan Duffield
57127ce661
use different cs for dsee
2015-03-31 14:21:59 -07:00
evan82
91cf419662
Merge pull request #290 from UdjinM6/fix_mn_dsee_activation
...
Fix MN dsee
2015-03-31 07:35:01 -07:00
UdjinM6
ae2dec6780
Fix MN dsee: MN should not update itself in MN list until it activated
2015-03-31 17:29:31 +03:00
