Update auto-generated bindings to latest upstream

Author: TheBlueMatt

lightning-c-bindings/include/ldk_rust_types.h

@@ -55,7 +55,6 @@ typedef struct nativeDelayedPaymentOutputDescriptorOpaque LDKnativeDelayedPaymen
 struct nativeStaticPaymentOutputDescriptorOpaque;
 typedef struct nativeStaticPaymentOutputDescriptorOpaque LDKnativeStaticPaymentOutputDescriptor;
 struct LDKBaseSign;
-typedef struct LDKBaseSign LDKBaseSign;
 struct nativeInMemorySignerOpaque;
 typedef struct nativeInMemorySignerOpaque LDKnativeInMemorySigner;
 struct nativeKeysManagerOpaque;
@@ -120,7 +119,6 @@ struct nativeErroringMessageHandlerOpaque;
 typedef struct nativeErroringMessageHandlerOpaque LDKnativeErroringMessageHandler;
 struct nativeMessageHandlerOpaque;
 typedef struct nativeMessageHandlerOpaque LDKnativeMessageHandler;
-typedef struct LDKSocketDescriptor LDKSocketDescriptor;
 struct nativePeerHandleErrorOpaque;
 typedef struct nativePeerHandleErrorOpaque LDKnativePeerHandleError;
 struct nativePeerManagerOpaque;

lightning-c-bindings/include/lightning.h

@@ -536,8 +536,7 @@ pub extern "C" fn ChannelDetails_set_is_funding_locked(this_ptr: &mut ChannelDet
 	unsafe { &mut *this_ptr.inner }.is_funding_locked = val;
 }
 /// True if the channel is (a) confirmed and funding_locked messages have been exchanged, (b)
-/// the peer is connected, (c) no monitor update failure is pending resolution, and (d) the
-/// channel is not currently negotiating a shutdown.
+/// the peer is connected, and (c) the channel is not currently negotiating a shutdown.
 ///
 /// This is a strict superset of `is_funding_locked`.
 #[no_mangle]
@@ -546,8 +545,7 @@ pub extern "C" fn ChannelDetails_get_is_usable(this_ptr: &ChannelDetails) -> boo
 	*inner_val
 }
 /// True if the channel is (a) confirmed and funding_locked messages have been exchanged, (b)
-/// the peer is connected, (c) no monitor update failure is pending resolution, and (d) the
-/// channel is not currently negotiating a shutdown.
+/// the peer is connected, and (c) the channel is not currently negotiating a shutdown.
 ///
 /// This is a strict superset of `is_funding_locked`.
 #[no_mangle]

lightning-c-bindings/src/lightning/ln/channelmanager.rs

@@ -4014,6 +4014,9 @@ pub enum ErrorAction {
 	},
 	/// The peer did something harmless that we weren't able to process, just log and ignore
 	IgnoreError,
+	/// The peer did something harmless that we weren't able to meaningfully process.
+	/// If the error is logged, log it at the given level.
+	IgnoreAndLog(crate::lightning::util::logger::Level),
 	/// The peer did something incorrect. Tell them.
 	SendErrorMessage {
 		/// The message to send.
@@ -4033,6 +4036,12 @@ impl ErrorAction {
 				}
 			},
 			ErrorAction::IgnoreError => nativeErrorAction::IgnoreError,
+			ErrorAction::IgnoreAndLog (ref a, ) => {
+				let mut a_nonref = (*a).clone();
+				nativeErrorAction::IgnoreAndLog (
+					a_nonref.into_native(),
+				)
+			},
 			ErrorAction::SendErrorMessage {ref msg, } => {
 				let mut msg_nonref = (*msg).clone();
 				nativeErrorAction::SendErrorMessage {
@@ -4051,6 +4060,11 @@ impl ErrorAction {
 				}
 			},
 			ErrorAction::IgnoreError => nativeErrorAction::IgnoreError,
+			ErrorAction::IgnoreAndLog (mut a, ) => {
+				nativeErrorAction::IgnoreAndLog (
+					a.into_native(),
+				)
+			},
 			ErrorAction::SendErrorMessage {mut msg, } => {
 				nativeErrorAction::SendErrorMessage {
 					msg: *unsafe { Box::from_raw(msg.take_inner()) },
@@ -4069,6 +4083,12 @@ impl ErrorAction {
 				}
 			},
 			nativeErrorAction::IgnoreError => ErrorAction::IgnoreError,
+			nativeErrorAction::IgnoreAndLog (ref a, ) => {
+				let mut a_nonref = (*a).clone();
+				ErrorAction::IgnoreAndLog (
+					crate::lightning::util::logger::Level::native_into(a_nonref),
+				)
+			},
 			nativeErrorAction::SendErrorMessage {ref msg, } => {
 				let mut msg_nonref = (*msg).clone();
 				ErrorAction::SendErrorMessage {
@@ -4087,6 +4107,11 @@ impl ErrorAction {
 				}
 			},
 			nativeErrorAction::IgnoreError => ErrorAction::IgnoreError,
+			nativeErrorAction::IgnoreAndLog (mut a, ) => {
+				ErrorAction::IgnoreAndLog (
+					crate::lightning::util::logger::Level::native_into(a),
+				)
+			},
 			nativeErrorAction::SendErrorMessage {mut msg, } => {
 				ErrorAction::SendErrorMessage {
 					msg: crate::lightning::ln::msgs::ErrorMessage { inner: Box::into_raw(Box::new(msg)), is_owned: true },

lightning-c-bindings/src/lightning/ln/msgs.rs

@@ -23,63 +23,57 @@ use crate::c_types::*;
 #[derive(Clone)]
 #[repr(C)]
 pub enum Level {
-	///Designates logger being silent
-	Off,
-	/// Designates very serious errors
-	Error,
-	/// Designates hazardous situations
-	Warn,
-	/// Designates useful information
-	Info,
-	/// Designates lower priority information
-	Debug,
 	/// Designates very low priority, often extremely verbose, information
 	Trace,
+	/// Designates lower priority information
+	Debug,
+	/// Designates useful information
+	Info,
+	/// Designates hazardous situations
+	Warn,
+	/// Designates very serious errors
+	Error,
 }
 use lightning::util::logger::Level as nativeLevel;
 impl Level {
 	#[allow(unused)]
 	pub(crate) fn to_native(&self) -> nativeLevel {
 		match self {
-			Level::Off => nativeLevel::Off,
-			Level::Error => nativeLevel::Error,
-			Level::Warn => nativeLevel::Warn,
-			Level::Info => nativeLevel::Info,
-			Level::Debug => nativeLevel::Debug,
 			Level::Trace => nativeLevel::Trace,
+			Level::Debug => nativeLevel::Debug,
+			Level::Info => nativeLevel::Info,
+			Level::Warn => nativeLevel::Warn,
+			Level::Error => nativeLevel::Error,
 		}
 	}
 	#[allow(unused)]
 	pub(crate) fn into_native(self) -> nativeLevel {
 		match self {
-			Level::Off => nativeLevel::Off,
-			Level::Error => nativeLevel::Error,
-			Level::Warn => nativeLevel::Warn,
-			Level::Info => nativeLevel::Info,
-			Level::Debug => nativeLevel::Debug,
 			Level::Trace => nativeLevel::Trace,
+			Level::Debug => nativeLevel::Debug,
+			Level::Info => nativeLevel::Info,
+			Level::Warn => nativeLevel::Warn,
+			Level::Error => nativeLevel::Error,
 		}
 	}
 	#[allow(unused)]
 	pub(crate) fn from_native(native: &nativeLevel) -> Self {
 		match native {
-			nativeLevel::Off => Level::Off,
-			nativeLevel::Error => Level::Error,
-			nativeLevel::Warn => Level::Warn,
-			nativeLevel::Info => Level::Info,
-			nativeLevel::Debug => Level::Debug,
 			nativeLevel::Trace => Level::Trace,
+			nativeLevel::Debug => Level::Debug,
+			nativeLevel::Info => Level::Info,
+			nativeLevel::Warn => Level::Warn,
+			nativeLevel::Error => Level::Error,
 		}
 	}
 	#[allow(unused)]
 	pub(crate) fn native_into(native: nativeLevel) -> Self {
 		match native {
-			nativeLevel::Off => Level::Off,
-			nativeLevel::Error => Level::Error,
-			nativeLevel::Warn => Level::Warn,
-			nativeLevel::Info => Level::Info,
-			nativeLevel::Debug => Level::Debug,
 			nativeLevel::Trace => Level::Trace,
+			nativeLevel::Debug => Level::Debug,
+			nativeLevel::Info => Level::Info,
+			nativeLevel::Warn => Level::Warn,
+			nativeLevel::Error => Level::Error,
 		}
 	}
 }

lightning-c-bindings/src/lightning/ln/peer_handler.rs

@@ -14,13 +14,13 @@
 //! Note this is not part of the specs, but follows lnd's signing and verifying protocol, which can is defined as follows:
 //!
 //! signature = zbase32(SigRec(sha256d((\"Lightning Signed Message:\" + msg)))
-//! zbase32 from https://philzimmermann.com/docs/human-oriented-base-32-encoding.txt
+//! zbase32 from <https://philzimmermann.com/docs/human-oriented-base-32-encoding.txt>
 //! SigRec has first byte 31 + recovery id, followed by 64 byte sig.
 //!
 //! This implementation is compatible with both lnd's and c-lightning's
 //!
-//! https://lightning.readthedocs.io/lightning-signmessage.7.html
-//! https://api.lightning.community/#signmessage
+//! <https://lightning.readthedocs.io/lightning-signmessage.7.html>
+//! <https://api.lightning.community/#signmessage>
 
 use std::str::FromStr;
 use std::ffi::c_void;
@@ -31,8 +31,8 @@ use crate::c_types::*;
 /// A receiver knowing the PublicKey (e.g. the node's id) and the message can be sure that the signature was generated by the caller.
 /// Signatures are EC recoverable, meaning that given the message and the signature the PublicKey of the signer can be extracted.
 #[no_mangle]
-pub extern "C" fn sign(mut msg: crate::c_types::u8slice, mut sk: crate::c_types::SecretKey) -> crate::c_types::derived::CResult_StringErrorZ {
-	let mut ret = lightning::util::message_signing::sign(msg.to_slice(), sk.into_rust());
+pub extern "C" fn sign(mut msg: crate::c_types::u8slice, sk: *const [u8; 32]) -> crate::c_types::derived::CResult_StringErrorZ {
+	let mut ret = lightning::util::message_signing::sign(msg.to_slice(), &::bitcoin::secp256k1::key::SecretKey::from_slice(&unsafe { *sk}[..]).unwrap());
 	let mut local_ret = match ret { Ok(mut o) => crate::c_types::CResultTempl::ok( { o.into() }).into(), Err(mut e) => crate::c_types::CResultTempl::err( { crate::c_types::Secp256k1Error::from_rust(e) }).into() };
 	local_ret
 }
@@ -49,7 +49,7 @@ pub extern "C" fn recover_pk(mut msg: crate::c_types::u8slice, mut sig: crate::c
 /// and the PublicKey.
 #[no_mangle]
 pub extern "C" fn verify(mut msg: crate::c_types::u8slice, mut sig: crate::c_types::Str, mut pk: crate::c_types::PublicKey) -> bool {
-	let mut ret = lightning::util::message_signing::verify(msg.to_slice(), sig.into_str(), pk.into_rust());
+	let mut ret = lightning::util::message_signing::verify(msg.to_slice(), sig.into_str(), &pk.into_rust());
 	ret
 }
 

lightning-c-bindings/src/lightning/util/logger.rs

@@ -110,6 +110,22 @@ use bitcoin::hashes::Hash;
 use crate::c_types::*;
 
 }
+/// Default expiry time as defined by [BOLT 11].
+///
+/// [BOLT 11]: https://github.com/lightningnetwork/lightning-rfc/blob/master/11-payment-encoding.md
+
+#[no_mangle]
+pub static DEFAULT_EXPIRY_TIME: u64 = lightning_invoice::DEFAULT_EXPIRY_TIME;
+/// Default minimum final CLTV expiry as defined by [BOLT 11].
+///
+/// Note that this is *not* the same value as rust-lightning's minimum CLTV expiry, which is
+/// provided in [`MIN_FINAL_CLTV_EXPIRY`].
+///
+/// [BOLT 11]: https://github.com/lightningnetwork/lightning-rfc/blob/master/11-payment-encoding.md
+/// [`MIN_FINAL_CLTV_EXPIRY`]: lightning::ln::channelmanager::MIN_FINAL_CLTV_EXPIRY
+
+#[no_mangle]
+pub static DEFAULT_MIN_FINAL_CLTV_EXPIRY: u64 = lightning_invoice::DEFAULT_MIN_FINAL_CLTV_EXPIRY;
 /// **Call this function on startup to ensure that all assumptions about the platform are valid.**
 ///
 /// Unfortunately we have to make assumptions about the upper bounds of the `SystemTime` type on