@@ -7153,6 +7153,12 @@ impl<SP: Deref> Channel<SP> where
71537153 pub fn get_channel_reestablish<L: Deref>(&mut self, logger: &L) -> msgs::ChannelReestablish where L::Target: Logger {
71547154 assert!(self.context.channel_state.is_peer_disconnected());
71557155 assert_ne!(self.context.cur_counterparty_commitment_transaction_number, INITIAL_COMMITMENT_NUMBER);
7156+ // This is generally the first function which gets called on any given channel once we're
7157+ // up and running normally. Thus, we take this opportunity to attempt to resolve the
7158+ // `holder_commitment_point` to get any keys which we are currently missing.
7159+ self.context.holder_commitment_point.try_resolve_pending(
7160+ &self.context.holder_signer, &self.context.secp_ctx, logger,
7161+ );
71567162 // Prior to static_remotekey, my_current_per_commitment_point was critical to claiming
71577163 // current to_remote balances. However, it no longer has any use, and thus is now simply
71587164 // set to a dummy (but valid, as required by the spec) public key.
@@ -9464,8 +9470,10 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
94649470 // TODO(async_signing): remove this expect with the Uninitialized variant
94659471 let current = holder_signer.get_per_commitment_point(cur_holder_commitment_transaction_number, &secp_ctx)
94669472 .expect("Must be able to derive the current commitment point upon channel restoration");
9467- HolderCommitmentPoint::PendingNext {
9468- transaction_number: cur_holder_commitment_transaction_number, current,
9473+ let next = holder_signer.get_per_commitment_point(cur_holder_commitment_transaction_number - 1, &secp_ctx)
9474+ .expect("Must be able to derive the next commitment point upon channel restoration");
9475+ HolderCommitmentPoint::Available {
9476+ transaction_number: cur_holder_commitment_transaction_number, current, next,
94699477 }
94709478 },
94719479 };
0 commit comments