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

rename core package from btc to xmr

Browse source
This commit is contained in:
woodser 2023-03-07 14:28:25 -05:00
parent e71f9a54ac
commit 5b8f9237ce
178 changed files with 357 additions and 358 deletions
Download patch file Download diff file Expand all files Collapse all files

4
desktop/src/main/java/haveno/desktop/app/HavenoApp.java
View file

@ -26,8 +26,6 @@ import haveno.common.config.Config;
import haveno.common.setup.GracefulShutDownHandler;
import haveno.common.setup.UncaughtExceptionHandler;
import haveno.common.util.Utilities;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.WalletsManager;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOffer;
import haveno.core.offer.OpenOfferManager;
@ -35,6 +33,8 @@ import haveno.core.user.Cookie;
import haveno.core.user.CookieKey;
import haveno.core.user.Preferences;
import haveno.core.user.User;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.core.xmr.wallet.WalletsManager;
import haveno.desktop.common.view.CachingViewLoader;
import haveno.desktop.common.view.View;
import haveno.desktop.common.view.ViewLoader;

2
desktop/src/main/java/haveno/desktop/components/TxIdTextField.java
View file

@ -20,10 +20,10 @@ package haveno.desktop.components;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.util.Utilities;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.user.BlockChainExplorer;
import haveno.core.user.Preferences;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.components.indicator.TxConfidenceIndicator;
import haveno.desktop.util.GUIUtil;
import com.jfoenix.controls.JFXTextField;

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

@ -30,8 +30,6 @@ import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.alert.PrivateNotificationManager;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.app.HavenoSetup;
import haveno.core.btc.nodes.LocalBitcoinNode;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.CryptoCurrency;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.Res;
@ -49,6 +47,8 @@ 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;
import haveno.desktop.components.TxIdTextField;

2
desktop/src/main/java/haveno/desktop/main/SharedPresentation.java
View file

@ -19,9 +19,9 @@ package haveno.desktop.main;
import haveno.common.UserThread;
import haveno.common.file.FileUtil;
import haveno.core.btc.wallet.WalletsManager;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOfferManager;
import haveno.core.xmr.wallet.WalletsManager;
import haveno.desktop.app.HavenoApp;
import haveno.desktop.main.overlays.popups.Popup;
import org.bitcoinj.wallet.DeterministicSeed;

2
desktop/src/main/java/haveno/desktop/main/account/content/password/PasswordView.java
View file

@ -22,8 +22,8 @@ import javax.inject.Inject;
import com.jfoenix.validation.RequiredFieldValidator;
import haveno.common.util.Tuple4;
import haveno.core.api.CoreAccountService;
import haveno.core.btc.wallet.WalletsManager;
import haveno.core.locale.Res;
import haveno.core.xmr.wallet.WalletsManager;
import haveno.desktop.Navigation;
import haveno.desktop.common.view.ActivatableView;
import haveno.desktop.common.view.FxmlView;

4
desktop/src/main/java/haveno/desktop/main/account/content/seedwords/SeedWordsView.java
View file

@ -26,11 +26,11 @@ import javax.inject.Named;
import com.google.common.base.Splitter;
import haveno.common.config.Config;
import haveno.core.btc.wallet.WalletsManager;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOfferManager;
import haveno.core.user.DontShowAgainLookup;
import haveno.core.xmr.wallet.WalletsManager;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.common.view.ActivatableView;
import haveno.desktop.common.view.FxmlView;
import haveno.desktop.main.SharedPresentation;

8
desktop/src/main/java/haveno/desktop/main/account/content/walletinfo/WalletInfoView.java
View file

@ -18,13 +18,13 @@
package haveno.desktop.main.account.content.walletinfo;
import haveno.common.config.Config;
import haveno.core.btc.listeners.BalanceListener;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.WalletService;
import haveno.core.btc.wallet.WalletsManager;
import haveno.core.locale.Res;
import haveno.core.util.FormattingUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.listeners.BalanceListener;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.core.xmr.wallet.WalletService;
import haveno.core.xmr.wallet.WalletsManager;
import haveno.desktop.common.view.ActivatableView;
import haveno.desktop.common.view.FxmlView;
import haveno.desktop.main.overlays.popups.Popup;

2
desktop/src/main/java/haveno/desktop/main/account/register/AgentRegistrationViewModel.java
View file

@ -20,11 +20,11 @@ package haveno.desktop.main.account.register;
import haveno.common.crypto.KeyRing;
import haveno.common.handlers.ErrorMessageHandler;
import haveno.common.handlers.ResultHandler;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.LanguageUtil;
import haveno.core.support.dispute.agent.DisputeAgent;
import haveno.core.support.dispute.agent.DisputeAgentManager;
import haveno.core.user.User;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.common.model.ActivatableViewModel;
import haveno.desktop.util.GUIUtil;
import haveno.network.p2p.NodeAddress;

2
desktop/src/main/java/haveno/desktop/main/account/register/arbitrator/ArbitratorRegistrationViewModel.java
View file

@ -19,10 +19,10 @@ package haveno.desktop.main.account.register.arbitrator;
import com.google.inject.Inject;
import haveno.common.crypto.KeyRing;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator;
import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import haveno.core.user.User;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.main.account.register.AgentRegistrationViewModel;
import haveno.network.p2p.P2PService;
import java.util.ArrayList;

2
desktop/src/main/java/haveno/desktop/main/account/register/mediator/MediatorRegistrationViewModel.java
View file

@ -19,10 +19,10 @@ package haveno.desktop.main.account.register.mediator;
import com.google.inject.Inject;
import haveno.common.crypto.KeyRing;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.support.dispute.mediation.mediator.Mediator;
import haveno.core.support.dispute.mediation.mediator.MediatorManager;
import haveno.core.user.User;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.main.account.register.AgentRegistrationViewModel;
import haveno.network.p2p.P2PService;
import java.util.ArrayList;

2
desktop/src/main/java/haveno/desktop/main/account/register/refundagent/RefundAgentRegistrationViewModel.java
View file

@ -20,10 +20,10 @@ package haveno.desktop.main.account.register.refundagent;
import com.google.inject.Inject;
import haveno.common.crypto.KeyRing;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.support.dispute.refund.refundagent.RefundAgent;
import haveno.core.support.dispute.refund.refundagent.RefundAgentManager;
import haveno.core.user.User;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.main.account.register.AgentRegistrationViewModel;
import haveno.network.p2p.P2PService;
import java.util.ArrayList;

6
desktop/src/main/java/haveno/desktop/main/funds/deposit/DepositListItem.java
View file

@ -19,12 +19,12 @@ package haveno.desktop.main.funds.deposit;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
import haveno.core.btc.listeners.XmrBalanceListener;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.trade.HavenoUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.listeners.XmrBalanceListener;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.components.indicator.TxConfidenceIndicator;
import haveno.desktop.util.GUIUtil;
import java.math.BigInteger;

6
desktop/src/main/java/haveno/desktop/main/funds/deposit/DepositView.java
View file

@ -22,15 +22,15 @@ import static haveno.desktop.util.FormBuilder.*;
import haveno.common.UserThread;
import haveno.common.app.DevEnv;
import haveno.common.util.Tuple3;
import haveno.core.btc.listeners.XmrBalanceListener;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.trade.HavenoUtils;
import haveno.core.user.Preferences;
import haveno.core.util.FormattingUtils;
import haveno.core.util.ParsingUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.listeners.XmrBalanceListener;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.common.view.ActivatableView;
import haveno.desktop.common.view.FxmlView;
import haveno.desktop.components.AddressTextField;

6
desktop/src/main/java/haveno/desktop/main/funds/locked/LockedListItem.java
View file

@ -17,12 +17,12 @@
package haveno.desktop.main.funds.locked;
import haveno.core.btc.listeners.BalanceListener;
import haveno.core.btc.model.AddressEntry;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.locale.Res;
import haveno.core.trade.Trade;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.listeners.BalanceListener;
import haveno.core.xmr.model.AddressEntry;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.desktop.util.DisplayUtils;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.Coin;

6
desktop/src/main/java/haveno/desktop/main/funds/locked/LockedView.java
View file

@ -26,9 +26,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.core.btc.listeners.BalanceListener;
import haveno.core.btc.model.AddressEntry;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOffer;
import haveno.core.offer.OpenOfferManager;
@ -38,6 +35,9 @@ import haveno.core.trade.TradeManager;
import haveno.core.user.Preferences;
import haveno.core.util.FormattingUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.listeners.BalanceListener;
import haveno.core.xmr.model.AddressEntry;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.desktop.common.view.ActivatableView;
import haveno.desktop.common.view.FxmlView;
import haveno.desktop.components.AutoTooltipButton;

6
desktop/src/main/java/haveno/desktop/main/funds/reserved/ReservedListItem.java
View file

@ -17,12 +17,12 @@
package haveno.desktop.main.funds.reserved;
import haveno.core.btc.listeners.BalanceListener;
import haveno.core.btc.model.AddressEntry;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOffer;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.listeners.BalanceListener;
import haveno.core.xmr.model.AddressEntry;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.desktop.components.AutoTooltipLabel;
import haveno.desktop.util.DisplayUtils;
import org.bitcoinj.core.Address;

6
desktop/src/main/java/haveno/desktop/main/funds/reserved/ReservedView.java
View file

@ -26,9 +26,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.core.btc.listeners.BalanceListener;
import haveno.core.btc.model.AddressEntry;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOffer;
import haveno.core.offer.OpenOfferManager;
@ -38,6 +35,9 @@ import haveno.core.trade.TradeManager;
import haveno.core.user.Preferences;
import haveno.core.util.FormattingUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.listeners.BalanceListener;
import haveno.core.xmr.model.AddressEntry;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.desktop.common.view.ActivatableView;
import haveno.desktop.common.view.FxmlView;
import haveno.desktop.components.AutoTooltipButton;

2
desktop/src/main/java/haveno/desktop/main/funds/transactions/DisplayedTransactions.java
View file

@ -17,8 +17,8 @@
package haveno.desktop.main.funds.transactions;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.trade.Tradable;
import haveno.core.xmr.wallet.XmrWalletService;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

2
desktop/src/main/java/haveno/desktop/main/funds/transactions/DisplayedTransactionsFactory.java
View file

@ -17,7 +17,7 @@
package haveno.desktop.main.funds.transactions;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.xmr.wallet.XmrWalletService;
import javax.inject.Inject;
import javax.inject.Singleton;

2
desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionAwareTradableFactory.java
View file

@ -18,12 +18,12 @@
package haveno.desktop.main.funds.transactions;
import haveno.common.crypto.PubKeyRingProvider;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.OpenOffer;
import haveno.core.support.dispute.arbitration.ArbitrationManager;
import haveno.core.support.dispute.refund.RefundManager;
import haveno.core.trade.Tradable;
import haveno.core.trade.Trade;
import haveno.core.xmr.wallet.XmrWalletService;
import javax.inject.Inject;
import javax.inject.Singleton;

2
desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionAwareTrade.java
View file

@ -18,13 +18,13 @@
package haveno.desktop.main.funds.transactions;
import haveno.common.crypto.PubKeyRing;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.support.dispute.Dispute;
import haveno.core.support.dispute.arbitration.ArbitrationManager;
import haveno.core.support.dispute.refund.RefundManager;
import haveno.core.trade.Tradable;
import haveno.core.trade.Trade;
import haveno.core.xmr.wallet.XmrWalletService;
import javafx.collections.ObservableList;
import java.util.Optional;

2
desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionListItemFactory.java
View file

@ -20,10 +20,10 @@ package haveno.desktop.main.funds.transactions;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.user.Preferences;
import haveno.core.util.FormattingUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.wallet.XmrWalletService;
import javax.annotation.Nullable;

2
desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsListItem.java
View file

@ -19,13 +19,13 @@ package haveno.desktop.main.funds.transactions;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.Offer;
import haveno.core.offer.OpenOffer;
import haveno.core.trade.HavenoUtils;
import haveno.core.trade.Tradable;
import haveno.core.trade.Trade;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.components.indicator.TxConfidenceIndicator;
import haveno.desktop.util.DisplayUtils;
import haveno.desktop.util.GUIUtil;

2
desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsView.java
View file

@ -24,11 +24,11 @@ import monero.wallet.model.MoneroWalletListener;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.util.Utilities;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOffer;
import haveno.core.trade.Trade;
import haveno.core.user.Preferences;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.common.view.ActivatableView;
import haveno.desktop.common.view.FxmlView;
import haveno.desktop.components.AddressWithIconAndDirection;

6
desktop/src/main/java/haveno/desktop/main/funds/withdrawal/WithdrawalListItem.java
View file

@ -17,12 +17,12 @@
package haveno.desktop.main.funds.withdrawal;
import haveno.core.btc.listeners.XmrBalanceListener;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.trade.HavenoUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.listeners.XmrBalanceListener;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.components.AutoTooltipLabel;
import javafx.scene.control.Label;

8
desktop/src/main/java/haveno/desktop/main/funds/withdrawal/WithdrawalView.java
View file

@ -20,16 +20,16 @@ package haveno.desktop.main.funds.withdrawal;
import static haveno.desktop.util.FormBuilder.*;
import haveno.common.util.Tuple2;
import haveno.core.btc.listeners.XmrBalanceListener;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.trade.HavenoUtils;
import haveno.core.trade.Trade;
import haveno.core.trade.TradeManager;
import haveno.core.user.DontShowAgainLookup;
import haveno.core.util.validation.BtcAddressValidator;
import haveno.core.xmr.listeners.XmrBalanceListener;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.core.xmr.setup.WalletsSetup;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.common.view.ActivatableView;
import haveno.desktop.common.view.FxmlView;
import haveno.desktop.components.InputTextField;

8
desktop/src/main/java/haveno/desktop/main/offer/MutableOfferDataModel.java
View file

@ -23,10 +23,6 @@ import haveno.common.handlers.ErrorMessageHandler;
import haveno.common.util.MathUtils;
import haveno.common.util.Utilities;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.btc.listeners.XmrBalanceListener;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.btc.wallet.Restrictions;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.TradeCurrency;
import haveno.core.monetary.Price;
@ -48,6 +44,10 @@ import haveno.core.util.FormattingUtils;
import haveno.core.util.VolumeUtil;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.coin.CoinUtil;
import haveno.core.xmr.listeners.XmrBalanceListener;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.core.xmr.wallet.Restrictions;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.Navigation;
import haveno.desktop.util.DisplayUtils;
import haveno.desktop.util.GUIUtil;

2
desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java
View file

@ -21,7 +21,6 @@ import haveno.common.UserThread;
import haveno.common.app.DevEnv;
import haveno.common.util.MathUtils;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.btc.wallet.Restrictions;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
@ -51,6 +50,7 @@ import haveno.core.util.validation.AltcoinValidator;
import haveno.core.util.validation.FiatPriceValidator;
import haveno.core.util.validation.InputValidator;
import haveno.core.util.validation.MonetaryValidator;
import haveno.core.xmr.wallet.Restrictions;
import haveno.desktop.Navigation;
import haveno.desktop.common.model.ActivatableWithDataModel;
import haveno.desktop.main.MainView;

4
desktop/src/main/java/haveno/desktop/main/offer/OfferDataModel.java
View file

@ -17,9 +17,9 @@
package haveno.desktop.main.offer;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.OfferUtil;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.common.model.ActivatableDataModel;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty;

2
desktop/src/main/java/haveno/desktop/main/offer/OfferViewUtil.java
View file

@ -19,13 +19,13 @@ package haveno.desktop.main.offer;
import haveno.common.UserThread;
import haveno.common.util.Tuple2;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.CryptoCurrency;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferDirection;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.Navigation;
import haveno.desktop.components.AutoTooltipButton;
import haveno.desktop.components.AutoTooltipLabel;

2
desktop/src/main/java/haveno/desktop/main/offer/createoffer/CreateOfferDataModel.java
View file

@ -19,7 +19,6 @@ package haveno.desktop.main.offer.createoffer;
import com.google.inject.Inject;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.CreateOfferService;
import haveno.core.offer.OfferUtil;
import haveno.core.offer.OpenOfferManager;
@ -30,6 +29,7 @@ import haveno.core.user.Preferences;
import haveno.core.user.User;
import haveno.core.util.FormattingUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.Navigation;
import haveno.desktop.main.offer.MutableOfferDataModel;
import haveno.network.p2p.P2PService;

2
desktop/src/main/java/haveno/desktop/main/offer/offerbook/BtcOfferBookViewModel.java
View file

@ -20,7 +20,6 @@ package haveno.desktop.main.offer.offerbook;
import com.google.inject.Inject;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.api.CoreApi;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.locale.CryptoCurrency;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.GlobalSettings;
@ -38,6 +37,7 @@ import haveno.core.user.User;
import haveno.core.util.FormattingUtils;
import haveno.core.util.PriceUtil;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.setup.WalletsSetup;
import haveno.desktop.Navigation;
import haveno.desktop.util.GUIUtil;
import haveno.network.p2p.P2PService;

2
desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookViewModel.java
View file

@ -22,7 +22,6 @@ import haveno.common.handlers.ErrorMessageHandler;
import haveno.common.handlers.ResultHandler;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.api.CoreApi;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.locale.BankUtil;
import haveno.core.locale.CountryUtil;
import haveno.core.locale.CryptoCurrency;
@ -49,6 +48,7 @@ import haveno.core.util.FormattingUtils;
import haveno.core.util.PriceUtil;
import haveno.core.util.VolumeUtil;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.setup.WalletsSetup;
import haveno.desktop.Navigation;
import haveno.desktop.common.model.ActivatableViewModel;
import haveno.desktop.main.MainView;

2
desktop/src/main/java/haveno/desktop/main/offer/offerbook/OtherOfferBookViewModel.java
View file

@ -20,7 +20,6 @@ package haveno.desktop.main.offer.offerbook;
import com.google.inject.Inject;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.api.CoreApi;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.locale.CryptoCurrency;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.GlobalSettings;
@ -37,6 +36,7 @@ import haveno.core.user.User;
import haveno.core.util.FormattingUtils;
import haveno.core.util.PriceUtil;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.setup.WalletsSetup;
import haveno.desktop.Navigation;
import haveno.desktop.main.offer.OfferViewUtil;
import haveno.desktop.util.GUIUtil;

2
desktop/src/main/java/haveno/desktop/main/offer/offerbook/TopAltcoinOfferBookViewModel.java
View file

@ -20,7 +20,6 @@ package haveno.desktop.main.offer.offerbook;
import com.google.inject.Inject;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.api.CoreApi;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.locale.TradeCurrency;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferDirection;
@ -34,6 +33,7 @@ import haveno.core.user.User;
import haveno.core.util.FormattingUtils;
import haveno.core.util.PriceUtil;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.setup.WalletsSetup;
import haveno.desktop.Navigation;
import haveno.desktop.util.GUIUtil;
import haveno.network.p2p.P2PService;

6
desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferDataModel.java
View file

@ -20,9 +20,6 @@ package haveno.desktop.main.offer.takeoffer;
import com.google.inject.Inject;
import haveno.common.handlers.ErrorMessageHandler;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.btc.listeners.XmrBalanceListener;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.filter.FilterManager;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.Res;
@ -42,6 +39,9 @@ import haveno.core.trade.handlers.TradeResultHandler;
import haveno.core.user.Preferences;
import haveno.core.user.User;
import haveno.core.util.VolumeUtil;
import haveno.core.xmr.listeners.XmrBalanceListener;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.Navigation;
import haveno.desktop.main.offer.OfferDataModel;
import haveno.desktop.main.offer.offerbook.OfferBook;

2
desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferViewModel.java
View file

@ -19,7 +19,6 @@ package haveno.desktop.main.offer.takeoffer;
import haveno.common.UserThread;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.btc.wallet.Restrictions;
import haveno.core.locale.Res;
import haveno.core.monetary.Price;
import haveno.core.offer.Offer;
@ -36,6 +35,7 @@ import haveno.core.util.VolumeUtil;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.coin.CoinUtil;
import haveno.core.util.validation.InputValidator;
import haveno.core.xmr.wallet.Restrictions;
import haveno.desktop.Navigation;
import haveno.desktop.common.model.ActivatableWithDataModel;
import haveno.desktop.common.model.ViewModel;

4
desktop/src/main/java/haveno/desktop/main/overlays/windows/BtcEmptyWalletWindow.java
View file

@ -11,12 +11,12 @@ import org.bitcoinj.core.InsufficientMoneyException;
import com.google.inject.Inject;
import haveno.common.UserThread;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.Restrictions;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOfferManager;
import haveno.core.util.FormattingUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.core.xmr.wallet.Restrictions;
import haveno.desktop.components.AutoTooltipButton;
import haveno.desktop.components.InputTextField;
import haveno.desktop.main.overlays.Overlay;

4
desktop/src/main/java/haveno/desktop/main/overlays/windows/DisputeSummaryWindow.java
View file

@ -27,8 +27,6 @@ import haveno.common.handlers.ResultHandler;
import haveno.common.util.Tuple2;
import haveno.common.util.Tuple3;
import haveno.core.api.CoreDisputesService;
import haveno.core.btc.wallet.TradeWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.support.SupportType;
import haveno.core.support.dispute.Dispute;
@ -45,6 +43,8 @@ import haveno.core.trade.TradeManager;
import haveno.core.util.FormattingUtils;
import haveno.core.util.VolumeUtil;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.wallet.TradeWalletService;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.components.AutoTooltipRadioButton;
import haveno.desktop.components.HavenoTextArea;
import haveno.desktop.components.InputTextField;

12
desktop/src/main/java/haveno/desktop/main/overlays/windows/ManualPayoutTxWindow.java
View file

@ -39,12 +39,6 @@ import haveno.common.util.Base64;
import haveno.common.util.Tuple2;
import haveno.common.util.Utilities;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.btc.exceptions.TransactionVerificationException;
import haveno.core.btc.exceptions.TxBroadcastException;
import haveno.core.btc.exceptions.WalletException;
import haveno.core.btc.wallet.TradeWalletService;
import haveno.core.btc.wallet.TxBroadcaster;
import haveno.core.btc.wallet.WalletsManager;
import haveno.core.locale.Res;
import haveno.core.payment.validation.LengthValidator;
import haveno.core.payment.validation.PercentageNumberValidator;
@ -52,6 +46,12 @@ import haveno.core.support.dispute.Dispute;
import haveno.core.support.dispute.mediation.MediationManager;
import haveno.core.user.BlockChainExplorer;
import haveno.core.user.Preferences;
import haveno.core.xmr.exceptions.TransactionVerificationException;
import haveno.core.xmr.exceptions.TxBroadcastException;
import haveno.core.xmr.exceptions.WalletException;
import haveno.core.xmr.wallet.TradeWalletService;
import haveno.core.xmr.wallet.TxBroadcaster;
import haveno.core.xmr.wallet.WalletsManager;
import haveno.desktop.components.AutoTooltipButton;
import haveno.desktop.components.HavenoTextArea;
import haveno.desktop.components.InputTextField;

2
desktop/src/main/java/haveno/desktop/main/overlays/windows/ShowWalletDataWindow.java
View file

@ -22,8 +22,8 @@ import static haveno.desktop.util.FormBuilder.addTopLabelTextArea;
import haveno.common.util.Tuple2;
import haveno.common.util.Utilities;
import haveno.core.btc.wallet.WalletsManager;
import haveno.core.locale.Res;
import haveno.core.xmr.wallet.WalletsManager;
import haveno.desktop.main.overlays.Overlay;
import javafx.scene.Scene;
import javafx.scene.control.CheckBox;

2
desktop/src/main/java/haveno/desktop/main/overlays/windows/TradeDetailsWindow.java
View file

@ -21,7 +21,6 @@ import haveno.common.UserThread;
import haveno.common.util.Tuple3;
import haveno.common.util.Utilities;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.Offer;
import haveno.core.payment.payload.PaymentAccountPayload;
@ -34,6 +33,7 @@ import haveno.core.trade.txproof.AssetTxProofResult;
import haveno.core.util.FormattingUtils;
import haveno.core.util.VolumeUtil;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.desktop.components.HavenoTextArea;
import haveno.desktop.main.MainView;
import haveno.desktop.main.overlays.Overlay;

2
desktop/src/main/java/haveno/desktop/main/overlays/windows/WalletPasswordWindow.java
View file

@ -29,9 +29,9 @@ import haveno.common.config.Config;
import haveno.common.crypto.IncorrectPasswordException;
import haveno.common.util.Tuple2;
import haveno.core.api.CoreAccountService;
import haveno.core.btc.wallet.WalletsManager;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOfferManager;
import haveno.core.xmr.wallet.WalletsManager;
import haveno.desktop.components.AutoTooltipButton;
import haveno.desktop.components.AutoTooltipLabel;
import haveno.desktop.components.BusyAnimation;

4
desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java
View file

@ -20,8 +20,6 @@ package haveno.desktop.main.portfolio.duplicateoffer;
import com.google.inject.Inject;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.btc.wallet.Restrictions;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.TradeCurrency;
import haveno.core.offer.CreateOfferService;
@ -36,6 +34,8 @@ import haveno.core.user.User;
import haveno.core.util.FormattingUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.coin.CoinUtil;
import haveno.core.xmr.wallet.Restrictions;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.Navigation;
import haveno.desktop.main.offer.MutableOfferDataModel;
import haveno.network.p2p.P2PService;

4
desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferDataModel.java
View file

@ -22,8 +22,6 @@ import com.google.inject.Inject;
import haveno.common.handlers.ErrorMessageHandler;
import haveno.common.handlers.ResultHandler;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.btc.wallet.Restrictions;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.TradeCurrency;
import haveno.core.offer.CreateOfferService;
@ -42,6 +40,8 @@ import haveno.core.user.User;
import haveno.core.util.FormattingUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.coin.CoinUtil;
import haveno.core.xmr.wallet.Restrictions;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.Navigation;
import haveno.desktop.main.offer.MutableOfferDataModel;
import haveno.network.p2p.P2PService;

2
desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesView.java
View file

@ -23,12 +23,12 @@ import javax.inject.Inject;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.util.Utilities;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.Offer;
import haveno.core.trade.Contract;
import haveno.core.trade.HavenoUtils;
import haveno.core.trade.Trade;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.common.view.ActivatableViewAndModel;
import haveno.desktop.common.view.FxmlView;
import haveno.desktop.components.AutoTooltipButton;

2
desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
View file

@ -29,7 +29,6 @@ import haveno.common.handlers.ResultHandler;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.api.CoreDisputesService;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferDirection;
@ -52,6 +51,7 @@ import haveno.core.trade.protocol.SellerProtocol;
import haveno.core.user.Preferences;
import haveno.core.util.FormattingUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.Navigation;
import haveno.desktop.common.model.ActivatableDataModel;
import haveno.desktop.main.MainView;

2
desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
View file

@ -22,7 +22,6 @@ import haveno.common.ClockWatcher;
import haveno.common.UserThread;
import haveno.common.app.DevEnv;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.btc.wallet.Restrictions;
import haveno.core.network.MessageState;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferUtil;
@ -39,6 +38,7 @@ import haveno.core.util.FormattingUtils;
import haveno.core.util.VolumeUtil;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.BtcAddressValidator;
import haveno.core.xmr.wallet.Restrictions;
import haveno.desktop.Navigation;
import haveno.desktop.common.model.ActivatableWithDataModel;
import haveno.desktop.common.model.ViewModel;

2
desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java
View file

@ -22,10 +22,10 @@ import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import com.jfoenix.controls.JFXBadge;
import haveno.common.UserThread;
import haveno.common.app.DevEnv;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.locale.Res;
import haveno.core.trade.txproof.AssetTxProofResult;
import haveno.core.user.DontShowAgainLookup;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.desktop.components.AutoTooltipButton;
import haveno.desktop.components.TitledGroupBg;
import haveno.desktop.main.MainView;

2
desktop/src/main/java/haveno/desktop/main/presentation/MarketPricePresentation.java
View file

@ -18,7 +18,6 @@
package haveno.desktop.main.presentation;
import haveno.common.UserThread;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
@ -26,6 +25,7 @@ import haveno.core.provider.price.MarketPrice;
import haveno.core.provider.price.PriceFeedService;
import haveno.core.user.Preferences;
import haveno.core.util.FormattingUtils;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.components.TxIdTextField;
import haveno.desktop.main.shared.PriceFeedComboBoxItem;
import haveno.desktop.util.GUIUtil;

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

@ -20,9 +20,6 @@ package haveno.desktop.main.settings.network;
import haveno.common.ClockWatcher;
import haveno.common.UserThread;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.btc.nodes.BtcNodes;
import haveno.core.btc.nodes.LocalBitcoinNode;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.filter.Filter;
import haveno.core.filter.FilterManager;
import haveno.core.locale.Res;
@ -30,6 +27,9 @@ import haveno.core.user.Preferences;
import haveno.core.util.FormattingUtils;
import haveno.core.util.validation.RegexValidator;
import haveno.core.util.validation.RegexValidatorFactory;
import haveno.core.xmr.nodes.BtcNodes;
import haveno.core.xmr.nodes.LocalBitcoinNode;
import haveno.core.xmr.setup.WalletsSetup;
import haveno.desktop.app.HavenoApp;
import haveno.desktop.common.view.ActivatableView;
import haveno.desktop.common.view.FxmlView;

2
desktop/src/main/java/haveno/desktop/main/settings/preferences/PreferencesView.java
View file

@ -25,7 +25,6 @@ import haveno.common.config.Config;
import haveno.common.util.Tuple2;
import haveno.common.util.Tuple3;
import haveno.common.util.Utilities;
import haveno.core.btc.wallet.Restrictions;
import haveno.core.filter.Filter;
import haveno.core.filter.FilterManager;
import haveno.core.locale.Country;
@ -48,6 +47,7 @@ import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.IntegerValidator;
import haveno.core.util.validation.RegexValidator;
import haveno.core.util.validation.RegexValidatorFactory;
import haveno.core.xmr.wallet.Restrictions;
import haveno.desktop.common.view.ActivatableViewAndModel;
import haveno.desktop.common.view.FxmlView;
import haveno.desktop.components.AutoTooltipButton;

2
desktop/src/main/java/haveno/desktop/main/support/dispute/agent/SignedOfferView.java
View file

@ -18,11 +18,11 @@
package haveno.desktop.main.support.dispute.agent;
import haveno.common.UserThread;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOfferManager;
import haveno.core.offer.SignedOffer;
import haveno.core.trade.HavenoUtils;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.common.view.ActivatableView;
import haveno.desktop.common.view.FxmlView;
import haveno.desktop.components.AutoTooltipLabel;

2
desktop/src/main/java/haveno/desktop/util/GUIUtil.java
View file

@ -49,7 +49,6 @@ import haveno.core.account.witness.AccountAgeWitness;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.app.HavenoSetup;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Country;
import haveno.core.locale.CountryUtil;
import haveno.core.locale.CurrencyUtil;
@ -64,6 +63,7 @@ import haveno.core.user.Preferences;
import haveno.core.user.User;
import haveno.core.util.FormattingUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.Navigation;
import haveno.desktop.app.HavenoApp;
import haveno.desktop.components.AutoTooltipLabel;