From 008cfaac57fbd192a98ee624459da2129767822e Mon Sep 17 00:00:00 2001 From: HenrikJannsen Date: Thu, 3 Nov 2022 10:46:26 -0500 Subject: [PATCH] Remove daoActivated options Signed-off-by: HenrikJannsen --- .../src/main/java/bisq/common/app/DevEnv.java | 9 +------- .../main/java/bisq/common/config/Config.java | 9 -------- .../core/app/misc/AppSetupWithP2PAndDAO.java | 15 +++++-------- .../main/java/bisq/core/dao/DaoModule.java | 1 - .../blindvote/BlindVoteListService.java | 11 ++++------ .../governance/proposal/ProposalService.java | 22 +++++++------------ .../core/setup/CoreNetworkCapabilities.java | 4 +--- .../core/setup/CorePersistedDataHost.java | 18 ++++++--------- 8 files changed, 27 insertions(+), 62 deletions(-) diff --git a/common/src/main/java/bisq/common/app/DevEnv.java b/common/src/main/java/bisq/common/app/DevEnv.java index 9bf852d97b..62f52c683f 100644 --- a/common/src/main/java/bisq/common/app/DevEnv.java +++ b/common/src/main/java/bisq/common/app/DevEnv.java @@ -34,7 +34,6 @@ public class DevEnv { public static void setup(Config config) { DevEnv.setDevMode(config.useDevMode); - DevEnv.setDaoActivated(config.daoActivated); } // If set to true we ignore several UI behavior like confirmation popups as well dummy accounts are created and @@ -49,14 +48,8 @@ public class DevEnv { DevEnv.devMode = devMode; } - private static boolean daoActivated = true; - public static boolean isDaoActivated() { - return daoActivated; - } - - public static void setDaoActivated(boolean daoActivated) { - DevEnv.daoActivated = daoActivated; + return true; } public static void logErrorAndThrowIfDevMode(String msg) { diff --git a/common/src/main/java/bisq/common/config/Config.java b/common/src/main/java/bisq/common/config/Config.java index a9647e5727..4c2e224887 100644 --- a/common/src/main/java/bisq/common/config/Config.java +++ b/common/src/main/java/bisq/common/config/Config.java @@ -115,7 +115,6 @@ public class Config { public static final String GENESIS_TX_ID = "genesisTxId"; public static final String GENESIS_BLOCK_HEIGHT = "genesisBlockHeight"; public static final String GENESIS_TOTAL_SUPPLY = "genesisTotalSupply"; - public static final String DAO_ACTIVATED = "daoActivated"; public static final String DUMP_DELAYED_PAYOUT_TXS = "dumpDelayedPayoutTxs"; public static final String ALLOW_FAULTY_DELAYED_TXS = "allowFaultyDelayedTxs"; public static final String API_PASSWORD = "apiPassword"; @@ -169,7 +168,6 @@ public class Config { public final NetworkParameters networkParameters; public final boolean ignoreLocalBtcNode; public final String bitcoinRegtestHost; - public final boolean daoActivated; public final String referralId; public final boolean useDevMode; public final boolean useDevModeHeader; @@ -626,12 +624,6 @@ public class Config { .ofType(long.class) .defaultsTo(-1L); - ArgumentAcceptingOptionSpec daoActivatedOpt = - parser.accepts(DAO_ACTIVATED, "If set to true dao is activated.") - .withRequiredArg() - .ofType(boolean.class) - .defaultsTo(true); - ArgumentAcceptingOptionSpec dumpDelayedPayoutTxsOpt = parser.accepts(DUMP_DELAYED_PAYOUT_TXS, "Dump delayed payout transactions to file") .withRequiredArg() @@ -798,7 +790,6 @@ public class Config { this.genesisTxId = options.valueOf(genesisTxIdOpt); this.genesisBlockHeight = options.valueOf(genesisBlockHeightOpt); this.genesisTotalSupply = options.valueOf(genesisTotalSupplyOpt); - this.daoActivated = options.valueOf(daoActivatedOpt); this.dumpDelayedPayoutTxs = options.valueOf(dumpDelayedPayoutTxsOpt); this.allowFaultyDelayedTxs = options.valueOf(allowFaultyDelayedTxsOpt); this.apiPassword = options.valueOf(apiPasswordOpt); diff --git a/core/src/main/java/bisq/core/app/misc/AppSetupWithP2PAndDAO.java b/core/src/main/java/bisq/core/app/misc/AppSetupWithP2PAndDAO.java index 1c77a6529e..a82d7d04aa 100644 --- a/core/src/main/java/bisq/core/app/misc/AppSetupWithP2PAndDAO.java +++ b/core/src/main/java/bisq/core/app/misc/AppSetupWithP2PAndDAO.java @@ -74,15 +74,12 @@ public class AppSetupWithP2PAndDAO extends AppSetupWithP2P { this.daoSetup = daoSetup; this.preferences = preferences; - // TODO Should be refactored/removed. In the meantime keep in sync with CorePersistedDataHost - if (config.daoActivated) { - persistedDataHosts.add(myVoteListService); - persistedDataHosts.add(ballotListService); - persistedDataHosts.add(myBlindVoteListService); - persistedDataHosts.add(myProposalListService); - persistedDataHosts.add(myReputationListService); - persistedDataHosts.add(myProofOfBurnListService); - } + persistedDataHosts.add(myVoteListService); + persistedDataHosts.add(ballotListService); + persistedDataHosts.add(myBlindVoteListService); + persistedDataHosts.add(myProposalListService); + persistedDataHosts.add(myReputationListService); + persistedDataHosts.add(myProofOfBurnListService); } @Override diff --git a/core/src/main/java/bisq/core/dao/DaoModule.java b/core/src/main/java/bisq/core/dao/DaoModule.java index ed2f0efef3..1bcd45e140 100644 --- a/core/src/main/java/bisq/core/dao/DaoModule.java +++ b/core/src/main/java/bisq/core/dao/DaoModule.java @@ -222,7 +222,6 @@ public class DaoModule extends AppModule { bindConstant().annotatedWith(named(Config.RPC_BLOCK_NOTIFICATION_HOST)).to(config.rpcBlockNotificationHost); bindConstant().annotatedWith(named(Config.DUMP_BLOCKCHAIN_DATA)).to(config.dumpBlockchainData); bindConstant().annotatedWith(named(Config.FULL_DAO_NODE)).to(config.fullDaoNode); - bindConstant().annotatedWith(named(Config.DAO_ACTIVATED)).to(config.daoActivated); } } diff --git a/core/src/main/java/bisq/core/dao/governance/blindvote/BlindVoteListService.java b/core/src/main/java/bisq/core/dao/governance/blindvote/BlindVoteListService.java index 4ed289d881..c75fe5777a 100644 --- a/core/src/main/java/bisq/core/dao/governance/blindvote/BlindVoteListService.java +++ b/core/src/main/java/bisq/core/dao/governance/blindvote/BlindVoteListService.java @@ -30,8 +30,6 @@ import bisq.network.p2p.storage.payload.PersistableNetworkPayload; import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreListener; import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService; -import bisq.common.config.Config; - import javax.inject.Inject; import javafx.collections.FXCollections; @@ -67,16 +65,14 @@ public class BlindVoteListService implements AppendOnlyDataStoreListener, DaoSta PeriodService periodService, BlindVoteStorageService blindVoteStorageService, AppendOnlyDataStoreService appendOnlyDataStoreService, - BlindVoteValidator blindVoteValidator, - Config config) { + BlindVoteValidator blindVoteValidator) { this.daoStateService = daoStateService; this.p2PService = p2PService; this.periodService = periodService; this.blindVoteStorageService = blindVoteStorageService; this.blindVoteValidator = blindVoteValidator; - if (config.daoActivated) - appendOnlyDataStoreService.addService(blindVoteStorageService); + appendOnlyDataStoreService.addService(blindVoteStorageService); } @@ -151,7 +147,8 @@ public class BlindVoteListService implements AppendOnlyDataStoreListener, DaoSta blindVoteStorageService.getMap().values().forEach(e -> onAppendOnlyDataAdded(e, false)); } - private void onAppendOnlyDataAdded(PersistableNetworkPayload persistableNetworkPayload, boolean fromBroadcastMessage) { + private void onAppendOnlyDataAdded(PersistableNetworkPayload persistableNetworkPayload, + boolean fromBroadcastMessage) { if (persistableNetworkPayload instanceof BlindVotePayload) { BlindVotePayload blindVotePayload = (BlindVotePayload) persistableNetworkPayload; if (!blindVotePayloads.contains(blindVotePayload)) { diff --git a/core/src/main/java/bisq/core/dao/governance/proposal/ProposalService.java b/core/src/main/java/bisq/core/dao/governance/proposal/ProposalService.java index a50b7e2f35..c48cce3dea 100644 --- a/core/src/main/java/bisq/core/dao/governance/proposal/ProposalService.java +++ b/core/src/main/java/bisq/core/dao/governance/proposal/ProposalService.java @@ -40,14 +40,10 @@ import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreListener; import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService; import bisq.network.p2p.storage.persistence.ProtectedDataStoreService; -import bisq.common.config.Config; - import org.bitcoinj.core.Coin; import com.google.inject.Inject; -import javax.inject.Named; - import javafx.collections.FXCollections; import javafx.collections.ObservableList; @@ -97,19 +93,16 @@ public class ProposalService implements HashMapChangedListener, AppendOnlyDataSt AppendOnlyDataStoreService appendOnlyDataStoreService, ProtectedDataStoreService protectedDataStoreService, DaoStateService daoStateService, - ProposalValidatorProvider validatorProvider, - @Named(Config.DAO_ACTIVATED) boolean daoActivated) { + ProposalValidatorProvider validatorProvider) { this.p2PService = p2PService; this.periodService = periodService; this.proposalStorageService = proposalStorageService; this.daoStateService = daoStateService; this.validatorProvider = validatorProvider; - if (daoActivated) { - // We add our stores to the global stores - appendOnlyDataStoreService.addService(proposalStorageService); - protectedDataStoreService.addService(tempProposalStorageService); - } + // We add our stores to the global stores + appendOnlyDataStoreService.addService(proposalStorageService); + protectedDataStoreService.addService(tempProposalStorageService); } @@ -198,14 +191,14 @@ public class ProposalService implements HashMapChangedListener, AppendOnlyDataSt public Coin getRequiredQuorum(Proposal proposal) { int chainHeight = daoStateService.getTx(proposal.getTxId()) .map(BaseTx::getBlockHeight). - orElse(daoStateService.getChainHeight()); + orElse(daoStateService.getChainHeight()); return daoStateService.getParamValueAsCoin(proposal.getQuorumParam(), chainHeight); } public double getRequiredThreshold(Proposal proposal) { int chainHeight = daoStateService.getTx(proposal.getTxId()) .map(BaseTx::getBlockHeight). - orElse(daoStateService.getChainHeight()); + orElse(daoStateService.getChainHeight()); return daoStateService.getParamValueAsPercentDouble(proposal.getThresholdParam(), chainHeight); } @@ -308,7 +301,8 @@ public class ProposalService implements HashMapChangedListener, AppendOnlyDataSt tempProposals.retainAll(tempProposalsWithUpdates); } - private void onAppendOnlyDataAdded(PersistableNetworkPayload persistableNetworkPayload, boolean fromBroadcastMessage) { + private void onAppendOnlyDataAdded(PersistableNetworkPayload persistableNetworkPayload, + boolean fromBroadcastMessage) { if (persistableNetworkPayload instanceof ProposalPayload) { ProposalPayload proposalPayload = (ProposalPayload) persistableNetworkPayload; if (!proposalPayloads.contains(proposalPayload)) { diff --git a/core/src/main/java/bisq/core/setup/CoreNetworkCapabilities.java b/core/src/main/java/bisq/core/setup/CoreNetworkCapabilities.java index 1f270e9a12..c905f88384 100644 --- a/core/src/main/java/bisq/core/setup/CoreNetworkCapabilities.java +++ b/core/src/main/java/bisq/core/setup/CoreNetworkCapabilities.java @@ -45,9 +45,7 @@ public class CoreNetworkCapabilities { Capability.BSQ_SWAP_OFFER ); - if (config.daoActivated) { - maybeApplyDaoFullMode(config); - } + maybeApplyDaoFullMode(config); log.info(Capabilities.app.prettyPrint()); } diff --git a/core/src/main/java/bisq/core/setup/CorePersistedDataHost.java b/core/src/main/java/bisq/core/setup/CorePersistedDataHost.java index f8e23ee5a6..98e171b426 100644 --- a/core/src/main/java/bisq/core/setup/CorePersistedDataHost.java +++ b/core/src/main/java/bisq/core/setup/CorePersistedDataHost.java @@ -42,7 +42,6 @@ import bisq.network.p2p.peers.PeerManager; import bisq.network.p2p.storage.P2PDataStorage; import bisq.network.p2p.storage.persistence.RemovedPayloadsService; -import bisq.common.config.Config; import bisq.common.proto.persistable.PersistedDataHost; import com.google.inject.Injector; @@ -74,16 +73,13 @@ public class CorePersistedDataHost { persistedDataHosts.add(injector.getInstance(MailboxMessageService.class)); persistedDataHosts.add(injector.getInstance(IgnoredMailboxService.class)); persistedDataHosts.add(injector.getInstance(RemovedPayloadsService.class)); - - if (injector.getInstance(Config.class).daoActivated) { - persistedDataHosts.add(injector.getInstance(BallotListService.class)); - persistedDataHosts.add(injector.getInstance(MyBlindVoteListService.class)); - persistedDataHosts.add(injector.getInstance(MyVoteListService.class)); - persistedDataHosts.add(injector.getInstance(MyProposalListService.class)); - persistedDataHosts.add(injector.getInstance(MyReputationListService.class)); - persistedDataHosts.add(injector.getInstance(MyProofOfBurnListService.class)); - persistedDataHosts.add(injector.getInstance(UnconfirmedBsqChangeOutputListService.class)); - } + persistedDataHosts.add(injector.getInstance(BallotListService.class)); + persistedDataHosts.add(injector.getInstance(MyBlindVoteListService.class)); + persistedDataHosts.add(injector.getInstance(MyVoteListService.class)); + persistedDataHosts.add(injector.getInstance(MyProposalListService.class)); + persistedDataHosts.add(injector.getInstance(MyReputationListService.class)); + persistedDataHosts.add(injector.getInstance(MyProofOfBurnListService.class)); + persistedDataHosts.add(injector.getInstance(UnconfirmedBsqChangeOutputListService.class)); return persistedDataHosts; } }