mirror of
https://github.com/aljazceru/lightning.git
synced 2025-12-29 03:44:30 +01:00
50f5eb34b4
Prior to this, lightningd would hand uninteresting peers back to connectd, which would then return it to lightningd if it sent a non-gossip msg, or if lightningd asked it to release the peer. Now connectd hands the peer to lightningd once we've done the init handshake, which hands it off to openingd. This is a deep structural change, so we do the minimum here and cleanup in the following patches. Lightningd: 1. Remove peer_nongossip handling from connect_control and peer_control. 2. Remove list of outstanding fundchannel command; it was only needed to find the race between us asking connectd to release the peer and it reconnecting. 3. We can no longer tell if the remote end has started trying to fund a channel (until it has succeeded): it's very transitory anyway so not worth fixing. 4. We now always have a struct peer, and allocate an uncommitted_channel for it, though it may never be used if neither end funds a channel. 5. We start funding on messages for openingd: we can get a funder_reply or a fundee, or an error in response to our request to fund a channel. so we handle all of them. 6. A new peer_start_openingd() is called after connectd hands us a peer. 7. json_fund_channel just looks through local peers; there are none hidden in connectd any more. 8. We sometimes start a new openingd just to send an error message. Openingd: 1. We always have information we need to accept them funding a channel (in the init message). 2. We have to listen for three fds: peer, gossip and master, so we opencode the poll. 3. We have an explicit message to start trying to fund a channel. 4. We can be told to send a message in our init message. Testing: 1. We don't handle some things gracefully yet, so two tests are disabled. 2. 'hand_back_peer .*: now local again' from connectd is no longer a message, openingd says 'Handed peer, entering loop' once its managing it. 3. peer['state'] used to be set to 'GOSSIPING' (otherwise this field doesn't exist; 'state' is now per-channel. It doesn't exist at all now. 4. Some tests now need to turn on IO logging in openingd, not connectd. 5. There's a gap between connecting on one node and having connectd on the peer hand over the connection to openingd. Our tests sometimes checked getpeers() on the peer, and didn't see anything, so line_graph needed updating. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
80 lines
3.2 KiB
CSV
80 lines
3.2 KiB
CSV
#include <common/cryptomsg.h>
|
|
#include <common/channel_config.h>
|
|
#include <common/derive_basepoints.h>
|
|
|
|
opening_init,6000
|
|
# Which network are we configured for (as index into the chainparams)?
|
|
opening_init,,network_index,u32
|
|
# Base configuration we'll offer (channel reserve will vary with amount)
|
|
opening_init,,our_config,struct channel_config
|
|
# Minimum/maximum configuration values we'll accept
|
|
opening_init,,max_to_self_delay,u32
|
|
opening_init,,min_effective_htlc_capacity_msat,u64
|
|
opening_init,,crypto_state,struct crypto_state
|
|
opening_init,,our_basepoints,struct basepoints
|
|
opening_init,,our_funding_pubkey,struct pubkey
|
|
# Constraints in case the other end tries to open a channel.
|
|
opening_init,,minimum_depth,u32
|
|
opening_init,,min_feerate,u32
|
|
opening_init,,max_feerate,u32
|
|
# Optional msg to send.
|
|
opening_init,,len,u16
|
|
opening_init,,msg,len*u8
|
|
|
|
#include <common/bip32.h>
|
|
#include <common/htlc_wire.h>
|
|
# Master->openingd: please fund a channel.
|
|
opening_funder,6001
|
|
opening_funder,,funding_satoshis,u64
|
|
opening_funder,,push_msat,u64
|
|
opening_funder,,feerate_per_kw,u32
|
|
opening_funder,,change_satoshis,u64
|
|
opening_funder,,change_keyindex,u32
|
|
opening_funder,,channel_flags,u8
|
|
#include <common/utxo.h>
|
|
opening_funder,,num_inputs,u16
|
|
opening_funder,,inputs,num_inputs*struct utxo
|
|
opening_funder,,bip32,struct ext_key
|
|
|
|
# Openingd->master: we've successfully offered channel.
|
|
# This gives their sig, means we can broadcast tx: we're done.
|
|
opening_funder_reply,6101
|
|
opening_funder_reply,,their_config,struct channel_config
|
|
opening_funder_reply,,first_commit,struct bitcoin_tx
|
|
opening_funder_reply,,first_commit_sig,secp256k1_ecdsa_signature
|
|
opening_funder_reply,,crypto_state,struct crypto_state
|
|
opening_funder_reply,,revocation_basepoint,struct pubkey
|
|
opening_funder_reply,,payment_basepoint,struct pubkey
|
|
opening_funder_reply,,htlc_basepoint,struct pubkey
|
|
opening_funder_reply,,delayed_payment_basepoint,struct pubkey
|
|
opening_funder_reply,,their_per_commit_point,struct pubkey
|
|
opening_funder_reply,,minimum_depth,u32
|
|
opening_funder_reply,,remote_fundingkey,struct pubkey
|
|
opening_funder_reply,,funding_txid,struct bitcoin_txid
|
|
opening_funder_reply,,feerate_per_kw,u32
|
|
opening_funder_reply,,our_channel_reserve_satoshis,u64
|
|
|
|
# Openingd->master: they offered channel.
|
|
# This gives their txid and info, means we can send funding_signed: we're done.
|
|
opening_fundee,6003
|
|
opening_fundee,,their_config,struct channel_config
|
|
opening_fundee,,first_commit,struct bitcoin_tx
|
|
opening_fundee,,first_commit_sig,secp256k1_ecdsa_signature
|
|
opening_fundee,,crypto_state,struct crypto_state
|
|
opening_fundee,,revocation_basepoint,struct pubkey
|
|
opening_fundee,,payment_basepoint,struct pubkey
|
|
opening_fundee,,htlc_basepoint,struct pubkey
|
|
opening_fundee,,delayed_payment_basepoint,struct pubkey
|
|
opening_fundee,,their_per_commit_point,struct pubkey
|
|
opening_fundee,,remote_fundingkey,struct pubkey
|
|
opening_fundee,,funding_txid,struct bitcoin_txid
|
|
opening_fundee,,funding_txout,u16
|
|
opening_fundee,,funding_satoshis,u64
|
|
opening_fundee,,push_msat,u64
|
|
opening_fundee,,channel_flags,u8
|
|
opening_fundee,,feerate_per_kw,u32
|
|
# The funding signed message: send this and we're committed.
|
|
opening_fundee,,msglen,u16
|
|
opening_fundee,,funding_signed_msg,msglen*u8
|
|
opening_fundee,,our_channel_reserve_satoshis,u64
|