Merge pull request #8642 from Roasbeef/kvdb-update

kvdb: bump to sqldb/v1.0.1

go.mod

@@ -36,10 +36,10 @@ require (
  github.com/lightningnetwork/lnd/cert v1.2.2
  github.com/lightningnetwork/lnd/clock v1.1.1
  github.com/lightningnetwork/lnd/fn v1.0.5
- github.com/lightningnetwork/lnd/healthcheck v1.2.3
+ github.com/lightningnetwork/lnd/healthcheck v1.2.4
  github.com/lightningnetwork/lnd/kvdb v1.4.5
  github.com/lightningnetwork/lnd/queue v1.1.1
- github.com/lightningnetwork/lnd/sqldb v1.0.0
+ github.com/lightningnetwork/lnd/sqldb v1.0.1
  github.com/lightningnetwork/lnd/ticker v1.1.1
  github.com/lightningnetwork/lnd/tlv v1.2.3
  github.com/lightningnetwork/lnd/tor v1.1.2
@@ -207,10 +207,6 @@ replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-d
 // https://github.com/lightningnetwork/lnd/pull/8611.
 replace github.com/lightningnetwork/lnd/kvdb => ./kvdb
 
-// Temporary replace rule until sqldb is tagged with changes from
-// https://github.com/lightningnetwork/lnd/pull/8611.
-replace github.com/lightningnetwork/lnd/sqldb => ./sqldb
-
 // If you change this please also update .github/pull_request_template.md and
 // docs/INSTALL.md.
 go 1.21.4

go.sum

@@ -447,10 +447,12 @@ github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsD
 github.com/lightningnetwork/lnd/clock v1.1.1/go.mod h1:mGnAhPyjYZQJmebS7aevElXKTFDuO+uNFFfMXK1W8xQ=
 github.com/lightningnetwork/lnd/fn v1.0.5 h1:ffDgMSn83avw6rNzxhbt6w5/2oIrwQKTPGfyaLupZtE=
 github.com/lightningnetwork/lnd/fn v1.0.5/go.mod h1:P027+0CyELd92H9gnReUkGGAqbFA1HwjHWdfaDFD51U=
-github.com/lightningnetwork/lnd/healthcheck v1.2.3 h1:oqhOOy8WmIEa6RBkYKC0mmYZkhl8T2kGD97n9jpML8o=
-github.com/lightningnetwork/lnd/healthcheck v1.2.3/go.mod h1:eDxH3dEwV9DeBW/6inrmlVh1qBOFV0AI14EEPnGt9gc=
+github.com/lightningnetwork/lnd/healthcheck v1.2.4 h1:lLPLac+p/TllByxGSlkCwkJlkddqMP5UCoawCj3mgFQ=
+github.com/lightningnetwork/lnd/healthcheck v1.2.4/go.mod h1:G7Tst2tVvWo7cx6mSBEToQC5L1XOGxzZTPB29g9Rv2I=
 github.com/lightningnetwork/lnd/queue v1.1.1 h1:99ovBlpM9B0FRCGYJo6RSFDlt8/vOkQQZznVb18iNMI=
 github.com/lightningnetwork/lnd/queue v1.1.1/go.mod h1:7A6nC1Qrm32FHuhx/mi1cieAiBZo5O6l8IBIoQxvkz4=
+github.com/lightningnetwork/lnd/sqldb v1.0.1 h1:lpNoJ6qRh3D02oeIUsKQLZUzjcgZ9ppMZNZnwrpBBmY=
+github.com/lightningnetwork/lnd/sqldb v1.0.1/go.mod h1:nSovU1U+gTPDWhfwmXu/kW8l8EJpwbvZQ05ijnkQzkA=
 github.com/lightningnetwork/lnd/ticker v1.1.1 h1:J/b6N2hibFtC7JLV77ULQp++QLtCwT6ijJlbdiZFbSM=
 github.com/lightningnetwork/lnd/ticker v1.1.1/go.mod h1:waPTRAAcwtu7Ji3+3k+u/xH5GHovTsCoSVpho0KDvdA=
 github.com/lightningnetwork/lnd/tlv v1.2.3 h1:If5ibokA/UoCBGuCKaY6Vn2SJU0l9uAbehCnhTZjEP8=

kvdb/go.mod

@@ -7,8 +7,8 @@ require (
  github.com/fergusstrange/embedded-postgres v1.25.0
  github.com/google/btree v1.0.1
  github.com/jackc/pgx/v4 v4.18.1
- github.com/lightningnetwork/lnd/healthcheck v1.0.0
- github.com/lightningnetwork/lnd/sqldb v0.0.0-00010101000000-000000000000
+ github.com/lightningnetwork/lnd/healthcheck v1.2.4
+ github.com/lightningnetwork/lnd/sqldb v1.0.1
  github.com/stretchr/testify v1.9.0
  go.etcd.io/bbolt v1.3.7
  go.etcd.io/etcd/api/v3 v3.5.7
@@ -24,6 +24,8 @@ require (
  github.com/Microsoft/go-winio v0.6.1 // indirect
  github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
+ github.com/btcsuite/btcd v0.23.2 // indirect
+ github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
  github.com/cenkalti/backoff/v4 v4.1.3 // indirect
  github.com/cespare/xxhash/v2 v2.2.0 // indirect
  github.com/containerd/continuity v0.3.0 // indirect
@@ -58,11 +60,12 @@ require (
  github.com/jackc/pgtype v1.14.0 // indirect
  github.com/jonboulle/clockwork v0.2.2 // indirect
  github.com/json-iterator/go v1.1.11 // indirect
- github.com/kr/pretty v0.3.0 // indirect
  github.com/lib/pq v1.10.9 // indirect
- github.com/lightningnetwork/lnd/ticker v1.0.0 // indirect
+ github.com/lightningnetwork/lnd/ticker v1.1.0 // indirect
+ github.com/lightningnetwork/lnd/tor v1.0.0 // indirect
  github.com/mattn/go-isatty v0.0.16 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+ github.com/miekg/dns v1.1.43 // indirect
  github.com/mitchellh/mapstructure v1.4.1 // indirect
  github.com/moby/term v0.5.0 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -79,7 +82,6 @@ require (
  github.com/prometheus/common v0.26.0 // indirect
  github.com/prometheus/procfs v0.6.0 // indirect
  github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
- github.com/rogpeppe/go-internal v1.9.0 // indirect
  github.com/sirupsen/logrus v1.9.2 // indirect
  github.com/soheilhy/cmux v0.1.5 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
@@ -114,7 +116,6 @@ require (
  google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
  google.golang.org/grpc v1.59.0 // indirect
  google.golang.org/protobuf v1.31.0 // indirect
- gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
  gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -137,8 +138,4 @@ replace github.com/ulikunitz/xz => github.com/ulikunitz/xz v0.5.11
 // https://deps.dev/advisory/OSV/GO-2021-0053?from=%2Fgo%2Fgithub.com%252Fgogo%252Fprotobuf%2Fv1.3.1
 replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
 
-// Temporary replace rule until sqldb is tagged with changes from
-// https://github.com/lightningnetwork/lnd/pull/8611.
-replace github.com/lightningnetwork/lnd/sqldb => ../sqldb
-
 go 1.21.4