aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-26 10:24:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

daemon: link HTLCs together.

Browse Source 
Most HTLCs we offer are triggered by an incoming HTLC from a different
peer.  Save this "source" htlc, so we can fail/fulfill it when we
fail/fulfill this one.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-06-30 09:08:11 +09:30
parent cc4fc4b668
commit 37b269f53e
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/packets.c
View File

@@ -643,7 +643,7 @@ Pkt *accept_pkt_htlc_add(struct peer *peer, const Pkt *pkt)
htlc = peer_new_htlc(peer, u->id, u->amount_msat, &rhash,
abs_locktime_to_blocks(&expiry),
u->route->info.data, u->route->info.len,
THEIRS);
NULL, THEIRS);
/* BOLT #2:
*

7
daemon/peer.c
View File

@@ -558,6 +558,7 @@ static bool command_htlc_fulfill(struct peer *peer,
static bool command_htlc_add(struct peer *peer, u64 msatoshis,
unsigned int expiry,
const struct sha256 *rhash,
struct htlc *src,
const u8 *route)
{
struct channel_state *cstate;
@@ -601,7 +602,7 @@ static bool command_htlc_add(struct peer *peer, u64 msatoshis,
htlc = peer_new_htlc(peer, peer->htlc_id_counter,
msatoshis, rhash, expiry, route, tal_count(route),
OURS);
src, OURS);
/* FIXME: BOLT is not correct here: we should say IFF we cannot
* afford it in remote at its own current proposed fee-rate. */
@@ -880,6 +881,7 @@ struct htlc *peer_new_htlc(struct peer *peer,
u32 expiry,
const u8 *route,
size_t routelen,
struct htlc *src,
enum channel_side side)
{
struct htlc *h = tal(peer, struct htlc);
@@ -890,6 +892,7 @@ struct htlc *peer_new_htlc(struct peer *peer,
if (!blocks_to_abs_locktime(expiry, &h->expiry))
fatal("Invalid HTLC expiry %u", expiry);
h->routing = tal_dup_arr(h, u8, route, routelen, 0);
h->src = src;
if (side == OURS)
htlc_map_add(&peer->local.htlcs, h);
else {
@@ -2667,7 +2670,7 @@ static void json_newhtlc(struct command *cmd,
return;
}
if (!command_htlc_add(peer, msatoshis, expiry, &rhash,
if (!command_htlc_add(peer, msatoshis, expiry, &rhash, NULL,
dummy_single_route(cmd, peer, msatoshis))) {
command_fail(cmd, "could not add htlc");
return;

1
daemon/peer.h
View File

@@ -252,6 +252,7 @@ struct htlc *peer_new_htlc(struct peer *peer,
u32 expiry,
const u8 *route,
size_t route_len,
struct htlc *src,
enum channel_side side);
/* Peer has recieved revocation. */