@@ -7639,12 +7639,6 @@ impl<SP: Deref> Writeable for Channel<SP> where SP::Target: SignerProvider {
7639
7639
(38, self.context.is_batch_funding, option),
7640
7640
(39, self.context.cur_holder_commitment_point, option),
7641
7641
(41, self.context.prev_holder_commitment_secret, option),
7642
- (43, self.context.signer_pending_commitment_point, required),
7643
- (45, self.context.signer_pending_revoke_and_ack, required),
7644
- (47, self.context.signer_pending_funding, required),
7645
- (49, self.context.signer_pending_channel_ready, required),
7646
- (51, self.context.signer_pending_commitment_point, required),
7647
- (53, self.context.signer_pending_released_secret, required),
7648
7642
});
7649
7643
7650
7644
Ok(())
@@ -7927,17 +7921,11 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
7927
7921
7928
7922
let mut pending_outbound_skimmed_fees_opt: Option<Vec<Option<u64>>> = None;
7929
7923
let mut holding_cell_skimmed_fees_opt: Option<Vec<Option<u64>>> = None;
7930
- let mut cur_holder_commitment_point: Option<PublicKey> = None;
7931
- let mut prev_holder_commitment_secret: Option<[u8; 32]> = None;
7932
7924
7933
7925
let mut is_batch_funding: Option<()> = None;
7934
7926
7935
- let mut signer_pending_commitment_update: bool = false;
7936
- let mut signer_pending_revoke_and_ack: bool = false;
7937
- let mut signer_pending_funding: bool = false;
7938
- let mut signer_pending_channel_ready: bool = false;
7939
- let mut signer_pending_commitment_point: bool = false;
7940
- let mut signer_pending_released_secret: bool = false;
7927
+ let mut cur_holder_commitment_point: Option<PublicKey> = None;
7928
+ let mut prev_holder_commitment_secret: Option<[u8; 32]> = None;
7941
7929
7942
7930
read_tlv_fields!(reader, {
7943
7931
(0, announcement_sigs, option),
@@ -7967,12 +7955,6 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
7967
7955
(38, is_batch_funding, option),
7968
7956
(39, cur_holder_commitment_point, option),
7969
7957
(41, prev_holder_commitment_secret, option),
7970
- (43, signer_pending_commitment_update, (default_value, false)),
7971
- (45, signer_pending_revoke_and_ack, (default_value, false)),
7972
- (47, signer_pending_funding, (default_value, false)),
7973
- (49, signer_pending_channel_ready, (default_value, false)),
7974
- (51, signer_pending_commitment_point, (default_value, false)),
7975
- (53, signer_pending_released_secret, (default_value, false)),
7976
7958
});
7977
7959
7978
7960
let (channel_keys_id, holder_signer) = if let Some(channel_keys_id) = channel_keys_id {
@@ -8026,6 +8008,7 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
8026
8008
8027
8009
// If we weren't able to load the cur_holder_commitment_point or prev_holder_commitment_secret,
8028
8010
// ask the signer for it now.
8011
+ let mut signer_pending_commitment_point = false;
8029
8012
if cur_holder_commitment_point.is_none() {
8030
8013
cur_holder_commitment_point = holder_signer.get_per_commitment_point(
8031
8014
cur_holder_commitment_transaction_number, &secp_ctx
@@ -8034,11 +8017,12 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
8034
8017
signer_pending_commitment_point = cur_holder_commitment_point.is_none();
8035
8018
}
8036
8019
8020
+ let mut signer_pending_released_secret = false;
8037
8021
if prev_holder_commitment_secret.is_none() {
8038
8022
let release_transaction_number = cur_holder_commitment_transaction_number + 2;
8039
8023
prev_holder_commitment_secret = if release_transaction_number <= INITIAL_COMMITMENT_NUMBER {
8040
8024
let secret = holder_signer.release_commitment_secret(release_transaction_number).ok();
8041
- signer_pending_commitment_point = secret.is_none();
8025
+ signer_pending_released_secret = secret.is_none();
8042
8026
secret
8043
8027
} else { None };
8044
8028
}
@@ -8114,10 +8098,10 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
8114
8098
monitor_pending_failures,
8115
8099
monitor_pending_finalized_fulfills: monitor_pending_finalized_fulfills.unwrap(),
8116
8100
8117
- signer_pending_commitment_update,
8118
- signer_pending_revoke_and_ack,
8119
- signer_pending_funding,
8120
- signer_pending_channel_ready,
8101
+ signer_pending_commitment_update: false ,
8102
+ signer_pending_revoke_and_ack: false ,
8103
+ signer_pending_funding: false ,
8104
+ signer_pending_channel_ready: false ,
8121
8105
signer_pending_commitment_point,
8122
8106
signer_pending_released_secret,
8123
8107
0 commit comments