Skip to content

Commit c9192f3

Browse files
authored
Merge pull request #1300 from lightninglabs/bump-lnd-v0.21-tapd-v0.8
multi: bump lnd to v0.21, taproot-assets to v0.8
2 parents 58e0c1e + fac7c42 commit c9192f3

28 files changed

Lines changed: 2622 additions & 2903 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
# If you change this value, please change it in the following files as well:
2222
# /Dockerfile
2323
# /dev.Dockerfile
24-
GO_VERSION: 1.25.5
24+
GO_VERSION: 1.25.10
2525

2626
jobs:
2727
########################

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN apk add --no-cache --update alpine-sdk \
3232

3333
# The first stage is already done and all static assets should now be generated
3434
# in the app/build sub directory.
35-
FROM golang:1.25.5-alpine3.23@sha256:ac09a5f469f307e5da71e766b0bd59c9c49ea460a528cc3e6686513d64a6f1fb as golangbuilder
35+
FROM golang:1.25.10-alpine3.23@sha256:8d22e29d960bc50cd025d93d5b7c7d220b1ee9aa7a239b3c8f55a57e987e8d45 as golangbuilder
3636

3737
# Instead of checking out from git again, we just copy the whole working
3838
# directory of the previous stage that includes the generated static assets.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ PUBLIC_URL :=
2222
# GO_VERSION is the Go version used for the release build, docker files, and
2323
# GitHub Actions. This is the reference version for the project. All other Go
2424
# versions are checked against this version.
25-
GO_VERSION = 1.25.5
25+
GO_VERSION = 1.25.10
2626

2727
LOOP_COMMIT := $(shell cat go.mod | \
2828
grep $(LOOP_PKG) | \

accounts/checkers.go

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -82,34 +82,6 @@ type AccountChecker struct {
8282
func NewAccountChecker(service Service,
8383
chainParams *chaincfg.Params) *AccountChecker {
8484

85-
// sendResponseHandler is a response handler function that is used by
86-
// multiple RPC checkers for checking an RPC response sent for a payment
87-
// attempt.
88-
sendResponseHandler := func(ctx context.Context,
89-
r *lnrpc.SendResponse) (proto.Message, error) {
90-
91-
status := lnrpc.Payment_IN_FLIGHT
92-
if len(r.PaymentError) > 0 {
93-
status = lnrpc.Payment_FAILED
94-
}
95-
96-
hash, err := lntypes.MakeHash(r.PaymentHash)
97-
if err != nil {
98-
return nil, fmt.Errorf("error parsing payment hash: %v",
99-
err)
100-
}
101-
102-
route := r.PaymentRoute
103-
totalAmount := int64(0)
104-
if route != nil {
105-
totalAmount = route.TotalAmtMsat + route.TotalFeesMsat
106-
}
107-
108-
return checkSendResponse(
109-
ctx, service, status, hash, totalAmount,
110-
)
111-
}
112-
11385
// nolint:ll
11486
checkers := CheckerMap{
11587
// Invoices:
@@ -178,29 +150,6 @@ func NewAccountChecker(service Service,
178150
),
179151

180152
// Payments:
181-
"/lnrpc.Lightning/SendPayment": mid.NewFullChecker(
182-
&lnrpc.SendRequest{},
183-
&lnrpc.SendResponse{},
184-
func(ctx context.Context, r *lnrpc.SendRequest) error {
185-
return checkSend(
186-
ctx, chainParams, service, r.Amt,
187-
r.AmtMsat, r.PaymentRequest,
188-
r.PaymentHash, r.FeeLimit,
189-
)
190-
}, sendResponseHandler, erroredPaymentHandler(service),
191-
),
192-
"/lnrpc.Lightning/SendPaymentSync": mid.NewFullChecker(
193-
&lnrpc.SendRequest{},
194-
&lnrpc.SendResponse{},
195-
func(ctx context.Context, r *lnrpc.SendRequest) error {
196-
return checkSend(
197-
ctx, chainParams, service, r.Amt,
198-
r.AmtMsat, r.PaymentRequest,
199-
r.PaymentHash, r.FeeLimit,
200-
)
201-
}, sendResponseHandler, erroredPaymentHandler(service),
202-
),
203-
// routerrpc.Router/SendPayment is deprecated.
204153
"/routerrpc.Router/SendPaymentV2": mid.NewFullChecker(
205154
&routerrpc.SendPaymentRequest{},
206155
&lnrpc.Payment{},
@@ -240,29 +189,6 @@ func NewAccountChecker(service Service,
240189
)
241190
}, erroredPaymentHandler(service),
242191
),
243-
"/lnrpc.Lightning/SendToRoute": mid.NewFullChecker(
244-
&lnrpc.SendToRouteRequest{},
245-
&lnrpc.SendResponse{},
246-
func(ctx context.Context,
247-
r *lnrpc.SendToRouteRequest) error {
248-
249-
return checkSendToRoute(
250-
ctx, service, r.PaymentHash, r.Route,
251-
)
252-
}, sendResponseHandler, erroredPaymentHandler(service),
253-
),
254-
"/lnrpc.Lightning/SendToRouteSync": mid.NewFullChecker(
255-
&lnrpc.SendToRouteRequest{},
256-
&lnrpc.SendResponse{},
257-
func(ctx context.Context,
258-
r *lnrpc.SendToRouteRequest) error {
259-
260-
return checkSendToRoute(
261-
ctx, service, r.PaymentHash, r.Route,
262-
)
263-
}, sendResponseHandler, erroredPaymentHandler(service),
264-
),
265-
// routerrpc.Router/SendToRoute is deprecated.
266192
"/routerrpc.Router/SendToRouteV2": mid.NewFullChecker(
267193
&routerrpc.SendToRouteRequest{},
268194
&lnrpc.HTLCAttempt{},

0 commit comments

Comments
 (0)