Completely rewrite channel HTLC tracking and processing

[rust-lightning] / fuzz / fuzz_targets / channel_target.rs

diff --git a/fuzz/fuzz_targets/channel_target.rs b/fuzz/fuzz_targets/channel_target.rs
index ec82fbd65abb3261166fef44a79b669cc824c90b..20fd4b4352d176df8c8f1749298ce3948354d1a5 100644 (file)
--- a/fuzz/fuzz_targets/channel_target.rs
+++ b/fuzz/fuzz_targets/channel_target.rs
@@ -3,15 +3,16 @@ extern crate lightning;
 extern crate secp256k1;
 
 use bitcoin::blockdata::block::BlockHeader;
-use bitcoin::blockdata::transaction::Transaction;
+use bitcoin::blockdata::transaction::{Transaction, TxOut};
 use bitcoin::util::hash::Sha256dHash;
 use bitcoin::network::serialize::{serialize, BitcoinHash};
 
 use lightning::ln::channel::Channel;
-use lightning::ln::channelmanager::PendingForwardHTLCInfo;
+use lightning::ln::channelmanager::{HTLCFailReason, PendingForwardHTLCInfo};
 use lightning::ln::msgs;
 use lightning::ln::msgs::MsgDecodable;
 use lightning::chain::chaininterface::{FeeEstimator, ConfirmationTarget};
+use lightning::util::reset_rng_state;
 
 use secp256k1::key::PublicKey;
 use secp256k1::Secp256k1;
@@ -89,6 +90,8 @@ impl<'a> FeeEstimator for FuzzEstimator<'a> {
 
 #[inline]
 pub fn do_test(data: &[u8]) {
+       reset_rng_state();
+
        let input = InputData {
                data,
                read_pos: AtomicUsize::new(0),
@@ -163,11 +166,11 @@ pub fn do_test(data: &[u8]) {
 
        let their_pubkey = get_pubkey!();
 
-       let tx = Transaction { version: 0, lock_time: 0, input: Vec::new(), output: Vec::new(), witness: Vec::new() };
-       let funding_output = (Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
+       let mut tx = Transaction { version: 0, lock_time: 0, input: Vec::new(), output: Vec::new() };
 
        let mut channel = if get_slice!(1)[0] != 0 {
-               let mut chan = Channel::new_outbound(&fee_est, their_pubkey, slice_to_be24(get_slice!(3)), get_slice!(1)[0] == 0, slice_to_be64(get_slice!(8)));
+               let chan_value = slice_to_be24(get_slice!(3));
+               let mut chan = Channel::new_outbound(&fee_est, their_pubkey, chan_value, get_slice!(1)[0] == 0, slice_to_be64(get_slice!(8)));
                chan.get_open_channel(Sha256dHash::from(get_slice!(32)), &fee_est).unwrap();
                let accept_chan = if get_slice!(1)[0] == 0 {
                        decode_msg_with_len16!(msgs::AcceptChannel, 270, 1)
@@ -175,6 +178,10 @@ pub fn do_test(data: &[u8]) {
                        decode_msg!(msgs::AcceptChannel, 270)
                };
                return_err!(chan.accept_channel(&accept_chan));
+
+               tx.output.push(TxOut{ value: chan_value, script_pubkey: chan.get_funding_redeemscript().to_v0_p2wsh() });
+               let funding_output = (Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
+
                chan.get_outbound_funding_created(funding_output.0.clone(), funding_output.1).unwrap();
                let funding_signed = decode_msg!(msgs::FundingSigned, 32+64);
                return_err!(chan.funding_signed(&funding_signed));
@@ -190,6 +197,10 @@ pub fn do_test(data: &[u8]) {
                        Err(_) => return,
                };
                chan.get_accept_channel().unwrap();
+
+               tx.output.push(TxOut{ value: open_chan.funding_satoshis, script_pubkey: chan.get_funding_redeemscript().to_v0_p2wsh() });
+               let funding_output = (Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
+
                let mut funding_created = decode_msg!(msgs::FundingCreated, 32+32+2+64);
                funding_created.funding_txid = funding_output.0.clone();
                funding_created.funding_output_index = funding_output.1;
@@ -230,11 +241,11 @@ pub fn do_test(data: &[u8]) {
                        },
                        4 => {
                                let update_fail_htlc = decode_msg_with_len16!(msgs::UpdateFailHTLC, 32 + 8, 1);
-                               return_err!(channel.update_fail_htlc(&update_fail_htlc));
+                               return_err!(channel.update_fail_htlc(&update_fail_htlc, HTLCFailReason::dummy()));
                        },
                        5 => {
                                let update_fail_malformed_htlc = decode_msg!(msgs::UpdateFailMalformedHTLC, 32+8+32+2);
-                               return_err!(channel.update_fail_malformed_htlc(&update_fail_malformed_htlc));
+                               return_err!(channel.update_fail_malformed_htlc(&update_fail_malformed_htlc, HTLCFailReason::dummy()));
                        },
                        6 => {
                                let commitment_signed = decode_msg_with_len16!(msgs::CommitmentSigned, 32+64, 64);
@@ -248,6 +259,14 @@ pub fn do_test(data: &[u8]) {
                                let update_fee = decode_msg!(msgs::UpdateFee, 32+4);
                                return_err!(channel.update_fee(&fee_est, &update_fee));
                        },
+                       9 => {
+                               let shutdown = decode_msg_with_len16!(msgs::Shutdown, 32, 1);
+                               return_err!(channel.shutdown(&fee_est, &shutdown));
+                       },
+                       10 => {
+                               let closing_signed = decode_msg!(msgs::ClosingSigned, 32+8+64);
+                               return_err!(channel.closing_signed(&fee_est, &closing_signed));
+                       },
                        _ => return,
                }
        }