nihilist/haveno-reto
1
0
Fork 0
mirror of https://github.com/retoaccess1/haveno-reto.git synced 2024-09-20 04:46:24 +02:00
Code Issues Packages Projects Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apitest/src/test/java/haveno/apitest/method/MethodTest.java
View File

@ -47,7 +47,7 @@ import javax.annotation.Nullable;
import static haveno.apitest.config.ApiTestConfig.BTC;
import static haveno.apitest.config.ApiTestRateMeterInterceptorConfig.getTestRateMeterInterceptorConfig;
import static haveno.cli.table.builder.TableType.BTC_BALANCE_TBL;
import static haveno.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent;
import static haveno.core.xmr.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent;
import static java.lang.String.format;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Arrays.stream;

2
core/src/main/java/haveno/core/api/CoreDisputeAgentsService.java
View File

@ -21,7 +21,6 @@ import haveno.common.config.Config;
import haveno.common.crypto.KeyRing;
import haveno.common.handlers.ErrorMessageHandler;
import haveno.common.handlers.ResultHandler;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.support.SupportType;
import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator;
import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
@ -30,6 +29,7 @@ import haveno.core.support.dispute.mediation.mediator.MediatorManager;
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.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;
import org.bitcoinj.core.ECKey;

2
core/src/main/java/haveno/core/api/CoreDisputesService.java
View File

@ -5,7 +5,6 @@ import haveno.common.crypto.KeyRing;
import haveno.common.crypto.PubKeyRing;
import haveno.common.handlers.FaultHandler;
import haveno.common.handlers.ResultHandler;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferDirection;
@ -23,6 +22,7 @@ import haveno.core.trade.Trade;
import haveno.core.trade.TradeManager;
import haveno.core.util.FormattingUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.wallet.XmrWalletService;
import javax.inject.Inject;
import javax.inject.Singleton;

6
core/src/main/java/haveno/core/api/CoreMoneroConnectionsService.java
View File

@ -3,10 +3,10 @@ package haveno.core.api;
import haveno.common.app.DevEnv;
import haveno.common.config.BaseCurrencyNetwork;
import haveno.common.config.Config;
import haveno.core.btc.model.EncryptedConnectionList;
import haveno.core.btc.setup.DownloadListener;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.trade.HavenoUtils;
import haveno.core.xmr.model.EncryptedConnectionList;
import haveno.core.xmr.setup.DownloadListener;
import haveno.core.xmr.setup.WalletsSetup;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;

6
core/src/main/java/haveno/core/api/CoreTradesService.java
View File

@ -19,8 +19,6 @@ package haveno.core.api;
import haveno.common.handlers.ErrorMessageHandler;
import haveno.common.handlers.ResultHandler;
import haveno.core.btc.model.AddressEntry;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.offer.Offer;
import haveno.core.offer.takeoffer.TakeOfferModel;
import haveno.core.support.messages.ChatMessage;
@ -35,6 +33,8 @@ import haveno.core.trade.protocol.BuyerProtocol;
import haveno.core.trade.protocol.SellerProtocol;
import haveno.core.user.User;
import haveno.core.util.validation.BtcAddressValidator;
import haveno.core.xmr.model.AddressEntry;
import haveno.core.xmr.wallet.BtcWalletService;
import org.bitcoinj.core.Coin;
import javax.inject.Inject;
@ -46,7 +46,7 @@ import java.util.function.Consumer;
import lombok.extern.slf4j.Slf4j;
import static haveno.core.btc.model.AddressEntry.Context.TRADE_PAYOUT;
import static haveno.core.xmr.model.AddressEntry.Context.TRADE_PAYOUT;
import static java.lang.String.format;
import java.math.BigInteger;

18
core/src/main/java/haveno/core/api/CoreWalletsService.java
View File

@ -40,17 +40,17 @@ import haveno.core.api.model.BalancesInfo;
import haveno.core.api.model.BtcBalanceInfo;
import haveno.core.api.model.XmrBalanceInfo;
import haveno.core.app.AppStartupState;
import haveno.core.btc.Balances;
import haveno.core.btc.exceptions.AddressEntryException;
import haveno.core.btc.exceptions.InsufficientFundsException;
import haveno.core.btc.model.AddressEntry;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.WalletsManager;
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.Balances;
import haveno.core.xmr.exceptions.AddressEntryException;
import haveno.core.xmr.exceptions.InsufficientFundsException;
import haveno.core.xmr.model.AddressEntry;
import haveno.core.xmr.setup.WalletsSetup;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.core.xmr.wallet.WalletsManager;
import haveno.core.xmr.wallet.XmrWalletService;
import org.bouncycastle.crypto.params.KeyParameter;
import java.util.List;
@ -63,8 +63,8 @@ import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable;
import static haveno.core.btc.wallet.Restrictions.getMinNonDustOutput;
import static haveno.core.util.ParsingUtils.parseToCoin;
import static haveno.core.xmr.wallet.Restrictions.getMinNonDustOutput;
import static java.lang.String.format;
import static java.util.concurrent.TimeUnit.SECONDS;

4
core/src/main/java/haveno/core/app/CoreModule.java
View File

@ -23,7 +23,6 @@ import haveno.common.config.Config;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.common.proto.persistable.PersistenceProtoResolver;
import haveno.core.alert.AlertModule;
import haveno.core.btc.MoneroModule;
import haveno.core.filter.FilterModule;
import haveno.core.network.CoreNetworkFilter;
import haveno.core.network.p2p.seed.DefaultSeedNodeRepository;
@ -36,7 +35,8 @@ import haveno.core.user.Preferences;
import haveno.core.util.FormattingUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.coin.ImmutableCoinFormatter;
import haveno.core.xmr.connection.MoneroConnectionModule;
import haveno.core.xmr.MoneroConnectionModule;
import haveno.core.xmr.MoneroModule;
import haveno.network.crypto.EncryptionServiceModule;
import haveno.network.p2p.P2PModule;
import haveno.network.p2p.network.BridgeAddressProvider;

2
core/src/main/java/haveno/core/app/DomainInitialisation.java
View File

@ -24,7 +24,6 @@ import haveno.core.account.sign.SignedWitnessService;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.alert.PrivateNotificationManager;
import haveno.core.alert.PrivateNotificationPayload;
import haveno.core.btc.Balances;
import haveno.core.filter.FilterManager;
import haveno.core.notifications.MobileNotificationService;
import haveno.core.notifications.alerts.DisputeMsgEvents;
@ -51,6 +50,7 @@ import haveno.core.trade.failed.FailedTradesManager;
import haveno.core.trade.statistics.TradeStatisticsManager;
import haveno.core.trade.txproof.xmr.XmrTxProofService;
import haveno.core.user.User;
import haveno.core.xmr.Balances;
import haveno.network.p2p.P2PService;
import javax.inject.Inject;

6
core/src/main/java/haveno/core/app/HavenoExecutable.java
View File

@ -34,9 +34,6 @@ import haveno.common.setup.UncaughtExceptionHandler;
import haveno.common.util.Utilities;
import haveno.core.api.AccountServiceListener;
import haveno.core.api.CoreAccountService;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.OpenOfferManager;
import haveno.core.provider.price.PriceFeedService;
import haveno.core.setup.CorePersistedDataHost;
@ -46,6 +43,9 @@ import haveno.core.trade.HavenoUtils;
import haveno.core.trade.TradeManager;
import haveno.core.trade.statistics.TradeStatisticsManager;
import haveno.core.trade.txproof.xmr.XmrTxProofService;
import haveno.core.xmr.setup.WalletsSetup;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.P2PService;
import java.io.Console;

14
core/src/main/java/haveno/core/app/HavenoSetup.java
View File

@ -69,13 +69,6 @@ import haveno.core.alert.AlertManager;
import haveno.core.alert.PrivateNotificationManager;
import haveno.core.alert.PrivateNotificationPayload;
import haveno.core.api.CoreMoneroNodeService;
import haveno.core.btc.model.AddressEntry;
import haveno.core.btc.nodes.LocalBitcoinNode;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.WalletsManager;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.btc.wallet.http.MemPoolSpaceTxBroadcaster;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOfferManager;
import haveno.core.payment.AmazonGiftCardAccount;
@ -92,6 +85,13 @@ 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.model.AddressEntry;
import haveno.core.xmr.nodes.LocalBitcoinNode;
import haveno.core.xmr.setup.WalletsSetup;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.core.xmr.wallet.WalletsManager;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.core.xmr.wallet.http.MemPoolSpaceTxBroadcaster;
import haveno.network.Socks5ProxyProvider;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;

8
core/src/main/java/haveno/core/app/WalletAppSetup.java
View File

@ -21,15 +21,15 @@ import haveno.common.UserThread;
import haveno.common.config.Config;
import haveno.core.api.CoreContext;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.btc.exceptions.InvalidHostException;
import haveno.core.btc.exceptions.RejectedTxException;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.btc.wallet.WalletsManager;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOfferManager;
import haveno.core.trade.TradeManager;
import haveno.core.user.Preferences;
import haveno.core.util.FormattingUtils;
import haveno.core.xmr.exceptions.InvalidHostException;
import haveno.core.xmr.exceptions.RejectedTxException;
import haveno.core.xmr.setup.WalletsSetup;
import haveno.core.xmr.wallet.WalletsManager;
import org.bitcoinj.core.RejectMessage;
import org.bitcoinj.core.VersionMessage;
import org.bitcoinj.store.BlockStoreException;

6
core/src/main/java/haveno/core/app/misc/ExecutableForAppWithP2p.java
View File

@ -27,11 +27,11 @@ import haveno.common.persistence.PersistenceManager;
import haveno.common.setup.GracefulShutDownHandler;
import haveno.common.util.Profiler;
import haveno.core.app.HavenoExecutable;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.OpenOfferManager;
import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import haveno.core.xmr.setup.WalletsSetup;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;
import haveno.network.p2p.seed.SeedNodeRepository;

4
core/src/main/java/haveno/core/app/misc/ModuleForAppWithP2p.java
View File

@ -27,7 +27,6 @@ import haveno.common.proto.network.NetworkProtoResolver;
import haveno.common.proto.persistable.PersistenceProtoResolver;
import haveno.core.alert.AlertModule;
import haveno.core.app.TorSetup;
import haveno.core.btc.MoneroModule;
import haveno.core.filter.FilterModule;
import haveno.core.network.CoreNetworkFilter;
import haveno.core.network.p2p.seed.DefaultSeedNodeRepository;
@ -37,7 +36,8 @@ import haveno.core.proto.persistable.CorePersistenceProtoResolver;
import haveno.core.trade.TradeModule;
import haveno.core.user.Preferences;
import haveno.core.user.User;
import haveno.core.xmr.connection.MoneroConnectionModule;
import haveno.core.xmr.MoneroConnectionModule;
import haveno.core.xmr.MoneroModule;
import haveno.network.crypto.EncryptionServiceModule;
import haveno.network.p2p.P2PModule;
import haveno.network.p2p.network.BridgeAddressProvider;

2
core/src/main/java/haveno/core/filter/FilterManager.java
View File

@ -22,13 +22,13 @@ import haveno.common.app.Version;
import haveno.common.config.Config;
import haveno.common.config.ConfigFileEditor;
import haveno.common.crypto.KeyRing;
import haveno.core.btc.nodes.BtcNodes;
import haveno.core.locale.Res;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.payload.PaymentMethod;
import haveno.core.provider.ProvidersRepository;
import haveno.core.user.Preferences;
import haveno.core.user.User;
import haveno.core.xmr.nodes.BtcNodes;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;
import haveno.network.p2p.P2PServiceListener;

4
core/src/main/java/haveno/core/offer/CreateOfferService.java
View File

@ -22,8 +22,6 @@ import static haveno.core.payment.payload.PaymentMethod.HAL_CASH_ID;
import haveno.common.app.Version;
import haveno.common.crypto.PubKeyRingProvider;
import haveno.common.util.Utilities;
import haveno.core.btc.wallet.Restrictions;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.Res;
import haveno.core.monetary.Price;
@ -37,6 +35,8 @@ import haveno.core.trade.statistics.TradeStatisticsManager;
import haveno.core.user.Preferences;
import haveno.core.user.User;
import haveno.core.util.coin.CoinUtil;
import haveno.core.xmr.wallet.Restrictions;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;

4
core/src/main/java/haveno/core/offer/OfferBookService.java
View File

@ -24,12 +24,12 @@ import haveno.common.file.JsonFileManager;
import haveno.common.handlers.ErrorMessageHandler;
import haveno.common.handlers.ResultHandler;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.btc.wallet.MoneroKeyImageListener;
import haveno.core.btc.wallet.MoneroKeyImagePoller;
import haveno.core.filter.FilterManager;
import haveno.core.locale.Res;
import haveno.core.provider.price.PriceFeedService;
import haveno.core.util.JsonUtil;
import haveno.core.xmr.wallet.MoneroKeyImageListener;
import haveno.core.xmr.wallet.MoneroKeyImagePoller;
import haveno.network.p2p.BootstrapListener;
import haveno.network.p2p.P2PService;
import haveno.network.p2p.storage.HashMapChangedListener;

6
core/src/main/java/haveno/core/offer/OfferUtil.java
View File

@ -22,7 +22,6 @@ import haveno.common.app.Version;
import haveno.common.util.MathUtils;
import haveno.common.util.Utilities;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.filter.FilterManager;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.Res;
@ -37,6 +36,7 @@ import haveno.core.trade.statistics.ReferralIdService;
import haveno.core.user.AutoConfirmSettings;
import haveno.core.user.Preferences;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.network.p2p.P2PService;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.TransactionInput;
@ -58,9 +58,9 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static haveno.common.util.MathUtils.roundDoubleToLong;
import static haveno.common.util.MathUtils.scaleUpByPowerOf10;
import static haveno.core.btc.wallet.Restrictions.getMaxBuyerSecurityDepositAsPercent;
import static haveno.core.btc.wallet.Restrictions.getMinBuyerSecurityDepositAsPercent;
import static haveno.core.offer.OfferPayload.*;
import static haveno.core.xmr.wallet.Restrictions.getMaxBuyerSecurityDepositAsPercent;
import static haveno.core.xmr.wallet.Restrictions.getMinBuyerSecurityDepositAsPercent;
/**
* This class holds utility methods for creating, editing and taking an Offer.

10
core/src/main/java/haveno/core/offer/OpenOfferManager.java
View File

@ -35,11 +35,6 @@ import haveno.common.util.Tuple2;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.api.CoreContext;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.MoneroKeyImageListener;
import haveno.core.btc.wallet.MoneroKeyImagePoller;
import haveno.core.btc.wallet.TradeWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.exceptions.TradePriceOutOfToleranceException;
import haveno.core.filter.FilterManager;
import haveno.core.offer.OfferBookService.OfferBookChangedListener;
@ -62,6 +57,11 @@ import haveno.core.user.Preferences;
import haveno.core.user.User;
import haveno.core.util.JsonUtil;
import haveno.core.util.Validator;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.core.xmr.wallet.MoneroKeyImageListener;
import haveno.core.xmr.wallet.MoneroKeyImagePoller;
import haveno.core.xmr.wallet.TradeWalletService;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.AckMessage;
import haveno.network.p2p.AckMessageSourceType;
import haveno.network.p2p.BootstrapListener;

2
core/src/main/java/haveno/core/offer/availability/OfferAvailabilityModel.java
View File

@ -19,7 +19,6 @@ package haveno.core.offer.availability;
import haveno.common.crypto.PubKeyRing;
import haveno.common.taskrunner.Model;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferUtil;
import haveno.core.offer.messages.OfferAvailabilityResponse;
@ -27,6 +26,7 @@ import haveno.core.support.dispute.mediation.mediator.MediatorManager;
import haveno.core.trade.messages.InitTradeRequest;
import haveno.core.trade.statistics.TradeStatisticsManager;
import haveno.core.user.User;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;
import lombok.Getter;

4
core/src/main/java/haveno/core/offer/availability/tasks/SendOfferAvailabilityRequest.java
View File

@ -22,8 +22,6 @@ import haveno.common.app.Version;
import haveno.common.crypto.Sig;
import haveno.common.taskrunner.Task;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.monetary.Price;
import haveno.core.offer.Offer;
import haveno.core.offer.availability.OfferAvailabilityModel;
@ -31,6 +29,8 @@ import haveno.core.offer.messages.OfferAvailabilityRequest;
import haveno.core.trade.HavenoUtils;
import haveno.core.trade.messages.InitTradeRequest;
import haveno.core.user.User;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.P2PService;
import haveno.network.p2p.SendDirectMessageListener;
import java.util.Date;

6
core/src/main/java/haveno/core/offer/placeoffer/PlaceOfferModel.java
View File

@ -20,9 +20,6 @@ package haveno.core.offer.placeoffer;
import haveno.common.crypto.KeyRing;
import haveno.common.taskrunner.Model;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.TradeWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.filter.FilterManager;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferBookService;
@ -31,6 +28,9 @@ import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import haveno.core.support.dispute.mediation.mediator.MediatorManager;
import haveno.core.trade.statistics.TradeStatisticsManager;
import haveno.core.user.User;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.core.xmr.wallet.TradeWalletService;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.P2PService;
import java.math.BigInteger;

12
core/src/main/java/haveno/core/offer/placeoffer/tasks/CreateMakerFeeTx.java
View File

@ -21,14 +21,14 @@ package haveno.core.offer.placeoffer.tasks;
import haveno.common.UserThread;
import haveno.common.taskrunner.Task;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.btc.exceptions.TxBroadcastException;
import haveno.core.btc.model.AddressEntry;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.TradeWalletService;
import haveno.core.btc.wallet.TxBroadcaster;
import haveno.core.btc.wallet.WalletService;
import haveno.core.offer.Offer;
import haveno.core.offer.placeoffer.PlaceOfferModel;
import haveno.core.xmr.exceptions.TxBroadcastException;
import haveno.core.xmr.model.AddressEntry;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.core.xmr.wallet.TradeWalletService;
import haveno.core.xmr.wallet.TxBroadcaster;
import haveno.core.xmr.wallet.WalletService;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.Transaction;

2
core/src/main/java/haveno/core/offer/placeoffer/tasks/MakerReserveOfferFunds.java
View File

@ -19,10 +19,10 @@ package haveno.core.offer.placeoffer.tasks;
import haveno.common.taskrunner.Task;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferDirection;
import haveno.core.offer.placeoffer.PlaceOfferModel;
import haveno.core.xmr.model.XmrAddressEntry;
import lombok.extern.slf4j.Slf4j;
import java.math.BigInteger;

2
core/src/main/java/haveno/core/offer/placeoffer/tasks/MakerSendSignOfferRequest.java
View File

@ -23,12 +23,12 @@ import haveno.common.handlers.ErrorMessageHandler;
import haveno.common.handlers.ResultHandler;
import haveno.common.taskrunner.Task;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.offer.Offer;
import haveno.core.offer.availability.DisputeAgentSelection;
import haveno.core.offer.messages.SignOfferRequest;
import haveno.core.offer.placeoffer.PlaceOfferModel;
import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.network.p2p.AckMessage;
import haveno.network.p2p.DecryptedDirectMessageListener;
import haveno.network.p2p.DecryptedMessageWithPubKey;

6
core/src/main/java/haveno/core/offer/takeoffer/TakeOfferModel.java
View File

@ -17,15 +17,13 @@
package haveno.core.offer.takeoffer;
import static haveno.core.btc.model.XmrAddressEntry.Context.OFFER_FUNDING;
import static haveno.core.offer.OfferDirection.SELL;
import static haveno.core.util.VolumeUtil.getAdjustedVolumeForHalCash;
import static haveno.core.util.VolumeUtil.getRoundedFiatVolume;
import static haveno.core.xmr.model.XmrAddressEntry.Context.OFFER_FUNDING;
import haveno.common.taskrunner.Model;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.CurrencyUtil;
import haveno.core.monetary.Price;
import haveno.core.monetary.Volume;
@ -35,6 +33,8 @@ import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.PaymentMethod;
import haveno.core.provider.price.PriceFeedService;
import haveno.core.trade.HavenoUtils;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.core.xmr.wallet.XmrWalletService;
import javax.inject.Inject;
import java.math.BigInteger;

2
core/src/main/java/haveno/core/payment/validation/SecurityDepositValidator.java
View File

@ -17,12 +17,12 @@
package haveno.core.payment.validation;
import haveno.core.btc.wallet.Restrictions;
import haveno.core.locale.Res;
import haveno.core.payment.PaymentAccount;
import haveno.core.util.FormattingUtils;
import haveno.core.util.ParsingUtils;
import haveno.core.util.validation.NumberValidator;
import haveno.core.xmr.wallet.Restrictions;
import javax.inject.Inject;
public class SecurityDepositValidator extends NumberValidator {

3
core/src/main/java/haveno/core/presentation/BalancePresentation.java
View File

@ -18,9 +18,8 @@
package haveno.core.presentation;
import haveno.common.UserThread;
import haveno.core.btc.Balances;
import haveno.core.trade.HavenoUtils;
import haveno.core.xmr.Balances;
import javax.inject.Inject;
import javafx.beans.property.SimpleStringProperty;

2
core/src/main/java/haveno/core/proto/ProtoDevUtil.java
View File

@ -17,7 +17,6 @@
package haveno.core.proto;
import haveno.core.btc.model.AddressEntry;
import haveno.core.offer.AvailabilityResult;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferDirection;
@ -25,6 +24,7 @@ import haveno.core.offer.OfferPayload;
import haveno.core.offer.OpenOffer;
import haveno.core.support.dispute.DisputeResult;
import haveno.core.trade.Trade;
import haveno.core.xmr.model.AddressEntry;
import lombok.extern.slf4j.Slf4j;
@Slf4j

10
core/src/main/java/haveno/core/proto/persistable/CorePersistenceProtoResolver.java
View File

@ -25,11 +25,6 @@ import haveno.common.proto.persistable.PersistableEnvelope;
import haveno.common.proto.persistable.PersistenceProtoResolver;
import haveno.core.account.sign.SignedWitnessStore;
import haveno.core.account.witness.AccountAgeWitnessStore;
import haveno.core.btc.model.AddressEntryList;
import haveno.core.btc.model.EncryptedConnectionList;
import haveno.core.btc.model.XmrAddressEntryList;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.SignedOfferList;
import haveno.core.payment.PaymentAccountList;
import haveno.core.proto.CoreProtoResolver;
@ -40,6 +35,11 @@ import haveno.core.trade.TradableList;
import haveno.core.trade.statistics.TradeStatistics3Store;
import haveno.core.user.PreferencesPayload;
import haveno.core.user.UserPayload;
import haveno.core.xmr.model.AddressEntryList;
import haveno.core.xmr.model.EncryptedConnectionList;
import haveno.core.xmr.model.XmrAddressEntryList;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.mailbox.IgnoredMailboxMap;
import haveno.network.p2p.mailbox.MailboxMessageList;
import haveno.network.p2p.peers.peerexchange.PeerList;

6
core/src/main/java/haveno/core/setup/CorePersistedDataHost.java
View File

@ -19,9 +19,6 @@ package haveno.core.setup;
import com.google.inject.Injector;
import haveno.common.proto.persistable.PersistedDataHost;
import haveno.core.btc.model.AddressEntryList;
import haveno.core.btc.model.EncryptedConnectionList;
import haveno.core.btc.model.XmrAddressEntryList;
import haveno.core.offer.OpenOfferManager;
import haveno.core.support.dispute.arbitration.ArbitrationDisputeListService;
import haveno.core.support.dispute.mediation.MediationDisputeListService;
@ -31,6 +28,9 @@ import haveno.core.trade.TradeManager;
import haveno.core.trade.failed.FailedTradesManager;
import haveno.core.user.Preferences;
import haveno.core.user.User;
import haveno.core.xmr.model.AddressEntryList;
import haveno.core.xmr.model.EncryptedConnectionList;
import haveno.core.xmr.model.XmrAddressEntryList;
import haveno.network.p2p.mailbox.IgnoredMailboxService;
import haveno.network.p2p.mailbox.MailboxMessageService;
import haveno.network.p2p.peers.PeerManager;

6
core/src/main/java/haveno/core/support/dispute/DisputeManager.java
View File

@ -28,9 +28,6 @@ import haveno.common.util.MathUtils;
import haveno.common.util.Tuple2;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.api.CoreNotificationService;
import haveno.core.btc.wallet.Restrictions;
import haveno.core.btc.wallet.TradeWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.Res;
import haveno.core.monetary.Altcoin;
@ -51,6 +48,9 @@ import haveno.core.trade.HavenoUtils;
import haveno.core.trade.Trade;
import haveno.core.trade.TradeManager;
import haveno.core.trade.protocol.TradePeer;
import haveno.core.xmr.wallet.Restrictions;
import haveno.core.xmr.wallet.TradeWalletService;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.BootstrapListener;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;

4
core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationManager.java
View File

@ -25,8 +25,6 @@ import haveno.common.config.Config;
import haveno.common.crypto.KeyRing;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.api.CoreNotificationService;
import haveno.core.btc.wallet.TradeWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOfferManager;
import haveno.core.provider.price.PriceFeedService;
@ -46,6 +44,8 @@ import haveno.core.trade.Contract;
import haveno.core.trade.HavenoUtils;
import haveno.core.trade.Trade;
import haveno.core.trade.TradeManager;
import haveno.core.xmr.wallet.TradeWalletService;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.AckMessageSourceType;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;

4
core/src/main/java/haveno/core/support/dispute/mediation/MediationManager.java
View File

@ -28,8 +28,6 @@ import haveno.common.handlers.ErrorMessageHandler;
import haveno.common.handlers.ResultHandler;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.api.CoreNotificationService;
import haveno.core.btc.wallet.TradeWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOffer;
import haveno.core.offer.OpenOfferManager;
@ -47,6 +45,8 @@ import haveno.core.trade.Trade;
import haveno.core.trade.TradeManager;
import haveno.core.trade.protocol.DisputeProtocol;
import haveno.core.trade.protocol.ProcessModel;
import haveno.core.xmr.wallet.TradeWalletService;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.AckMessageSourceType;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;

4
core/src/main/java/haveno/core/support/dispute/refund/RefundManager.java
View File

@ -26,8 +26,6 @@ import haveno.common.config.Config;
import haveno.common.crypto.KeyRing;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.api.CoreNotificationService;
import haveno.core.btc.wallet.TradeWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOffer;
import haveno.core.offer.OpenOfferManager;
@ -43,6 +41,8 @@ import haveno.core.support.messages.SupportMessage;
import haveno.core.trade.ClosedTradableManager;
import haveno.core.trade.Trade;
import haveno.core.trade.TradeManager;
import haveno.core.xmr.wallet.TradeWalletService;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.AckMessageSourceType;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;

2
core/src/main/java/haveno/core/trade/ArbitratorTrade.java
View File

@ -1,10 +1,10 @@
package haveno.core.trade;
import haveno.common.proto.ProtoUtil;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.proto.CoreProtoResolver;
import haveno.core.trade.protocol.ProcessModel;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import java.math.BigInteger;
import java.util.UUID;

2
core/src/main/java/haveno/core/trade/BuyerAsMakerTrade.java
View File

@ -18,10 +18,10 @@
package haveno.core.trade;
import haveno.common.proto.ProtoUtil;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.proto.CoreProtoResolver;
import haveno.core.trade.protocol.ProcessModel;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import java.math.BigInteger;
import java.util.UUID;

2
core/src/main/java/haveno/core/trade/BuyerAsTakerTrade.java
View File

@ -18,10 +18,10 @@
package haveno.core.trade;
import haveno.common.proto.ProtoUtil;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.proto.CoreProtoResolver;
import haveno.core.trade.protocol.ProcessModel;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import java.math.BigInteger;
import java.util.UUID;

2
core/src/main/java/haveno/core/trade/BuyerTrade.java
View File

@ -17,9 +17,9 @@
package haveno.core.trade;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.trade.protocol.ProcessModel;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import lombok.extern.slf4j.Slf4j;

2
core/src/main/java/haveno/core/trade/SellerAsMakerTrade.java
View File

@ -18,10 +18,10 @@
package haveno.core.trade;
import haveno.common.proto.ProtoUtil;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.proto.CoreProtoResolver;
import haveno.core.trade.protocol.ProcessModel;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import java.math.BigInteger;
import java.util.UUID;

2
core/src/main/java/haveno/core/trade/SellerAsTakerTrade.java
View File

@ -18,10 +18,10 @@
package haveno.core.trade;
import haveno.common.proto.ProtoUtil;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.proto.CoreProtoResolver;
import haveno.core.trade.protocol.ProcessModel;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import java.math.BigInteger;
import java.util.UUID;

2
core/src/main/java/haveno/core/trade/SellerTrade.java
View File

@ -17,9 +17,9 @@
package haveno.core.trade;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.trade.protocol.ProcessModel;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import lombok.extern.slf4j.Slf4j;

2
core/src/main/java/haveno/core/trade/TradableList.java
View File

@ -21,9 +21,9 @@ import com.google.protobuf.Message;
import haveno.common.proto.ProtoUtil;
import haveno.common.proto.ProtobufferRuntimeException;
import haveno.common.proto.persistable.PersistableListAsObservable;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.OpenOffer;
import haveno.core.proto.CoreProtoResolver;
import haveno.core.xmr.wallet.XmrWalletService;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;

4
core/src/main/java/haveno/core/trade/Trade.java
View File

@ -27,8 +27,6 @@ import haveno.common.proto.ProtoUtil;
import haveno.common.taskrunner.Model;
import haveno.common.util.Utilities;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.CurrencyUtil;
import haveno.core.monetary.Price;
import haveno.core.monetary.Volume;
@ -50,6 +48,8 @@ import haveno.core.trade.protocol.TradePeer;
import haveno.core.trade.protocol.TradeProtocol;
import haveno.core.trade.txproof.AssetTxProofResult;
import haveno.core.util.VolumeUtil;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.AckMessage;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;

2
core/src/main/java/haveno/core/trade/TradeDataValidation.java
View File

@ -35,9 +35,9 @@ import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.offer.Offer;
import haveno.core.support.dispute.Dispute;
import haveno.core.xmr.wallet.BtcWalletService;
@Slf4j
public class TradeDataValidation {

4
core/src/main/java/haveno/core/trade/TradeManager.java
View File

@ -30,8 +30,6 @@ import haveno.common.proto.persistable.PersistedDataHost;
import haveno.core.api.AccountServiceListener;
import haveno.core.api.CoreAccountService;
import haveno.core.api.CoreNotificationService;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferBookService;
@ -67,6 +65,8 @@ import haveno.core.trade.statistics.ReferralIdService;
import haveno.core.trade.statistics.TradeStatisticsManager;
import haveno.core.user.User;
import haveno.core.util.Validator;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.BootstrapListener;
import haveno.network.p2p.DecryptedDirectMessageListener;
import haveno.network.p2p.DecryptedMessageWithPubKey;

2
core/src/main/java/haveno/core/trade/TradeUtil.java
View File

@ -20,9 +20,9 @@ package haveno.core.trade;
import haveno.common.crypto.KeyRing;
import haveno.common.util.Tuple2;
import haveno.common.util.Utilities;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.Offer;
import haveno.core.xmr.wallet.BtcWalletService;
import javax.inject.Inject;
import javax.inject.Singleton;

4
core/src/main/java/haveno/core/trade/failed/FailedTradesManager.java
View File

@ -21,14 +21,14 @@ import com.google.inject.Inject;
import haveno.common.crypto.KeyRing;
import haveno.common.persistence.PersistenceManager;
import haveno.common.proto.persistable.PersistedDataHost;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.provider.price.PriceFeedService;
import haveno.core.trade.CleanupMailboxMessages;
import haveno.core.trade.TradableList;
import haveno.core.trade.Trade;
import haveno.core.trade.TradeUtil;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.core.xmr.wallet.XmrWalletService;
import javafx.collections.ObservableList;
import java.util.Optional;

6
core/src/main/java/haveno/core/trade/protocol/ProcessModel.java
View File

@ -25,9 +25,6 @@ import haveno.common.proto.ProtoUtil;
import haveno.common.proto.persistable.PersistablePayload;
import haveno.common.taskrunner.Model;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.TradeWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.filter.FilterManager;
import haveno.core.network.MessageState;
import haveno.core.offer.Offer;
@ -47,6 +44,9 @@ import haveno.core.trade.messages.TradeMessage;
import haveno.core.trade.statistics.ReferralIdService;
import haveno.core.trade.statistics.TradeStatisticsManager;
import haveno.core.user.User;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.core.xmr.wallet.TradeWalletService;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.AckMessage;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;

6
core/src/main/java/haveno/core/trade/protocol/ProcessModelServiceProvider.java
View File

@ -19,9 +19,6 @@ package haveno.core.trade.protocol;
import haveno.common.crypto.KeyRing;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.TradeWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.filter.FilterManager;
import haveno.core.offer.OpenOfferManager;
import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
@ -30,6 +27,9 @@ import haveno.core.support.dispute.refund.refundagent.RefundAgentManager;
import haveno.core.trade.statistics.ReferralIdService;
import haveno.core.trade.statistics.TradeStatisticsManager;
import haveno.core.user.User;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.core.xmr.wallet.TradeWalletService;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.P2PService;
import javax.inject.Inject;

2
core/src/main/java/haveno/core/trade/protocol/TradePeer.java
View File

@ -23,9 +23,9 @@ import haveno.common.crypto.PubKeyRing;
import haveno.common.proto.ProtoUtil;
import haveno.common.proto.persistable.PersistablePayload;
import haveno.core.account.witness.AccountAgeWitness;
import haveno.core.btc.model.RawTransactionInput;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.proto.CoreProtoResolver;
import haveno.core.xmr.model.RawTransactionInput;
import haveno.network.p2p.NodeAddress;
import java.util.ArrayList;
import java.util.List;

2
core/src/main/java/haveno/core/trade/protocol/tasks/MakerSendInitTradeRequest.java
View File

@ -19,10 +19,10 @@ package haveno.core.trade.protocol.tasks;
import haveno.common.app.Version;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.offer.Offer;
import haveno.core.trade.Trade;
import haveno.core.trade.messages.InitTradeRequest;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.network.p2p.SendDirectMessageListener;
import java.util.UUID;

2
core/src/main/java/haveno/core/trade/protocol/tasks/MakerSetLockTime.java
View File

@ -19,8 +19,8 @@ package haveno.core.trade.protocol.tasks;
import haveno.common.config.Config;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.btc.wallet.Restrictions;
import haveno.core.trade.Trade;
import haveno.core.xmr.wallet.Restrictions;
import lombok.extern.slf4j.Slf4j;
@Slf4j

2
core/src/main/java/haveno/core/trade/protocol/tasks/MaybeSendSignContractRequest.java
View File

@ -26,12 +26,12 @@ import com.google.common.base.Charsets;
import haveno.common.app.Version;
import haveno.common.crypto.Sig;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.trade.ArbitratorTrade;
import haveno.core.trade.MakerTrade;
import haveno.core.trade.Trade;
import haveno.core.trade.Trade.State;
import haveno.core.trade.messages.SignContractRequest;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.network.p2p.SendDirectMessageListener;
import lombok.extern.slf4j.Slf4j;
import monero.daemon.model.MoneroOutput;

2
core/src/main/java/haveno/core/trade/protocol/tasks/ProcessInitMultisigRequest.java
View File

@ -20,13 +20,13 @@ package haveno.core.trade.protocol.tasks;
import haveno.common.app.Version;
import haveno.common.crypto.PubKeyRing;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.trade.ArbitratorTrade;
import haveno.core.trade.MakerTrade;
import haveno.core.trade.TakerTrade;
import haveno.core.trade.Trade;
import haveno.core.trade.messages.InitMultisigRequest;
import haveno.core.trade.protocol.TradePeer;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.SendDirectMessageListener;
import java.util.Arrays;

2
core/src/main/java/haveno/core/trade/protocol/tasks/TakerReserveTradeFunds.java
View File

@ -18,9 +18,9 @@
package haveno.core.trade.protocol.tasks;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.offer.OfferDirection;
import haveno.core.trade.Trade;
import haveno.core.xmr.model.XmrAddressEntry;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;

6
core/src/main/java/haveno/core/user/Preferences.java
View File

@ -22,9 +22,6 @@ import haveno.common.config.Config;
import haveno.common.persistence.PersistenceManager;
import haveno.common.proto.persistable.PersistedDataHost;
import haveno.common.util.Utilities;
import haveno.core.btc.nodes.BtcNodes;
import haveno.core.btc.nodes.LocalBitcoinNode;
import haveno.core.btc.wallet.Restrictions;
import haveno.core.locale.Country;
import haveno.core.locale.CountryUtil;
import haveno.core.locale.CryptoCurrency;
@ -35,6 +32,9 @@ import haveno.core.locale.TradeCurrency;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.PaymentAccountUtil;
import haveno.core.xmr.MoneroNodeSettings;
import haveno.core.xmr.nodes.BtcNodes;
import haveno.core.xmr.nodes.LocalBitcoinNode;
import haveno.core.xmr.wallet.Restrictions;
import haveno.network.p2p.network.BridgeAddressProvider;
import javax.inject.Inject;
import javax.inject.Named;

2
core/src/main/java/haveno/core/user/PreferencesPayload.java
View File

@ -28,7 +28,7 @@ import haveno.core.payment.PaymentAccount;
import haveno.core.proto.CoreProtoResolver;
import haveno.core.xmr.MoneroNodeSettings;
import static haveno.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent;
import static haveno.core.xmr.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent;
import com.google.common.collect.Maps;

2
core/src/main/java/haveno/core/util/coin/CoinUtil.java
View File

@ -21,10 +21,10 @@ import org.bitcoinj.core.Coin;
import com.google.common.annotations.VisibleForTesting;
import haveno.common.util.MathUtils;
import haveno.core.btc.wallet.Restrictions;
import haveno.core.monetary.Price;
import haveno.core.monetary.Volume;
import haveno.core.trade.HavenoUtils;
import haveno.core.xmr.wallet.Restrictions;
import static com.google.common.base.Preconditions.checkArgument;
import static haveno.core.util.VolumeUtil.getAdjustedFiatVolume;

6
core/src/main/java/haveno/core/btc/Balances.java → core/src/main/java/haveno/core/xmr/Balances.java
View File

@ -15,10 +15,8 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc;
package haveno.core.xmr;
import haveno.core.btc.listeners.XmrBalanceListener;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.OfferPayload;
import haveno.core.offer.OpenOffer;
import haveno.core.offer.OpenOfferManager;
@ -28,6 +26,8 @@ import haveno.core.trade.ClosedTradableManager;
import haveno.core.trade.Trade;
import haveno.core.trade.TradeManager;
import haveno.core.trade.failed.FailedTradesManager;
import haveno.core.xmr.listeners.XmrBalanceListener;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.P2PService;
import java.math.BigInteger;
import java.util.List;

4
core/src/main/java/haveno/core/xmr/connection/MoneroConnectionModule.java → core/src/main/java/haveno/core/xmr/MoneroConnectionModule.java
View File

@ -1,10 +1,10 @@
package haveno.core.xmr.connection;
package haveno.core.xmr;
import com.google.inject.Singleton;
import haveno.common.app.AppModule;
import haveno.common.config.Config;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.btc.model.EncryptedConnectionList;
import haveno.core.xmr.model.EncryptedConnectionList;
import lombok.extern.slf4j.Slf4j;
@Slf4j

22
core/src/main/java/haveno/core/btc/MoneroModule.java → core/src/main/java/haveno/core/xmr/MoneroModule.java
View File

@ -15,25 +15,25 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc;
package haveno.core.xmr;
import com.google.inject.Singleton;
import com.google.inject.TypeLiteral;
import haveno.common.app.AppModule;
import haveno.common.config.Config;
import haveno.core.btc.model.AddressEntryList;
import haveno.core.btc.model.EncryptedConnectionList;
import haveno.core.btc.model.XmrAddressEntryList;
import haveno.core.btc.nodes.BtcNodes;
import haveno.core.btc.setup.RegTestHost;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.NonBsqCoinSelector;
import haveno.core.btc.wallet.TradeWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.provider.ProvidersRepository;
import haveno.core.provider.fee.FeeProvider;
import haveno.core.provider.price.PriceFeedService;
import haveno.core.xmr.model.AddressEntryList;
import haveno.core.xmr.model.EncryptedConnectionList;
import haveno.core.xmr.model.XmrAddressEntryList;
import haveno.core.xmr.nodes.BtcNodes;
import haveno.core.xmr.setup.RegTestHost;
import haveno.core.xmr.setup.WalletsSetup;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.core.xmr.wallet.NonBsqCoinSelector;
import haveno.core.xmr.wallet.TradeWalletService;
import haveno.core.xmr.wallet.XmrWalletService;
import java.io.File;
import java.util.Arrays;

2
core/src/main/java/haveno/core/btc/exceptions/AddressEntryException.java → core/src/main/java/haveno/core/xmr/exceptions/AddressEntryException.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.exceptions;
package haveno.core.xmr.exceptions;
public class AddressEntryException extends Exception {
public AddressEntryException(String message) {

2
core/src/main/java/haveno/core/btc/exceptions/InsufficientFundsException.java → core/src/main/java/haveno/core/xmr/exceptions/InsufficientFundsException.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.exceptions;
package haveno.core.xmr.exceptions;
public class InsufficientFundsException extends Exception {
public InsufficientFundsException(String message) {

2
core/src/main/java/haveno/core/btc/exceptions/InvalidHostException.java → core/src/main/java/haveno/core/xmr/exceptions/InvalidHostException.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.exceptions;
package haveno.core.xmr.exceptions;
public class InvalidHostException extends IllegalArgumentException {

2
core/src/main/java/haveno/core/btc/exceptions/RejectedTxException.java → core/src/main/java/haveno/core/xmr/exceptions/RejectedTxException.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.exceptions;
package haveno.core.xmr.exceptions;
import org.bitcoinj.core.RejectMessage;

2
core/src/main/java/haveno/core/btc/exceptions/SigningException.java → core/src/main/java/haveno/core/xmr/exceptions/SigningException.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.exceptions;
package haveno.core.xmr.exceptions;
public class SigningException extends Exception {
public SigningException(String message) {

2
core/src/main/java/haveno/core/btc/exceptions/TransactionVerificationException.java → core/src/main/java/haveno/core/xmr/exceptions/TransactionVerificationException.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.exceptions;
package haveno.core.xmr.exceptions;
public class TransactionVerificationException extends Exception {
public TransactionVerificationException(Throwable t) {

2
core/src/main/java/haveno/core/btc/exceptions/TxBroadcastException.java → core/src/main/java/haveno/core/xmr/exceptions/TxBroadcastException.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.exceptions;
package haveno.core.xmr.exceptions;
import lombok.Getter;

2
core/src/main/java/haveno/core/btc/exceptions/TxBroadcastTimeoutException.java → core/src/main/java/haveno/core/xmr/exceptions/TxBroadcastTimeoutException.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.exceptions;
package haveno.core.xmr.exceptions;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.wallet.Wallet;

2
core/src/main/java/haveno/core/btc/exceptions/WalletException.java → core/src/main/java/haveno/core/xmr/exceptions/WalletException.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.exceptions;
package haveno.core.xmr.exceptions;
public class WalletException extends Exception {
public WalletException(Throwable t) {

2
core/src/main/java/haveno/core/btc/listeners/AddressConfidenceListener.java → core/src/main/java/haveno/core/xmr/listeners/AddressConfidenceListener.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.listeners;
package haveno.core.xmr.listeners;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.TransactionConfidence;

2
core/src/main/java/haveno/core/btc/listeners/BalanceListener.java → core/src/main/java/haveno/core/xmr/listeners/BalanceListener.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.listeners;
package haveno.core.xmr.listeners;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.Coin;

2
core/src/main/java/haveno/core/btc/listeners/TxConfidenceListener.java → core/src/main/java/haveno/core/xmr/listeners/TxConfidenceListener.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.listeners;
package haveno.core.xmr.listeners;
import org.bitcoinj.core.TransactionConfidence;

2
core/src/main/java/haveno/core/btc/listeners/XmrBalanceListener.java → core/src/main/java/haveno/core/xmr/listeners/XmrBalanceListener.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.listeners;
package haveno.core.xmr.listeners;
import java.math.BigInteger;

2
core/src/main/java/haveno/core/btc/model/AddressEntry.java → core/src/main/java/haveno/core/xmr/model/AddressEntry.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.model;
package haveno.core.xmr.model;
import com.google.protobuf.ByteString;
import haveno.common.config.Config;

2
core/src/main/java/haveno/core/btc/model/AddressEntryList.java → core/src/main/java/haveno/core/xmr/model/AddressEntryList.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.model;
package haveno.core.xmr.model;
import com.google.protobuf.Message;
import haveno.common.config.Config;

2
core/src/main/java/haveno/core/btc/model/EncryptedConnectionList.java → core/src/main/java/haveno/core/xmr/model/EncryptedConnectionList.java
View File

@ -1,4 +1,4 @@
package haveno.core.btc.model;
package haveno.core.xmr.model;
import com.google.protobuf.ByteString;
import com.google.protobuf.Message;

2
core/src/main/java/haveno/core/btc/model/InputsAndChangeOutput.java → core/src/main/java/haveno/core/xmr/model/InputsAndChangeOutput.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.model;
package haveno.core.xmr.model;
import java.util.List;

2
core/src/main/java/haveno/core/btc/model/PreparedDepositTxAndMakerInputs.java → core/src/main/java/haveno/core/xmr/model/PreparedDepositTxAndMakerInputs.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.model;
package haveno.core.xmr.model;
import java.util.ArrayList;

2
core/src/main/java/haveno/core/btc/model/RawTransactionInput.java → core/src/main/java/haveno/core/xmr/model/RawTransactionInput.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.model;
package haveno.core.xmr.model;
import com.google.protobuf.ByteString;
import haveno.common.proto.network.NetworkPayload;

2
core/src/main/java/haveno/core/btc/model/XmrAddressEntry.java → core/src/main/java/haveno/core/xmr/model/XmrAddressEntry.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.model;
package haveno.core.xmr.model;
import org.bitcoinj.core.Coin;
import haveno.common.proto.ProtoUtil;

2
core/src/main/java/haveno/core/btc/model/XmrAddressEntryList.java → core/src/main/java/haveno/core/xmr/model/XmrAddressEntryList.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.model;
package haveno.core.xmr.model;
import com.google.protobuf.Message;
import haveno.common.persistence.PersistenceManager;

4
core/src/main/java/haveno/core/btc/nodes/BtcNetworkConfig.java → core/src/main/java/haveno/core/xmr/nodes/BtcNetworkConfig.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.nodes;
package haveno.core.xmr.nodes;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.PeerAddress;
@ -23,7 +23,7 @@ import org.bitcoinj.params.MainNetParams;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import haveno.common.config.Config;
import haveno.core.btc.setup.WalletConfig;
import haveno.core.xmr.setup.WalletConfig;
import haveno.network.Socks5MultiDiscovery;
import java.util.List;

4
core/src/main/java/haveno/core/btc/nodes/BtcNodeConverter.java → core/src/main/java/haveno/core/xmr/nodes/BtcNodeConverter.java
View File

@ -15,13 +15,13 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.nodes;
package haveno.core.xmr.nodes;
import org.bitcoinj.core.PeerAddress;
import org.bitcoinj.net.OnionCatConverter;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import haveno.core.btc.nodes.BtcNodes.BtcNode;
import haveno.core.xmr.nodes.BtcNodes.BtcNode;
import haveno.network.DnsLookupException;
import haveno.network.DnsLookupTor;
import java.net.InetAddress;

2
core/src/main/java/haveno/core/btc/nodes/BtcNodes.java → core/src/main/java/haveno/core/xmr/nodes/BtcNodes.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.nodes;
package haveno.core.xmr.nodes;
import java.util.ArrayList;
import java.util.Arrays;

2
core/src/main/java/haveno/core/btc/nodes/BtcNodesRepository.java → core/src/main/java/haveno/core/xmr/nodes/BtcNodesRepository.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.nodes;
package haveno.core.xmr.nodes;
import org.bitcoinj.core.PeerAddress;

2
core/src/main/java/haveno/core/btc/nodes/BtcNodesSetupPreferences.java → core/src/main/java/haveno/core/xmr/nodes/BtcNodesSetupPreferences.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.nodes;
package haveno.core.xmr.nodes;
import haveno.common.config.Config;
import haveno.common.util.Utilities;

2
core/src/main/java/haveno/core/btc/nodes/LocalBitcoinNode.java → core/src/main/java/haveno/core/xmr/nodes/LocalBitcoinNode.java
View File

@ -1,4 +1,4 @@
package haveno.core.btc.nodes;
package haveno.core.xmr.nodes;
import javax.inject.Inject;
import javax.inject.Singleton;

2
core/src/main/java/haveno/core/btc/nodes/ProxySocketFactory.java → core/src/main/java/haveno/core/xmr/nodes/ProxySocketFactory.java
View File

@ -33,7 +33,7 @@
* PircBotX. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.nodes;
package haveno.core.xmr.nodes;
import javax.net.SocketFactory;

2
core/src/main/java/haveno/core/btc/nodes/SeedPeersSocks5Dns.java → core/src/main/java/haveno/core/xmr/nodes/SeedPeersSocks5Dns.java
View File

@ -31,7 +31,7 @@
* limitations under the License.
*/
package haveno.core.btc.nodes;
package haveno.core.xmr.nodes;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.net.discovery.PeerDiscovery;

2
core/src/main/java/haveno/core/btc/setup/DownloadListener.java → core/src/main/java/haveno/core/xmr/setup/DownloadListener.java
View File

@ -1,4 +1,4 @@
package haveno.core.btc.setup;
package haveno.core.xmr.setup;
import javafx.beans.property.DoubleProperty;
import javafx.beans.property.ReadOnlyDoubleProperty;

2
core/src/main/java/haveno/core/btc/setup/HavenoKeyChainFactory.java → core/src/main/java/haveno/core/xmr/setup/HavenoKeyChainFactory.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.setup;
package haveno.core.xmr.setup;
import org.bitcoinj.crypto.ChildNumber;
import org.bitcoinj.crypto.DeterministicKey;

2
core/src/main/java/haveno/core/btc/setup/HavenoKeyChainGroupStructure.java → core/src/main/java/haveno/core/xmr/setup/HavenoKeyChainGroupStructure.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.setup;
package haveno.core.xmr.setup;
import org.bitcoinj.crypto.ChildNumber;
import org.bitcoinj.script.Script;

2
core/src/main/java/haveno/core/btc/setup/MoneroWalletRpcManager.java → core/src/main/java/haveno/core/xmr/setup/MoneroWalletRpcManager.java
View File

@ -1,4 +1,4 @@
package haveno.core.btc.setup;
package haveno.core.xmr.setup;
import java.net.ServerSocket;

2
core/src/main/java/haveno/core/btc/setup/RegTestHost.java → core/src/main/java/haveno/core/xmr/setup/RegTestHost.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.setup;
package haveno.core.xmr.setup;
import haveno.common.config.Config;

4
core/src/main/java/haveno/core/btc/setup/WalletConfig.java → core/src/main/java/haveno/core/xmr/setup/WalletConfig.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.setup;
package haveno.core.xmr.setup;
import org.bitcoinj.core.BlockChain;
import org.bitcoinj.core.Context;
@ -35,7 +35,7 @@ import org.bitcoinj.wallet.Wallet;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import haveno.common.config.Config;
import haveno.common.file.FileUtil;
import haveno.core.btc.nodes.LocalBitcoinNode;
import haveno.core.xmr.nodes.LocalBitcoinNode;
import com.google.common.io.Closeables;
import com.google.common.util.concurrent.AbstractIdleService;

20
core/src/main/java/haveno/core/btc/setup/WalletsSetup.java → core/src/main/java/haveno/core/xmr/setup/WalletsSetup.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.setup;
package haveno.core.xmr.setup;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.BlockChain;
@ -35,16 +35,16 @@ import haveno.common.config.Config;
import haveno.common.file.FileUtil;
import haveno.common.handlers.ExceptionHandler;
import haveno.common.handlers.ResultHandler;
import haveno.core.btc.exceptions.InvalidHostException;
import haveno.core.btc.model.AddressEntry;
import haveno.core.btc.model.AddressEntryList;
import haveno.core.btc.nodes.BtcNetworkConfig;
import haveno.core.btc.nodes.BtcNodes;
import haveno.core.btc.nodes.BtcNodesRepository;
import haveno.core.btc.nodes.BtcNodesSetupPreferences;
import haveno.core.btc.nodes.LocalBitcoinNode;
import haveno.core.btc.nodes.BtcNodes.BtcNode;
import haveno.core.user.Preferences;
import haveno.core.xmr.exceptions.InvalidHostException;
import haveno.core.xmr.model.AddressEntry;
import haveno.core.xmr.model.AddressEntryList;
import haveno.core.xmr.nodes.BtcNetworkConfig;
import haveno.core.xmr.nodes.BtcNodes;
import haveno.core.xmr.nodes.BtcNodesRepository;
import haveno.core.xmr.nodes.BtcNodesSetupPreferences;
import haveno.core.xmr.nodes.LocalBitcoinNode;
import haveno.core.xmr.nodes.BtcNodes.BtcNode;
import haveno.network.Socks5MultiDiscovery;
import haveno.network.Socks5ProxyProvider;
import com.google.inject.Inject;

2
core/src/main/java/haveno/core/btc/wallet/BtcCoinSelector.java → core/src/main/java/haveno/core/xmr/wallet/BtcCoinSelector.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.wallet;
package haveno.core.xmr.wallet;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.TransactionOutput;

18
core/src/main/java/haveno/core/btc/wallet/BtcWalletService.java → core/src/main/java/haveno/core/xmr/wallet/BtcWalletService.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.wallet;
package haveno.core.xmr.wallet;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.AddressFormatException;
@ -43,15 +43,15 @@ import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.MoreExecutors;
import haveno.common.handlers.ErrorMessageHandler;
import haveno.common.util.Tuple2;
import haveno.core.btc.exceptions.AddressEntryException;
import haveno.core.btc.exceptions.InsufficientFundsException;
import haveno.core.btc.exceptions.TransactionVerificationException;
import haveno.core.btc.exceptions.WalletException;
import haveno.core.btc.model.AddressEntry;
import haveno.core.btc.model.AddressEntryList;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.btc.wallet.http.MemPoolSpaceTxBroadcaster;
import haveno.core.user.Preferences;
import haveno.core.xmr.exceptions.AddressEntryException;
import haveno.core.xmr.exceptions.InsufficientFundsException;
import haveno.core.xmr.exceptions.TransactionVerificationException;
import haveno.core.xmr.exceptions.WalletException;
import haveno.core.xmr.model.AddressEntry;
import haveno.core.xmr.model.AddressEntryList;
import haveno.core.xmr.setup.WalletsSetup;
import haveno.core.xmr.wallet.http.MemPoolSpaceTxBroadcaster;
import org.bouncycastle.crypto.params.KeyParameter;
import java.util.Arrays;

2
core/src/main/java/haveno/core/btc/wallet/HavenoDefaultCoinSelector.java → core/src/main/java/haveno/core/xmr/wallet/HavenoDefaultCoinSelector.java
View File

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package haveno.core.btc.wallet;
package haveno.core.xmr.wallet;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.InsufficientMoneyException;

Some files were not shown because too many files have changed in this diff Show More