Commit Graph

6247 Commits

Author SHA1 Message Date
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
Evan Duffield
ec80b25217 updated chinese translations 2015-04-07 20:05:40 -07:00
Evan Duffield
ad348211f8 Merge branch 'v0.11.2.x' of https://github.com/darkcoin/darkcoin into v0.11.2.x 2015-04-07 20:04:02 -07:00
evan82
d7cdaad0e2 Merge pull request #300 from UdjinM6/fix_votes_filter
fix filtering for masternode list votes rpc
2015-04-07 17:48:06 -07:00
Evan Duffield
5c03872655 fixed vote crashes 2015-04-07 17:45:33 -07:00
UdjinM6
f358a8a698 fix filtering for masternode list votes rpc 2015-04-08 03:43:40 +03:00
Evan Duffield
88ab84a2e7 updated translatios 2015-04-07 17:35:22 -07:00
Evan Duffield
631e4b505f fixed vote-many 2015-04-07 12:59:30 -07:00
Evan Duffield
13e4a7d33f Merge branch 'v0.11.2.x' of https://github.com/darkcoin/darkcoin into v0.11.2.x 2015-04-07 10:22:10 -07:00
Evan Duffield
d120557b05 updated chinese translations 2015-04-07 10:09:42 -07:00
Evan Duffield
0b225546f7 check collateral before submitting 2015-04-07 09:41:31 -07:00
UdjinM6
debcbb75b1 do not search for known sporks by hash, search only by ID 2015-04-07 18:17:50 +03:00
Evan Duffield
83864c69c3 Merge branch 'master' of https://github.com/darkcoin/darkcoin into v0.11.2.x 2015-04-07 07:40:28 -07:00
evan82
ac51baf4a2 Merge pull request #297 from crowning-/master
Transaction type column width adjusted
2015-04-07 07:30:15 -07:00
UdjinM6
41f592aec7 Explicitly convert mutable txes to immutable before calling AcceptableInputs 2015-04-07 05:59:56 +03:00
UdjinM6
649434dd2e Fix SelectCoinsByDenominations relative things:
- AvailableCoins inside SelectCoinsByDenominations should select denoms only now (also removing corresponding "if"s)
- use temporary vectors in doauto when call SelectCoinsByDenominations to prevent vCoins modification
- variables naming (set...->v...)
2015-04-07 05:52:49 +03:00
Evan Duffield
7e72c2bccf added nDenom check for dsa 2015-04-06 16:07:25 -07:00
Evan Duffield
42e056c5c5 version/proto bump 2015-04-06 13:41:08 -07:00
Evan Duffield
d928a53234 DS Working pretty well 2015-04-06 13:00:46 -07:00
Evan Duffield
18828b00ef fixed overviewpage.cpp 2015-04-06 08:32:43 -07:00
Evan Duffield
f0192b1bb3 Reverting some DS changes
- Some changes caused instability of DS, this should fix that.
2015-04-06 08:14:26 -07: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
Github-Pull: #5945
2015-04-06 11:38:43 +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
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
crowning-
833cf2b23e Transaction type column width adjusted 2015-04-03 20:42:54 +02: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
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
UdjinM6
c8657cbb4d fix possible MN breakage during mixing 2015-04-02 19:26:45 +03: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
2b7636c3d6
Merge pull request #5953
a1f425b Add a consistency check for the block chain data structures (Pieter Wuille)

This is a port of #5900 to 0.10.

Github-Pull: #5900
2015-04-01 17:26:33 +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
Github-Pull: #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
Github-Pull: #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
Github-Pull: #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
Github-Pull: #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
Github-Pull: #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
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
UdjinM6
89f8a68a97 Fixes for "masternode list"
- fix descriptions and filtering in masternode list rpc, sort modes
- rename "active" to "status"
- move MN status string compilation to masternode.h
- "full" mode will use Status instead of IsEnabled now
2015-03-31 04:14:44 +03:00
UdjinM6
368c7a631e Fix UI in masternode and lite modes:
- disable entire DS frame in masternode mode and do not run timer
- hide DS and IX checkboxes in litemode
2015-03-31 01:27:20 +03:00
Evan Duffield
fea26cfb89 updated minimum for reference node 2015-03-30 12:33:42 -07:00
Evan Duffield
91d5f043ca Merge branch 'crowning--v0.11.2.x' 2015-03-30 09:06:26 -07:00
Evan Duffield
0dab1d059e updated chinese translations 2015-03-30 09:05:24 -07:00
crowning-
e67cc843dc Black border of Windows icons removed 2015-03-30 08:17:08 +02:00
Evan Duffield
8e8c117dd3 version bump 2015-03-29 22:19:15 -07:00
Evan Duffield
9d23c7fa3a translation updates 2015-03-29 22:18:16 -07:00
thelazier
551dd3bc56 Update rpcdarksend.cpp 2015-03-29 09:25:32 +07:00
crowning-
24d4738c22 Create empty dash.conf during startup if it doesn't exist 2015-03-28 14:22:57 +01:00
Evan Duffield
0202a9613f version bump 2015-03-27 18:08:46 -07:00
Evan Duffield
de073e8724 version bump 2015-03-27 18:06:13 -07:00
Evan Duffield
f227a13cb1 Merge branch 'v0.11.2.x' of https://github.com/darkcoinproject/darkcoin into v0.11.2.x 2015-03-27 17:42:56 -07:00
Evan Duffield
a5e5476995 imported updated translations 2015-03-27 17:42:35 -07:00
Pieter Wuille
a1f425b48b Add a consistency check for the block chain data structures
This adds a -checkblockindex (defaulting to true for regtest), which occasionally
does a full consistency check for mapBlockIndex, setBlockIndexCandidates, chainActive, and
mapBlocksUnlinked.
2015-03-27 17:24:07 -07:00
crowning-
dbc093f834 Merge remote-tracking branch 'upstream/v0.11.2.x' into v0.11.2.x 2015-03-27 23:49:13 +01:00
crowning-
2d5dd18548 Line-break (which breaks the layout) removed from German translation. 2015-03-27 23:44:52 +01:00
UdjinM6
e6ec450fa1 (mac) icns with new logo 2015-03-27 20:12:34 +03:00
Evan Duffield
d1fad966e9 DASHS -> DASH 2015-03-27 08:54:29 -07:00
Evan Duffield
6a75e6e52e updated chinese translations 2015-03-27 08:04:17 -07:00
Evan Duffield
b929991ff9 deleted unused translation files 2015-03-27 07:32:19 -07:00
crowning-
4421c968cf 256x256 pics updated to Dash logo 2015-03-26 23:08:01 +01:00
crowning-
253c9d79fd 256x256 pics updated to Dash 2015-03-26 23:07:31 +01:00
Evan Duffield
79edce5f5d version bump 2015-03-26 14:58:10 -07:00
crowning-
073e55fcc5 Dash images for toolbar 2015-03-26 22:56:48 +01:00
crowning-
d6db2a35c6 Dash icons for Windows 2015-03-26 22:12:53 +01:00
Evan Duffield
b89fd2e149 compiling warnings / fixed block comparison 2015-03-26 14:11:05 -07:00
Evan Duffield
a34ca7a88c Reference node fixes / debugging
- Only allow payments to be created once per blockHeight
2015-03-26 13:46:19 -07:00
Evan Duffield
6c9cc68449 version 12 2015-03-26 07:29:56 -07:00
evan82
b00ffa6af1 Merge pull request #279 from UdjinM6/v0.11.2.x_DS_header
v0.11.2.x make Darksend header styling closer to Available label
2015-03-26 07:22:57 -07:00
evan82
aadf08a8ca Merge pull request #278 from UdjinM6/v0.11.2.x_fix_UI
v0.11.2.x fix balances label UI issue
2015-03-26 07:22:35 -07:00
UdjinM6
b44f0429db make Darksend header styling closer to Available label 2015-03-26 13:25:01 +03:00
Wladimir J. van der Laan
4635a4c4e7
Translations update from transifex 2015-03-26 08:59:53 +01:00
Ruben de Vries
78f64ef0b2
don't trickle for whitelisted nodes
Rebased-From: fc720207e0
Github-Pull: #5942
2015-03-26 08:39:00 +01:00
UdjinM6
e9ea273db7 fix balances label UI issue 2015-03-25 18:13:55 +03:00
crowning-
51fdade5c7 Fixed console history truncation 2015-03-25 10:16:46 +01:00
snogcel
24b0e364f2 updated color scheme and logos 2015-03-24 22:54:49 -06:00
snogcel
283edf7598 adjustment (single line revert) 2015-03-24 19:01:50 -06:00
snogcel
bf4c9ef42a qlabel width adjustment & small button placement adjustment 2015-03-24 18:58:33 -06:00
Evan Duffield
41135ad456 version/proto/minproto bump 2015-03-24 14:14:55 -07:00
UdjinM6
d08949970c Merge branch 'v0.11.2.x' into v0.11.2.x_mncache_strmagic 2015-03-24 19:14:07 +03:00
evan82
9fec03ba3f Merge pull request #272 from UdjinM6/v0.11.2.x_small_mn_related_fixes_cleanups
V0.11.2.x few small mn related fixes & cleanups
2015-03-24 08:29:53 -07:00
evan82
d75462694f Merge pull request #271 from crowning-/v0.11.2.x
Default keypool size in usage text fixed
2015-03-24 08:29:22 -07:00
evan82
774ccffe3c Merge pull request #270 from snogcel/v0.11.2.x
increase recent transactions to 5
2015-03-24 08:29:07 -07:00
evan82
d2c868a9a4 Merge pull request #274 from UdjinM6/v0.11.2.x_dont_limit_dssend_inputs
V0.11.2.x don't limit ds-send inputs number artificially, fees should take care of it instead
2015-03-24 08:27:17 -07:00
UdjinM6
ca53ddd32b don't limit ds-send inputs number artificially, fees should take care of it instead 2015-03-24 18:16:43 +03:00
Alex Morcos
1d2cdd2ef9
Fix InvalidateBlock to add chainActive.Tip to setBlockIndexCandidates
Rebased-From: cd3d67cf3b
Github-Pull: #5890
2015-03-24 14:51:36 +01:00
UdjinM6
7ae6c961f7 use strMagicMessage to verify mncache.dat, rewrite (only) if hash and both magic are ok 2015-03-24 13:43:14 +03:00
crowning-
1795fb347e Merge remote-tracking branch 'upstream/v0.11.2.x' into v0.11.2.x 2015-03-24 09:22:23 +01:00
crowning-
a6862652b8 Default keypool size in usage text fixed 2015-03-24 09:18:35 +01:00
dexX7
c9e022b7ee Initialization: set Boost path locale in main thread
The path locale is lazy initialized and to avoid deinitialization errors
in multithreading environments, it is set explicitly by the main thread.

Conflicts:
	src/util.cpp
Rebased-From: 317e66c741
Github-Pull: #5877
2015-03-24 08:45:24 +01:00
snogcel
7092180641 increase recent transactions to 5 2015-03-23 21:31:15 -06:00
evan82
7af4e2ad11 Merge pull request #269 from snogcel/v0.11.2.x
updated logo positioning and subtle color scheme adjustment
2015-03-23 20:14:07 -07:00
UdjinM6
6f11893ea1 ProcessMasternodeConnections should work on testnet too 2015-03-24 05:03:34 +03:00
UdjinM6
cfc4bbd986 do not check mn unless only active requested 2015-03-24 05:02:22 +03:00
UdjinM6
0fd7c655a4 move mn state enum inside class 2015-03-24 04:59:12 +03:00
snogcel
33202e4089 adjust Available Balance label height 2015-03-23 19:58:45 -06:00
UdjinM6
5c1621447d make sure nScanningErrorCount and nLastScanningErrorBlockHeight handled correctly 2015-03-24 04:52:27 +03:00
Evan Duffield
505ab68aa9 version bump 2015-03-23 18:19:49 -07:00
Evan Duffield
49214d0232 Removed donation flag 2015-03-23 18:16:28 -07:00
snogcel
0b9f9b6c33 Revert "increase number of recent transactions"
This reverts commit 99ce56a8c0.
2015-03-23 18:44:16 -06:00
snogcel
99ce56a8c0 increase number of recent transactions 2015-03-23 18:41:10 -06:00
snogcel
3bcaead0f6 updated logo and subtle color scheme adjustment 2015-03-23 18:32:54 -06:00
crowning-
a5833ccd34 "(out of sync)" labels re-aligned 2015-03-23 21:12:33 +01:00
evan82
bf52910a14 Merge pull request #266 from UdjinM6/v0.11.2.x_fix_scorecalculation_hash
V0.11.2.x fix scorecalculation hash
2015-03-23 13:03:02 -07:00
Evan Duffield
b0786bb5a1 Merge branch 'v0.11.2.x' of https://github.com/darkcoinproject/darkcoin into v0.11.2.x 2015-03-23 12:40:41 -07:00
Evan Duffield
701886c8d5 New Command: masternode list pose
- Shows proof-of-service score for masternodes
2015-03-23 12:39:38 -07:00
evan82
49576c93b2 Merge pull request #267 from UdjinM6/v0.11.2.x_rpc_blockheader
V0.11.2.x add getblockheader rpc command (+small fix for getblock example)
2015-03-23 11:43:18 -07:00
UdjinM6
ef98ad5039 example block hash btc->dash 2015-03-23 20:57:03 +03:00
UdjinM6
52ff69dd57 add getblockheader rpc command 2015-03-23 20:56:16 +03:00
Evan Duffield
1a6be53733 reducing spam 2015-03-23 10:43:17 -07:00
Evan Duffield
2bac43a100 updated logos 2015-03-23 10:30:12 -07:00
UdjinM6
2a7c348b16 explicitly grab each piece of data from memory for hashing in CMasternode::CalculateScore 2015-03-23 20:28:36 +03:00
Evan Duffield
528cf61185 version bump / pose fixes 2015-03-23 10:20:56 -07:00
Evan Duffield
c0a658ae43 version bump 2015-03-23 07:14:34 -07:00
Evan Duffield
4592b5090d fixed masternode donation miscalculations 2015-03-23 07:13:20 -07:00
Evan Duffield
4152eea1c1 fixed ranking issues for PoSe 2015-03-23 05:59:22 -07:00
Evan Duffield
0e35ed5cb6 Merge branch 'v0.11.2.x' of https://github.com/darkcoinproject/darkcoin into v0.11.2.x 2015-03-22 17:44:36 -07:00
Evan Duffield
739486eb5d added "masternode list donation" 2015-03-22 17:43:42 -07:00
evan82
3103432fac Merge pull request #265 from crowning-/v0.11.2.x
Resized transaction icons of overview-page for a more harmonic look
2015-03-22 15:50:17 -07:00
Evan Duffield
98a984dc6b changed seeders 2015-03-22 13:49:43 -07:00
crowning-
bcb148eeab Placement of transaction-amount adjusted (unconfirmed transactions didn't fit) 2015-03-22 21:29:29 +01:00
crowning-
ef74e261e5 Resized transaction icons of overview-page for a more harmonic look 2015-03-22 20:37:30 +01:00
Evan Duffield
88de9f9c4d version bump 2015-03-22 07:31:55 -07:00
Evan Duffield
da66e049cb update logos 2015-03-22 07:15:28 -07:00
Evan Duffield
563b949db3 Merge branch 'v0.11.2.x' of https://github.com/darkcoinproject/darkcoin into v0.11.2.x 2015-03-21 21:08:07 -07:00
Evan Duffield
9ae1093935 improved donation code/message 2015-03-21 21:07:59 -07:00
Evan Duffield
9bafb70a2f changed some locks 2015-03-21 20:27:13 -07:00
UdjinM6
e3d333f8b2 converted from "fix possible block db breakage during re-index" bb6acff079 2015-03-21 20:27:13 -07:00
UdjinM6
66d96acd19 format only: tabs -> spaces 2015-03-21 20:27:13 -07:00
UdjinM6
00023e97db disconnect ds timer if not in litemode 2015-03-21 20:27:13 -07:00