From b13daab906b04efb50a2e467c0299ed6ea81b058 Mon Sep 17 00:00:00 2001 From: Tibo-lg Date: Wed, 4 Oct 2023 14:27:30 +0900 Subject: [PATCH] fixup! Check and return commit tx number --- lightning/src/ln/channelmanager.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs index 2d70c405565..5e9bcff1781 100644 --- a/lightning/src/ln/channelmanager.rs +++ b/lightning/src/ln/channelmanager.rs @@ -82,6 +82,8 @@ pub use crate::ln::outbound_payment::{PaymentSendFailure, Retry, RetryableSendFa use crate::ln::script::ShutdownScript; use super::msgs::{CommitmentSigned, RevokeAndACK}; +pub type NumberedCommitmentSigned = (CommitmentSigned, u64); + // We hold various information about HTLC relay in the HTLC objects in Channel itself: // // Upon receipt of an HTLC from a peer, we'll give it a PendingHTLCStatus indicating if it should @@ -2703,22 +2705,24 @@ where self.close_channel_internal(channel_id, counterparty_node_id, target_feerate_sats_per_1000_weight, shutdown_script) } - /// - pub fn get_updated_funding_outpoint_commitment_signed(&self, channel_lock: &mut ChannelLock<::Signer>, funding_outpoint: &OutPoint, channel_value_satoshis: u64, value_to_self_msat: u64) -> Result<(CommitmentSigned, u64), APIError> { + /// Updates the funding output and returns the `CommitmentSigned` message for the updated + /// commitment transaction, as well as the commitment transaction number. + pub fn get_updated_funding_outpoint_commitment_signed(&self, channel_lock: &mut ChannelLock<::Signer>, funding_outpoint: &OutPoint, channel_value_satoshis: u64, value_to_self_msat: u64) -> Result { self.get_updated_funding_outpoint_commitment_signed_internal(channel_lock, funding_outpoint, channel_value_satoshis, value_to_self_msat) } - /// + /// Process and validates the given commitment signature and returns the RAA to be given to the + /// counterparty on success. pub fn on_commitment_signed_get_raa(&self, channel_lock: &mut ChannelLock<::Signer>, commitment_signature: &secp256k1::ecdsa::Signature, htlc_signatures: &[secp256k1::ecdsa::Signature]) -> Result { self.on_commitment_signed_get_raa_internal(channel_lock, commitment_signature, htlc_signatures) } - /// + /// Process the given RAA message. pub fn revoke_and_ack_commitment(&self, channel_lock: &mut ChannelLock<::Signer>, revoke_and_ack: &RevokeAndACK) -> Result<(), APIError> { self.revoke_and_ack_commitment_internal(channel_lock, revoke_and_ack) } - /// + /// Set the funding outpoint for the channel to the given values. pub fn set_funding_outpoint(&self, channel_lock: &mut ChannelLock<::Signer>, funding_output: &OutPoint, channel_value_satoshis: u64, value_to_self_msat: u64) { self.set_funding_outpoint_internal(channel_lock, funding_output, channel_value_satoshis, value_to_self_msat); }