Merge branch 'woodser:master' into light-wallet

.github/workflows/label.yml

@@ -16,10 +16,10 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           issue-number: ${{ github.event.issue.number }}
           body: >
-            There is a bounty on this issue. The amount is in the title. The reward will be awarded to the first person or group of people who resolve this issue.
+            There is a bounty on this issue. The amount is in the title. The reward will be awarded to the first person or group of people whose solution is accepted and merged.
 
 
-            If you are starting to work on this bounty, please write a comment so that we can assign the issue to you. We expect contributors to provide a PR in a reasonable timeframe or, in case of an extensive work, updates on their progress. We will unassign the issue if we feel the assignee is not responsive or has abandoned the task.
+            In some cases, we may assign the issue to specific contributors. We expect contributors to provide a PR in a reasonable time frame or, in case of an extensive work, updates on their progress. We will unassign the issue if we feel the assignee is not responsive or has abandoned the task.
 
 
             Read the [full conditions and details](https://github.com/woodser/monero-java/blob/master/docs/bounties.md) of the bounty system.

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.4.1)
 if (WIN32)
   add_definitions( "-D_GLIBCXX_USE_NANOSLEEP=1" )
   add_definitions( "-DWIN32_LEAN_AND_MEAN" )
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj -O2 -fPIC -std=c++14 -F/Library/Frameworks -pthread -lcrypto -lcrypt32") 
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj -O2 -fPIC -std=c++14 -F/Library/Frameworks -pthread -lcrypto -lcrypt32 -lbcrypt") 
 else()
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++14 -F/Library/Frameworks -pthread")
 endif()
@@ -83,7 +83,7 @@ if(STATIC AND NOT IOS)
 endif()
 
 if (WIN32)
-  list(APPEND OPENSSL_LIBRARIES ws2_32 crypt32)
+  list(APPEND OPENSSL_LIBRARIES ws2_32 crypt32 bcrypt)
 endif()
 
 ######################

README.md

@@ -1,6 +1,6 @@
 # Monero Java Library
 
-A Java library for creating Monero applications using RPC and JNI bindings to [monero v0.18.3.3 'Fluorine Fermi'](https://github.com/monero-project/monero/tree/v0.18.3.3).
+A Java library for creating Monero applications using RPC and JNI bindings to [monero v0.18.3.4 'Fluorine Fermi'](https://github.com/monero-project/monero/tree/v0.18.3.4).
 
 * Supports wallet and daemon RPC clients.
 * Supports client-side wallets using JNI bindings.
@@ -85,6 +85,14 @@ assertTrue(FUNDS_RECEIVED);
 walletFull.close(true);
 ```
 
+## Documentation
+
+* [Javadoc](https://woodser.github.io/monero-java/javadocs/index.html)
+* [API and model overview with visual diagrams](https://woodser.github.io/monero-java/monero-spec.pdf)
+* [JUnit tests](src/test/java)
+* [Using TOR](docs/tor.md)
+* [monero-ts documentation](https://github.com/woodser/monero-ts#documentation) provides additional documentation which translates to monero-java
+
 ## Using monero-java in your project
 
 #### For Maven, add to pom.xml:
@@ -93,13 +101,13 @@ walletFull.close(true);
 <dependency>
   <groupId>io.github.woodser</groupId>
   <artifactId>monero-java</artifactId>
-  <version>0.8.26</version>
+  <version>0.8.31</version>
 </dependency>
 ```
 
 #### For Gradle, add to build.gradle:
 
-`compile 'io.github.woodser:monero-java:0.8.26'`
+`compile 'io.github.woodser:monero-java:0.8.32'`
 
 #### If using RPC servers:
 
@@ -112,14 +120,6 @@ walletFull.close(true);
 > 1. Install [MSYS2](https://www.msys2.org/).
 > 2. Environment variables > System variables > Path > Edit > New > C:\msys64\mingw64\bin
 
-## Documentation
-
-* [Javadoc](https://woodser.github.io/monero-java/allclasses.html)
-* [API and model overview with visual diagrams](https://woodser.github.io/monero-java/monero-spec.pdf)
-* [JUnit tests](src/test/java)
-* [Using TOR](docs/tor.md)
-* [monero-ts documentation](https://github.com/woodser/monero-ts#documentation) provides additional documentation which translates to monero-java
-
 ## Building native libraries from source
 
 If you want to use native wallets instead of monero-wallet-rpc, or if you want to process binary data, native libraries must be used for your specific platform.
@@ -154,9 +154,9 @@ For convenience, native libraries for Linux, macOS, and Windows are distributed
 6. Update packages: `pacman -Syu` and confirm at the prompts.
 7. Install dependencies. During installation, use default=all by leaving the input blank and pressing enter.
 
-    64-bit: `pacman -S mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake git`
+    64-bit: `pacman -S mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake git mingw-w64-x86_64-icu`
 
-    32-bit: `pacman -S mingw-w64-i686-toolchain make mingw-w64-i686-cmake git`
+    32-bit: `pacman -S mingw-w64-i686-toolchain make mingw-w64-i686-cmake git mingw-w64-i686-icu`
 8. Install Java JDK:
     ```
     curl -s "https://get.sdkman.io" | bash

docs/javadocs/index-files/index-18.html

@@ -1273,16 +1273,10 @@ <h2 class="title" id="I:S">S</h2>
 <dd>&nbsp;</dd>
 <dt><a href="../monero/wallet/model/MoneroSubaddress.html#setUnlockedBalance(java.math.BigInteger)" class="member-name-link">setUnlockedBalance(BigInteger)</a> - Method in class monero.wallet.model.<a href="../monero/wallet/model/MoneroSubaddress.html" title="class in monero.wallet.model">MoneroSubaddress</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="../monero/wallet/model/MoneroTxConfig.html#setUnlockTime(java.lang.Long)" class="member-name-link">setUnlockTime(Long)</a> - Method in class monero.wallet.model.<a href="../monero/wallet/model/MoneroTxConfig.html" title="class in monero.wallet.model">MoneroTxConfig</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="../monero/wallet/model/MoneroTxQuery.html#setUnlockTime(java.lang.Long)" class="member-name-link">setUnlockTime(Long)</a> - Method in class monero.wallet.model.<a href="../monero/wallet/model/MoneroTxQuery.html" title="class in monero.wallet.model">MoneroTxQuery</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="../monero/daemon/model/MoneroTx.html#setUnlockTime(java.math.BigInteger)" class="member-name-link">setUnlockTime(BigInteger)</a> - Method in class monero.daemon.model.<a href="../monero/daemon/model/MoneroTx.html" title="class in monero.daemon.model">MoneroTx</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="../monero/wallet/model/MoneroTxConfig.html#setUnlockTime(java.math.BigInteger)" class="member-name-link">setUnlockTime(BigInteger)</a> - Method in class monero.wallet.model.<a href="../monero/wallet/model/MoneroTxConfig.html" title="class in monero.wallet.model">MoneroTxConfig</a></dt>
-<dd>
-<div class="block">Set the minimum height or timestamp for the transaction to unlock.</div>
-</dd>
 <dt><a href="../monero/wallet/model/MoneroTxQuery.html#setUnlockTime(java.math.BigInteger)" class="member-name-link">setUnlockTime(BigInteger)</a> - Method in class monero.wallet.model.<a href="../monero/wallet/model/MoneroTxQuery.html" title="class in monero.wallet.model">MoneroTxQuery</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="../monero/wallet/model/MoneroTxWallet.html#setUnlockTime(java.math.BigInteger)" class="member-name-link">setUnlockTime(BigInteger)</a> - Method in class monero.wallet.model.<a href="../monero/wallet/model/MoneroTxWallet.html" title="class in monero.wallet.model">MoneroTxWallet</a></dt>

docs/javadocs/index-files/index-7.html

@@ -1594,10 +1594,6 @@ <h2 class="title" id="I:G">G</h2>
 <dd>
 <div class="block">Get the minimum height or timestamp for the transactions to unlock.</div>
 </dd>
-<dt><a href="../monero/wallet/model/MoneroTxConfig.html#getUnlockTime()" class="member-name-link">getUnlockTime()</a> - Method in class monero.wallet.model.<a href="../monero/wallet/model/MoneroTxConfig.html" title="class in monero.wallet.model">MoneroTxConfig</a></dt>
-<dd>
-<div class="block">Get the minimum height for the transaction to unlock.</div>
-</dd>
 <dt><a href="../monero/wallet/model/MoneroTxSet.html#getUnsignedTxHex()" class="member-name-link">getUnsignedTxHex()</a> - Method in class monero.wallet.model.<a href="../monero/wallet/model/MoneroTxSet.html" title="class in monero.wallet.model">MoneroTxSet</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="../monero/wallet/model/MoneroKeyImageImportResult.html#getUnspentAmount()" class="member-name-link">getUnspentAmount()</a> - Method in class monero.wallet.model.<a href="../monero/wallet/model/MoneroKeyImageImportResult.html" title="class in monero.wallet.model">MoneroKeyImageImportResult</a></dt>