v0.8.55 fix and changes

CMakeLists.txt

@@ -135,6 +135,10 @@ endif()
 find_library(SODIUM_LIBRARY sodium REQUIRED)
 message(STATUS "Using libsodium library at ${SODIUM_LIBRARY}")
 
+# monero includes real sodium headers not present in the vendored stubs
+find_path(SODIUM_INCLUDE_PATH sodium/crypto_shorthash_siphash24.h REQUIRED)
+message(STATUS "Using libsodium include dir at ${SODIUM_INCLUDE_PATH}")
+
 ############
 # HIDAPI
 ############
@@ -321,6 +325,7 @@ target_include_directories(monero-java PUBLIC
   "${MONERO_PROJECT_SRC}/wallet/api"
   ${Boost_INCLUDE_DIR}
   ${OPENSSL_INCLUDE_DIR}
+  ${SODIUM_INCLUDE_PATH}
 )
 
 if (APPLE)

README.md

@@ -97,15 +97,15 @@ walletFull.close(true);
 
 #### For Gradle, add to build.gradle:
 
-`compile 'io.github.woodser:monero-java:0.8.54'`
+`compile 'io.github.woodser:monero-java:0.8.55'`
 
 #### For Maven, add to pom.xml:
 
 ```xml
 <dependency>
   <groupId>io.github.woodser</groupId>
   <artifactId>monero-java</artifactId>
-  <version>0.8.54</version>
+  <version>0.8.55</version>
 </dependency>
 ```
 

docs/javadocs/constant-values.html

@@ -70,7 +70,7 @@ <h2 title="monero.common.*">monero.common.*</h2>
 <div class="table-header col-last">Value</div>
 <div class="col-first even-row-color"><code id="monero.common.MoneroUtils.RING_SIZE">public&nbsp;static&nbsp;final&nbsp;int</code></div>
 <div class="col-second even-row-color"><code><a href="monero/common/MoneroUtils.html#RING_SIZE">RING_SIZE</a></code></div>
-<div class="col-last even-row-color"><code>12</code></div>
+<div class="col-last even-row-color"><code>16</code></div>
 </div>
 </li>
 <li>

docs/javadocs/monero/wallet/MoneroWalletFull.html

@@ -1126,7 +1126,7 @@ <h3>connectionManagerListener</h3>
 <li>
 <section class="detail" id="isClosed">
 <h3>isClosed</h3>
-<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name">isClosed</span></div>
+<div class="member-signature"><span class="modifiers">protected volatile</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name">isClosed</span></div>
 </section>
 </li>
 </ul>

docs/javadocs/monero/wallet/MoneroWalletRpc.html

@@ -1129,7 +1129,7 @@ <h3>connectionManagerListener</h3>
 <li>
 <section class="detail" id="isClosed">
 <h3>isClosed</h3>
-<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name">isClosed</span></div>
+<div class="member-signature"><span class="modifiers">protected volatile</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name">isClosed</span></div>
 </section>
 </li>
 </ul>

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.github.woodser</groupId>
 	<artifactId>monero-java</artifactId>
-	<version>0.8.54</version>
+	<version>0.8.55</version>
 	<name>Monero Java Library</name>
 	<description>A Java library for using Monero</description>
 	<url>https://github.com/woodser/monero-java</url>
@@ -97,7 +97,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
-			<version>5.6.2</version>
+			<version>5.6.4</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-codec</groupId>

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.54";
+    return "0.8.55";
   }
 
   /**
@@ -142,7 +142,7 @@ public static boolean isNativeLibraryLoaded() {
     }
   }
 
-  public static final int RING_SIZE = 12; // network-enforced ring size
+  public static final int RING_SIZE = 16; // network-enforced ring size
 
   private static int LOG_LEVEL = 0;
   private static long AU_PER_XMR = 1000000000000l;

src/main/java/monero/wallet/MoneroWalletDefault.java

@@ -64,7 +64,7 @@ abstract class MoneroWalletDefault implements MoneroWallet {
   protected Set<MoneroWalletListenerI> listeners;
   protected MoneroConnectionManager connectionManager;
   protected MoneroConnectionManagerListener connectionManagerListener;
-  protected boolean isClosed = false;
+  protected volatile boolean isClosed = false;
 
   public MoneroWalletDefault() {
     this.listeners = new LinkedHashSet<MoneroWalletListenerI>();