Skip to content

Commit e91e49b

Browse files
committed
Use channel parameters in sign_counterparty_payment_input
Now that channel_value_satoshis has been moved to ChannelTransactionParameters, InMemorySigner no longer needs a copy. Remove uses of the copy from sign_counterparty_payment_input.
1 parent 268f8ce commit e91e49b

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

lightning/src/sign/mod.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,13 +1206,12 @@ impl InMemorySigner {
12061206
return Err(());
12071207
}
12081208

1209-
let remotepubkey = bitcoin::PublicKey::new(self.pubkeys().payment_point);
1210-
// We cannot always assume that `channel_parameters` is set, so can't just call
1211-
// `self.channel_parameters()` or anything that relies on it
1212-
let supports_anchors_zero_fee_htlc_tx = self
1213-
.channel_type_features()
1214-
.map(|features| features.supports_anchors_zero_fee_htlc_tx())
1215-
.unwrap_or(false);
1209+
// TODO: Is this ok?
1210+
let channel_parameters =
1211+
descriptor.channel_transaction_parameters.as_ref().expect(MISSING_PARAMS_ERR);
1212+
let remotepubkey = bitcoin::PublicKey::new(channel_parameters.holder_pubkeys.payment_point);
1213+
let supports_anchors_zero_fee_htlc_tx =
1214+
channel_parameters.channel_type_features.supports_anchors_zero_fee_htlc_tx();
12161215

12171216
let witness_script = if supports_anchors_zero_fee_htlc_tx {
12181217
chan_utils::get_to_countersignatory_with_anchors_redeemscript(&remotepubkey.inner)

0 commit comments

Comments
 (0)