mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Set new testnet genesis tx, increase DAO periods

Browse source
This commit is contained in:
Manfred Karrer 2018-12-02 19:48:46 +01:00
parent 145f03733c
commit c4145b8312
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/src/main/java/bisq/core/dao/governance/param/Param.java
View file

@ -110,26 +110,25 @@ 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
// TODO for testnet we want to have a short cycle of about a week
PHASE_UNDEFINED("0", ParamType.BLOCK),
PHASE_PROPOSAL("300", ParamType.BLOCK, 3, 3), // 2 days
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("150", ParamType.BLOCK, 3, 3), // 1 day
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*/
PHASE_RESULT("2", ParamType.BLOCK, 3, 3); // 2 blocks
// TODO for dev testing we use short periods...
// Period phase ("11 blocks atm)
PHASE_UNDEFINED("0", ParamType.BLOCK),
// 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);
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

4
core/src/main/java/bisq/core/dao/state/GenesisTxInfo.java
View file

@ -48,8 +48,8 @@ public class GenesisTxInfo {
private static final String MAINNET_GENESIS_TX_ID = "81855816eca165f17f0668898faa8724a105196e90ffc4993f4cac980176674e";
private static final int MAINNET_GENESIS_BLOCK_HEIGHT = 524717; // 2018-05-27
private static final String TESTNET_GENESIS_TX_ID = "83007e4d9c351adee7b9c1b24c66d04f82e32714029923b815142f84152e9185";
private static final int TESTNET_GENESIS_BLOCK_HEIGHT = 1446068; // 2018-11-30
private static final String TESTNET_GENESIS_TX_ID = "09e70ce0ab7a962a82a2ca84c9ae8a89140bf1c3fb6f7efad6162e39e4b362ae";
private static final int TESTNET_GENESIS_BLOCK_HEIGHT = 1446299; // 2018-12-02
private static final String REGTEST_GENESIS_TX_ID = "30af0050040befd8af25068cc697e418e09c2d8ebd8d411d2240591b9ec203cf";
private static final int REGTEST_GENESIS_BLOCK_HEIGHT = 111;