X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fscid_utils.rs;h=c9485b60b70be78fd88b52eb45703c74f4da5af1;hb=1d9e541c5766eb03dfaee7844b27b3bc1d60a05e;hp=651b36ef32c3ce5a7d4382be73562733a5fb8a4b;hpb=2f0ddf0763767fbdd22dafbe4574228c6be88b1e;p=rust-lightning diff --git a/lightning/src/util/scid_utils.rs b/lightning/src/util/scid_utils.rs index 651b36ef..c9485b60 100644 --- a/lightning/src/util/scid_utils.rs +++ b/lightning/src/util/scid_utils.rs @@ -7,6 +7,8 @@ // You may not use this file except in accordance with one or both of these // licenses. +//! Utilities for creating and parsing short channel ids. + /// Maximum block height that can be used in a `short_channel_id`. This /// value is based on the 3-bytes available for block height. pub const MAX_SCID_BLOCK: u64 = 0x00ffffff; @@ -22,23 +24,26 @@ pub const MAX_SCID_VOUT_INDEX: u64 = 0xffff; /// A `short_channel_id` construction error #[derive(Debug, PartialEq, Eq)] pub enum ShortChannelIdError { + /// Block height too high BlockOverflow, + /// Tx index too high TxIndexOverflow, + /// Vout index too high VoutIndexOverflow, } /// Extracts the block height (most significant 3-bytes) from the `short_channel_id` -pub fn block_from_scid(short_channel_id: &u64) -> u32 { +pub fn block_from_scid(short_channel_id: u64) -> u32 { return (short_channel_id >> 40) as u32; } /// Extracts the tx index (bytes [2..4]) from the `short_channel_id` -pub fn tx_index_from_scid(short_channel_id: &u64) -> u32 { +pub fn tx_index_from_scid(short_channel_id: u64) -> u32 { return ((short_channel_id >> 16) & MAX_SCID_TX_INDEX) as u32; } /// Extracts the vout (bytes [0..2]) from the `short_channel_id` -pub fn vout_from_scid(short_channel_id: &u64) -> u16 { +pub fn vout_from_scid(short_channel_id: u64) -> u16 { return ((short_channel_id) & MAX_SCID_VOUT_INDEX) as u16; } @@ -63,14 +68,16 @@ pub fn scid_from_parts(block: u64, tx_index: u64, vout_index: u64) -> Result(&self, highest_seen_blockheight: u32, genesis_hash: &BlockHash, fake_scid_rand_bytes: &[u8; 32], keys_manager: &K) -> u64 - where K::Target: KeysInterface, + pub(crate) fn get_fake_scid(&self, highest_seen_blockheight: u32, chain_hash: &ChainHash, fake_scid_rand_bytes: &[u8; 32], entropy_source: &ES) -> u64 + where ES::Target: EntropySource, { // Ensure we haven't created a namespace that doesn't fit into the 3 bits we've allocated for // namespaces. assert!((*self as u8) < MAX_NAMESPACES); - let rand_bytes = keys_manager.get_secure_random_bytes(); + let rand_bytes = entropy_source.get_secure_random_bytes(); - let segwit_activation_height = segwit_activation_height(genesis_hash); + let segwit_activation_height = segwit_activation_height(chain_hash); let mut blocks_since_segwit_activation = highest_seen_blockheight.saturating_sub(segwit_activation_height); // We want to ensure that this fake channel won't conflict with any transactions we haven't @@ -141,30 +152,39 @@ pub(crate) mod fake_scid { } } - fn segwit_activation_height(genesis: &BlockHash) -> u32 { - const MAINNET_GENESIS_STR: &'static str = "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"; - if BlockHash::from_hex(MAINNET_GENESIS_STR).unwrap() == *genesis { + fn segwit_activation_height(chain_hash: &ChainHash) -> u32 { + if *chain_hash == ChainHash::using_genesis_block(Network::Bitcoin) { MAINNET_SEGWIT_ACTIVATION_HEIGHT } else { TEST_SEGWIT_ACTIVATION_HEIGHT } } - /// Returns whether the given fake scid falls into the given namespace. - pub fn is_valid_phantom(fake_scid_rand_bytes: &[u8; 32], scid: u64, genesis_hash: &BlockHash) -> bool { - let block_height = scid_utils::block_from_scid(&scid); - let tx_index = scid_utils::tx_index_from_scid(&scid); + /// Returns whether the given fake scid falls into the phantom namespace. + pub fn is_valid_phantom(fake_scid_rand_bytes: &[u8; 32], scid: u64, chain_hash: &ChainHash) -> bool { + let block_height = scid_utils::block_from_scid(scid); + let tx_index = scid_utils::tx_index_from_scid(scid); let namespace = Namespace::Phantom; let valid_vout = namespace.get_encrypted_vout(block_height, tx_index, fake_scid_rand_bytes); - block_height >= segwit_activation_height(genesis_hash) - && valid_vout == scid_utils::vout_from_scid(&scid) as u8 + block_height >= segwit_activation_height(chain_hash) + && valid_vout == scid_utils::vout_from_scid(scid) as u8 + } + + /// Returns whether the given fake scid falls into the intercept namespace. + pub fn is_valid_intercept(fake_scid_rand_bytes: &[u8; 32], scid: u64, chain_hash: &ChainHash) -> bool { + let block_height = scid_utils::block_from_scid(scid); + let tx_index = scid_utils::tx_index_from_scid(scid); + let namespace = Namespace::Intercept; + let valid_vout = namespace.get_encrypted_vout(block_height, tx_index, fake_scid_rand_bytes); + block_height >= segwit_activation_height(chain_hash) + && valid_vout == scid_utils::vout_from_scid(scid) as u8 } #[cfg(test)] mod tests { - use bitcoin::blockdata::constants::genesis_block; + use bitcoin::blockdata::constants::ChainHash; use bitcoin::network::constants::Network; - use crate::util::scid_utils::fake_scid::{is_valid_phantom, MAINNET_SEGWIT_ACTIVATION_HEIGHT, MAX_TX_INDEX, MAX_NAMESPACES, Namespace, NAMESPACE_ID_BITMASK, segwit_activation_height, TEST_SEGWIT_ACTIVATION_HEIGHT}; + use crate::util::scid_utils::fake_scid::{is_valid_intercept, is_valid_phantom, MAINNET_SEGWIT_ACTIVATION_HEIGHT, MAX_TX_INDEX, MAX_NAMESPACES, Namespace, NAMESPACE_ID_BITMASK, segwit_activation_height, TEST_SEGWIT_ACTIVATION_HEIGHT}; use crate::util::scid_utils; use crate::util::test_utils; use crate::sync::Arc; @@ -174,20 +194,24 @@ pub(crate) mod fake_scid { let phantom_namespace = Namespace::Phantom; assert!((phantom_namespace as u8) < MAX_NAMESPACES); assert!((phantom_namespace as u8) <= NAMESPACE_ID_BITMASK); + + let intercept_namespace = Namespace::Intercept; + assert!((intercept_namespace as u8) < MAX_NAMESPACES); + assert!((intercept_namespace as u8) <= NAMESPACE_ID_BITMASK); } #[test] fn test_segwit_activation_height() { - let mainnet_genesis = genesis_block(Network::Bitcoin).header.block_hash(); + let mainnet_genesis = ChainHash::using_genesis_block(Network::Bitcoin); assert_eq!(segwit_activation_height(&mainnet_genesis), MAINNET_SEGWIT_ACTIVATION_HEIGHT); - let testnet_genesis = genesis_block(Network::Testnet).header.block_hash(); + let testnet_genesis = ChainHash::using_genesis_block(Network::Testnet); assert_eq!(segwit_activation_height(&testnet_genesis), TEST_SEGWIT_ACTIVATION_HEIGHT); - let signet_genesis = genesis_block(Network::Signet).header.block_hash(); + let signet_genesis = ChainHash::using_genesis_block(Network::Signet); assert_eq!(segwit_activation_height(&signet_genesis), TEST_SEGWIT_ACTIVATION_HEIGHT); - let regtest_genesis = genesis_block(Network::Regtest).header.block_hash(); + let regtest_genesis = ChainHash::using_genesis_block(Network::Regtest); assert_eq!(segwit_activation_height(®test_genesis), TEST_SEGWIT_ACTIVATION_HEIGHT); } @@ -195,7 +219,7 @@ pub(crate) mod fake_scid { fn test_is_valid_phantom() { let namespace = Namespace::Phantom; let fake_scid_rand_bytes = [0; 32]; - let testnet_genesis = genesis_block(Network::Testnet).header.block_hash(); + let testnet_genesis = ChainHash::using_genesis_block(Network::Testnet); let valid_encrypted_vout = namespace.get_encrypted_vout(0, 0, &fake_scid_rand_bytes); let valid_fake_scid = scid_utils::scid_from_parts(1, 0, valid_encrypted_vout as u64).unwrap(); assert!(is_valid_phantom(&fake_scid_rand_bytes, valid_fake_scid, &testnet_genesis)); @@ -203,23 +227,35 @@ pub(crate) mod fake_scid { assert!(!is_valid_phantom(&fake_scid_rand_bytes, invalid_fake_scid, &testnet_genesis)); } + #[test] + fn test_is_valid_intercept() { + let namespace = Namespace::Intercept; + let fake_scid_rand_bytes = [0; 32]; + let testnet_genesis = ChainHash::using_genesis_block(Network::Testnet); + let valid_encrypted_vout = namespace.get_encrypted_vout(0, 0, &fake_scid_rand_bytes); + let valid_fake_scid = scid_utils::scid_from_parts(1, 0, valid_encrypted_vout as u64).unwrap(); + assert!(is_valid_intercept(&fake_scid_rand_bytes, valid_fake_scid, &testnet_genesis)); + let invalid_fake_scid = scid_utils::scid_from_parts(1, 0, 12).unwrap(); + assert!(!is_valid_intercept(&fake_scid_rand_bytes, invalid_fake_scid, &testnet_genesis)); + } + #[test] fn test_get_fake_scid() { - let mainnet_genesis = genesis_block(Network::Bitcoin).header.block_hash(); + let mainnet_genesis = ChainHash::using_genesis_block(Network::Bitcoin); let seed = [0; 32]; let fake_scid_rand_bytes = [1; 32]; let keys_manager = Arc::new(test_utils::TestKeysInterface::new(&seed, Network::Testnet)); let namespace = Namespace::Phantom; let fake_scid = namespace.get_fake_scid(500_000, &mainnet_genesis, &fake_scid_rand_bytes, &keys_manager); - let fake_height = scid_utils::block_from_scid(&fake_scid); + let fake_height = scid_utils::block_from_scid(fake_scid); assert!(fake_height >= MAINNET_SEGWIT_ACTIVATION_HEIGHT); assert!(fake_height <= 500_000); - let fake_tx_index = scid_utils::tx_index_from_scid(&fake_scid); + let fake_tx_index = scid_utils::tx_index_from_scid(fake_scid); assert!(fake_tx_index <= MAX_TX_INDEX); - let fake_vout = scid_utils::vout_from_scid(&fake_scid); + let fake_vout = scid_utils::vout_from_scid(fake_scid); assert!(fake_vout < MAX_NAMESPACES as u16); } } @@ -231,29 +267,29 @@ mod tests { #[test] fn test_block_from_scid() { - assert_eq!(block_from_scid(&0x000000_000000_0000), 0); - assert_eq!(block_from_scid(&0x000001_000000_0000), 1); - assert_eq!(block_from_scid(&0x000001_ffffff_ffff), 1); - assert_eq!(block_from_scid(&0x800000_ffffff_ffff), 0x800000); - assert_eq!(block_from_scid(&0xffffff_ffffff_ffff), 0xffffff); + assert_eq!(block_from_scid(0x000000_000000_0000), 0); + assert_eq!(block_from_scid(0x000001_000000_0000), 1); + assert_eq!(block_from_scid(0x000001_ffffff_ffff), 1); + assert_eq!(block_from_scid(0x800000_ffffff_ffff), 0x800000); + assert_eq!(block_from_scid(0xffffff_ffffff_ffff), 0xffffff); } #[test] fn test_tx_index_from_scid() { - assert_eq!(tx_index_from_scid(&0x000000_000000_0000), 0); - assert_eq!(tx_index_from_scid(&0x000000_000001_0000), 1); - assert_eq!(tx_index_from_scid(&0xffffff_000001_ffff), 1); - assert_eq!(tx_index_from_scid(&0xffffff_800000_ffff), 0x800000); - assert_eq!(tx_index_from_scid(&0xffffff_ffffff_ffff), 0xffffff); + assert_eq!(tx_index_from_scid(0x000000_000000_0000), 0); + assert_eq!(tx_index_from_scid(0x000000_000001_0000), 1); + assert_eq!(tx_index_from_scid(0xffffff_000001_ffff), 1); + assert_eq!(tx_index_from_scid(0xffffff_800000_ffff), 0x800000); + assert_eq!(tx_index_from_scid(0xffffff_ffffff_ffff), 0xffffff); } #[test] fn test_vout_from_scid() { - assert_eq!(vout_from_scid(&0x000000_000000_0000), 0); - assert_eq!(vout_from_scid(&0x000000_000000_0001), 1); - assert_eq!(vout_from_scid(&0xffffff_ffffff_0001), 1); - assert_eq!(vout_from_scid(&0xffffff_ffffff_8000), 0x8000); - assert_eq!(vout_from_scid(&0xffffff_ffffff_ffff), 0xffff); + assert_eq!(vout_from_scid(0x000000_000000_0000), 0); + assert_eq!(vout_from_scid(0x000000_000000_0001), 1); + assert_eq!(vout_from_scid(0xffffff_ffffff_0001), 1); + assert_eq!(vout_from_scid(0xffffff_ffffff_8000), 0x8000); + assert_eq!(vout_from_scid(0xffffff_ffffff_ffff), 0xffff); } #[test]