Commit graph

350 commits

Author SHA1 Message Date
Matt Corallo
6296eb1c5f Track counterparty's commitment secrets in Channel directly.
In the process of removing a local ChannelMonitor in each Channel,
we need to track our counterpartys' commitment secrets so that we
can check them locally instead of calling our channel monitor to
do that work for us.
2020-02-26 17:48:31 -05:00
Matt Corallo
27be07ba3e Swap out ChannelMonitor remote secret tracking for a struct.
In order to drop the ChannelMonitor from Channel, we need to track
remote per_commitment_secrets outside of the monitor to validate new
ones as they come in.

This just moves the current code from ChannelMonitor into a new
CounterpartyCommitmentSecrets struct in chan_utils.
2020-02-26 17:48:31 -05:00
Matt Corallo
72e32e7af6 Clarify the in-flight HTLC state-tracking structs a bit.
This also renames PendingForwardHTLCInfo to PendingHTLCInfo since
it now also encompasses Pending *Received* HTLCs.
2020-02-26 17:48:31 -05:00
Valentine Wallace
d768cc234e
multi: update ChannelManager tx broadcaster from Arc to Deref 2020-02-25 20:12:25 -05:00
Matt Corallo
a2fce3bbc0 Further clean up some comments wrt the peer socket handling API 2020-02-24 11:54:37 -05:00
Matt Corallo
2be0810e78
Merge pull request #512 from TheBlueMatt/2020-02-peer_handler-docs
Fix incorrect docs/disconnect handling in peer_handler
2020-02-21 19:02:21 +00:00
Matt Corallo
faaa4d207d Fix incorrect docs around disconnect in peer_handler + rename fns
The way PeerHandler was written, it was supposed to remove from
self.peers iff the API docs indicate that disconnect_event should
NOT be called (and otherwise rely on disconnect_event to do so).

Sadly, the implementation was way out of whack with reality - in
the implementation, essentially anywhere where PeerHandler
originated the disconnection, the peer was removed and no
disconnect_event was expected. The docs, however, indicated that
disconnect_event should nearly only be called, only not doing so
when the initial handshake message never completed.

We opt to change the docs, mostly, as well as clean up the
ping/pong handling somewhat and rename a few functions to clarify
what they actually do.
2020-02-20 20:48:13 -05:00
Matt Corallo
d296360ba7 Test basic HTLC claim behavior from monitor -> manager on reorg 2020-02-20 20:31:51 -05:00
Matt Corallo
5e43070ef4 Move pending-HTLC-updated ChannelMonitor from ManyChannelMonitor
This is important for a number of reasons:
 * Firstly, I hit this trying to implement rescan in the demo
   bitcoinrpc client - if individual ChannelMonitors are out of
   sync with each other, we cannot add them all into a
   ManyChannelMonitor together and then rescan, but need to rescan
   them individually without having to do a bunch of manual work.
   Of the three return values in ChannelMonitor::block_connected,
   only the HTLCsource stuff that is moved here makes no sense to
   be exposed to the user.
 * Secondly, the logic currently in ManyChannelMonitor cannot be
   reproduced by the user! HTLCSource is deliberately an opaque
   type but we use its data to decide which things to keep when
   inserting into the HashMap. This would prevent a user from
   properly implementing a replacement ManyChannelMonitor, which is
   unacceptable.
 * Finally, by moving the tracking into ChannelMonitor, we can
   serialize them out, which prevents us from forgetting them when
   loading from disk, though there are still other races which need
   to be handled to make this fully safe (see TODOs in
   ChannelManager).

This is safe as no two entries can have the same HTLCSource across
different channels (or, if they did, it would be a rather serious
bug), though note that, IIRC, when this code was added, the
HTLCSource field in the values was not present.

We also take this opportunity to rename the fetch function to match
our other event interfaces, makaing it clear that by calling the
function the set of HTLCUpdates will also be cleared.
2020-02-20 20:31:51 -05:00
Matt Corallo
09ba0baf2c Only expose constants exposed for testing in cfg(test) 2020-02-20 15:10:09 -05:00
Matt Corallo
3e726c4c8e
Merge pull request #506 from arik-so/ping_encryption_fix
Encrypt ping messages before sending them
2020-02-20 19:50:20 +00:00
Arik Sosman
d9e1f98323
Remove unused code in peer handler test utility method. 2020-02-19 17:57:03 -08:00
Arik Sosman
b317f5221f
Fix ping message sent on timer ticks to be encrypted so the peer can decrypt it instead of shutting down the connection. 2020-02-19 14:08:56 -08:00
Matt Corallo
2f346414ad
Merge pull request #502 from rloomba/rloomba/add_unregister_listener
[chaininterface] Add ability for BlockNotifier to unregister listeners
2020-02-19 19:02:47 +00:00
Matt Corallo
4b189bd09f Allow deserialization of new Channels before we've seen a block
Previously, if we have a live ChannelManager (that has seen blocks)
and we open a new Channel, if we serialize that ChannelManager
before a new block comes in, we'll fail to deserialize it. This is
the result of an overly-ambigious last_block_connected check which
would see 0s for the new channel but the previous block for the
ChannelManager as a whole.

We add a new test which catches this error as well as hopefully
getting some test coverage for other similar issues in the future.
2020-02-18 18:22:06 -05:00
Matt Corallo
ed2a5fdab9 Fix serialization rt bug in Channel and test in functional_tests
Previously, when attempting to write out a channel with some
RemoteAnnounced pending inbound HTLCs, we'd write out the count
without them, but write out some of their fields. We should drop
them as intended as they will need to be reannounced upon
reconnection.

This was found while attempting to simply reproduce a different
bug by adding tests for ChannelManager serialization rount-trip at
the end of each functional_test (in Node::drop). That test is
included here to prevent some classes of similar bugs in the future.
2020-02-18 18:22:05 -05:00
Matt Corallo
5fceb0ff4f Add comment describing how ChannelMonitor::block_connected is called 2020-02-18 18:20:33 -05:00
Matt Corallo
662f13a858 Test that we don't forget to track any outputs at monitor-load
This tests, after each functional test, that if we serialize and
reload all of our ChannelMonitors we end up tracking the same set
of outputs as before.
2020-02-18 18:20:33 -05:00
Matt Corallo
73dce207dd Track the full list of outpoints a chanmon wants monitoring for.
Upon deserialization/reload we need to be able to register each
outpoint which spends the commitment txo which a channelmonitor
believes to be on chain. While our other internal tracking is
likely sufficient to regenerate these, its much easier to simply
track all outpouts we've ever generated, so we do that here.
2020-02-18 18:20:33 -05:00
Ryan Loomba
7d6234662c add functionality for BlockNotifier to unregister a previously registered listener, in order to no longer receive events 2020-02-17 21:33:56 -08:00
Matt Corallo
473f611d11
Merge pull request #440 from TheBlueMatt/2020-01-feature-sanity
Fix a bug in required feature checks
2020-02-17 23:47:06 +00:00
Matt Corallo
ca4c970467 Clarify rescan rules for block_connected somewhat 2020-02-13 12:56:13 -05:00
Matt Corallo
4ac9ed2f00 Add some basic sanity tests for feature flags 2020-02-12 17:16:42 -05:00
Matt Corallo
a3ddb9fb19 Avoid treating option_upfront_shutdown (req) as unknown_required.
This fixes the bitmask in requires_unknown_bits.
2020-02-12 17:13:50 -05:00
Matt Corallo
f137139672 Remove unnecessary mut introduced in 0c595a7ff6 2020-02-12 13:03:41 -05:00
Matt Corallo
c906f28432
Merge pull request #461 from ariard/2020-remove-duplicata
Remove some duplicata of broadcast txn from ChannelMonitor
2020-02-12 17:38:21 +00:00
Antoine Riard
494219e388 Remove duplicata of broadcast txn from ChannelMonitor
Previously, if new ouputs were found to be watched as part
of channel operations, the block was rescan which triggers
again parser and generation of transactions already issued.

This commit first modifies the test framework without
altering further ChannelMonitor.

ChannelMonitor refactoring is introduced in a latter commit.
2020-02-12 00:37:19 -05:00
Matt Corallo
bec0a260e8 Define a BLOCK_SIZE constant for chacha20 2020-02-11 16:27:38 -05:00
Matt Corallo
65a2bcf46c Swap out 20*65 for a constant, given onion hops are now of var len 2020-02-11 16:27:38 -05:00
Matt Corallo
bfe59a753e Use RouteHop's new node_features to send TLV-encoded onion hops
This implements the new TLV variable-length encoding for onion hop
data, opting to send it if the RouteHop's node_features indicates
support. It also uses the new process_inline method in ChaCha20 to
optimize a few things (though it grows a new TODO for a
probably-important optimization).
2020-02-11 16:27:38 -05:00
Matt Corallo
c94e53d9dd Add support for variable-length onion payload reads using TLV 2020-02-11 16:27:38 -05:00
Matt Corallo
c326061108 Add macros for building TLV (de)serializers.
There's quite a bit of machinery included here, but it neatly
avoids any dynamic allocation during TLV deserialization, and the
calling side looks nice and simple. The macro-generated code is
pretty nice, though has some redundant if statements (I haven't
checked if they get optimized out yet, but I can't imagine they
don't).
2020-02-11 13:48:56 -05:00
Matt Corallo
85c8410f89 Expose VecWriter outside of util::ser since peer_handler uses it 2020-02-11 13:48:56 -05:00
Matt Corallo
66c4ed2d68 Add new streams and serialization wrappers for TLV types.
This adds a number of new stream adapters to track and/or calculate
the number of bytes read/written to an underlying stream, as well
as wrappers for the two (?!) variable-length integer types that TLV
introduces.
2020-02-11 13:48:56 -05:00
Matt Corallo
f990aacccb Add a ChaChaReader adapter to read an encrypted stream & use it
This prepares for variable-length per-hop-data by wrapping the full
hop_data field in a decrypting stream, with a few minor
optimizations and redundant allocations to boot.
2020-02-11 13:48:56 -05:00
Matt Corallo
8f3750304b Move BogusHopData generation into test instead of OnionHopData.
This, as it should be, restricts OnionHopData to only being able to
represent valid states, while still allowing for tests to generate
bogus hop data fields to test deserialization.
2020-02-11 13:48:56 -05:00
Matt Corallo
c2a47d1b4c Pull hmac out of OnionHopData.
Its a bit awkward to have an hmac field covering the struct that
its in, and there is little difference in removing it, so just pull
it out and use a [u8; 32] where we care about the hmac.
2020-02-11 13:48:56 -05:00
Matt Corallo
36c725fe1c Flatten OnionHopData struct with the Realm0 struct.
Previously OnionHopData contained a OnionRealm0HopData field however
instead of bumping the realm number, it has been replaced with a
length, used to indicte the length of a TLV-formatted object.

Because a TLV-formatted hop data can contain the same information as
a realm-0 hop data, we flatten the field and simply keep track of
what format it was in.
2020-02-11 13:48:56 -05:00
Matt Corallo
1619d08163
Merge pull request #491 from TheBlueMatt/2020-02-one-conf-lock
Fix one-confirmation funding_locked generation
2020-02-11 05:36:01 +00:00
Matt Corallo
b7f4f764af
Merge pull request #490 from jkczyz/2020-02-initial-routing-sync
Refactor logic for setting initial_routing_sync feature bit
2020-02-10 22:18:48 +00:00
Matt Corallo
ff24530318 Add some trace logging for funding_locked and announcement_sigs 2020-02-10 17:09:24 -05:00
Matt Corallo
8c0ec5c20d Add test for 1-conf channels 2020-02-10 17:09:24 -05:00
Matt Corallo
b02ccbb92f Fix sending funding_locked with 1 conf.
We previously tracked funding transaction confirmation by marking
funding_tx_confirmations to 1 when we see it in a block and
incrementing each block thereafter if its non-0. To avoid
double-incrementing the first confirmation, we did the increment
(and funding_locked check) after doing the first-confirmation
checks. Thus, we'd never hit the funding_locked case during the
first confirmation.

To address this, we simply swap the order of the checks, though
bumping the funding_tx_confirmations increment up to the top.

Reported-by: Igor Cota <igor@codexapertus.com>
2020-02-10 17:09:21 -05:00
Jeffrey Czyz
72de9cc178 Add a test for Router's should_request_full_sync 2020-02-10 12:01:35 -08:00
Jeffrey Czyz
71021fc9d8 Move Router test setup to a helper function 2020-02-10 11:54:46 -08:00
Jeffrey Czyz
d3fb619020 Move initial_routing_sync decision to the Router
PeerManager determines whether the initial_routing_sync feature bit
should be set when sending Init messages to peers. Move this to the
Router as it is better able to determine if a full sync is needed.
2020-02-10 11:13:41 -08:00
Matt Corallo
88b7dcd7e4
Merge pull request #445 from TheBlueMatt/2020-01-fuzz-enforcer-fix
Fix EnforcingChannelKeys panic when our counterparty burns their $.
2020-02-10 18:47:44 +00:00
Matt Corallo
1443509d77 Test that EnforcingChannelKeys doesn't panic on duplicate RAAs 2020-02-07 20:03:00 -05:00
Matt Corallo
60fad62633 Fix EnforcingChannelKeys panic when our counterparty burns their $.
If our counterparty burns their funds by revoking their current
commitment transaction before we've sent them a new one, we'll step
forward the remote commitment number. This would be otherwise fine
(and may even encourage them to broadcast their revoked state(s) on
chain), except that our new EnforcingChannelKeys expects us to not
jump forward in time. Since it isn't too important that we punish
our counterparty in such a corner-case, we opt to just close the
channel in such a case and move on.
2020-02-07 20:03:00 -05:00
Arik Sosman
360ed11c59
remove decode_error macro only used once 2020-02-06 14:17:44 -08:00