X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=genbindings.py;h=67de282141766d5422cc5911e3a2add7e3a6ddd1;hb=d8656f7b597edd7ae8c34cb677c35d3b1635efd5;hp=1ade1705010d1f9055fe236b0be157cb9c091146;hpb=2eb87ba813b7b6c1669a8a0d900a2baa67bfea3e;p=ldk-java diff --git a/genbindings.py b/genbindings.py index 1ade1705..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,17 +20,26 @@ 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 target = typescript_strings.Target.NODEJS if len(sys.argv) == 8 and sys.argv[7] == 'browser': target = typescript_strings.Target.BROWSER +elif sys.argv[6] == "c_sharp": + import csharp_strings + from csharp_strings import Consts + target = csharp_strings.Target.CSHARP +elif sys.argv[6] == "python": + import python_strings + from python_strings import Consts + target = python_strings.Target.PYTHON else: - print("Only java or typescript can be set for lang") + 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") @@ -124,26 +133,26 @@ 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"): - 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]" - 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("LDKTxid"): - fn_arg = "uint8_t (*" + fn_arg[8:] + ")[32]" - assert var_is_arr_regex.match(fn_arg[8:]) - rust_obj = "LDKThirtyTwoBytes" + elif fn_arg.startswith("LDKThirtyTwoU16s"): + fn_arg = "uint16_t (*" + fn_arg[17:] + ")[32]" + assert var_is_arr_regex.match(fn_arg[9:]) + rust_obj = "LDKThirtyTwoU16s" arr_access = "data" + elif fn_arg.startswith("LDKU128"): + if fn_arg == "LDKU128": + fn_arg = "LDKU128 arg" + if fn_arg.startswith("LDKU128*") or fn_arg.startswith("LDKU128 *"): + fn_arg = "uint8_t (" + fn_arg[8:] + ")[16]" + else: + fn_arg = "uint8_t (*" + fn_arg[8:] + ")[16]" + assert var_is_arr_regex.match(fn_arg[8:]) + rust_obj = "LDKU128" + arr_access = "le_bytes" elif fn_arg.startswith("LDKPublicKey"): fn_arg = "uint8_t (*" + fn_arg[13:] + ")[33]" assert var_is_arr_regex.match(fn_arg[8:]) @@ -154,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 = "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 = "LDKSignature" + rust_obj = "LDKSchnorrSignature" arr_access = "compact_form" elif fn_arg.startswith("LDKRecoverableSignature"): fn_arg = "uint8_t (*" + fn_arg[24:] + ")[68]" @@ -204,6 +218,17 @@ 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": + 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" elif fn_arg.startswith("LDKCVec_"): is_ptr = False if "*" in fn_arg: @@ -249,7 +274,7 @@ def java_c_types(fn_arg, ret_arr_len): fn_arg = fn_arg[4:].strip() is_primitive = True elif fn_arg.startswith("bool"): - java_ty = "boolean" + java_ty = consts.c_type_map['bool'][0] c_ty = "jboolean" fn_ty_arg = "Z" arr_ty = "bool" @@ -263,11 +288,11 @@ def java_c_types(fn_arg, ret_arr_len): arr_ty = "uint8_t" fn_arg = fn_arg[7:].strip() is_primitive = True - elif fn_arg.startswith("LDKu5") or fn_arg.startswith("LDKWitnessVersion"): + elif fn_arg.startswith("LDKU5") or fn_arg.startswith("LDKWitnessVersion"): java_ty = consts.c_type_map['uint8_t'][0] - if fn_arg.startswith("LDKu5"): + if fn_arg.startswith("LDKU5"): java_hu_ty = "UInt5" - rust_obj = "LDKu5" + rust_obj = "LDKU5" fn_arg = fn_arg[6:].strip() else: java_hu_ty = "WitnessVersion" @@ -292,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'] @@ -315,14 +356,17 @@ def java_c_types(fn_arg, ret_arr_len): arr_ty = "LDKStr" fn_ty_arg = "Ljava/lang/String;" fn_arg = fn_arg[6:].strip() - elif fn_arg.startswith("LDKStr"): + elif fn_arg.startswith("LDKStr") or fn_arg.startswith("LDKAddress"): rust_obj = "LDKStr" arr_ty = "LDKStr" java_ty = consts.java_type_map["String"] java_hu_ty = consts.java_hu_type_map["String"] c_ty = "jstring" fn_ty_arg = "Ljava/lang/String;" - fn_arg = fn_arg[6:].strip() + if fn_arg.startswith("LDKAddress"): + fn_arg = fn_arg[10:].strip() + else: + fn_arg = fn_arg[6:].strip() arr_access = "chars" arr_len = "len" elif fn_arg.startswith("LDKError ") or fn_arg == "LDKError": @@ -340,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() @@ -381,6 +425,8 @@ def java_c_types(fn_arg, ret_arr_len): else: java_ty = java_ty + "[]" java_hu_ty = java_ty + if rust_obj == "LDKU128": + java_hu_ty = consts.u128_native_ty c_ty = c_ty + "Array" subty = java_c_types(arr_ty, None) @@ -539,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")) @@ -551,7 +600,6 @@ with open(sys.argv[1]) as in_h, open(f"{sys.argv[2]}/bindings{consts.file_ext}", default_constructor_args = {} takes_self = False takes_self_ptr = False - args_known = True for argument_index, argument in enumerate(method_arguments): arg_ty = type_mapping_generator.java_c_types(argument, None) @@ -585,13 +633,12 @@ with open(sys.argv[1]) as in_h, open(f"{sys.argv[2]}/bindings{consts.file_ext}", if argument_conversion_info.arg_conv is not None and "WARNING" in argument_conversion_info.arg_conv: if argument_conversion_info.rust_obj in constructor_fns: assert not is_free - for explode_arg in constructor_fns[argument_conversion_info.rust_obj].split(','): + for explode_idx, explode_arg in enumerate(constructor_fns[argument_conversion_info.rust_obj].split(',')): explode_arg_conv = type_mapping_generator.map_type(explode_arg, False, None, False, True) + if explode_idx == 0 and explode_arg_conv.c_ty == "void": + continue # (void) is C lingo for "no arguments) if explode_arg_conv.c_ty == "void": - # We actually want to handle this case, but for now its only used in NetGraphMsgHandler::new() - # which ends up resulting in a redundant constructor - both without arguments for the NetworkGraph. - args_known = False - pass + assert False if not argument_conversion_info.arg_name in default_constructor_args: default_constructor_args[argument_conversion_info.arg_name] = [] default_constructor_args[argument_conversion_info.arg_name].append(explode_arg_conv) @@ -607,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_")) @@ -625,6 +672,7 @@ with open(sys.argv[1]) as in_h, open(f"{sys.argv[2]}/bindings{consts.file_ext}", arg.from_hu_conv = (arg.from_hu_conv[0], "") out_java.write("\t// " + line) + args_known = True # We no longer ever set this to false (out_java_delta, out_c_delta, out_java_struct_delta) = \ consts.map_function(argument_types, c_call_string, method_name, struct_meth_name, return_type_info, struct_meth, default_constructor_args, takes_self, takes_self_ptr, args_known, type_mapping_generator, doc_comment) out_java.write(out_java_delta) @@ -740,13 +788,20 @@ with open(sys.argv[1]) as in_h, open(f"{sys.argv[2]}/bindings{consts.file_ext}", for var_line in field_var_lines: if var_line.group(1) in trait_structs: field_var_convs.append((var_line.group(1), var_line.group(2), trait_structs[var_line.group(1)])) - flattened_field_var_convs.append((var_line.group(1), var_line.group(2), )) - flattened_field_var_convs.extend(trait_structs[var_line.group(1)]) + flattened_field_var_convs.append((var_line.group(1), var_line.group(2), var_line.group(2))) + for field_var in trait_structs[var_line.group(1)]: + if isinstance(field_var, ConvInfo): + flattened_field_var_convs.append(field_var) + else: + path = var_line.group(2) + if len(field_var) > 2: + path = var_line.group(2) + "." + field_var[2] + flattened_field_var_convs.append((field_var[0], field_var[1], path)) else: mapped = type_mapping_generator.map_type(var_line.group(1) + " " + var_line.group(2), False, None, False, False) field_var_convs.append(mapped) flattened_field_var_convs.append(mapped) - trait_structs[struct_name] = field_var_convs + trait_structs[struct_name] = flattened_field_var_convs field_fns = [] for fn_docs, fn_line in trait_fn_lines: @@ -756,9 +811,8 @@ with open(sys.argv[1]) as in_h, open(f"{sys.argv[2]}/bindings{consts.file_ext}", else: (nullable_params, ret_nullable) = doc_to_params_ret_nullable(fn_docs) if ret_nullable: - assert False # This isn't yet handled on the Java side - ret_ty_info.nullable = True ret_ty_info = type_mapping_generator.map_nullable_type(fn_line.group(2).strip() + " ret", True, None, False, False) + ret_ty_info.nullable = True else: ret_ty_info = type_mapping_generator.map_type(fn_line.group(2).strip() + " ret", True, None, False, False) is_const = fn_line.group(4) is not None @@ -1044,6 +1098,7 @@ with open(sys.argv[1]) as in_h, open(f"{sys.argv[2]}/bindings{consts.file_ext}", 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(consts.txout_defn) + out_java_struct.write(consts.hu_struct_file_suffix) 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);") @@ -1054,10 +1109,41 @@ 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) out_java_struct.write(consts.scalar_defn) + out_java_struct.write(consts.hu_struct_file_suffix) fn_line = "struct LDKThirtyTwoBytes BigEndianScalar_get_bytes (struct LDKBigEndianScalar* thing)" write_c(fn_line + " {\n") write_c("\tLDKThirtyTwoBytes ret = { .data = *thing->big_endian_bytes };\n") @@ -1108,23 +1194,23 @@ with open(sys.argv[1]) as in_h, open(f"{sys.argv[2]}/bindings{consts.file_ext}", else: assert(line == "\n") - out_java.write(consts.bindings_footer) + out_java.write(consts.bindings_footer()) for struct_name in opaque_structs: with open(f"{sys.argv[3]}/structs/{struct_name.replace('LDK', '')}{consts.file_ext}", "a") as out_java_struct: - out_java_struct.write("}\n") + out_java_struct.write("}\n" + consts.hu_struct_file_suffix) for struct_name in trait_structs: with open(f"{sys.argv[3]}/structs/{struct_name.replace('LDK', '')}{consts.file_ext}", "a") as out_java_struct: - out_java_struct.write("}\n") + out_java_struct.write("}\n" + consts.hu_struct_file_suffix) for struct_name in complex_enums: with open(f"{sys.argv[3]}/structs/{struct_name.replace('LDK', '').replace('COption', 'Option')}{consts.file_ext}", "a") as out_java_struct: - out_java_struct.write("}\n") + out_java_struct.write("}\n" + consts.hu_struct_file_suffix) for struct_name in result_types: with open(f"{sys.argv[3]}/structs/{struct_name.replace('LDKCResult', 'Result')}{consts.file_ext}", "a") as out_java_struct: - out_java_struct.write("}\n") + out_java_struct.write("}\n" + consts.hu_struct_file_suffix) for struct_name in tuple_types: struct_hu_name = struct_name.replace("LDKC2Tuple", "TwoTuple").replace("LDKC3Tuple", "ThreeTuple") with open(f"{sys.argv[3]}/structs/{struct_hu_name}{consts.file_ext}", "a") as out_java_struct: - out_java_struct.write("}\n") + out_java_struct.write("}\n" + consts.hu_struct_file_suffix) with open(f"{sys.argv[4]}/bindings.c.body", "w") as out_c: out_c.write(consts.c_file_pfx)