Commit Graph

4512 Commits

Author SHA1 Message Date
crowning2
28b877e790 Missing include added/modifed 2015-03-07 19:10:56 +01:00
crowning2
59bb5bec12 Merge 'upstream/v0.11.2.x' into v0.11.2.x 2015-03-07 16:48:44 +01:00
Evan Duffield
a8f5743999 version bump 2015-03-07 07:51:23 -07:00
Evan Duffield
c169e49fce Added input/output/sig trickle
- Send a few inputs/output each cycle
- Mix other users inputs/outputs into relay each cycle
- Send signatures as a tickle, also mixed with other users signatures
- Fixed a bug with validating the final transaction
2015-03-07 07:50:14 -07:00
crowning2
db0dac64dc Build fix for src/qt/Makefile.am 2015-03-07 10:59:36 +01:00
snogcel
9e22d0d3fc CSS WIP v11 2015-03-07 01:07:55 -07:00
crowning2
fd865303f1 Added new resources to QT-Makefile 2015-03-07 01:43:42 +01:00
crowning2
e5b41852e3 darkcoin.qrc reformat 2015-03-06 23:33:31 +01:00
crowning2
7793b2d4f0 Added new images/icons to resource file and adjusted CSS.file 2015-03-06 23:10:23 +01:00
crowning2
5f3ac99782 Merge 'origin/v0.11.2.x' into v0.11.2.x 2015-03-06 22:24:48 +01:00
crowning2
552e30d646 Merge 'upstream/v0.11.2.x' into v0.11.2.x 2015-03-06 22:24:20 +01:00
evan82
a086a6abe3 Merge pull request #233 from UdjinM6/v0.11.2.x_save_dsqcount
V0.11.2.x save nDsqCount in mncache.dat
2015-03-06 12:27:35 -07:00
UdjinM6
b5414e1c3c save nDsqCount in mncache.dat 2015-03-06 20:59:19 +03:00
Mike Kinney
1d9c0b1ebc Merge branch 'v0.11.2.x' of https://github.com/darkcoin/darkcoin into v0.11.2.x-remove-unused 2015-03-06 06:14:12 -08:00
Mike Kinney
7ed8073010 v0.11.2.x remove unused variables 2015-03-06 06:13:58 -08:00
evan82
9f124d56b6 Merge pull request #231 from mkinney/v11.2-comments
V0.11.2.x comments
2015-03-06 07:04:44 -07:00
evan82
2a6d51af8d Merge pull request #229 from UdjinM6/v0.11.2.x_fix_strings
V0.11.2.x fix strings
2015-03-06 07:02:28 -07:00
evan82
953e978424 Merge pull request #228 from UdjinM6/v0.11.2.x_masternodes.dat_rename
V0.11.2.x rename masternodes.dat
2015-03-06 07:02:16 -07:00
Mike Kinney
ed3e22d1f0 remove trailing space 2015-03-05 23:28:25 -08:00
Mike Kinney
757128bfe0 v0.11.2.x Updating comments 2015-03-05 23:24:34 -08:00
snogcel
645a77f5e7 CSS WIP v10 2015-03-05 21:55:06 -07:00
crowning2
142b6fb32c Merge upstream 2015-03-05 21:43:51 +01:00
UdjinM6
e0714aac5d fix strings to translate once / typo 2015-03-05 20:42:50 +03:00
UdjinM6
e522cbfd6a rename masternodes.dat->mncache.dat / fix strings 2015-03-05 20:39:47 +03:00
UdjinM6
2e0d7ab0b6 fix even more console spam 2015-03-05 19:40:17 +03:00
Evan Duffield
5bc821cb5e Changed max rounds to 6 in UI
-Rounds are 100x+ more secure, so even 4 rounds should be highly secure
-If users still want more rounds, they can use the parameter -darksendrounds to use up to 16
2015-03-05 08:28:16 -07:00
Evan Duffield
f63e1ddfd0 Merge branch 'v-1.11.2.x' of https://github.com/darkcoinproject/darkcoin into v0.11.2.x 2015-03-05 08:23:43 -07:00
Evan Duffield
1053c299ed version/protocol bump 2015-03-05 08:23:21 -07:00
Evan Duffield
9aca26d220 merged mkinney-v0.11.2 2015-03-05 08:18:45 -07:00
evan82
ed57dd2695 Merge pull request #224 from vertoe/devel-0.9
Merge master, translations, upstream
2015-03-05 08:16:08 -07:00
evan82
5965bec6ba Merge pull request #222 from UdjinM6/v0.11.2.x_reject_too_old_mn
v0.11.2.x better old mn filtering
2015-03-05 08:15:01 -07:00
evan82
2773bb1f78 Merge pull request #223 from UdjinM6/v0.11.2.x_fix_console_spam
v0.11.2.x fix console spam
2015-03-05 08:14:45 -07:00
evan82
ecd9d4a436 Merge pull request #225 from UdjinM6/v0.11.2.x_masternodes.dat_verification
V0.11.2.x masternodes.dat verification
2015-03-05 08:14:27 -07:00
Evan Duffield
c6f0259d9b fixed shared key usage 2015-03-05 08:08:03 -07:00
Mike Kinney
c8fe5a9cf7 V0.11.2.x update comments 2015-03-05 00:11:56 -08:00
Mike Kinney
98fe439af4 V0.11.2.x update comments 2015-03-05 00:10:15 -08:00
Mike Kinney
b0079d37ad V0.11.2.x update comments 2015-03-04 23:49:50 -08:00
UdjinM6
2a5d588784 Make masternodes.dat verification more specific, prevent from overwriting corruped files and files with unknown format, give more info in debug.log output 2015-03-05 02:46:50 +03:00
vertoe
c3c53dd8ed Pull translations from transifex. 2015-03-04 21:23:59 +01:00
vertoe
27121a2c07 Update translation source. 2015-03-04 21:21:37 +01:00
UdjinM6
0595ef80c3 fix console spam 2015-03-04 22:59:51 +03:00
crowning2
0a4aa64346 Daily upstream merge 2015-03-04 20:33:35 +01:00
crowning2
8702795d9d Daily upstream merge. 2015-03-04 20:32:56 +01:00
UdjinM6
84f4657ff9 Prevent masternodes with protocol less then nMasternodeMinProtocol (set to MIN_PEER_PROTO_VERSION by default now) to be able to stay in masternode list. Scenario: MIN_PEER_PROTO_VERSION was bumped but because we remember masternode we will never ask it for dsee again. 2015-03-04 22:04:02 +03:00
Evan Duffield
119007dd48 fix compiling for windows 2015-03-04 11:17:30 -07:00
evan82
ead462c2bb Merge pull request #218 from UdjinM6/v0.11.2.x_fix_masternodelist
V0.11.2.x fix masternodelist
2015-03-04 10:38:08 -07:00
evan82
0681d3144c Merge pull request #217 from UdjinM6/v0.11.2.x_fix_ds_ix_fee_calculation_display
V0.11.2.x fix ds&ix fee calculation&display
2015-03-04 10:37:22 -07:00
Evan Duffield
ba270619bf missing file 2015-03-04 10:35:50 -07:00
Evan Duffield
a6b58ab1e8 Merged masternode blinding 2015-03-04 08:58:36 -07:00
snogcel
d53e950671 CSS WIP v9 2015-03-03 23:05:30 -07:00
crowning2
6d58449987 Theme selector added to options-page 2015-03-03 21:49:40 +01:00
crowning2
25ccc86acd Merge upstream 2015-03-02 21:43:19 +01:00
UdjinM6
d2a1ecf524 add spaces to IP only in full mode 2015-03-02 07:54:34 +03:00
UdjinM6
64c1a8b147 remove "|" to make full mode a bit more compact 2015-03-02 07:45:18 +03:00
UdjinM6
3a4c3e401b add spaces to table-fy console view of "masternode list" 2015-03-02 07:36:38 +03:00
UdjinM6
62800573cc fix filtering for "active" (was broken after IP filtering) / reorder modes alphabetically 2015-03-02 07:35:13 +03:00
UdjinM6
4bfdcc181c fix IX and DS fee calculations / use coincontrol to show live calculations 2015-03-02 07:26:38 +03:00
evan82
96dbba0d5f Merge pull request #216 from vertoe/devel-0.9
Weekly translation updates.
2015-03-01 19:12:31 -07:00
evan82
369ca60da7 Merge pull request #215 from vertoe/devel-0.9-upstr
Fix priority calculation in CreateTransaction
2015-03-01 19:10:00 -07:00
evan82
8faca60382 Merge pull request #213 from UdjinM6/v0.11.2.x_fix_monospace_qt_console
V0.11.2.x fix spaces/monospace fonts in qt console
2015-03-01 19:08:12 -07:00
evan82
40b2ac6e3e Merge pull request #211 from UdjinM6/v0.11.2.x_pay_to_oldest_legit
V0.11.2.x pay to oldest legit MN
2015-03-01 19:06:17 -07:00
evan82
e2cf12b9de Merge pull request #210 from UdjinM6/v0.11.2.x_check_exp_mn_on_start
V0.11.2.x check expired MNs right on client start
2015-03-01 19:04:22 -07:00
evan82
da8dc22856 Merge pull request #209 from UdjinM6/v0.11.2.x_fix_crash_in_overview
V0.11.2.x fix crash on client shutdown
2015-03-01 19:03:13 -07:00
vertoe
092c9c99a2 Pull translations from transifex. 2015-03-02 00:09:33 +01:00
vertoe
6e20247e3e Extract strings. 2015-03-02 00:08:42 +01:00
vertoe
14bebe4fd7 merge upstream 0.9 2015-03-02 00:04:56 +01:00
UdjinM6
54a78ed036 fix spaces/monospace fonts in qt console 2015-03-01 22:42:57 +03:00
UdjinM6
f4f3f6bd6a prevent gaming sigTime too much on initial dsee 2015-03-01 18:51:30 +03:00
UdjinM6
b2017ebefa find oldest legit masternode to pay / naming "now" -> "sigTime" 2015-03-01 18:45:27 +03:00
snogcel
7af7db84c7 CSS WIP v8 2015-03-01 02:15:39 -07:00
snogcel
4a8f81c0e5 Merge remote-tracking branch 'upstream/v0.11.2.x' into v0.11.2.x 2015-03-01 00:52:57 -07:00
UdjinM6
7b1efb8997 show new number of MNs on add/remove in logs / move output to debug level 2015-03-01 03:26:29 +03:00
UdjinM6
4b4b1dc911 disconnect timer on overview page destruction 2015-03-01 03:08:24 +03:00
UdjinM6
80ce3f5a06 clear maps in mnodeman 2015-03-01 03:04:17 +03:00
UdjinM6
4af7c7411a check and remove expired masternodes on client start / more info on load/flush 2015-03-01 02:56:52 +03:00
evan82
2d3426755c Merge pull request #207 from UdjinM6/v0.11.2.x_fix_logs
V0.11.2.x fix logs
2015-02-27 06:49:31 -07:00
snogcel
fb90f70d90 CSS WIP v7 - Send 2015-02-26 22:05:20 -07:00
snogcel
8001c48c71 Merge remote-tracking branch 'upstream/v0.11.2.x' into v0.11.2.x 2015-02-26 22:02:04 -07:00
UdjinM6
e7bf8d0fe6 Few small log output fixes:
- fix DumpMasternodes log output (wasn't really working)
- add log output on CMasternodeMan::Add
- slightly edit CMasternodeMan::CheckAndRemove log output
2015-02-27 04:49:12 +03:00
UdjinM6
14ecda3486 With persistant storage this restriction was way too hard and could lead to dramatically shrinking/not updating masternode list after few restarts with some timeouts 2015-02-27 04:41:17 +03:00
UdjinM6
4fe845bf15 Fix crashes on remove from vector
Few more locks and slight iterators optimization
2015-02-27 02:12:43 +03:00
UdjinM6
0747da6b36 Fix versions:
- bump PROTOCOL_VERSION (new collaterals are incompatible with 70066)
 - define MIN_POOL_PEER_PROTO_VERSION instead of confusing darkSendPool.MIN_PEER_PROTO_VERSION / bump it too
2015-02-26 20:29:57 +03:00
evan82
ff297c25e3 Merge pull request #203 from UdjinM6/v0.11.2.x_fix_processmessages
V0.11.2.x Few fixes for processing extra messages:
2015-02-26 08:31:45 -07:00
evan82
5b4d27864e Merge pull request #202 from UdjinM6/v0.11.2.x_fix_doauto
V0.11.2.x fix DoAutomaticDenominating:
2015-02-26 08:31:21 -07:00
evan82
1560cb65ed Merge pull request #201 from UdjinM6/v0.11.2.x_rpc_fixes
V0.11.2.x rpc fixes
2015-02-26 08:30:40 -07:00
UdjinM6
1ded1b9ec2 Few fixes for processing extra messages:
- call ProcessMessageMasternodePayments on ProcessBlock (lost after moving mnodeman functionality)
- do not process extra functionality messages (DS, IX, spork) on initial download / reindex
2015-02-26 17:40:43 +03:00
Evan Duffield
736e6da6b8 allow searching masternode list by ip address 2015-02-26 07:33:27 -07:00
Evan Duffield
848adbb2d3 Fixed compiling errors
std::stoi was introduced in C++11, should probably avoid using it
2015-02-26 07:23:06 -07:00
UdjinM6
56471f8330 fix DoAutomaticDenominating:
- check for NULL (result of FindRandom, could happen if masternode list is empty)
 - assign submittedToMasternode only when all checks are passed
 - naming consistency (mn --> pmn)
2015-02-26 04:55:27 +03:00
snogcel
f99b986ba6 Merge remote-tracking branch 'upstream/v0.11.2.x' into v0.11.2.x 2015-02-25 18:53:21 -07:00
UdjinM6
0d82275d05 rpc: allow "darksend" only with ENABLE_WALLET 2015-02-26 04:48:03 +03:00
UdjinM6
5585850396 rpc fixes:
- extended help on "masternode"
 - enabled/both modes for "masternode count"
 - extended output for "masternode current"
 - update help on "getblocktemplate"
2015-02-26 04:35:33 +03:00
evan82
38509c5433 Merge pull request #200 from UdjinM6/v0.11.2.x_fix_few_test
V0.11.2.x fix few test (generation/data)
2015-02-25 18:27:08 -07:00
evan82
4254b864ab Merge pull request #199 from UdjinM6/v0.11.2.x_fix_uri
V0.11.2.x fix parseBitcoinURI
2015-02-25 18:26:33 -07:00
evan82
97d88a6fa7 Merge pull request #197 from UdjinM6/v0.11.2.x_masternodemanager
V0.11.2.x masternodemanager
2015-02-25 18:26:05 -07:00
UdjinM6
2e05bf212e Change the way changes are handled:
- do not keep track of a single time variable for whole structure change
- save to masternode.dat and clear on checks:
  - who's asked for the masternode list and the last time
  - who we asked for the masternode list and the last time (will help to prevent dseg ban when restart wallet several times in short period of time)
  - which masternodes we've asked for
- do not use timeout for CheckAndRemove (played with that - doesn't make sense actually)
2015-02-26 02:21:28 +03:00
UdjinM6
248420be31 fix few tests 2015-02-25 20:24:15 +03:00
UdjinM6
c172c36885 fix parseBitcoinURI 2015-02-25 20:20:19 +03:00
UdjinM6
0d51e1c90d better naming/readability (Find) 2015-02-25 14:54:03 +03:00
snogcel
059216acf4 CSS WIP v6 2015-02-24 20:59:37 -07:00