loopdb: switch to go.etcd.io/bbolt

starius · starius · commit 06e1858e5baf · 2025-03-12T21:40:10.000-03:00
github.com/coreos/bbolt has race conditions: golang/go#54690
diff --git a/go.mod b/go.mod
@@ -9,7 +9,6 @@ require (
 	github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c // indirect
 	github.com/btcsuite/btcwallet v0.16.10-0.20241127094224-93c858b2ad63
 	github.com/btcsuite/btcwallet/wtxmgr v1.5.4
-	github.com/coreos/bbolt v1.3.3
 	github.com/davecgh/go-spew v1.1.1
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
 	github.com/fortytw2/leaktest v1.3.0
@@ -35,6 +34,7 @@ require (
 	github.com/ory/dockertest/v3 v3.10.0
 	github.com/stretchr/testify v1.9.0
 	github.com/urfave/cli v1.22.9
+	go.etcd.io/bbolt v1.3.11
 	golang.org/x/net v0.33.0
 	google.golang.org/grpc v1.64.1
 	google.golang.org/protobuf v1.34.2
@@ -164,7 +164,6 @@ require (
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
 	gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
-	go.etcd.io/bbolt v1.3.11 // indirect
 	go.etcd.io/etcd/api/v3 v3.5.12 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
 	go.etcd.io/etcd/client/v2 v2.305.12 // indirect
diff --git a/go.sum b/go.sum
@@ -732,8 +732,6 @@ github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD9
 github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
 github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
 github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM=
-github.com/coreos/bbolt v1.3.3 h1:n6AiVyVRKQFNb6mJlwESEvvLoDyiTzXX7ORAUlkeBdY=
-github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
diff --git a/loopd/daemon.go b/loopd/daemon.go
@@ -12,7 +12,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/coreos/bbolt"
 	proxy "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop"
@@ -33,6 +32,7 @@ import (
 	"github.com/lightningnetwork/lnd/clock"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/lightningnetwork/lnd/macaroons"
+	"go.etcd.io/bbolt"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/encoding/protojson"
 	"gopkg.in/macaroon-bakery.v2/bakery"
diff --git a/loopdb/loopin.go b/loopdb/loopin.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/coreos/bbolt"
 	"github.com/lightninglabs/loop/labels"
 	"github.com/lightningnetwork/lnd/routing/route"
+	"go.etcd.io/bbolt"
 )
 
 // LoopInContract contains the data that is serialized to persistent storage for
diff --git a/loopdb/meta.go b/loopdb/meta.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/btcsuite/btcd/chaincfg"
-	"github.com/coreos/bbolt"
+	"go.etcd.io/bbolt"
 )
 
 var (
diff --git a/loopdb/migration_01_costs.go b/loopdb/migration_01_costs.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/btcsuite/btcd/chaincfg"
-	"github.com/coreos/bbolt"
+	"go.etcd.io/bbolt"
 )
 
 // noMigrationAvailable is the fall back migration in case there is no migration
diff --git a/loopdb/migration_02_swap_publication_deadline.go b/loopdb/migration_02_swap_publication_deadline.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/btcsuite/btcd/chaincfg"
-	"github.com/coreos/bbolt"
+	"go.etcd.io/bbolt"
 )
 
 // migrateSwapPublicationDeadline migrates the database to v02, by adding the
diff --git a/loopdb/migration_03_last_hop.go b/loopdb/migration_03_last_hop.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/btcsuite/btcd/chaincfg"
-	"github.com/coreos/bbolt"
+	"go.etcd.io/bbolt"
 )
 
 // migrateLastHop migrates the database to v03, replacing the never used loop in
diff --git a/loopdb/migration_04_updates.go b/loopdb/migration_04_updates.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/btcsuite/btcd/chaincfg"
-	"github.com/coreos/bbolt"
+	"go.etcd.io/bbolt"
 )
 
 // migrateUpdates migrates the swap updates to add an additional level of
diff --git a/loopdb/migration_04_updates_test.go b/loopdb/migration_04_updates_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/btcsuite/btcd/chaincfg"
-	"github.com/coreos/bbolt"
 	"github.com/stretchr/testify/require"
+	"go.etcd.io/bbolt"
 )
 
 // TestMigrationUpdates asserts that the swap updates migration is carried out
diff --git a/loopdb/raw_db_test.go b/loopdb/raw_db_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/coreos/bbolt"
+	"go.etcd.io/bbolt"
 )
 
 // DumpDB dumps go code describing the contents of the database to stdout. This
diff --git a/loopdb/store.go b/loopdb/store.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
-	"github.com/coreos/bbolt"
 	"github.com/lightningnetwork/lnd/lntypes"
+	"go.etcd.io/bbolt"
 )
 
 var (
diff --git a/loopdb/store_test.go b/loopdb/store_test.go
@@ -11,12 +11,12 @@ import (
 
 	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
-	"github.com/coreos/bbolt"
 	"github.com/lightninglabs/loop/test"
 	"github.com/lightningnetwork/lnd/keychain"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/lightningnetwork/lnd/routing/route"
 	"github.com/stretchr/testify/require"
+	"go.etcd.io/bbolt"
 )
 
 var (

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ import (`
`6`	`6`	`"fmt"`
`7`	`7`	`"time"`
`8`	`8`
`9`		`- "github.com/coreos/bbolt"`
`10`	`9`	`"github.com/lightninglabs/loop/labels"`
`11`	`10`	`"github.com/lightningnetwork/lnd/routing/route"`
	`11`	`+ "go.etcd.io/bbolt"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// LoopInContract contains the data that is serialized to persistent storage for`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`
`7`	`7`	`"github.com/btcsuite/btcd/chaincfg"`
`8`		`- "github.com/coreos/bbolt"`
	`8`	`+ "go.etcd.io/bbolt"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"fmt"`
`7`	`7`
`8`	`8`	`"github.com/btcsuite/btcd/chaincfg"`
`9`		`- "github.com/coreos/bbolt"`
	`9`	`+ "go.etcd.io/bbolt"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// migrateSwapPublicationDeadline migrates the database to v02, by adding the`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import (`
`8`	`8`	`"testing"`
`9`	`9`
`10`	`10`	`"github.com/btcsuite/btcd/chaincfg"`
`11`		`- "github.com/coreos/bbolt"`
`12`	`11`	`"github.com/stretchr/testify/require"`
	`12`	`+ "go.etcd.io/bbolt"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`// TestMigrationUpdates asserts that the swap updates migration is carried out`