X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fonion_route_tests.rs;h=cfdba07a2f2839af321bddfc1e9f0c5ec26abc63;hb=f70c113fd813cff4d31481a9200e5f7121224a81;hp=d326c1aab74441f1203f532ea48a333b85f8c375;hpb=0c250468d632ed6df93d8a9d34389a2cb61eac40;p=rust-lightning diff --git a/lightning/src/ln/onion_route_tests.rs b/lightning/src/ln/onion_route_tests.rs index d326c1aa..cfdba07a 100644 --- a/lightning/src/ln/onion_route_tests.rs +++ b/lightning/src/ln/onion_route_tests.rs @@ -19,7 +19,7 @@ use crate::ln::channel::EXPIRE_PREV_CONFIG_TICKS; use crate::ln::channelmanager::{HTLCForwardInfo, FailureCode, CLTV_FAR_FAR_AWAY, DISABLE_GOSSIP_TICKS, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId, RecipientOnionFields}; use crate::ln::onion_utils; use crate::routing::gossip::{NetworkUpdate, RoutingFees}; -use crate::routing::router::{get_route, PaymentParameters, Route, RouteHint, RouteHintHop}; +use crate::routing::router::{get_route, PaymentParameters, Route, RouteParameters, RouteHint, RouteHintHop}; use crate::ln::features::{InitFeatures, Bolt11InvoiceFeatures}; use crate::ln::msgs; use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate}; @@ -29,8 +29,7 @@ use crate::util::test_utils; use crate::util::config::{UserConfig, ChannelConfig, MaxDustHTLCExposure}; use crate::util::errors::APIError; -use bitcoin::hash_types::BlockHash; - +use bitcoin::blockdata::constants::ChainHash; use bitcoin::hashes::{Hash, HashEngine}; use bitcoin::hashes::hmac::{Hmac, HmacEngine}; use bitcoin::hashes::sha256::Hash as Sha256; @@ -234,12 +233,13 @@ fn run_onion_failure_test_with_fail_intercept( impl msgs::ChannelUpdate { fn dummy(short_channel_id: u64) -> msgs::ChannelUpdate { + use bitcoin::hash_types::BlockHash; use bitcoin::secp256k1::ffi::Signature as FFISignature; use bitcoin::secp256k1::ecdsa::Signature; msgs::ChannelUpdate { signature: Signature::from(unsafe { FFISignature::new() }), contents: msgs::UnsignedChannelUpdate { - chain_hash: BlockHash::hash(&vec![0u8][..]), + chain_hash: ChainHash::from(BlockHash::hash(&vec![0u8][..]).as_ref()), short_channel_id, timestamp: 0, flags: 0, @@ -516,7 +516,7 @@ fn test_onion_failure() { let short_channel_id = channels[1].0.contents.short_channel_id; let amt_to_forward = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id()) .unwrap().lock().unwrap().channel_by_id.get(&channels[1].2).unwrap() - .context.get_counterparty_htlc_minimum_msat() - 1; + .context().get_counterparty_htlc_minimum_msat() - 1; let mut bogus_route = route.clone(); let route_len = bogus_route.paths[0].hops.len(); bogus_route.paths[0].hops[route_len-1].fee_msat = amt_to_forward; @@ -639,14 +639,40 @@ fn test_onion_failure() { let um = onion_utils::gen_um_from_shared_secret(&onion_keys[1].shared_secret.as_ref()); let mut hmac = HmacEngine::::new(&um); hmac.input(&decoded_err_packet.encode()[32..]); - decoded_err_packet.hmac = Hmac::from_engine(hmac).into_inner(); + decoded_err_packet.hmac = Hmac::from_engine(hmac).to_byte_array(); msg.reason = onion_utils::encrypt_failure_packet( &onion_keys[1].shared_secret.as_ref(), &decoded_err_packet.encode()[..]) }, || nodes[2].node.fail_htlc_backwards(&payment_hash), false, None, Some(NetworkUpdate::NodeFailure { node_id: route.paths[0].hops[1].pubkey, is_permanent: true }), Some(channels[1].0.contents.short_channel_id)); - run_onion_failure_test_with_fail_intercept("0-length channel update in UPDATE onion failure", 200, &nodes, - &route, &payment_hash, &payment_secret, |_msg| {}, |msg| { + run_onion_failure_test_with_fail_intercept("0-length channel update in intermediate node UPDATE onion failure", + 100, &nodes, &route, &payment_hash, &payment_secret, |msg| { + msg.amount_msat -= 1; + }, |msg| { + let session_priv = SecretKey::from_slice(&[3; 32]).unwrap(); + let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap(); + let mut decoded_err_packet = msgs::DecodedOnionErrorPacket { + failuremsg: vec![ + 0x10, 0x7, // UPDATE|7 + 0x0, 0x0 // 0-len channel update + ], + pad: vec![0; 255 - 4 /* 4-byte error message */], + hmac: [0; 32], + }; + let um = onion_utils::gen_um_from_shared_secret(&onion_keys[0].shared_secret.as_ref()); + let mut hmac = HmacEngine::::new(&um); + hmac.input(&decoded_err_packet.encode()[32..]); + decoded_err_packet.hmac = Hmac::from_engine(hmac).to_byte_array(); + msg.reason = onion_utils::encrypt_failure_packet( + &onion_keys[0].shared_secret.as_ref(), &decoded_err_packet.encode()[..]) + }, || {}, true, Some(0x1000|7), + Some(NetworkUpdate::ChannelFailure { + short_channel_id: channels[1].0.contents.short_channel_id, + is_permanent: false, + }), + Some(channels[1].0.contents.short_channel_id)); + run_onion_failure_test_with_fail_intercept("0-length channel update in final node UPDATE onion failure", + 200, &nodes, &route, &payment_hash, &payment_secret, |_msg| {}, |msg| { let session_priv = SecretKey::from_slice(&[3; 32]).unwrap(); let onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap(); let mut decoded_err_packet = msgs::DecodedOnionErrorPacket { @@ -660,7 +686,7 @@ fn test_onion_failure() { let um = onion_utils::gen_um_from_shared_secret(&onion_keys[1].shared_secret.as_ref()); let mut hmac = HmacEngine::::new(&um); hmac.input(&decoded_err_packet.encode()[32..]); - decoded_err_packet.hmac = Hmac::from_engine(hmac).into_inner(); + decoded_err_packet.hmac = Hmac::from_engine(hmac).to_byte_array(); msg.reason = onion_utils::encrypt_failure_packet( &onion_keys[1].shared_secret.as_ref(), &decoded_err_packet.encode()[..]) }, || nodes[2].node.fail_htlc_backwards(&payment_hash), true, Some(0x1000|7), @@ -764,7 +790,7 @@ fn do_test_onion_failure_stale_channel_update(announced_channel: bool) { htlc_minimum_msat: None, }])]; let payment_params = PaymentParameters::from_node_id(*channel_to_update_counterparty, TEST_FINAL_CLTV) - .with_bolt11_features(nodes[2].node.invoice_features()).unwrap() + .with_bolt11_features(nodes[2].node.bolt11_invoice_features()).unwrap() .with_route_hints(hop_hints).unwrap(); get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, PAYMENT_AMT) }; @@ -1021,7 +1047,7 @@ macro_rules! get_phantom_route { let phantom_pubkey = $nodes[1].keys_manager.get_node_id(Recipient::PhantomNode).unwrap(); let phantom_route_hint = $nodes[1].node.get_phantom_route_hints(); let payment_params = PaymentParameters::from_node_id(phantom_pubkey, TEST_FINAL_CLTV) - .with_bolt11_features($nodes[1].node.invoice_features()).unwrap() + .with_bolt11_features($nodes[1].node.bolt11_invoice_features()).unwrap() .with_route_hints(vec![RouteHint(vec![ RouteHintHop { src_node_id: $nodes[0].node.get_our_node_id(), @@ -1048,10 +1074,11 @@ macro_rules! get_phantom_route { ])]).unwrap(); let scorer = test_utils::TestScorer::new(); let network_graph = $nodes[0].network_graph.read_only(); + let route_params = RouteParameters::from_payment_params_and_value(payment_params, $amt); (get_route( - &$nodes[0].node.get_our_node_id(), &payment_params, &network_graph, + &$nodes[0].node.get_our_node_id(), &route_params, &network_graph, Some(&$nodes[0].node.list_usable_channels().iter().collect::>()), - $amt, $nodes[0].logger, &scorer, &(), &[0u8; 32] + $nodes[0].logger, &scorer, &Default::default(), &[0u8; 32] ).unwrap(), phantom_route_hint.phantom_scid) } }} @@ -1092,7 +1119,7 @@ fn test_phantom_onion_hmac_failure() { }, .. }) => { onion_packet.hmac[onion_packet.hmac.len() - 1] ^= 1; - Sha256::hash(&onion_packet.hop_data).into_inner().to_vec() + Sha256::hash(&onion_packet.hop_data).to_byte_array().to_vec() }, _ => panic!("Unexpected forward"), }