Skip to content

Commit

Permalink
update to monero-java 0.8.29 to fix #995
Browse files Browse the repository at this point in the history
  • Loading branch information
woodser committed Jun 7, 2024
1 parent 31a5878 commit 99f41e0
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ configure(subprojects) {
gsonVersion = '2.8.5'
guavaVersion = '32.1.1-jre'
guiceVersion = '7.0.0'
moneroJavaVersion = '0.8.27'
moneroJavaVersion = '0.8.29'
httpclient5Version = '5.0'
hamcrestVersion = '2.2'
httpclientVersion = '4.5.12'
Expand Down
24 changes: 12 additions & 12 deletions core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,18 @@ public static void printTxs(String tracePrefix, MoneroTxWallet... txs) {

private void initialize() {

// try to load native monero library
if (useNativeXmrWallet && !MoneroUtils.isNativeLibraryLoaded()) {
try {
MoneroUtils.loadNativeLibrary();
} catch (Exception | UnsatisfiedLinkError e) {
log.warn("Failed to load Monero native libraries: " + e.getMessage());
}
}
String appliedMsg = "Monero native libraries applied: " + isNativeLibraryApplied();
if (useNativeXmrWallet && !isNativeLibraryApplied()) log.warn(appliedMsg);
else log.info(appliedMsg);

// listen for connection changes
xmrConnectionService.addConnectionListener(connection -> {

Expand All @@ -1290,18 +1302,6 @@ private void initialize() {
walletInitListener = (obs, oldVal, newVal) -> initMainWalletIfConnected();
xmrConnectionService.downloadPercentageProperty().addListener(walletInitListener);
initMainWalletIfConnected();

// try to load native monero library
if (useNativeXmrWallet && !MoneroUtils.isNativeLibraryLoaded()) {
try {
MoneroUtils.loadNativeLibrary();
} catch (Exception | UnsatisfiedLinkError e) {
log.warn("Failed to load Monero native libraries: " + e.getMessage());
}
}
String appliedMsg = "Monero native libraries applied: " + isNativeLibraryApplied();
if (useNativeXmrWallet && !isNativeLibraryApplied()) log.warn(appliedMsg);
else log.info(appliedMsg);
}

private void initMainWalletIfConnected() {
Expand Down
6 changes: 3 additions & 3 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -886,9 +886,9 @@
<sha256 value="c92e2ca40a3f2474d61e56831aeb379cf8ae3dddeea61b4a828cee2d99f71f38" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.github.woodser" name="monero-java" version="0.8.27">
<artifact name="monero-java-0.8.27.jar">
<sha256 value="8bb6c4288b9490247b60d8d4955175bffc83124bf5e7ad4cdb17e19c4479d378" origin="Generated by Gradle"/>
<component group="io.github.woodser" name="monero-java" version="0.8.29">
<artifact name="monero-java-0.8.29.jar">
<sha256 value="41eba8c84a1b1c99f209628fdc8302b493b629cedadc790774cb215da2f08b4d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.grpc" name="grpc-api" version="1.42.1">
Expand Down

0 comments on commit 99f41e0

Please sign in to comment.