X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=genbindings.py;h=67de282141766d5422cc5911e3a2add7e3a6ddd1;hb=2f8218ecc6d7c18fb331e5429960e296dd43b943;hp=e5a59700352c6f0c1cdff2de3546783770396ee8;hpb=a672396f21c0448656bb400cfe28b9df6e5a842b;p=ldk-java diff --git a/genbindings.py b/genbindings.py index e5a59700..67de2821 100755 --- a/genbindings.py +++ b/genbindings.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 import os, sys, re, subprocess -if len(sys.argv) < 7: - print("USAGE: /path/to/lightning.h /path/to/bindings/output /path/to/bindings/ /path/to/bindings/output.c debug lang") +if len(sys.argv) < 8: + print("USAGE: /path/to/lightning.h /path/to/bindings/output /path/to/bindings/ /path/to/bindings/output.c debug lang target-tuple") sys.exit(1) if sys.argv[5] == "false": @@ -20,6 +20,8 @@ if sys.argv[6] == "java" or sys.argv[6] == "android": target = java_strings.Target.JAVA if sys.argv[6] == "android": target = java_strings.Target.ANDROID + if "apple" in sys.argv[8]: + target = java_strings.Target.MACOS elif sys.argv[6] == "typescript": import typescript_strings from typescript_strings import Consts @@ -38,7 +40,6 @@ else: print("Only java, typescript, python, or c_sharp can be set for lang") sys.exit(1) - consts = Consts(DEBUG, target=target, outdir=sys.argv[4]) local_git_version = os.getenv("LDK_GARBAGECOLLECTED_GIT_OVERRIDE") @@ -132,27 +133,15 @@ def java_c_types(fn_arg, ret_arr_len): rust_obj = None arr_access = None java_hu_ty = None - if fn_arg.startswith("LDKPaymentPreimage") or fn_arg.startswith("LDKPaymentSecret") or fn_arg.startswith("LDKPaymentHash") or fn_arg.startswith("LDKChainHash"): - if fn_arg.startswith("LDKPaymentPreimage"): - fn_arg = "uint8_t (*" + fn_arg[19:] + ")[32]" - elif fn_arg.startswith("LDKPaymentSecret"): - fn_arg = "uint8_t (*" + fn_arg[17:] + ")[32]" - elif fn_arg.startswith("LDKPaymentHash"): - fn_arg = "uint8_t (*" + fn_arg[15:] + ")[32]" - elif fn_arg.startswith("LDKChainHash"): - fn_arg = "uint8_t (*" + fn_arg[13:] + ")[32]" - assert var_is_arr_regex.match(fn_arg[8:]) - rust_obj = "LDKThirtyTwoBytes" - arr_access = "data" - elif fn_arg.startswith("LDKThirtyTwoBytes"): + if fn_arg.startswith("LDKThirtyTwoBytes"): fn_arg = "uint8_t (*" + fn_arg[18:] + ")[32]" assert var_is_arr_regex.match(fn_arg[8:]) rust_obj = "LDKThirtyTwoBytes" arr_access = "data" - elif fn_arg.startswith("LDKEightU16s"): - fn_arg = "uint16_t (*" + fn_arg[13:] + ")[8]" + elif fn_arg.startswith("LDKThirtyTwoU16s"): + fn_arg = "uint16_t (*" + fn_arg[17:] + ")[32]" assert var_is_arr_regex.match(fn_arg[9:]) - rust_obj = "LDKEightU16s" + rust_obj = "LDKThirtyTwoU16s" arr_access = "data" elif fn_arg.startswith("LDKU128"): if fn_arg == "LDKU128": @@ -164,11 +153,6 @@ def java_c_types(fn_arg, ret_arr_len): assert var_is_arr_regex.match(fn_arg[8:]) rust_obj = "LDKU128" arr_access = "le_bytes" - elif fn_arg.startswith("LDKTxid"): - fn_arg = "uint8_t (*" + fn_arg[8:] + ")[32]" - assert var_is_arr_regex.match(fn_arg[8:]) - rust_obj = "LDKThirtyTwoBytes" - arr_access = "data" elif fn_arg.startswith("LDKPublicKey"): fn_arg = "uint8_t (*" + fn_arg[13:] + ")[33]" assert var_is_arr_regex.match(fn_arg[8:]) @@ -179,10 +163,15 @@ def java_c_types(fn_arg, ret_arr_len): assert var_is_arr_regex.match(fn_arg[8:]) rust_obj = "LDKSecretKey" arr_access = "bytes" - elif fn_arg.startswith("LDKSignature"): - fn_arg = "uint8_t (*" + fn_arg[13:] + ")[64]" + elif fn_arg.startswith("LDKECDSASignature"): + fn_arg = "uint8_t (*" + fn_arg[18:] + ")[64]" assert var_is_arr_regex.match(fn_arg[8:]) - rust_obj = "LDKSignature" + rust_obj = "LDKECDSASignature" + arr_access = "compact_form" + elif fn_arg.startswith("LDKSchnorrSignature"): + fn_arg = "uint8_t (*" + fn_arg[20:] + ")[64]" + assert var_is_arr_regex.match(fn_arg[8:]) + rust_obj = "LDKSchnorrSignature" arr_access = "compact_form" elif fn_arg.startswith("LDKRecoverableSignature"): fn_arg = "uint8_t (*" + fn_arg[24:] + ")[68]" @@ -229,8 +218,14 @@ def java_c_types(fn_arg, ret_arr_len): rust_obj = "LDKTransaction" assert var_is_arr_regex.match(fn_arg[8:]) arr_access = "data" + elif fn_arg.startswith("LDKTransactionOutputs "): + fn_arg = "C2Tuple_ThirtyTwoBytesCVec_C2Tuple_u32TxOutZZZ" + rust_obj = "C2Tuple_ThirtyTwoBytesCVec_C2Tuple_u32TxOutZZZ" elif fn_arg.startswith("LDKWitness ") or fn_arg == "LDKWitness": - fn_arg = "uint8_t (*" + fn_arg[11:] + ")[datalen]" + if len(fn_arg) > 12 and fn_arg[11] == "*": + fn_arg = "uint8_t (" + fn_arg[11:] + ")[datalen]" + else: + fn_arg = "uint8_t (*" + fn_arg[11:] + ")[datalen]" rust_obj = "LDKWitness" assert var_is_arr_regex.match(fn_arg[8:]) arr_access = "data" @@ -322,6 +317,22 @@ def java_c_types(fn_arg, ret_arr_len): fn_ty_arg = "I" fn_arg = fn_arg[8:].strip() is_primitive = True + elif fn_arg.startswith("int64_t"): + mapped_type = consts.c_type_map['int64_t'] + java_ty = mapped_type[0] + c_ty = "int64_t" + arr_ty = "int64_t" + fn_ty_arg = "J" + fn_arg = fn_arg[7:].strip() + is_primitive = True + elif fn_arg.startswith("double"): + mapped_type = consts.c_type_map['double'] + java_ty = mapped_type[0] + c_ty = "double" + arr_ty = "double" + fn_ty_arg = "D" + fn_arg = fn_arg[6:].strip() + is_primitive = True elif fn_arg.startswith("uint64_t") or fn_arg.startswith("uintptr_t"): # TODO: uintptr_t is arch-dependent :( mapped_type = consts.c_type_map['uint64_t'] @@ -373,7 +384,7 @@ def java_c_types(fn_arg, ret_arr_len): assert ma.group(1).strip().startswith("LDK") java_ty = ma.group(1).strip()[3:] java_hu_ty = java_ty - c_ty = consts.result_c_ty + c_ty = consts.unitary_enum_c_ty fn_ty_arg = "Lorg/ldk/enums/" + java_ty + ";" fn_arg = ma.group(2).strip() rust_obj = ma.group(1).strip() @@ -574,6 +585,9 @@ with open(sys.argv[1]) as in_h, open(f"{sys.argv[2]}/bindings{consts.file_ext}", 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: + # LDKWitness is mapped as an array, so no need to implement clone + if expected_struct == "LDKWitness": + return meth_line = "uint64_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")) @@ -640,8 +654,8 @@ with open(sys.argv[1]) as in_h, open(f"{sys.argv[2]}/bindings{consts.file_ext}", expected_struct in complex_enums or expected_struct in complex_enums or expected_struct in result_types or expected_struct in tuple_types) and not is_free impl_on_utils = not impl_on_struct and (not is_free and not method_name.endswith("_clone") and - not method_name.startswith("TxOut") and not method_name.startswith("BigEndianScalar") and - not method_name.startswith("_") and + not method_name.startswith("TxOut") and not method_name.startswith("TxIn") and + not method_name.startswith("BigEndianScalar") and not method_name.startswith("_") and method_name != "check_platform" and method_name != "Result_read" and not expected_struct in unitary_enums and ((not method_name.startswith("C2Tuple_") and not method_name.startswith("C3Tuple_")) @@ -1095,6 +1109,36 @@ with open(sys.argv[1]) as in_h, open(f"{sys.argv[2]}/bindings{consts.file_ext}", write_c("\treturn thing->value;") write_c("}") map_fn(fn_line + "\n", re.compile("(.*) (TxOut_get_value) \((.*)\)").match(fn_line), None, None, None) + elif struct_name == "LDKTxIn": + with open(f"{sys.argv[3]}/structs/TxIn{consts.file_ext}", "w") as out_java_struct: + out_java_struct.write(consts.hu_struct_file_prefix) + out_java_struct.write(consts.txin_defn) + out_java_struct.write(consts.hu_struct_file_suffix) + fn_line = "struct LDKWitness TxIn_get_witness (struct LDKTxIn* thing)" + write_c(fn_line + " {") + write_c("\treturn Witness_clone(&thing->witness);") + write_c("}") + map_fn(fn_line + "\n", re.compile("(.*) (TxIn_get_witness) \((.*)\)").match(fn_line), None, None, None) + fn_line = "struct LDKCVec_u8Z TxIn_get_script_sig (struct LDKTxIn* thing)" + write_c(fn_line + " {") + write_c("\treturn CVec_u8Z_clone(&thing->script_sig);") + write_c("}") + map_fn(fn_line + "\n", re.compile("(.*) (TxIn_get_script_sig) \((.*)\)").match(fn_line), None, None, None) + fn_line = "LDKThirtyTwoBytes TxIn_get_previous_txid (struct LDKTxIn* thing)" + write_c(fn_line + " {") + write_c("\treturn thing->previous_txid;") + write_c("}") + map_fn(fn_line + "\n", re.compile("(.*) (TxIn_get_previous_txid) \((.*)\)").match(fn_line), None, None, None) + fn_line = "uint32_t TxIn_get_previous_vout (struct LDKTxIn* thing)" + write_c(fn_line + " {") + write_c("\treturn thing->previous_vout;") + write_c("}") + map_fn(fn_line + "\n", re.compile("(.*) (TxIn_get_previous_vout) \((.*)\)").match(fn_line), None, None, None) + fn_line = "uint32_t TxIn_get_sequence (struct LDKTxIn* thing)" + write_c(fn_line + " {") + write_c("\treturn thing->sequence;") + write_c("}") + map_fn(fn_line + "\n", re.compile("(.*) (TxIn_get_sequence) \((.*)\)").match(fn_line), None, None, None) elif struct_name == "LDKBigEndianScalar": with open(f"{sys.argv[3]}/structs/BigEndianScalar{consts.file_ext}", "w") as out_java_struct: out_java_struct.write(consts.hu_struct_file_prefix)