Merge pull request #10339 from ellemouton/g175Prep3

[g175:2] graph/db: v2 columns and v2 node CRUD

Author: ellemouton

autopilot/prefattach_test.go

@@ -31,12 +31,14 @@ type testGraph interface {
 }
 
 type testDBGraph struct {
-	db *graphdb.ChannelGraph
+	db *graphdb.VersionedGraph
 	databaseChannelGraph
 }
 
 func newDiskChanGraph(t *testing.T) (testGraph, error) {
-	graphDB := graphdb.MakeTestGraph(t)
+	graphDB := graphdb.NewVersionedGraph(
+		graphdb.MakeTestGraph(t), lnwire.GossipVersion1,
+	)
 	require.NoError(t, graphDB.Start())
 	t.Cleanup(func() {
 		require.NoError(t, graphDB.Stop())

config_builder.go

@@ -1096,7 +1096,7 @@ func (d *DefaultDatabaseBuilder) BuildDatabase(
 
 	// The graph store implementation we will use depends on whether
 	// native SQL is enabled or not.
-	var graphStore graphdb.V1Store
+	var graphStore graphdb.Store
 
 	// Instantiate a native SQL store if the flag is set.
 	if d.cfg.DB.UseNativeSQL {

docs/release-notes/release-notes-0.21.0.md

@@ -68,6 +68,8 @@
 * Freeze the [graph SQL migration 
   code](https://github.com/lightningnetwork/lnd/pull/10338) to prevent the 
   need for maintenance as the sqlc code evolves. 
+* Prepare the graph DB for handling gossip [V2 
+  nodes](https://github.com/lightningnetwork/lnd/pull/10339). 
 
 ## Code Health
 

graph/builder.go

@@ -111,7 +111,8 @@ type Builder struct {
 
 	bestHeight atomic.Uint32
 
-	cfg *Config
+	cfg     *Config
+	v1Graph *graphdb.VersionedGraph
 
 	// newBlocks is a channel in which new blocks connected to the end of
 	// the main chain are sent over, and blocks updated after a call to
@@ -146,7 +147,11 @@ var _ ChannelGraphSource = (*Builder)(nil)
 // NewBuilder constructs a new Builder.
 func NewBuilder(cfg *Config) (*Builder, error) {
 	return &Builder{
-		cfg:            cfg,
+		cfg: cfg,
+		// For now, we'll just use V1 graph reader.
+		v1Graph: graphdb.NewVersionedGraph(
+			cfg.Graph, lnwire.GossipVersion1,
+		),
 		channelEdgeMtx: multimutex.NewMutex[uint64](),
 		statTicker:     ticker.New(defaultStatInterval),
 		stats:          new(builderStats),
@@ -874,7 +879,7 @@ func (b *Builder) assertNodeAnnFreshness(ctx context.Context, node route.Vertex,
 	// node announcements, we will ignore such nodes. If we do know about
 	// this node, check that this update brings info newer than what we
 	// already have.
-	lastUpdate, exists, err := b.cfg.Graph.HasNode(ctx, node)
+	lastUpdate, exists, err := b.cfg.Graph.HasV1Node(ctx, node)
 	if err != nil {
 		return fmt.Errorf("unable to query for the "+
 			"existence of node: %w", err)
@@ -1266,7 +1271,7 @@ func (b *Builder) GetChannelByID(chanID lnwire.ShortChannelID) (
 func (b *Builder) FetchNode(ctx context.Context,
 	node route.Vertex) (*models.Node, error) {
 
-	return b.cfg.Graph.FetchNode(ctx, node)
+	return b.v1Graph.FetchNode(ctx, node)
 }
 
 // ForAllOutgoingChannels is used to iterate over all outgoing channels owned by

graph/builder_test.go

@@ -359,7 +359,7 @@ func TestWakeUpOnStaleBranch(t *testing.T) {
 	// Create new router with same graph database.
 	router, err := NewBuilder(&Config{
 		SelfNode:           selfNode.PubKeyBytes,
-		Graph:              ctx.graph,
+		Graph:              ctx.graph.ChannelGraph,
 		Chain:              ctx.chain,
 		ChainView:          ctx.chainView,
 		ChannelPruneExpiry: time.Hour * 24,
@@ -1595,7 +1595,9 @@ func parseTestGraph(t *testing.T, useCache bool, path string) (
 	}
 
 	return &testGraphInstance{
-		graph:      graph,
+		graph: graphdb.NewVersionedGraph(
+			graph, lnwire.GossipVersion1,
+		),
 		aliasMap:   aliasMap,
 		privKeyMap: privKeyMap,
 		channelIDs: channelIDs,
@@ -1690,7 +1692,7 @@ func asymmetricTestChannel(alias1, alias2 string, capacity btcutil.Amount,
 
 // assertChannelsPruned ensures that only the given channels are pruned from the
 // graph out of the set of all channels.
-func assertChannelsPruned(t *testing.T, graph *graphdb.ChannelGraph,
+func assertChannelsPruned(t *testing.T, graph *graphdb.VersionedGraph,
 	channels []*testChannel, prunedChanIDs ...uint64) {
 
 	t.Helper()
@@ -1980,7 +1982,9 @@ func createTestGraphFromChannels(t *testing.T, useCache bool,
 	}
 
 	return &testGraphInstance{
-		graph:      graph,
+		graph: graphdb.NewVersionedGraph(
+			graph, lnwire.GossipVersion1,
+		),
 		aliasMap:   aliasMap,
 		privKeyMap: privKeyMap,
 		links:      links,

graph/db/benchmark_test.go

@@ -72,19 +72,19 @@ var (
 // and a function to open the connection.
 type dbConnection struct {
 	name string
-	open func(testing.TB) V1Store
+	open func(testing.TB) Store
 }
 
 // This var block defines the various database connections that we will use
 // for testing. Each connection is defined as a dbConnection struct that
 // contains a name and an open function. The open function is used to create
-// a new V1Store instance for the given database type.
+// a new Store instance for the given database type.
 var (
 	// kvdbBBoltConn is a connection to a kvdb-bbolt database called
 	// channel.db.
 	kvdbBBoltConn = dbConnection{
 		name: "kvdb-bbolt",
-		open: func(b testing.TB) V1Store {
+		open: func(b testing.TB) Store {
 			return connectBBoltDB(b, bboltDBPath, kvdbBBoltFile)
 		},
 	}
@@ -93,7 +93,7 @@ var (
 	// channel.sqlite.
 	kvdbSqliteConn = dbConnection{
 		name: "kvdb-sqlite",
-		open: func(b testing.TB) V1Store {
+		open: func(b testing.TB) Store {
 			return connectKVDBSqlite(
 				b, kvdbSqlitePath, kvdbSqliteFile,
 			)
@@ -104,7 +104,7 @@ var (
 	// called lnd.sqlite.
 	nativeSQLSqliteConn = dbConnection{
 		name: "native-sqlite",
-		open: func(b testing.TB) V1Store {
+		open: func(b testing.TB) Store {
 			return connectNativeSQLite(
 				b, sqldb.DefaultSQLiteConfig(),
 				nativeSQLSqlitePath, nativeSQLSqliteFile,
@@ -116,7 +116,7 @@ var (
 	// using a postgres connection string.
 	kvdbPostgresConn = dbConnection{
 		name: "kvdb-postgres",
-		open: func(b testing.TB) V1Store {
+		open: func(b testing.TB) Store {
 			return connectKVDBPostgres(b, kvdbPostgresDNS)
 		},
 	}
@@ -125,7 +125,7 @@ var (
 	// database using a postgres connection string.
 	nativeSQLPostgresConn = dbConnection{
 		name: "native-postgres",
-		open: func(b testing.TB) V1Store {
+		open: func(b testing.TB) Store {
 			return connectNativePostgres(
 				b, sqldb.DefaultPostgresConfig(),
 				nativeSQLPostgresDNS,
@@ -134,10 +134,10 @@ var (
 	}
 )
 
-// connectNativePostgres creates a V1Store instance backed by a native Postgres
+// connectNativePostgres creates a Store instance backed by a native Postgres
 // database for testing purposes.
 func connectNativePostgres(t testing.TB, cfg *sqldb.QueryConfig,
-	dsn string) V1Store {
+	dsn string) Store {
 
 	return newSQLStore(t, cfg, sqlPostgres(t, dsn))
 }
@@ -157,10 +157,10 @@ func sqlPostgres(t testing.TB, dsn string) BatchedSQLQueries {
 	return newSQLExecutor(t, store)
 }
 
-// connectNativeSQLite creates a V1Store instance backed by a native SQLite
+// connectNativeSQLite creates a Store instance backed by a native SQLite
 // database for testing purposes.
 func connectNativeSQLite(t testing.TB, cfg *sqldb.QueryConfig, dbPath,
-	file string) V1Store {
+	file string) Store {
 
 	return newSQLStore(t, cfg, sqlSQLite(t, dbPath, file))
 }
@@ -205,9 +205,9 @@ func kvdbPostgres(t testing.TB, dsn string) kvdb.Backend {
 	return kvStore
 }
 
-// connectKVDBPostgres creates a V1Store instance backed by a kvdb-postgres
+// connectKVDBPostgres creates a Store instance backed by a kvdb-postgres
 // database for testing purposes.
-func connectKVDBPostgres(t testing.TB, dsn string) V1Store {
+func connectKVDBPostgres(t testing.TB, dsn string) Store {
 	return newKVStore(t, kvdbPostgres(t, dsn))
 }
 
@@ -231,14 +231,14 @@ func kvdbSqlite(t testing.TB, dbPath, fileName string) kvdb.Backend {
 	return kvStore
 }
 
-// connectKVDBSqlite creates a V1Store instance backed by a kvdb-sqlite
+// connectKVDBSqlite creates a Store instance backed by a kvdb-sqlite
 // database for testing purposes.
-func connectKVDBSqlite(t testing.TB, dbPath, fileName string) V1Store {
+func connectKVDBSqlite(t testing.TB, dbPath, fileName string) Store {
 	return newKVStore(t, kvdbSqlite(t, dbPath, fileName))
 }
 
 // connectBBoltDB creates a new BBolt database connection for testing.
-func connectBBoltDB(t testing.TB, dbPath, fileName string) V1Store {
+func connectBBoltDB(t testing.TB, dbPath, fileName string) Store {
 	return newKVStore(t, kvdbBBolt(t, dbPath, fileName))
 }
 
@@ -261,7 +261,7 @@ func kvdbBBolt(t testing.TB, dbPath, fileName string) kvdb.Backend {
 
 // newKVStore creates a new KVStore instance for testing using a provided
 // kvdb.Backend instance.
-func newKVStore(t testing.TB, backend kvdb.Backend) V1Store {
+func newKVStore(t testing.TB, backend kvdb.Backend) Store {
 	store, err := NewKVStore(backend, testStoreOptions...)
 	require.NoError(t, err)
 
@@ -286,7 +286,7 @@ func newSQLExecutor(t testing.TB, db sqldb.DB) BatchedSQLQueries {
 // newSQLStore creates a new SQLStore instance for testing using a provided
 // sqldb.DB instance.
 func newSQLStore(t testing.TB, cfg *sqldb.QueryConfig,
-	db BatchedSQLQueries) V1Store {
+	db BatchedSQLQueries) Store {
 
 	store, err := NewSQLStore(
 		&SQLStoreConfig{
@@ -587,7 +587,7 @@ func BenchmarkCacheLoading(b *testing.B) {
 	}
 }
 
-// BenchmarkGraphReadMethods benchmarks various read calls of various V1Store
+// BenchmarkGraphReadMethods benchmarks various read calls of various Store
 // implementations.
 //
 // NOTE: this is to be run against a local graph database. It can be run
@@ -614,11 +614,11 @@ func BenchmarkGraphReadMethods(b *testing.B) {
 
 	tests := []struct {
 		name string
-		fn   func(b testing.TB, store V1Store)
+		fn   func(b testing.TB, store Store)
 	}{
 		{
 			name: "ForEachNode",
-			fn: func(b testing.TB, store V1Store) {
+			fn: func(b testing.TB, store Store) {
 				err := store.ForEachNode(
 					ctx,
 					func(_ *models.Node) error {
@@ -635,7 +635,7 @@ func BenchmarkGraphReadMethods(b *testing.B) {
 		},
 		{
 			name: "ForEachChannel",
-			fn: func(b testing.TB, store V1Store) {
+			fn: func(b testing.TB, store Store) {
 				//nolint:ll
 				err := store.ForEachChannel(
 					ctx, func(_ *models.ChannelEdgeInfo,
@@ -655,7 +655,7 @@ func BenchmarkGraphReadMethods(b *testing.B) {
 		},
 		{
 			name: "NodeUpdatesInHorizon",
-			fn: func(b testing.TB, store V1Store) {
+			fn: func(b testing.TB, store Store) {
 				iter := store.NodeUpdatesInHorizon(
 					time.Unix(0, 0), time.Now(),
 				)
@@ -665,7 +665,7 @@ func BenchmarkGraphReadMethods(b *testing.B) {
 		},
 		{
 			name: "ForEachNodeCacheable",
-			fn: func(b testing.TB, store V1Store) {
+			fn: func(b testing.TB, store Store) {
 				err := store.ForEachNodeCacheable(
 					ctx, func(_ route.Vertex,
 						_ *lnwire.FeatureVector) error {
@@ -683,7 +683,7 @@ func BenchmarkGraphReadMethods(b *testing.B) {
 		},
 		{
 			name: "ForEachNodeCached",
-			fn: func(b testing.TB, store V1Store) {
+			fn: func(b testing.TB, store Store) {
 				//nolint:ll
 				err := store.ForEachNodeCached(
 					ctx, false, func(context.Context,
@@ -704,7 +704,7 @@ func BenchmarkGraphReadMethods(b *testing.B) {
 		},
 		{
 			name: "ChanUpdatesInHorizon",
-			fn: func(b testing.TB, store V1Store) {
+			fn: func(b testing.TB, store Store) {
 				iter := store.ChanUpdatesInHorizon(
 					time.Unix(0, 0), time.Now(),
 				)