aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-06 15:44:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

liquidity-ad: wire in csv updates to commitment txs

Browse Source
This commit is contained in:
niftynei
2021-06-22 16:49:04 -05:00
committed by neil saitug
parent 67b8a22aa7
commit 2532aa003a
5 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
channeld/commit_tx.c
View File

@@ -90,6 +90,8 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
const struct pubkey *remote_funding_key,
enum side opener,
u16 to_self_delay,
u32 lease_expiry,
u32 blockheight,
const struct keyset *keyset,
u32 feerate_per_kw,
struct amount_sat dust_limit,
@@ -234,9 +236,16 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
* output](#to_local-output).
*/
if (amount_msat_greater_eq_sat(self_pay, dust_limit)) {
/* BOLT- #3:
* In a leased channel, the `to_local` output that
* pays the `accepter` node is modified so that its
* CSV is equal to the greater of the
* `to_self_delay` or the `lease_end` - `blockheight`.
*/
u8 *wscript = to_self_wscript(tmpctx,
to_self_delay,
1, /* FIXME: csv_lock */
lease_expiry > blockheight ?
lease_expiry - blockheight : 0,
keyset);
u8 *p2wsh = scriptpubkey_p2wsh(tx, wscript);
struct amount_sat amount = amount_msat_to_sat_round_down(self_pay);
@@ -278,9 +287,22 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
* Otherwise, this output is a simple P2WPKH to `remotepubkey`.
*/
if (option_anchor_outputs) {
/* FIXME: use csv_lock */
/* BOLT- #3:
* ##### Leased channel (`option_will_fund`)
*
* If a `lease` applies to the channel, the
* `to_remote` output of the `initiator`
* ensures the `leasor` funds are not
* spendable until the lease expires.
*
* <remote_pubkey> OP_CHECKSIGVERIFY
* MAX(1, lease_end - blockheight)
* OP_CHECKSEQUENCEVERIFY
*/
u32 csv_lock = lease_expiry > blockheight ?
lease_expiry - blockheight : 1;
scriptpubkey = scriptpubkey_p2wsh(tmpctx,
anchor_to_remote_redeem(tmpctx, &keyset->other_payment_key, 1));
anchor_to_remote_redeem(tmpctx, &keyset->other_payment_key, csv_lock));
} else {
scriptpubkey = scriptpubkey_p2wpkh(tmpctx,
&keyset->other_payment_key);