wip4

Author: joostjager

lightning/src/ln/onion_utils.rs

@@ -1858,17 +1858,13 @@ pub fn write_downstream_hmacs(
 
 
 fn process_failure_packet(packet: &[u8], shared_secret: &[u8], payload: &[u8; 4]) -> Vec<u8> {
-	println!("Failure packet: {}", log_bytes!(&packet));
-
 	// Create new packet.
 	let mut processed_packet = vec![0; packet.len()];
 
 	// Copy message.
 	let message = &packet[..packet.len() - MAX_HOPS * FULL_PAYLOAD_LEN - HMAC_COUNT * HMAC_LEN];
 	processed_packet[..packet.len() - MAX_HOPS * FULL_PAYLOAD_LEN - HMAC_COUNT * HMAC_LEN].copy_from_slice(message);
 
-	println!("Message: {}", log_bytes!(&message));
-
 	// Shift payloads right.
 	{
 		let payloads = &packet[packet.len() - MAX_HOPS * FULL_PAYLOAD_LEN - HMAC_COUNT * HMAC_LEN..packet.len()-HMAC_COUNT*HMAC_LEN];
@@ -1906,8 +1902,6 @@ fn process_failure_packet(packet: &[u8], shared_secret: &[u8], payload: &[u8; 4]
 	// Add this node's hmacs.
 	add_hmacs(&shared_secret, &mut processed_packet);
 
-	println!("Failure packet post-hmac: {}", log_bytes!(&processed_packet));
-
 	processed_packet
 }
 
@@ -2288,48 +2282,19 @@ use crate::io;
 
 		super::add_hmacs(onion_keys[4].shared_secret.as_ref(), packet_slice);
 
-		let encrypted_packet = super::encrypt_failure_packet(onion_keys[4].shared_secret.as_ref(), packet_slice);
+		let mut encrypted_packet = super::encrypt_failure_packet(onion_keys[4].shared_secret.as_ref(), packet_slice);
 		assert_eq!(encrypted_packet.data.to_lower_hex_string(), EXPECTED_MESSAGES[0]);
 
-		let payload = [0, 0, 0, 2];
-		let encrypted_packet = process_failure_packet(&encrypted_packet.data, onion_keys[3].shared_secret.as_ref(), &payload);
-		let encrypted_packet = super::encrypt_failure_packet(onion_keys[3].shared_secret.as_ref(), &encrypted_packet);
-
-		assert_eq!(encrypted_packet.data.to_lower_hex_string(), EXPECTED_MESSAGES[1]);
-
-		// let onion_packet_1 = super::encrypt_failure_packet(
-		// 	onion_keys[4].shared_secret.as_ref(),
-		// 	&onion_error.encode()[..],
-		// );
-		// let hex = "a5e6bd0c74cb347f10cce367f949098f2457d14c046fd8a22cb96efb30b0fdcda8cb9168b50f2fd45edd73c1b0c8b33002df376801ff58aaa94000bf8a86f92620f343baef38a580102395ae3abf9128d1047a0736ff9b83d456740ebbb4aeb3aa9737f18fb4afb4aa074fb26c4d702f42968888550a3bded8c05247e045b866baef0499f079fdaeef6538f31d44deafffdfd3afa2fb4ca9082b8f1c465371a9894dd8c243fb4847e004f5256b3e90e2edde4c9fb3082ddfe4d1e734cacd96ef0706bf63c9984e22dc98851bcccd1c3494351feb458c9c6af41c0044bea3c47552b1d992ae542b17a2d0bba1a096c78d169034ecb55b6e3a7263c26017f033031228833c1daefc0dedb8cf7c3e37c9c37ebfe42f3225c326e8bcfd338804c145b16e34e4";
-		// assert_eq!(onion_packet_1.data, <Vec<u8>>::from_hex(hex).unwrap());
-
-		// let onion_packet_2 = super::encrypt_failure_packet(
-		// 	onion_keys[3].shared_secret.as_ref(),
-		// 	&onion_packet_1.data[..],
-		// );
-		// let hex = "c49a1ce81680f78f5f2000cda36268de34a3f0a0662f55b4e837c83a8773c22aa081bab1616a0011585323930fa5b9fae0c85770a2279ff59ec427ad1bbff9001c0cd1497004bd2a0f68b50704cf6d6a4bf3c8b6a0833399a24b3456961ba00736785112594f65b6b2d44d9f5ea4e49b5e1ec2af978cbe31c67114440ac51a62081df0ed46d4a3df295da0b0fe25c0115019f03f15ec86fabb4c852f83449e812f141a9395b3f70b766ebbd4ec2fae2b6955bd8f32684c15abfe8fd3a6261e52650e8807a92158d9f1463261a925e4bfba44bd20b166d532f0017185c3a6ac7957adefe45559e3072c8dc35abeba835a8cb01a71a15c736911126f27d46a36168ca5ef7dccd4e2886212602b181463e0dd30185c96348f9743a02aca8ec27c0b90dca270";
-		// assert_eq!(onion_packet_2.data, <Vec<u8>>::from_hex(hex).unwrap());
-
-		// let onion_packet_3 = super::encrypt_failure_packet(
-		// 	onion_keys[2].shared_secret.as_ref(),
-		// 	&onion_packet_2.data[..],
-		// );
-		// let hex = "a5d3e8634cfe78b2307d87c6d90be6fe7855b4f2cc9b1dfb19e92e4b79103f61ff9ac25f412ddfb7466e74f81b3e545563cdd8f5524dae873de61d7bdfccd496af2584930d2b566b4f8d3881f8c043df92224f38cf094cfc09d92655989531524593ec6d6caec1863bdfaa79229b5020acc034cd6deeea1021c50586947b9b8e6faa83b81fbfa6133c0af5d6b07c017f7158fa94f0d206baf12dda6b68f785b773b360fd0497e16cc402d779c8d48d0fa6315536ef0660f3f4e1865f5b38ea49c7da4fd959de4e83ff3ab686f059a45c65ba2af4a6a79166aa0f496bf04d06987b6d2ea205bdb0d347718b9aeff5b61dfff344993a275b79717cd815b6ad4c0beb568c4ac9c36ff1c315ec1119a1993c4b61e6eaa0375e0aaf738ac691abd3263bf937e3";
-		// assert_eq!(onion_packet_3.data, <Vec<u8>>::from_hex(hex).unwrap());
-
-		// let onion_packet_4 = super::encrypt_failure_packet(
-		// 	onion_keys[1].shared_secret.as_ref(),
-		// 	&onion_packet_3.data[..],
-		// );
-		// let hex = "aac3200c4968f56b21f53e5e374e3a2383ad2b1b6501bbcc45abc31e59b26881b7dfadbb56ec8dae8857add94e6702fb4c3a4de22e2e669e1ed926b04447fc73034bb730f4932acd62727b75348a648a1128744657ca6a4e713b9b646c3ca66cac02cdab44dd3439890ef3aaf61708714f7375349b8da541b2548d452d84de7084bb95b3ac2345201d624d31f4d52078aa0fa05a88b4e20202bd2b86ac5b52919ea305a8949de95e935eed0319cf3cf19ebea61d76ba92532497fcdc9411d06bcd4275094d0a4a3c5d3a945e43305a5a9256e333e1f64dbca5fcd4e03a39b9012d197506e06f29339dfee3331995b21615337ae060233d39befea925cc262873e0530408e6990f1cbd233a150ef7b004ff6166c70c68d9f8c853c1abca640b8660db2921";
-		// assert_eq!(onion_packet_4.data, <Vec<u8>>::from_hex(hex).unwrap());
-
-		// let onion_packet_5 = super::encrypt_failure_packet(
-		// 	onion_keys[0].shared_secret.as_ref(),
-		// 	&onion_packet_4.data[..],
-		// );
-		// let hex = "9c5add3963fc7f6ed7f148623c84134b5647e1306419dbe2174e523fa9e2fbed3a06a19f899145610741c83ad40b7712aefaddec8c6baf7325d92ea4ca4d1df8bce517f7e54554608bf2bd8071a4f52a7a2f7ffbb1413edad81eeea5785aa9d990f2865dc23b4bc3c301a94eec4eabebca66be5cf638f693ec256aec514620cc28ee4a94bd9565bc4d4962b9d3641d4278fb319ed2b84de5b665f307a2db0f7fbb757366067d88c50f7e829138fde4f78d39b5b5802f1b92a8a820865af5cc79f9f30bc3f461c66af95d13e5e1f0381c184572a91dee1c849048a647a1158cf884064deddbf1b0b88dfe2f791428d0ba0f6fb2f04e14081f69165ae66d9297c118f0907705c9c4954a199bae0bb96fad763d690e7daa6cfda59ba7f2c8d11448b604d12d";
-		// assert_eq!(onion_packet_5.data, <Vec<u8>>::from_hex(hex).unwrap());
+		for idx in 1..5 {
+			let shared_secret = onion_keys[4 - idx].shared_secret.as_ref();
+
+			let payload = [0, 0, 0, (idx + 1) as u8];
+			let processed_packet = process_failure_packet(&encrypted_packet.data, shared_secret, &payload);
+			encrypted_packet = super::encrypt_failure_packet(shared_secret, &processed_packet);
+
+			assert_eq!(encrypted_packet.data.to_lower_hex_string(), EXPECTED_MESSAGES[idx]);
+		}
+
+
 	}
 }