Commit Graph

9119 Commits

Author SHA1 Message Date
evan82
511b11aa53 Merge pull request #374 from UdjinM6/v0.12.0.x_ds_reservekeys
V0.12.0.x deal with reservekeys in CreateDenominated and MakeCollaterals more accurate (+todo)
2015-06-22 12:25:27 -07:00
evan82
59097ed28d Merge pull request #373 from UdjinM6/v0.12.0.x_fix_PrepareDarksendDenominate
V0.12.0.x fix PrepareDarksendDenominate - loop instead of if
2015-06-22 11:35:29 -07:00
UdjinM6
d766b6b564 fix PrepareDarksendDenominate - loop instead of if 2015-06-22 21:10:46 +03:00
evan82
b61f4761ff Merge pull request #372 from UdjinM6/v0.12.0.x_bump_ix_proto
V0.12.0.x bump ix min proto
2015-06-22 11:10:21 -07:00
UdjinM6
02230c4263 deal with reservekeys in CreateDenominated and MakeCollaterals more accurate (+todo) 2015-06-22 20:59:27 +03:00
UdjinM6
a049348110 bump ix min proto 2015-06-22 20:51:28 +03:00
Evan Duffield
12863bb423 version bump 2015-06-22 08:47:24 -07:00
Evan Duffield
feaaf1e166 fixed bug with counting votes 2015-06-22 07:20:34 -07:00
Evan Duffield
12e5f8f4d4 added some debugging 2015-06-22 06:50:33 -07:00
Evan Duffield
dddc095856 changed enforcement strategy for mn payments 2015-06-21 10:06:25 -07:00
Evan Duffield
892212d407 version / min version bump 2015-06-21 09:32:32 -07:00
Evan Duffield
b8c842744d clear out old masternodes in CheckAndRemove 2015-06-21 06:54:07 -07:00
Evan Duffield
1cf09fae8e update protocol version 2015-06-20 19:03:06 -07:00
Evan Duffield
ca95ca2d95 fixed nDos for failure of mnp 2015-06-20 13:28:41 -07:00
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