mirror of
https://github.com/aljazceru/lightning.git
synced 2025-12-19 07:04:22 +01:00
Makefile: update bolt version to include option_anchors_zero_fee_htlc_tx.
This touches a lot of text, mainly to change "if `option_anchor_outputs`" to "if `option_anchors`" Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
@@ -231,7 +231,8 @@ void peer_start_closingd(struct channel *channel,
|
||||
return;
|
||||
}
|
||||
|
||||
/* BOLT #2:
|
||||
/* FIXME: This is the old BOLT 2 text, which restricted the closing
|
||||
* fee to cap at the final commitment fee. We still do this for now.
|
||||
*
|
||||
* The sending node:
|
||||
* - MUST set `fee_satoshis` less than or equal to the base
|
||||
|
||||
@@ -147,12 +147,14 @@ wallet_commit_channel(struct lightningd *ld,
|
||||
* #### Requirements
|
||||
*
|
||||
* Both peers:
|
||||
* - if `option_static_remotekey` or `option_anchor_outputs` was negotiated:
|
||||
* - `option_static_remotekey` or `option_anchor_outputs` applies to all commitment
|
||||
* transactions
|
||||
* - if `option_static_remotekey`, `option_anchor_outputs` or
|
||||
* `option_anchors_zero_fee_htlc_tx` was negotiated:
|
||||
* - `option_static_remotekey`, `option_anchor_outputs` or
|
||||
* `option_anchors_zero_fee_htlc_tx` applies to all commitment transactions
|
||||
* - otherwise:
|
||||
* - `option_static_remotekey` or `option_anchor_outputs` does not apply to any commitment
|
||||
* transactions
|
||||
* - `option_static_remotekey`, `option_anchor_outputs` or
|
||||
* `option_anchors_zero_fee_htlc_tx` does not apply to any commitment
|
||||
* transactions
|
||||
*/
|
||||
/* i.e. We set it now for the channel permanently. */
|
||||
if (feature_negotiated(ld->our_features,
|
||||
|
||||
@@ -612,7 +612,7 @@ static struct amount_sat commit_txfee(const struct channel *channel,
|
||||
|
||||
if (channel->option_anchor_outputs) {
|
||||
/* BOLT #3:
|
||||
* If `option_anchor_outputs` applies to the commitment
|
||||
* If `option_anchors` applies to the commitment
|
||||
* transaction, also subtract two times the fixed anchor size
|
||||
* of 330 sats from the funder (either `to_local` or
|
||||
* `to_remote`).
|
||||
|
||||
Reference in New Issue
Block a user