Skip to content

Commit a2ddacb

Browse files
committed
build(temp): bump tapd & lnd
1 parent 3fb07b4 commit a2ddacb

File tree

6 files changed

+127
-105
lines changed

6 files changed

+127
-105
lines changed

accounts/service.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010
"github.com/btcsuite/btcd/btcutil"
1111
"github.com/btcsuite/btcd/chaincfg"
1212
"github.com/lightninglabs/lndclient"
13-
"github.com/lightningnetwork/lnd/channeldb"
1413
"github.com/lightningnetwork/lnd/fn"
1514
invpkg "github.com/lightningnetwork/lnd/invoices"
1615
"github.com/lightningnetwork/lnd/lnrpc"
1716
"github.com/lightningnetwork/lnd/lntypes"
1817
"github.com/lightningnetwork/lnd/lnwire"
18+
paymentsdb "github.com/lightningnetwork/lnd/payments/db"
1919
)
2020

2121
// Config holds the configuration options for the accounts service.
@@ -739,7 +739,7 @@ func (s *InterceptorService) TrackPayment(ctx context.Context, id AccountID,
739739
// startup, to make sure we don't miss any
740740
// payments.
741741
if errors.Is(
742-
err, channeldb.ErrPaymentNotInitiated,
742+
err, paymentsdb.ErrPaymentNotInitiated,
743743
) {
744744

745745
log.Debugf("Payment %v not initiated, "+

accounts/service_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import (
77
"time"
88

99
"github.com/lightninglabs/lndclient"
10-
"github.com/lightningnetwork/lnd/channeldb"
1110
"github.com/lightningnetwork/lnd/clock"
1211
invpkg "github.com/lightningnetwork/lnd/invoices"
1312
"github.com/lightningnetwork/lnd/lnrpc"
1413
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
1514
"github.com/lightningnetwork/lnd/lntypes"
15+
paymentsdb "github.com/lightningnetwork/lnd/payments/db"
1616
"github.com/stretchr/testify/require"
1717
)
1818

@@ -585,7 +585,7 @@ func TestAccountService(t *testing.T) {
585585
require.ErrorIs(t, err, ErrAccBalanceInsufficient)
586586

587587
// Now signal that the payment was non-initiated.
588-
r.paymentErrChan <- channeldb.ErrPaymentNotInitiated
588+
r.paymentErrChan <- paymentsdb.ErrPaymentNotInitiated
589589

590590
// Once the error is handled in the service.TrackPayment
591591
// goroutine, and therefore free up the 2000 in-flight

go.mod

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ require (
3232
github.com/lightninglabs/pool v0.6.6-beta
3333
github.com/lightninglabs/pool/auctioneerrpc v1.1.3
3434
github.com/lightninglabs/pool/poolrpc v1.0.1
35-
github.com/lightninglabs/taproot-assets v0.6.1-0.20250729190616-3f323918a96e
36-
github.com/lightninglabs/taproot-assets/taprpc v1.0.10-0.20250729190616-3f323918a96e
37-
github.com/lightningnetwork/lnd v0.19.3-beta.rc1
35+
github.com/lightninglabs/taproot-assets v0.6.1-0.20250901160900-74d98bfe2b1d
36+
github.com/lightninglabs/taproot-assets/taprpc v1.0.10-0.20250828130158-77f942076c03
37+
github.com/lightningnetwork/lnd v0.19.3-beta.rc2
3838
github.com/lightningnetwork/lnd/cert v1.2.2
3939
github.com/lightningnetwork/lnd/clock v1.1.1
4040
github.com/lightningnetwork/lnd/fn v1.2.5
4141
github.com/lightningnetwork/lnd/fn/v2 v2.0.8
4242
github.com/lightningnetwork/lnd/kvdb v1.4.16
43-
github.com/lightningnetwork/lnd/sqldb v1.0.11-0.20250623231731-45c15646c68b
43+
github.com/lightningnetwork/lnd/sqldb v1.0.11-0.20250820143531-0c2f045f5def
4444
github.com/lightningnetwork/lnd/tlv v1.3.2
4545
github.com/lightningnetwork/lnd/tor v1.1.6
4646
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
@@ -50,12 +50,12 @@ require (
5050
github.com/stretchr/testify v1.10.0
5151
github.com/urfave/cli v1.22.14
5252
go.etcd.io/bbolt v1.3.11
53-
golang.org/x/crypto v0.36.0
54-
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8
55-
golang.org/x/net v0.38.0
56-
golang.org/x/sync v0.12.0
53+
golang.org/x/crypto v0.37.0
54+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
55+
golang.org/x/net v0.39.0
56+
golang.org/x/sync v0.13.0
5757
google.golang.org/grpc v1.65.0
58-
google.golang.org/protobuf v1.34.2
58+
google.golang.org/protobuf v1.36.5
5959
gopkg.in/macaroon-bakery.v2 v2.3.0
6060
gopkg.in/macaroon.v2 v2.1.0
6161
modernc.org/sqlite v1.34.5
@@ -96,17 +96,17 @@ require (
9696
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
9797
github.com/decred/dcrd/lru v1.1.2 // indirect
9898
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
99-
github.com/docker/cli v28.0.1+incompatible // indirect
100-
github.com/docker/docker v28.0.1+incompatible // indirect
99+
github.com/docker/cli v28.1.1+incompatible // indirect
100+
github.com/docker/docker v28.1.1+incompatible // indirect
101101
github.com/docker/go-connections v0.5.0 // indirect
102102
github.com/docker/go-units v0.5.0 // indirect
103103
github.com/dustin/go-humanize v1.0.1 // indirect
104104
github.com/fergusstrange/embedded-postgres v1.25.0 // indirect
105105
github.com/fortytw2/leaktest v1.3.0 // indirect
106-
github.com/go-logr/logr v1.4.2 // indirect
106+
github.com/go-logr/logr v1.4.3 // indirect
107107
github.com/go-logr/stdr v1.2.2 // indirect
108108
github.com/go-macaroon-bakery/macaroonpb v1.0.0 // indirect
109-
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
109+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
110110
github.com/goccy/go-yaml v1.15.23 // indirect
111111
github.com/gogo/protobuf v1.3.2 // indirect
112112
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
@@ -127,12 +127,12 @@ require (
127127
github.com/jackc/pgio v1.0.0 // indirect
128128
github.com/jackc/pgpassfile v1.0.0 // indirect
129129
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
130-
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
131-
github.com/jackc/pgtype v1.14.0 // indirect
132-
github.com/jackc/pgx/v4 v4.18.2 // indirect
133-
github.com/jackc/pgx/v5 v5.6.0 // indirect
130+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
131+
github.com/jackc/pgtype v1.14.4 // indirect
132+
github.com/jackc/pgx/v4 v4.18.3 // indirect
133+
github.com/jackc/pgx/v5 v5.7.4 // indirect
134134
github.com/jackc/puddle v1.3.0 // indirect
135-
github.com/jackc/puddle/v2 v2.2.1 // indirect
135+
github.com/jackc/puddle/v2 v2.2.2 // indirect
136136
github.com/jackpal/gateway v1.0.5 // indirect
137137
github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad // indirect
138138
github.com/jedib0t/go-pretty/v6 v6.2.7 // indirect
@@ -148,7 +148,7 @@ require (
148148
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3 // indirect
149149
github.com/lightninglabs/neutrino v0.16.1 // indirect
150150
github.com/lightninglabs/neutrino/cache v1.1.2 // indirect
151-
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb // indirect
151+
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240815225420-8b40adf04ab9 // indirect
152152
github.com/lightningnetwork/lnd/healthcheck v1.2.6 // indirect
153153
github.com/lightningnetwork/lnd/queue v1.1.1 // indirect
154154
github.com/lightningnetwork/lnd/ticker v1.1.1 // indirect
@@ -180,7 +180,7 @@ require (
180180
github.com/shopspring/decimal v1.3.1 // indirect
181181
github.com/sirupsen/logrus v1.9.3 // indirect
182182
github.com/soheilhy/cmux v0.1.5 // indirect
183-
github.com/spf13/pflag v1.0.5 // indirect
183+
github.com/spf13/pflag v1.0.6 // indirect
184184
github.com/stretchr/objx v0.5.2 // indirect
185185
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
186186
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
@@ -200,23 +200,23 @@ require (
200200
go.etcd.io/etcd/server/v3 v3.5.12 // indirect
201201
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
202202
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
203-
go.opentelemetry.io/otel v1.36.0 // indirect
203+
go.opentelemetry.io/otel v1.37.0 // indirect
204204
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect
205205
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
206-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
207-
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
208-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
206+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
207+
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
208+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
209209
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
210210
go.uber.org/atomic v1.10.0 // indirect
211211
go.uber.org/mock v0.4.0 // indirect
212212
go.uber.org/multierr v1.6.0 // indirect
213-
go.uber.org/zap v1.23.0 // indirect
214-
golang.org/x/mod v0.21.0 // indirect
213+
go.uber.org/zap v1.24.0 // indirect
214+
golang.org/x/mod v0.24.0 // indirect
215215
golang.org/x/sys v0.33.0 // indirect
216-
golang.org/x/term v0.30.0 // indirect
217-
golang.org/x/text v0.23.0 // indirect
216+
golang.org/x/term v0.31.0 // indirect
217+
golang.org/x/text v0.24.0 // indirect
218218
golang.org/x/time v0.5.0 // indirect
219-
golang.org/x/tools v0.24.0 // indirect
219+
golang.org/x/tools v0.31.0 // indirect
220220
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
221221
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
222222
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
@@ -247,3 +247,13 @@ replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-d
247247
// it is a replace in the tapd repository, it doesn't get propagated here
248248
// automatically, so we need to add it manually.
249249
replace github.com/golang-migrate/migrate/v4 => github.com/lightninglabs/migrate/v4 v4.18.2-9023d66a-fork-pr-2
250+
251+
replace github.com/lightningnetwork/lnd => github.com/GeorgeTsagk/lnd v0.0.0-20250901145709-e24e285e3e38
252+
253+
replace github.com/lightningnetwork/lnd/sqldb => github.com/GeorgeTsagk/lnd/sqldb v0.0.0-20250901145709-e24e285e3e38
254+
255+
replace github.com/lightninglabs/lndclient => github.com/GeorgeTsagk/lndclient v0.0.0-20250828124156-45b539c2e6b7
256+
257+
replace github.com/lightninglabs/loop => github.com/GeorgeTsagk/loop v0.0.0-20250828133616-fd2640b33446
258+
259+
replace github.com/lightninglabs/loop/looprpc => github.com/GeorgeTsagk/loop/looprpc v0.0.0-20250828133616-fd2640b33446

0 commit comments

Comments
 (0)