From 2ebd76bbbb2d578026308a755ae65ccc9adf8e0e Mon Sep 17 00:00:00 2001 From: Conner Fromknecht Date: Wed, 28 Aug 2019 13:30:06 -0700 Subject: [PATCH 1/2] rpcserver: marshal db edges by increasing pubkey --- rpcserver.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rpcserver.go b/rpcserver.go index 5cb959c5..a5e2ad16 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -3770,6 +3770,13 @@ func (r *rpcServer) DescribeGraph(ctx context.Context, func marshalDbEdge(edgeInfo *channeldb.ChannelEdgeInfo, c1, c2 *channeldb.ChannelEdgePolicy) *lnrpc.ChannelEdge { + // Order the edges by increasing pubkey. + if bytes.Compare(edgeInfo.NodeKey2Bytes[:], + edgeInfo.NodeKey1Bytes[:]) < 0 { + + c2, c1 = c1, c2 + } + var ( lastUpdate int64 ) From d08721b32dcb942e896d48b4dad2742a37cc2118 Mon Sep 17 00:00:00 2001 From: Conner Fromknecht Date: Wed, 28 Aug 2019 13:31:12 -0700 Subject: [PATCH 2/2] rpcserver: correctly compute edge-level lastUpdate --- rpcserver.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/rpcserver.go b/rpcserver.go index a5e2ad16..c6776ac1 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -3777,16 +3777,13 @@ func marshalDbEdge(edgeInfo *channeldb.ChannelEdgeInfo, c2, c1 = c1, c2 } - var ( - lastUpdate int64 - ) - - if c2 != nil { - lastUpdate = c2.LastUpdate.Unix() - } + var lastUpdate int64 if c1 != nil { lastUpdate = c1.LastUpdate.Unix() } + if c2 != nil && c2.LastUpdate.Unix() > lastUpdate { + lastUpdate = c2.LastUpdate.Unix() + } edge := &lnrpc.ChannelEdge{ ChannelId: edgeInfo.ChannelID,