class Target(Enum):
JAVA = 1,
ANDROID = 2
+ MACOS = 3
class Consts:
def __init__(self, DEBUG: bool, target: Target, **kwargs):
self.target = target
self.c_array_class_caches = set()
self.c_type_map = dict(
+ bool = ['boolean'],
uint8_t = ['byte'],
uint16_t = ['short'],
uint32_t = ['int'],
uint64_t = ['long'],
+ int64_t = ['long'],
+ double = ['double'],
)
self.java_type_map = dict(
String = "String"
import java.nio.file.StandardCopyOption;
public class bindings {
- public static class VecOrSliceDef {
- public long dataptr;
- public long datalen;
- public long stride;
- public VecOrSliceDef(long dataptr, long datalen, long stride) {
- this.dataptr = dataptr; this.datalen = datalen; this.stride = stride;
- }
- }
static {
try {
// Try to load natively first, this works on Android and in testing.
throw new IllegalArgumentException(e);
}
}
- init(java.lang.Enum.class, VecOrSliceDef.class);
+ init(java.lang.Enum.class);
init_class_cache();
if (!get_lib_version_string().equals(version.get_ldk_java_bindings_version()))
throw new IllegalArgumentException("Compiled LDK library and LDK class failes do not match");
// Fetching the LDK versions from C also checks that the header and binaries match
System.err.println("Loaded LDK-Java Bindings " + version.get_ldk_java_bindings_version() + " with LDK " + get_ldk_version() + " and LDK-C-Bindings " + get_ldk_c_bindings_version());
}
- static native void init(java.lang.Class c, java.lang.Class slicedef);
+ static native void init(java.lang.Class c);
static native void init_class_cache();
static native String get_lib_version_string();
public static native String get_ldk_c_bindings_version();
public static native String get_ldk_version();
- public static native boolean deref_bool(long ptr);
- public static native long deref_long(long ptr);
- public static native void free_heap_ptr(long ptr);
- public static native byte[] read_bytes(long ptr, long len);
- public static native byte[] get_u8_slice_bytes(long slice_ptr);
- public static native long bytes_to_u8_vec(byte[] bytes);
- public static native long new_txpointer_copy_data(byte[] txdata);
- public static native void txpointer_free(long ptr);
- public static native byte[] txpointer_get_buffer(long ptr);
- public static native long vec_slice_len(long vec);
- public static native long new_empty_slice_vec();
-
"""
self.bindings_version_file = """package org.ldk.impl;
}
}"""
- self.bindings_footer = "}\n"
-
self.util_fn_pfx = """package org.ldk.structs;
import org.ldk.impl.bindings;
import org.ldk.enums.*;
}
}"""
+ self.txin_defn = """public class TxIn extends CommonBase {
+ /** The witness in this input, in serialized form */
+ public final byte[] witness;
+ /** The script_sig in this input */
+ public final byte[] script_sig;
+ /** The transaction output's sequence number */
+ public final int sequence;
+ /** The txid this input is spending */
+ public final byte[] previous_txid;
+ /** The output index within the spent transaction of the output this input is spending */
+ public final int previous_vout;
+
+ TxIn(java.lang.Object _dummy, long ptr) {
+ super(ptr);
+ this.witness = bindings.TxIn_get_witness(ptr);
+ this.script_sig = bindings.TxIn_get_script_sig(ptr);
+ this.sequence = bindings.TxIn_get_sequence(ptr);
+ this.previous_txid = bindings.TxIn_get_previous_txid(ptr);
+ this.previous_vout = bindings.TxIn_get_previous_vout(ptr);
+ }
+ /** Constructs a new TxIn, note that previous_txid must be exactly 32 bytes */
+ public TxIn(byte[] witness, byte[] script_sig, int sequence, byte[] previous_txid, int previous_vout) {
+ this(null, bindings.TxIn_new(witness, script_sig, sequence, previous_txid, previous_vout));
+ }
+
+ @Override @SuppressWarnings(\"deprecation\")
+ protected void finalize() throws Throwable {
+ super.finalize();
+ if (ptr != 0) { bindings.TxIn_free(ptr); }
+ }
+}"""
+
self.scalar_defn = """public class BigEndianScalar extends CommonBase {
/** The bytes of the scalar value, in big endian */
public final byte[] scalar_bytes;
else:
self.c_file_pfx = self.c_file_pfx + "#define DEBUG_PRINT(...) fprintf(stderr, __VA_ARGS__)\n"
- if not DEBUG or sys.platform == "darwin":
+ if not DEBUG or self.target == Target.MACOS:
self.c_file_pfx = self.c_file_pfx + """#define MALLOC(a, _) malloc(a)
#define FREE(p) if ((uint64_t)(p) > 4096) { free(p); }
#define CHECK_ACCESS(p)
}
"""
- if sys.platform != "darwin":
+ if self.target != Target.MACOS:
self.c_file_pfx += """
// Running a leak check across all the allocations and frees of the JDK is a mess,
// so instead we implement our own naive leak checker here, relying on the -wrap
"""
self.c_file_pfx = self.c_file_pfx + """
static jmethodID ordinal_meth = NULL;
-static jmethodID slicedef_meth = NULL;
-static jclass slicedef_cls = NULL;
-JNIEXPORT void Java_org_ldk_impl_bindings_init(JNIEnv * env, jclass _b, jclass enum_class, jclass slicedef_class) {
+JNIEXPORT void Java_org_ldk_impl_bindings_init(JNIEnv * env, jclass _b, jclass enum_class) {
ordinal_meth = (*env)->GetMethodID(env, enum_class, "ordinal", "()I");
CHECK(ordinal_meth != NULL);
- slicedef_meth = (*env)->GetMethodID(env, slicedef_class, "<init>", "(JJJ)V");
- CHECK(slicedef_meth != NULL);
- slicedef_cls = (*env)->NewGlobalRef(env, slicedef_class);
- CHECK(slicedef_cls != NULL);
-}
-
-JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_deref_1bool (JNIEnv * env, jclass _a, jlong ptr) {
- return *((bool*)ptr);
-}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_deref_1long (JNIEnv * env, jclass _a, jlong ptr) {
- return *((long*)ptr);
-}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_free_1heap_1ptr (JNIEnv * env, jclass _a, jlong ptr) {
- FREE((void*)ptr);
-}
-JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_read_1bytes (JNIEnv * env, jclass _b, jlong ptr, jlong len) {
- jbyteArray ret_arr = (*env)->NewByteArray(env, len);
- (*env)->SetByteArrayRegion(env, ret_arr, 0, len, (unsigned char*)ptr);
- return ret_arr;
-}
-JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_get_1u8_1slice_1bytes (JNIEnv * env, jclass _b, jlong slice_ptr) {
- LDKu8slice *slice = (LDKu8slice*)slice_ptr;
- jbyteArray ret_arr = (*env)->NewByteArray(env, slice->datalen);
- (*env)->SetByteArrayRegion(env, ret_arr, 0, slice->datalen, slice->data);
- return ret_arr;
-}
-JNIEXPORT int64_t impl_bindings_bytes_1to_1u8_1vec (JNIEnv * env, jclass _b, jbyteArray bytes) {
- LDKCVec_u8Z *vec = (LDKCVec_u8Z*)MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8");
- vec->datalen = (*env)->GetArrayLength(env, bytes);
- vec->data = (uint8_t*)MALLOC(vec->datalen, "LDKCVec_u8Z Bytes");
- (*env)->GetByteArrayRegion (env, bytes, 0, vec->datalen, vec->data);
- return (uint64_t)vec;
-}
-JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_txpointer_1get_1buffer (JNIEnv * env, jclass _b, jlong ptr) {
- LDKTransaction *txdata = (LDKTransaction*)ptr;
- LDKu8slice slice;
- slice.data = txdata->data;
- slice.datalen = txdata->datalen;
- return Java_org_ldk_impl_bindings_get_1u8_1slice_1bytes(env, _b, (uint64_t)&slice);
-}
-JNIEXPORT int64_t JNICALL Java_org_ldk_impl_bindings_new_1txpointer_1copy_1data (JNIEnv * env, jclass _b, jbyteArray bytes) {
- LDKTransaction *txdata = (LDKTransaction*)MALLOC(sizeof(LDKTransaction), "LDKTransaction");
- txdata->datalen = (*env)->GetArrayLength(env, bytes);
- txdata->data = (uint8_t*)MALLOC(txdata->datalen, "Tx Data Bytes");
- txdata->data_is_owned = false;
- (*env)->GetByteArrayRegion (env, bytes, 0, txdata->datalen, txdata->data);
- return (uint64_t)txdata;
-}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_txpointer_1free (JNIEnv * env, jclass _b, jlong ptr) {
- LDKTransaction *tx = (LDKTransaction*)ptr;
- tx->data_is_owned = true;
- Transaction_free(*tx);
- FREE((void*)ptr);
-}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_vec_1slice_1len (JNIEnv * env, jclass _a, jlong ptr) {
- // Check offsets of a few Vec types are all consistent as we're meant to be generic across types
- _Static_assert(offsetof(LDKCVec_u8Z, datalen) == offsetof(LDKCVec_SignatureZ, datalen), "Vec<*> needs to be mapped identically");
- _Static_assert(offsetof(LDKCVec_u8Z, datalen) == offsetof(LDKCVec_MessageSendEventZ, datalen), "Vec<*> needs to be mapped identically");
- _Static_assert(offsetof(LDKCVec_u8Z, datalen) == offsetof(LDKCVec_EventZ, datalen), "Vec<*> needs to be mapped identically");
- _Static_assert(offsetof(LDKCVec_u8Z, datalen) == offsetof(LDKCVec_C2Tuple_usizeTransactionZZ, datalen), "Vec<*> needs to be mapped identically");
- LDKCVec_u8Z *vec = (LDKCVec_u8Z*)ptr;
- return (uint64_t)vec->datalen;
-}
-JNIEXPORT int64_t JNICALL Java_org_ldk_impl_bindings_new_1empty_1slice_1vec (JNIEnv * env, jclass _b) {
- // Check sizes of a few Vec types are all consistent as we're meant to be generic across types
- _Static_assert(sizeof(LDKCVec_u8Z) == sizeof(LDKCVec_SignatureZ), "Vec<*> needs to be mapped identically");
- _Static_assert(sizeof(LDKCVec_u8Z) == sizeof(LDKCVec_MessageSendEventZ), "Vec<*> needs to be mapped identically");
- _Static_assert(sizeof(LDKCVec_u8Z) == sizeof(LDKCVec_EventZ), "Vec<*> needs to be mapped identically");
- _Static_assert(sizeof(LDKCVec_u8Z) == sizeof(LDKCVec_C2Tuple_usizeTransactionZZ), "Vec<*> needs to be mapped identically");
- LDKCVec_u8Z *vec = (LDKCVec_u8Z*)MALLOC(sizeof(LDKCVec_u8Z), "Empty LDKCVec");
- vec->data = NULL;
- vec->datalen = 0;
- return (uint64_t)vec;
}
// We assume that CVec_u8Z and u8slice are the same size and layout (and thus pointers to the two can be mixed)
typedef jlongArray int64_tArray;
typedef jbyteArray int8_tArray;
-
-static inline jstring str_ref_to_java(JNIEnv *env, const char* chars, size_t len) {
- // Sadly we need to create a temporary because Java can't accept a char* without a 0-terminator
- char* conv_buf = MALLOC(len + 1, "str conv buf");
- memcpy(conv_buf, chars, len);
- conv_buf[len] = 0;
- jstring ret = (*env)->NewStringUTF(env, conv_buf);
- FREE(conv_buf);
+typedef jshortArray int16_tArray;
+
+static inline jstring str_ref_to_java(JNIEnv *env, const unsigned char* chars, size_t len) {
+ // Java uses "Modified UTF-8" rather than UTF-8. This requires special
+ // handling for codepoints above 0xFFFF, which get converted from four
+ // bytes to six. We don't know upfront how many codepoints in the string
+ // are above 0xFFFF, so we just allocate an extra 33% up front and waste a
+ // bit of space.
+ unsigned char* java_chars = MALLOC(len * 3 / 2 + 1, "str conv buf");
+ unsigned char* next_java_char = java_chars;
+ const unsigned char* next_in_char = chars;
+ const unsigned char* end = chars + len;
+ #define COPY_CHAR_TO_JAVA do { *next_java_char = *next_in_char; next_java_char++; next_in_char++; } while (0)
+
+ while (next_in_char < end) {
+ if (!*next_in_char) break;
+ if (!(*next_in_char & 0b10000000)) {
+ COPY_CHAR_TO_JAVA;
+ } else if ((*next_in_char & 0b11100000) == 0b11000000) {
+ if (next_in_char + 2 > end) { CHECK(false); break; } // bad string
+ COPY_CHAR_TO_JAVA;
+ COPY_CHAR_TO_JAVA;
+ } else if ((*next_in_char & 0b11110000) == 0b11100000) {
+ if (next_in_char + 3 > end) { CHECK(false); break; } // bad string
+ COPY_CHAR_TO_JAVA;
+ COPY_CHAR_TO_JAVA;
+ COPY_CHAR_TO_JAVA;
+ } else if ((*next_in_char & 0b11111000) == 0b11110000) {
+ if (next_in_char + 4 > end) { CHECK(false); break; } // bad string
+ uint32_t codepoint = 0;
+ codepoint |= (((uint32_t)*(next_in_char )) & 0b00000111) << 18;
+ codepoint |= (((uint32_t)*(next_in_char + 1)) & 0b00111111) << 12;
+ codepoint |= (((uint32_t)*(next_in_char + 2)) & 0b00111111) << 6;
+ codepoint |= (((uint32_t)*(next_in_char + 3)) & 0b00111111) << 0;
+ codepoint -= 0x10000;
+ *next_java_char = 0b11101101;
+ next_java_char++;
+ *next_java_char = 0b10100000 | ((codepoint >> 16) & 0b00001111);
+ next_java_char++;
+ *next_java_char = 0b10000000 | ((codepoint >> 10) & 0b00111111);
+ next_java_char++;
+ *next_java_char = 0b11101101;
+ next_java_char++;
+ *next_java_char = 0b10110000 | ((codepoint >> 6) & 0b00001111);
+ next_java_char++;
+ *next_java_char = 0b10000000 | ((codepoint >> 0) & 0b00111111);
+ next_java_char++;
+ next_in_char += 4;
+ } else {
+ // Bad string
+ CHECK(false);
+ break;
+ }
+ }
+ *next_java_char = 0;
+ jstring ret = (*env)->NewStringUTF(env, java_chars);
+ FREE(java_chars);
return ret;
}
static inline LDKStr java_to_owned_str(JNIEnv *env, jstring str) {
uint64_t str_len = (*env)->GetStringUTFLength(env, str);
- char* newchars = MALLOC(str_len + 1, "String chars");
- const char* jchars = (*env)->GetStringUTFChars(env, str, NULL);
- memcpy(newchars, jchars, str_len);
- newchars[str_len] = 0;
+ // Java uses "Modified UTF-8" rather than UTF-8. This requires special
+ // handling for codepoints above 0xFFFF, which we implement below.
+ unsigned char* newchars = MALLOC(str_len, "String chars");
+ unsigned char* next_newchar = newchars;
+ uint64_t utf8_len = 0;
+
+ const unsigned char* jchars = (*env)->GetStringUTFChars(env, str, NULL);
+ const unsigned char* next_char = jchars;
+ const unsigned char* end = jchars + str_len;
+
+ #define COPY_CHAR_FROM_JAVA do { *next_newchar = *next_char; next_newchar++; next_char++; utf8_len++; } while (0)
+
+ while (next_char < end) {
+ if (!(*next_char & 0b10000000)) {
+ CHECK(*next_char != 0); // Bad Modified UTF-8 string, but we'll just cut here
+ COPY_CHAR_FROM_JAVA;
+ } else if ((*next_char & 0b11100000) == 0b11000000) {
+ if (next_char + 2 > end) { CHECK(false); break; } // bad string
+ uint16_t codepoint = 0;
+ codepoint |= (((uint16_t)(*next_char & 0x1f)) << 6);
+ codepoint |= *(next_char + 1) & 0x3f;
+ if (codepoint == 0) {
+ // We should really never get null codepoints, but java allows them.
+ // Just skip it.
+ next_char += 2;
+ } else {
+ COPY_CHAR_FROM_JAVA;
+ COPY_CHAR_FROM_JAVA;
+ }
+ } else if ((*next_char & 0b11110000) == 0b11100000) {
+ if (next_char + 3 > end) { CHECK(false); break; } // bad string
+ if (*next_char == 0b11101101 && (*(next_char + 1) & 0b11110000) == 0b10100000) {
+ // Surrogate code unit shoul indicate we have a codepoint above
+ // 0xFFFF, which is where Modified UTF-8 and UTF-8 diverge.
+ if (next_char + 6 > end) { CHECK(false); break; } // bad string
+ CHECK(*(next_char + 3) == 0b11101101);
+ CHECK((*(next_char + 4) & 0b11110000) == 0b10110000);
+ // Calculate the codepoint per https://docs.oracle.com/javase/1.5.0/docs/guide/jni/spec/types.html#wp16542
+ uint32_t codepoint = 0x10000;
+ codepoint += ((((uint32_t)*(next_char + 1)) & 0x0f) << 16);
+ codepoint += ((((uint32_t)*(next_char + 2)) & 0x3f) << 10);
+ codepoint += ((((uint32_t)*(next_char + 4)) & 0x0f) << 6);
+ codepoint += (((uint32_t)*(next_char + 5)) & 0x3f);
+ *next_newchar = 0b11110000 | ((codepoint >> 18) & 0b111);
+ next_newchar++;
+ *next_newchar = 0b10000000 | ((codepoint >> 12) & 0b111111);
+ next_newchar++;
+ *next_newchar = 0b10000000 | ((codepoint >> 6) & 0b111111);
+ next_newchar++;
+ *next_newchar = 0b10000000 | ( codepoint & 0b111111);
+ next_newchar++;
+ next_char += 6;
+ utf8_len += 4;
+ } else {
+ COPY_CHAR_FROM_JAVA;
+ COPY_CHAR_FROM_JAVA;
+ COPY_CHAR_FROM_JAVA;
+ }
+ } else {
+ // Bad string
+ CHECK(false);
+ break;
+ }
+ }
(*env)->ReleaseStringUTFChars(env, str, jchars);
LDKStr res = {
.chars = newchars,
- .len = str_len,
+ .len = utf8_len,
.chars_is_owned = true
};
return res;
import javax.annotation.Nullable;
"""
+ self.hu_struct_file_suffix = ""
self.c_fn_ty_pfx = "JNIEXPORT "
self.c_fn_args_pfx = "JNIEnv *env, jclass clz"
self.file_ext = ".java"
self.ptr_c_ty = "int64_t"
self.ptr_native_ty = "long"
+ self.u128_native_ty = "UInt128"
self.usize_c_ty = "int64_t"
self.usize_native_ty = "long"
self.native_zero_ptr = "0"
- self.result_c_ty = "jclass"
+ self.unitary_enum_c_ty = "jclass"
self.ptr_arr = "jobjectArray"
self.is_arr_some_check = ("", " != NULL")
self.get_native_arr_len_call = ("(*env)->GetArrayLength(env, ", ")")
+ def bindings_footer(self):
+ return "}\n"
+
def construct_jenv(self):
res = "JNIEnv *env;\n"
res += "jint get_jenv_res = (*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_6);\n"
clz_var = ty_info.java_fn_ty_arg[1:].replace("[", "arr_of_")
self.c_array_class_caches.add(clz_var)
return "(*env)->NewObjectArray(env, " + arr_len + ", " + clz_var + "_clz, NULL);\n"
+ elif ty_info.subty.c_ty == "jstring":
+ return "(*env)->NewObjectArray(env, " + arr_len + ", String_clz, NULL);\n"
else:
return "(*env)->New" + ty_info.java_ty.strip("[]").title() + "Array(env, " + arr_len + ")"
def set_native_arr_contents(self, arr_name, arr_len, ty_info):
if ty_info.c_ty == "int8_tArray":
return ("(*env)->SetByteArrayRegion(env, " + arr_name + ", 0, " + arr_len + ", ", ")")
+ elif ty_info.c_ty == "int16_tArray":
+ return ("(*env)->SetShortArrayRegion(env, " + arr_name + ", 0, " + arr_len + ", ", ")")
else:
assert False
def get_native_arr_contents(self, arr_name, dest_name, arr_len, ty_info, copy):
- if ty_info.c_ty == "int8_tArray":
+ if "String" in ty_info.java_ty:
+ return None
+ if ty_info.c_ty == "int8_tArray" or ty_info.c_ty == "int16_tArray":
+ fn_ty = "Byte" if ty_info.c_ty == "int8_tArray" else "Short"
if copy:
- return "(*env)->GetByteArrayRegion(env, " + arr_name + ", 0, " + arr_len + ", " + dest_name + ")"
+ return "(*env)->Get" + fn_ty + "ArrayRegion(env, " + arr_name + ", 0, " + arr_len + ", " + dest_name + ")"
else:
- return "(*env)->GetByteArrayElements (env, " + arr_name + ", NULL)"
+ return "(*env)->Get" + fn_ty + "ArrayElements (env, " + arr_name + ", NULL)"
elif not ty_info.java_ty[:len(ty_info.java_ty) - 2].endswith("[]"):
return "(*env)->Get" + ty_info.subty.java_ty.title() + "ArrayElements (env, " + arr_name + ", NULL)"
else:
else:
return "(*env)->Release" + ty_info.java_ty.strip("[]").title() + "ArrayElements(env, " + arr_name + ", " + dest_name + ", 0)"
- def map_hu_array_elems(self, arr_name, conv_name, arr_ty, elem_ty):
+ def map_hu_array_elems(self, arr_name, conv_name, arr_ty, elem_ty, is_nullable):
if elem_ty.java_ty == "long" and elem_ty.java_hu_ty != "long":
return arr_name + " != null ? Arrays.stream(" + arr_name + ").mapToLong(" + conv_name + " -> " + elem_ty.from_hu_conv[0] + ").toArray() : null"
elif elem_ty.java_ty == "long":
res = ""
for ty in sorted(self.c_array_class_caches):
res = res + "static jclass " + ty + "_clz = NULL;\n"
+ res = res + "static jclass String_clz = NULL;\n"
res = res + "JNIEXPORT void Java_org_ldk_impl_bindings_init_1class_1cache(JNIEnv * env, jclass clz) {\n"
for ty in sorted(self.c_array_class_caches):
res = res + "\t" + ty + "_clz = (*env)->FindClass(env, \"" + ty.replace("arr_of_", "[") + "\");\n"
res = res + "\tCHECK(" + ty + "_clz != NULL);\n"
res = res + "\t" + ty + "_clz = (*env)->NewGlobalRef(env, " + ty + "_clz);\n"
+ res = res + "\tString_clz = (*env)->FindClass(env, \"java/lang/String\");\n"
+ res = res + "\tCHECK(String_clz != NULL);\n"
+ res = res + "\tString_clz = (*env)->NewGlobalRef(env, String_clz);\n"
+
res = res + "}\n"
return res
def primitive_arr_from_hu(self, arr_ty, fixed_len, arr_name):
mapped_ty = arr_ty.subty
+ if arr_ty.rust_obj == "LDKU128":
+ return ("" + arr_name + ".getLEBytes()", "")
if fixed_len is not None:
- return ("InternalUtils.check_arr_len(" + arr_name + ", " + fixed_len + ")", "")
+ if mapped_ty.c_ty == "int8_t" or mapped_ty.c_ty == "uint8_t":
+ return ("InternalUtils.check_arr_len(" + arr_name + ", " + fixed_len + ")", "")
+ elif mapped_ty.c_ty == "int16_t" or mapped_ty.c_ty == "uint16_t":
+ return ("InternalUtils.check_arr_16_len(" + arr_name + ", " + fixed_len + ")", "")
+ else:
+ print(arr_ty.c_ty)
+ assert False
return None
def primitive_arr_to_hu(self, arr_ty, fixed_len, arr_name, conv_name):
+ if arr_ty.rust_obj == "LDKU128":
+ return "org.ldk.util.UInt128 " + conv_name + " = new org.ldk.util.UInt128(" + arr_name + ");"
return None
def java_arr_ty_str(self, elem_ty_str):
def fully_qualified_hu_ty_path(self, ty):
if ty.java_fn_ty_arg.startswith("L") and ty.java_fn_ty_arg.endswith(";"):
return ty.java_fn_ty_arg.strip("L;").replace("/", ".")
- if ty.java_hu_ty == "UnqualifiedError" or ty.java_hu_ty == "UInt5" or ty.java_hu_ty == "WitnessVersion":
+ if ty.java_hu_ty == "UnqualifiedError" or ty.java_hu_ty == "UInt128" or ty.java_hu_ty == "UInt5" or ty.java_hu_ty == "WitnessVersion":
return "org.ldk.util." + ty.java_hu_ty
if not ty.is_native_primitive and ty.rust_obj is not None and not "[]" in ty.java_hu_ty:
return "org.ldk.structs." + ty.java_hu_ty
out_java_trait = out_java_trait + "\t\t" + var.from_hu_conv[1].replace("\n", "\n\t\t") + ";\n"
else:
out_java_trait = out_java_trait + "\t\tthis.ptrs_to.add(" + var[1] + ");\n"
- out_java_trait = out_java_trait + "\t\tthis.bindings_instance = arg;\n"
- out_java_trait = out_java_trait + "\t}\n"
- out_java_trait = out_java_trait + "\t@Override @SuppressWarnings(\"deprecation\")\n"
- out_java_trait = out_java_trait + "\tprotected void finalize() throws Throwable {\n"
- out_java_trait = out_java_trait + "\t\tif (ptr != 0) { bindings." + struct_name.replace("LDK","") + "_free(ptr); } super.finalize();\n"
- out_java_trait = out_java_trait + "\t}\n\n"
+ out_java_trait += f""" this.bindings_instance = arg;
+ }}
+ @Override @SuppressWarnings("deprecation")
+ protected void finalize() throws Throwable {{
+ if (ptr != 0) {{ bindings.{struct_name.replace("LDK","")}_free(ptr); }} super.finalize();
+ }}
+ /**
+ * Destroys the object, freeing associated resources. After this call, any access
+ * to this object may result in a SEGFAULT or worse.
+ *
+ * You should generally NEVER call this method. You should let the garbage collector
+ * do this for you when it finalizes objects. However, it may be useful for types
+ * which represent locks and should be closed immediately to avoid holding locks
+ * until the GC runs.
+ */
+ public void destroy() {{
+ if (ptr != 0) {{ bindings.{struct_name.replace("LDK","")}_free(ptr); }}
+ ptr = 0;
+ }}
+"""
java_trait_constr = "\tprivate static class " + struct_name + "Holder { " + struct_name.replace("LDK", "") + " held; }\n"
java_trait_constr = java_trait_constr + "\tpublic static " + struct_name.replace("LDK", "") + " new_impl(" + struct_name.replace("LDK", "") + "Interface arg"
java_trait_constr = java_trait_constr + ", " + var.arg_name
else:
java_trait_constr += ", " + var[1] + ".new_impl(" + var[1] + "_impl"
+ suptrait_constr = ""
for suparg in var[2]:
if isinstance(suparg, ConvInfo):
- java_trait_constr += ", " + suparg.arg_name
+ suptrait_constr += ", " + suparg.arg_name
else:
- java_trait_constr += ", " + suparg[1]
- java_trait_constr += ").bindings_instance"
+ suptrait_constr += ", " + suparg[1] + "_impl"
+ java_trait_constr += suptrait_constr + ").bindings_instance"
for suparg in var[2]:
if isinstance(suparg, ConvInfo):
java_trait_constr += ", " + suparg.arg_name
else:
- java_trait_constr += ", " + suparg[1]
+ java_trait_constr += ", " + suparg[1] + ".new_impl("
+ # Blindly assume that we can just strip the first arg to build the args for the supertrait
+ java_trait_constr += suptrait_constr.split(", ", 1)[1]
+ java_trait_constr += ").bindings_instance"
out_java_trait = out_java_trait + "\t}\n"
out_java_trait = out_java_trait + java_trait_constr + ");\n\t\treturn impl_holder.held;\n\t}\n"
out_c = out_c + "static void " + struct_name + "_JCalls_cloned(" + struct_name + "* new_obj) {\n"
out_c = out_c + "\t" + struct_name + "_JCalls *j_calls = (" + struct_name + "_JCalls*) new_obj->this_arg;\n"
out_c = out_c + "\tatomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release);\n"
- for var in field_vars:
+ for var in flattened_field_vars:
if not isinstance(var, ConvInfo):
- out_c = out_c + "\tatomic_fetch_add_explicit(&j_calls->" + var[1] + "->refcnt, 1, memory_order_release);\n"
+ out_c = out_c + "\tatomic_fetch_add_explicit(&j_calls->" + var[2].replace(".", "->") + "->refcnt, 1, memory_order_release);\n"
out_c = out_c + "}\n"
out_c = out_c + "static inline " + struct_name + " " + struct_name + "_init (" + self.c_fn_args_pfx + ", jobject o"
out_c = out_c + "\t};\n"
for var in flattened_field_vars:
if not isinstance(var, ConvInfo):
- out_c = out_c + "\tcalls->" + var[1] + " = ret." + var[1] + ".this_arg;\n"
+ out_c = out_c + "\tcalls->" + var[1] + " = ret." + var[2] + ".this_arg;\n"
out_c = out_c + "\treturn ret;\n"
out_c = out_c + "}\n"
underscore_name = ''.join('_' + c.lower() if c.isupper() else c for c in var[1]).strip('_')
out_java_trait += "\tpublic " + var[1] + " get_" + underscore_name + "() {\n"
out_java_trait += "\t\t" + var[1] + " res = new " + var[1] + "(null, bindings." + struct_name + "_get_" + var[1] + "(this.ptr));\n"
- out_java_trait += "\t\tthis.ptrs_to.add(res);\n"
+ out_java_trait += "\t\tres.ptrs_to.add(this);\n"
out_java_trait += "\t\treturn res;\n"
out_java_trait += "\t}\n"
out_java_trait += "\n"
out_c += "JNIEXPORT int64_t JNICALL Java_org_ldk_impl_bindings_" + struct_name + "_1get_1" + var[1] + "(JNIEnv *env, jclass clz, int64_t arg) {\n"
out_c += "\t" + struct_name + " *inp = (" + struct_name + " *)untag_ptr(arg);\n"
- out_c += "\treturn tag_ptr(&inp->" + var[1] + ", false);\n"
+ out_c += "\treturn tag_ptr(&inp->" + var[2] + ", false);\n"
out_c += "}\n"
return (out_java, out_java_trait, out_c)
extra_java_struct_out += "\t\tif (!(o instanceof " + struct_meth + ")) return false;\n"
extra_java_struct_out += "\t\treturn this.eq((" + struct_meth + ")o);\n"
extra_java_struct_out += "\t}\n"
+ if meth_n == "wait":
+ meth_n = "wait_indefinite"
out_java_struct += ("\tpublic " + return_type_info.java_hu_ty + " " + meth_n + "(")
for idx, arg in enumerate(argument_types):
if idx != 0:
else:
if arg.nullable:
out_java_struct += "@Nullable "
- ty_string = arg.java_hu_ty
- if arg.java_fn_ty_arg[0] == "L" and arg.java_fn_ty_arg[len(arg.java_fn_ty_arg) - 1] == ";":
- ty_string = arg.java_fn_ty_arg.strip("L;").replace("/", ".")
+ ty_string = self.fully_qualified_hu_ty_path(arg)
out_java_struct += ty_string + " " + arg.arg_name
out_java += (");\n")
out_c += (") {\n")