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.

Sign up for GitHub

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

Jump to bottom

Adjust length of DAO phases depending on network #2277

Merged
merged 1 commit into from
Jan 16, 2019
Merged

Adjust length of DAO phases depending on network #2277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 45 additions & 28 deletions core/src/main/java/bisq/core/dao/governance/param/Param.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,41 +110,58 @@ public enum Param {
// Min required trade volume to not get de-listed. Check starts after trial period and use trial period afterwards to look back for trade activity.
ASSET_MIN_VOLUME("0.01", ParamType.BTC, 10, 10),

// TODO for testnet we want to have a short cycle of about a week (1012 blocks)
PHASE_UNDEFINED("0", ParamType.BLOCK),
PHASE_PROPOSAL("380", ParamType.BLOCK, 3, 3), // 2,6 days
PHASE_BREAK1("10", ParamType.BLOCK, 3, 3), // 10 blocks
PHASE_BLIND_VOTE("300", ParamType.BLOCK, 3, 3), // 2 days
PHASE_BREAK2("10", ParamType.BLOCK, 3, 23), // 10 blocks
PHASE_VOTE_REVEAL("300", ParamType.BLOCK, 3, 3), // 2 day
PHASE_BREAK3("10", ParamType.BLOCK, 3, 3), // 10 blocks
PHASE_RESULT("2", ParamType.BLOCK, 3, 3); // 2 blocks

// TODO for dev testing we use very short periods...
/*PHASE_UNDEFINED("0", ParamType.BLOCK),
PHASE_PROPOSAL("4", ParamType.BLOCK, 3, 3),
PHASE_BREAK1("1", ParamType.BLOCK, 3, 3),
PHASE_BLIND_VOTE("2", ParamType.BLOCK, 3, 3),
PHASE_BREAK2("1", ParamType.BLOCK, 3, 23),
PHASE_VOTE_REVEAL("2", ParamType.BLOCK, 3, 3),
PHASE_BREAK3("1", ParamType.BLOCK, 3, 3),
PHASE_RESULT("2", ParamType.BLOCK, 3, 3);*/

// See: https://github.com/bisq-network/proposals/issues/46
// The last block in the proposal and vote phases are not shown to the user as he cannot make a tx there as it would be
// confirmed in the next block which would be the following break phase. To hide that complexity we show only the
// blocks where the user can be active. To have still round numbers for the durations we add 1 block to those
// phases and subtract 1 block from the following breaks.
// So in the UI the user will see 3600 blocks and the last
// block of the technical 3601 blocks is displayed as part of the break1 phase.
/* PHASE_UNDEFINED("0"),
PHASE_PROPOSAL("3601"), // 24 days
PHASE_BREAK1("149"), // 1 day
PHASE_BLIND_VOTE("601"), // 4 days
PHASE_BREAK2("9"), // 10 blocks
PHASE_VOTE_REVEAL("301"), // 2 days
PHASE_BREAK3("9"), // 10 blocks
PHASE_RESULT("10); // 10 block*/
// For testnet we want to have a short cycle of about a week (1012 blocks)
// For regtest we use very short periods
PHASE_UNDEFINED("0", ParamType.BLOCK),
PHASE_PROPOSAL(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ?
"3601" : // mainnet; 24 days
BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ?
"4" : // regtest
"380", // testnet; 2.6 days
ParamType.BLOCK, 3, 3),
PHASE_BREAK1(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ?
"149" : // mainnet; 1 day
BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ?
"1" : // regtest
"10", // testnet
ParamType.BLOCK, 3, 3),
PHASE_BLIND_VOTE(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ?
"601" : // mainnet; 4 days
BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ?
"2" : // regtest
"300", // testnet; 2 days
ParamType.BLOCK, 3, 3),
PHASE_BREAK2(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ?
"9" : // mainnet
BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ?
"1" : // regtest
"10", // testnet
ParamType.BLOCK, 3, 23),
PHASE_VOTE_REVEAL(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ?
"301" : // mainnet; 2 days
BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ?
"2" : // regtest
"300", // testnet; 2 days
ParamType.BLOCK, 3, 3),
PHASE_BREAK3(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ?
"9" : // mainnet
BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ?
"1" : // regtest
"10", // testnet
ParamType.BLOCK, 3, 3),
PHASE_RESULT(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ?
"10" : // mainnet
BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ?
"2" : // regtest
"2", // testnet
ParamType.BLOCK, 3, 3);

@Getter
private final String defaultValue;
Expand Down