Skip to content

Commit 5194458

Browse files
optout21optout21
committed
Minor changes post review
1 parent c2e4db1 commit 5194458

File tree

2 files changed

+29
-33
lines changed

2 files changed

+29
-33
lines changed

‎lightning/src/ln/channel.rs‎

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1706,26 +1706,27 @@ pub(super) trait InteractivelyFunded<SP: Deref> where SP::Target: SignerProvider
17061706
) -> Result<Option<InteractiveTxMessageSend>, APIError>
17071707
where ES::Target: EntropySource
17081708
{
1709-
let mut funding_inputs = self.dual_funding_context_mut().our_funding_inputs.take().unwrap_or_else(|| vec![]);
1709+
let mut funding_inputs = Vec::new();
1710+
mem::swap(&mut self.dual_funding_context_mut().our_funding_inputs, &mut funding_inputs);
17101711

17111712
if let Some(prev_funding_input) = prev_funding_input {
17121713
funding_inputs.push(prev_funding_input);
17131714
}
17141715

1715-
let mut funding_inputs_prev_outputs: Vec<TxOut> = Vec::with_capacity(funding_inputs.len());
1716+
let mut funding_inputs_prev_outputs: Vec<&TxOut> = Vec::with_capacity(funding_inputs.len());
17161717
// Check that vouts exist for each TxIn in provided transactions.
1717-
for (idx, input) in funding_inputs.iter().enumerate() {
1718-
if let Some(output) = input.1.as_transaction().output.get(input.0.previous_output.vout as usize) {
1719-
funding_inputs_prev_outputs.push(output.clone());
1718+
for (idx, (txin, tx)) in funding_inputs.iter().enumerate() {
1719+
if let Some(output) = tx.as_transaction().output.get(txin.previous_output.vout as usize) {
1720+
funding_inputs_prev_outputs.push(output);
17201721
} else {
17211722
return Err(APIError::APIMisuseError {
17221723
err: format!("Transaction with txid {} does not have an output with vout of {} corresponding to TxIn at funding_inputs[{}]",
1723-
input.1.as_transaction().compute_txid(), input.0.previous_output.vout, idx) });
1724+
tx.as_transaction().compute_txid(), txin.previous_output.vout, idx) });
17241725
}
17251726
}
17261727

17271728
let total_input_satoshis: u64 = funding_inputs.iter().map(
1728-
|input| input.1.as_transaction().output.get(input.0.previous_output.vout as usize).map(|out| out.value.to_sat()).unwrap_or(0)
1729+
|(txin, tx)| tx.as_transaction().output.get(txin.previous_output.vout as usize).map(|out| out.value.to_sat()).unwrap_or(0)
17291730
).sum();
17301731
if total_input_satoshis < self.dual_funding_context().our_funding_satoshis {
17311732
return Err(APIError::APIMisuseError {
@@ -1767,18 +1768,24 @@ pub(super) trait InteractivelyFunded<SP: Deref> where SP::Target: SignerProvider
17671768
|err| APIError::APIMisuseError {
17681769
err: format!("Failed to get change script as new destination script, {:?}", err),
17691770
})?;
1770-
add_funding_change_output(change_value, change_script,
1771-
&mut funding_outputs, self.dual_funding_context().funding_feerate_sat_per_1000_weight);
1771+
let mut change_output = TxOut {
1772+
value: Amount::from_sat(change_value),
1773+
script_pubkey: change_script,
1774+
};
1775+
let change_output_weight = get_output_weight(&change_output.script_pubkey).to_wu();
1776+
let change_output_fee = fee_for_weight(self.dual_funding_context().funding_feerate_sat_per_1000_weight, change_output_weight);
1777+
change_output.value = Amount::from_sat(change_value.saturating_sub(change_output_fee));
1778+
funding_outputs.push(OutputOwned::Single(change_output));
17721779
}
17731780

17741781
let constructor_args = InteractiveTxConstructorArgs {
17751782
entropy_source,
17761783
holder_node_id,
17771784
counterparty_node_id: self.context().counterparty_node_id,
17781785
channel_id: self.context().channel_id(),
1779-
feerate_sat_per_kw: self.dual_funding_context_mut().funding_feerate_sat_per_1000_weight,
1786+
feerate_sat_per_kw: self.dual_funding_context().funding_feerate_sat_per_1000_weight,
17801787
is_initiator: self.is_initiator(),
1781-
funding_tx_locktime: self.dual_funding_context_mut().funding_tx_locktime,
1788+
funding_tx_locktime: self.dual_funding_context().funding_tx_locktime,
17821789
inputs_to_contribute: funding_inputs,
17831790
outputs_to_contribute: funding_outputs,
17841791
expected_remote_shared_funding_output,
@@ -1787,7 +1794,7 @@ pub(super) trait InteractivelyFunded<SP: Deref> where SP::Target: SignerProvider
17871794
.map_err(|_| APIError::APIMisuseError { err: "Incorrect shared output provided".into() })?;
17881795
let msg = tx_constructor.take_initiator_first_message();
17891796

1790-
self.interactive_tx_constructor_mut().replace(tx_constructor);
1797+
*self.interactive_tx_constructor_mut() = Some(tx_constructor);
17911798

17921799
Ok(msg)
17931800
}
@@ -4267,21 +4274,6 @@ fn get_v2_channel_reserve_satoshis(channel_value_satoshis: u64, dust_limit_satos
42674274
cmp::min(channel_value_satoshis, cmp::max(q, dust_limit_satoshis))
42684275
}
42694276

4270-
#[allow(dead_code)] // TODO(dual_funding): Remove once begin_interactive_funding_tx_construction() is used
4271-
fn add_funding_change_output(
4272-
change_value: u64, change_script: ScriptBuf,
4273-
funding_outputs: &mut Vec<OutputOwned>, funding_feerate_sat_per_1000_weight: u32,
4274-
) {
4275-
let mut change_output = TxOut {
4276-
value: Amount::from_sat(change_value),
4277-
script_pubkey: change_script,
4278-
};
4279-
let change_output_weight = get_output_weight(&change_output.script_pubkey).to_wu();
4280-
let change_output_fee = fee_for_weight(funding_feerate_sat_per_1000_weight, change_output_weight);
4281-
change_output.value = Amount::from_sat(change_value.saturating_sub(change_output_fee));
4282-
funding_outputs.push(OutputOwned::Single(change_output.clone()));
4283-
}
4284-
42854277
pub(super) fn calculate_our_funding_satoshis(
42864278
is_initiator: bool, funding_inputs: &[(TxIn, TransactionU16LenLimited)],
42874279
total_witness_weight: Weight, funding_feerate_sat_per_1000_weight: u32,
@@ -4341,8 +4333,10 @@ pub(super) struct DualFundingChannelContext {
43414333
/// Note that the `our_funding_satoshis` field is equal to the total value of `our_funding_inputs`
43424334
/// minus any fees paid for our contributed weight. This means that change will never be generated
43434335
/// and the maximum value possible will go towards funding the channel.
4336+
///
4337+
/// Note that this field may be emptied once the interactive negotiation has been started.
43444338
#[allow(dead_code)] // TODO(dual_funding): Remove once contribution to V2 channels is enabled.
4345-
pub our_funding_inputs: Option<Vec<(TxIn, TransactionU16LenLimited)>>,
4339+
pub our_funding_inputs: Vec<(TxIn, TransactionU16LenLimited)>,
43464340
}
43474341

43484342
// Holder designates channel data owned for the benefit of the user client.
@@ -9018,7 +9012,7 @@ impl<SP: Deref> OutboundV2Channel<SP> where SP::Target: SignerProvider {
90189012
their_funding_satoshis: None,
90199013
funding_tx_locktime,
90209014
funding_feerate_sat_per_1000_weight,
9021-
our_funding_inputs: Some(funding_inputs),
9015+
our_funding_inputs: funding_inputs,
90229016
},
90239017
interactive_tx_constructor: None,
90249018
};
@@ -9187,7 +9181,7 @@ impl<SP: Deref> InboundV2Channel<SP> where SP::Target: SignerProvider {
91879181
their_funding_satoshis: Some(msg.common_fields.funding_satoshis),
91889182
funding_tx_locktime: LockTime::from_consensus(msg.locktime),
91899183
funding_feerate_sat_per_1000_weight: msg.funding_feerate_sat_per_1000_weight,
9190-
our_funding_inputs: Some(funding_inputs.clone()),
9184+
our_funding_inputs: funding_inputs.clone(),
91919185
};
91929186

91939187
let interactive_tx_constructor = Some(InteractiveTxConstructor::new(

‎lightning/src/ln/interactivetxs.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,7 +1669,7 @@ impl InteractiveTxConstructor {
16691669
/// or None if a change is not needed/possible.
16701670
#[allow(dead_code)] // TODO(dual_funding): Remove once begin_interactive_funding_tx_construction() is used
16711671
pub(super) fn calculate_change_output_value(
1672-
is_initiator: bool, our_contribution: u64, funding_inputs_prev_outputs: &Vec<TxOut>,
1672+
is_initiator: bool, our_contribution: u64, funding_inputs_prev_outputs: &Vec<&TxOut>,
16731673
funding_outputs: &Vec<OutputOwned>, funding_feerate_sat_per_1000_weight: u32,
16741674
holder_dust_limit_satoshis: u64,
16751675
) -> Option<u64> {
@@ -2640,10 +2640,11 @@ mod tests {
26402640

26412641
#[test]
26422642
fn test_calculate_change_output_value_open() {
2643-
let input_prevouts = vec![
2643+
let input_prevouts_owned = vec![
26442644
TxOut { value: Amount::from_sat(70_000), script_pubkey: ScriptBuf::new() },
26452645
TxOut { value: Amount::from_sat(60_000), script_pubkey: ScriptBuf::new() },
26462646
];
2647+
let input_prevouts: Vec<&TxOut> = input_prevouts_owned.iter().collect();
26472648
let our_contributed = 110_000;
26482649
let txout = TxOut { value: Amount::from_sat(128_000), script_pubkey: ScriptBuf::new() };
26492650
let outputs = vec![OutputOwned::SharedControlFullyOwned(txout)];
@@ -2729,10 +2730,11 @@ mod tests {
27292730

27302731
#[test]
27312732
fn test_calculate_change_output_value_splice() {
2732-
let input_prevouts = vec![
2733+
let input_prevouts_owned = vec![
27332734
TxOut { value: Amount::from_sat(70_000), script_pubkey: ScriptBuf::new() },
27342735
TxOut { value: Amount::from_sat(60_000), script_pubkey: ScriptBuf::new() },
27352736
];
2737+
let input_prevouts: Vec<&TxOut> = input_prevouts_owned.iter().collect();
27362738
let our_contributed = 110_000;
27372739
let txout = TxOut { value: Amount::from_sat(148_000), script_pubkey: ScriptBuf::new() };
27382740
let outputs = vec![OutputOwned::Shared(SharedOwnedOutput::new(txout, our_contributed))];

0 commit comments

Comments
 (0)