Move btc setup classes to setup package

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;

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;
 

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;

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;

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;

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;

core/src/main/java/bisq/core/btc/setup/BisqDeterministicKeyChain.java

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

core/src/main/java/bisq/core/btc/setup/BisqKeyChainFactory.java

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

core/src/main/java/bisq/core/btc/setup/BisqKeyChainGroup.java

@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.core.btc.wallet;
+package bisq.core.btc.setup;
 
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.wallet.DeterministicKeyChain;

core/src/main/java/bisq/core/btc/setup/BtcDeterministicKeyChain.java

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

core/src/main/java/bisq/core/btc/setup/BtcNodeConverter.java

@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.core.btc.wallet;
+package bisq.core.btc.setup;
 
 import bisq.core.btc.BitcoinNodes.BtcNode;
 

core/src/main/java/bisq/core/btc/setup/PeerAddressesRepository.java

@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.core.btc.wallet;
+package bisq.core.btc.setup;
 
 import bisq.core.btc.BitcoinNodes.BtcNode;
 

core/src/main/java/bisq/core/btc/setup/ProxySocketFactory.java

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

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;

core/src/main/java/bisq/core/btc/setup/WalletConfig.java

@@ -15,10 +15,11 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-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;
 

core/src/main/java/bisq/core/btc/setup/WalletNetworkConfig.java

@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.core.btc.wallet;
+package bisq.core.btc.setup;
 
 import bisq.network.Socks5MultiDiscovery;
 

core/src/main/java/bisq/core/btc/setup/WalletSetupPreferences.java

@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-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 {

core/src/main/java/bisq/core/btc/setup/WalletsSetup.java

@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-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) {

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;

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;
 

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;

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;
 

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;