Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2024-10-01 01:35:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

update monero-java (v0.8.0) and monero-project (v0.18.2.2 w/ extensions)

Browse Source 
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)
This commit is contained in:
woodser 2023-07-25 08:19:17 -04:00
parent 6188905848
commit 13d87a32a5
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build.gradle
View File

@ -48,7 +48,7 @@ configure(subprojects) {
gsonVersion = '2.8.5' gsonVersion = '2.8.5'
guavaVersion = '30.1.1-jre' guavaVersion = '30.1.1-jre'
guiceVersion = '4.2.2' guiceVersion = '4.2.2'
moneroJavaVersion = '0.7.16' moneroJavaVersion = '0.8.0'
httpclient5Version = '5.0' httpclient5Version = '5.0'
hamcrestVersion = '2.2' hamcrestVersion = '2.2'
httpclientVersion = '4.5.12' httpclientVersion = '4.5.12'
@ -425,12 +425,12 @@ configure(project(':core')) {
doLast { doLast {
// get monero binaries download url // get monero binaries download url
Map moneroBinaries = [ Map moneroBinaries = [
'linux' : 'https://github.com/haveno-dex/monero/releases/download/testing12/monero-bins-haveno-linux.tar.gz', 'linux' : 'https://github.com/haveno-dex/monero/releases/download/testing13/monero-bins-haveno-linux.tar.gz',
'linux-sha256' : 'c782448567b12f2c8a213f3aa170ae98ea218b43b38db21c7126ffc162897b8e', 'linux-sha256' : 'eac55092b97162854f2a94f7895d52cf4a20eba0a55a1769ce053060d6be6195',
'mac' : 'https://github.com/haveno-dex/monero/releases/download/testing12/monero-bins-haveno-mac.tar.gz', 'mac' : 'https://github.com/haveno-dex/monero/releases/download/testing13/monero-bins-haveno-mac.tar.gz',
'mac-sha256' : '0bd4e53ddc0cca1de6f2df401d6b0d6b4fca6808f3f0b56e5b186541dc09681a', 'mac-sha256' : 'e7bf40ef35cb278649c63f8651cee6124d4a5e97448dfa407b193572ebd85fb6',
'windows' : 'https://github.com/haveno-dex/monero/releases/download/testing12/monero-bins-haveno-windows.zip', 'windows' : 'https://github.com/haveno-dex/monero/releases/download/testing13/monero-bins-haveno-windows.zip',
'windows-sha256': 'c060cdc177122933d32220c276a510e98c8a5b061b113170ce397049c11a7eb2' 'windows-sha256': 'f7da08d793041103c069b23229040fc4f9632009317b84d201f63f477d3ca3dd'
] ]
String osKey String osKey

2
core/src/main/java/haveno/core/api/CoreWalletsService.java
View File

@ -130,7 +130,7 @@ class CoreWalletsService {
} }
String getXmrSeed() { String getXmrSeed() {
return xmrWalletService.getWallet().getMnemonic(); return xmrWalletService.getWallet().getSeed();
} }
String getXmrPrimaryAddress() { String getXmrPrimaryAddress() {

2
core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
View File

@ -511,7 +511,7 @@ public class XmrWalletService {
} }
// verify unlock height // 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 // verify miner fee
BigInteger feeEstimate = getFeeEstimate(tx.getWeight()); BigInteger feeEstimate = getFeeEstimate(tx.getWeight());

6
desktop/src/main/java/haveno/desktop/main/account/content/seedwords/SeedWordsView.java
View File

@ -183,13 +183,13 @@ public class SeedWordsView extends ActivatableView<GridPane, Void> {
.actionButtonText(Res.get("account.seed.warn.noPw.yes")) .actionButtonText(Res.get("account.seed.warn.noPw.yes"))
.onAction(() -> { .onAction(() -> {
DontShowAgainLookup.dontShowAgain(key, true); DontShowAgainLookup.dontShowAgain(key, true);
initSeedWords(xmrWalletService.getWallet().getMnemonic()); initSeedWords(xmrWalletService.getWallet().getSeed());
showSeedScreen(); showSeedScreen();
}) })
.closeButtonText(Res.get("shared.no")) .closeButtonText(Res.get("shared.no"))
.show(); .show();
} else { } else {
initSeedWords(xmrWalletService.getWallet().getMnemonic()); initSeedWords(xmrWalletService.getWallet().getSeed());
showSeedScreen(); showSeedScreen();
} }
} }
@ -214,7 +214,7 @@ public class SeedWordsView extends ActivatableView<GridPane, Void> {
private void askForPassword() { private void askForPassword() {
walletPasswordWindow.headLine(Res.get("account.seed.enterPw")).onSuccess(() -> { walletPasswordWindow.headLine(Res.get("account.seed.enterPw")).onSuccess(() -> {
initSeedWords(xmrWalletService.getWallet().getMnemonic()); initSeedWords(xmrWalletService.getWallet().getSeed());
showSeedScreen(); showSeedScreen();
}).hideForgotPasswordButton().show(); }).hideForgotPasswordButton().show();
} }

6
gradle/verification-metadata.xml
View File

@ -1111,9 +1111,9 @@
<sha256 value="4728eddd64e6ae3e1f205a775c6a327b24bd990b86d528584a17450a8b5f00d6" origin="Generated by Gradle"/> <sha256 value="4728eddd64e6ae3e1f205a775c6a327b24bd990b86d528584a17450a8b5f00d6" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="io.github.monero-ecosystem" name="monero-java" version="0.7.16"> <component group="io.github.monero-ecosystem" name="monero-java" version="0.8.0">
<artifact name="monero-java-0.7.16.jar"> <artifact name="monero-java-0.8.0.jar">
<sha256 value="2628b54829a994f6b1f560541df9b2a6b3c501cdb178b4a64c7acc3f405e7ba8" origin="Generated by Gradle"/> <sha256 value="2fc5d548991cc1b55698ba858b7990d6dd8a8bc226e8f7c5c0d6955aab104513" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="io.github.resilience4j" name="resilience4j-all" version="1.7.0"> <component group="io.github.resilience4j" name="resilience4j-all" version="1.7.0">