f rebase on new changes in #786

Author: TheBlueMatt

lightning/src/chain/keysinterface.rs

@@ -944,23 +944,23 @@ impl KeysManager {
 		};
 		transaction_utils::maybe_add_change_output(&mut spend_tx, input_value, witness_weight, feerate_sat_per_1000_weight, change_destination_script)?;
 
-		let mut keys_cache: Option<(InMemoryChannelKeys, (u64, u64))> = None;
+		let mut keys_cache: Option<(InMemoryChannelKeys, [u8; 32])> = None;
 		let mut input_idx = 0;
 		for outp in descriptors {
 			match outp {
 				SpendableOutputDescriptor::StaticOutputCounterpartyPayment(descriptor) => {
-					if keys_cache.is_none() || keys_cache.as_ref().unwrap().1 != descriptor.key_derivation_params {
+					if keys_cache.is_none() || keys_cache.as_ref().unwrap().1 != descriptor.channel_keys_id {
 						keys_cache = Some((
-							self.derive_channel_keys(descriptor.channel_value_satoshis, descriptor.key_derivation_params.0, descriptor.key_derivation_params.1),
-							descriptor.key_derivation_params));
+							self.derive_channel_keys(descriptor.channel_value_satoshis, &descriptor.channel_keys_id),
+							descriptor.channel_keys_id));
 					}
 					spend_tx.input[input_idx].witness = keys_cache.as_ref().unwrap().0.sign_counterparty_payment_input(&spend_tx, input_idx, &descriptor, &secp_ctx).unwrap();
 				},
 				SpendableOutputDescriptor::DynamicOutputP2WSH(descriptor) => {
-					if keys_cache.is_none() || keys_cache.as_ref().unwrap().1 != descriptor.key_derivation_params {
+					if keys_cache.is_none() || keys_cache.as_ref().unwrap().1 != descriptor.channel_keys_id {
 						keys_cache = Some((
-							self.derive_channel_keys(descriptor.channel_value_satoshis, descriptor.key_derivation_params.0, descriptor.key_derivation_params.1),
-							descriptor.key_derivation_params));
+							self.derive_channel_keys(descriptor.channel_value_satoshis, &descriptor.channel_keys_id),
+							descriptor.channel_keys_id));
 					}
 					spend_tx.input[input_idx].witness = keys_cache.as_ref().unwrap().0.sign_dynamic_p2wsh_input(&spend_tx, input_idx, &descriptor, &secp_ctx).unwrap();
 				},