Skip to content

Commit d9c7cff

Browse files
committed
Don't persist individual flags
1 parent e7ffdba commit d9c7cff

File tree

1 file changed

+9
-25
lines changed

1 file changed

+9
-25
lines changed

lightning/src/ln/channel.rs

+9-25
Original file line numberDiff line numberDiff line change
@@ -7639,12 +7639,6 @@ impl<SP: Deref> Writeable for Channel<SP> where SP::Target: SignerProvider {
76397639
(38, self.context.is_batch_funding, option),
76407640
(39, self.context.cur_holder_commitment_point, option),
76417641
(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),
76487642
});
76497643

76507644
Ok(())
@@ -7927,17 +7921,11 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
79277921

79287922
let mut pending_outbound_skimmed_fees_opt: Option<Vec<Option<u64>>> = None;
79297923
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;
79327924

79337925
let mut is_batch_funding: Option<()> = None;
79347926

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;
79417929

79427930
read_tlv_fields!(reader, {
79437931
(0, announcement_sigs, option),
@@ -7967,12 +7955,6 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
79677955
(38, is_batch_funding, option),
79687956
(39, cur_holder_commitment_point, option),
79697957
(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)),
79767958
});
79777959

79787960
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
80268008

80278009
// If we weren't able to load the cur_holder_commitment_point or prev_holder_commitment_secret,
80288010
// ask the signer for it now.
8011+
let mut signer_pending_commitment_point = false;
80298012
if cur_holder_commitment_point.is_none() {
80308013
cur_holder_commitment_point = holder_signer.get_per_commitment_point(
80318014
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
80348017
signer_pending_commitment_point = cur_holder_commitment_point.is_none();
80358018
}
80368019

8020+
let mut signer_pending_released_secret = false;
80378021
if prev_holder_commitment_secret.is_none() {
80388022
let release_transaction_number = cur_holder_commitment_transaction_number + 2;
80398023
prev_holder_commitment_secret = if release_transaction_number <= INITIAL_COMMITMENT_NUMBER {
80408024
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();
80428026
secret
80438027
} else { None };
80448028
}
@@ -8114,10 +8098,10 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
81148098
monitor_pending_failures,
81158099
monitor_pending_finalized_fulfills: monitor_pending_finalized_fulfills.unwrap(),
81168100

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,
81218105
signer_pending_commitment_point,
81228106
signer_pending_released_secret,
81238107

0 commit comments

Comments
 (0)