Track ChannelTransactionParameters in ChannelMonitor FundingScope

The `ChannelTransactionParameters` will change across `FundingScope`s,
so we make sure to track it to ensure it is updated accordingly when a
new `FundingScope` is applied/considered.

Author: wpaulino

lightning/src/chain/channelmonitor.rs

@@ -875,7 +875,7 @@ struct FundingScope {
 	outpoint: OutPoint,
 	script_pubkey: ScriptBuf,
 	redeem_script: ScriptBuf,
-	channel_value_satoshis: u64,
+	channel_parameters: ChannelTransactionParameters,
 
 	current_counterparty_commitment_txid: Option<Txid>,
 	prev_counterparty_commitment_txid: Option<Txid>,
@@ -1118,7 +1118,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 
 		self.counterparty_commitment_params.write(writer)?;
 		self.funding.redeem_script.write(writer)?;
-		self.funding.channel_value_satoshis.write(writer)?;
+		self.funding.channel_parameters.channel_value_satoshis.write(writer)?;
 
 		match self.their_cur_per_commitment_points {
 			Some((idx, pubkey, second_option)) => {
@@ -1378,7 +1378,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 		on_counterparty_tx_csv: u16, destination_script: &Script, funding_outpoint: OutPoint,
 		funding_script: ScriptBuf, channel_parameters: &ChannelTransactionParameters,
 		holder_pays_commitment_tx_fee: bool, funding_redeemscript: ScriptBuf,
-		channel_value_satoshis: u64, commitment_transaction_number_obscure_factor: u64,
+		commitment_transaction_number_obscure_factor: u64,
 		initial_holder_commitment_tx: HolderCommitmentTransaction, best_block: BestBlock,
 		counterparty_node_id: PublicKey, channel_id: ChannelId,
 	) -> ChannelMonitor<Signer> {
@@ -1418,8 +1418,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 		};
 
 		let onchain_tx_handler = OnchainTxHandler::new(
-			channel_value_satoshis, channel_keys_id, destination_script.into(), keys,
-			channel_parameters.clone(), initial_holder_commitment_tx, secp_ctx
+			channel_parameters.channel_value_satoshis, channel_keys_id, destination_script.into(),
+			keys, channel_parameters.clone(), initial_holder_commitment_tx, secp_ctx
 		);
 
 		let mut outputs_to_watch = new_hash_map();
@@ -1432,7 +1432,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 				outpoint: funding_outpoint,
 				script_pubkey: funding_script,
 				redeem_script: funding_redeemscript,
-				channel_value_satoshis,
+				channel_parameters: channel_parameters.clone(),
 
 				current_counterparty_commitment_txid: None,
 				prev_counterparty_commitment_txid: None,
@@ -3146,7 +3146,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 	fn generate_claimable_outpoints_and_watch_outputs(&mut self, reason: ClosureReason) -> (Vec<PackageTemplate>, Vec<TransactionOutputs>) {
 		let funding_outp = HolderFundingOutput::build(
 			self.funding.redeem_script.clone(),
-			self.funding.channel_value_satoshis,
+			self.funding.channel_parameters.channel_value_satoshis,
 			self.onchain_tx_handler.channel_type_features().clone()
 		);
 		let commitment_package = PackageTemplate::build_package(
@@ -3403,7 +3403,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 					let commitment_txid = commitment_tx.compute_txid();
 					debug_assert_eq!(self.funding.current_holder_commitment_tx.txid, commitment_txid);
 					let pending_htlcs = self.funding.current_holder_commitment_tx.non_dust_htlcs();
-					let commitment_tx_fee_satoshis = self.funding.channel_value_satoshis -
+					let channel_value_satoshis = self.funding.channel_parameters.channel_value_satoshis;
+					let commitment_tx_fee_satoshis = channel_value_satoshis -
 						commitment_tx.output.iter().fold(0u64, |sum, output| sum + output.value.to_sat());
 					ret.push(Event::BumpTransaction(BumpTransactionEvent::ChannelClose {
 						channel_id,
@@ -3415,7 +3416,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 						anchor_descriptor: AnchorDescriptor {
 							channel_derivation_parameters: ChannelDerivationParameters {
 								keys_id: self.channel_keys_id,
-								value_satoshis: self.funding.channel_value_satoshis,
+								value_satoshis: channel_value_satoshis,
 								transaction_parameters: self.onchain_tx_handler.channel_transaction_parameters.clone(),
 							},
 							outpoint: BitcoinOutPoint {
@@ -3436,7 +3437,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 						htlc_descriptors.push(HTLCDescriptor {
 							channel_derivation_parameters: ChannelDerivationParameters {
 								keys_id: self.channel_keys_id,
-								value_satoshis: self.funding.channel_value_satoshis,
+								value_satoshis: self.funding.channel_parameters.channel_value_satoshis,
 								transaction_parameters: self.onchain_tx_handler.channel_transaction_parameters.clone(),
 							},
 							commitment_txid: htlc.commitment_txid,
@@ -4809,7 +4810,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 						output: outp.clone(),
 						revocation_pubkey: broadcasted_holder_revokable_script.2,
 						channel_keys_id: self.channel_keys_id,
-						channel_value_satoshis: self.funding.channel_value_satoshis,
+						channel_value_satoshis: self.funding.channel_parameters.channel_value_satoshis,
 						channel_transaction_parameters: Some(self.onchain_tx_handler.channel_transaction_parameters.clone()),
 					}));
 				}
@@ -4819,7 +4820,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 					outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 					output: outp.clone(),
 					channel_keys_id: self.channel_keys_id,
-					channel_value_satoshis: self.funding.channel_value_satoshis,
+					channel_value_satoshis: self.funding.channel_parameters.channel_value_satoshis,
 					channel_transaction_parameters: Some(self.onchain_tx_handler.channel_transaction_parameters.clone()),
 				}));
 			}
@@ -5183,12 +5184,14 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 				To continue, run a v0.1 release, send/route a payment over the channel or close it.", channel_id);
 		}
 
+		let channel_parameters = onchain_tx_handler.channel_transaction_parameters.clone();
+
 		Ok((best_block.block_hash, ChannelMonitor::from_impl(ChannelMonitorImpl {
 			funding: FundingScope {
 				outpoint,
 				script_pubkey: funding_script,
 				redeem_script: funding_redeemscript,
-				channel_value_satoshis,
+				channel_parameters,
 
 				current_counterparty_commitment_txid,
 				prev_counterparty_commitment_txid,
@@ -5485,7 +5488,7 @@ mod tests {
 		let best_block = BestBlock::from_network(Network::Testnet);
 		let monitor = ChannelMonitor::new(
 			Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
-			funding_txo, ScriptBuf::new(), &channel_parameters, true, ScriptBuf::new(), 46, 0,
+			funding_txo, ScriptBuf::new(), &channel_parameters, true, ScriptBuf::new(), 0,
 			HolderCommitmentTransaction::dummy(0, &mut Vec::new()), best_block, dummy_key, channel_id,
 		);
 
@@ -5738,7 +5741,7 @@ mod tests {
 		let best_block = BestBlock::from_network(Network::Testnet);
 		let monitor = ChannelMonitor::new(
 			Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
-			funding_txo, ScriptBuf::new(), &channel_parameters, true, ScriptBuf::new(), 46, 0,
+			funding_txo, ScriptBuf::new(), &channel_parameters, true, ScriptBuf::new(), 0,
 			HolderCommitmentTransaction::dummy(0, &mut Vec::new()), best_block, dummy_key, channel_id,
 		);
 

lightning/src/ln/channel.rs

@@ -2137,8 +2137,8 @@ trait InitialRemoteCommitmentReceiver<SP: Deref> where SP::Target: SignerProvide
 			context.secp_ctx.clone(), monitor_signer, shutdown_script,
 			funding.get_holder_selected_contest_delay(), &context.destination_script, funding_txo,
 			funding_txo_script, &funding.channel_transaction_parameters, funding.is_outbound(),
-			funding_redeemscript, funding.get_value_satoshis(), obscure_factor,
-			holder_commitment_tx, best_block, context.counterparty_node_id, context.channel_id(),
+			funding_redeemscript, obscure_factor, holder_commitment_tx, best_block,
+			context.counterparty_node_id, context.channel_id(),
 		);
 		channel_monitor.provide_initial_counterparty_commitment_tx(
 			counterparty_initial_commitment_tx.clone(), logger,