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

rpcserver: update RPC function impls to account for new API changes

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2017-07-30 14:25:03 -07:00
parent 0dfe73386b
commit 5ed9375e94
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
rpcserver.go
View File

@ -353,8 +353,8 @@ func (r *rpcServer) OpenChannel(in *lnrpc.OpenChannelRequest,
updateStream lnrpc.Lightning_OpenChannelServer) error { updateStream lnrpc.Lightning_OpenChannelServer) error {
rpcsLog.Tracef("[openchannel] request to peerid(%v) "+ rpcsLog.Tracef("[openchannel] request to peerid(%v) "+
"allocation(us=%v, them=%v) numconfs=%v", in.TargetPeerId, "allocation(us=%v, them=%v)", in.TargetPeerId,
in.LocalFundingAmount, in.PushSat, in.NumConfs) in.LocalFundingAmount, in.PushSat)
localFundingAmt := btcutil.Amount(in.LocalFundingAmount) localFundingAmt := btcutil.Amount(in.LocalFundingAmount)
remoteInitialBalance := btcutil.Amount(in.PushSat) remoteInitialBalance := btcutil.Amount(in.PushSat)
@ -410,7 +410,7 @@ func (r *rpcServer) OpenChannel(in *lnrpc.OpenChannelRequest,
// open a new channel. A stream is returned in place, this stream will // open a new channel. A stream is returned in place, this stream will
// be used to consume updates of the state of the pending channel. // be used to consume updates of the state of the pending channel.
updateChan, errChan := r.server.OpenChannel(in.TargetPeerId, updateChan, errChan := r.server.OpenChannel(in.TargetPeerId,
nodePubKey, localFundingAmt, remoteInitialBalance, in.NumConfs) nodePubKey, localFundingAmt, remoteInitialBalance)
var outpoint wire.OutPoint var outpoint wire.OutPoint
out: out:
@ -460,8 +460,8 @@ func (r *rpcServer) OpenChannelSync(ctx context.Context,
in *lnrpc.OpenChannelRequest) (*lnrpc.ChannelPoint, error) { in *lnrpc.OpenChannelRequest) (*lnrpc.ChannelPoint, error) {
rpcsLog.Tracef("[openchannel] request to peerid(%v) "+ rpcsLog.Tracef("[openchannel] request to peerid(%v) "+
"allocation(us=%v, them=%v) numconfs=%v", in.TargetPeerId, "allocation(us=%v, them=%v)", in.TargetPeerId,
in.LocalFundingAmount, in.PushSat, in.NumConfs) in.LocalFundingAmount, in.PushSat)
// Creation of channels before the wallet syncs up is currently // Creation of channels before the wallet syncs up is currently
// disallowed. // disallowed.
@ -498,7 +498,7 @@ func (r *rpcServer) OpenChannelSync(ctx context.Context,
} }
updateChan, errChan := r.server.OpenChannel(in.TargetPeerId, updateChan, errChan := r.server.OpenChannel(in.TargetPeerId,
nodepubKey, localFundingAmt, remoteInitialBalance, in.NumConfs) nodepubKey, localFundingAmt, remoteInitialBalance)
select { select {
// If an error occurs them immediately return the error to the client. // If an error occurs them immediately return the error to the client.
@ -675,7 +675,7 @@ func (r *rpcServer) fetchActiveChannel(chanPoint wire.OutPoint) (*lnwallet.Light
// according to its channel point. // according to its channel point.
var dbChan *channeldb.OpenChannel var dbChan *channeldb.OpenChannel
for _, dbChannel := range dbChannels { for _, dbChannel := range dbChannels {
if *dbChannel.ChanID == chanPoint { if dbChannel.FundingOutpoint == chanPoint {
dbChan = dbChannel dbChan = dbChannel
break break
} }
@ -689,7 +689,7 @@ func (r *rpcServer) fetchActiveChannel(chanPoint wire.OutPoint) (*lnwallet.Light
// Otherwise, we create a fully populated channel state machine which // Otherwise, we create a fully populated channel state machine which
// uses the db channel as backing storage. // uses the db channel as backing storage.
return lnwallet.NewLightningChannel(r.server.cc.wallet.Signer, nil, return lnwallet.NewLightningChannel(r.server.cc.wallet.Cfg.Signer, nil,
r.server.cc.feeEstimator, dbChan) r.server.cc.feeEstimator, dbChan)
} }
@ -881,7 +881,7 @@ func (r *rpcServer) ChannelBalance(ctx context.Context,
var balance btcutil.Amount var balance btcutil.Amount
for _, channel := range channels { for _, channel := range channels {
if !channel.IsPending { if !channel.IsPending {
balance += channel.OurBalance balance += channel.LocalBalance
} }
} }
@ -918,17 +918,17 @@ func (r *rpcServer) PendingChannels(ctx context.Context,
// broadcast. // broadcast.
// TODO(roasbeef): query for funding tx from wallet, display // TODO(roasbeef): query for funding tx from wallet, display
// that also? // that also?
utx := btcutil.NewTx(pendingChan.OurCommitTx) utx := btcutil.NewTx(&pendingChan.CommitTx)
commitBaseWeight := blockchain.GetTransactionWeight(utx) commitBaseWeight := blockchain.GetTransactionWeight(utx)
commitWeight := commitBaseWeight + lnwallet.WitnessCommitmentTxWeight commitWeight := commitBaseWeight + lnwallet.WitnessCommitmentTxWeight
resp.PendingOpenChannels[i] = &lnrpc.PendingChannelResponse_PendingOpenChannel{ resp.PendingOpenChannels[i] = &lnrpc.PendingChannelResponse_PendingOpenChannel{
Channel: &lnrpc.PendingChannelResponse_PendingChannel{ Channel: &lnrpc.PendingChannelResponse_PendingChannel{
RemoteNodePub: hex.EncodeToString(pub), RemoteNodePub: hex.EncodeToString(pub),
ChannelPoint: pendingChan.ChanID.String(), ChannelPoint: pendingChan.FundingOutpoint.String(),
Capacity: int64(pendingChan.Capacity), Capacity: int64(pendingChan.Capacity),
LocalBalance: int64(pendingChan.OurBalance), LocalBalance: int64(pendingChan.LocalBalance),
RemoteBalance: int64(pendingChan.TheirBalance), RemoteBalance: int64(pendingChan.RemoteBalance),
}, },
CommitWeight: commitWeight, CommitWeight: commitWeight,
CommitFee: int64(pendingChan.CommitFee), CommitFee: int64(pendingChan.CommitFee),
@ -1047,12 +1047,12 @@ func (r *rpcServer) ListChannels(ctx context.Context,
nodePub := dbChannel.IdentityPub nodePub := dbChannel.IdentityPub
nodeID := hex.EncodeToString(nodePub.SerializeCompressed()) nodeID := hex.EncodeToString(nodePub.SerializeCompressed())
chanPoint := dbChannel.ChanID chanPoint := dbChannel.FundingOutpoint
// With the channel point known, retrieve the network channel // With the channel point known, retrieve the network channel
// ID from the database. // ID from the database.
var chanID uint64 var chanID uint64
chanID, _ = graph.ChannelID(chanPoint) chanID, _ = graph.ChannelID(&chanPoint)
var peerOnline bool var peerOnline bool
if _, err := r.server.findPeer(nodePub); err == nil { if _, err := r.server.findPeer(nodePub); err == nil {
@ -1064,7 +1064,7 @@ func (r *rpcServer) ListChannels(ctx context.Context,
// estimated weight of the witness to calculate the weight of // estimated weight of the witness to calculate the weight of
// the transaction if it were to be immediately unilaterally // the transaction if it were to be immediately unilaterally
// broadcast. // broadcast.
utx := btcutil.NewTx(dbChannel.OurCommitTx) utx := btcutil.NewTx(&dbChannel.CommitTx)
commitBaseWeight := blockchain.GetTransactionWeight(utx) commitBaseWeight := blockchain.GetTransactionWeight(utx)
commitWeight := commitBaseWeight + lnwallet.WitnessCommitmentTxWeight commitWeight := commitBaseWeight + lnwallet.WitnessCommitmentTxWeight
@ -1074,8 +1074,8 @@ func (r *rpcServer) ListChannels(ctx context.Context,
ChannelPoint: chanPoint.String(), ChannelPoint: chanPoint.String(),
ChanId: chanID, ChanId: chanID,
Capacity: int64(dbChannel.Capacity), Capacity: int64(dbChannel.Capacity),
LocalBalance: int64(dbChannel.OurBalance), LocalBalance: int64(dbChannel.LocalBalance),
RemoteBalance: int64(dbChannel.TheirBalance), RemoteBalance: int64(dbChannel.RemoteBalance),
CommitFee: int64(dbChannel.CommitFee), CommitFee: int64(dbChannel.CommitFee),
CommitWeight: commitWeight, CommitWeight: commitWeight,
FeePerKw: int64(dbChannel.FeePerKw), FeePerKw: int64(dbChannel.FeePerKw),
@ -1091,7 +1091,6 @@ func (r *rpcServer) ListChannels(ctx context.Context,
Amount: int64(htlc.Amt), Amount: int64(htlc.Amt),
HashLock: htlc.RHash[:], HashLock: htlc.RHash[:],
ExpirationHeight: htlc.RefundTimeout, ExpirationHeight: htlc.RefundTimeout,
RevocationDelay: htlc.RevocationDelay,
} }
} }