From 13d87a32a5c31e077d5678399df26a97886c9d15 Mon Sep 17 00:00:00 2001 From: woodser Date: Tue, 25 Jul 2023 08:19:17 -0400 Subject: [PATCH] update monero-java (v0.8.0) and monero-project (v0.18.2.2 w/ extensions) subtract mining fees from payment destinations optimize wallet rpc calls for periodic refresh from 3 to 1 fixes to saving wallet files respect frozen outputs restore from multisig seed (experimental) --- build.gradle | 14 +++++++------- .../java/haveno/core/api/CoreWalletsService.java | 2 +- .../haveno/core/xmr/wallet/XmrWalletService.java | 2 +- .../account/content/seedwords/SeedWordsView.java | 6 +++--- gradle/verification-metadata.xml | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 77224c99c8..206a5b3d98 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ configure(subprojects) { gsonVersion = '2.8.5' guavaVersion = '30.1.1-jre' guiceVersion = '4.2.2' - moneroJavaVersion = '0.7.16' + moneroJavaVersion = '0.8.0' httpclient5Version = '5.0' hamcrestVersion = '2.2' httpclientVersion = '4.5.12' @@ -425,12 +425,12 @@ configure(project(':core')) { doLast { // get monero binaries download url Map moneroBinaries = [ - 'linux' : 'https://github.com/haveno-dex/monero/releases/download/testing12/monero-bins-haveno-linux.tar.gz', - 'linux-sha256' : 'c782448567b12f2c8a213f3aa170ae98ea218b43b38db21c7126ffc162897b8e', - 'mac' : 'https://github.com/haveno-dex/monero/releases/download/testing12/monero-bins-haveno-mac.tar.gz', - 'mac-sha256' : '0bd4e53ddc0cca1de6f2df401d6b0d6b4fca6808f3f0b56e5b186541dc09681a', - 'windows' : 'https://github.com/haveno-dex/monero/releases/download/testing12/monero-bins-haveno-windows.zip', - 'windows-sha256': 'c060cdc177122933d32220c276a510e98c8a5b061b113170ce397049c11a7eb2' + 'linux' : 'https://github.com/haveno-dex/monero/releases/download/testing13/monero-bins-haveno-linux.tar.gz', + 'linux-sha256' : 'eac55092b97162854f2a94f7895d52cf4a20eba0a55a1769ce053060d6be6195', + 'mac' : 'https://github.com/haveno-dex/monero/releases/download/testing13/monero-bins-haveno-mac.tar.gz', + 'mac-sha256' : 'e7bf40ef35cb278649c63f8651cee6124d4a5e97448dfa407b193572ebd85fb6', + 'windows' : 'https://github.com/haveno-dex/monero/releases/download/testing13/monero-bins-haveno-windows.zip', + 'windows-sha256': 'f7da08d793041103c069b23229040fc4f9632009317b84d201f63f477d3ca3dd' ] String osKey diff --git a/core/src/main/java/haveno/core/api/CoreWalletsService.java b/core/src/main/java/haveno/core/api/CoreWalletsService.java index 65513de865..dfdb79d390 100644 --- a/core/src/main/java/haveno/core/api/CoreWalletsService.java +++ b/core/src/main/java/haveno/core/api/CoreWalletsService.java @@ -130,7 +130,7 @@ class CoreWalletsService { } String getXmrSeed() { - return xmrWalletService.getWallet().getMnemonic(); + return xmrWalletService.getWallet().getSeed(); } String getXmrPrimaryAddress() { diff --git a/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java b/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java index 041db70a8b..1cfd0f4eba 100644 --- a/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java +++ b/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java @@ -511,7 +511,7 @@ public class XmrWalletService { } // verify unlock height - if (tx.getUnlockHeight() != 0) throw new RuntimeException("Unlock height must be 0"); + if (!BigInteger.valueOf(0).equals(tx.getUnlockTime())) throw new RuntimeException("Unlock height must be 0"); // verify miner fee BigInteger feeEstimate = getFeeEstimate(tx.getWeight()); diff --git a/desktop/src/main/java/haveno/desktop/main/account/content/seedwords/SeedWordsView.java b/desktop/src/main/java/haveno/desktop/main/account/content/seedwords/SeedWordsView.java index 2e8d3679e2..6cac3ee56a 100644 --- a/desktop/src/main/java/haveno/desktop/main/account/content/seedwords/SeedWordsView.java +++ b/desktop/src/main/java/haveno/desktop/main/account/content/seedwords/SeedWordsView.java @@ -183,13 +183,13 @@ public class SeedWordsView extends ActivatableView { .actionButtonText(Res.get("account.seed.warn.noPw.yes")) .onAction(() -> { DontShowAgainLookup.dontShowAgain(key, true); - initSeedWords(xmrWalletService.getWallet().getMnemonic()); + initSeedWords(xmrWalletService.getWallet().getSeed()); showSeedScreen(); }) .closeButtonText(Res.get("shared.no")) .show(); } else { - initSeedWords(xmrWalletService.getWallet().getMnemonic()); + initSeedWords(xmrWalletService.getWallet().getSeed()); showSeedScreen(); } } @@ -214,7 +214,7 @@ public class SeedWordsView extends ActivatableView { private void askForPassword() { walletPasswordWindow.headLine(Res.get("account.seed.enterPw")).onSuccess(() -> { - initSeedWords(xmrWalletService.getWallet().getMnemonic()); + initSeedWords(xmrWalletService.getWallet().getSeed()); showSeedScreen(); }).hideForgotPasswordButton().show(); } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 8472b2c7c5..0faa0f18dc 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1111,9 +1111,9 @@ - - - + + +