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

onchaind: speed up HTLC matching by skipping identical CLTVs.

Browse Source 
We try signatures to see which HTLC (we can have many) is the right one;
we can trivially match htlcs against commitment tx outputs, but the CTLV
can vary, and that's inside the htlc tx itself.

By sorting them, it's easy to skip comparing duplicates:

Time before: 2m32.547s
Time after: 1m6.984s

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2020-12-03 11:52:01 +10:30
committed by Christian Decker
parent e9e6f72d7c
commit 5bc61e77cb
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
onchaind/onchaind.c
View File

@@ -1,6 +1,7 @@
#include <bitcoin/feerate.h> #include <bitcoin/feerate.h>
#include <bitcoin/psbt.h> #include <bitcoin/psbt.h>
#include <bitcoin/script.h> #include <bitcoin/script.h>
#include <ccan/asort/asort.h>
#include <ccan/crypto/shachain/shachain.h> #include <ccan/crypto/shachain/shachain.h>
#include <ccan/mem/mem.h> #include <ccan/mem/mem.h>
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
@@ -2263,6 +2264,12 @@ static size_t resolve_our_htlc_ourcommit(struct tracked_output *out,
/* These htlcs are all possibilities, but signature will only match /* These htlcs are all possibilities, but signature will only match
* one with the correct cltv: check which that is. */ * one with the correct cltv: check which that is. */
for (i = 0; i < tal_count(matches); i++) { for (i = 0; i < tal_count(matches); i++) {
/* Skip over duplicate HTLCs, since we only need one. */
if (i > 0
&& (htlcs[matches[i]].cltv_expiry
== htlcs[matches[i-1]].cltv_expiry))
continue;
/* BOLT #5: /* BOLT #5:
* *
* ## HTLC Output Handling: Local Commitment, Local Offers * ## HTLC Output Handling: Local Commitment, Local Offers
@@ -3640,6 +3647,16 @@ search_done:
wait_for_resolved(outs); wait_for_resolved(outs);
} }
static int cmp_htlc_cltv(const struct htlc_stub *a,
const struct htlc_stub *b, void *unused)
{
if (a->cltv_expiry < b->cltv_expiry)
return -1;
else if (a->cltv_expiry > b->cltv_expiry)
return 1;
return 0;
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
setup_locale(); setup_locale();
@@ -3731,6 +3748,9 @@ int main(int argc, char *argv[])
master_badmsg(WIRE_ONCHAIND_HTLC, msg); master_badmsg(WIRE_ONCHAIND_HTLC, msg);
} }
/* Sort by CLTV, so matches are in CLTV order (and easy to skip dups) */
asort(htlcs, tal_count(htlcs), cmp_htlc_cltv, NULL);
outs = tal_arr(ctx, struct tracked_output *, 0); outs = tal_arr(ctx, struct tracked_output *, 0);
wally_tx_input_get_txid(tx->inputs[0], &tmptxid); wally_tx_input_get_txid(tx->inputs[0], &tmptxid);
new_tracked_output(&outs, &tmptxid, new_tracked_output(&outs, &tmptxid,