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

rpcserver: enrich ListChannels with peer alias

Browse Source
This commit is contained in:
Slyghtning 2023-01-15 19:31:09 +10:30
parent 9d048ecd6a
commit 3e5943b7f9
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rpcserver.go
View File

@ -4017,7 +4017,9 @@ func (r *rpcServer) ListChannels(ctx context.Context,
// Next, we'll determine whether we should add this channel to // Next, we'll determine whether we should add this channel to
// our list depending on the type of channels requested to us. // our list depending on the type of channels requested to us.
isActive := peerOnline && linkActive isActive := peerOnline && linkActive
channel, err := createRPCOpenChannel(r, dbChannel, isActive) channel, err := createRPCOpenChannel(
r, dbChannel, isActive, in.PeerAliasLookup,
)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -4066,7 +4068,6 @@ func rpcCommitmentType(chanType channeldb.ChannelType) lnrpc.CommitmentType {
// *Channeldb.ChannelConfig. // *Channeldb.ChannelConfig.
func createChannelConstraint( func createChannelConstraint(
chanCfg *channeldb.ChannelConfig) *lnrpc.ChannelConstraints { chanCfg *channeldb.ChannelConfig) *lnrpc.ChannelConstraints {
return &lnrpc.ChannelConstraints{ return &lnrpc.ChannelConstraints{
CsvDelay: uint32(chanCfg.CsvDelay), CsvDelay: uint32(chanCfg.CsvDelay),
ChanReserveSat: uint64(chanCfg.ChanReserve), ChanReserveSat: uint64(chanCfg.ChanReserve),
@ -4088,7 +4089,7 @@ func isPrivate(dbChannel *channeldb.OpenChannel) bool {
// createRPCOpenChannel creates an *lnrpc.Channel from the *channeldb.Channel. // createRPCOpenChannel creates an *lnrpc.Channel from the *channeldb.Channel.
func createRPCOpenChannel(r *rpcServer, dbChannel *channeldb.OpenChannel, func createRPCOpenChannel(r *rpcServer, dbChannel *channeldb.OpenChannel,
isActive bool) (*lnrpc.Channel, error) { isActive, peerAliasLookup bool) (*lnrpc.Channel, error) {
nodePub := dbChannel.IdentityPub nodePub := dbChannel.IdentityPub
nodeID := hex.EncodeToString(nodePub.SerializeCompressed()) nodeID := hex.EncodeToString(nodePub.SerializeCompressed())
@ -4164,6 +4165,16 @@ func createRPCOpenChannel(r *rpcServer, dbChannel *channeldb.OpenChannel,
RemoteChanReserveSat: int64(dbChannel.RemoteChanCfg.ChanReserve), RemoteChanReserveSat: int64(dbChannel.RemoteChanCfg.ChanReserve),
} }
// Look up our channel peer's node alias if the caller requests it.
if peerAliasLookup {
peerAlias, err := r.server.graphDB.LookupAlias(nodePub)
if err != nil {
return nil, fmt.Errorf("unable to lookup peer "+
"alias: %w", err)
}
channel.PeerAlias = peerAlias
}
// Populate the set of aliases. // Populate the set of aliases.
for _, chanAlias := range channelAliases { for _, chanAlias := range channelAliases {
channel.AliasScids = append( channel.AliasScids = append(
@ -4576,7 +4587,7 @@ func (r *rpcServer) SubscribeChannelEvents(req *lnrpc.ChannelEventSubscription,
} }
case channelnotifier.OpenChannelEvent: case channelnotifier.OpenChannelEvent:
channel, err := createRPCOpenChannel( channel, err := createRPCOpenChannel(
r, event.Channel, true, r, event.Channel, true, false,
) )
if err != nil { if err != nil {
return err return err