@@ -1961,11 +1961,11 @@ impl KeysManager {
19611961
19621962 /// Derive an old [`EcdsaChannelSigner`] containing per-channel secrets based on a key derivation parameters.
19631963 pub fn derive_channel_keys (
1964- & self , channel_value_satoshis : u64 , params : & [ u8 ; 32 ] ,
1964+ & self , channel_value_satoshis : u64 , channel_keys_id : [ u8 ; 32 ] ,
19651965 ) -> InMemorySigner {
1966- let chan_id = u64:: from_be_bytes ( params [ 0 ..8 ] . try_into ( ) . unwrap ( ) ) ;
1966+ let chan_id = u64:: from_be_bytes ( channel_keys_id [ 0 ..8 ] . try_into ( ) . unwrap ( ) ) ;
19671967 let mut unique_start = Sha256 :: engine ( ) ;
1968- unique_start. input ( params ) ;
1968+ unique_start. input ( & channel_keys_id ) ;
19691969 unique_start. input ( & self . seed ) ;
19701970
19711971 // We only seriously intend to rely on the channel_master_key for true secure
@@ -2015,7 +2015,7 @@ impl KeysManager {
20152015 htlc_base_key,
20162016 commitment_seed,
20172017 channel_value_satoshis,
2018- params . clone ( ) ,
2018+ channel_keys_id ,
20192019 prng_seed,
20202020 )
20212021 }
@@ -2048,7 +2048,7 @@ impl KeysManager {
20482048 {
20492049 let mut signer = self . derive_channel_keys (
20502050 descriptor. channel_value_satoshis ,
2051- & descriptor. channel_keys_id ,
2051+ descriptor. channel_keys_id ,
20522052 ) ;
20532053 if let Some ( channel_params) =
20542054 descriptor. channel_transaction_parameters . as_ref ( )
@@ -2073,7 +2073,7 @@ impl KeysManager {
20732073 keys_cache = Some ( (
20742074 self . derive_channel_keys (
20752075 descriptor. channel_value_satoshis ,
2076- & descriptor. channel_keys_id ,
2076+ descriptor. channel_keys_id ,
20772077 ) ,
20782078 descriptor. channel_keys_id ,
20792079 ) ) ;
@@ -2273,7 +2273,7 @@ impl SignerProvider for KeysManager {
22732273 fn derive_channel_signer (
22742274 & self , channel_value_satoshis : u64 , channel_keys_id : [ u8 ; 32 ] ,
22752275 ) -> Self :: EcdsaSigner {
2276- self . derive_channel_keys ( channel_value_satoshis, & channel_keys_id)
2276+ self . derive_channel_keys ( channel_value_satoshis, channel_keys_id)
22772277 }
22782278
22792279 fn read_chan_signer ( & self , reader : & [ u8 ] ) -> Result < Self :: EcdsaSigner , DecodeError > {
@@ -2461,9 +2461,9 @@ impl PhantomKeysManager {
24612461
24622462 /// See [`KeysManager::derive_channel_keys`] for documentation on this method.
24632463 pub fn derive_channel_keys (
2464- & self , channel_value_satoshis : u64 , params : & [ u8 ; 32 ] ,
2464+ & self , channel_value_satoshis : u64 , channel_keys_id : [ u8 ; 32 ] ,
24652465 ) -> InMemorySigner {
2466- self . inner . derive_channel_keys ( channel_value_satoshis, params )
2466+ self . inner . derive_channel_keys ( channel_value_satoshis, channel_keys_id )
24672467 }
24682468
24692469 /// Gets the "node_id" secret key used to sign gossip announcements, decode onion data, etc.
0 commit comments