Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HTLC error cleanup #3472

Merged
merged 16 commits into from
Feb 25, 2020
Merged

HTLC error cleanup #3472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
36f93ce
lightningd: rename htlc_in and htlc_out failuremsg fields to failonion.
rustyrussell Feb 17, 2020
9d8bc21
lightningd: clean up weird call to send_htlc_out.
rustyrussell Feb 17, 2020
45308b8
channeld: don't get details of our own failed htlcs at init.
rustyrussell Feb 17, 2020
832a5c2
lightningd: handle fail_htlc_in with no known outgoing channel.
rustyrussell Feb 17, 2020
c9f5dc2
gossipd: provide (stripped) channel_update when resolving a channel.
rustyrussell Feb 17, 2020
6d0f6f0
channeld: get the onionreply back from lightningd for failed htlcs.
rustyrussell Feb 17, 2020
6fab127
lightningd: remove always-NULL argument to add_fail.
rustyrussell Feb 17, 2020
5b7d83f
wallet: Add new htlc column "localfailmsg" for outgoing htlcs.
rustyrussell Feb 18, 2020
8a18d9f
channeld: add routing to get our own channel's channel_update.
rustyrussell Feb 18, 2020
eb5eeb6
lightningd: store raw msg rather than code for locally-failed outgoin…
rustyrussell Feb 21, 2020
ea23f9b
lightningd: separate path for failed_htlc when an onion is bad.
rustyrussell Feb 21, 2020
82613d4
lightningd: make local htlc failures pass a wiremsg for errors, not a…
rustyrussell Feb 21, 2020
953a583
lightningd: always use an onionreply for locally generated incoming H…
rustyrussell Feb 21, 2020
8bf6393
wallet: only store BADONION codes in db for incoming htlcs: rest are …
rustyrussell Feb 21, 2020
c07e1aa
lightningd: rename htlc_in field from failcode to badonion.
rustyrussell Feb 21, 2020
4dbeac8
plugins: support failure_message in invoice and htlc_accepted hooks.
rustyrussell Feb 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions channeld/channel_wire.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ msgdata,channel_init,htlc_states,enum htlc_state,num_htlcs
msgdata,channel_init,num_fulfilled,u16,
msgdata,channel_init,fulfilled,fulfilled_htlc,num_fulfilled
msgdata,channel_init,fulfilled_sides,enum side,num_fulfilled
msgdata,channel_init,num_failed,u16,
msgdata,channel_init,failed,failed_htlc,num_failed
msgdata,channel_init,failed_sides,enum side,num_failed
msgdata,channel_init,failheight,u32,
msgdata,channel_init,num_failed_in,u16,
msgdata,channel_init,failed_in,failed_htlc,num_failed_in
msgdata,channel_init,num_failed_out,u16,
msgdata,channel_init,failed_out,u64,num_failed_out
msgdata,channel_init,local_funding_locked,bool,
msgdata,channel_init,remote_funding_locked,bool,
msgdata,channel_init,funding_short_id,short_channel_id,
Expand Down Expand Up @@ -87,8 +87,9 @@ msgdata,channel_offer_htlc,onion_routing_packet,u8,1366
# Reply; synchronous since IDs have to increment.
msgtype,channel_offer_htlc_reply,1104
msgdata,channel_offer_htlc_reply,id,u64,
# Zero failure code means success.,
msgdata,channel_offer_htlc_reply,failure_code,u16,
# Empty failure message means success.
msgdata,channel_offer_htlc_reply,len,u16,
msgdata,channel_offer_htlc_reply,failuremsg,u8,len
msgdata,channel_offer_htlc_reply,failurestr,wirestring,

# Main daemon found out the preimage for an HTLC
Expand All @@ -99,7 +100,6 @@ msgdata,channel_fulfill_htlc,fulfilled_htlc,fulfilled_htlc,
# Main daemon says HTLC failed
msgtype,channel_fail_htlc,1006
msgdata,channel_fail_htlc,failed_htlc,failed_htlc,
msgdata,channel_fail_htlc,failheight,u32,

# When we receive funding_locked.
msgtype,channel_got_funding_locked,1019
Expand Down Expand Up @@ -129,7 +129,6 @@ msgdata,channel_got_commitsig,htlc_signature,secp256k1_ecdsa_signature,num_htlcs
# RCVD_ADD_COMMIT: we're now committed to their new offered HTLCs.
msgdata,channel_got_commitsig,num_added,u16,
msgdata,channel_got_commitsig,added,added_htlc,num_added
msgdata,channel_got_commitsig,shared_secret,secret,num_added
# RCVD_REMOVE_COMMIT: we're now no longer committed to these HTLCs.
msgdata,channel_got_commitsig,num_fulfilled,u16,
msgdata,channel_got_commitsig,fulfilled,fulfilled_htlc,num_fulfilled
Expand Down
Loading