mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 06:41:44 +01:00
Code Issues Projects Releases Wiki Activity

BOLT update to fae35903ae600d61124a3920363094b02d2ae8e5

Browse source 
This details handling of onchain HTLCs, and we document how we
implement it.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2017-09-27 06:32:47 +09:30
parent 1ac9e0b532
commit 4ce9f73e00
2 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lightningd/peer_control.c
View file

@ -1115,6 +1115,19 @@ static void onchaind_tell_fulfill(struct peer *peer)
if (hin->key.peer != peer)
continue;
/* BOLT #5:
*
* If the node receives (or already knows) a payment preimage
* for an unresolved HTLC output it was offered for which it
* has committed to an outgoing HTLC, it MUST *resolve* the
* output by spending it. Otherwise, if the other node is not
* irrevocably committed to the HTLC, it MUST NOT *resolve*
* the output by spending it.
*/
/* We only set preimage once it's irrevocably committed, and
* we spend even if we don't have an outgoing HTLC (eg. local
* payyment complete) */
if (!hin->preimage)
continue;

36
onchaind/onchain.c
View file

@ -774,9 +774,12 @@ static void tx_new_depth(struct tracked_output **outs,
/* BOLT #5:
*
* If the node receives (or already knows) a payment preimage for an
* unresolved HTLC output it was offered, it MUST *resolve* the output by
* spending it.
* unresolved HTLC output it was offered for which it has committed to an
* outgoing HTLC, it MUST *resolve* the output by spending it. Otherwise, if
* the other node is not irrevocably committed to the HTLC, it MUST NOT
* *resolve* the output by spending it.
*/
/* Master makes sure we only get told preimages once other node is committed. */
static void handle_preimage(struct tracked_output **outs,
const struct preimage *preimage)
{
@ -812,11 +815,11 @@ static void handle_preimage(struct tracked_output **outs,
/* BOLT #5:
*
* If the transaction is the nodes' own commitment
* transaction, then the it MUST use the HTLC-success
* transaction, and the HTLC-success transaction output MUST
* be *resolved* as described in "On-chain HTLC Transaction
* Handling".
* To spend an offered HTLC output: if the transaction is the
* nodes' own commitment transaction, then it MUST use the
* HTLC-success transaction, and the HTLC-success transaction
* output MUST be *resolved* as described in "On-chain HTLC
* Transaction Handling"
*/
if (outs[i]->remote_htlc_sig) {
tx = htlc_success_tx(outs[i], &outs[i]->txid,
@ -839,8 +842,8 @@ static void handle_preimage(struct tracked_output **outs,
} else {
/* BOLT #5:
*
* Otherwise, it MUST *resolve* the output by spending
* it to a convenient address.
* otherwise, it MUST spend the output to a convenient
* address.
*/
tx = tx_to_us(outs[i], outs[i], 0, 0,
preimage, sizeof(*preimage),
@ -1015,18 +1018,9 @@ static void resolve_their_htlc(struct tracked_output *out)
*
*...
* ## Requirements
*
*
* If the node receives (or already knows) a payment preimage for an
* unresolved HTLC output it was offered, it MUST *resolve* the output
* by spending it. If the transaction is the nodes' own commitment
* transaction, then the it MUST use the HTLC-success transaction, and
* the HTLC-success transaction output MUST be *resolved* as described
* in "On-chain HTLC Transaction Handling". Otherwise, it MUST
* *resolve* the output by spending it to a convenient address.
*
* Otherwise, if the HTLC output has expired, it is considered
* *irrevocably resolved*.
*...
* If not otherwise resolved, once the HTLC output has expired, it is
* considered *irrevocably resolved*.
*/
/* If we hit timeout depth, resolve by ignoring. */
propose_resolution_at_block(out, NULL, out->htlc->cltv_expiry,