rust_obj = "LDKSignature"
arr_access = "compact_form"
elif fn_arg.startswith("LDKRecoverableSignature"):
- fn_arg = "uint8_t (*" + fn_arg[25:] + ")[68]"
+ fn_arg = "uint8_t (*" + fn_arg[24:] + ")[68]"
assert var_is_arr_regex.match(fn_arg[8:])
rust_obj = "LDKRecoverableSignature"
arr_access = "serialized_form"
c_ty = "int64_t"
fn_arg = fn_arg[8:].strip()
else:
+ java_ty = consts.ptr_native_ty
c_ty = "int64_t"
rust_obj = "uintptr_t"
fn_arg = fn_arg[9:].strip()
return_type_info = type_mapping_generator.map_type(method_return_type.strip() + " ret", True, ret_arr_len, False, force_holds_ref)
if method_name.endswith("_clone") and expected_struct not in unitary_enums:
- meth_line = "uint64_t " + expected_struct.replace("LDK", "") + "_clone_ptr(" + expected_struct + " *NONNULL_PTR arg)"
+ meth_line = "uintptr_t " + expected_struct.replace("LDK", "") + "_clone_ptr(" + expected_struct + " *NONNULL_PTR arg)"
write_c("static inline " + meth_line + " {\n")
write_c("\t" + return_type_info.ret_conv[0].replace("\n", "\n\t"))
write_c(method_name + "(arg)")
write_c(return_type_info.ret_conv[1])
write_c("\n\treturn " + return_type_info.ret_conv_name + ";\n}\n")
- map_fn(meth_line + ";\n", re.compile("(uint64_t) ([A-Za-z_0-9]*)\((.*)\)").match(meth_line), None, None, None)
+ map_fn(meth_line + ";\n", re.compile("(uintptr_t) ([A-Za-z_0-9]*)\((.*)\)").match(meth_line), None, None, None)
argument_types = []
default_constructor_args = {}
or method_name.endswith("_read"))):
out_java_struct = open(f"{sys.argv[3]}/structs/UtilMethods{consts.file_ext}", "a")
for line in out_java_struct_delta.splitlines():
- if not line.strip().startswith("this."):
+ if "this" not in line:
out_java_struct.write(line + "\n")
else:
out_java_struct.write("\t\t// " + line.strip() + "\n")
if check_sfx is not None:
write_c("CHECK(" + check_sfx[0] + "owner" + check_sfx[1] + ");\n")
write_c("\treturn " + accessor[0] + "owner" + accessor[1] + ";\n")
+ holds_ref = True
else:
fn_defn = ptr_fn_defn
write_c("static inline " + fn_defn + "{\n")
elif struct_name == "LDKTxOut":
with open(f"{sys.argv[3]}/structs/TxOut{consts.file_ext}", "w") as out_java_struct:
out_java_struct.write(consts.hu_struct_file_prefix)
- out_java_struct.write("public class TxOut extends CommonBase{\n")
- out_java_struct.write("\t/** The script_pubkey in this output */\n")
- out_java_struct.write("\tpublic final byte[] script_pubkey;\n")
- out_java_struct.write("\t/** The value, in satoshis, of this output */\n")
- out_java_struct.write("\tpublic final long value;\n")
- out_java_struct.write("\n")
- out_java_struct.write("\tTxOut(java.lang.Object _dummy, long ptr) {\n")
- out_java_struct.write("\t\tsuper(ptr);\n")
- out_java_struct.write("\t\tthis.script_pubkey = bindings.TxOut_get_script_pubkey(ptr);\n")
- out_java_struct.write("\t\tthis.value = bindings.TxOut_get_value(ptr);\n")
- out_java_struct.write("\t}\n")
- out_java_struct.write("\tpublic TxOut(long value, byte[] script_pubkey) {\n")
- out_java_struct.write("\t\tsuper(bindings.TxOut_new(script_pubkey, value));\n")
- out_java_struct.write("\t\tthis.script_pubkey = bindings.TxOut_get_script_pubkey(ptr);\n")
- out_java_struct.write("\t\tthis.value = bindings.TxOut_get_value(ptr);\n")
- out_java_struct.write("\t}\n")
- out_java_struct.write("\n")
- out_java_struct.write("\t@Override @SuppressWarnings(\"deprecation\")\n")
- out_java_struct.write("\tprotected void finalize() throws Throwable {\n")
- out_java_struct.write("\t\tsuper.finalize();\n")
- out_java_struct.write("\t\tif (ptr != 0) { bindings.TxOut_free(ptr); }\n")
- out_java_struct.write("\t}\n")
- out_java_struct.write("\n")
- out_java_struct.write("}")
+ out_java_struct.write(consts.txout_defn)
fn_line = "struct LDKCVec_u8Z TxOut_get_script_pubkey (struct LDKTxOut* thing)"
write_c(fn_line + " {")
write_c("\treturn CVec_u8Z_clone(&thing->script_pubkey);")