From f3f719a6326770b10d54936a0c0a599789256c98 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 23 Sep 2018 14:46:58 -0500 Subject: [PATCH] Move btc setup classes to setup package --- core/src/main/java/bisq/core/app/BisqExecutable.java | 2 +- core/src/main/java/bisq/core/app/BisqSetup.java | 4 +--- core/src/main/java/bisq/core/app/WalletAppSetup.java | 2 +- .../java/bisq/core/app/misc/ExecutableForAppWithP2p.java | 2 +- .../src/main/java/bisq/core/arbitration/DisputeManager.java | 2 +- core/src/main/java/bisq/core/btc/BitcoinModule.java | 2 +- .../btc/{wallet => setup}/BisqDeterministicKeyChain.java | 2 +- .../core/btc/{wallet => setup}/BisqKeyChainFactory.java | 2 +- .../bisq/core/btc/{wallet => setup}/BisqKeyChainGroup.java | 2 +- .../btc/{wallet => setup}/BtcDeterministicKeyChain.java | 2 +- .../bisq/core/btc/{wallet => setup}/BtcNodeConverter.java | 2 +- .../core/btc/{wallet => setup}/PeerAddressesRepository.java | 2 +- .../java/bisq/core/btc/{ => setup}/ProxySocketFactory.java | 2 +- .../java/bisq/core/btc/{ => setup}/SeedPeersSocks5Dns.java | 2 +- .../java/bisq/core/btc/{wallet => setup}/WalletConfig.java | 5 +++-- .../core/btc/{wallet => setup}/WalletNetworkConfig.java | 2 +- .../core/btc/{wallet => setup}/WalletSetupPreferences.java | 4 ++-- .../java/bisq/core/btc/{wallet => setup}/WalletsSetup.java | 6 +++--- .../main/java/bisq/core/btc/wallet/BsqWalletService.java | 1 + .../main/java/bisq/core/btc/wallet/BtcWalletService.java | 1 + .../main/java/bisq/core/btc/wallet/TradeWalletService.java | 2 ++ core/src/main/java/bisq/core/btc/wallet/WalletService.java | 1 + .../java/bisq/core/btc/wallet/BtcNodeConverterTest.java | 3 ++- .../bisq/core/btc/wallet/PeerAddressesRepositoryTest.java | 2 ++ .../java/bisq/core/btc/wallet/WalletNetworkConfigTest.java | 3 +++ .../bisq/core/btc/wallet/WalletSetupPreferencesTest.java | 1 + desktop/src/main/java/bisq/desktop/main/MainViewModel.java | 2 +- .../bisq/desktop/main/dao/bonding/BondingViewUtils.java | 2 +- .../desktop/main/dao/governance/make/MakeProposalView.java | 2 +- .../java/bisq/desktop/main/dao/wallet/send/BsqSendView.java | 2 +- .../desktop/main/funds/transactions/TransactionsView.java | 2 +- .../bisq/desktop/main/funds/withdrawal/WithdrawalView.java | 2 +- .../java/bisq/desktop/main/offer/MutableOfferViewModel.java | 2 +- .../main/offer/createoffer/CreateOfferViewModel.java | 2 +- .../desktop/main/offer/takeoffer/TakeOfferViewModel.java | 2 +- .../desktop/main/overlays/windows/EmptyWalletWindow.java | 2 +- .../desktop/main/overlays/windows/ManualPayoutTxWindow.java | 2 +- .../main/portfolio/editoffer/EditOfferViewModel.java | 2 +- .../portfolio/pendingtrades/PendingTradesDataModel.java | 2 +- .../desktop/main/settings/network/NetworkSettingsView.java | 2 +- desktop/src/main/java/bisq/desktop/util/GUIUtil.java | 2 +- monitor/src/main/java/bisq/monitor/MonitorAppSetup.java | 2 +- .../src/main/java/bisq/monitor/metrics/MetricsModel.java | 2 +- 43 files changed, 53 insertions(+), 42 deletions(-) rename core/src/main/java/bisq/core/btc/{wallet => setup}/BisqDeterministicKeyChain.java (98%) rename core/src/main/java/bisq/core/btc/{wallet => setup}/BisqKeyChainFactory.java (98%) rename core/src/main/java/bisq/core/btc/{wallet => setup}/BisqKeyChainGroup.java (98%) rename core/src/main/java/bisq/core/btc/{wallet => setup}/BtcDeterministicKeyChain.java (98%) rename core/src/main/java/bisq/core/btc/{wallet => setup}/BtcNodeConverter.java (99%) rename core/src/main/java/bisq/core/btc/{wallet => setup}/PeerAddressesRepository.java (99%) rename core/src/main/java/bisq/core/btc/{ => setup}/ProxySocketFactory.java (99%) rename core/src/main/java/bisq/core/btc/{ => setup}/SeedPeersSocks5Dns.java (99%) rename core/src/main/java/bisq/core/btc/{wallet => setup}/WalletConfig.java (99%) rename core/src/main/java/bisq/core/btc/{wallet => setup}/WalletNetworkConfig.java (99%) rename core/src/main/java/bisq/core/btc/{wallet => setup}/WalletSetupPreferences.java (97%) rename core/src/main/java/bisq/core/btc/{wallet => setup}/WalletsSetup.java (99%) diff --git a/core/src/main/java/bisq/core/app/BisqExecutable.java b/core/src/main/java/bisq/core/app/BisqExecutable.java index cb99f061f5..1341abc529 100644 --- a/core/src/main/java/bisq/core/app/BisqExecutable.java +++ b/core/src/main/java/bisq/core/app/BisqExecutable.java @@ -20,9 +20,9 @@ package bisq.core.app; import bisq.core.arbitration.ArbitratorManager; import bisq.core.btc.BtcOptionKeys; import bisq.core.btc.RegTestHost; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.BsqWalletService; import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.WalletsSetup; import bisq.core.dao.DaoOptionKeys; import bisq.core.dao.DaoSetup; import bisq.core.exceptions.BisqException; diff --git a/core/src/main/java/bisq/core/app/BisqSetup.java b/core/src/main/java/bisq/core/app/BisqSetup.java index 1fbb63757d..b457b4d47c 100644 --- a/core/src/main/java/bisq/core/app/BisqSetup.java +++ b/core/src/main/java/bisq/core/app/BisqSetup.java @@ -26,9 +26,9 @@ import bisq.core.arbitration.DisputeManager; import bisq.core.btc.AddressEntry; import bisq.core.btc.BalanceModel; import bisq.core.btc.listeners.BalanceListener; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.BtcWalletService; import bisq.core.btc.wallet.WalletsManager; -import bisq.core.btc.wallet.WalletsSetup; import bisq.core.dao.DaoSetup; import bisq.core.filter.FilterManager; import bisq.core.locale.Res; @@ -88,8 +88,6 @@ import javafx.collections.SetChangeListener; import org.spongycastle.crypto.params.KeyParameter; -import java.security.Security; - import java.net.InetSocketAddress; import java.net.Socket; diff --git a/core/src/main/java/bisq/core/app/WalletAppSetup.java b/core/src/main/java/bisq/core/app/WalletAppSetup.java index 537f194738..59e5bca1da 100644 --- a/core/src/main/java/bisq/core/app/WalletAppSetup.java +++ b/core/src/main/java/bisq/core/app/WalletAppSetup.java @@ -17,8 +17,8 @@ package bisq.core.app; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.WalletsManager; -import bisq.core.btc.wallet.WalletsSetup; import bisq.core.locale.Res; import bisq.core.user.Preferences; import bisq.core.util.BSFormatter; diff --git a/core/src/main/java/bisq/core/app/misc/ExecutableForAppWithP2p.java b/core/src/main/java/bisq/core/app/misc/ExecutableForAppWithP2p.java index 0d8c35395c..a1dbf242e2 100644 --- a/core/src/main/java/bisq/core/app/misc/ExecutableForAppWithP2p.java +++ b/core/src/main/java/bisq/core/app/misc/ExecutableForAppWithP2p.java @@ -21,9 +21,9 @@ import bisq.core.app.AppOptionKeys; import bisq.core.app.BisqEnvironment; import bisq.core.app.BisqExecutable; import bisq.core.arbitration.ArbitratorManager; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.BsqWalletService; import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.WalletsSetup; import bisq.core.offer.OpenOfferManager; import bisq.network.p2p.P2PService; diff --git a/core/src/main/java/bisq/core/arbitration/DisputeManager.java b/core/src/main/java/bisq/core/arbitration/DisputeManager.java index d32b07c163..1947041cbf 100644 --- a/core/src/main/java/bisq/core/arbitration/DisputeManager.java +++ b/core/src/main/java/bisq/core/arbitration/DisputeManager.java @@ -25,11 +25,11 @@ import bisq.core.arbitration.messages.PeerOpenedDisputeMessage; import bisq.core.arbitration.messages.PeerPublishedDisputePayoutTxMessage; import bisq.core.btc.exceptions.TransactionVerificationException; import bisq.core.btc.exceptions.WalletException; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.BtcWalletService; import bisq.core.btc.wallet.TradeWalletService; import bisq.core.btc.wallet.TxBroadcastException; import bisq.core.btc.wallet.TxBroadcaster; -import bisq.core.btc.wallet.WalletsSetup; import bisq.core.locale.Res; import bisq.core.offer.OpenOffer; import bisq.core.offer.OpenOfferManager; diff --git a/core/src/main/java/bisq/core/btc/BitcoinModule.java b/core/src/main/java/bisq/core/btc/BitcoinModule.java index 8faf462e1f..16b753e327 100644 --- a/core/src/main/java/bisq/core/btc/BitcoinModule.java +++ b/core/src/main/java/bisq/core/btc/BitcoinModule.java @@ -18,12 +18,12 @@ package bisq.core.btc; import bisq.core.app.AppOptionKeys; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.BsqCoinSelector; import bisq.core.btc.wallet.BsqWalletService; import bisq.core.btc.wallet.BtcWalletService; import bisq.core.btc.wallet.NonBsqCoinSelector; import bisq.core.btc.wallet.TradeWalletService; -import bisq.core.btc.wallet.WalletsSetup; import bisq.core.provider.PriceNodeHttpClient; import bisq.core.provider.ProvidersRepository; import bisq.core.provider.fee.FeeProvider; diff --git a/core/src/main/java/bisq/core/btc/wallet/BisqDeterministicKeyChain.java b/core/src/main/java/bisq/core/btc/setup/BisqDeterministicKeyChain.java similarity index 98% rename from core/src/main/java/bisq/core/btc/wallet/BisqDeterministicKeyChain.java rename to core/src/main/java/bisq/core/btc/setup/BisqDeterministicKeyChain.java index 56ab52a9ea..e0d53ddd15 100644 --- a/core/src/main/java/bisq/core/btc/wallet/BisqDeterministicKeyChain.java +++ b/core/src/main/java/bisq/core/btc/setup/BisqDeterministicKeyChain.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.core.btc.wallet; +package bisq.core.btc.setup; import org.bitcoinj.crypto.ChildNumber; import org.bitcoinj.crypto.DeterministicKey; diff --git a/core/src/main/java/bisq/core/btc/wallet/BisqKeyChainFactory.java b/core/src/main/java/bisq/core/btc/setup/BisqKeyChainFactory.java similarity index 98% rename from core/src/main/java/bisq/core/btc/wallet/BisqKeyChainFactory.java rename to core/src/main/java/bisq/core/btc/setup/BisqKeyChainFactory.java index b4a71608aa..0cb088f31d 100644 --- a/core/src/main/java/bisq/core/btc/wallet/BisqKeyChainFactory.java +++ b/core/src/main/java/bisq/core/btc/setup/BisqKeyChainFactory.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.core.btc.wallet; +package bisq.core.btc.setup; import org.bitcoinj.crypto.ChildNumber; import org.bitcoinj.crypto.DeterministicKey; diff --git a/core/src/main/java/bisq/core/btc/wallet/BisqKeyChainGroup.java b/core/src/main/java/bisq/core/btc/setup/BisqKeyChainGroup.java similarity index 98% rename from core/src/main/java/bisq/core/btc/wallet/BisqKeyChainGroup.java rename to core/src/main/java/bisq/core/btc/setup/BisqKeyChainGroup.java index e78f16f188..2146bfea7e 100644 --- a/core/src/main/java/bisq/core/btc/wallet/BisqKeyChainGroup.java +++ b/core/src/main/java/bisq/core/btc/setup/BisqKeyChainGroup.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.core.btc.wallet; +package bisq.core.btc.setup; import org.bitcoinj.core.NetworkParameters; import org.bitcoinj.wallet.DeterministicKeyChain; diff --git a/core/src/main/java/bisq/core/btc/wallet/BtcDeterministicKeyChain.java b/core/src/main/java/bisq/core/btc/setup/BtcDeterministicKeyChain.java similarity index 98% rename from core/src/main/java/bisq/core/btc/wallet/BtcDeterministicKeyChain.java rename to core/src/main/java/bisq/core/btc/setup/BtcDeterministicKeyChain.java index bbe17cb060..da704161f2 100644 --- a/core/src/main/java/bisq/core/btc/wallet/BtcDeterministicKeyChain.java +++ b/core/src/main/java/bisq/core/btc/setup/BtcDeterministicKeyChain.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.core.btc.wallet; +package bisq.core.btc.setup; import org.bitcoinj.crypto.ChildNumber; import org.bitcoinj.crypto.DeterministicKey; diff --git a/core/src/main/java/bisq/core/btc/wallet/BtcNodeConverter.java b/core/src/main/java/bisq/core/btc/setup/BtcNodeConverter.java similarity index 99% rename from core/src/main/java/bisq/core/btc/wallet/BtcNodeConverter.java rename to core/src/main/java/bisq/core/btc/setup/BtcNodeConverter.java index 754cde8ebe..cb23b53416 100644 --- a/core/src/main/java/bisq/core/btc/wallet/BtcNodeConverter.java +++ b/core/src/main/java/bisq/core/btc/setup/BtcNodeConverter.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.core.btc.wallet; +package bisq.core.btc.setup; import bisq.core.btc.BitcoinNodes.BtcNode; diff --git a/core/src/main/java/bisq/core/btc/wallet/PeerAddressesRepository.java b/core/src/main/java/bisq/core/btc/setup/PeerAddressesRepository.java similarity index 99% rename from core/src/main/java/bisq/core/btc/wallet/PeerAddressesRepository.java rename to core/src/main/java/bisq/core/btc/setup/PeerAddressesRepository.java index 2ba9f95a45..228f835f5d 100644 --- a/core/src/main/java/bisq/core/btc/wallet/PeerAddressesRepository.java +++ b/core/src/main/java/bisq/core/btc/setup/PeerAddressesRepository.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.core.btc.wallet; +package bisq.core.btc.setup; import bisq.core.btc.BitcoinNodes.BtcNode; diff --git a/core/src/main/java/bisq/core/btc/ProxySocketFactory.java b/core/src/main/java/bisq/core/btc/setup/ProxySocketFactory.java similarity index 99% rename from core/src/main/java/bisq/core/btc/ProxySocketFactory.java rename to core/src/main/java/bisq/core/btc/setup/ProxySocketFactory.java index 4b3eea873f..a131744cb1 100644 --- a/core/src/main/java/bisq/core/btc/ProxySocketFactory.java +++ b/core/src/main/java/bisq/core/btc/setup/ProxySocketFactory.java @@ -33,7 +33,7 @@ * PircBotX. If not, see . */ -package bisq.core.btc; +package bisq.core.btc.setup; import javax.net.SocketFactory; diff --git a/core/src/main/java/bisq/core/btc/SeedPeersSocks5Dns.java b/core/src/main/java/bisq/core/btc/setup/SeedPeersSocks5Dns.java similarity index 99% rename from core/src/main/java/bisq/core/btc/SeedPeersSocks5Dns.java rename to core/src/main/java/bisq/core/btc/setup/SeedPeersSocks5Dns.java index 60554f8ed2..d274300cfb 100644 --- a/core/src/main/java/bisq/core/btc/SeedPeersSocks5Dns.java +++ b/core/src/main/java/bisq/core/btc/setup/SeedPeersSocks5Dns.java @@ -31,7 +31,7 @@ * limitations under the License. */ -package bisq.core.btc; +package bisq.core.btc.setup; import org.bitcoinj.core.NetworkParameters; import org.bitcoinj.net.discovery.PeerDiscovery; diff --git a/core/src/main/java/bisq/core/btc/wallet/WalletConfig.java b/core/src/main/java/bisq/core/btc/setup/WalletConfig.java similarity index 99% rename from core/src/main/java/bisq/core/btc/wallet/WalletConfig.java rename to core/src/main/java/bisq/core/btc/setup/WalletConfig.java index 3c05d94e03..0ae051e819 100644 --- a/core/src/main/java/bisq/core/btc/wallet/WalletConfig.java +++ b/core/src/main/java/bisq/core/btc/setup/WalletConfig.java @@ -15,10 +15,11 @@ * along with Bisq. If not, see . */ -package bisq.core.btc.wallet; +package bisq.core.btc.setup; import bisq.core.app.BisqEnvironment; -import bisq.core.btc.ProxySocketFactory; +import bisq.core.btc.wallet.BisqRiskAnalysis; +import bisq.core.btc.wallet.BsqWallet; import bisq.common.app.Version; diff --git a/core/src/main/java/bisq/core/btc/wallet/WalletNetworkConfig.java b/core/src/main/java/bisq/core/btc/setup/WalletNetworkConfig.java similarity index 99% rename from core/src/main/java/bisq/core/btc/wallet/WalletNetworkConfig.java rename to core/src/main/java/bisq/core/btc/setup/WalletNetworkConfig.java index e7105d294b..22aa45886f 100644 --- a/core/src/main/java/bisq/core/btc/wallet/WalletNetworkConfig.java +++ b/core/src/main/java/bisq/core/btc/setup/WalletNetworkConfig.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.core.btc.wallet; +package bisq.core.btc.setup; import bisq.network.Socks5MultiDiscovery; diff --git a/core/src/main/java/bisq/core/btc/wallet/WalletSetupPreferences.java b/core/src/main/java/bisq/core/btc/setup/WalletSetupPreferences.java similarity index 97% rename from core/src/main/java/bisq/core/btc/wallet/WalletSetupPreferences.java rename to core/src/main/java/bisq/core/btc/setup/WalletSetupPreferences.java index 0044ad06e9..14a043c38e 100644 --- a/core/src/main/java/bisq/core/btc/wallet/WalletSetupPreferences.java +++ b/core/src/main/java/bisq/core/btc/setup/WalletSetupPreferences.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.core.btc.wallet; +package bisq.core.btc.setup; import bisq.core.btc.BitcoinNodes; import bisq.core.btc.BitcoinNodes.BitcoinNodesOption; @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static bisq.core.btc.BitcoinNodes.BitcoinNodesOption.CUSTOM; -import static bisq.core.btc.wallet.WalletsSetup.DEFAULT_CONNECTIONS; +import static bisq.core.btc.setup.WalletsSetup.DEFAULT_CONNECTIONS; class WalletSetupPreferences { diff --git a/core/src/main/java/bisq/core/btc/wallet/WalletsSetup.java b/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java similarity index 99% rename from core/src/main/java/bisq/core/btc/wallet/WalletsSetup.java rename to core/src/main/java/bisq/core/btc/setup/WalletsSetup.java index 66bbfb22b5..1472d44b9e 100644 --- a/core/src/main/java/bisq/core/btc/wallet/WalletsSetup.java +++ b/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.core.btc.wallet; +package bisq.core.btc.setup; import bisq.core.app.BisqEnvironment; import bisq.core.btc.AddressEntry; @@ -341,12 +341,12 @@ public class WalletsSetup { // Backup /////////////////////////////////////////////////////////////////////////////////////////// - void backupWallets() { + public void backupWallets() { FileUtil.rollingBackup(walletDir, btcWalletFileName, 20); FileUtil.rollingBackup(walletDir, BSQ_WALLET_FILE_NAME, 20); } - void clearBackups() { + public void clearBackups() { try { FileUtil.deleteDirectory(new File(Paths.get(walletDir.getAbsolutePath(), "backup").toString())); } catch (IOException e) { diff --git a/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java b/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java index 93812d640f..c32b5c779f 100644 --- a/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java +++ b/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java @@ -21,6 +21,7 @@ import bisq.core.app.BisqEnvironment; import bisq.core.btc.Restrictions; import bisq.core.btc.exceptions.TransactionVerificationException; import bisq.core.btc.exceptions.WalletException; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.dao.state.BsqStateListener; import bisq.core.dao.state.BsqStateService; import bisq.core.dao.state.blockchain.Block; diff --git a/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java b/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java index 838f2c5bf4..f1b06b9b92 100644 --- a/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java +++ b/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java @@ -24,6 +24,7 @@ import bisq.core.btc.InsufficientFundsException; import bisq.core.btc.Restrictions; import bisq.core.btc.exceptions.TransactionVerificationException; import bisq.core.btc.exceptions.WalletException; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.provider.fee.FeeService; import bisq.core.user.Preferences; diff --git a/core/src/main/java/bisq/core/btc/wallet/TradeWalletService.java b/core/src/main/java/bisq/core/btc/wallet/TradeWalletService.java index ee54276643..d4d62ed8e1 100644 --- a/core/src/main/java/bisq/core/btc/wallet/TradeWalletService.java +++ b/core/src/main/java/bisq/core/btc/wallet/TradeWalletService.java @@ -25,6 +25,8 @@ import bisq.core.btc.data.RawTransactionInput; import bisq.core.btc.exceptions.SigningException; import bisq.core.btc.exceptions.TransactionVerificationException; import bisq.core.btc.exceptions.WalletException; +import bisq.core.btc.setup.WalletConfig; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.locale.Res; import bisq.common.app.Log; diff --git a/core/src/main/java/bisq/core/btc/wallet/WalletService.java b/core/src/main/java/bisq/core/btc/wallet/WalletService.java index fb31bdda01..97a6d85bcf 100644 --- a/core/src/main/java/bisq/core/btc/wallet/WalletService.java +++ b/core/src/main/java/bisq/core/btc/wallet/WalletService.java @@ -23,6 +23,7 @@ import bisq.core.btc.exceptions.WalletException; import bisq.core.btc.listeners.AddressConfidenceListener; import bisq.core.btc.listeners.BalanceListener; import bisq.core.btc.listeners.TxConfidenceListener; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.provider.fee.FeeService; import bisq.core.user.Preferences; diff --git a/core/src/test/java/bisq/core/btc/wallet/BtcNodeConverterTest.java b/core/src/test/java/bisq/core/btc/wallet/BtcNodeConverterTest.java index 1381ce9b5f..64800d727f 100644 --- a/core/src/test/java/bisq/core/btc/wallet/BtcNodeConverterTest.java +++ b/core/src/test/java/bisq/core/btc/wallet/BtcNodeConverterTest.java @@ -18,7 +18,8 @@ package bisq.core.btc.wallet; import bisq.core.btc.BitcoinNodes.BtcNode; -import bisq.core.btc.wallet.BtcNodeConverter.Facade; +import bisq.core.btc.setup.BtcNodeConverter; +import bisq.core.btc.setup.BtcNodeConverter.Facade; import bisq.network.DnsLookupException; diff --git a/core/src/test/java/bisq/core/btc/wallet/PeerAddressesRepositoryTest.java b/core/src/test/java/bisq/core/btc/wallet/PeerAddressesRepositoryTest.java index 353d0a569a..798571de9a 100644 --- a/core/src/test/java/bisq/core/btc/wallet/PeerAddressesRepositoryTest.java +++ b/core/src/test/java/bisq/core/btc/wallet/PeerAddressesRepositoryTest.java @@ -18,6 +18,8 @@ package bisq.core.btc.wallet; import bisq.core.btc.BitcoinNodes.BtcNode; +import bisq.core.btc.setup.BtcNodeConverter; +import bisq.core.btc.setup.PeerAddressesRepository; import org.bitcoinj.core.PeerAddress; diff --git a/core/src/test/java/bisq/core/btc/wallet/WalletNetworkConfigTest.java b/core/src/test/java/bisq/core/btc/wallet/WalletNetworkConfigTest.java index d1fc971e1e..191c6cb46a 100644 --- a/core/src/test/java/bisq/core/btc/wallet/WalletNetworkConfigTest.java +++ b/core/src/test/java/bisq/core/btc/wallet/WalletNetworkConfigTest.java @@ -17,6 +17,9 @@ package bisq.core.btc.wallet; +import bisq.core.btc.setup.WalletConfig; +import bisq.core.btc.setup.WalletNetworkConfig; + import bisq.network.Socks5MultiDiscovery; import org.bitcoinj.core.NetworkParameters; diff --git a/core/src/test/java/bisq/core/btc/wallet/WalletSetupPreferencesTest.java b/core/src/test/java/bisq/core/btc/wallet/WalletSetupPreferencesTest.java index 32cd0c2db9..d2a744d3ae 100644 --- a/core/src/test/java/bisq/core/btc/wallet/WalletSetupPreferencesTest.java +++ b/core/src/test/java/bisq/core/btc/wallet/WalletSetupPreferencesTest.java @@ -19,6 +19,7 @@ package bisq.core.btc.wallet; import bisq.core.btc.BitcoinNodes; import bisq.core.btc.BitcoinNodes.BtcNode; +import bisq.core.btc.setup.WalletSetupPreferences; import bisq.core.user.Preferences; import java.util.List; diff --git a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java index f54415c432..f5cded52a3 100644 --- a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java @@ -33,8 +33,8 @@ import bisq.core.alert.PrivateNotificationManager; import bisq.core.app.AppOptionKeys; import bisq.core.app.BisqEnvironment; import bisq.core.app.BisqSetup; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.WalletsSetup; import bisq.core.locale.CurrencyUtil; import bisq.core.locale.Res; import bisq.core.payment.AccountAgeWitnessService; diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingViewUtils.java b/desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingViewUtils.java index c25e9107bd..12d3feb416 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingViewUtils.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingViewUtils.java @@ -24,7 +24,7 @@ import bisq.desktop.main.funds.deposit.DepositView; import bisq.desktop.main.overlays.popups.Popup; import bisq.desktop.util.GUIUtil; -import bisq.core.btc.wallet.WalletsSetup; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.dao.DaoFacade; import bisq.core.dao.bonding.lockup.LockupType; import bisq.core.dao.governance.role.BondedRole; diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java index 8c8823965e..3a1390ceac 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java @@ -27,9 +27,9 @@ import bisq.desktop.util.FormBuilder; import bisq.desktop.util.GUIUtil; import bisq.desktop.util.Layout; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.BsqWalletService; import bisq.core.btc.wallet.InsufficientBsqException; -import bisq.core.btc.wallet.WalletsSetup; import bisq.core.dao.DaoFacade; import bisq.core.dao.exceptions.ValidationException; import bisq.core.dao.governance.proposal.Proposal; diff --git a/desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java b/desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java index 4c968622bd..2aacb01825 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java @@ -34,6 +34,7 @@ import bisq.desktop.util.validation.BsqValidator; import bisq.desktop.util.validation.BtcValidator; import bisq.core.btc.Restrictions; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.BsqBalanceListener; import bisq.core.btc.wallet.BsqWalletService; import bisq.core.btc.wallet.BtcWalletService; @@ -41,7 +42,6 @@ import bisq.core.btc.wallet.TxBroadcastException; import bisq.core.btc.wallet.TxBroadcaster; import bisq.core.btc.wallet.TxMalleabilityException; import bisq.core.btc.wallet.WalletsManager; -import bisq.core.btc.wallet.WalletsSetup; import bisq.core.locale.Res; import bisq.core.util.BSFormatter; import bisq.core.util.BsqFormatter; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.java b/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.java index 390a3c1bc9..9d5077f800 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.java +++ b/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.java @@ -28,8 +28,8 @@ import bisq.desktop.main.overlays.windows.OfferDetailsWindow; import bisq.desktop.main.overlays.windows.TradeDetailsWindow; import bisq.desktop.util.GUIUtil; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.WalletsSetup; import bisq.core.locale.Res; import bisq.core.offer.OpenOffer; import bisq.core.trade.Tradable; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java b/desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java index 441879124a..db4bc9362e 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java +++ b/desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java @@ -31,8 +31,8 @@ import bisq.core.btc.AddressEntryException; import bisq.core.btc.InsufficientFundsException; import bisq.core.btc.Restrictions; import bisq.core.btc.listeners.BalanceListener; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.WalletsSetup; import bisq.core.locale.Res; import bisq.core.trade.Tradable; import bisq.core.trade.Trade; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java index bd12d115f2..d195d107f1 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java @@ -36,7 +36,7 @@ import bisq.desktop.util.validation.SecurityDepositValidator; import bisq.core.app.BisqEnvironment; import bisq.core.btc.Restrictions; -import bisq.core.btc.wallet.WalletsSetup; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.locale.CurrencyUtil; import bisq.core.locale.Res; import bisq.core.locale.TradeCurrency; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModel.java b/desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModel.java index c0c2bc3d89..65e0d84dcc 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModel.java @@ -27,7 +27,7 @@ import bisq.desktop.util.validation.FiatPriceValidator; import bisq.desktop.util.validation.FiatVolumeValidator; import bisq.desktop.util.validation.SecurityDepositValidator; -import bisq.core.btc.wallet.WalletsSetup; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.provider.price.PriceFeedService; import bisq.core.user.Preferences; import bisq.core.util.BSFormatter; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java index b335faf988..d4f6599231 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java @@ -27,7 +27,7 @@ import bisq.desktop.main.overlays.popups.Popup; import bisq.desktop.util.GUIUtil; import bisq.desktop.util.validation.BtcValidator; -import bisq.core.btc.wallet.WalletsSetup; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.locale.CurrencyUtil; import bisq.core.locale.Res; import bisq.core.monetary.Price; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/EmptyWalletWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/EmptyWalletWindow.java index 2281ed7216..6740c379f6 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/EmptyWalletWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/EmptyWalletWindow.java @@ -25,10 +25,10 @@ import bisq.desktop.util.GUIUtil; import bisq.desktop.util.Transitions; import bisq.core.btc.Restrictions; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.BsqWalletService; import bisq.core.btc.wallet.BtcWalletService; import bisq.core.btc.wallet.WalletService; -import bisq.core.btc.wallet.WalletsSetup; import bisq.core.locale.Res; import bisq.core.offer.OpenOfferManager; import bisq.core.util.BSFormatter; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java index 5b45e9e2e5..41d34750b6 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java @@ -24,10 +24,10 @@ import bisq.desktop.util.GUIUtil; import bisq.core.btc.exceptions.TransactionVerificationException; import bisq.core.btc.exceptions.WalletException; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.TradeWalletService; import bisq.core.btc.wallet.TxBroadcastException; import bisq.core.btc.wallet.TxBroadcaster; -import bisq.core.btc.wallet.WalletsSetup; import bisq.network.p2p.P2PService; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java b/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java index 561e667d59..0d62d5249d 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java @@ -26,7 +26,7 @@ import bisq.desktop.util.validation.FiatPriceValidator; import bisq.desktop.util.validation.FiatVolumeValidator; import bisq.desktop.util.validation.SecurityDepositValidator; -import bisq.core.btc.wallet.WalletsSetup; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.offer.OpenOffer; import bisq.core.provider.price.PriceFeedService; import bisq.core.user.Preferences; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java index c8e5411ae9..60e6cbeacc 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java @@ -30,8 +30,8 @@ import bisq.desktop.util.GUIUtil; import bisq.core.arbitration.Dispute; import bisq.core.arbitration.DisputeAlreadyOpenException; import bisq.core.arbitration.DisputeManager; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.WalletsSetup; import bisq.core.locale.Res; import bisq.core.offer.Offer; import bisq.core.offer.OfferPayload; diff --git a/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java b/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java index c37f8ac8c4..d2d5a4c155 100644 --- a/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java +++ b/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java @@ -30,7 +30,7 @@ import bisq.desktop.util.GUIUtil; import bisq.core.app.BisqEnvironment; import bisq.core.btc.BitcoinNodes; -import bisq.core.btc.wallet.WalletsSetup; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.filter.Filter; import bisq.core.filter.FilterManager; import bisq.core.locale.Res; diff --git a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java b/desktop/src/main/java/bisq/desktop/util/GUIUtil.java index ceed04e245..eca804a491 100644 --- a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java +++ b/desktop/src/main/java/bisq/desktop/util/GUIUtil.java @@ -22,8 +22,8 @@ import bisq.desktop.components.indicator.TxConfidenceIndicator; import bisq.desktop.main.overlays.popups.Popup; import bisq.core.app.BisqEnvironment; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.WalletsManager; -import bisq.core.btc.wallet.WalletsSetup; import bisq.core.locale.Country; import bisq.core.locale.CountryUtil; import bisq.core.locale.CurrencyUtil; diff --git a/monitor/src/main/java/bisq/monitor/MonitorAppSetup.java b/monitor/src/main/java/bisq/monitor/MonitorAppSetup.java index 947bf554c7..6a6bfa66c9 100644 --- a/monitor/src/main/java/bisq/monitor/MonitorAppSetup.java +++ b/monitor/src/main/java/bisq/monitor/MonitorAppSetup.java @@ -21,7 +21,7 @@ import bisq.monitor.metrics.p2p.MonitorP2PService; import bisq.core.app.BisqEnvironment; import bisq.core.app.SetupUtils; -import bisq.core.btc.wallet.WalletsSetup; +import bisq.core.btc.setup.WalletsSetup; import bisq.network.crypto.EncryptionService; import bisq.network.p2p.network.SetupListener; diff --git a/monitor/src/main/java/bisq/monitor/metrics/MetricsModel.java b/monitor/src/main/java/bisq/monitor/metrics/MetricsModel.java index ddac2e4243..3508b8132d 100644 --- a/monitor/src/main/java/bisq/monitor/metrics/MetricsModel.java +++ b/monitor/src/main/java/bisq/monitor/metrics/MetricsModel.java @@ -20,7 +20,7 @@ package bisq.monitor.metrics; import bisq.monitor.MonitorOptionKeys; import bisq.core.btc.BitcoinNodes; -import bisq.core.btc.wallet.WalletsSetup; +import bisq.core.btc.setup.WalletsSetup; import bisq.core.locale.Res; import bisq.network.p2p.NodeAddress;