Skip to content

Commit 3477721

Browse files
naumenkogsnaumenkogs
committed
Remove non-bitcoin chain helpers
1 parent 982f58e commit 3477721

File tree

3 files changed

+58
-117
lines changed

3 files changed

+58
-117
lines changed

‎lightning/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ Still missing tons of error-handling. See GitHub issues for suggested projects i
1111
"""
1212

1313
[features]
14-
# Supports tracking channels with a non-bitcoin chain hashes. Currently enables all kinds of fun DoS attacks.
15-
non_bitcoin_chain_hash_routing = []
1614
fuzztarget = ["bitcoin/fuzztarget"]
1715
# Unlog messages superior at targeted level.
1816
max_level_off = []

‎lightning/src/ln/msgs.rs

Lines changed: 22 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1445,7 +1445,7 @@ mod tests {
14451445
assert_eq!(encoded_value, hex::decode("040000000000000005000000000000000600000000000000070000000000000000083a840000034dd977cb9b53d93a6ff64bb5f1e158b4094b66e798fb12911168a3ccdf80a83096340a6a95da0ae8d9f776528eecdbb747eb6b545495a4319ed5378e35b21e073acf9953cef4700860f5967838eba2bae89288ad188ebf8b20bf995c3ea53a26df1876d0a3a0e13172ba286a673140190c02ba9da60a2e43a745188c8a83c7f3ef").unwrap());
14461446
}
14471447

1448-
fn do_encoding_channel_announcement(unknown_features_bits: bool, non_bitcoin_chain_hash: bool, excess_data: bool) {
1448+
fn do_encoding_channel_announcement(unknown_features_bits: bool, excess_data: bool) {
14491449
let secp_ctx = Secp256k1::new();
14501450
let (privkey_1, pubkey_1) = get_keys_from!("0101010101010101010101010101010101010101010101010101010101010101", secp_ctx);
14511451
let (privkey_2, pubkey_2) = get_keys_from!("0202020202020202020202020202020202020202020202020202020202020202", secp_ctx);
@@ -1461,7 +1461,7 @@ mod tests {
14611461
}
14621462
let unsigned_channel_announcement = msgs::UnsignedChannelAnnouncement {
14631463
features,
1464-
chain_hash: if !non_bitcoin_chain_hash { BlockHash::from_hex("6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000").unwrap() } else { BlockHash::from_hex("000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943").unwrap() },
1464+
chain_hash: BlockHash::from_hex("6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000").unwrap(),
14651465
short_channel_id: 2316138423780173,
14661466
node_id_1: pubkey_1,
14671467
node_id_2: pubkey_2,
@@ -1483,11 +1483,7 @@ mod tests {
14831483
} else {
14841484
target_value.append(&mut hex::decode("0000").unwrap());
14851485
}
1486-
if non_bitcoin_chain_hash {
1487-
target_value.append(&mut hex::decode("43497fd7f826957108f4a30fd9cec3aeba79972084e90ead01ea330900000000").unwrap());
1488-
} else {
1489-
target_value.append(&mut hex::decode("000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f").unwrap());
1490-
}
1486+
target_value.append(&mut hex::decode("000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f").unwrap());
14911487
target_value.append(&mut hex::decode("00083a840000034d031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f024d4b6cd1361032ca9bd2aeb9d900aa4d45d9ead80ac9423374c451a7254d076602531fe6068134503d2723133227c867ac8fa6c83c537e9a44c3c5bdbdcb1fe33703462779ad4aad39514614751a71085f2f10e1c7a593e4e030efb5b8721ce55b0b").unwrap());
14921488
if excess_data {
14931489
target_value.append(&mut hex::decode("0a00001400001e000028").unwrap());
@@ -1497,14 +1493,10 @@ mod tests {
14971493

14981494
#[test]
14991495
fn encoding_channel_announcement() {
1500-
do_encoding_channel_announcement(false, false, false);
1501-
do_encoding_channel_announcement(true, false, false);
1502-
do_encoding_channel_announcement(true, true, false);
1503-
do_encoding_channel_announcement(true, true, true);
1504-
do_encoding_channel_announcement(false, true, true);
1505-
do_encoding_channel_announcement(false, false, true);
1506-
do_encoding_channel_announcement(false, true, false);
1507-
do_encoding_channel_announcement(true, false, true);
1496+
do_encoding_channel_announcement(true, false);
1497+
do_encoding_channel_announcement(false, true);
1498+
do_encoding_channel_announcement(false, false);
1499+
do_encoding_channel_announcement(true, true);
15081500
}
15091501

15101502
fn do_encoding_node_announcement(unknown_features_bits: bool, ipv4: bool, ipv6: bool, onionv2: bool, onionv3: bool, excess_address_data: bool, excess_data: bool) {
@@ -1606,12 +1598,12 @@ mod tests {
16061598
do_encoding_node_announcement(false, false, true, false, true, false, false);
16071599
}
16081600

1609-
fn do_encoding_channel_update(non_bitcoin_chain_hash: bool, direction: bool, disable: bool, htlc_maximum_msat: bool) {
1601+
fn do_encoding_channel_update(direction: bool, disable: bool, htlc_maximum_msat: bool) {
16101602
let secp_ctx = Secp256k1::new();
16111603
let (privkey_1, _) = get_keys_from!("0101010101010101010101010101010101010101010101010101010101010101", secp_ctx);
16121604
let sig_1 = get_sig_on!(privkey_1, secp_ctx, String::from("01010101010101010101010101010101"));
16131605
let unsigned_channel_update = msgs::UnsignedChannelUpdate {
1614-
chain_hash: if !non_bitcoin_chain_hash { BlockHash::from_hex("6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000").unwrap() } else { BlockHash::from_hex("000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943").unwrap() },
1606+
chain_hash: BlockHash::from_hex("6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000").unwrap(),
16151607
short_channel_id: 2316138423780173,
16161608
timestamp: 20190119,
16171609
flags: if direction { 1 } else { 0 } | if disable { 1 << 1 } else { 0 } | if htlc_maximum_msat { 1 << 8 } else { 0 },
@@ -1627,11 +1619,7 @@ mod tests {
16271619
};
16281620
let encoded_value = channel_update.encode();
16291621
let mut target_value = hex::decode("d977cb9b53d93a6ff64bb5f1e158b4094b66e798fb12911168a3ccdf80a83096340a6a95da0ae8d9f776528eecdbb747eb6b545495a4319ed5378e35b21e073a").unwrap();
1630-
if non_bitcoin_chain_hash {
1631-
target_value.append(&mut hex::decode("43497fd7f826957108f4a30fd9cec3aeba79972084e90ead01ea330900000000").unwrap());
1632-
} else {
1633-
target_value.append(&mut hex::decode("000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f").unwrap());
1634-
}
1622+
target_value.append(&mut hex::decode("000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f").unwrap());
16351623
target_value.append(&mut hex::decode("00083a840000034d013413a7").unwrap());
16361624
if htlc_maximum_msat {
16371625
target_value.append(&mut hex::decode("01").unwrap());
@@ -1656,15 +1644,14 @@ mod tests {
16561644

16571645
#[test]
16581646
fn encoding_channel_update() {
1659-
do_encoding_channel_update(false, false, false, false);
1660-
do_encoding_channel_update(true, false, false, false);
1661-
do_encoding_channel_update(false, true, false, false);
1662-
do_encoding_channel_update(false, false, true, false);
1663-
do_encoding_channel_update(false, false, false, true);
1664-
do_encoding_channel_update(true, true, true, true);
1647+
do_encoding_channel_update(false, false, false);
1648+
do_encoding_channel_update(true, false, false);
1649+
do_encoding_channel_update(false, true, false);
1650+
do_encoding_channel_update(false, false, true);
1651+
do_encoding_channel_update(true, true, true);
16651652
}
16661653

1667-
fn do_encoding_open_channel(non_bitcoin_chain_hash: bool, random_bit: bool, shutdown: bool) {
1654+
fn do_encoding_open_channel(random_bit: bool, shutdown: bool) {
16681655
let secp_ctx = Secp256k1::new();
16691656
let (_, pubkey_1) = get_keys_from!("0101010101010101010101010101010101010101010101010101010101010101", secp_ctx);
16701657
let (_, pubkey_2) = get_keys_from!("0202020202020202020202020202020202020202020202020202020202020202", secp_ctx);
@@ -1673,7 +1660,7 @@ mod tests {
16731660
let (_, pubkey_5) = get_keys_from!("0505050505050505050505050505050505050505050505050505050505050505", secp_ctx);
16741661
let (_, pubkey_6) = get_keys_from!("0606060606060606060606060606060606060606060606060606060606060606", secp_ctx);
16751662
let open_channel = msgs::OpenChannel {
1676-
chain_hash: if !non_bitcoin_chain_hash { BlockHash::from_hex("6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000").unwrap() } else { BlockHash::from_hex("000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943").unwrap() },
1663+
chain_hash: BlockHash::from_hex("6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000").unwrap(),
16771664
temporary_channel_id: [2; 32],
16781665
funding_satoshis: 1311768467284833366,
16791666
push_msat: 2536655962884945560,
@@ -1695,11 +1682,7 @@ mod tests {
16951682
};
16961683
let encoded_value = open_channel.encode();
16971684
let mut target_value = Vec::new();
1698-
if non_bitcoin_chain_hash {
1699-
target_value.append(&mut hex::decode("43497fd7f826957108f4a30fd9cec3aeba79972084e90ead01ea330900000000").unwrap());
1700-
} else {
1701-
target_value.append(&mut hex::decode("000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f").unwrap());
1702-
}
1685+
target_value.append(&mut hex::decode("000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f").unwrap());
17031686
target_value.append(&mut hex::decode("02020202020202020202020202020202020202020202020202020202020202021234567890123456233403289122369832144668701144767633030896203198784335490624111800083a840000034d000c89d4c0bcc0bc031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f024d4b6cd1361032ca9bd2aeb9d900aa4d45d9ead80ac9423374c451a7254d076602531fe6068134503d2723133227c867ac8fa6c83c537e9a44c3c5bdbdcb1fe33703462779ad4aad39514614751a71085f2f10e1c7a593e4e030efb5b8721ce55b0b0362c0a046dacce86ddd0343c6d3c7c79c2208ba0d9c9cf24a6d046d21d21f90f703f006a18d5653c4edf5391ff23a61f03ff83d237e880ee61187fa9f379a028e0a").unwrap());
17041687
if random_bit {
17051688
target_value.append(&mut hex::decode("20").unwrap());
@@ -1714,11 +1697,10 @@ mod tests {
17141697

17151698
#[test]
17161699
fn encoding_open_channel() {
1717-
do_encoding_open_channel(false, false, false);
1718-
do_encoding_open_channel(true, false, false);
1719-
do_encoding_open_channel(false, true, false);
1720-
do_encoding_open_channel(false, false, true);
1721-
do_encoding_open_channel(true, true, true);
1700+
do_encoding_open_channel(false, false);
1701+
do_encoding_open_channel(true, false);
1702+
do_encoding_open_channel(false, true);
1703+
do_encoding_open_channel(true, true);
17221704
}
17231705

17241706
fn do_encoding_accept_channel(shutdown: bool) {

0 commit comments

Comments
 (0)