@@ -434,6 +434,7 @@ pub struct ChannelManager<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref,
434
434
#[ cfg( not( any( test, feature = "_test_utils" ) ) ) ]
435
435
channel_state : Mutex < ChannelHolder < Signer > > ,
436
436
our_network_key : SecretKey ,
437
+ our_network_pubkey : PublicKey ,
437
438
438
439
/// Used to track the last value sent in a node_announcement "timestamp" field. We ensure this
439
440
/// value increases strictly since we don't assume access to a time source.
@@ -822,7 +823,6 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
822
823
823
824
latest_block_height : AtomicUsize :: new ( params. latest_height ) ,
824
825
last_block_hash : RwLock :: new ( params. latest_hash ) ,
825
- secp_ctx,
826
826
827
827
channel_state : Mutex :: new ( ChannelHolder {
828
828
by_id : HashMap :: new ( ) ,
@@ -832,6 +832,8 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
832
832
pending_msg_events : Vec :: new ( ) ,
833
833
} ) ,
834
834
our_network_key : keys_manager. get_node_secret ( ) ,
835
+ our_network_pubkey : PublicKey :: from_secret_key ( & secp_ctx, & keys_manager. get_node_secret ( ) ) ,
836
+ secp_ctx,
835
837
836
838
last_node_announcement_serial : AtomicUsize :: new ( 0 ) ,
837
839
@@ -2315,7 +2317,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
2315
2317
2316
2318
/// Gets the node_id held by this ChannelManager
2317
2319
pub fn get_our_node_id ( & self ) -> PublicKey {
2318
- PublicKey :: from_secret_key ( & self . secp_ctx , & self . our_network_key )
2320
+ self . our_network_pubkey . clone ( )
2319
2321
}
2320
2322
2321
2323
/// Restores a single, given channel to normal operation after a
@@ -4318,7 +4320,6 @@ impl<'a, Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
4318
4320
4319
4321
latest_block_height : AtomicUsize :: new ( latest_block_height as usize ) ,
4320
4322
last_block_hash : RwLock :: new ( last_block_hash) ,
4321
- secp_ctx,
4322
4323
4323
4324
channel_state : Mutex :: new ( ChannelHolder {
4324
4325
by_id,
@@ -4328,6 +4329,8 @@ impl<'a, Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
4328
4329
pending_msg_events : Vec :: new ( ) ,
4329
4330
} ) ,
4330
4331
our_network_key : args. keys_manager . get_node_secret ( ) ,
4332
+ our_network_pubkey : PublicKey :: from_secret_key ( & secp_ctx, & args. keys_manager . get_node_secret ( ) ) ,
4333
+ secp_ctx,
4331
4334
4332
4335
last_node_announcement_serial : AtomicUsize :: new ( last_node_announcement_serial as usize ) ,
4333
4336
0 commit comments