Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-10 23:50:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

replace LocalBitcoinNode with LocalMoneroNode

Browse source
This commit is contained in:
woodser 2023-08-17 11:50:51 -04:00
parent d50ab5782b
commit 740374c9db
28 changed files with 92 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

6
desktop/src/main/java/haveno/desktop/main/MainViewModel.java
View file

@ -48,7 +48,6 @@ import haveno.core.trade.TradeManager;
import haveno.core.user.DontShowAgainLookup;
import haveno.core.user.Preferences;
import haveno.core.user.User;
import haveno.core.xmr.nodes.LocalBitcoinNode;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.Navigation;
import haveno.desktop.common.model.ViewModel;
@ -122,7 +121,6 @@ public class MainViewModel implements ViewModel, HavenoSetup.HavenoSetupListener
@Getter
private final PriceFeedService priceFeedService;
private final Config config;
private final LocalBitcoinNode localBitcoinNode;
private final AccountAgeWitnessService accountAgeWitnessService;
@Getter
private final TorNetworkSettingsWindow torNetworkSettingsWindow;
@ -166,7 +164,6 @@ public class MainViewModel implements ViewModel, HavenoSetup.HavenoSetupListener
TacWindow tacWindow,
PriceFeedService priceFeedService,
Config config,
LocalBitcoinNode localBitcoinNode,
AccountAgeWitnessService accountAgeWitnessService,
TorNetworkSettingsWindow torNetworkSettingsWindow,
CorruptedStorageFileHandler corruptedStorageFileHandler,
@ -190,7 +187,6 @@ public class MainViewModel implements ViewModel, HavenoSetup.HavenoSetupListener
this.tacWindow = tacWindow;
this.priceFeedService = priceFeedService;
this.config = config;
this.localBitcoinNode = localBitcoinNode;
this.accountAgeWitnessService = accountAgeWitnessService;
this.torNetworkSettingsWindow = torNetworkSettingsWindow;
this.corruptedStorageFileHandler = corruptedStorageFileHandler;
@ -359,7 +355,7 @@ public class MainViewModel implements ViewModel, HavenoSetup.HavenoSetupListener
havenoSetup.setDisplaySecurityRecommendationHandler(key -> {});
havenoSetup.setDisplayLocalhostHandler(key -> {
if (!DevEnv.isDevMode()) {
Popup popup = new Popup().backgroundInfo(Res.get("popup.bitcoinLocalhostNode.msg"))
Popup popup = new Popup().backgroundInfo(Res.get("popup.moneroLocalhostNode.msg"))
.dontShowAgainId(key);
popup.setDisplayOrderPriority(5);
popupQueue.add(popup);

34
desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.java
View file

@ -20,6 +20,7 @@ package haveno.desktop.main.settings.network;
import haveno.common.ClockWatcher;
import haveno.common.UserThread;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.api.LocalMoneroNode;
import haveno.core.filter.Filter;
import haveno.core.filter.FilterManager;
import haveno.core.locale.Res;
@ -28,7 +29,6 @@ import haveno.core.util.FormattingUtils;
import haveno.core.util.validation.RegexValidator;
import haveno.core.util.validation.RegexValidatorFactory;
import haveno.core.xmr.nodes.XmrNodes;
import haveno.core.xmr.nodes.LocalBitcoinNode;
import haveno.core.xmr.setup.WalletsSetup;
import haveno.desktop.app.HavenoApp;
import haveno.desktop.common.view.ActivatableView;
@ -104,7 +104,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
private final Preferences preferences;
private final XmrNodes xmrNodes;
private final FilterManager filterManager;
private final LocalBitcoinNode localBitcoinNode;
private final LocalMoneroNode localMoneroNode;
private final TorNetworkSettingsWindow torNetworkSettingsWindow;
private final ClockWatcher clockWatcher;
private final WalletsSetup walletsSetup;
@ -134,7 +134,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
Preferences preferences,
XmrNodes xmrNodes,
FilterManager filterManager,
LocalBitcoinNode localBitcoinNode,
LocalMoneroNode localMoneroNode,
TorNetworkSettingsWindow torNetworkSettingsWindow,
ClockWatcher clockWatcher) {
super();
@ -144,7 +144,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
this.preferences = preferences;
this.xmrNodes = xmrNodes;
this.filterManager = filterManager;
this.localBitcoinNode = localBitcoinNode;
this.localMoneroNode = localMoneroNode;
this.torNetworkSettingsWindow = torNetworkSettingsWindow;
this.clockWatcher = clockWatcher;
}
@ -385,16 +385,16 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
}
private void onMoneroPeersToggleSelected(boolean calledFromUser) {
boolean localBitcoinNodeShouldBeUsed = localBitcoinNode.shouldBeUsed();
useTorForXmrJCheckBox.setDisable(localBitcoinNodeShouldBeUsed);
moneroNodesLabel.setDisable(localBitcoinNodeShouldBeUsed);
xmrNodesLabel.setDisable(localBitcoinNodeShouldBeUsed);
xmrNodesInputTextField.setDisable(localBitcoinNodeShouldBeUsed);
useProvidedNodesRadio.setDisable(localBitcoinNodeShouldBeUsed);
useCustomNodesRadio.setDisable(localBitcoinNodeShouldBeUsed);
usePublicNodesRadio.setDisable(localBitcoinNodeShouldBeUsed || isPreventPublicXmrNetwork());
boolean localMoneroNodeShouldBeUsed = localMoneroNode.shouldBeUsed();
useTorForXmrJCheckBox.setDisable(localMoneroNodeShouldBeUsed);
moneroNodesLabel.setDisable(localMoneroNodeShouldBeUsed);
xmrNodesLabel.setDisable(localMoneroNodeShouldBeUsed);
xmrNodesInputTextField.setDisable(localMoneroNodeShouldBeUsed);
useProvidedNodesRadio.setDisable(localMoneroNodeShouldBeUsed);
useCustomNodesRadio.setDisable(localMoneroNodeShouldBeUsed);
usePublicNodesRadio.setDisable(localMoneroNodeShouldBeUsed || isPreventPublicXmrNetwork());
XmrNodes.MoneroNodesOption currentBitcoinNodesOption = XmrNodes.MoneroNodesOption.values()[preferences.getMoneroNodesOptionOrdinal()];
XmrNodes.MoneroNodesOption currentMoneroNodesOption = XmrNodes.MoneroNodesOption.values()[preferences.getMoneroNodesOptionOrdinal()];
switch (selectedMoneroNodesOption) {
case CUSTOM:
@ -402,7 +402,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
xmrNodesLabel.setDisable(false);
if (!xmrNodesInputTextField.getText().isEmpty()
&& xmrNodesInputTextField.validate()
&& currentBitcoinNodesOption != XmrNodes.MoneroNodesOption.CUSTOM) {
&& currentMoneroNodesOption != XmrNodes.MoneroNodesOption.CUSTOM) {
preferences.setMoneroNodesOptionOrdinal(selectedMoneroNodesOption.ordinal());
if (calledFromUser) {
if (isPreventPublicXmrNetwork()) {
@ -417,7 +417,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
case PUBLIC:
xmrNodesInputTextField.setDisable(true);
xmrNodesLabel.setDisable(true);
if (currentBitcoinNodesOption != XmrNodes.MoneroNodesOption.PUBLIC) {
if (currentMoneroNodesOption != XmrNodes.MoneroNodesOption.PUBLIC) {
preferences.setMoneroNodesOptionOrdinal(selectedMoneroNodesOption.ordinal());
if (calledFromUser) {
new Popup()
@ -439,7 +439,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
case PROVIDED:
xmrNodesInputTextField.setDisable(true);
xmrNodesLabel.setDisable(true);
if (currentBitcoinNodesOption != XmrNodes.MoneroNodesOption.PROVIDED) {
if (currentMoneroNodesOption != XmrNodes.MoneroNodesOption.PROVIDED) {
preferences.setMoneroNodesOptionOrdinal(selectedMoneroNodesOption.ordinal());
if (calledFromUser) {
showShutDownPopup();
@ -452,7 +452,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
private void applyPreventPublicXmrNetwork() {
final boolean preventPublicXmrNetwork = isPreventPublicXmrNetwork();
usePublicNodesRadio.setDisable(localBitcoinNode.shouldBeUsed() || preventPublicXmrNetwork);
usePublicNodesRadio.setDisable(localMoneroNode.shouldBeUsed() || preventPublicXmrNetwork);
if (preventPublicXmrNetwork && selectedMoneroNodesOption == XmrNodes.MoneroNodesOption.PUBLIC) {
selectedMoneroNodesOption = XmrNodes.MoneroNodesOption.PROVIDED;
preferences.setMoneroNodesOptionOrdinal(selectedMoneroNodesOption.ordinal());