highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-06-24 07:46:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

rpcserver: include channelID in ListChannels response

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2016-12-26 23:50:19 -06:00
parent f9f840feb6
commit abfef02df2
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rpcserver.go
View File

@ -19,7 +19,7 @@ import (
"github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet"
"github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/routing/rt/graph" "github.com/lightningnetwork/lnd/routing"
"github.com/roasbeef/btcd/btcec" "github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/chaincfg" "github.com/roasbeef/btcd/chaincfg"
"github.com/roasbeef/btcd/txscript" "github.com/roasbeef/btcd/txscript"
@ -558,6 +558,8 @@ func (r *rpcServer) ListChannels(ctx context.Context,
resp := &lnrpc.ListChannelsResponse{} resp := &lnrpc.ListChannelsResponse{}
graph := r.server.chanDB.ChannelGraph()
dbChannels, err := r.server.chanDB.FetchAllChannels() dbChannels, err := r.server.chanDB.FetchAllChannels()
if err != nil { if err != nil {
return nil, err return nil, err
@ -569,10 +571,19 @@ func (r *rpcServer) ListChannels(ctx context.Context,
for _, dbChannel := range dbChannels { for _, dbChannel := range dbChannels {
nodePub := dbChannel.IdentityPub.SerializeCompressed() nodePub := dbChannel.IdentityPub.SerializeCompressed()
nodeID := hex.EncodeToString(nodePub) nodeID := hex.EncodeToString(nodePub)
chanPoint := dbChannel.ChanID
// With the channel point known, retrieve the network channel
// ID from the database.
chanID, err := graph.ChannelID(chanPoint)
if err != nil {
return nil, err
}
channel := &lnrpc.ActiveChannel{ channel := &lnrpc.ActiveChannel{
RemotePubkey: nodeID, RemotePubkey: nodeID,
ChannelPoint: dbChannel.ChanID.String(), ChannelPoint: chanPoint.String(),
ChanId: chanID,
Capacity: int64(dbChannel.Capacity), Capacity: int64(dbChannel.Capacity),
LocalBalance: int64(dbChannel.OurBalance), LocalBalance: int64(dbChannel.OurBalance),
RemoteBalance: int64(dbChannel.TheirBalance), RemoteBalance: int64(dbChannel.TheirBalance),