Improve data structure, validation and performance

core/src/main/java/bisq/core/dao/governance/proposal/ProposalValidator.java

@@ -19,6 +19,7 @@
 
 import bisq.core.dao.governance.period.PeriodService;
 import bisq.core.dao.state.DaoStateService;
+import bisq.core.dao.state.model.blockchain.BaseTx;
 import bisq.core.dao.state.model.blockchain.Tx;
 import bisq.core.dao.state.model.blockchain.TxType;
 import bisq.core.dao.state.model.governance.CompensationProposal;
@@ -135,4 +136,12 @@ private boolean isValid(Proposal proposal, boolean allowUnconfirmed) {
             return false;
         }
     }
+
+    protected Integer getBlockHeight(Proposal proposal) {
+        // When we receive a temp proposal the tx is usually not confirmed so we cannot lookup the block height of
+        // the tx. We take the current block height in that case as it would be in the same cycle anyway.
+        return daoStateService.getTx(proposal.getTxId())
+                .map(BaseTx::getBlockHeight)
+                .orElseGet(daoStateService::getChainHeight);
+    }
 }

core/src/main/java/bisq/core/dao/governance/proposal/ProposalValidatorProvider.java

@@ -24,14 +24,7 @@
 import bisq.core.dao.governance.proposal.reimbursement.ReimbursementValidator;
 import bisq.core.dao.governance.proposal.removeAsset.RemoveAssetValidator;
 import bisq.core.dao.governance.proposal.role.RoleValidator;
-import bisq.core.dao.state.model.governance.ChangeParamProposal;
-import bisq.core.dao.state.model.governance.CompensationProposal;
-import bisq.core.dao.state.model.governance.ConfiscateBondProposal;
-import bisq.core.dao.state.model.governance.GenericProposal;
 import bisq.core.dao.state.model.governance.Proposal;
-import bisq.core.dao.state.model.governance.ReimbursementProposal;
-import bisq.core.dao.state.model.governance.RemoveAssetProposal;
-import bisq.core.dao.state.model.governance.RoleProposal;
 
 import javax.inject.Inject;
 
@@ -65,21 +58,26 @@ public ProposalValidatorProvider(CompensationValidator compensationValidator,
     }
 
     public ProposalValidator getValidator(Proposal proposal) {
-        if (proposal instanceof CompensationProposal)
-            return compensationValidator;
-        else if (proposal instanceof ConfiscateBondProposal)
-            return confiscateBondValidator;
-        else if (proposal instanceof GenericProposal)
-            return genericProposalValidator;
-        else if (proposal instanceof ChangeParamProposal)
-            return changeParamValidator;
-        else if (proposal instanceof ReimbursementProposal)
-            return reimbursementValidator;
-        else if (proposal instanceof RemoveAssetProposal)
-            return removeAssetValidator;
-        else if (proposal instanceof RoleProposal)
-            return roleValidator;
-        else
-            throw new RuntimeException("");
+        return getValidator(proposal.getType());
+    }
+
+    public ProposalValidator getValidator(ProposalType proposalType) {
+        switch (proposalType) {
+            case COMPENSATION_REQUEST:
+                return compensationValidator;
+            case REIMBURSEMENT_REQUEST:
+                return reimbursementValidator;
+            case CHANGE_PARAM:
+                return changeParamValidator;
+            case BONDED_ROLE:
+                return roleValidator;
+            case CONFISCATE_BOND:
+                return confiscateBondValidator;
+            case GENERIC:
+                return genericProposalValidator;
+            case REMOVE_ASSET:
+                return removeAssetValidator;
+        }
+        throw new RuntimeException("Proposal type " + proposalType.name() + " was not covered by switch case.");
     }
 }

core/src/main/java/bisq/core/dao/governance/proposal/compensation/CompensationValidator.java

@@ -17,8 +17,8 @@
 
 package bisq.core.dao.governance.proposal.compensation;
 
-import bisq.core.dao.governance.proposal.ProposalValidationException;
 import bisq.core.dao.governance.period.PeriodService;
+import bisq.core.dao.governance.proposal.ProposalValidationException;
 import bisq.core.dao.governance.proposal.ProposalValidator;
 import bisq.core.dao.state.DaoStateService;
 import bisq.core.dao.state.model.governance.CompensationProposal;
@@ -53,13 +53,15 @@ public void validateDataFields(Proposal proposal) throws ProposalValidationExcep
             compensationProposal.getAddress(); // throws AddressFormatException if wrong address
 
             Coin requestedBsq = compensationProposal.getRequestedBsq();
-            Coin maxCompensationRequestAmount = CompensationConsensus.getMaxCompensationRequestAmount(daoStateService, periodService.getChainHeight());
+            int chainHeight = getBlockHeight(proposal);
+            Coin maxCompensationRequestAmount = CompensationConsensus.getMaxCompensationRequestAmount(daoStateService, chainHeight);
             checkArgument(requestedBsq.compareTo(maxCompensationRequestAmount) <= 0,
                     "Requested BSQ must not exceed " + (maxCompensationRequestAmount.value / 100L) + " BSQ");
-            Coin minCompensationRequestAmount = CompensationConsensus.getMinCompensationRequestAmount(daoStateService, periodService.getChainHeight());
+            Coin minCompensationRequestAmount = CompensationConsensus.getMinCompensationRequestAmount(daoStateService, chainHeight);
             checkArgument(requestedBsq.compareTo(minCompensationRequestAmount) >= 0,
                     "Requested BSQ must not be less than " + (minCompensationRequestAmount.value / 100L) + " BSQ");
-
+        } catch (ProposalValidationException e) {
+            throw e;
         } catch (Throwable throwable) {
             throw new ProposalValidationException(throwable);
         }

core/src/main/java/bisq/core/dao/governance/proposal/confiscatebond/ConfiscateBondValidator.java

@@ -17,8 +17,8 @@
 
 package bisq.core.dao.governance.proposal.confiscatebond;
 
-import bisq.core.dao.governance.proposal.ProposalValidationException;
 import bisq.core.dao.governance.period.PeriodService;
+import bisq.core.dao.governance.proposal.ProposalValidationException;
 import bisq.core.dao.governance.proposal.ProposalValidator;
 import bisq.core.dao.state.DaoStateService;
 import bisq.core.dao.state.model.governance.ConfiscateBondProposal;
@@ -28,6 +28,8 @@
 
 import lombok.extern.slf4j.Slf4j;
 
+import static org.apache.commons.lang3.Validate.notEmpty;
+
 @Slf4j
 public class ConfiscateBondValidator extends ProposalValidator {
 
@@ -40,9 +42,10 @@ public ConfiscateBondValidator(DaoStateService daoStateService, PeriodService pe
     public void validateDataFields(Proposal proposal) throws ProposalValidationException {
         try {
             super.validateDataFields(proposal);
-
             ConfiscateBondProposal confiscateBondProposal = (ConfiscateBondProposal) proposal;
-            //TODO
+            notEmpty(confiscateBondProposal.getLockupTxId(), "LockupTxId must not be empty");
+        } catch (ProposalValidationException e) {
+            throw e;
         } catch (Throwable throwable) {
             throw new ProposalValidationException(throwable);
         }

core/src/main/java/bisq/core/dao/governance/proposal/generic/GenericProposalValidator.java

@@ -17,11 +17,10 @@
 
 package bisq.core.dao.governance.proposal.generic;
 
-import bisq.core.dao.governance.proposal.ProposalValidationException;
 import bisq.core.dao.governance.period.PeriodService;
+import bisq.core.dao.governance.proposal.ProposalValidationException;
 import bisq.core.dao.governance.proposal.ProposalValidator;
 import bisq.core.dao.state.DaoStateService;
-import bisq.core.dao.state.model.governance.GenericProposal;
 import bisq.core.dao.state.model.governance.Proposal;
 
 import javax.inject.Inject;
@@ -40,9 +39,8 @@ public GenericProposalValidator(DaoStateService daoStateService, PeriodService p
     public void validateDataFields(Proposal proposal) throws ProposalValidationException {
         try {
             super.validateDataFields(proposal);
-
-            GenericProposal genericProposalProposal = (GenericProposal) proposal;
-            //TODO
+        } catch (ProposalValidationException e) {
+            throw e;
         } catch (Throwable throwable) {
             throw new ProposalValidationException(throwable);
         }

core/src/main/java/bisq/core/dao/governance/proposal/param/ChangeParamValidator.java

@@ -24,7 +24,6 @@
 import bisq.core.dao.governance.proposal.ProposalValidationException;
 import bisq.core.dao.governance.proposal.ProposalValidator;
 import bisq.core.dao.state.DaoStateService;
-import bisq.core.dao.state.model.blockchain.BaseTx;
 import bisq.core.dao.state.model.governance.ChangeParamProposal;
 import bisq.core.dao.state.model.governance.Proposal;
 import bisq.core.locale.Res;
@@ -86,14 +85,10 @@ public ChangeParamValidator(DaoStateService daoStateService, PeriodService perio
     public void validateDataFields(Proposal proposal) throws ProposalValidationException {
         try {
             super.validateDataFields(proposal);
-
             ChangeParamProposal changeParamProposal = (ChangeParamProposal) proposal;
-            // When we receive a temp proposal the tx is usually not confirmed so we cannot lookup the block height of
-            // the tx. We take the current block height in that case as it would be in the same cycle anyway.
-            int blockHeight = daoStateService.getTx(proposal.getTxId())
-                    .map(BaseTx::getBlockHeight)
-                    .orElseGet(daoStateService::getChainHeight);
-            validateParamValue(changeParamProposal.getParam(), changeParamProposal.getParamValue(), blockHeight);
+            validateParamValue(changeParamProposal.getParam(), changeParamProposal.getParamValue(), getBlockHeight(proposal));
+        } catch (ProposalValidationException e) {
+            throw e;
         } catch (Throwable throwable) {
             throw new ProposalValidationException(throwable);
         }
@@ -104,7 +99,7 @@ public void validateParamValue(Param param, String inputValue) throws ParamValid
         validateParamValue(param, inputValue, blockHeight);
     }
 
-    public void validateParamValue(Param param, String inputValue, int blockHeight) throws ParamValidationException {
+    private void validateParamValue(Param param, String inputValue, int blockHeight) throws ParamValidationException {
         String currentParamValue = daoStateService.getParamValue(param, blockHeight);
         validateParamValue(param, currentParamValue, inputValue);
     }

core/src/main/java/bisq/core/dao/governance/proposal/reimbursement/ReimbursementValidator.java

@@ -17,9 +17,10 @@
 
 package bisq.core.dao.governance.proposal.reimbursement;
 
-import bisq.core.dao.governance.proposal.ProposalValidationException;
 import bisq.core.dao.governance.period.PeriodService;
+import bisq.core.dao.governance.proposal.ProposalValidationException;
 import bisq.core.dao.governance.proposal.ProposalValidator;
+import bisq.core.dao.governance.proposal.compensation.CompensationConsensus;
 import bisq.core.dao.state.DaoStateService;
 import bisq.core.dao.state.model.governance.Proposal;
 import bisq.core.dao.state.model.governance.ReimbursementProposal;
@@ -53,12 +54,15 @@ public void validateDataFields(Proposal proposal) throws ProposalValidationExcep
             reimbursementProposal.getAddress(); // throws AddressFormatException if wrong address
 
             Coin requestedBsq = reimbursementProposal.getRequestedBsq();
-            Coin maxReimbursementRequestAmount = ReimbursementConsensus.getMaxReimbursementRequestAmount(daoStateService, periodService.getChainHeight());
-            checkArgument(requestedBsq.compareTo(maxReimbursementRequestAmount) <= 0,
-                    "Requested BSQ must not exceed " + (maxReimbursementRequestAmount.value / 100L) + " BSQ");
-            Coin minReimbursementRequestAmount = ReimbursementConsensus.getMinReimbursementRequestAmount(daoStateService, periodService.getChainHeight());
-            checkArgument(requestedBsq.compareTo(minReimbursementRequestAmount) >= 0,
-                    "Requested BSQ must not be less than " + (minReimbursementRequestAmount.value / 100L) + " BSQ");
+            int chainHeight = getBlockHeight(proposal);
+            Coin maxCompensationRequestAmount = CompensationConsensus.getMaxCompensationRequestAmount(daoStateService, chainHeight);
+            checkArgument(requestedBsq.compareTo(maxCompensationRequestAmount) <= 0,
+                    "Requested BSQ must not exceed " + (maxCompensationRequestAmount.value / 100L) + " BSQ");
+            Coin minCompensationRequestAmount = CompensationConsensus.getMinCompensationRequestAmount(daoStateService, chainHeight);
+            checkArgument(requestedBsq.compareTo(minCompensationRequestAmount) >= 0,
+                    "Requested BSQ must not be less than " + (minCompensationRequestAmount.value / 100L) + " BSQ");
+        } catch (ProposalValidationException e) {
+            throw e;
         } catch (Throwable throwable) {
             throw new ProposalValidationException(throwable);
         }

core/src/main/java/bisq/core/dao/governance/proposal/removeAsset/RemoveAssetValidator.java

@@ -17,8 +17,8 @@
 
 package bisq.core.dao.governance.proposal.removeAsset;
 
-import bisq.core.dao.governance.proposal.ProposalValidationException;
 import bisq.core.dao.governance.period.PeriodService;
+import bisq.core.dao.governance.proposal.ProposalValidationException;
 import bisq.core.dao.governance.proposal.ProposalValidator;
 import bisq.core.dao.state.DaoStateService;
 import bisq.core.dao.state.model.governance.Proposal;
@@ -28,6 +28,8 @@
 
 import lombok.extern.slf4j.Slf4j;
 
+import static org.apache.commons.lang3.Validate.notEmpty;
+
 @Slf4j
 public class RemoveAssetValidator extends ProposalValidator {
 
@@ -42,7 +44,9 @@ public void validateDataFields(Proposal proposal) throws ProposalValidationExcep
             super.validateDataFields(proposal);
 
             RemoveAssetProposal removeAssetProposal = (RemoveAssetProposal) proposal;
-            //TODO
+            notEmpty(removeAssetProposal.getTickerSymbol(), "TickerSymbol must not be empty");
+        } catch (ProposalValidationException e) {
+            throw e;
         } catch (Throwable throwable) {
             throw new ProposalValidationException(throwable);
         }

core/src/main/java/bisq/core/dao/governance/proposal/role/RoleValidator.java

@@ -17,19 +17,18 @@
 
 package bisq.core.dao.governance.proposal.role;
 
-import bisq.core.dao.governance.proposal.ProposalValidationException;
 import bisq.core.dao.governance.period.PeriodService;
+import bisq.core.dao.governance.proposal.ProposalValidationException;
 import bisq.core.dao.governance.proposal.ProposalValidator;
 import bisq.core.dao.state.DaoStateService;
 import bisq.core.dao.state.model.governance.Proposal;
-import bisq.core.dao.state.model.governance.Role;
 import bisq.core.dao.state.model.governance.RoleProposal;
 
 import javax.inject.Inject;
 
 import lombok.extern.slf4j.Slf4j;
 
-import static org.apache.commons.lang3.Validate.notEmpty;
+import static org.apache.commons.lang3.Validate.notNull;
 
 @Slf4j
 public class RoleValidator extends ProposalValidator {
@@ -45,11 +44,7 @@ public void validateDataFields(Proposal proposal) throws ProposalValidationExcep
             super.validateDataFields(proposal);
 
             RoleProposal roleProposal = (RoleProposal) proposal;
-            Role role = roleProposal.getRole();
-
-            //TODO
-            notEmpty(role.getName(), "role.name must not be empty");
-
+            notNull(roleProposal.getRole(), "Bonded role must not be null");
         } catch (Throwable throwable) {
             throw new ProposalValidationException(throwable);
         }

core/src/main/java/bisq/core/dao/state/model/governance/Proposal.java

@@ -51,6 +51,7 @@ public abstract class Proposal implements PersistablePayload, NetworkPayload, Co
     protected final String link;
     protected final byte version;
     protected final long creationDate;
+    @Nullable
     protected final String txId;
 
     protected Proposal(String name,

desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java

@@ -33,10 +33,10 @@
 import bisq.core.btc.setup.WalletsSetup;
 import bisq.core.btc.wallet.BsqWalletService;
 import bisq.core.dao.DaoFacade;
-import bisq.core.dao.governance.proposal.ProposalValidationException;
 import bisq.core.dao.governance.bond.Bond;
 import bisq.core.dao.governance.param.Param;
 import bisq.core.dao.governance.proposal.ProposalType;
+import bisq.core.dao.governance.proposal.ProposalValidationException;
 import bisq.core.dao.governance.proposal.ProposalWithTransaction;
 import bisq.core.dao.governance.proposal.TxException;
 import bisq.core.dao.governance.proposal.param.ChangeParamValidator;
@@ -358,14 +358,14 @@ private void doPublishMyProposal(Proposal proposal, Transaction transaction) {
     }
 
     @Nullable
-    private ProposalWithTransaction getProposalWithTransaction(ProposalType type)
+    private ProposalWithTransaction getProposalWithTransaction(ProposalType proposalType)
             throws InsufficientMoneyException, ProposalValidationException, TxException {
 
         checkNotNull(proposalDisplay, "proposalDisplay must not be null");
 
         String link = proposalDisplay.linkInputTextField.getText();
         String name = proposalDisplay.nameTextField.getText();
-        switch (type) {
+        switch (proposalType) {
             case COMPENSATION_REQUEST:
                 checkNotNull(proposalDisplay.requestedBsqTextField,
                         "proposalDisplay.requestedBsqTextField must not be null");