Commit graph

30 commits

Author SHA1 Message Date
Matt Corallo
0b5b2828f9
Merge pull request #447 from ariard/2020-01-fix-weight-computation
Bound incoming HTLC witnessScript to min/max limits
2020-01-17 22:32:29 +00:00
Antoine Riard
fbc7885a97 Bound incoming HTLC witnessScript to min/max limits
Fix a crash where previously we weren't able to detect any accepted
HTLC if its witness-encoded cltv expiry was different from expected
ACCEPTED_HTLC_SCRIPT_WEIGHT. This should work for any cltv expiry
included between 0 and 16777216 on mainnet, testnet and regtest.
2020-01-17 16:39:31 -05:00
Antoine Riard
5aa95baa8d Log block disconnection in ChannelMonitor 2020-01-17 14:20:23 -05:00
Matt Corallo
e2e1628680 Sign local HTLC transactions at broadcast-time, instead of generate 2019-12-24 12:14:20 -05:00
Matt Corallo
eb97a7534d Make ChannelMonitor sign local transactions (at broadcast time) 2019-12-24 12:14:20 -05:00
Matt Corallo
200e8983ad Set basic channel info in chanmon all at once, add a bit more info 2019-12-24 12:14:09 -05:00
Matt Corallo
33810eddb5 Drop duplicative current-local-tx storage in channel.
We now have current-local-tx broadcast ability in channel monitors
directly (for ChannelManager deserialization), so we can just use
that instead of always having the Channel store signed ready-to-go
copies of the latest local commitment transaction.

This is further kinda nice since ChannelMonitor is live and can, eg
broadcast HTLC-Success transactions immediately as they will be
generated at broadcast time instead of in advance.

Finally, this lets us clean up a tiny bit in Channel.
2019-12-24 12:14:09 -05:00
Matt Corallo
4275b7744a Avoid cloning RBF state when we just want to modify fields. 2019-12-10 19:35:43 -05:00
Antoine Riard
85c03c1139 Add test_bump_txn_sanitize_tracking_maps
Extend test visibility of claim-tracking maps to do so.

Cover both "If 2 claimable-outpoint-spending txn are in 1 block,
clean up properly" and "Clean up claimable_outpoints when
pending_claim_requests is cleaned" fix commits in same patchset.
2019-12-10 19:35:43 -05:00
Antoine Riard
0150b1f6f6 Sanitize pending_claim_requests if no more outpoints to claim 2019-12-10 19:35:42 -05:00
Matt Corallo
6a775ea1e9 Dont RBF a tx twice if it hits RBF timer when one input is spent 2019-12-10 17:42:58 -05:00
Matt Corallo
ae042ebedb Clean up claimable_outpoints when pending_claim_requests is cleaned
When claimable_outpoints was introduced in "Move
our_claim_txn_waiting_first_conf to pending_claim_requests", removal
of elements from it (which are just pointers into
pending_claim_requests) was never added.
2019-12-10 17:42:58 -05:00
Matt Corallo
475719d01c If 2 claimable-outpoint-spending txn are in 1 block, clean up properly
This resolves an issue where we will never track 2 on-chain events
which are waiting for ANTI_REORG_DELAY at the same height.

This partially reverts and fixes "Move our_claim_txn_waiting_first_conf
to pending_claim_requests".
2019-12-10 17:42:58 -05:00
Antoine Riard
9eb87802c5 Log block tick in ChannelMonitor 2019-12-10 17:42:58 -05:00
Matt Corallo
2c8bc3c64e Correct input comparison for input-subset RBF bump creation
This resolves a regression introduced in "Implement bumping engine in
ChannelMonitor::block_connected" in which not all inputs are checked.
Several opportunities to clarify and clean up comments are also taken.

Fix test_bump_penalty_txn_on_revoked_htlcs as now remote claim txn
build the same way than us are going to be register as cleaning
pending_claim_request after ANTI_REORG_DELAY. It means during this
delay we are going to generate invalid bumped claiming txn on
already claimed outpoints. Previously these txn weren't issued
because all their outpoints would have been removed.

Fix full_stack_target by adding more input for FuzzEstimator
2019-12-10 17:42:40 -05:00
Matt Corallo
7be903ba00 Dont forget RBF previous-feerate info if tx size changed.
While our fee may change wildly (or even go down), the previous
fee *rate* is still valid, and we should use that as the basis for
our RBF.
2019-12-10 15:50:56 -05:00
Antoine Riard
d421816e84 Add test_set_outpoints_partial_claiming 2019-12-10 15:50:56 -05:00
Antoine Riard
feb472dc9e Track and react to remote partial-claiming of pending claim request
A pending claim request may contain a set of multiple outpoints.
If one or multiple of them get claimed by remote party, our in-flight
claiming transactions aren't valid anymore so we need to react
quickly and regenerate claiming transaction with accurate set.

However, a claimed outpoint may be disconnected and we need to resurrect
back outpoint among set of orignal pending claim request.

To guarantee consistency of contentious claimed outpoint we cache it
as OnchainEvent::ContentionsOutpoint and only delete it after
ANTI_REORG_DELAY.

Fix test broken by change, partial claiming on revoked txn
force us to regenerate txn
2019-12-10 15:50:56 -05:00
Antoine Riard
6eb290d780 Add RBF-bumping of preimage/timeout txn on remote HTLC outputs
Given they are only signed by us we can RBF at wish

Fix tests broken by introduction of more txn broadcast
(channel_monitor_network_test)

Add locktime in RemoteHTLC as it's needed to generate
timeout txn.
2019-12-10 15:50:51 -05:00
Antoine Riard
116b1eb028 Implement bumping engine in ChannelMonitor::block_connected
Add RBF-bumping of justice txn, given they are only signed by us we
can RBF at wish.

Aggregation of bump-candidates and more aggresive bumping heuristics
are left open

Fix tests broken by introduction of more txn broadcast.
Some tests may have a relaxed check (claim_htlc_ouputs_single_tx)
as broadcast bumped txn are now interwining in previous broadcast ones
and breaking simple expectations

Use bumping engine to rebuild claiming transaction in case of partial-
claim of its outpoints set.
2019-12-09 22:22:54 -05:00
Antoine Riard
6a7c471369 Remove superflous pending_claims
As local onchain txn are already monitored in block_connected by
check_spend_local_transaction, it's useless to generate twice
pending claims for HTLC outputs on local commitment tx.

We could do the alternative.
2019-12-09 22:22:52 -05:00
Antoine Riard
0011713d2c Move our_claim_txn_waiting_first_conf to pending_claim_requests
Add claimable_outpoints maps.

Both structures are tied and should ensure their mutual consistency.

Pending_claim_requests is cached by original claim txid. Medatada
and per input material should be constant between bumped transactions,
only change should be partial-claiming of outpoints set and block
reorgs.

Due to RBF rules, if an input has been part of an aggregate tx
at first claim try, if we want the bumped tx to land nicely
in the mempool, inputs should be distributed in multiple
bumped tx but still be aggregate in a new bumped tx.
2019-12-09 22:22:35 -05:00
Antoine Riard
09ca1e93a4 Add log_trace on bump candidates tracking-buffer insertions 2019-12-09 22:19:44 -05:00
Matt Corallo
be7d3d17ac
Merge pull request #401 from ariard/2019-11-log-tx-broadcast
Add log for every tx broadcast
2019-11-25 22:39:48 +00:00
Antoine Riard
9df0250dbb Add log for every tx broadcast
Added macro log_tx in macro_logger.rs
2019-11-25 16:55:14 -05:00
Valentine Wallace
f71518365f
chaininterface+multi: add filter_block and reentered to ChainWatchInterface
Because filter_block takes a  and returns a list of s , we must add a lifetime to the ChainWatchInterface, which bubbles up in a lot of places. These places include adding a lifetime  to the Node struct, which causes a lot of rearranging tests so that variables don't go out of scope before the Node that owns them does.
2019-11-21 20:35:53 -05:00
Valentine Wallace
969f863013
chaininterface: add BlockNotifier struct
Adding this struct will allow us to remove the circular reference
between ChainListeners and the ChainWatchInterface, because it
separates out the responsibility of notifying listeners about new
blocks from the responsibility of storing and retrieving watched
transactions.
2019-11-21 20:34:00 -05:00
Valentine Wallace
1ec0c14fce
multi: remove listeners field and method from ChainWatchInterface
This includes the purpose of this PR, which is to remove the circular reference created by ChainListeners self-adding themselves to their ChainWatchInterface's `listeners` field.
2019-11-21 18:06:35 -05:00
RJ Rybarczyk
5305223495 Merge branch 'master' of github.com:rust-bitcoin/rust-lightning into use-workspaces 2019-11-18 19:44:55 +00:00
RJ Rybarczyk
88fef649b1 Use workspaces to separate crates 2019-11-15 02:44:30 +00:00
Renamed from src/ln/channelmonitor.rs (Browse further)