Show incoming/outgoing policies stably

pull/29/head
rkfg 3 years ago
parent f50f077d94
commit b9253086e1

@ -354,6 +354,14 @@ func (l Backend) GetChannelInfo(ctx context.Context, channel *models.Channel) er
channel.Policy1 = protoToRoutingPolicy(resp.Node1Policy) channel.Policy1 = protoToRoutingPolicy(resp.Node1Policy)
channel.Policy2 = protoToRoutingPolicy(resp.Node2Policy) channel.Policy2 = protoToRoutingPolicy(resp.Node2Policy)
info, err := clt.GetInfo(ctx, &lnrpc.GetInfoRequest{})
if err != nil {
return errors.WithStack(err)
}
if info != nil {
channel.WeFirst = resp.Node1Pub == info.IdentityPubkey
}
return nil return nil
} }

@ -48,6 +48,7 @@ type Channel struct {
PendingHTLC []*HTLC PendingHTLC []*HTLC
LastUpdate *time.Time LastUpdate *time.Time
Node *Node Node *Node
WeFirst bool
Policy1 *RoutingPolicy Policy1 *RoutingPolicy
Policy2 *RoutingPolicy Policy2 *RoutingPolicy
} }

@ -7,6 +7,7 @@ import (
"golang.org/x/text/language" "golang.org/x/text/language"
"golang.org/x/text/message" "golang.org/x/text/message"
netModels "github.com/edouardparis/lntop/network/models"
"github.com/edouardparis/lntop/ui/color" "github.com/edouardparis/lntop/ui/color"
"github.com/edouardparis/lntop/ui/models" "github.com/edouardparis/lntop/ui/models"
) )
@ -93,12 +94,12 @@ func (c *Channel) Set(g *gocui.Gui, x0, y0, x1, y1 int) error {
footer.FgColor = gocui.ColorBlack footer.FgColor = gocui.ColorBlack
footer.Clear() footer.Clear()
blackBg := color.Black(color.Background) blackBg := color.Black(color.Background)
fmt.Fprintln(footer, fmt.Sprintf("%s%s %s%s %s%s %s%s", fmt.Fprintf(footer, "%s%s %s%s %s%s %s%s\n",
blackBg("F1"), "Help", blackBg("F1"), "Help",
blackBg("F2"), "Menu", blackBg("F2"), "Menu",
blackBg("Enter"), "Channels", blackBg("Enter"), "Channels",
blackBg("F10"), "Quit", blackBg("F10"), "Quit",
)) )
return nil return nil
} }
@ -116,6 +117,29 @@ func (c Channel) Delete(g *gocui.Gui) error {
return g.DeleteView(CHANNEL_FOOTER) return g.DeleteView(CHANNEL_FOOTER)
} }
func printPolicy(v *gocui.View, p *message.Printer, policy *netModels.RoutingPolicy, outgoing bool) {
green := color.Green()
cyan := color.Cyan()
red := color.Red()
fmt.Fprintln(v, "")
direction := "Outgoing"
if !outgoing {
direction = "Incoming"
}
fmt.Fprintf(v, green(" [ %s Policy ]\n"), direction)
if policy.Disabled {
fmt.Fprintln(v, red("disabled"))
}
fmt.Fprintf(v, "%s %d\n",
cyan(" Time lock delta:"), policy.TimeLockDelta)
fmt.Fprintf(v, "%s %d\n",
cyan(" Min htlc:"), policy.MinHtlc)
fmt.Fprintf(v, "%s %d\n",
cyan(" Fee base msat:"), policy.FeeBaseMsat)
fmt.Fprintf(v, "%s %d\n",
cyan("Fee rate milli msat:"), policy.FeeRateMilliMsat)
}
func (c *Channel) display() { func (c *Channel) display() {
p := message.NewPrinter(language.English) p := message.NewPrinter(language.English)
v := c.view v := c.view
@ -123,64 +147,43 @@ func (c *Channel) display() {
channel := c.channels.Current() channel := c.channels.Current()
green := color.Green() green := color.Green()
cyan := color.Cyan() cyan := color.Cyan()
red := color.Red()
fmt.Fprintln(v, green(" [ Channel ]")) fmt.Fprintln(v, green(" [ Channel ]"))
fmt.Fprintln(v, fmt.Sprintf("%s %s", fmt.Fprintf(v, "%s %s\n",
cyan(" Status:"), status(channel))) cyan(" Status:"), status(channel))
fmt.Fprintln(v, fmt.Sprintf("%s %d", fmt.Fprintf(v, "%s %d\n",
cyan(" ID:"), channel.ID)) cyan(" ID:"), channel.ID)
fmt.Fprintln(v, p.Sprintf("%s %d", fmt.Fprintf(v, "%s %d\n",
cyan(" Capacity:"), channel.Capacity)) cyan(" Capacity:"), channel.Capacity)
fmt.Fprintln(v, p.Sprintf("%s %d", fmt.Fprintf(v, "%s %d\n",
cyan(" Local Balance:"), channel.LocalBalance)) cyan(" Local Balance:"), channel.LocalBalance)
fmt.Fprintln(v, p.Sprintf("%s %d", fmt.Fprintf(v, "%s %d\n",
cyan(" Remote Balance:"), channel.RemoteBalance)) cyan(" Remote Balance:"), channel.RemoteBalance)
fmt.Fprintln(v, fmt.Sprintf("%s %s", fmt.Fprintf(v, "%s %s\n",
cyan(" Channel Point:"), channel.ChannelPoint)) cyan(" Channel Point:"), channel.ChannelPoint)
fmt.Fprintln(v, "") fmt.Fprintln(v, "")
fmt.Fprintln(v, green(" [ Node ]")) fmt.Fprintln(v, green(" [ Node ]"))
fmt.Fprintln(v, fmt.Sprintf("%s %s", fmt.Fprintf(v, "%s %s\n",
cyan(" PubKey:"), channel.RemotePubKey)) cyan(" PubKey:"), channel.RemotePubKey)
if channel.Node != nil { if channel.Node != nil {
fmt.Fprintln(v, fmt.Sprintf("%s %s", fmt.Fprintf(v, "%s %s\n",
cyan(" Alias:"), channel.Node.Alias)) cyan(" Alias:"), channel.Node.Alias)
fmt.Fprintln(v, p.Sprintf("%s %d", fmt.Fprintf(v, "%s %d\n",
cyan(" Total Capacity:"), channel.Node.TotalCapacity)) cyan(" Total Capacity:"), channel.Node.TotalCapacity)
fmt.Fprintln(v, p.Sprintf("%s %d", fmt.Fprintf(v, "%s %d\n",
cyan(" Total Channels:"), channel.Node.NumChannels)) cyan(" Total Channels:"), channel.Node.NumChannels)
} }
if channel.Policy1 != nil { if channel.Policy1 != nil && channel.WeFirst {
fmt.Fprintln(v, "") printPolicy(v, p, channel.Policy1, true)
fmt.Fprintln(v, green(" [ Forward Policy Node 1 ]"))
if channel.Policy1.Disabled {
fmt.Fprintln(v, red("disabled"))
}
fmt.Fprintln(v, p.Sprintf("%s %d",
cyan(" Time lock delta:"), channel.Policy1.TimeLockDelta))
fmt.Fprintln(v, p.Sprintf("%s %d",
cyan(" Min htlc:"), channel.Policy1.MinHtlc))
fmt.Fprintln(v, p.Sprintf("%s %d",
cyan(" Fee base msat:"), channel.Policy1.FeeBaseMsat))
fmt.Fprintln(v, p.Sprintf("%s %d",
cyan("Fee rate milli msat:"), channel.Policy1.FeeRateMilliMsat))
} }
if channel.Policy2 != nil { if channel.Policy2 != nil {
fmt.Fprintln(v, "") printPolicy(v, p, channel.Policy2, !channel.WeFirst)
fmt.Fprintln(v, green(" [ Forward Policy Node 2 ]")) }
if channel.Policy2.Disabled {
fmt.Fprintln(v, red("disabled")) if channel.Policy1 != nil && !channel.WeFirst {
} printPolicy(v, p, channel.Policy1, false)
fmt.Fprintln(v, p.Sprintf("%s %d",
cyan(" Time lock delta:"), channel.Policy2.TimeLockDelta))
fmt.Fprintln(v, p.Sprintf("%s %d",
cyan(" Min htlc:"), channel.Policy2.MinHtlc))
fmt.Fprintln(v, p.Sprintf("%s %d",
cyan(" Fee base msat:"), channel.Policy2.FeeBaseMsat))
fmt.Fprintln(v, p.Sprintf("%s %d",
cyan("Fee rate milli msat:"), channel.Policy2.FeeRateMilliMsat))
} }
} }

Loading…
Cancel
Save