From d63bc2e23736faeb36382f0390443b724af360b5 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Thu, 28 May 2026 11:59:27 +0200 Subject: [PATCH] mod: drop queue + kvdb replaces, require tagged versions In this commit, we drop the in-tree replace directives for the queue and kvdb submodules now that both have proper tags. queue/v1.2.0 carries the BackpressureQueue[T] work, and kvdb/v1.5.0 completes the pgx/v4 -> pgx/v5 migration. Both tags point at the same commit where each module last changed, so swapping the local copies for the tagged versions doesn't change what we build. We keep the sqldb replace for now: that one's still waiting on the gossip V2 sqldb changes before we can cut its tag. --- go.mod | 10 ++-------- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 0c6d51c50..1e9f9e979 100644 --- a/go.mod +++ b/go.mod @@ -38,8 +38,8 @@ require ( github.com/lightningnetwork/lnd/clock v1.1.1 github.com/lightningnetwork/lnd/fn/v2 v2.0.9 github.com/lightningnetwork/lnd/healthcheck v1.2.6 - github.com/lightningnetwork/lnd/kvdb v1.4.16 - github.com/lightningnetwork/lnd/queue v1.1.1 + github.com/lightningnetwork/lnd/kvdb v1.5.0 + github.com/lightningnetwork/lnd/queue v1.2.0 github.com/lightningnetwork/lnd/sqldb v1.0.11 github.com/lightningnetwork/lnd/ticker v1.1.1 github.com/lightningnetwork/lnd/tlv v1.3.2 @@ -197,15 +197,9 @@ require ( sigs.k8s.io/yaml v1.2.0 // indirect ) -// TODO(gijs): remove once new queue package is released. -replace github.com/lightningnetwork/lnd/queue => ./queue - // TODO(elle): remove once the gossip V2 sqldb changes have been made. replace github.com/lightningnetwork/lnd/sqldb => ./sqldb -// TODO: remove once kvdb with pgx/v5 is released. -replace github.com/lightningnetwork/lnd/kvdb => ./kvdb - // This replace is for https://github.com/advisories/GHSA-25xm-hr59-7c27 replace github.com/ulikunitz/xz => github.com/ulikunitz/xz v0.5.11 diff --git a/go.sum b/go.sum index d905a5da2..0d03a3852 100644 --- a/go.sum +++ b/go.sum @@ -321,6 +321,10 @@ github.com/lightningnetwork/lnd/fn/v2 v2.0.9 h1:ZytG4ltPac/sCyg1EJDn10RGzPIDJeye github.com/lightningnetwork/lnd/fn/v2 v2.0.9/go.mod h1:aPUJHJ31S+Lgoo8I5SxDIjnmeCifqujaiTXKZqpav3w= github.com/lightningnetwork/lnd/healthcheck v1.2.6 h1:1sWhqr93GdkWy4+6U7JxBfcyZIE78MhIHTJZfPx7qqI= github.com/lightningnetwork/lnd/healthcheck v1.2.6/go.mod h1:Mu02um4CWY/zdTOvFje7WJgJcHyX2zq/FG3MhOAiGaQ= +github.com/lightningnetwork/lnd/kvdb v1.5.0 h1:Mglu7tGUdpFv8mDQTBIS2S8kwAz66MXlqUYUeaZ2+YQ= +github.com/lightningnetwork/lnd/kvdb v1.5.0/go.mod h1:SxUoxWaMpyErZ2GM7maz661NQqwS8J/PUUQv6fnhzOI= +github.com/lightningnetwork/lnd/queue v1.2.0 h1:sSrn+u84OLuOT/F+xGxgg8VfknXeIZEAFQoMH6BL60s= +github.com/lightningnetwork/lnd/queue v1.2.0/go.mod h1:qLNP0L3B7piRGvDyhAyJKic4xTt+Mw4D7mWrQeuAwxY= 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.3.2 h1:MO4FCk7F4k5xPMqVZF6Nb/kOpxlwPrUQpYjmyKny5s0=