diff --git a/README.md b/README.md index 44c5df47..37ab22e8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Monero Java Library -A Java library for creating Monero applications using RPC or JNI bindings to [monero v0.18.5.1 'Fluorine Fermi'](https://github.com/monero-project/monero/tree/v0.18.5.1). +A Java library for creating Monero applications using RPC or JNI bindings to [monero v0.18.5.3 'Fluorine Fermi'](https://github.com/monero-project/monero/tree/v0.18.5.3). * Supports wallet and daemon RPC clients. * Supports client-side wallets using JNI bindings. @@ -97,7 +97,7 @@ walletFull.close(true); #### For Gradle, add to build.gradle: -`compile 'io.github.woodser:monero-java:0.8.60'` +`compile 'io.github.woodser:monero-java:0.8.61'` #### For Maven, add to pom.xml: @@ -105,7 +105,7 @@ walletFull.close(true); io.github.woodser monero-java - 0.8.60 + 0.8.61 ``` diff --git a/docs/monero-spec.drawio b/docs/monero-spec.drawio index 5d06c5cb..be4d34b6 100644 --- a/docs/monero-spec.drawio +++ b/docs/monero-spec.drawio @@ -1,6 +1,6 @@ - + @@ -1901,8 +1901,8 @@ - - + + @@ -2074,7 +2074,7 @@ - + diff --git a/docs/monero-spec.pdf b/docs/monero-spec.pdf index 405587a0..adaa27f4 100644 Binary files a/docs/monero-spec.pdf and b/docs/monero-spec.pdf differ diff --git a/external/monero-cpp b/external/monero-cpp index 574ad3a4..4627b20e 160000 --- a/external/monero-cpp +++ b/external/monero-cpp @@ -1 +1 @@ -Subproject commit 574ad3a4c82870d9550d003a2483e002739ec55a +Subproject commit 4627b20e4e3a0829d30f948abcfc9f5d91764879 diff --git a/pom.xml b/pom.xml index 81903840..4aaac75c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.github.woodser monero-java - 0.8.60 + 0.8.61 Monero Java Library A Java library for using Monero https://github.com/woodser/monero-java diff --git a/src/main/java/monero/common/MoneroUtils.java b/src/main/java/monero/common/MoneroUtils.java index 65e536f9..fa8415d2 100644 --- a/src/main/java/monero/common/MoneroUtils.java +++ b/src/main/java/monero/common/MoneroUtils.java @@ -42,7 +42,7 @@ public class MoneroUtils { * @return the version of this monero-java library */ public static String getVersion() { - return "0.8.60"; + return "0.8.61"; } /** diff --git a/src/main/java/monero/wallet/MoneroWalletRpc.java b/src/main/java/monero/wallet/MoneroWalletRpc.java index ca2d71f0..c2dc4979 100644 --- a/src/main/java/monero/wallet/MoneroWalletRpc.java +++ b/src/main/java/monero/wallet/MoneroWalletRpc.java @@ -1231,7 +1231,7 @@ public List createTxs(MoneroTxConfig config) { GenUtils.assertNotNull("Destination amount is not defined", destination.getAmount()); Map destinationMap = new HashMap(); destinationMap.put("address", destination.getAddress()); - destinationMap.put("amount", destination.getAmount().toString()); + destinationMap.put("amount", destination.getAmount()); destinationMaps.add(destinationMap); } if (config.getSubtractFeeFrom() != null) params.put("subtract_fee_from_outputs", config.getSubtractFeeFrom()); @@ -1626,7 +1626,7 @@ public String getReserveProofWallet(String message) { public String getReserveProofAccount(int accountIdx, BigInteger amount, String message) { Map params = new HashMap(); params.put("account_index", accountIdx); - params.put("amount", amount.toString()); + params.put("amount", amount); params.put("message", message); Map resp = rpc.sendJsonRequest("get_reserve_proof", params); Map result = (Map) resp.get("result"); @@ -1775,7 +1775,7 @@ public String getPaymentUri(MoneroTxConfig config) { GenUtils.assertNotNull("Must provide send request to create a payment URI", config); Map params = new HashMap(); params.put("address", config.getDestinations().get(0).getAddress()); - params.put("amount", config.getDestinations().get(0).getAmount() != null ? config.getDestinations().get(0).getAmount().toString() : null); + params.put("amount", config.getDestinations().get(0).getAmount()); params.put("payment_id", config.getPaymentId()); params.put("recipient_name", config.getRecipientName()); params.put("tx_description", config.getNote());