Incorporate upstream changes

* change fn signature of `filter_block`
* Use u32 instead of u64 for fee_est.
* Change fields in `DynamicOutputP2WSH`

Author: joemphilips

bindings/src/adaptors/mod.rs

@@ -84,7 +84,7 @@ impl From<ConfirmationTarget> for FFIConfirmationTarget {
 
 pub mod fee_estimator_fn {
     use super::{FFIConfirmationTarget};
-    pub type GetEstSatPer1000WeightPtr = extern "cdecl" fn (FFIConfirmationTarget) -> u64;
+    pub type GetEstSatPer1000WeightPtr = extern "cdecl" fn (FFIConfirmationTarget) -> u32;
 }
 
 #[repr(C)]
@@ -94,7 +94,7 @@ pub struct FFIFeeEstimator {
 }
 
 impl FeeEstimator for FFIFeeEstimator {
-	fn get_est_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u64 {
+	fn get_est_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
         (self.get_est_sat_per_1000_weight_ptr)(confirmation_target.into())
     }
 }
@@ -197,7 +197,7 @@ pub mod chain_watch_interface_fn {
     pub type InstallWatchOutpointPtr = extern "cdecl" fn(outpoint: *const FFIOutPoint, out_script: *const FFIScript);
     pub type WatchAllTxnPtr = extern "cdecl" fn();
     pub type GetChainUtxoPtr = extern "cdecl" fn(genesis_hash: *const Bytes32, unspent_tx_output_identifier: u64, err: *mut FFIChainError, script_ptr: *mut u8, script_len: *mut usize, amount_satoshis: *mut u64);
-    pub type FilterBlock = extern "cdecl" fn(block_ptr: *const u8, block_len: usize, matched_index_ptr: *mut u8, matched_inedx_len: *mut usize);
+    pub type FilterBlock = extern "cdecl" fn(block_ptr: *const u8, block_len: usize, matched_index_ptr: *mut usize, matched_inedx_len: *mut usize);
     pub type ReEntered = extern "cdecl" fn() -> usize;
 }
 
@@ -268,25 +268,18 @@ impl ChainWatchInterface for FFIChainWatchInterface {
         }
     }
 
-    fn filter_block<'a>(&self, block: &'a Block) -> (Vec<&'a Transaction>, Vec<u32>) {
+    fn filter_block<'a>(&self, block: &'a Block) -> Vec<usize> {
         let block_bytes = bitcoin_serialize(block);
         // the minimum weight for one tx is 440. So the max number of tx in one block is 9090.
-        // so the max size of the buffer we have to prepare is.
-        // `2 + (9090 * 4) = 36362`.
-        let mut matched_tx_index = [0u8; 36864];
-        let mut matched_tx_index_len_ptr: &mut usize = todo!();
+        let mut matched_tx_index = [0; 9091];
+        let mut matched_tx_index_len_ptr: &mut usize = &mut usize::MAX;
         println!("coinbase tx in rl {:?}", block.txdata[0]);
         (self.filter_block_ptr)(block_bytes.as_ptr(), block_bytes.len(), matched_tx_index.as_mut_ptr(), matched_tx_index_len_ptr as *mut _);
         if (matched_tx_index_len_ptr.clone() == usize::MAX) {
             panic!("FFI failure. the caller must set the actual serialized length of the tx-indexes in filter_block");
         }
-        let mut matched_tx_index: &[u8] = unsafe_block!("We know the caller has set the value for serialized tx index" => &matched_tx_index[..(*matched_tx_index_len_ptr)]);
-        let matched_tx_indexes: Vec<u32> = lightning::util::ser::Readable::read(&mut std::io::Cursor::new(matched_tx_index)).unwrap();
-        let mut matched_txs = Vec::with_capacity(matched_tx_indexes.len());
-        for i in matched_tx_indexes.iter() {
-            matched_txs.push(&block.txdata[i.clone() as usize]);
-        }
-        (matched_txs, matched_tx_indexes)
+        let mut matched_tx_indexes: &[usize] = unsafe_block!("We know the caller has set the value for serialized tx index" => &matched_tx_index[..(*matched_tx_index_len_ptr)]);
+        matched_tx_indexes.to_vec()
     }
 
     fn reentered(&self) -> usize {
@@ -410,6 +403,8 @@ impl From<FFILightningError> for LightningError {
     }
 }
 
+// --- routing stuff ---
+/// TODO: enable to pass routing handler from outside.
 pub mod routing_msg_descriptor_fn {
     use super::*;
     use crate::adaptors::primitives::Bytes33;

bindings/src/channelmanager.rs

@@ -273,7 +273,7 @@ ffi! {
         FFIResult::ok()
     }
 
-    fn update_fee(channel_id: Ref<[u8; 32]>, feerate_per_kw: u64, handle: FFIArcChannelManagerHandle) -> FFIResult {
+    fn update_fee(channel_id: Ref<[u8; 32]>, feerate_per_kw: u32, handle: FFIArcChannelManagerHandle) -> FFIResult {
         let chan_man: &FFIArcChannelManager = unsafe_block!("We know handle points to valid channel_manager" => handle.as_ref());
         let channel_id: &[u8;32] = unsafe_block!("" => channel_id.as_ref());
         chan_man.update_fee(channel_id.clone(), feerate_per_kw)?;

bindings/src/ffi_test_utils.rs

@@ -28,7 +28,7 @@ ffi! {
         let mut events =  Vec::with_capacity(5);
 
         let txid = bitcoin::consensus::deserialize(&hex::decode("4141414141414141414141414141414141414141414141414141414141414142").unwrap()).unwrap();
-        let funding_txo= OutPoint::new(txid, 1);
+        let funding_txo = OutPoint{ txid, index: 1};
         let user_channel_id = 1111;
         events.push(Event::FundingBroadcastSafe {funding_txo, user_channel_id} );
 
@@ -54,13 +54,15 @@ ffi! {
         let output = TxOut {value: 255, script_pubkey: bitcoin::blockdata::script::Script::new() };
         let static_output = SpendableOutputDescriptor::StaticOutput {outpoint, output: output.clone()};
 
-        let key = bitcoin::secp256k1::key::SecretKey::from_slice(&hex::decode("0101010101010101010101010101010101010101010101010101010101010101").unwrap()).unwrap();
+        let per_commitment_point = bitcoin::secp256k1::key::PublicKey::from_slice(&hex::decode("02aca35d6de21baefaf65db590611fabd42ed4d52683c36caff58761d309314f65").unwrap()).unwrap();
+        let remote_revocation_pubkey = bitcoin::secp256k1::key::PublicKey::from_slice(&hex::decode("02812cb18bf5c19374b34419095a09aa0b0d5559a24ce0ef558845230b0a096161").unwrap()).unwrap();
         let dynamic_output_p2wsh = SpendableOutputDescriptor::DynamicOutputP2WSH {
             outpoint,
-            key,
-            witness_script: bitcoin::blockdata::script::Script::new(),
+            per_commitment_point,
             to_self_delay: 144,
-            output
+            key_derivation_params: (3, 4),
+            output,
+            remote_revocation_pubkey
         };
         let outputs = vec![static_output, dynamic_output_p2wsh];
         events.push(Event::SpendableOutputs {outputs});

bindings/src/peermanager.rs

@@ -22,7 +22,7 @@ use crate::{
 };
 use crate::channelmanager::FFIArcChannelManagerHandle;
 
-type FFISimpleArcPeerManager = PeerManager<FFISocketDescriptor, Arc<FFIArcChannelManager>, Arc<FFILogger>>;
+type FFISimpleArcPeerManager = PeerManager<FFISocketDescriptor, Arc<FFIArcChannelManager>, Arc<NetGraphMsgHandler<Arc<FFIChainWatchInterface>, Arc<FFILogger>>>, Arc<FFILogger>>;
 type FFIArcPeerManagerHandle<'a> = HandleShared<'a, FFISimpleArcPeerManager>;
 
 lazy_static! {

lightning/src/ln/peer_handler.rs

@@ -196,7 +196,8 @@ pub struct PeerManager<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: De
 		CM::Target: ChannelMessageHandler,
 		RM::Target: RoutingMessageHandler,
 		L::Target: Logger {
-	message_handler: MessageHandler<CM, RM>,
+	/// MessageHandler for this PeerManager
+	pub message_handler: MessageHandler<CM, RM>,
 	peers: Mutex<PeerHolder<Descriptor>>,
 	our_node_secret: SecretKey,
 	ephemeral_key_midstate: Sha256Engine,