akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmd/lncli: add 'connect' flag to openchannel command

Browse Source 
Adds the option to connect to a node before opening the channel by
passing the node's host:port via the --connect flag.
This commit is contained in:
Wilmer Paulino 2018-01-10 02:27:49 -05:00
parent 3b4ffbca48
commit aca0c9324d
No known key found for this signature in database
GPG Key ID: 6DF57B9F9514972F
1 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
cmd/lncli/commands.go
View File

@ -374,11 +374,15 @@ func disconnectPeer(ctx *cli.Context) error {
// TODO(roasbeef): change default number of confirmations // TODO(roasbeef): change default number of confirmations
var openChannelCommand = cli.Command{ var openChannelCommand = cli.Command{
Name: "openchannel", Name: "openchannel",
Usage: "Open a channel to an existing peer.", Usage: "Open a channel to a node or an existing peer.",
Description: ` Description: `
Attempt to open a new channel to an existing peer with the key node-key Attempt to open a new channel to an existing peer with the key node-key
optionally blocking until the channel is 'open'. optionally blocking until the channel is 'open'.
One can also connect to a node before opening a new channel to it by
setting its host:port via the --connect argument. For this to work,
the node_key must be provided, rather than the peer_id. This is optional.
The channel will be initialized with local-amt satoshis local and push-amt The channel will be initialized with local-amt satoshis local and push-amt
satoshis for the remote node. Once the channel is open, a channelPoint (txid:vout) satoshis for the remote node. Once the channel is open, a channelPoint (txid:vout)
of the funding output is returned. of the funding output is returned.
@ -395,9 +399,13 @@ var openChannelCommand = cli.Command{
}, },
cli.StringFlag{ cli.StringFlag{
Name: "node_key", Name: "node_key",
Usage: "the identity public key of the target peer " + Usage: "the identity public key of the target node/peer " +
"serialized in compressed format", "serialized in compressed format",
}, },
cli.StringFlag{
Name: "connect",
Usage: "(optional) the host:port of the target node",
},
cli.IntFlag{ cli.IntFlag{
Name: "local_amt", Name: "local_amt",
Usage: "the number of satoshis the wallet should commit to the channel", Usage: "the number of satoshis the wallet should commit to the channel",
@ -475,6 +483,7 @@ func openChannel(ctx *cli.Context) error {
return fmt.Errorf("unable to decode node public key: %v", err) return fmt.Errorf("unable to decode node public key: %v", err)
} }
req.NodePubkey = nodePubHex req.NodePubkey = nodePubHex
case args.Present(): case args.Present():
nodePubHex, err := hex.DecodeString(args.First()) nodePubHex, err := hex.DecodeString(args.First())
if err != nil { if err != nil {
@ -486,6 +495,29 @@ func openChannel(ctx *cli.Context) error {
return fmt.Errorf("node id argument missing") return fmt.Errorf("node id argument missing")
} }
// As soon as we can confirm that the node's node_key was set, rather
// than the peer_id, we can check if the host:port was also set to
// connect to it before opening the channel.
if req.NodePubkey != nil && ctx.IsSet("connect") {
addr := &lnrpc.LightningAddress{
Pubkey: hex.EncodeToString(req.NodePubkey),
Host: ctx.String("connect"),
}
req := &lnrpc.ConnectPeerRequest{
Addr: addr,
Perm: false,
}
// Check if connecting to the node was successful.
// We discard the peer id returned as it is not needed.
_, err := client.ConnectPeer(ctxb, req)
if err != nil &&
!strings.Contains(err.Error(), "already connected") {
return err
}
}
switch { switch {
case ctx.IsSet("local_amt"): case ctx.IsSet("local_amt"):
req.LocalFundingAmount = int64(ctx.Int("local_amt")) req.LocalFundingAmount = int64(ctx.Int("local_amt"))