sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 13:03:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,691 Commits 24 Branches 554 Tags 576 MiB
0890b8f055
Commit Graph

6691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wladimir J. van der Laan
47fdeb4a9c
Merge pull request #5807 
9cd1dd9 Fix priority calculation in CreateTransaction (Alex Morcos)
 2015-02-26 11:15:24 +01: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
1dd5655f8a Merge pull request #198 from absolutebit/patch-1 
Minor typo
 2015-02-25 18:26:18 -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
evan82
d8307c51e4 Merge pull request #196 from UdjinM6/v0.11.2.x_fix_HasCollateralInputs 
V0.11.2.x fix has collateral inputs
 2015-02-25 18:25:13 -07:00
evan82
040528dc44 Merge pull request #195 from elanaint/elanaint-tor-docs 
Update tor.md
 2015-02-25 18:24:52 -07:00
evan82
13e66ea87a Merge pull request #194 from crowning-/patch-2 
Added automake to build requirements
 2015-02-25 18:24:33 -07:00
evan82
da8c267295 Merge pull request #193 from crowning-/patch-1 
Added automake to build requirements
 2015-02-25 18:24:17 -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
30f10d97d5 fix b58 test data generation 2015-02-25 20:23:08 +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
absolutebit
89745b5074 Minor typo 2015-02-25 03:37:47 -05:00
snogcel
059216acf4 CSS WIP v6 2015-02-24 20:59:37 -07:00
UdjinM6
259752c627 copyright 2015-02-24 17:05:26 +03:00
UdjinM6
d2e3d67a1d show active/total MNs on info tab / update it in separate timer 2015-02-24 16:24:42 +03:00
UdjinM6
003a1b7d72 track lastTimeChanged for mnodeman and ask for update only if UpdateNeeded 2015-02-24 13:39:29 +03:00
UdjinM6
0cd0e9de6d add masternodelist to command list (seems to be no way to get "help masternode list" working) 2015-02-24 03:06:13 +03:00
UdjinM6
f57a688fea clean unused 2015-02-24 02:53:51 +03:00
UdjinM6
dd61090051 move list logic back to rpcdarkcsend and give it a copy of vMasternodes (json dep in mnodeman is ugly, my bad) 2015-02-24 02:48:11 +03:00
UdjinM6
9b13c63c45 trivial fix 2015-02-24 02:45:37 +03:00
UdjinM6
9905be3793 CMasternodeMan - masternode manager class - part4 - fixed rpc/count can return "enabled only"/list can be filtered (everything should be ok) 2015-02-24 02:15:40 +03:00
UdjinM6
dd1c1b7d1c CMasternodeMan - masternode manager class - part3 - connect ProcessMessage from mnodeman(rpc still broken) 2015-02-23 23:12:33 +03:00
UdjinM6
14e122cbfa CMasternodeMan - masternode manager class - part2 - fix ProcessMasternodeConnections/ThreadCheckDarkSendPool (still broken) 2015-02-23 23:07:37 +03:00
UdjinM6
adddff85a2 CMasternodeMan - masternode manager class - part1(broken) 2015-02-23 23:01:21 +03:00
UdjinM6
74551e9f31 HasCollateralInputs should check only for at least 1 collateral (not 2) - fix endless loop 2015-02-23 20:42:13 +03:00
elanaint
b6ac14c5c1 Update tor.md 2015-02-22 20:44:03 +00:00
elanaint
a5565084f2 Update tor.md 2015-02-22 20:39:26 +00:00
snogcel
a0624aa427 CSS WIP v5 2015-02-22 11:22:38 -07:00
crowning-
35bc99a2a4 Added automake to build requirements 
At least Ubuntu >= 14.04 based distributions don't have automake installed by default.
 2015-02-21 18:40:33 +01:00
crowning-
4874f00819 Added automake to build requirements 
At least Ubuntu >= 14.04 based distributions don't have automake installed by default.
 2015-02-21 18:38:49 +01:00
snogcel
99fecc3ce3 CSS WIP v4 2015-02-21 10:18:42 -07:00
snogcel
9ed81b4fef Merge branch 'v0.11.2.x' of http://www.github.com/crowning2/darkcoin into v0.11.2.x 2015-02-20 01:03:30 -07:00
snogcel
91034fdb4f CSS WIP v3 2015-02-20 01:02:38 -07:00
snogcel
d31aef41ea Merge remote-tracking branch 'upstream/v0.11.2.x' into v0.11.2.x 2015-02-19 21:40:36 -07:00
Alex Morcos
9cd1dd9f6b Fix priority calculation in CreateTransaction 
Make this projection of priority in 1 block match the calculation in the low priority reject code.

Rebased-From: 2d9b0b7f03
Github-Pull: #5675

Conflicts:
	src/wallet.cpp
 2015-02-19 19:20:05 -08:00
crowning2
2babac5087 Daily update from Evan's repository 2015-02-19 21:37:29 +01:00
evan82
d1a22ad9f9 Merge pull request #192 from darkcoin/revert-191-revert-187-devel-0.9-strings 
Revert "Revert "Rebrand to darkcoin""
 2015-02-19 11:58:50 -07:00
evan82
3bb9ef96f4 Revert "Revert "Rebrand to darkcoin"" 2015-02-19 11:58:38 -07:00
evan82
93efb82ab1 Merge pull request #191 from darkcoin/revert-187-devel-0.9-strings 
Revert "Rebrand to darkcoin"
 2015-02-19 11:28:58 -07:00
evan82
516f590c65 Revert "Rebrand to darkcoin" 2015-02-19 11:28:40 -07:00
Evan Duffield
8e1eaf983d Enable darksend balance only when LiteMode is disabled 2015-02-19 11:22:00 -07:00
evan82
70a5555dc8 Merge pull request #190 from vertoe/devel-0.9 
Check pindexBestForkBase for null
 2015-02-19 08:44:31 -07:00
vertoe
08b1667141 merge upstream 0.9 2015-02-19 15:11:06 +01:00