X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-c-bindings%2Fsrc%2Flightning%2Futil%2Ferrors.rs;h=229fe039961b5aef8a8a47ddc03ce0b6e5c43d5a;hb=4b4f99b5639701ccfd4722589316ce2c333ef517;hp=27d79c2bf72c32f456a00b97e99b626d24bc21a6;hpb=2f0c348c6fe505a736c3d015df6d6cd30032c912;p=ldk-c-bindings

diff --git a/lightning-c-bindings/src/lightning/util/errors.rs b/lightning-c-bindings/src/lightning/util/errors.rs
index 27d79c2..229fe03 100644
--- a/lightning-c-bindings/src/lightning/util/errors.rs
+++ b/lightning-c-bindings/src/lightning/util/errors.rs
@@ -10,6 +10,7 @@
 
 use std::str::FromStr;
 use std::ffi::c_void;
+use core::convert::Infallible;
 use bitcoin::hashes::Hash;
 use crate::c_types::*;
 
@@ -50,6 +51,18 @@ pub enum APIError {
 	/// An attempt to call watch/update_channel returned an Err (ie you did this!), causing the
 	/// attempted action to fail.
 	MonitorUpdateFailed,
+	/// [`KeysInterface::get_shutdown_scriptpubkey`] returned a shutdown scriptpubkey incompatible
+	/// with the channel counterparty as negotiated in [`InitFeatures`].
+	///
+	/// Using a SegWit v0 script should resolve this issue. If you cannot, you won't be able to open
+	/// a channel or cooperatively close one with this peer (and will have to force-close instead).
+	///
+	/// [`KeysInterface::get_shutdown_scriptpubkey`]: crate::chain::keysinterface::KeysInterface::get_shutdown_scriptpubkey
+	/// [`InitFeatures`]: crate::ln::features::InitFeatures
+	IncompatibleShutdownScript {
+		/// The incompatible shutdown script.
+		script: crate::lightning::ln::script::ShutdownScript,
+	},
 }
 use lightning::util::errors::APIError as nativeAPIError;
 impl APIError {
@@ -83,6 +96,12 @@ impl APIError {
 				}
 			},
 			APIError::MonitorUpdateFailed => nativeAPIError::MonitorUpdateFailed,
+			APIError::IncompatibleShutdownScript {ref script, } => {
+				let mut script_nonref = (*script).clone();
+				nativeAPIError::IncompatibleShutdownScript {
+					script: *unsafe { Box::from_raw(script_nonref.take_inner()) },
+				}
+			},
 		}
 	}
 	#[allow(unused)]
@@ -110,6 +129,11 @@ impl APIError {
 				}
 			},
 			APIError::MonitorUpdateFailed => nativeAPIError::MonitorUpdateFailed,
+			APIError::IncompatibleShutdownScript {mut script, } => {
+				nativeAPIError::IncompatibleShutdownScript {
+					script: *unsafe { Box::from_raw(script.take_inner()) },
+				}
+			},
 		}
 	}
 	#[allow(unused)]
@@ -142,6 +166,12 @@ impl APIError {
 				}
 			},
 			nativeAPIError::MonitorUpdateFailed => APIError::MonitorUpdateFailed,
+			nativeAPIError::IncompatibleShutdownScript {ref script, } => {
+				let mut script_nonref = (*script).clone();
+				APIError::IncompatibleShutdownScript {
+					script: crate::lightning::ln::script::ShutdownScript { inner: ObjOps::heap_alloc(script_nonref), is_owned: true },
+				}
+			},
 		}
 	}
 	#[allow(unused)]
@@ -169,6 +199,11 @@ impl APIError {
 				}
 			},
 			nativeAPIError::MonitorUpdateFailed => APIError::MonitorUpdateFailed,
+			nativeAPIError::IncompatibleShutdownScript {mut script, } => {
+				APIError::IncompatibleShutdownScript {
+					script: crate::lightning::ln::script::ShutdownScript { inner: ObjOps::heap_alloc(script), is_owned: true },
+				}
+			},
 		}
 	}
 }
@@ -213,3 +248,10 @@ pub extern "C" fn APIError_channel_unavailable(err: crate::c_types::Str) -> APIE
 /// Utility method to constructs a new MonitorUpdateFailed-variant APIError
 pub extern "C" fn APIError_monitor_update_failed() -> APIError {
 	APIError::MonitorUpdateFailed}
+#[no_mangle]
+/// Utility method to constructs a new IncompatibleShutdownScript-variant APIError
+pub extern "C" fn APIError_incompatible_shutdown_script(script: crate::lightning::ln::script::ShutdownScript) -> APIError {
+	APIError::IncompatibleShutdownScript {
+		script,
+	}
+}