Merge pull request #47 from TheBlueMatt/main

v0.0.101.2

Author: TheBlueMatt

.gitignore

@@ -7,3 +7,4 @@ src/main/java/org/ldk/impl/version.java
 src/main/jni/version.c
 ts/version.ts
 ts/version.c
+**/*.class

android-build.sh

@@ -57,10 +57,10 @@ ls ldk-java-classes.jar
 rm -rf aar
 mkdir aar
 cp -r "$3/"* ./aar/
-mkdir -p ./aar/jni/{arm64,armeabi,x86,x86_64}
+mkdir -p ./aar/jni/{armeabi-v7a,arm64-v8a,x86,x86_64}
 
-cp liblightningjni_release_aarch64-linux-android.so ./aar/jni/arm64/liblightningjni.so
-cp liblightningjni_release_armv7-linux-androideabi.so ./aar/jni/armeabi/liblightningjni.so
+cp liblightningjni_release_aarch64-linux-android.so ./aar/jni/arm64-v8a/liblightningjni.so
+cp liblightningjni_release_armv7-linux-androideabi.so ./aar/jni/armeabi-v7a/liblightningjni.so
 cp liblightningjni_release_i686-linux-android.so ./aar/jni/x86/liblightningjni.so
 cp liblightningjni_release_x86_64-linux-android.so ./aar/jni/x86_64/liblightningjni.so
 cp ldk-java-classes.jar ./aar/classes.jar

gen_type_mapping.py

@@ -240,6 +240,7 @@ def map_type_with_info(self, ty_info, print_void, ret_arr_len, is_free, holds_re
                     if (ty_info.rust_obj.replace("LDK", "") + "_clone") in self.clone_fns:
                         # TODO: This is a bit too naive, even with the checks above, we really need to know if rust wants a ref or not, not just if its pass as a ptr.
                         opaque_arg_conv = opaque_arg_conv + "\n" + ty_info.var_name + "_conv = " + ty_info.rust_obj.replace("LDK", "") + "_clone(&" + ty_info.var_name + "_conv);"
+                        from_hu_conv = (from_hu_conv[0], "")
                     elif ty_info.passed_as_ptr:
                         opaque_arg_conv = opaque_arg_conv + "\n// Warning: we need a move here but no clone is available for " + ty_info.rust_obj
                         # TODO: Once we support features cloning (which just isn't in C yet), we can make this a compile error instead!
@@ -422,17 +423,19 @@ def map_type_with_info(self, ty_info, print_void, ret_arr_len, is_free, holds_re
                 assert(not is_free)
                 if ty_info.rust_obj in self.complex_enums:
                     ret_conv = ("uint64_t ret_" + ty_info.var_name + " = (uint64_t)", " | 1; // Warning: We should clone here!")
+                    from_hu_sfx = "this.ptrs_to.add(" + ty_info.var_name + ")"
                     if ty_info.rust_obj.replace("LDK", "") + "_clone" in self.clone_fns:
                         ret_conv_pfx = ty_info.rust_obj + " *ret_" + ty_info.var_name + " = MALLOC(sizeof(" + ty_info.rust_obj + "), \"" + ty_info.rust_obj + " ret conversion\");\n"
                         ret_conv_pfx += "*ret_" + ty_info.var_name + " = " + ty_info.rust_obj.replace("LDK", "") + "_clone("
                         ret_conv = (ret_conv_pfx, ");")
+                        from_hu_sfx = ""
                     return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
                         arg_conv = ty_info.rust_obj + "* " + ty_info.var_name + "_conv = (" + ty_info.rust_obj + "*)" + ty_info.var_name + ";",
                         arg_conv_name = ty_info.var_name + "_conv", arg_conv_cleanup = None,
                         ret_conv = ret_conv, ret_conv_name = "(uint64_t)ret_" + ty_info.var_name,
                         to_hu_conv = ty_info.java_hu_ty + " " + ty_info.var_name + "_hu_conv = " + ty_info.java_hu_ty + ".constr_from_ptr(" + ty_info.var_name + ");",
                         to_hu_conv_name = ty_info.var_name + "_hu_conv",
-                        from_hu_conv = (ty_info.var_name + " == null ? 0 : " + ty_info.var_name + ".ptr & ~1", "this.ptrs_to.add(" + ty_info.var_name + ")"))
+                        from_hu_conv = (ty_info.var_name + " == null ? 0 : " + ty_info.var_name + ".ptr & ~1", from_hu_sfx))
                 elif ty_info.rust_obj in self.trait_structs:
                     if ty_info.nonnull_ptr:
                         arg_conv = ty_info.rust_obj + "* " + ty_info.var_name + "_conv = (" + ty_info.rust_obj + "*)(((uint64_t)" + ty_info.var_name + ") & ~1);"
@@ -457,7 +460,7 @@ def map_type_with_info(self, ty_info, print_void, ret_arr_len, is_free, holds_re
                             ret_conv_name = "(uint64_t)" + ty_info.var_name + "_clone",
                             to_hu_conv = ty_info.java_hu_ty + " ret_hu_conv = new " + ty_info.java_hu_ty + "(null, " + ty_info.var_name + ");\nret_hu_conv.ptrs_to.add(this);",
                             to_hu_conv_name = "ret_hu_conv",
-                            from_hu_conv = (ty_info.var_name + " == null ? 0 : " + ty_info.var_name + ".ptr", "this.ptrs_to.add(" + ty_info.var_name + ")"))
+                            from_hu_conv = (ty_info.var_name + " == null ? 0 : " + ty_info.var_name + ".ptr", ""))
                     else:
                         return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
                             arg_conv = arg_conv, arg_conv_name = arg_conv_name, arg_conv_cleanup = None,

src/main/java/org/ldk/batteries/NioPeerHandler.java

@@ -3,6 +3,7 @@
 import org.ldk.structs.*;
 
 import java.io.IOException;
+import java.util.LinkedList;
 import java.net.SocketAddress;
 import java.net.StandardSocketOptions;
 import java.nio.Buffer;
@@ -239,6 +240,11 @@ public void disconnect(byte[] their_node_id) {
         this.peer_manager.disconnect_by_node_id(their_node_id, false);
     }
 
+    /**
+     * Before shutdown, we have to ensure all of our listening sockets are closed manually, as they appear
+     * to otherwise remain open and lying around on OSX (though no other platform).
+     */
+    private LinkedList<ServerSocketChannel> listening_sockets = new LinkedList();
     /**
      * Binds a listening socket to the given address, accepting incoming connections and handling them on the background
      * thread.
@@ -248,9 +254,13 @@ public void disconnect(byte[] their_node_id) {
      */
     public void bind_listener(SocketAddress socket_address) throws IOException {
         ServerSocketChannel listen_channel = ServerSocketChannel.open();
+        listen_channel.setOption(StandardSocketOptions.SO_REUSEADDR, true);
         listen_channel.bind(socket_address);
         listen_channel.configureBlocking(false);
         do_selector_action(() -> listen_channel.register(this.selector, SelectionKey.OP_ACCEPT));
+        synchronized(listening_sockets) {
+            listening_sockets.add(listen_channel);
+        }
     }
 
     /**
@@ -263,6 +273,14 @@ public void interrupt() {
         try {
             io_thread.join();
         } catch (InterruptedException ignored) { }
+        synchronized(listening_sockets) {
+            try {
+                selector.close();
+                for (ServerSocketChannel chan : listening_sockets) {
+                    chan.close();
+                }
+            } catch (IOException ignored) {}
+        }
     }
 
     /**

src/main/java/org/ldk/impl/version.class

@@ -179,7 +179,6 @@ public static APIError incompatible_shutdown_script(ShutdownScript script) {
 		if (ret < 1024) { return null; }
 		APIError ret_hu_conv = APIError.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(script);
 		return ret_hu_conv;
 	}
 

src/main/java/org/ldk/structs/APIError.java

@@ -161,7 +161,6 @@ public static Balance maybe_claimable_htlcawaiting_timeout(long claimable_amount
 	 */
 	public boolean eq(Balance b) {
 		boolean ret = bindings.Balance_eq(this.ptr, b == null ? 0 : b.ptr & ~1);
-		this.ptrs_to.add(b);
 		return ret;
 	}
 

src/main/java/org/ldk/structs/Balance.java

@@ -32,7 +32,6 @@ public class BaseSign extends CommonBase {
 	private BaseSign(bindings.LDKBaseSign arg, ChannelPublicKeys pubkeys) {
 		super(bindings.LDKBaseSign_new(arg, pubkeys == null ? 0 : pubkeys.ptr & ~1));
 		this.ptrs_to.add(arg);
-		this.ptrs_to.add(pubkeys);
 		this.bindings_instance = arg;
 	}
 	@Override @SuppressWarnings("deprecation")

src/main/java/org/ldk/structs/BaseSign.java

@@ -68,7 +68,6 @@ public Balance[] get_claimable_balances(ChannelDetails[] ignored_channels) {
 			ret_conv_9_hu_conv.ptrs_to.add(this);
 			ret_conv_9_arr[j] = ret_conv_9_hu_conv;
 		}
-		for (ChannelDetails ignored_channels_conv_16: ignored_channels) { this.ptrs_to.add(ignored_channels_conv_16); };
 		return ret_conv_9_arr;
 	}
 

src/main/java/org/ldk/structs/ChainMonitor.java

@@ -58,7 +58,6 @@ public BestBlock get_best_block() {
 	 */
 	public void set_best_block(BestBlock val) {
 		bindings.ChainParameters_set_best_block(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
 	}
 
 	/**
@@ -69,7 +68,6 @@ public static ChainParameters of(org.ldk.enums.Network network_arg, BestBlock be
 		if (ret < 1024) { return null; }
 		ChainParameters ret_hu_conv = new ChainParameters(null, ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(best_block_arg);
 		return ret_hu_conv;
 	}