@@ -1702,20 +1702,20 @@ pub(super) trait InteractivelyFunded<SP: Deref> where SP::Target: SignerProvider
1702
1702
funding_inputs.push(prev_funding_input);
1703
1703
}
1704
1704
1705
- let mut funding_inputs_prev_outputs: Vec<TxOut> = Vec::with_capacity(funding_inputs.len());
1705
+ let mut funding_inputs_prev_outputs: Vec<& TxOut> = Vec::with_capacity(funding_inputs.len());
1706
1706
// Check that vouts exist for each TxIn in provided transactions.
1707
- for (idx, input ) in funding_inputs.iter().enumerate() {
1708
- if let Some(output) = input.1. as_transaction().output.get(input.0 .previous_output.vout as usize) {
1709
- funding_inputs_prev_outputs.push(output.clone() );
1707
+ for (idx, (txin, tx) ) in funding_inputs.iter().enumerate() {
1708
+ if let Some(output) = tx. as_transaction().output.get(txin .previous_output.vout as usize) {
1709
+ funding_inputs_prev_outputs.push(output);
1710
1710
} else {
1711
1711
return Err(APIError::APIMisuseError {
1712
1712
err: format!("Transaction with txid {} does not have an output with vout of {} corresponding to TxIn at funding_inputs[{}]",
1713
- input.1. as_transaction().compute_txid(), input.0 .previous_output.vout, idx) });
1713
+ tx. as_transaction().compute_txid(), txin .previous_output.vout, idx) });
1714
1714
}
1715
1715
}
1716
1716
1717
1717
let total_input_satoshis: u64 = funding_inputs.iter().map(
1718
- |input| input.1. as_transaction().output.get(input.0 .previous_output.vout as usize).map(|out| out.value.to_sat()).unwrap_or(0)
1718
+ |(txin, tx)| tx. as_transaction().output.get(txin .previous_output.vout as usize).map(|out| out.value.to_sat()).unwrap_or(0)
1719
1719
).sum();
1720
1720
if total_input_satoshis < self.dual_funding_context().our_funding_satoshis {
1721
1721
return Err(APIError::APIMisuseError {
@@ -1757,18 +1757,24 @@ pub(super) trait InteractivelyFunded<SP: Deref> where SP::Target: SignerProvider
1757
1757
|err| APIError::APIMisuseError {
1758
1758
err: format!("Failed to get change script as new destination script, {:?}", err),
1759
1759
})?;
1760
- add_funding_change_output(change_value, change_script,
1761
- &mut funding_outputs, self.dual_funding_context().funding_feerate_sat_per_1000_weight);
1760
+ let mut change_output = TxOut {
1761
+ value: Amount::from_sat(change_value),
1762
+ script_pubkey: change_script,
1763
+ };
1764
+ let change_output_weight = get_output_weight(&change_output.script_pubkey).to_wu();
1765
+ let change_output_fee = fee_for_weight(self.dual_funding_context().funding_feerate_sat_per_1000_weight, change_output_weight);
1766
+ change_output.value = Amount::from_sat(change_value.saturating_sub(change_output_fee));
1767
+ funding_outputs.push(OutputOwned::Single(change_output));
1762
1768
}
1763
1769
1764
1770
let constructor_args = InteractiveTxConstructorArgs {
1765
1771
entropy_source,
1766
1772
holder_node_id,
1767
1773
counterparty_node_id: self.context().counterparty_node_id,
1768
1774
channel_id: self.context().channel_id(),
1769
- feerate_sat_per_kw: self.dual_funding_context_mut ().funding_feerate_sat_per_1000_weight,
1775
+ feerate_sat_per_kw: self.dual_funding_context ().funding_feerate_sat_per_1000_weight,
1770
1776
is_initiator: self.is_initiator(),
1771
- funding_tx_locktime: self.dual_funding_context_mut ().funding_tx_locktime,
1777
+ funding_tx_locktime: self.dual_funding_context ().funding_tx_locktime,
1772
1778
inputs_to_contribute: funding_inputs,
1773
1779
outputs_to_contribute: funding_outputs,
1774
1780
expected_remote_shared_funding_output,
@@ -1777,7 +1783,7 @@ pub(super) trait InteractivelyFunded<SP: Deref> where SP::Target: SignerProvider
1777
1783
.map_err(|_| APIError::APIMisuseError { err: "Incorrect shared output provided".into() })?;
1778
1784
let msg = tx_constructor.take_initiator_first_message();
1779
1785
1780
- self.interactive_tx_constructor_mut().replace (tx_constructor);
1786
+ * self.interactive_tx_constructor_mut() = Some (tx_constructor);
1781
1787
1782
1788
Ok(msg)
1783
1789
}
@@ -4264,21 +4270,6 @@ fn get_v2_channel_reserve_satoshis(channel_value_satoshis: u64, dust_limit_satos
4264
4270
cmp::min(channel_value_satoshis, cmp::max(q, dust_limit_satoshis))
4265
4271
}
4266
4272
4267
- #[allow(dead_code)] // TODO(dual_funding): Remove once begin_interactive_funding_tx_construction() is used
4268
- fn add_funding_change_output(
4269
- change_value: u64, change_script: ScriptBuf,
4270
- funding_outputs: &mut Vec<OutputOwned>, funding_feerate_sat_per_1000_weight: u32,
4271
- ) {
4272
- let mut change_output = TxOut {
4273
- value: Amount::from_sat(change_value),
4274
- script_pubkey: change_script,
4275
- };
4276
- let change_output_weight = get_output_weight(&change_output.script_pubkey).to_wu();
4277
- let change_output_fee = fee_for_weight(funding_feerate_sat_per_1000_weight, change_output_weight);
4278
- change_output.value = Amount::from_sat(change_value.saturating_sub(change_output_fee));
4279
- funding_outputs.push(OutputOwned::Single(change_output.clone()));
4280
- }
4281
-
4282
4273
pub(super) fn calculate_our_funding_satoshis(
4283
4274
is_initiator: bool, funding_inputs: &[(TxIn, TransactionU16LenLimited)],
4284
4275
total_witness_weight: Weight, funding_feerate_sat_per_1000_weight: u32,
0 commit comments