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

protocol: split message update_remove_htlc into update_timedout_htlc and update_routefail_htlc, remove update_remove_htlc_delay.

Browse Source 
For the moment, there's no way to remove an in-progress HTLC before
it's timed out.  The other side can remove it with a routefail, but
you can't push for it to be removed.

We may add that later, but by definition it's only a polited request, and
normally we should rely on timeouts.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2015-09-24 15:02:49 +09:30
parent 807ac38308
commit d00eeded9f
7 changed files with 252 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lightning.proto
View File

@@ -123,7 +123,7 @@ message update_add_htlc {
// FIXME: Routing information.
}
// We can't do this HTLC, sorry.
// We can't do this HTLC, sorry (instead of update_accept)
message update_decline_htlc {
oneof reason {
funding insufficient_funds = 1;
@@ -131,7 +131,7 @@ message update_decline_htlc {
};
}
// Complete an HTLC
// Complete your HTLC: I have the R value, pay me!
message update_complete_htlc {
// Hash for which I will supply preimage to revoke this commitment tx.
required sha256_hash revocation_hash = 1;
@@ -139,22 +139,23 @@ message update_complete_htlc {
required sha256_hash r = 3;
}
// Remove an HTLC
message update_remove_htlc {
// Remove my HTLC: it has timed out, before you got the R value.
message update_timedout_htlc {
// Hash for which I will supply preimage to revoke this commitment tx.
required sha256_hash revocation_hash = 1;
// Hash for HTLC R value.
required sha256_hash r_hash = 3;
}
// Respond to an HTLC remove request: not yet.
// Expect a remove_htlc later.
message update_remove_htlc_delay {
// Remove your HTLC: routing has failed upstream
message update_routefail_htlc {
// Hash for which I will supply preimage to revoke this commitment tx.
required sha256_hash revocation_hash = 1;
// Hash for HTLC R value.
required sha256_hash r_hash = 1;
required sha256_hash r_hash = 3;
}
// OK, I accept that update; here's your signature.
// OK, I accept that update; here's your signature.
message update_accept {
// Signature for your new commitment tx.
required signature sig = 1;
@@ -211,10 +212,10 @@ message pkt {
update_accept update_accept = 3;
update_signature update_signature = 4;
update_complete update_complete = 5;
update_complete_htlc update_complete_htlc = 6;
update_remove_htlc update_remove_htlc = 7;
update_remove_htlc_delay update_remove_htlc_delay = 8;
update_decline_htlc update_decline_htlc = 9;
update_decline_htlc update_decline_htlc = 6;
update_complete_htlc update_complete_htlc = 7;
update_timedout_htlc update_timedout_htlc = 8;
update_routefail_htlc update_routefail_htlc = 9;
// Closing
close_channel close = 401;
close_channel_complete close_complete = 402;