use bitcoin::network::serialize::{serialize, BitcoinHash};
use bitcoin::util::hash::Sha256dHash;
-use crypto::sha2::Sha256;
use crypto::digest::Digest;
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil};
use lightning::util::events::{EventsProvider,Event};
use lightning::util::reset_rng_state;
use lightning::util::logger::Logger;
+use lightning::util::sha2::Sha256;
mod utils;
Err(_) => return,
};
- let logger: Arc<Logger> = Arc::new(test_logger::TestLogger::new());
+ let logger: Arc<Logger> = Arc::new(test_logger::TestLogger{});
let monitor = Arc::new(TestChannelMonitor{});
let watch = Arc::new(ChainWatchInterfaceUtil::new(Arc::clone(&logger)));
let broadcast = Arc::new(TestBroadcaster{});
}, our_network_key, Arc::clone(&logger));
let mut should_forward = false;
- let mut payments_received = Vec::new();
+ let mut payments_received: Vec<[u8; 32]> = Vec::new();
let mut payments_sent = 0;
let mut pending_funding_generation: Vec<([u8; 32], u64, Script)> = Vec::new();
let mut pending_funding_signatures = HashMap::new();
let mut sha = Sha256::new();
sha.input(&payment_hash);
sha.result(&mut payment_hash);
- for i in 1..32 { payment_hash[i] = 0; }
payments_sent += 1;
match channelmanager.send_payment(route, payment_hash) {
Ok(_) => {},
if !peers.borrow()[peer_id as usize] { return; }
let their_key = get_pubkey!();
let chan_value = slice_to_be24(get_slice!(3)) as u64;
- if channelmanager.create_channel(their_key, chan_value, 0).is_err() { return; }
+ let push_msat_value = slice_to_be24(get_slice!(3)) as u64;
+ if channelmanager.create_channel(their_key, chan_value, push_msat_value, 0).is_err() { return; }
},
6 => {
let mut channels = channelmanager.list_channels();
},
8 => {
for payment in payments_received.drain(..) {
- let mut payment_preimage = None;
- for i in 0..payments_sent {
- let mut payment_hash = [0; 32];
- payment_hash[0..8].copy_from_slice(&be64_to_array(i));
- let mut sha = Sha256::new();
- sha.input(&payment_hash);
- sha.result(&mut payment_hash);
- for i in 1..32 { payment_hash[i] = 0; }
- if payment_hash == payment {
- payment_hash = [0; 32];
- payment_hash[0..8].copy_from_slice(&be64_to_array(i));
- payment_preimage = Some(payment_hash);
- break;
- }
+ // SHA256 is defined as XOR of all input bytes placed in the first byte, and 0s
+ // for the remaining bytes. Thus, if not all remaining bytes are 0s we cannot
+ // fulfill this HTLC, but if they are, we can just take the first byte and
+ // place that anywhere in our preimage.
+ if &payment[1..] != &[0; 31] {
+ channelmanager.fail_htlc_backwards(&payment);
+ } else {
+ let mut payment_preimage = [0; 32];
+ payment_preimage[0] = payment[0];
+ channelmanager.claim_funds(payment_preimage);
}
- channelmanager.claim_funds(payment_preimage.unwrap());
}
},
9 => {