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

Rename bannedSignerPubKeys to bannedAccountWitnessSignerPubKeys

Browse source 
We use several signing keys, so better to make it more explicit.
protobuf entry is not changed to not risk issues (i guess it would
work renaming it)
This commit is contained in:
chimp1984 2020-08-31 13:01:44 -05:00
parent 9a142be86e
commit 4a2f7dc92c
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
3 changed files with 90 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/src/main/java/bisq/core/filter/Filter.java
View file

@ -71,7 +71,7 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload {
private final List<String> mediators; private final List<String> mediators;
private final List<String> refundAgents; private final List<String> refundAgents;
private final List<String> bannedSignerPubKeys; private final List<String> bannedAccountWitnessSignerPubKeys;
private final List<String> btcFeeReceiverAddresses; private final List<String> btcFeeReceiverAddresses;
@ -104,7 +104,7 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload {
filter.getDisableTradeBelowVersion(), filter.getDisableTradeBelowVersion(),
filter.getMediators(), filter.getMediators(),
filter.getRefundAgents(), filter.getRefundAgents(),
filter.getBannedSignerPubKeys(), filter.getBannedAccountWitnessSignerPubKeys(),
filter.getBtcFeeReceiverAddresses(), filter.getBtcFeeReceiverAddresses(),
filter.getOwnerPubKeyBytes(), filter.getOwnerPubKeyBytes(),
filter.getCreationDate(), filter.getCreationDate(),
@ -131,7 +131,7 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload {
filter.getDisableTradeBelowVersion(), filter.getDisableTradeBelowVersion(),
filter.getMediators(), filter.getMediators(),
filter.getRefundAgents(), filter.getRefundAgents(),
filter.getBannedSignerPubKeys(), filter.getBannedAccountWitnessSignerPubKeys(),
filter.getBtcFeeReceiverAddresses(), filter.getBtcFeeReceiverAddresses(),
filter.getOwnerPubKeyBytes(), filter.getOwnerPubKeyBytes(),
filter.getCreationDate(), filter.getCreationDate(),
@ -156,7 +156,7 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload {
String disableTradeBelowVersion, String disableTradeBelowVersion,
List<String> mediators, List<String> mediators,
List<String> refundAgents, List<String> refundAgents,
List<String> bannedSignerPubKeys, List<String> bannedAccountWitnessSignerPubKeys,
List<String> btcFeeReceiverAddresses, List<String> btcFeeReceiverAddresses,
PublicKey ownerPubKey, PublicKey ownerPubKey,
String signerPubKeyAsHex, String signerPubKeyAsHex,
@ -176,7 +176,7 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload {
disableTradeBelowVersion, disableTradeBelowVersion,
mediators, mediators,
refundAgents, refundAgents,
bannedSignerPubKeys, bannedAccountWitnessSignerPubKeys,
btcFeeReceiverAddresses, btcFeeReceiverAddresses,
Sig.getPublicKeyBytes(ownerPubKey), Sig.getPublicKeyBytes(ownerPubKey),
System.currentTimeMillis(), System.currentTimeMillis(),
@ -207,7 +207,7 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload {
String disableTradeBelowVersion, String disableTradeBelowVersion,
List<String> mediators, List<String> mediators,
List<String> refundAgents, List<String> refundAgents,
List<String> bannedSignerPubKeys, List<String> bannedAccountWitnessSignerPubKeys,
List<String> btcFeeReceiverAddresses, List<String> btcFeeReceiverAddresses,
byte[] ownerPubKeyBytes, byte[] ownerPubKeyBytes,
long creationDate, long creationDate,
@ -230,7 +230,7 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload {
this.disableTradeBelowVersion = disableTradeBelowVersion; this.disableTradeBelowVersion = disableTradeBelowVersion;
this.mediators = mediators; this.mediators = mediators;
this.refundAgents = refundAgents; this.refundAgents = refundAgents;
this.bannedSignerPubKeys = bannedSignerPubKeys; this.bannedAccountWitnessSignerPubKeys = bannedAccountWitnessSignerPubKeys;
this.btcFeeReceiverAddresses = btcFeeReceiverAddresses; this.btcFeeReceiverAddresses = btcFeeReceiverAddresses;
this.ownerPubKeyBytes = ownerPubKeyBytes; this.ownerPubKeyBytes = ownerPubKeyBytes;
this.creationDate = creationDate; this.creationDate = creationDate;
@ -268,7 +268,7 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload {
.setDisableTradeBelowVersion(disableTradeBelowVersion) .setDisableTradeBelowVersion(disableTradeBelowVersion)
.addAllMediators(mediators) .addAllMediators(mediators)
.addAllRefundAgents(refundAgents) .addAllRefundAgents(refundAgents)
.addAllBannedSignerPubKeys(bannedSignerPubKeys) .addAllBannedSignerPubKeys(bannedAccountWitnessSignerPubKeys)
.addAllBtcFeeReceiverAddresses(btcFeeReceiverAddresses) .addAllBtcFeeReceiverAddresses(btcFeeReceiverAddresses)
.setOwnerPubKeyBytes(ByteString.copyFrom(ownerPubKeyBytes)) .setOwnerPubKeyBytes(ByteString.copyFrom(ownerPubKeyBytes))
.setSignerPubKeyAsHex(signerPubKeyAsHex) .setSignerPubKeyAsHex(signerPubKeyAsHex)
@ -344,7 +344,7 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload {
",\n disableTradeBelowVersion='" + disableTradeBelowVersion + '\'' + ",\n disableTradeBelowVersion='" + disableTradeBelowVersion + '\'' +
",\n mediators=" + mediators + ",\n mediators=" + mediators +
",\n refundAgents=" + refundAgents + ",\n refundAgents=" + refundAgents +
",\n bannedAccountWitnessSignerPubKeys=" + bannedSignerPubKeys + ",\n bannedAccountWitnessSignerPubKeys=" + bannedAccountWitnessSignerPubKeys +
",\n bannedPrivilegedDevPubKeys=" + bannedPrivilegedDevPubKeys + ",\n bannedPrivilegedDevPubKeys=" + bannedPrivilegedDevPubKeys +
",\n btcFeeReceiverAddresses=" + btcFeeReceiverAddresses + ",\n btcFeeReceiverAddresses=" + btcFeeReceiverAddresses +
",\n creationDate=" + creationDate + ",\n creationDate=" + creationDate +

4
core/src/main/java/bisq/core/filter/FilterManager.java
View file

@ -386,8 +386,8 @@ public class FilterManager {
public boolean isWitnessSignerPubKeyBanned(String witnessSignerPubKeyAsHex) { public boolean isWitnessSignerPubKeyBanned(String witnessSignerPubKeyAsHex) {
return getFilter() != null && return getFilter() != null &&
getFilter().getBannedSignerPubKeys() != null && getFilter().getBannedAccountWitnessSignerPubKeys() != null &&
getFilter().getBannedSignerPubKeys().stream() getFilter().getBannedAccountWitnessSignerPubKeys().stream()
.anyMatch(e -> e.equals(witnessSignerPubKeyAsHex)); .anyMatch(e -> e.equals(witnessSignerPubKeyAsHex));
} }

139
desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java
View file

@ -112,57 +112,76 @@ public class FilterWindow extends Overlay<FilterWindow> {
gridPane.getColumnConstraints().remove(1); gridPane.getColumnConstraints().remove(1);
gridPane.getColumnConstraints().get(0).setHalignment(HPos.LEFT); gridPane.getColumnConstraints().get(0).setHalignment(HPos.LEFT);
InputTextField keyInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("shared.unlock"), 10); InputTextField keyTF = addInputTextField(gridPane, ++rowIndex,
Res.get("shared.unlock"), 10);
if (useDevPrivilegeKeys) { if (useDevPrivilegeKeys) {
keyInputTextField.setText(DevEnv.DEV_PRIVILEGE_PRIV_KEY); keyTF.setText(DevEnv.DEV_PRIVILEGE_PRIV_KEY);
} }
InputTextField offerIdsInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.offers")); InputTextField offerIdsTF = addInputTextField(gridPane, ++rowIndex,
InputTextField nodesInputTextField = addTopLabelInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.onions")).second; Res.get("filterWindow.offers"));
nodesInputTextField.setPromptText("E.g. zqnzx6o3nifef5df.onion:9999"); // Do not translate InputTextField nodesTF = addTopLabelInputTextField(gridPane, ++rowIndex,
InputTextField paymentAccountFilterInputTextField = addTopLabelInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.accounts")).second; Res.get("filterWindow.onions")).second;
GridPane.setHalignment(paymentAccountFilterInputTextField, HPos.RIGHT); nodesTF.setPromptText("E.g. zqnzx6o3nifef5df.onion:9999"); // Do not translate
paymentAccountFilterInputTextField.setPromptText("E.g. PERFECT_MONEY|getAccountNr|12345"); // Do not translate InputTextField paymentAccountFilterTF = addTopLabelInputTextField(gridPane, ++rowIndex,
InputTextField bannedCurrenciesInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.bannedCurrencies")); Res.get("filterWindow.accounts")).second;
InputTextField bannedPaymentMethodsInputTextField = addTopLabelInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.bannedPaymentMethods")).second; GridPane.setHalignment(paymentAccountFilterTF, HPos.RIGHT);
bannedPaymentMethodsInputTextField.setPromptText("E.g. PERFECT_MONEY"); // Do not translate paymentAccountFilterTF.setPromptText("E.g. PERFECT_MONEY|getAccountNr|12345"); // Do not translate
InputTextField bannedAccountWitnessSignerPubKeysInputTextField = addTopLabelInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.bannedAccountWitnessSignerPubKeys")).second; InputTextField bannedCurrenciesTF = addInputTextField(gridPane, ++rowIndex,
bannedAccountWitnessSignerPubKeysInputTextField.setPromptText("E.g. 7f66117aa084e5a2c54fe17d29dd1fee2b241257"); // Do not translate Res.get("filterWindow.bannedCurrencies"));
InputTextField arbitratorsInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.arbitrators")); InputTextField bannedPaymentMethodsTF = addTopLabelInputTextField(gridPane, ++rowIndex,
InputTextField mediatorsInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.mediators")); Res.get("filterWindow.bannedPaymentMethods")).second;
InputTextField refundAgentsInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.refundAgents")); bannedPaymentMethodsTF.setPromptText("E.g. PERFECT_MONEY"); // Do not translate
InputTextField btcFeeReceiverAddressesInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.btcFeeReceiverAddresses")); InputTextField bannedAccountWitnessSignerPubKeysTF = addTopLabelInputTextField(gridPane, ++rowIndex,
InputTextField seedNodesInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.seedNode")); Res.get("filterWindow.bannedAccountWitnessSignerPubKeys")).second;
InputTextField priceRelayNodesInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.priceRelayNode")); bannedAccountWitnessSignerPubKeysTF.setPromptText("E.g. 7f66117aa084e5a2c54fe17d29dd1fee2b241257"); // Do not translate
InputTextField btcNodesInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.btcNode")); InputTextField arbitratorsTF = addInputTextField(gridPane, ++rowIndex,
CheckBox preventPublicBtcNetworkCheckBox = addLabelCheckBox(gridPane, ++rowIndex, Res.get("filterWindow.preventPublicBtcNetwork")); Res.get("filterWindow.arbitrators"));
CheckBox disableDaoCheckBox = addLabelCheckBox(gridPane, ++rowIndex, Res.get("filterWindow.disableDao")); InputTextField mediatorsTF = addInputTextField(gridPane, ++rowIndex,
InputTextField disableDaoBelowVersionInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.disableDaoBelowVersion")); Res.get("filterWindow.mediators"));
InputTextField disableTradeBelowVersionInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.disableTradeBelowVersion")); InputTextField refundAgentsTF = addInputTextField(gridPane, ++rowIndex,
InputTextField bannedPrivilegedDevPubKeysInputTextField = addTopLabelInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.bannedPrivilegedDevPubKeys")).second; Res.get("filterWindow.refundAgents"));
InputTextField btcFeeReceiverAddressesTF = addInputTextField(gridPane, ++rowIndex,
Res.get("filterWindow.btcFeeReceiverAddresses"));
InputTextField seedNodesTF = addInputTextField(gridPane, ++rowIndex,
Res.get("filterWindow.seedNode"));
InputTextField priceRelayNodesTF = addInputTextField(gridPane, ++rowIndex,
Res.get("filterWindow.priceRelayNode"));
InputTextField btcNodesTF = addInputTextField(gridPane, ++rowIndex,
Res.get("filterWindow.btcNode"));
CheckBox preventPublicBtcNetworkCheckBox = addLabelCheckBox(gridPane, ++rowIndex,
Res.get("filterWindow.preventPublicBtcNetwork"));
CheckBox disableDaoCheckBox = addLabelCheckBox(gridPane, ++rowIndex,
Res.get("filterWindow.disableDao"));
InputTextField disableDaoBelowVersionTF = addInputTextField(gridPane, ++rowIndex,
Res.get("filterWindow.disableDaoBelowVersion"));
InputTextField disableTradeBelowVersionTF = addInputTextField(gridPane, ++rowIndex,
Res.get("filterWindow.disableTradeBelowVersion"));
InputTextField bannedPrivilegedDevPubKeysTF = addTopLabelInputTextField(gridPane, ++rowIndex,
Res.get("filterWindow.bannedPrivilegedDevPubKeys")).second;
Filter filter = filterManager.getDevFilter(); Filter filter = filterManager.getDevFilter();
if (filter != null) { if (filter != null) {
setupFieldFromList(offerIdsInputTextField, filter.getBannedOfferIds()); setupFieldFromList(offerIdsTF, filter.getBannedOfferIds());
setupFieldFromList(nodesInputTextField, filter.getBannedNodeAddress()); setupFieldFromList(nodesTF, filter.getBannedNodeAddress());
setupFieldFromPaymentAccountFiltersList(paymentAccountFilterInputTextField, filter.getBannedPaymentAccounts()); setupFieldFromPaymentAccountFiltersList(paymentAccountFilterTF, filter.getBannedPaymentAccounts());
setupFieldFromList(bannedCurrenciesInputTextField, filter.getBannedCurrencies()); setupFieldFromList(bannedCurrenciesTF, filter.getBannedCurrencies());
setupFieldFromList(bannedPaymentMethodsInputTextField, filter.getBannedPaymentMethods()); setupFieldFromList(bannedPaymentMethodsTF, filter.getBannedPaymentMethods());
setupFieldFromList(bannedAccountWitnessSignerPubKeysInputTextField, filter.getBannedSignerPubKeys()); setupFieldFromList(bannedAccountWitnessSignerPubKeysTF, filter.getBannedAccountWitnessSignerPubKeys());
setupFieldFromList(arbitratorsInputTextField, filter.getArbitrators()); setupFieldFromList(arbitratorsTF, filter.getArbitrators());
setupFieldFromList(mediatorsInputTextField, filter.getMediators()); setupFieldFromList(mediatorsTF, filter.getMediators());
setupFieldFromList(refundAgentsInputTextField, filter.getRefundAgents()); setupFieldFromList(refundAgentsTF, filter.getRefundAgents());
setupFieldFromList(btcFeeReceiverAddressesInputTextField, filter.getBtcFeeReceiverAddresses()); setupFieldFromList(btcFeeReceiverAddressesTF, filter.getBtcFeeReceiverAddresses());
setupFieldFromList(seedNodesInputTextField, filter.getSeedNodes()); setupFieldFromList(seedNodesTF, filter.getSeedNodes());
setupFieldFromList(priceRelayNodesInputTextField, filter.getPriceRelayNodes()); setupFieldFromList(priceRelayNodesTF, filter.getPriceRelayNodes());
setupFieldFromList(btcNodesInputTextField, filter.getBtcNodes()); setupFieldFromList(btcNodesTF, filter.getBtcNodes());
setupFieldFromList(btcNodesInputTextField, filter.getBtcNodes()); setupFieldFromList(btcNodesTF, filter.getBtcNodes());
setupFieldFromList(bannedPrivilegedDevPubKeysInputTextField, filter.getBannedPrivilegedDevPubKeys()); setupFieldFromList(bannedPrivilegedDevPubKeysTF, filter.getBannedPrivilegedDevPubKeys());
preventPublicBtcNetworkCheckBox.setSelected(filter.isPreventPublicBtcNetwork()); preventPublicBtcNetworkCheckBox.setSelected(filter.isPreventPublicBtcNetwork());
disableDaoCheckBox.setSelected(filter.isDisableDao()); disableDaoCheckBox.setSelected(filter.isDisableDao());
disableDaoBelowVersionInputTextField.setText(filter.getDisableDaoBelowVersion()); disableDaoBelowVersionTF.setText(filter.getDisableDaoBelowVersion());
disableTradeBelowVersionInputTextField.setText(filter.getDisableTradeBelowVersion()); disableTradeBelowVersionTF.setText(filter.getDisableTradeBelowVersion());
} }
Button removeFilterMessageButton = new AutoTooltipButton(Res.get("filterWindow.remove")); Button removeFilterMessageButton = new AutoTooltipButton(Res.get("filterWindow.remove"));
@ -170,30 +189,30 @@ public class FilterWindow extends Overlay<FilterWindow> {
Button sendButton = new AutoTooltipButton(Res.get("filterWindow.add")); Button sendButton = new AutoTooltipButton(Res.get("filterWindow.add"));
sendButton.setOnAction(e -> { sendButton.setOnAction(e -> {
String privKeyString = keyInputTextField.getText(); String privKeyString = keyTF.getText();
if (filterManager.canAddDevFilter(privKeyString)) { if (filterManager.canAddDevFilter(privKeyString)) {
String signerPubKeyAsHex = filterManager.getSignerPubKeyAsHex(privKeyString); String signerPubKeyAsHex = filterManager.getSignerPubKeyAsHex(privKeyString);
Filter newFilter = new Filter( Filter newFilter = new Filter(
readAsList(offerIdsInputTextField), readAsList(offerIdsTF),
readAsList(nodesInputTextField), readAsList(nodesTF),
readAsPaymentAccountFiltersList(paymentAccountFilterInputTextField), readAsPaymentAccountFiltersList(paymentAccountFilterTF),
readAsList(bannedCurrenciesInputTextField), readAsList(bannedCurrenciesTF),
readAsList(bannedPaymentMethodsInputTextField), readAsList(bannedPaymentMethodsTF),
readAsList(arbitratorsInputTextField), readAsList(arbitratorsTF),
readAsList(seedNodesInputTextField), readAsList(seedNodesTF),
readAsList(priceRelayNodesInputTextField), readAsList(priceRelayNodesTF),
preventPublicBtcNetworkCheckBox.isSelected(), preventPublicBtcNetworkCheckBox.isSelected(),
readAsList(btcNodesInputTextField), readAsList(btcNodesTF),
disableDaoCheckBox.isSelected(), disableDaoCheckBox.isSelected(),
disableDaoBelowVersionInputTextField.getText(), disableDaoBelowVersionTF.getText(),
disableTradeBelowVersionInputTextField.getText(), disableTradeBelowVersionTF.getText(),
readAsList(mediatorsInputTextField), readAsList(mediatorsTF),
readAsList(refundAgentsInputTextField), readAsList(refundAgentsTF),
readAsList(bannedAccountWitnessSignerPubKeysInputTextField), readAsList(bannedAccountWitnessSignerPubKeysTF),
readAsList(btcFeeReceiverAddressesInputTextField), readAsList(btcFeeReceiverAddressesTF),
filterManager.getOwnerPubKey(), filterManager.getOwnerPubKey(),
signerPubKeyAsHex, signerPubKeyAsHex,
readAsList(bannedPrivilegedDevPubKeysInputTextField) readAsList(bannedPrivilegedDevPubKeysTF)
); );
filterManager.addDevFilter(newFilter, privKeyString); filterManager.addDevFilter(newFilter, privKeyString);
@ -205,7 +224,7 @@ public class FilterWindow extends Overlay<FilterWindow> {
}); });
removeFilterMessageButton.setOnAction(e -> { removeFilterMessageButton.setOnAction(e -> {
String privKeyString = keyInputTextField.getText(); String privKeyString = keyTF.getText();
if (filterManager.canRemoveDevFilter(privKeyString)) { if (filterManager.canRemoveDevFilter(privKeyString)) {
filterManager.removeDevFilter(privKeyString); filterManager.removeDevFilter(privKeyString);
hide(); hide();