Ecosystem/haveno
Ecosystem/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2024-11-16 15:58:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

show warnings from wallet disconnect on manual shutdown, not stacktraces

Browse source 
quick build haveno apps with `make haveno-apps`
upgrade to monero-java 0.5.8
This commit is contained in:
woodser 2021-11-12 14:48:28 -05:00
parent cd108387a2
commit 4000fdc1e5
3 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -1,6 +1,6 @@
# See docs/installing.md # See docs/installing.md
build: nodes localnet build-haveno build: nodes localnet haveno
clean: clean:
./gradlew clean ./gradlew clean
@ -14,9 +14,12 @@ localnet:
nodes: localnet nodes: localnet
./scripts/xmr_btc_deps.sh ./scripts/xmr_btc_deps.sh
build-haveno: haveno:
./gradlew build ./gradlew build
haveno-apps: # quick build desktop and daemon apps without tests, etc
./gradlew :core:compileJava :desktop:build
deploy: deploy:
# create a new screen session named 'localnet' # create a new screen session named 'localnet'
screen -dmS localnet screen -dmS localnet

2
build.gradle
View file

@ -40,7 +40,7 @@ configure(subprojects) {
grpcVersion = '1.25.0' grpcVersion = '1.25.0'
gsonVersion = '2.8.5' gsonVersion = '2.8.5'
guavaVersion = '28.2-jre' guavaVersion = '28.2-jre'
moneroJavaVersion = '0.5.5' moneroJavaVersion = '0.5.8'
httpclient5Version = '5.0' httpclient5Version = '5.0'
guiceVersion = '4.2.2' guiceVersion = '4.2.2'
hamcrestVersion = '1.3' hamcrestVersion = '1.3'

10
core/src/main/java/bisq/core/btc/wallet/XmrWalletService.java
View file

@ -16,8 +16,6 @@ import javax.inject.Inject;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;
import java.io.File;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.ArrayList; import java.util.ArrayList;
@ -34,9 +32,6 @@ import org.slf4j.LoggerFactory;
import lombok.Getter; import lombok.Getter;
import monero.common.MoneroUtils;
import monero.daemon.MoneroDaemon; import monero.daemon.MoneroDaemon;
import monero.wallet.MoneroWallet; import monero.wallet.MoneroWallet;
import monero.wallet.model.MoneroOutputWallet; import monero.wallet.model.MoneroOutputWallet;
@ -280,7 +275,6 @@ public class XmrWalletService {
} }
public void shutDown() { public void shutDown() {
System.out.println("XmrWalletService.shutDown()");
// collect wallets to shutdown // collect wallets to shutdown
List<MoneroWallet> openWallets = new ArrayList<MoneroWallet>(); List<MoneroWallet> openWallets = new ArrayList<MoneroWallet>();
@ -297,7 +291,7 @@ public class XmrWalletService {
public void run() { public void run() {
try { walletsSetup.getWalletConfig().closeWallet(openWallet); } try { walletsSetup.getWalletConfig().closeWallet(openWallet); }
catch (Exception e) { catch (Exception e) {
e.printStackTrace(); // exception expected on shutdown when run as daemon TODO (woodser): detect if running as daemon log.warn("Error closing monero-wallet-rpc subprocess. Was Haveno stopped manually with ctrl+c?");
} }
} }
})); }));
@ -307,12 +301,10 @@ public class XmrWalletService {
for (Thread thread : threads) thread.start(); for (Thread thread : threads) thread.start();
// wait for all threads // wait for all threads
System.out.println("Joining threads");
for (Thread thread : threads) { for (Thread thread : threads) {
try { thread.join(); } try { thread.join(); }
catch (InterruptedException e) { e.printStackTrace(); } catch (InterruptedException e) { e.printStackTrace(); }
} }
System.out.println("Done joining threads");
} }
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////