Skip to content

Commit 32d0cd9

Browse files
joostjagerjoostjager
committed
lndclient: update to new routerrpc
1 parent 8301abd commit 32d0cd9

File tree

5 files changed

+41
-48
lines changed

5 files changed

+41
-48
lines changed

‎go.mod‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@ module github.com/lightninglabs/loop
33
require (
44
github.com/btcsuite/btcd v0.20.1-beta
55
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
6-
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d
6+
github.com/btcsuite/btcutil v1.0.2
77
github.com/coreos/bbolt v1.3.3
88
github.com/fortytw2/leaktest v1.3.0
99
github.com/golang/protobuf v1.3.2
1010
github.com/google/go-cmp v0.3.1 // indirect
1111
github.com/grpc-ecosystem/grpc-gateway v1.12.2
1212
github.com/jessevdk/go-flags v1.4.0
1313
github.com/lightninglabs/protobuf-hex-display v1.3.3-0.20191212020323-b444784ce75d
14-
github.com/lightningnetwork/lnd v0.9.0-beta-rc3.0.20200121213302-a2977c4438b5
15-
github.com/lightningnetwork/lnd/queue v1.0.2
14+
github.com/lightningnetwork/lnd v0.10.0-beta.rc1
15+
github.com/lightningnetwork/lnd/queue v1.0.3
1616
github.com/urfave/cli v1.20.0
17-
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 // indirect
1817
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
1918
golang.org/x/text v0.3.2 // indirect
2019
google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c

‎go.sum‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,22 @@ github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9
2727
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
2828
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d h1:yJzD/yFppdVCf6ApMkVy8cUxV0XrxdP9rVf6D87/Mng=
2929
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
30-
github.com/btcsuite/btcwallet v0.11.0 h1:XhwqdhEchy5a0q6R+y3F82roD2hYycPCHovgNyJS08w=
31-
github.com/btcsuite/btcwallet v0.11.0/go.mod h1:qtPAohN1ioo0pvJt/j7bZM8ANBWlYWVCVFL0kkijs7s=
30+
github.com/btcsuite/btcutil v1.0.2 h1:9iZ1Terx9fMIOtq1VrwdqfsATL9MC2l8ZrUY6YZ2uts=
31+
github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts=
32+
github.com/btcsuite/btcutil/psbt v1.0.2 h1:gCVY3KxdoEVU7Q6TjusPO+GANIwVgr9yTLqM+a6CZr8=
33+
github.com/btcsuite/btcutil/psbt v1.0.2/go.mod h1:LVveMu4VaNSkIRTZu2+ut0HDBRuYjqGocxDMNS1KuGQ=
34+
github.com/btcsuite/btcwallet v0.11.1-0.20200403222202-ada7ca077ebb h1:kkq2SSCy+OrC7GVZLIqutoHVR2yW4SJQdX70jtmuLDI=
35+
github.com/btcsuite/btcwallet v0.11.1-0.20200403222202-ada7ca077ebb/go.mod h1:9fJNm1aXi4q9P5Nk23mmqppCy1Le3f2/JMWj9UXKkCc=
3236
github.com/btcsuite/btcwallet/wallet/txauthor v1.0.0 h1:KGHMW5sd7yDdDMkCZ/JpP0KltolFsQcB973brBnfj4c=
3337
github.com/btcsuite/btcwallet/wallet/txauthor v1.0.0/go.mod h1:VufDts7bd/zs3GV13f/lXc/0lXrPnvxD/NvmpG/FEKU=
3438
github.com/btcsuite/btcwallet/wallet/txrules v1.0.0 h1:2VsfS0sBedcM5KmDzRMT3+b6xobqWveZGvjb+jFez5w=
3539
github.com/btcsuite/btcwallet/wallet/txrules v1.0.0/go.mod h1:UwQE78yCerZ313EXZwEiu3jNAtfXj2n2+c8RWiE/WNA=
3640
github.com/btcsuite/btcwallet/wallet/txsizes v1.0.0 h1:6DxkcoMnCPY4E9cUDPB5tbuuf40SmmMkSQkoE8vCT+s=
3741
github.com/btcsuite/btcwallet/wallet/txsizes v1.0.0/go.mod h1:pauEU8UuMFiThe5PB3EO+gO5kx87Me5NvdQDsTuq6cs=
3842
github.com/btcsuite/btcwallet/walletdb v1.0.0/go.mod h1:bZTy9RyYZh9fLnSua+/CD48TJtYJSHjjYcSaszuxCCk=
39-
github.com/btcsuite/btcwallet/walletdb v1.1.0 h1:JHAL7wZ8pX4SULabeAv/wPO9sseRWMGzE80lfVmRw6Y=
40-
github.com/btcsuite/btcwallet/walletdb v1.1.0/go.mod h1:bZTy9RyYZh9fLnSua+/CD48TJtYJSHjjYcSaszuxCCk=
43+
github.com/btcsuite/btcwallet/walletdb v1.2.0/go.mod h1:9cwc1Yyg4uvd4ZdfdoMnALji+V9gfWSMfxEdLdR5Vwc=
44+
github.com/btcsuite/btcwallet/walletdb v1.3.1 h1:lW1Ac3F1jJY4K11P+YQtRNcP5jFk27ASfrV7C6mvRU0=
45+
github.com/btcsuite/btcwallet/walletdb v1.3.1/go.mod h1:9cwc1Yyg4uvd4ZdfdoMnALji+V9gfWSMfxEdLdR5Vwc=
4146
github.com/btcsuite/btcwallet/wtxmgr v1.0.0 h1:aIHgViEmZmZfe0tQQqF1xyd2qBqFWxX5vZXkkbjtbeA=
4247
github.com/btcsuite/btcwallet/wtxmgr v1.0.0/go.mod h1:vc4gBprll6BP0UJ+AIGDaySoc7MdAmZf8kelfNb8CFY=
4348
github.com/btcsuite/fastsha256 v0.0.0-20160815193821-637e65642941 h1:kij1x2aL7VE6gtx8KMIt8PGPgI5GV9LgtHFG5KaEMPY=
@@ -137,18 +142,20 @@ github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf h1:HZKvJUHlcXI
137142
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf/go.mod h1:vxmQPeIQxPf6Jf9rM8R+B4rKBqLA2AjttNxkFBL2Plk=
138143
github.com/lightninglabs/neutrino v0.11.0 h1:lPpYFCtsfJX2W5zI4pWycPmbbBdr7zU+BafYdLoD6k0=
139144
github.com/lightninglabs/neutrino v0.11.0/go.mod h1:CuhF0iuzg9Sp2HO6ZgXgayviFTn1QHdSTJlMncK80wg=
145+
github.com/lightninglabs/neutrino v0.11.1-0.20200316235139-bffc52e8f200 h1:j4iZ1XlUAPQmW6oSzMcJGILYsRHNs+4O3Gk+2Ms5Dww=
146+
github.com/lightninglabs/neutrino v0.11.1-0.20200316235139-bffc52e8f200/go.mod h1:MlZmoKa7CJP3eR1s5yB7Rm5aSyadpKkxqAwLQmog7N0=
140147
github.com/lightninglabs/protobuf-hex-display v1.3.3-0.20191212020323-b444784ce75d h1:QWD/5MPnaZfUVP7P8wLa4M8Td2DI7XXHXt2vhVtUgGI=
141148
github.com/lightninglabs/protobuf-hex-display v1.3.3-0.20191212020323-b444784ce75d/go.mod h1:KDb67YMzoh4eudnzClmvs2FbiLG9vxISmLApUkCa4uI=
142149
github.com/lightningnetwork/lightning-onion v1.0.1 h1:qChGgS5+aPxFeR6JiUsGvanei1bn6WJpYbvosw/1604=
143150
github.com/lightningnetwork/lightning-onion v1.0.1/go.mod h1:rigfi6Af/KqsF7Za0hOgcyq2PNH4AN70AaMRxcJkff4=
144-
github.com/lightningnetwork/lnd v0.9.0-beta-rc3.0.20200121213302-a2977c4438b5 h1:qLO+I/7EggqegY8uu6k9TuE/5Tc5zV2L8gQGfgEV9LY=
145-
github.com/lightningnetwork/lnd v0.9.0-beta-rc3.0.20200121213302-a2977c4438b5/go.mod h1:sxMH8WLTqgERzBCrTrBCuDkT6SqAjZhnOWiAQSNzJ8A=
146-
github.com/lightningnetwork/lnd/cert v1.0.0 h1:J0gtf2UNQX2U+/j5cXnX2wIMSTuJuwrXv7m9qJr2wtw=
147-
github.com/lightningnetwork/lnd/cert v1.0.0/go.mod h1:fmtemlSMf5t4hsQmcprSoOykypAPp+9c+0d0iqTScMo=
151+
github.com/lightningnetwork/lnd v0.10.0-beta.rc1 h1:eCLOYu+Erw+GIxMJHbkTRn23eBVN3s7u188iyw3747Y=
152+
github.com/lightningnetwork/lnd v0.10.0-beta.rc1/go.mod h1:UNd+jGvZbtHFAR4syN6ab2euqh5DNzbVjjomZZFlCEY=
153+
github.com/lightningnetwork/lnd/cert v1.0.1 h1:D+FOL2J/MzoolaWSEZJZc5Qb7vqy6P8IX1HGzqHWnQM=
154+
github.com/lightningnetwork/lnd/cert v1.0.1/go.mod h1:fmtemlSMf5t4hsQmcprSoOykypAPp+9c+0d0iqTScMo=
148155
github.com/lightningnetwork/lnd/queue v1.0.1 h1:jzJKcTy3Nj5lQrooJ3aaw9Lau3I0IwvQR5sqtjdv2R0=
149156
github.com/lightningnetwork/lnd/queue v1.0.1/go.mod h1:vaQwexir73flPW43Mrm7JOgJHmcEFBWWSl9HlyASoms=
150-
github.com/lightningnetwork/lnd/queue v1.0.2 h1:Hx43fmTz2pDH4fIYDr57P/M5cB+GEMLzN+eif8576Xo=
151-
github.com/lightningnetwork/lnd/queue v1.0.2/go.mod h1:YTkTVZCxz8tAYreH27EO3s8572ODumWrNdYW2E/YKxg=
157+
github.com/lightningnetwork/lnd/queue v1.0.3 h1:5ufYVE7lh9GJnL1wOoeO3bZ3aAHWNnkNFHP7W1+NiJ8=
158+
github.com/lightningnetwork/lnd/queue v1.0.3/go.mod h1:YTkTVZCxz8tAYreH27EO3s8572ODumWrNdYW2E/YKxg=
152159
github.com/lightningnetwork/lnd/ticker v1.0.0 h1:S1b60TEGoTtCe2A0yeB+ecoj/kkS4qpwh6l+AkQEZwU=
153160
github.com/lightningnetwork/lnd/ticker v1.0.0/go.mod h1:iaLXJiVgI1sPANIF2qYYUJXjoksPNvGNYowB8aRbpX0=
154161
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 h1:sjOGyegMIhvgfq5oaue6Td+hxZuf3tDC8lAPrFldqFw=
@@ -200,8 +207,8 @@ golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb/go.mod h1:6SG95UA2DQfeDnf
200207
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
201208
golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
202209
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
203-
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 h1:Gv7RPwsi3eZ2Fgewe3CBsuOebPwO27PoXzRpJPsvSSM=
204-
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
210+
golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d h1:2+ZP7EfsZV7Vvmx3TIqSlSzATMkTAKqM14YGFPoSKjI=
211+
golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
205212
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
206213
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
207214
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -225,6 +232,7 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
225232
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
226233
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
227234
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
235+
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
228236
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
229237
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
230238
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

‎lndclient/router_client.go‎

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ type RouterClient interface {
3434

3535
// PaymentStatus describe the state of a payment.
3636
type PaymentStatus struct {
37-
State routerrpc.PaymentState
37+
State lnrpc.Payment_PaymentStatus
3838
Preimage lntypes.Preimage
3939
Fee lnwire.MilliSatoshi
40-
Route *route.Route
40+
Value lnwire.MilliSatoshi
4141
}
4242

4343
// SendPaymentRequest defines the payment parameters for a new payment.
@@ -170,7 +170,7 @@ func (r *routerClient) trackPayment(ctx context.Context,
170170
errorChan := make(chan error, 1)
171171
go func() {
172172
for {
173-
rpcStatus, err := stream.Recv()
173+
payment, err := stream.Recv()
174174
if err != nil {
175175
switch status.Convert(err).Code() {
176176

@@ -189,7 +189,7 @@ func (r *routerClient) trackPayment(ctx context.Context,
189189
return
190190
}
191191

192-
status, err := unmarshallPaymentStatus(rpcStatus)
192+
status, err := unmarshallPaymentStatus(payment)
193193
if err != nil {
194194
errorChan <- err
195195
return
@@ -208,33 +208,23 @@ func (r *routerClient) trackPayment(ctx context.Context,
208208

209209
// unmarshallPaymentStatus converts an rpc status update to the PaymentStatus
210210
// type that is used throughout the application.
211-
func unmarshallPaymentStatus(rpcStatus *routerrpc.PaymentStatus) (
211+
func unmarshallPaymentStatus(rpcPayment *lnrpc.Payment) (
212212
*PaymentStatus, error) {
213213

214214
status := PaymentStatus{
215-
State: rpcStatus.State,
215+
State: rpcPayment.Status,
216216
}
217217

218-
if status.State == routerrpc.PaymentState_SUCCEEDED {
219-
preimage, err := lntypes.MakePreimage(
220-
rpcStatus.Preimage,
218+
if status.State == lnrpc.Payment_SUCCEEDED {
219+
preimage, err := lntypes.MakePreimageFromStr(
220+
rpcPayment.PaymentPreimage,
221221
)
222222
if err != nil {
223223
return nil, err
224224
}
225225
status.Preimage = preimage
226-
227-
status.Fee = lnwire.MilliSatoshi(
228-
rpcStatus.Route.TotalFeesMsat,
229-
)
230-
231-
if rpcStatus.Route != nil {
232-
route, err := unmarshallRoute(rpcStatus.Route)
233-
if err != nil {
234-
return nil, err
235-
}
236-
status.Route = route
237-
}
226+
status.Fee = lnwire.MilliSatoshi(rpcPayment.FeeMsat)
227+
status.Value = lnwire.MilliSatoshi(rpcPayment.ValueMsat)
238228
}
239229

240230
return &status, nil

‎lsat/interceptor.go‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"github.com/btcsuite/btcutil"
1212
"github.com/lightninglabs/loop/lndclient"
13-
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
13+
"github.com/lightningnetwork/lnd/lnrpc"
1414
"github.com/lightningnetwork/lnd/lnwire"
1515
"github.com/lightningnetwork/lnd/macaroons"
1616
"github.com/lightningnetwork/lnd/zpay32"
@@ -399,13 +399,13 @@ func (i *Interceptor) trackPayment(ctx context.Context, token *Token) error {
399399
// If the payment was successful, we have all the
400400
// information we need and we can return the fully paid
401401
// token.
402-
case routerrpc.PaymentState_SUCCEEDED:
402+
case lnrpc.Payment_SUCCEEDED:
403403
extractPaymentDetails(token, result)
404404
return i.store.StoreToken(token)
405405

406406
// The payment is still in transit, we'll give it more
407407
// time to complete.
408-
case routerrpc.PaymentState_IN_FLIGHT:
408+
case lnrpc.Payment_IN_FLIGHT:
409409

410410
// Any other state means either error or timeout.
411411
default:
@@ -440,8 +440,6 @@ func isPaymentRequired(err error) bool {
440440
// from the payment status and stores them in the token.
441441
func extractPaymentDetails(token *Token, status lndclient.PaymentStatus) {
442442
token.Preimage = status.Preimage
443-
total := status.Route.TotalAmount
444-
fees := status.Route.TotalFees()
445-
token.AmountPaid = total - fees
446-
token.RoutingFeePaid = fees
443+
token.AmountPaid = status.Value
444+
token.RoutingFeePaid = status.Fee
447445
}

‎lsat/interceptor_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ import (
1111

1212
"github.com/lightninglabs/loop/lndclient"
1313
"github.com/lightninglabs/loop/test"
14-
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
14+
"github.com/lightningnetwork/lnd/lnrpc"
1515
"github.com/lightningnetwork/lnd/lntypes"
16-
"github.com/lightningnetwork/lnd/routing/route"
1716
"google.golang.org/grpc"
1817
"google.golang.org/grpc/status"
1918
"gopkg.in/macaroon.v2"
@@ -160,9 +159,8 @@ var (
160159
// return an error.
161160
resetBackend(nil, "")
162161
msg.Updates <- lndclient.PaymentStatus{
163-
State: routerrpc.PaymentState_SUCCEEDED,
162+
State: lnrpc.Payment_SUCCEEDED,
164163
Preimage: paidPreimage,
165-
Route: &route.Route{},
166164
}
167165
},
168166
expectToken: true,

0 commit comments

Comments
 (0)