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

lnrpc: expose commitment type on pending open and waiting close channels

Browse Source
This commit is contained in:
Joost Jager
2020-03-30 20:36:38 +02:00
parent 41573004a3
commit baffe156db
4 changed files with 790 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rpcserver.go
View File

@ -2738,6 +2738,7 @@ func (r *rpcServer) PendingChannels(ctx context.Context,
LocalChanReserveSat: int64(pendingChan.LocalChanCfg.ChanReserve),
RemoteChanReserveSat: int64(pendingChan.RemoteChanCfg.ChanReserve),
Initiator: pendingChan.IsInitiator,
CommitmentType: rpcCommitmentType(pendingChan.ChanType),
},
CommitWeight: commitWeight,
CommitFee: int64(localCommitment.CommitFee),
@ -2764,10 +2765,11 @@ func (r *rpcServer) PendingChannels(ctx context.Context,
pub := pendingClose.RemotePub.SerializeCompressed()
chanPoint := pendingClose.ChanPoint
channel := &lnrpc.PendingChannelsResponse_PendingChannel{
RemoteNodePub: hex.EncodeToString(pub),
ChannelPoint: chanPoint.String(),
Capacity: int64(pendingClose.Capacity),
LocalBalance: int64(pendingClose.SettledBalance),
RemoteNodePub: hex.EncodeToString(pub),
ChannelPoint: chanPoint.String(),
Capacity: int64(pendingClose.Capacity),
LocalBalance: int64(pendingClose.SettledBalance),
CommitmentType: lnrpc.CommitmentType_UNKNOWN_COMMITMENT_TYPE,
}
// Lookup the channel in the historical channel bucket to obtain
@ -2786,6 +2788,9 @@ func (r *rpcServer) PendingChannels(ctx context.Context,
case nil:
channel.Initiator = historical.IsInitiator
channel.CommitmentType = rpcCommitmentType(
historical.ChanType,
)
// If the error is non-nil, and not due to older versions of lnd
// not persisting historical channels, return it.
@ -2913,6 +2918,7 @@ func (r *rpcServer) PendingChannels(ctx context.Context,
LocalChanReserveSat: int64(waitingClose.LocalChanCfg.ChanReserve),
RemoteChanReserveSat: int64(waitingClose.RemoteChanCfg.ChanReserve),
Initiator: waitingClose.IsInitiator,
CommitmentType: rpcCommitmentType(waitingClose.ChanType),
}
waitingCloseResp := &lnrpc.PendingChannelsResponse_WaitingCloseChannel{