Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dao ui improvements #1751

Merged
merged 31 commits into from Oct 12, 2018
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
6299411
Fix/add comments
ManfredKarrer Oct 4, 2018
93b38d2
Add ButtonCell and PromptText to ComboBox in FormBuilder
ManfredKarrer Oct 4, 2018
5f43bea
Improve setFitToRowsForTableView method
ManfredKarrer Oct 5, 2018
ccdac8e
Add new items to Param
ManfredKarrer Oct 5, 2018
072cedc
Improve param change selection (WIP)
ManfredKarrer Oct 5, 2018
3e7eba8
Add Generic- and removeAsset proposals
ManfredKarrer Oct 5, 2018
4770ac9
Remove asset from comboBoxes if it was removed by voting
ManfredKarrer Oct 5, 2018
f4cfeef
Add checkTradeActivity method, remove ConvertToTradeStatistics2
ManfredKarrer Oct 5, 2018
6bcbfe7
Merge branch 'master' into Dao-UI-improvements
ManfredKarrer Oct 5, 2018
5dfbb6d
Merge branch 'master' into Dao-UI-improvements
ManfredKarrer Oct 7, 2018
57355f2
Merge branch 'Dao-UI-improvements'
ManfredKarrer Oct 8, 2018
d279dae
Rename chainHeadHeight to chainHeight
ManfredKarrer Oct 8, 2018
4cc17fe
Persist EvaluatedProposalList
ManfredKarrer Oct 9, 2018
58e6db0
Persist DecryptedBallotsWithMeritsList
ManfredKarrer Oct 9, 2018
5141806
Add handling for missing blindVote data
ManfredKarrer Oct 10, 2018
9b40306
Add handling for missing proposal data
ManfredKarrer Oct 10, 2018
db3cd32
Add VoteResultExceptionHandler
ManfredKarrer Oct 10, 2018
a63d1cc
Merge remote-tracking branch 'upstream/master'
ManfredKarrer Oct 10, 2018
d2c9843
Merge branch 'master' into Dao-UI-improvements
ManfredKarrer Oct 10, 2018
e99d733
Remove PHASE_BREAK4, adjust phase periods and fees
ManfredKarrer Oct 10, 2018
280af36
Reduce default btc miner fee from 200 to 50 sat/byte
ManfredKarrer Oct 10, 2018
c8f0098
Add comments, cleanups
ManfredKarrer Oct 10, 2018
923aaf6
Remove other base currencies from FeeService
ManfredKarrer Oct 10, 2018
8e22916
Adjust comments
ManfredKarrer Oct 10, 2018
965d741
Rename fields and params
ManfredKarrer Oct 10, 2018
4b9073c
Rename support for other base currencies in getDefaultMinFeePerByte
ManfredKarrer Oct 10, 2018
048767a
Make ProposalConsensus and CompensationConsensus methods static
ManfredKarrer Oct 10, 2018
aeebae9
Support trade fees defined DAO params
ManfredKarrer Oct 10, 2018
c3f508e
Adjust DAO params
ManfredKarrer Oct 10, 2018
62a8246
Update comments
ManfredKarrer Oct 10, 2018
5879dd9
Change log level for printing asset trade stats
ManfredKarrer Oct 10, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 9 additions & 8 deletions core/src/main/java/bisq/core/dao/state/governance/Param.java
Expand Up @@ -93,15 +93,16 @@ public enum Param {

//TODO add asset listing params (nr. of trades, volume, time, fee which defines listing state)

// Period phase (16 blocks atm)
// TODO for dev testing we use short periods...
// Period phase (11 blocks atm)
PHASE_UNDEFINED(0),
PHASE_PROPOSAL(2), // 24 days
PHASE_BREAK1(1), // 10 blocks
PHASE_BLIND_VOTE(2), // 4 days
PHASE_BREAK2(1), // 10 blocks
PHASE_VOTE_REVEAL(2), // 2 days
PHASE_BREAK3(1), // 10 blocks
PHASE_RESULT(2); // 1 block
PHASE_PROPOSAL(2),
PHASE_BREAK1(1),
PHASE_BLIND_VOTE(2),
PHASE_BREAK2(1),
PHASE_VOTE_REVEAL(2),
PHASE_BREAK3(1),
PHASE_RESULT(2);

// See: https://github.com/bisq-network/proposals/issues/46
/*
Expand Down