X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c_sharp%2Fsrc%2Forg%2Fldk%2Fstructs%2FOffer.cs;h=2ac035d9703463e7d0b65c2478f105e753ff03da;hb=8de7213fbf663ff60322896282dad51e8ab2f001;hp=c23621e4a4a5eb9ea02ed7f1c03095b7e306c11d;hpb=afc50e5d491a11364849383b75a8f939df703bac;p=ldk-java diff --git a/c_sharp/src/org/ldk/structs/Offer.cs b/c_sharp/src/org/ldk/structs/Offer.cs index c23621e4..2ac035d9 100644 --- a/c_sharp/src/org/ldk/structs/Offer.cs +++ b/c_sharp/src/org/ldk/structs/Offer.cs @@ -51,19 +51,18 @@ public class Offer : CommonBase { * for the selected chain. */ public byte[][] chains() { - byte[][] ret = bindings.Offer_chains(this.ptr); + long ret = bindings.Offer_chains(this.ptr); GC.KeepAlive(this); - return ret; - } - - /** - * Returns whether the given chain is supported by the offer. - */ - public bool supports_chain(byte[] chain) { - bool ret = bindings.Offer_supports_chain(this.ptr, InternalUtils.check_arr_len(chain, 32)); - GC.KeepAlive(this); - GC.KeepAlive(chain); - return ret; + if (ret >= 0 && ret <= 4096) { return null; } + int ret_conv_8_len = InternalUtils.getArrayLength(ret); + byte[][] ret_conv_8_arr = new byte[ret_conv_8_len][]; + for (int i = 0; i < ret_conv_8_len; i++) { + long ret_conv_8 = InternalUtils.getU64ArrayElem(ret, i); + byte[] ret_conv_8_conv = InternalUtils.decodeUint8Array(ret_conv_8); + ret_conv_8_arr[i] = ret_conv_8_conv; + } + bindings.free_buffer(ret); + return ret_conv_8_arr; } /** @@ -109,8 +108,8 @@ public class Offer : CommonBase { /** * Features pertaining to the offer. */ - public OfferFeatures features() { - long ret = bindings.Offer_features(this.ptr); + public OfferFeatures offer_features() { + long ret = bindings.Offer_offer_features(this.ptr); GC.KeepAlive(this); if (ret >= 0 && ret <= 4096) { return null; } org.ldk.structs.OfferFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.OfferFeatures(null, ret); } @@ -123,24 +122,15 @@ public class Offer : CommonBase { * * If `None`, the offer does not expire. */ - public Option_DurationZ absolute_expiry() { + public Option_u64Z absolute_expiry() { long ret = bindings.Offer_absolute_expiry(this.ptr); GC.KeepAlive(this); if (ret >= 0 && ret <= 4096) { return null; } - org.ldk.structs.Option_DurationZ ret_hu_conv = org.ldk.structs.Option_DurationZ.constr_from_ptr(ret); + org.ldk.structs.Option_u64Z ret_hu_conv = org.ldk.structs.Option_u64Z.constr_from_ptr(ret); if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.AddLast(this); }; return ret_hu_conv; } - /** - * Whether the offer has expired. - */ - public bool is_expired() { - bool ret = bindings.Offer_is_expired(this.ptr); - GC.KeepAlive(this); - return ret; - } - /** * The issuer of the offer, possibly beginning with `user@domain` or `domain`. Intended to be * displayed to the user but with the caveat that it has not been verified in any way. @@ -161,16 +151,18 @@ public class Offer : CommonBase { * recipient privacy by obfuscating its node id. */ public BlindedPath[] paths() { - long[] ret = bindings.Offer_paths(this.ptr); + long ret = bindings.Offer_paths(this.ptr); GC.KeepAlive(this); - int ret_conv_13_len = ret.Length; + if (ret >= 0 && ret <= 4096) { return null; } + int ret_conv_13_len = InternalUtils.getArrayLength(ret); BlindedPath[] ret_conv_13_arr = new BlindedPath[ret_conv_13_len]; for (int n = 0; n < ret_conv_13_len; n++) { - long ret_conv_13 = ret[n]; + long ret_conv_13 = InternalUtils.getU64ArrayElem(ret, n); org.ldk.structs.BlindedPath ret_conv_13_hu_conv = null; if (ret_conv_13 < 0 || ret_conv_13 > 4096) { ret_conv_13_hu_conv = new org.ldk.structs.BlindedPath(null, ret_conv_13); } if (ret_conv_13_hu_conv != null) { ret_conv_13_hu_conv.ptrs_to.AddLast(this); }; ret_conv_13_arr[n] = ret_conv_13_hu_conv; } + bindings.free_buffer(ret); return ret_conv_13_arr; } @@ -186,6 +178,36 @@ public class Offer : CommonBase { return ret_hu_conv; } + /** + * The public key used by the recipient to sign invoices. + */ + public byte[] signing_pubkey() { + long ret = bindings.Offer_signing_pubkey(this.ptr); + GC.KeepAlive(this); + if (ret >= 0 && ret <= 4096) { return null; } + byte[] ret_conv = InternalUtils.decodeUint8Array(ret); + return ret_conv; + } + + /** + * Returns whether the given chain is supported by the offer. + */ + public bool supports_chain(byte[] chain) { + bool ret = bindings.Offer_supports_chain(this.ptr, InternalUtils.encodeUint8Array(InternalUtils.check_arr_len(chain, 32))); + GC.KeepAlive(this); + GC.KeepAlive(chain); + return ret; + } + + /** + * Whether the offer has expired. + */ + public bool is_expired() { + bool ret = bindings.Offer_is_expired(this.ptr); + GC.KeepAlive(this); + return ret; + } + /** * Returns whether the given quantity is valid for the offer. */ @@ -207,29 +229,22 @@ public class Offer : CommonBase { return ret; } - /** - * The public key used by the recipient to sign invoices. - */ - public byte[] signing_pubkey() { - byte[] ret = bindings.Offer_signing_pubkey(this.ptr); - GC.KeepAlive(this); - return ret; - } - /** * Serialize the Offer object into a byte array which can be read by Offer_read */ public byte[] write() { - byte[] ret = bindings.Offer_write(this.ptr); + long ret = bindings.Offer_write(this.ptr); GC.KeepAlive(this); - return ret; + if (ret >= 0 && ret <= 4096) { return null; } + byte[] ret_conv = InternalUtils.decodeUint8Array(ret); + return ret_conv; } /** * Read a Offer object from a string */ public static Result_OfferBolt12ParseErrorZ from_str(string s) { - long ret = bindings.Offer_from_str(s); + long ret = bindings.Offer_from_str(InternalUtils.encodeString(s)); GC.KeepAlive(s); if (ret >= 0 && ret <= 4096) { return null; } Result_OfferBolt12ParseErrorZ ret_hu_conv = Result_OfferBolt12ParseErrorZ.constr_from_ptr(ret);