f - change serialization and initialization

Author: alecchendev

lightning/src/ln/channel.rs

@@ -1801,8 +1801,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider  {
 		let value_to_self_msat = our_funding_satoshis * 1000 + msg_push_msat;
 
 		let holder_signer = ChannelSignerType::Ecdsa(holder_signer);
-		let mut holder_commitment_point = HolderCommitmentPoint::new();
-		holder_commitment_point.advance(&holder_signer, &secp_ctx, &&logger);
+		let holder_commitment_point = HolderCommitmentPoint::new(&holder_signer, &secp_ctx);
 
 		// TODO(dual_funding): Checks for `funding_feerate_sat_per_1000_weight`?
 
@@ -2030,8 +2029,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider  {
 		let temporary_channel_id = temporary_channel_id.unwrap_or_else(|| ChannelId::temporary_from_entropy_source(entropy_source));
 
 		let holder_signer = ChannelSignerType::Ecdsa(holder_signer);
-		let mut holder_commitment_point = HolderCommitmentPoint::new();
-		holder_commitment_point.advance(&holder_signer, &secp_ctx, logger);
+		let holder_commitment_point = HolderCommitmentPoint::new(&holder_signer, &secp_ctx);
 
 		Ok(Self {
 			user_id,
@@ -8850,7 +8848,8 @@ impl<SP: Deref> Writeable for Channel<SP> where SP::Target: SignerProvider {
 			monitor_pending_update_adds = Some(&self.context.monitor_pending_update_adds);
 		}
 
-		let cur_holder_commitment_point = self.context.holder_commitment_point.current_point();
+		// `current_point` will become optional when async signing is implemented.
+		let cur_holder_commitment_point = Some(self.context.holder_commitment_point.current_point());
 		let next_holder_commitment_point = self.context.holder_commitment_point.next_point();
 
 		write_tlv_fields!(writer, {
@@ -9354,12 +9353,15 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
 			(Some(current), Some(next)) => HolderCommitmentPoint::Available {
 				transaction_number: cur_holder_commitment_transaction_number, current, next
 			},
-			(Some(current), _) => HolderCommitmentPoint::PendingNext {
-				transaction_number: cur_holder_commitment_transaction_number, current
+			(Some(current), _) => HolderCommitmentPoint::Available {
+				transaction_number: cur_holder_commitment_transaction_number, current,
+				next: holder_signer.get_per_commitment_point(cur_holder_commitment_transaction_number - 1, &secp_ctx),
+			},
+			(_, _) => HolderCommitmentPoint::Available {
+				transaction_number: cur_holder_commitment_transaction_number,
+				current: holder_signer.get_per_commitment_point(cur_holder_commitment_transaction_number, &secp_ctx),
+				next: holder_signer.get_per_commitment_point(cur_holder_commitment_transaction_number - 1, &secp_ctx),
 			},
-			(_, _) => HolderCommitmentPoint::Uninitialized {
-				transaction_number: cur_holder_commitment_transaction_number
-			}
 		};
 
 		Ok(Channel {