From fb5b56d03c8c2102c9ce4580e54578fae7f5f85a Mon Sep 17 00:00:00 2001 From: HenrikJannsen Date: Mon, 10 Apr 2023 14:38:37 +0700 Subject: [PATCH] Add processBurningManAccountingData field to preferences Signed-off-by: HenrikJannsen --- core/src/main/java/bisq/core/user/Preferences.java | 13 +++++++++++++ .../java/bisq/core/user/PreferencesPayload.java | 9 +++++++-- proto/src/main/proto/pb.proto | 1 + 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/bisq/core/user/Preferences.java b/core/src/main/java/bisq/core/user/Preferences.java index 82670c0e0c..6a312de449 100644 --- a/core/src/main/java/bisq/core/user/Preferences.java +++ b/core/src/main/java/bisq/core/user/Preferences.java @@ -846,6 +846,11 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid requestPersistence(); } + public void setProcessBurningManAccountingData(boolean processBurningManAccountingData) { + prefPayload.setProcessBurningManAccountingData(processBurningManAccountingData); + requestPersistence(); + } + /////////////////////////////////////////////////////////////////////////////////////////// // Getter @@ -1012,6 +1017,10 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid } } + public boolean isProcessBurningManAccountingData() { + return prefPayload.isProcessBurningManAccountingData(); + } + /////////////////////////////////////////////////////////////////////////////////////////// // Private @@ -1132,6 +1141,8 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid double getBuyerSecurityDepositAsPercent(); + boolean isProcessBurningManAccountingData(); + void setDaoFullNode(boolean value); void setRpcUser(String value); @@ -1175,5 +1186,7 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid void setUserDefinedTradeLimit(long userDefinedTradeLimit); void setUserHasRaisedTradeLimit(boolean userHasRaisedTradeLimit); + + void setProcessBurningManAccountingData(boolean processBurningManAccountingData); } } diff --git a/core/src/main/java/bisq/core/user/PreferencesPayload.java b/core/src/main/java/bisq/core/user/PreferencesPayload.java index 11e7562761..eb74be1b6e 100644 --- a/core/src/main/java/bisq/core/user/PreferencesPayload.java +++ b/core/src/main/java/bisq/core/user/PreferencesPayload.java @@ -145,6 +145,9 @@ public final class PreferencesPayload implements PersistableEnvelope { private long userDefinedTradeLimit = Preferences.INITIAL_TRADE_LIMIT; private boolean userHasRaisedTradeLimit = false; + // Added at 1.9.11 + private boolean processBurningManAccountingData = false; + /////////////////////////////////////////////////////////////////////////////////////////// // Constructor /////////////////////////////////////////////////////////////////////////////////////////// @@ -216,7 +219,8 @@ public final class PreferencesPayload implements PersistableEnvelope { .setUseFullModeDaoMonitor(useFullModeDaoMonitor) .setUseBitcoinUrisInQrCodes(useBitcoinUrisInQrCodes) .setUserDefinedTradeLimit(userDefinedTradeLimit) - .setUserHasRaisedTradeLimit(userHasRaisedTradeLimit); + .setUserHasRaisedTradeLimit(userHasRaisedTradeLimit) + .setProcessBurningManAccountingData(processBurningManAccountingData); Optional.ofNullable(backupDirectory).ifPresent(builder::setBackupDirectory); Optional.ofNullable(preferredTradeCurrency).ifPresent(e -> builder.setPreferredTradeCurrency((protobuf.TradeCurrency) e.toProtoMessage())); @@ -323,7 +327,8 @@ public final class PreferencesPayload implements PersistableEnvelope { proto.getUseFullModeDaoMonitor(), proto.getUseBitcoinUrisInQrCodes(), proto.getUserHasRaisedTradeLimit() ? proto.getUserDefinedTradeLimit() : Preferences.INITIAL_TRADE_LIMIT, - proto.getUserHasRaisedTradeLimit() + proto.getUserHasRaisedTradeLimit(), + proto.getProcessBurningManAccountingData() ); } } diff --git a/proto/src/main/proto/pb.proto b/proto/src/main/proto/pb.proto index d56eebae43..2d276a327a 100644 --- a/proto/src/main/proto/pb.proto +++ b/proto/src/main/proto/pb.proto @@ -1971,6 +1971,7 @@ message PreferencesPayload { bool use_bitcoin_uris_in_qr_codes = 66; int64 user_defined_trade_limit = 67; bool user_has_raised_trade_limit = 68; + bool process_burning_man_accounting_data = 69; } message AutoConfirmSettings {