Commit Graph

6300 Commits

Author SHA1 Message Date
adios
f9b77c4376 Masternode broadcast's and ping's GetHash method fix 2015-06-09 17:22:31 +04: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
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
UdjinM6
d53968ea56 fix ix comments 2015-06-04 21:54:33 +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
crowning-
8f695a03c1 Statusbar icons for tDASH added 2015-06-01 09:55:07 +02:00
Evan Duffield
a93ceed090 Finalized Budget Changes
- Finalized budgets now pass proposal hash, payee and amount. This keeps them completely separate from the proposal system to aid in consensus.
- Added status messages for badly formed finalized budgets (probably attacks). If users see messages like this they should check the proposals to see if something is wrong with them before voting.
2015-05-30 13:12:12 -07:00
Evan Duffield
c4b1156206 Merge branch 'v0.12.0.x' of https://github.com/dashpay/dash into v0.12.0.x 2015-05-30 10:30:01 -07:00
Evan Duffield
eaf7b940a6 Complete rewrite of consensus code for mn/budget payments
- Added FindProposal and FindFinalBudget to budgeting class
- Added 2 new sporks for Proposals and Budget payment enforcement. This is outside of the decentralized code so we can turn it off if there's a problem.
- Detect budget blocks and pay correct amounts in super blocks
2015-05-30 10:27:51 -07:00
UdjinM6
543256c3e8 - fix issues with locking coins and not unlocking them properly (mostly on failures)
- more SetNull calls on failures
- move collateral tx reset out of SetNull and redo verification/renewal on doAuto in one single place (should prevent fast keypool exhausting on failures)
- move lastNewBlock from SetNull to Reset
2015-05-30 07:44:56 +03:00
crowning-
e01fefa6c4 Dash copyright year fixed 2015-05-30 05:13:09 +02:00
UdjinM6
4292d4d87d - Randomize denoms calculated ot of vecAmounts. Should help to find partners faster/more often and maybe slightly improve anonymity also.
- sessionTotal doesn't makes sense anymore, get rid of it.
- GetDenominationsByAmount cleaned but it is not used anywhere else so maybe it should be removed too (placed a comment there but didn't remove it yet).
2015-05-30 05:59:31 +03:00
UdjinM6
04f9fb043f Merge pull request #342 from crowning-/Wallet_Repair
Wallet Repair Buttons
2015-05-29 11:26:03 +03:00
crowning-
d953b23061 Wallet Repair Buttons: statustip changed 2015-05-29 08:18:33 +02:00
crowning-
4574218349 Wallet Repair Buttons: removed obsolete comment 2015-05-28 23:14:09 +02:00
crowning-
a4dce4340a Wallet Repair Buttons: refactoring and remove old repair args before restart 2015-05-28 23:09:14 +02:00
Evan Duffield
bd4a7f2fad Masternode payment consensus via quorums
- Payees are chosen by their last payment, if no payment it's based on their hash
- Fixed a few issues with counting quorum votes
2015-05-28 10:45:31 -07:00
Evan Duffield
d470eddc01 fixed hashing issues with mnw messages 2015-05-27 15:07:53 -07:00
crowning-
6f49808caa Wallet Repair Buttons: refactoring to remove redundant code 2015-05-27 22:35:46 +02:00
Evan Duffield
fe55b12a1f added improvements for finding next masternode to get paid 2015-05-27 12:47:01 -07:00
Evan Duffield
66dcf6bbc7 cleaned up naming of budget functions 2015-05-27 10:11:00 -07:00
Evan Duffield
41eb74dc82 Stable budget implementation
- All budgeting code seems to be rather stable now. Serialization/caching is working rather well.
- Fixed some ambiguous variable names within the budgeting system that were causing the file caching to not work all of the time
2015-05-27 09:28:55 -07:00
crowning-
e68350d372 Wallet Repair Buttons (possible segfault on OSX fixed) 2015-05-26 23:09:16 +02:00
Evan Duffield
efe377fa69 tie budget system to masternode payment system 2015-05-26 07:56:51 -07:00
crowning-
3ab747d8ff Wallet Repair Buttons added 2015-05-25 22:59:38 +02:00
crowning-
9a6fe03974 Wallet Repair Buttons: initial commit (+ file permissions restored) 2015-05-25 18:29:11 +02:00
crowning-
8c4175b359 Wallet Repair Buttons: initial commit 2015-05-23 13:28:33 +02:00
evan82
b616fb8ef0 Merge pull request #338 from UdjinM6/lock_masternodes
Lock masternodes from masternode configuration file
2015-05-20 16:06:49 -07:00
evan82
9e5542ac45 Merge pull request #337 from UdjinM6/ds_coin_control
CoinControl should disable DS when non-anonymized inputs are selected
2015-05-20 16:06:38 -07:00
evan82
de562d89f7 Merge pull request #333 from UdjinM6/v0.12.0.x_update_mainnet_lastcheckpoint_data
V0.12.0.x update mainnet lastcheckpoint data
2015-05-20 16:06:08 -07:00
UdjinM6
472d2a21d6 fix tooltip background 2015-05-20 23:09:31 +03:00
UdjinM6
5a8b8538e3 Lock masternodes from masternode configuration file 2015-05-20 20:21:44 +03:00
crowning-
34a205b9a6 Fix tooltip background for OSX 2015-05-20 09:05:46 +02:00
UdjinM6
06032be332 unset DS checkbox if there were non-anonymized inputs selected in coincontrol, give warning 2015-05-20 00:10:52 +03:00
crowning-
eea3317755 Use existing constant instead of hardcoded size value 2015-05-17 21:21:43 +02:00
crowning-
2154f94131 Open peers information page when clicking on connections item 2015-05-17 20:56:00 +02:00
crowning-
32c6068ce9 Merge remote-tracking branch 'upstream/v0.12.0.x' into v0.12.0.x 2015-05-17 16:37:59 +02:00
UdjinM6
5cb819c3f8 Merge pull request #332 from UdjinM6/v0.12.0.x_fix_mnpayment_bugs
V0.12.0.x fix 2 masternode payments bugs
2015-05-17 17:26:12 +03:00
crowning-
dd76a079dd Tooltips for Coincontrol-Dialog added 2015-05-17 14:12:01 +02:00
UdjinM6
a4a72d6fa0 Update last checkpoint data for mainnet - should give more accurate verification progress 2015-05-16 06:04:33 +03:00
UdjinM6
397654ef76 fix masternode payments bugs 2015-05-16 05:53:53 +03:00
UdjinM6
18c60f9ecb Merge branch 'master' into v0.12.0.x_merge_btc010_master (fix spaces) 2015-05-16 02:34:25 +03:00