Fulfilling Proposal #110

common/src/main/proto/pb.proto

@@ -1454,6 +1454,13 @@ message PreferencesPayload {
     double buyer_security_deposit_as_percent_for_crypto = 52;
     int32 block_notify_port = 53;
     int32 css_theme = 54;
+    bool use_bisq_xmr_wallet = 55;
+    string xmr_user_host = 56;
+    string xmr_host_port = 57;
+    string xmr_rpc_user = 58;
+    string xmr_rpc_pwd = 59;
+    repeated string xmr_hosts = 60;
+    int32 xmr_host_option_ordinal = 61;    
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////

core/src/main/java/bisq/core/payment/PaymentAccountFactory.java

@@ -17,7 +17,10 @@
 
 package bisq.core.payment;
 
+import bisq.core.locale.TradeCurrency;
 import bisq.core.payment.payload.PaymentMethod;
+import bisq.core.xmr.wallet.XmrWalletRpcWrapper;
+
 
 public class PaymentAccountFactory {
     public static PaymentAccount getPaymentAccount(PaymentMethod paymentMethod) {
@@ -91,4 +94,16 @@ public static PaymentAccount getPaymentAccount(PaymentMethod paymentMethod) {
                 throw new RuntimeException("Not supported PaymentMethod: " + paymentMethod);
         }
     }
+
+    public static InstantCryptoCurrencyAccount producePrimaryWalletAccount(XmrWalletRpcWrapper xmrWalletRpcWrapper, TradeCurrency xmrTradeCurrency) {
+    	InstantCryptoCurrencyAccount account = new InstantCryptoCurrencyAccount();
+    	account.init();
+
+    	account.setAddress(xmrWalletRpcWrapper.getPrimaryAddress());
+    	account.setSingleTradeCurrency(xmrTradeCurrency);
+    	account.setAccountName("XMR Wallet: " + account.getAddress().substring(0, 6) + "...");
+
+    	return account;
+    }
+
 }

core/src/main/java/bisq/core/presentation/CorePresentationModule.java

@@ -19,6 +19,8 @@
 
 import bisq.common.app.AppModule;
 
+import bisq.core.xmr.wallet.XmrWalletRpcWrapper;
+
 import org.springframework.core.env.Environment;
 
 import com.google.inject.Singleton;

core/src/main/java/bisq/core/user/Preferences.java

@@ -79,6 +79,10 @@
 @Slf4j
 @Singleton
 public final class Preferences implements PersistedDataHost, BridgeAddressProvider {
+	//TODO(niyid) Monero Wallet params: XMR_MAIN_NET_EXPLORERS, XMR_TEST_NET_EXPLORERS
+	//TODO(niyid) Monero Wallet params: Local Host(127.0.0.1)/Remote Host node, Port
+	//TODO(niyid) Monero Wallet params: List of available remote nodes
+	//TODO(niyid) Monero Wallet params equivalents of: btcNodesFromOptions, useTorFlagFromOptions, rpcUserFromOptions, rpcPwFromOptions
 
     private static final ArrayList<BlockChainExplorer> BTC_MAIN_NET_EXPLORERS = new ArrayList<>(Arrays.asList(
             new BlockChainExplorer("Blockstream.info", "https://blockstream.info/tx/", "https://blockstream.info/address/"),
@@ -133,14 +137,19 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid
     private final ObservableList<FiatCurrency> fiatCurrenciesAsObservable = FXCollections.observableArrayList();
     private final ObservableList<CryptoCurrency> cryptoCurrenciesAsObservable = FXCollections.observableArrayList();
     private final ObservableList<TradeCurrency> tradeCurrenciesAsObservable = FXCollections.observableArrayList();
+    private final ObservableList<String> xmrHostsAsObservable = FXCollections.observableArrayList();
     private final ObservableMap<String, Boolean> dontShowAgainMapAsObservable = FXCollections.observableHashMap();
 
     private final Storage<PreferencesPayload> storage;
     private final BisqEnvironment bisqEnvironment;
     private final String btcNodesFromOptions, useTorFlagFromOptions, referralIdFromOptions, fullDaoNodeFromOptions,
             rpcUserFromOptions, rpcPwFromOptions, blockNotifyPortFromOptions;
+
+    private final String xmrUserHostDelegate, xmrHostPortDelegate, xmrRpcUserDelegate, xmrRpcPwdDelegate;
     @Getter
     private final BooleanProperty useStandbyModeProperty = new SimpleBooleanProperty(prefPayload.isUseStandbyMode());
+    @Getter
+    private final BooleanProperty useBisqXmrWalletProperty = new SimpleBooleanProperty(prefPayload.isUseBisqXmrWallet());
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -171,6 +180,11 @@ public Preferences(Storage<PreferencesPayload> storage,
         this.rpcUserFromOptions = rpcUser;
         this.rpcPwFromOptions = rpcPassword;
         this.blockNotifyPortFromOptions = rpcBlockNotificationPort;
+
+        xmrUserHostDelegate = "127.0.0.1";
+        xmrHostPortDelegate = "29088";
+        xmrRpcUserDelegate = null;
+        xmrRpcPwdDelegate = null;
 
         useAnimationsProperty.addListener((ov) -> {
             prefPayload.setUseAnimations(useAnimationsProperty.get());
@@ -188,6 +202,11 @@ public Preferences(Storage<PreferencesPayload> storage,
             persist();
         });
 
+        useBisqXmrWalletProperty.addListener((ov) -> {
+            prefPayload.setUseBisqXmrWallet(useBisqXmrWalletProperty.get());
+            persist();
+        });
+
         fiatCurrenciesAsObservable.addListener((javafx.beans.Observable ov) -> {
             prefPayload.getFiatCurrencies().clear();
             prefPayload.getFiatCurrencies().addAll(fiatCurrenciesAsObservable);
@@ -269,11 +288,13 @@ public void readPersisted() {
         // set all properties
         useAnimationsProperty.set(prefPayload.isUseAnimations());
         useStandbyModeProperty.set(prefPayload.isUseStandbyMode());
+        useBisqXmrWalletProperty.set(prefPayload.isUseBisqXmrWallet());
         useCustomWithdrawalTxFeeProperty.set(prefPayload.isUseCustomWithdrawalTxFee());
         withdrawalTxFeeInBytesProperty.set(prefPayload.getWithdrawalTxFeeInBytes());
 
         tradeCurrenciesAsObservable.addAll(prefPayload.getFiatCurrencies());
         tradeCurrenciesAsObservable.addAll(prefPayload.getCryptoCurrencies());
+        xmrHostsAsObservable.addAll(prefPayload.getXmrHosts());
         dontShowAgainMapAsObservable.putAll(getDontShowAgainMap());
 
         // Override settings with options if set
@@ -382,6 +403,27 @@ public void removeCryptoCurrency(CryptoCurrency tradeCurrency) {
         }
     }
 
+    public void addXmrHost(String host) {
+        if (!xmrHostsAsObservable.contains(host)) {
+        	xmrHostsAsObservable.add(host);
+        }
+    }
+
+    public void removeXmrHost(String host) {
+        if (xmrHostsAsObservable.size() > 1) {
+            if (xmrHostsAsObservable.contains(host))
+            	xmrHostsAsObservable.remove(host);
+
+            if (prefPayload.getXmrUserHost() != null &&
+                    prefPayload.getXmrUserHost().equals(host)) {
+                setXmrUserHost(xmrHostsAsObservable.get(0));
+            }
+        } else {
+            log.error("you cannot remove the last Monero host");
+        }
+    }
+
+
     public void setBlockChainExplorer(BlockChainExplorer blockChainExplorer) {
         if (BisqEnvironment.getBaseCurrencyNetwork().isMainnet())
             setBlockChainExplorerMainNet(blockChainExplorer);
@@ -622,6 +664,10 @@ public void setUseStandbyMode(boolean useStandbyMode) {
         this.useStandbyModeProperty.set(useStandbyMode);
     }
 
+    public void setUseBisqXmrWallet(boolean useBisqXmrWallet) {
+        this.useBisqXmrWalletProperty.set(useBisqXmrWallet);
+    }
+
     public void setTakeOfferSelectedPaymentAccountId(String value) {
         prefPayload.setTakeOfferSelectedPaymentAccountId(value);
         persist();
@@ -653,6 +699,32 @@ public void setRpcPw(String value) {
         }
     }
 
+    public void setXmrUserHostDelegate(String value) {
+    	prefPayload.setXmrUserHost(value);
+        persist();
+    }
+
+    public void setXmrHostPortDelegate(String value) {
+        prefPayload.setXmrHostPort(value);
+        persist();
+    }
+
+    public void setXmrRpcUserDelegate(String value) {
+        // We only persist if we have not set the program argument
+        if (xmrRpcUserDelegate == null || xmrRpcUserDelegate.isEmpty()) {
+            prefPayload.setXmrRpcUser(value);
+            persist();
+        }
+    }
+
+    public void setXmrRpcPwdDelegate(String value) {
+        // We only persist if we have not set the program argument
+        if (xmrRpcPwdDelegate == null || xmrRpcPwdDelegate.isEmpty()) {
+            prefPayload.setXmrRpcPwd(value);
+            persist();
+        }
+    }
+
     public void setBlockNotifyPort(int value) {
         // We only persist if we have not set the program argument
         if (blockNotifyPortFromOptions == null || blockNotifyPortFromOptions.isEmpty()) {
@@ -686,6 +758,10 @@ public ObservableList<CryptoCurrency> getCryptoCurrenciesAsObservable() {
     public ObservableList<TradeCurrency> getTradeCurrenciesAsObservable() {
         return tradeCurrenciesAsObservable;
     }
+
+    public ObservableList<String> getXmrHostsAsObservable() {
+        return xmrHostsAsObservable;
+    }
 
     public ObservableMap<String, Boolean> getDontShowAgainMapAsObservable() {
         return dontShowAgainMapAsObservable;
@@ -805,6 +881,38 @@ public String getRpcPw() {
         }
     }
 
+    public String getXmrUserHostDelegate() {
+        if (xmrUserHostDelegate != null && !xmrUserHostDelegate.isEmpty()) {
+            return xmrUserHostDelegate;
+        } else {
+            return prefPayload.getXmrUserHost();
+        }
+    }
+
+    public String getXmrHostPortDelegate() {
+        if (xmrHostPortDelegate != null && !xmrHostPortDelegate.isEmpty()) {
+            return xmrHostPortDelegate;
+        } else {
+            return prefPayload.getXmrUserHost();
+        }
+    }
+
+    public String getXmrRpcUserDelegate() {
+        if (xmrRpcUserDelegate != null && !xmrRpcUserDelegate.isEmpty()) {
+            return xmrRpcUserDelegate;
+        } else {
+            return prefPayload.getXmrRpcUser();
+        }
+    }
+
+    public String getXmrRpcPwdDelegate() {
+        if (xmrRpcPwdDelegate != null && !xmrRpcPwdDelegate.isEmpty()) {
+            return xmrRpcPwdDelegate;
+        } else {
+            return prefPayload.getXmrRpcPwd();
+        }
+    }
+
     public int getBlockNotifyPort() {
         if (blockNotifyPortFromOptions != null && !blockNotifyPortFromOptions.isEmpty()) {
             try {
@@ -927,6 +1035,8 @@ private interface ExcludesDelegateMethods {
         long getWithdrawalTxFeeInBytes();
 
         void setUseStandbyMode(boolean useStandbyMode);
+
+        void setUseBisqXmrWallet(boolean useBisqXmrWallet);
 
         void setTakeOfferSelectedPaymentAccountId(String value);
 

core/src/main/java/bisq/core/user/PreferencesPayload.java

@@ -94,7 +94,6 @@ public final class PreferencesPayload implements PersistableEnvelope {
     private long buyerSecurityDepositAsLong;
 
     private boolean useAnimations;
-    private int cssTheme;
     @Nullable
     private PaymentAccount selectedPaymentAccountForCreateOffer;
     private boolean payFeeInBtc = true;
@@ -125,8 +124,17 @@ public final class PreferencesPayload implements PersistableEnvelope {
     private int ignoreDustThreshold = 600;
     private double buyerSecurityDepositAsPercentForCrypto = getDefaultBuyerSecurityDepositAsPercent(new CryptoCurrencyAccount());
     private int blockNotifyPort;
-
-
+    private int cssTheme;
+
+    private boolean useBisqXmrWallet = false;
+    private String xmrUserHost = "127.0.0.1";
+    private String xmrHostPort = "29088";
+    @Nullable
+    private String xmrRpcUser;
+    @Nullable
+    private String xmrRpcPwd;
+    private List<String> xmrHosts = new ArrayList<>();
+    private int xmrHostOptionOrdinal;    
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -171,7 +179,6 @@ public Message toProtoMessage() {
                 .setDirectoryChooserPath(directoryChooserPath)
                 .setBuyerSecurityDepositAsLong(buyerSecurityDepositAsLong)
                 .setUseAnimations(useAnimations)
-                .setCssTheme(cssTheme)
                 .setPayFeeInBtc(payFeeInBtc)
                 .setBridgeOptionOrdinal(bridgeOptionOrdinal)
                 .setTorTransportOrdinal(torTransportOrdinal)
@@ -185,7 +192,15 @@ public Message toProtoMessage() {
                 .setBuyerSecurityDepositAsPercent(buyerSecurityDepositAsPercent)
                 .setIgnoreDustThreshold(ignoreDustThreshold)
                 .setBuyerSecurityDepositAsPercentForCrypto(buyerSecurityDepositAsPercentForCrypto)
-                .setBlockNotifyPort(blockNotifyPort);
+                .setBlockNotifyPort(blockNotifyPort)
+                .setCssTheme(cssTheme)
+                .setUseBisqXmrWallet(useBisqXmrWallet)
+                .setXmrUserHost(xmrUserHost)
+                .setXmrHostPort(xmrHostPort)
+                .setXmrRpcUser(xmrRpcUser)
+                .setXmrRpcPwd(xmrRpcPwd)
+                .addAllXmrHosts(xmrHosts)
+                .setXmrHostOptionOrdinal(xmrHostOptionOrdinal);
         Optional.ofNullable(backupDirectory).ifPresent(builder::setBackupDirectory);
         Optional.ofNullable(preferredTradeCurrency).ifPresent(e -> builder.setPreferredTradeCurrency((protobuf.TradeCurrency) e.toProtoMessage()));
         Optional.ofNullable(offerBookChartScreenCurrencyCode).ifPresent(builder::setOfferBookChartScreenCurrencyCode);
@@ -249,7 +264,6 @@ public static PersistableEnvelope fromProto(protobuf.PreferencesPayload proto, C
                 proto.getDirectoryChooserPath(),
                 proto.getBuyerSecurityDepositAsLong(),
                 proto.getUseAnimations(),
-                proto.getCssTheme(),
                 paymentAccount,
                 proto.getPayFeeInBtc(),
                 proto.getBridgeAddressesList().isEmpty() ? null : new ArrayList<>(proto.getBridgeAddressesList()),
@@ -271,7 +285,15 @@ public static PersistableEnvelope fromProto(protobuf.PreferencesPayload proto, C
                 proto.getBuyerSecurityDepositAsPercent(),
                 proto.getIgnoreDustThreshold(),
                 proto.getBuyerSecurityDepositAsPercentForCrypto(),
-                proto.getBlockNotifyPort());
+                proto.getBlockNotifyPort(),
+                proto.getCssTheme(),
+	            proto.getUseBisqXmrWallet(),
+	            proto.getXmrUserHost(),
+	            proto.getXmrHostPort(),
+	            proto.getXmrRpcUser(),
+	            proto.getXmrRpcPwd(),
+	            proto.getXmrHostsList(),
+	            proto.getXmrHostOptionOrdinal());
 
     }
 }