Commit Graph

9105 Commits

Author SHA1 Message Date
Evan Duffield
06ac558fee version bump 2015-06-20 13:00:19 -07:00
Evan Duffield
049aae7c49 Merge branch 'v0.12.0.x' of https://github.com/dashpay/dash into v0.12.0.x 2015-06-20 12:59:38 -07:00
Evan Duffield
947b79c8c5 Changed masternode broadcast/pinging logic
- Fixed a bug causing the broadcasts to be ignored in some situations
- Added some logic to rebroadcast new masternodes, so the rest of the network finds out about unknown nodes quickly
- should help masternode payments to work properly
2015-06-20 12:56:56 -07:00
evan82
2c8383a13d Merge pull request #369 from UdjinM6/v0.12.0.x_fix_ProcessMessage_AcceptToMemoryPool
V0.12.0.x use v11-like AcceptToMemoryPool call in ProcessMessage(dstx/tx)
2015-06-20 10:14:44 -07:00
UdjinM6
97c97f7e40 use v11-like AcceptToMemoryPool call in ProcessMessage(dstx/tx) 2015-06-20 05:33:15 +03:00
Evan Duffield
a0d8442835 added hybrid keys for masternode payment voting 2015-06-19 11:33:02 -07:00
Evan Duffield
b6f760ff90 Check before pulling payee 2015-06-19 09:14:48 -07:00
evan82
4f5e3c545d Merge pull request #365 from UdjinM6/v0.12.0.x_fix_dsc
V0.12.0.x fix dsc
2015-06-18 20:24:37 -07:00
UdjinM6
58c0f150a4 fix dsc 2015-06-19 04:42:25 +03:00
evan82
3834e459d9 Merge pull request #364 from UdjinM6/v0.12.0.x_fix_mnping
V0.12.0.x fix mnping
2015-06-18 11:52:49 -07:00
UdjinM6
1e393d5b70 fix mnping 2015-06-18 21:41:01 +03:00
evan82
85815dcf29 Merge pull request #362 from snogcel/v0.12.0.x
Available Balance, Pending Label Fix
2015-06-18 10:38:52 -07:00
evan82
e9019a176b Merge pull request #363 from thelazier/v0.12.0.x_fix_blocktemplate
Propose to fix getblocktemplate not have payee from masternode winners..
2015-06-18 10:17:38 -07:00
thelazier
639c67d354 Fix getblocktemplate not show payee from masternode winners.. 2015-06-18 16:40:22 +07:00
snogcel
5fed89fde4 Available Balance, Pending Label Fix 2015-06-17 21:37:30 -06:00
Evan Duffield
cc458007e3 update version 2015-06-17 17:10:42 -07:00
evan82
4de16d142b Merge pull request #361 from UdjinM6/v0.12.0.x_fix_mnb
V0.12.0.x remove nLastPaid from CMasternodeBroadcast
2015-06-17 17:07:59 -07:00
UdjinM6
91c7f66562 remove nLastPaid from CMasternodeBroadcast 2015-06-18 00:18:24 +03:00
evan82
4229e8a2c9 Merge pull request #360 from UdjinM6/v0.12.0.x_fix_buffer_overflow
V0.12.0.x SecondsSincePayment
2015-06-17 13:34:39 -07:00
UdjinM6
795ee119ec SecondsSincePayment (fix buffer overflow / change logic / move impl to cpp) 2015-06-17 23:03:09 +03:00
Evan Duffield
df77f56e11 Budget stability fixes
- Proposals must start on a budget block now
- Finalized budgets now enforce proposal start and end periods
- Other misc fixes
2015-06-16 10:04:35 -07:00
Evan Duffield
5c4dc3727b fixed issue with reindex and super blocks 2015-06-16 07:04:50 -07:00
Evan Duffield
c40c1338c7 update git ignore 2015-06-16 06:47:45 -07:00
Evan Duffield
c489574e8a Masternode System Bug Fixes
- Fixed a race condition with masternode node selection upon new blocks
- Using nTime for lastpaid instead of the current time for high consensus
2015-06-14 17:05:51 -07:00
evan82
b2b2e12b10 Merge pull request #359 from UdjinM6/v0.12.0.x_fix_budget_segfault
v0.12.0.x fix segfault in budgets
2015-06-10 19:37:08 -07:00
UdjinM6
f1debd4688 fix segfault in budgets 2015-06-10 09:49:08 +03:00
Evan Duffield
928f6edcb6 Adjusted max payment per finalized budget to 10% of the monthly block reward 2015-06-09 20:46:24 -06:00
evan82
a4b6b7df81 Merge pull request #355 from UdjinM6/v0.12.0.x_gitian_doc
V0.12.0.x fix md syntax in doc/gitian-building.md
2015-06-09 20:04:33 -06:00
evan82
07fbdfc525 Merge pull request #356 from UdjinM6/v0.12.0.x_mnping_blockhash
V0.12.0.x add recent (tip - 12) blockhash to mnping
2015-06-09 20:04:12 -06:00
evan82
201448cea0 Merge pull request #358 from UdjinM6/v0.12.0.x_fix_budget_gethash
V0.12.0.x fix budget gethash
2015-06-09 20:01:00 -06:00
evan82
0186cc87bf Merge pull request #357 from btcsoft/v0.12.0.x_masternode_hashes
Masternode broadcast's and ping's GetHash method fix
2015-06-09 19:49:23 -06:00
UdjinM6
5f5ee7a59b fix CFinalizedBudgetVote and CBudgetVote hashing, see https://github.com/dashpay/dash/pull/357 for more info 2015-06-09 19:37:58 +03:00
adios
f9b77c4376 Masternode broadcast's and ping's GetHash method fix 2015-06-09 17:22:31 +04:00
UdjinM6
19d9a65f8a add recent (tip - 12) block hash to mnping 2015-06-09 14:37:36 +03:00
evan82
aa91dde992 Merge pull request #354 from UdjinM6/v0.12.0.x_merge_master
V0.12.0.x merge master
2015-06-07 18:50:37 -06:00
UdjinM6
73a9de8178 fix md syntax in doc/gitian-building.md 2015-06-07 12:57:10 +03:00
evan82
cddd69ef40 Merge pull request #350 from UdjinM6/v0.12.0.x_budget
V0.12.0.x budget fixes/cleanups
2015-06-06 08:14:44 -06:00
evan82
e1ba34c9eb Merge pull request #353 from UdjinM6/v0.12.0.x_ix_comments
[NO_CODE] V0.12.0.x fix ix description
2015-06-04 18:46:56 -06:00
UdjinM6
d53968ea56 fix ix comments 2015-06-04 21:54:33 +03:00
UdjinM6
999979e1e5 moved release notes to proper folders 2015-06-04 19:24:04 +03:00
UdjinM6
2b055d28ef mention 0.12 in release notes 2015-06-04 19:20:14 +03:00
UdjinM6
9e8d54124f Merge branch 'master' into v0.12.0.x_merge_master 2015-06-04 19:14:32 +03:00
evan82
34e808bfbd Merge pull request #348 from UdjinM6/v0.12.0.x_fix_unlock_null_collateral
V0.12.0.x fix unlock/setnull/collateraltx
2015-06-04 07:10:49 -07:00
evan82
1a9e34e18a Merge pull request #347 from UdjinM6/v0.12.0.x_ds_rand_denom
V0.12.0.x ds rand denom
2015-06-04 07:09:59 -07:00
UdjinM6
17d3df5300 fix CBudgetManager::FindProposal 2015-06-03 19:45:15 +03:00
UdjinM6
d335c1ebbe MOVE: group classes` implementation together; REMOVE: GetMasternodeBudgetEscrow (not used) 2015-06-03 19:10:11 +03:00
UdjinM6
6e0a64bc5d simplify few IFs 2015-06-03 18:42:37 +03:00
UdjinM6
b8b3690a5c Merge pull request #349 from crowning-/Statusbar_Icons
Statusbar icons for testnet added
2015-06-03 00:55:36 +03:00
Evan Duffield
439679f5bc Finalized Budget Voting and Payment
- Added strBudgetMode with modes of "auto", "output-vin" and "suggest". Auto votes for what the masternode sees as the most popular proposals, output-vin is a delegation mode to another party and "suggest" sends a message to the network, suggesting the most popular proposals
2015-06-01 12:06:03 -07:00
crowning-
859d523a46 Statusbar_Icons: makefile for Gitian fixed 2015-06-01 10:27:46 +02:00