Update rust-bitcoin wrappers to latest rust-bitcoin/secp

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index f83c62741074039f8dce268b1df9f9486d0fca5d..0c4c1d88694e3c5637cd60efb108ef9806894b1c 100644 (file)
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -863,6 +863,7 @@ fn initial_clonable_types() -> HashSet<String> {
        res.insert("crate::c_types::Transaction".to_owned());
        res.insert("crate::c_types::Witness".to_owned());
        res.insert("crate::c_types::WitnessVersion".to_owned());
+       res.insert("crate::c_types::WitnessProgram".to_owned());
        res.insert("crate::c_types::TxIn".to_owned());
        res.insert("crate::c_types::TxOut".to_owned());
        res.insert("crate::c_types::ECDSASignature".to_owned());
@@ -1070,19 +1071,20 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::secp256k1::Scalar" if !is_ref => Some("crate::c_types::BigEndianScalar"),
                        "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
 
-                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" if is_ref => Some("crate::c_types::u8slice"),
-                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" if !is_ref => Some("crate::c_types::derived::CVec_u8Z"),
+                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" => Some("crate::c_types::u8slice"),
+                       "bitcoin::blockdata::script::ScriptBuf"|"bitcoin::ScriptBuf" => Some("crate::c_types::derived::CVec_u8Z"),
                        "bitcoin::OutPoint"|"bitcoin::blockdata::transaction::OutPoint" => Some("crate::lightning::chain::transaction::OutPoint"),
                        "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some("crate::c_types::Transaction"),
                        "bitcoin::Witness" => Some("crate::c_types::Witness"),
                        "bitcoin::TxIn"|"bitcoin::blockdata::transaction::TxIn" if !is_ref => Some("crate::c_types::TxIn"),
                        "bitcoin::TxOut"|"bitcoin::blockdata::transaction::TxOut" => Some("crate::c_types::TxOut"),
                        "bitcoin::network::constants::Network" => Some("crate::bitcoin::network::Network"),
-                       "bitcoin::util::address::WitnessVersion" => Some("crate::c_types::WitnessVersion"),
-                       "bitcoin::blockdata::block::BlockHeader" if is_ref  => Some("*const [u8; 80]"),
+                       "bitcoin::address::WitnessVersion" => Some("crate::c_types::WitnessVersion"),
+                       "bitcoin::address::WitnessProgram" => Some("crate::c_types::WitnessProgram"),
+                       "bitcoin::blockdata::block::Header" if is_ref  => Some("*const [u8; 80]"),
                        "bitcoin::blockdata::block::Block" if is_ref  => Some("crate::c_types::u8slice"),
 
-                       "bitcoin::PackedLockTime"|"bitcoin::blockdata::locktime::PackedLockTime" => Some("u32"),
+                       "bitcoin::blockdata::locktime::absolute::LockTime" => Some("u32"),
 
                        "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some("crate::c_types::derived::CVec_u8Z"),
 
@@ -1098,11 +1100,12 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                if is_ref => Some("*const [u8; 32]"),
 
                        // Newtypes that we just expose in their original form.
-                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
+                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
                                if is_ref  => Some("*const [u8; 32]"),
-                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
+                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
                                if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
                        "bitcoin::secp256k1::Message" if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
+                       "bitcoin::secp256k1::Message" if is_ref => Some("*const [u8; 32]"),
                        "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret"
                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"
@@ -1178,8 +1181,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::secp256k1::Scalar" if !is_ref => Some(""),
                        "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some("::bitcoin::secp256k1::ecdh::SharedSecret::from_bytes("),
 
-                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" if is_ref => Some("&::bitcoin::blockdata::script::Script::from(Vec::from("),
-                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" if !is_ref => Some("::bitcoin::blockdata::script::Script::from("),
+                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" => Some("::bitcoin::blockdata::script::Script::from_bytes("),
+                       "bitcoin::blockdata::script::ScriptBuf"|"bitcoin::ScriptBuf" => Some("::bitcoin::blockdata::script::ScriptBuf::from("),
                        "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" if is_ref => Some("&"),
                        "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(""),
                        "bitcoin::Witness" if is_ref => Some("&"),
@@ -1188,26 +1191,28 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::TxIn"|"bitcoin::blockdata::transaction::TxIn" if !is_ref => Some(""),
                        "bitcoin::TxOut"|"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(""),
                        "bitcoin::network::constants::Network" => Some(""),
-                       "bitcoin::util::address::WitnessVersion" => Some(""),
-                       "bitcoin::blockdata::block::BlockHeader" => Some("&::bitcoin::consensus::encode::deserialize(unsafe { &*"),
+                       "bitcoin::address::WitnessVersion" => Some(""),
+                       "bitcoin::address::WitnessProgram" if is_ref => Some("&"),
+                       "bitcoin::address::WitnessProgram" if !is_ref => Some(""),
+                       "bitcoin::blockdata::block::Header" => Some("&::bitcoin::consensus::encode::deserialize(unsafe { &*"),
                        "bitcoin::blockdata::block::Block" if is_ref => Some("&::bitcoin::consensus::encode::deserialize("),
 
-                       "bitcoin::PackedLockTime"|"bitcoin::blockdata::locktime::PackedLockTime" => Some("::bitcoin::PackedLockTime("),
+                       "bitcoin::blockdata::locktime::absolute::LockTime" => Some("::bitcoin::blockdata::locktime::absolute::LockTime::from_consensus("),
 
-                       "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some("::bitcoin::consensus::encode::deserialize("),
+                       "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some("::bitcoin::psbt::PartiallySignedTransaction::deserialize("),
 
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash" if !is_ref =>
-                               Some("bitcoin::hash_types::PubkeyHash::from_hash(bitcoin::hashes::Hash::from_inner("),
+                               Some("bitcoin::hash_types::PubkeyHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array("),
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash" if is_ref =>
-                               Some("&bitcoin::hash_types::PubkeyHash::from_hash(bitcoin::hashes::Hash::from_inner(unsafe { *"),
+                               Some("&bitcoin::hash_types::PubkeyHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array(unsafe { *"),
                        "bitcoin::hash_types::WPubkeyHash" if is_ref =>
-                               Some("&bitcoin::hash_types::WPubkeyHash::from_hash(bitcoin::hashes::Hash::from_inner(unsafe { *"),
+                               Some("&bitcoin::hash_types::WPubkeyHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array(unsafe { *"),
                        "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash" if !is_ref =>
-                               Some("bitcoin::hash_types::ScriptHash::from_hash(bitcoin::hashes::Hash::from_inner("),
+                               Some("bitcoin::hash_types::ScriptHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array("),
                        "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash" if is_ref =>
-                               Some("&bitcoin::hash_types::ScriptHash::from_hash(bitcoin::hashes::Hash::from_inner(unsafe { *"),
+                               Some("&bitcoin::hash_types::ScriptHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array(unsafe { *"),
                        "bitcoin::hash_types::WScriptHash" if is_ref =>
-                               Some("&bitcoin::hash_types::WScriptHash::from_hash(bitcoin::hashes::Hash::from_inner(unsafe { *"),
+                               Some("&bitcoin::hash_types::WScriptHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array(unsafe { *"),
 
                        // Newtypes that we just expose in their original form.
                        "bitcoin::hash_types::Txid" if is_ref => Some("&::bitcoin::hash_types::Txid::from_slice(&unsafe { &*"),
@@ -1287,19 +1292,20 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::secp256k1::Scalar" => Some(".into_rust()"),
                        "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some(".data)"),
 
-                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" if is_ref => Some(".to_slice()))"),
-                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" if !is_ref => Some(".into_rust())"),
+                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" => Some(".to_slice())"),
+                       "bitcoin::blockdata::script::ScriptBuf"|"bitcoin::ScriptBuf" => Some(".into_rust())"),
                        "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(".into_bitcoin()"),
                        "bitcoin::Witness" => Some(".into_bitcoin()"),
                        "bitcoin::OutPoint"|"bitcoin::blockdata::transaction::OutPoint" => Some(")"),
                        "bitcoin::TxIn"|"bitcoin::blockdata::transaction::TxIn" if !is_ref => Some(".into_rust()"),
                        "bitcoin::TxOut"|"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(".into_rust()"),
                        "bitcoin::network::constants::Network" => Some(".into_bitcoin()"),
-                       "bitcoin::util::address::WitnessVersion" => Some(".into()"),
-                       "bitcoin::blockdata::block::BlockHeader" => Some(" }).unwrap()"),
+                       "bitcoin::address::WitnessVersion" => Some(".into()"),
+                       "bitcoin::address::WitnessProgram" => Some(".into_bitcoin()"),
+                       "bitcoin::blockdata::block::Header" => Some(" }).unwrap()"),
                        "bitcoin::blockdata::block::Block" => Some(".to_slice()).unwrap()"),
 
-                       "bitcoin::PackedLockTime"|"bitcoin::blockdata::locktime::PackedLockTime" => Some(")"),
+                       "bitcoin::blockdata::locktime::absolute::LockTime" => Some(")"),
 
                        "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some(".as_slice()).expect(\"Invalid PSBT format\")"),
 
@@ -1316,7 +1322,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::hash_types::Txid" if is_ref => Some(" }[..]).unwrap()"),
                        "bitcoin::hash_types::Txid" => Some(".data[..]).unwrap()"),
                        "bitcoin::hash_types::BlockHash"|"bitcoin::BlockHash" if !is_ref => Some(".data[..]).unwrap()"),
-                       "bitcoin::blockdata::constants::ChainHash" if !is_ref => Some(".data[..])"),
+                       "bitcoin::blockdata::constants::ChainHash" if !is_ref => Some(".data)"),
                        "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret"
                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"
@@ -1343,9 +1349,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "[u8]" if is_ref => Some(("crate::c_types::u8slice::from_slice(", ")")),
                        "[usize]" if is_ref => Some(("crate::c_types::usizeslice::from_slice(", ")")),
 
-                       "bitcoin::blockdata::block::BlockHeader" if is_ref => Some(("{ let mut s = [0u8; 80]; s[..].copy_from_slice(&::bitcoin::consensus::encode::serialize(", ")); s }")),
+                       "bitcoin::blockdata::block::Header" if is_ref => Some(("{ let mut s = [0u8; 80]; s[..].copy_from_slice(&::bitcoin::consensus::encode::serialize(", ")); s }")),
                        "bitcoin::blockdata::block::Block" if is_ref => Some(("::bitcoin::consensus::encode::serialize(", ")")),
-                       "bitcoin::hash_types::Txid" => None,
 
                        _ => None,
                }.map(|s| s.to_owned())
@@ -1405,8 +1410,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::secp256k1::Scalar" if !is_ref => Some("crate::c_types::BigEndianScalar::from_rust(&"),
                        "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
 
-                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" if is_ref => Some("crate::c_types::u8slice::from_slice(&"),
-                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" if !is_ref => Some(""),
+                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" => Some("crate::c_types::u8slice::from_slice("),
+                       "bitcoin::blockdata::script::ScriptBuf"|"bitcoin::ScriptBuf" => Some(""),
                        "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" if is_ref => Some("crate::c_types::Transaction::from_bitcoin("),
                        "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some("crate::c_types::Transaction::from_bitcoin(&"),
                        "bitcoin::Witness" if is_ref => Some("crate::c_types::Witness::from_bitcoin("),
@@ -1417,27 +1422,27 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::TxOut"|"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some("crate::c_types::TxOut::from_rust(&"),
                        "bitcoin::TxOut"|"bitcoin::blockdata::transaction::TxOut" if is_ref => Some("crate::c_types::TxOut::from_rust("),
                        "bitcoin::network::constants::Network" => Some("crate::bitcoin::network::Network::from_bitcoin("),
-                       "bitcoin::util::address::WitnessVersion" => Some(""),
-                       "bitcoin::blockdata::block::BlockHeader" if is_ref => Some("&local_"),
+                       "bitcoin::address::WitnessVersion" => Some(""),
+                       "bitcoin::address::WitnessProgram" => Some("crate::c_types::WitnessProgram::from_bitcoin("),
+                       "bitcoin::blockdata::block::Header" if is_ref => Some("&local_"),
                        "bitcoin::blockdata::block::Block" if is_ref => Some("crate::c_types::u8slice::from_slice(&local_"),
 
-                       "bitcoin::PackedLockTime"|"bitcoin::blockdata::locktime::PackedLockTime" => Some(""),
+                       "bitcoin::blockdata::locktime::absolute::LockTime" => Some(""),
 
-                       "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some("::bitcoin::consensus::encode::serialize(&"),
-
-                       "bitcoin::hash_types::Txid" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
+                       "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some(""),
 
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|
                        "bitcoin::hash_types::WPubkeyHash"|"bitcoin::hash_types::WScriptHash"|
                        "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
-                               if !is_ref => Some("crate::c_types::TwentyBytes { data: "),
+                               if !is_ref => Some("crate::c_types::TwentyBytes { data: *"),
 
                        // Newtypes that we just expose in their original form.
-                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
+                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
                                if is_ref => Some(""),
-                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
-                               if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
+                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
+                               if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: *"),
                        "bitcoin::secp256k1::Message" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
+                       "bitcoin::secp256k1::Message" if is_ref => Some(""),
                        "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret"
                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"
@@ -1508,37 +1513,36 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::secp256k1::Scalar" if !is_ref => Some(")"),
                        "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some(".secret_bytes() }"),
 
-                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" if is_ref => Some("[..])"),
-                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" if !is_ref => Some(".into_bytes().into()"),
+                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" => Some(".as_ref())"),
+                       "bitcoin::blockdata::script::ScriptBuf"|"bitcoin::ScriptBuf" if is_ref => Some(".as_bytes().to_vec().into()"),
+                       "bitcoin::blockdata::script::ScriptBuf"|"bitcoin::ScriptBuf" if !is_ref => Some(".to_bytes().into()"),
                        "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(")"),
                        "bitcoin::Witness" => Some(")"),
                        "bitcoin::OutPoint"|"bitcoin::blockdata::transaction::OutPoint" => Some(")"),
                        "bitcoin::TxIn"|"bitcoin::blockdata::transaction::TxIn" if !is_ref => Some(")"),
                        "bitcoin::TxOut"|"bitcoin::blockdata::transaction::TxOut" => Some(")"),
                        "bitcoin::network::constants::Network" => Some(")"),
-                       "bitcoin::util::address::WitnessVersion" => Some(".into()"),
-                       "bitcoin::blockdata::block::BlockHeader" if is_ref => Some(""),
+                       "bitcoin::address::WitnessVersion" => Some(".into()"),
+                       "bitcoin::address::WitnessProgram" => Some(")"),
+                       "bitcoin::blockdata::block::Header" if is_ref => Some(""),
                        "bitcoin::blockdata::block::Block" if is_ref => Some(")"),
 
-                       "bitcoin::PackedLockTime"|"bitcoin::blockdata::locktime::PackedLockTime" => Some(".0"),
-
-                       "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some(").into()"),
+                       "bitcoin::blockdata::locktime::absolute::LockTime" => Some(".to_consensus_u32()"),
 
-                       "bitcoin::hash_types::Txid" if !is_ref => Some(".into_inner() }"),
+                       "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some(".serialize().into()"),
 
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|
                        "bitcoin::hash_types::WPubkeyHash"|"bitcoin::hash_types::WScriptHash"|
                        "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
-                               if !is_ref => Some(".as_hash().into_inner() }"),
+                               if !is_ref => Some(".as_ref() }"),
 
                        // Newtypes that we just expose in their original form.
-                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"
-                               if is_ref => Some(".as_inner()"),
-                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"
-                               if !is_ref => Some(".into_inner() }"),
-                       "bitcoin::blockdata::constants::ChainHash" if is_ref => Some(".as_bytes()"),
-                       "bitcoin::blockdata::constants::ChainHash" if !is_ref => Some(".to_bytes() }"),
+                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
+                               if is_ref => Some(".as_ref()"),
+                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
+                               if !is_ref => Some(".as_ref() }"),
                        "bitcoin::secp256k1::Message" if !is_ref => Some(".as_ref().clone() }"),
+                       "bitcoin::secp256k1::Message" if is_ref => Some(".as_ref()"),
                        "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret"
                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"

diff --git a/lightning-c-bindings/Cargo.toml b/lightning-c-bindings/Cargo.toml
index e9039a78c8b25d0ee4f8c5cd1dbdae2e41b470af..aa31bb5e6839acf7c5a43b35631a85f916752457 100644 (file)
--- a/lightning-c-bindings/Cargo.toml
+++ b/lightning-c-bindings/Cargo.toml
@@ -19,8 +19,8 @@ no-std = ["bitcoin/no-std", "lightning/no-std", "lightning-invoice/no-std", "lig
 std = ["bitcoin/std", "lightning/std", "lightning-invoice/std", "lightning-background-processor/std"]
 
 [dependencies]
-bitcoin = { version = "0.29", default-features = false }
-secp256k1 = { version = "0.24", features = ["global-context", "recovery"] }
+bitcoin = { version = "0.30", default-features = false }
+secp256k1 = { version = "0.27", features = ["global-context", "recovery"] }
 # Note that the following line is matched by genbindings to update the path
 lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.118-bindings", default-features = false }
 lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.118-bindings", default-features = false }

diff --git a/lightning-c-bindings/src/bitcoin/network.rs b/lightning-c-bindings/src/bitcoin/network.rs
index 0603404d51bb2594f98bc6ca40085ce9a2ac08cf..78565a1c19f30e25d7af30a2dd63d139b22629e0 100644 (file)
--- a/lightning-c-bindings/src/bitcoin/network.rs
+++ b/lightning-c-bindings/src/bitcoin/network.rs
@@ -30,6 +30,7 @@ impl Network {
                        BitcoinNetwork::Testnet => Network::Testnet,
                        BitcoinNetwork::Regtest => Network::Regtest,
                        BitcoinNetwork::Signet => Network::Signet,
+                       _ => unreachable!(),
                }
        }
 }

diff --git a/lightning-c-bindings/src/c_types/mod.rs b/lightning-c-bindings/src/c_types/mod.rs
index eb9be439a1acf06b9a7ab8fe6b0676b37ccc195d..19e567268ea1fdf4250017942ef61c93df7024ce 100644 (file)
--- a/lightning-c-bindings/src/c_types/mod.rs
+++ b/lightning-c-bindings/src/c_types/mod.rs
@@ -5,6 +5,8 @@ pub mod derived;
 
 use bitcoin::Transaction as BitcoinTransaction;
 use bitcoin::Witness as BitcoinWitness;
+use bitcoin::address;
+use bitcoin::address::WitnessProgram as BitcoinWitnessProgram;
 use bitcoin::hashes::Hash;
 use bitcoin::secp256k1::PublicKey as SecpPublicKey;
 use bitcoin::secp256k1::SecretKey as SecpSecretKey;
@@ -15,7 +17,6 @@ use bitcoin::secp256k1::ecdsa::RecoveryId;
 use bitcoin::secp256k1::ecdsa::RecoverableSignature as SecpRecoverableSignature;
 use bitcoin::secp256k1::Scalar as SecpScalar;
 use bitcoin::bech32;
-use bitcoin::util::address;
 
 use core::convert::TryInto; // Bindings need at least rustc 1.34
 use alloc::borrow::ToOwned;
@@ -96,6 +97,58 @@ impl Into<address::WitnessVersion> for WitnessVersion {
        }
 }
 
+/// A segregated witness version byte and script bytes
+#[repr(C)]
+#[derive(Clone)]
+pub struct WitnessProgram {
+       version: WitnessVersion,
+       program: derived::CVec_u8Z,
+}
+impl WitnessProgram {
+       pub(crate) fn from_bitcoin(o: BitcoinWitnessProgram) -> Self {
+               Self {
+                       version: o.version().into(),
+                       program: o.program().as_bytes().to_vec().into(),
+               }
+       }
+       pub(crate) fn into_bitcoin(mut self) -> BitcoinWitnessProgram {
+               BitcoinWitnessProgram::new(
+                       self.version.into(),
+                       self.program.into_rust(),
+               ).expect("Program length was previously checked")
+       }
+}
+
+#[no_mangle]
+/// Constructs a new WitnessProgram given a version and program bytes.
+///
+/// The program MUST be at least 2 bytes and no longer than 40 bytes long.
+/// Further, if the version is 0, the program MUST be either exactly 20 or exactly 32 bytes long.
+pub extern "C" fn WitnessProgram_new(version: WitnessVersion, program: derived::CVec_u8Z) -> WitnessProgram {
+       assert!(program.datalen >= 2, "WitnessProgram program lengths must be at least 2 bytes long");
+       assert!(program.datalen <= 40, "WitnessProgram program lengths must be no longer than 40 bytes");
+       if version.0 == 0 {
+               assert!(program.datalen == 20 || program.datalen == 32, "WitnessProgram program length must be 20 or 32 for version-0 programs");
+       }
+       WitnessProgram { version, program }
+}
+#[no_mangle]
+/// Gets the `WitnessVersion` of the given `WitnessProgram`
+pub extern "C" fn WitnessProgram_get_version(prog: &WitnessProgram) -> WitnessVersion {
+       prog.version
+}
+#[no_mangle]
+/// Gets the witness program bytes of the given `WitnessProgram`
+pub extern "C" fn WitnessProgram_get_program(prog: &WitnessProgram) -> u8slice {
+       u8slice::from_vec(&prog.program)
+}
+#[no_mangle]
+/// Creates a new WitnessProgram which has the same data as `orig`
+pub extern "C" fn WitnessProgram_clone(orig: &WitnessProgram) -> WitnessProgram { orig.clone() }
+#[no_mangle]
+/// Releases any memory held by the given `WitnessProgram` (which is currently none)
+pub extern "C" fn WitnessProgram_free(o: WitnessProgram) { }
+
 #[derive(Clone)]
 #[repr(C)]
 /// Represents a valid secp256k1 public key serialized in "compressed form" as a 33 byte array.
@@ -534,7 +587,7 @@ pub extern "C" fn Witness_clone(orig: &Witness) -> Witness { orig.clone() }
 pub extern "C" fn Witness_free(_res: Witness) { }
 
 pub(crate) fn bitcoin_to_C_outpoint(outpoint: &::bitcoin::blockdata::transaction::OutPoint) -> crate::lightning::chain::transaction::OutPoint {
-       crate::lightning::chain::transaction::OutPoint_new(ThirtyTwoBytes { data: outpoint.txid.into_inner() }, outpoint.vout.try_into().unwrap())
+       crate::lightning::chain::transaction::OutPoint_new(ThirtyTwoBytes { data: *outpoint.txid.as_ref() }, outpoint.vout.try_into().unwrap())
 }
 pub(crate) fn C_to_bitcoin_outpoint(outpoint: crate::lightning::chain::transaction::OutPoint) -> ::bitcoin::blockdata::transaction::OutPoint {
        unsafe {
@@ -570,7 +623,7 @@ impl TxIn {
                        witness: Witness::from_bitcoin(&txin.witness),
                        script_sig: derived::CVec_u8Z::from(txin.script_sig.clone().into_bytes()),
                        sequence: txin.sequence.0,
-                       previous_txid: ThirtyTwoBytes { data: txin.previous_output.txid.into_inner() },
+                       previous_txid: ThirtyTwoBytes { data: *txin.previous_output.txid.as_ref() },
                        previous_vout: txin.previous_output.vout,
                }
        }