Move WalletService into Bisq 2 specific code

bisq-network · Sep 20, 2024 · 0914966 · 0914966
1 parent 21e2b57
commit 0914966
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 13 deletions.
diff --git a/apps/desktop/desktop-app/build.gradle.kts b/apps/desktop/desktop-app/build.gradle.kts
@@ -55,6 +55,7 @@ dependencies {
 
     implementation("network:network")
     implementation("bitcoind:core")
+    implementation("wallets:wallet")
     // implementation("wallets:electrum")
     // implementation("wallets:bitcoind")
 

diff --git a/apps/desktop/desktop/build.gradle.kts b/apps/desktop/desktop/build.gradle.kts
@@ -40,6 +40,7 @@ dependencies {
     implementation("network:network-identity")
 
     implementation("bitcoind:core")
+    implementation("wallets:wallet")
     // implementation("wallets:electrum")
     // implementation("wallets:bitcoind")
 

diff --git a/apps/rest-api-app/build.gradle.kts b/apps/rest-api-app/build.gradle.kts
@@ -28,6 +28,7 @@ dependencies {
     implementation("network:network-common")
     implementation("network:network")
     implementation("bitcoind:core")
+    implementation("wallets:wallet")
 
     implementation(libs.typesafe.config)
     implementation(libs.bundles.glassfish.jersey)

diff --git a/apps/rest-api-app/src/main/java/bisq/rest_api/RestApiApplicationService.java b/apps/rest-api-app/src/main/java/bisq/rest_api/RestApiApplicationService.java
@@ -37,8 +37,8 @@
 import bisq.support.SupportService;
 import bisq.trade.TradeService;
 import bisq.user.UserService;
-import bisq.wallets.core.BitcoinWalletSelection;
 import bisq.wallets.core.WalletService;
+import bisq.wallets.core.BitcoinWalletSelection;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/bisq-easy/build.gradle.kts b/bisq-easy/build.gradle.kts
@@ -21,6 +21,7 @@ dependencies {
     implementation("network:network")
     implementation("network:network-identity")
     implementation("bitcoind:core")
+    implementation("wallets:wallet")
     // implementation("wallets:electrum")
     // implementation("wallets:bitcoind")
 

diff --git a/wallets/electrum/build.gradle.kts b/wallets/electrum/build.gradle.kts
@@ -21,6 +21,7 @@ dependencies {
     api("bitcoind:core")
     implementation("bitcoind:json-rpc")
     implementation("bitcoind:regtest")
+    implementation("wallets:wallet")
 
     implementation(project(":process"))
     implementation(libs.typesafe.config)

diff --git a/wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumWalletService.java b/wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumWalletService.java
@@ -21,14 +21,14 @@
 import bisq.common.observable.Observable;
 import bisq.common.observable.collection.ObservableSet;
 import bisq.common.util.NetworkUtils;
+import bisq.wallets.bitcoind.RpcConfig;
 import bisq.wallets.core.WalletService;
 import bisq.wallets.core.model.Transaction;
 import bisq.wallets.core.model.TransactionInfo;
 import bisq.wallets.core.model.Utxo;
 import bisq.wallets.electrum.notifications.ElectrumNotifyApi;
 import bisq.wallets.electrum.notifications.ElectrumNotifyWebServer;
 import bisq.wallets.electrum.rpc.ElectrumProcessConfig;
-import bisq.wallets.json_rpc.RpcConfig;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
@@ -97,7 +97,14 @@ public ElectrumWalletService(Config config, Path bisqDataDir) {
     @Override
     public CompletableFuture<Boolean> initialize() {
         log.info("initialize");
-        return initializeWallet(processConfig.getElectrumConfig().toRpcConfig(), Optional.empty());
+        bisq.wallets.json_rpc.RpcConfig jsonRpcConfig = processConfig.getElectrumConfig().toRpcConfig();
+        bisq.wallets.bitcoind.RpcConfig rpcConfig = RpcConfig.builder()
+                .hostname(jsonRpcConfig.getHostname())
+                .port(jsonRpcConfig.getPort())
+                .user(jsonRpcConfig.getUser())
+                .password(jsonRpcConfig.getPassword())
+                .build();
+        return initializeWallet(rpcConfig, Optional.empty());
     }
 
     @Override
@@ -115,8 +122,10 @@ public CompletableFuture<Boolean> shutdown() {
     // WalletService
     ///////////////////////////////////////////////////////////////////////////////////////////////////
 
+
     @Override
-    public CompletableFuture<Boolean> initializeWallet(RpcConfig rpcConfig, Optional<String> walletPassphrase) {
+    public CompletableFuture<Boolean> initializeWallet(bisq.wallets.bitcoind.RpcConfig rpcConfig,
+                                                       Optional<String> walletPassphrase) {
         return CompletableFuture.supplyAsync(() -> {
             long ts = System.currentTimeMillis();
             electrumProcess.start();

diff --git a/wallets/wallet/src/main/java/bisq/wallets/bitcoind/AbstractBitcoindWalletService.java b/wallets/wallet/src/main/java/bisq/wallets/bitcoind/AbstractBitcoindWalletService.java
@@ -116,15 +116,8 @@ public CompletableFuture<Boolean> shutdown() {
 
 
     @Override
-    public CompletableFuture<Boolean> initializeWallet(bisq.wallets.json_rpc.RpcConfig jsonRpcConfig,
+    public CompletableFuture<Boolean> initializeWallet(RpcConfig rpcConfig,
                                                        Optional<String> walletPassphrase) {
-        RpcConfig rpcConfig = RpcConfig.builder()
-                .hostname(jsonRpcConfig.getHostname())
-                .port(jsonRpcConfig.getPort())
-                .user(jsonRpcConfig.getUser())
-                .password(jsonRpcConfig.getPassword())
-                .build();
-
         if (wallet.isEmpty()) {
             boolean isSuccess = verifyRpcConfigAndCreateWallet(Optional.of(rpcConfig));
 

diff --git a/...java/bisq/wallets/core/WalletService.java → ...java/bisq/wallets/core/WalletService.java b/...java/bisq/wallets/core/WalletService.java → ...java/bisq/wallets/core/WalletService.java
@@ -21,10 +21,10 @@
 import bisq.common.monetary.Coin;
 import bisq.common.observable.Observable;
 import bisq.common.observable.collection.ObservableSet;
+import bisq.wallets.bitcoind.RpcConfig;
 import bisq.wallets.core.model.Transaction;
 import bisq.wallets.core.model.TransactionInfo;
 import bisq.wallets.core.model.Utxo;
-import bisq.wallets.json_rpc.RpcConfig;
 
 import java.util.List;
 import java.util.Optional;