X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-c-bindings%2Fsrc%2Fc_types%2Fmod.rs;h=71aa6793cc25c9c3f2de853dedb9de0ff90e5f2b;hb=321d9d5103debfe4d5b92d8717fa4339e1d57969;hp=80f04c523f421d9fd2cd64fcbb9ae0c767781999;hpb=529b93b9b39972119e2569c5dc4913ffdf4a8d8f;p=ldk-c-bindings

diff --git a/lightning-c-bindings/src/c_types/mod.rs b/lightning-c-bindings/src/c_types/mod.rs
index 80f04c5..71aa679 100644
--- a/lightning-c-bindings/src/c_types/mod.rs
+++ b/lightning-c-bindings/src/c_types/mod.rs
@@ -5,12 +5,12 @@ pub mod derived;
 
 use bitcoin::Transaction as BitcoinTransaction;
 use bitcoin::hashes::Hash;
-use bitcoin::secp256k1::key::PublicKey as SecpPublicKey;
-use bitcoin::secp256k1::key::SecretKey as SecpSecretKey;
-use bitcoin::secp256k1::Signature as SecpSignature;
+use bitcoin::secp256k1::PublicKey as SecpPublicKey;
+use bitcoin::secp256k1::SecretKey as SecpSecretKey;
+use bitcoin::secp256k1::ecdsa::Signature as SecpSignature;
 use bitcoin::secp256k1::Error as SecpError;
-use bitcoin::secp256k1::recovery::RecoveryId;
-use bitcoin::secp256k1::recovery::RecoverableSignature as SecpRecoverableSignature;
+use bitcoin::secp256k1::ecdsa::RecoveryId;
+use bitcoin::secp256k1::ecdsa::RecoverableSignature as SecpRecoverableSignature;
 use bitcoin::bech32;
 
 use core::convert::TryInto; // Bindings need at least rustc 1.34
@@ -146,14 +146,18 @@ pub enum Secp256k1Error {
 	InvalidSignature,
 	/// Bad secret key
 	InvalidSecretKey,
+	/// Bad shared secret.
+	InvalidSharedSecret,
 	/// Bad recovery id
 	InvalidRecoveryId,
 	/// Invalid tweak for add_assign or mul_assign
 	InvalidTweak,
-	/// tweak_add_check failed on an xonly public key
-	TweakCheckFailed,
 	/// Didn't pass enough memory to context creation with preallocated memory
 	NotEnoughMemory,
+	/// Bad set of public keys.
+	InvalidPublicKeySum,
+	/// The only valid parity values are 0 or 1.
+	InvalidParityValue,
 }
 impl Secp256k1Error {
 	pub(crate) fn from_rust(err: SecpError) -> Self {
@@ -163,23 +167,28 @@ impl Secp256k1Error {
 			SecpError::InvalidPublicKey => Secp256k1Error::InvalidPublicKey,
 			SecpError::InvalidSignature => Secp256k1Error::InvalidSignature,
 			SecpError::InvalidSecretKey => Secp256k1Error::InvalidSecretKey,
+			SecpError::InvalidSharedSecret => Secp256k1Error::InvalidSharedSecret,
 			SecpError::InvalidRecoveryId => Secp256k1Error::InvalidRecoveryId,
 			SecpError::InvalidTweak => Secp256k1Error::InvalidTweak,
-			SecpError::TweakCheckFailed => Secp256k1Error::TweakCheckFailed,
 			SecpError::NotEnoughMemory => Secp256k1Error::NotEnoughMemory,
+			SecpError::InvalidPublicKeySum => Secp256k1Error::InvalidPublicKeySum,
+			SecpError::InvalidParityValue(_) => Secp256k1Error::InvalidParityValue,
 		}
 	}
 	pub(crate) fn into_rust(self) -> SecpError {
+		let invalid_parity = secp256k1::Parity::from_i32(42).unwrap_err();
 		match self {
 			Secp256k1Error::IncorrectSignature => SecpError::IncorrectSignature,
 			Secp256k1Error::InvalidMessage => SecpError::InvalidMessage,
 			Secp256k1Error::InvalidPublicKey => SecpError::InvalidPublicKey,
 			Secp256k1Error::InvalidSignature => SecpError::InvalidSignature,
 			Secp256k1Error::InvalidSecretKey => SecpError::InvalidSecretKey,
+			Secp256k1Error::InvalidSharedSecret => SecpError::InvalidSharedSecret,
 			Secp256k1Error::InvalidRecoveryId => SecpError::InvalidRecoveryId,
 			Secp256k1Error::InvalidTweak => SecpError::InvalidTweak,
-			Secp256k1Error::TweakCheckFailed => SecpError::TweakCheckFailed,
 			Secp256k1Error::NotEnoughMemory => SecpError::NotEnoughMemory,
+			Secp256k1Error::InvalidPublicKeySum => SecpError::InvalidPublicKeySum,
+			Secp256k1Error::InvalidParityValue => SecpError::InvalidParityValue(invalid_parity),
 		}
 	}
 }
@@ -227,6 +236,12 @@ impl Bech32Error {
 		}
 	}
 }
+#[no_mangle]
+/// Creates a new Bech32Error which has the same data as `orig`
+pub extern "C" fn Bech32Error_clone(orig: &Bech32Error) -> Bech32Error { orig.clone() }
+#[no_mangle]
+/// Releases any memory held by the given `Bech32Error` (which is currently none)
+pub extern "C" fn Bech32Error_free(o: Bech32Error) { }
 
 #[repr(C)]
 #[derive(Clone, Copy, PartialEq)]
@@ -563,7 +578,7 @@ impl Into<Str> for String {
 }
 impl Clone for Str {
 	fn clone(&self) -> Self {
-		self.into_str().clone().into()
+		String::from(self.into_str()).into()
 	}
 }