Add pebble as valid value for --db-type.

api/keystore/keystore.go

@@ -14,7 +14,6 @@ import (
 	"github.com/ava-labs/avalanchego/chains/atomic"
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/database/encdb"
-	"github.com/ava-labs/avalanchego/database/manager"
 	"github.com/ava-labs/avalanchego/database/prefixdb"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/utils/json"
@@ -105,13 +104,12 @@ type keystore struct {
 	bcDB   database.Database
 }
 
-func New(log logging.Logger, dbManager manager.Manager) Keystore {
-	currentDB := dbManager.Current()
+func New(log logging.Logger, db database.Database) Keystore {
 	return &keystore{
 		log:                log,
 		usernameToPassword: make(map[string]*password.Hash),
-		userDB:             prefixdb.New(usersPrefix, currentDB.Database),
-		bcDB:               prefixdb.New(bcsPrefix, currentDB.Database),
+		userDB:             prefixdb.New(usersPrefix, db),
+		bcDB:               prefixdb.New(bcsPrefix, db),
 	}
 }
 

api/keystore/service.go

@@ -10,11 +10,8 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/ava-labs/avalanchego/api"
-	"github.com/ava-labs/avalanchego/database/manager"
-	"github.com/ava-labs/avalanchego/database/memdb"
 	"github.com/ava-labs/avalanchego/utils/formatting"
 	"github.com/ava-labs/avalanchego/utils/logging"
-	"github.com/ava-labs/avalanchego/version"
 )
 
 type service struct {
@@ -115,17 +112,3 @@ func (s *service) ExportUser(_ *http.Request, args *ExportUserArgs, reply *Expor
 	reply.Encoding = args.Encoding
 	return nil
 }
-
-// CreateTestKeystore returns a new keystore that can be utilized for testing
-func CreateTestKeystore() (Keystore, error) {
-	dbManager, err := manager.NewManagerFromDBs([]*manager.VersionedDatabase{
-		{
-			Database: memdb.New(),
-			Version:  version.Semantic1_0_0,
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-	return New(logging.NoLog{}, dbManager), nil
-}

api/keystore/service_test.go

@@ -11,8 +11,10 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/ava-labs/avalanchego/api"
+	"github.com/ava-labs/avalanchego/database/memdb"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/utils/formatting"
+	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/password"
 )
 
@@ -23,8 +25,7 @@ var strongPassword = "N_+=_jJ;^(<;{4,:*m6CET}'&N;83FYK.wtNpwp-Jt" // #nosec G101
 func TestServiceListNoUsers(t *testing.T) {
 	require := require.New(t)
 
-	ks, err := CreateTestKeystore()
-	require.NoError(err)
+	ks := New(logging.NoLog{}, memdb.New())
 	s := service{ks: ks.(*keystore)}
 
 	reply := ListUsersReply{}
@@ -35,8 +36,7 @@ func TestServiceListNoUsers(t *testing.T) {
 func TestServiceCreateUser(t *testing.T) {
 	require := require.New(t)
 
-	ks, err := CreateTestKeystore()
-	require.NoError(err)
+	ks := New(logging.NoLog{}, memdb.New())
 	s := service{ks: ks.(*keystore)}
 
 	{
@@ -66,8 +66,7 @@ func genStr(n int) string {
 func TestServiceCreateUserArgsCheck(t *testing.T) {
 	require := require.New(t)
 
-	ks, err := CreateTestKeystore()
-	require.NoError(err)
+	ks := New(logging.NoLog{}, memdb.New())
 	s := service{ks: ks.(*keystore)}
 
 	{
@@ -100,8 +99,7 @@ func TestServiceCreateUserArgsCheck(t *testing.T) {
 func TestServiceCreateUserWeakPassword(t *testing.T) {
 	require := require.New(t)
 
-	ks, err := CreateTestKeystore()
-	require.NoError(err)
+	ks := New(logging.NoLog{}, memdb.New())
 	s := service{ks: ks.(*keystore)}
 
 	{
@@ -117,8 +115,7 @@ func TestServiceCreateUserWeakPassword(t *testing.T) {
 func TestServiceCreateDuplicate(t *testing.T) {
 	require := require.New(t)
 
-	ks, err := CreateTestKeystore()
-	require.NoError(err)
+	ks := New(logging.NoLog{}, memdb.New())
 	s := service{ks: ks.(*keystore)}
 
 	{
@@ -140,12 +137,11 @@ func TestServiceCreateDuplicate(t *testing.T) {
 func TestServiceCreateUserNoName(t *testing.T) {
 	require := require.New(t)
 
-	ks, err := CreateTestKeystore()
-	require.NoError(err)
+	ks := New(logging.NoLog{}, memdb.New())
 	s := service{ks: ks.(*keystore)}
 
 	reply := api.EmptyReply{}
-	err = s.CreateUser(nil, &api.UserPass{
+	err := s.CreateUser(nil, &api.UserPass{
 		Password: strongPassword,
 	}, &reply)
 	require.ErrorIs(err, errEmptyUsername)
@@ -154,8 +150,7 @@ func TestServiceCreateUserNoName(t *testing.T) {
 func TestServiceUseBlockchainDB(t *testing.T) {
 	require := require.New(t)
 
-	ks, err := CreateTestKeystore()
-	require.NoError(err)
+	ks := New(logging.NoLog{}, memdb.New())
 	s := service{ks: ks.(*keystore)}
 
 	{
@@ -185,8 +180,7 @@ func TestServiceExportImport(t *testing.T) {
 
 	encodings := []formatting.Encoding{formatting.Hex}
 	for _, encoding := range encodings {
-		ks, err := CreateTestKeystore()
-		require.NoError(err)
+		ks := New(logging.NoLog{}, memdb.New())
 		s := service{ks: ks.(*keystore)}
 
 		{
@@ -212,8 +206,7 @@ func TestServiceExportImport(t *testing.T) {
 		exportReply := ExportUserReply{}
 		require.NoError(s.ExportUser(nil, &exportArgs, &exportReply))
 
-		newKS, err := CreateTestKeystore()
-		require.NoError(err)
+		newKS := New(logging.NoLog{}, memdb.New())
 		newS := service{ks: newKS.(*keystore)}
 
 		{
@@ -324,16 +317,15 @@ func TestServiceDeleteUser(t *testing.T) {
 		t.Run(tt.desc, func(t *testing.T) {
 			require := require.New(t)
 
-			ksIntf, err := CreateTestKeystore()
-			require.NoError(err)
+			ksIntf := New(logging.NoLog{}, memdb.New())
 			ks := ksIntf.(*keystore)
 			s := service{ks: ks}
 
 			if tt.setup != nil {
 				require.NoError(tt.setup(ks))
 			}
 			got := &api.EmptyReply{}
-			err = s.DeleteUser(nil, tt.request, got)
+			err := s.DeleteUser(nil, tt.request, got)
 			require.ErrorIs(err, tt.expectedErr)
 			if tt.expectedErr != nil {
 				return

chains/linearizable_vm.go

@@ -7,13 +7,12 @@ import (
 	"context"
 
 	"github.com/ava-labs/avalanchego/api/metrics"
+	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/snow"
 	"github.com/ava-labs/avalanchego/snow/engine/avalanche/vertex"
 	"github.com/ava-labs/avalanchego/snow/engine/common"
 	"github.com/ava-labs/avalanchego/snow/engine/snowman/block"
-
-	dbManager "github.com/ava-labs/avalanchego/database/manager"
 )
 
 var (
@@ -32,7 +31,7 @@ type initializeOnLinearizeVM struct {
 
 	registerer   metrics.OptionalGatherer
 	ctx          *snow.Context
-	dbManager    dbManager.Manager
+	db           database.Database
 	genesisBytes []byte
 	upgradeBytes []byte
 	configBytes  []byte
@@ -47,7 +46,7 @@ func (vm *initializeOnLinearizeVM) Linearize(ctx context.Context, stopVertexID i
 	return vm.vmToInitialize.Initialize(
 		ctx,
 		vm.ctx,
-		vm.dbManager,
+		vm.db,
 		vm.genesisBytes,
 		vm.upgradeBytes,
 		vm.configBytes,
@@ -74,7 +73,7 @@ func NewLinearizeOnInitializeVM(vm vertex.LinearizableVMWithEngine) *linearizeOn
 func (vm *linearizeOnInitializeVM) Initialize(
 	ctx context.Context,
 	_ *snow.Context,
-	_ dbManager.Manager,
+	_ database.Database,
 	_ []byte,
 	_ []byte,
 	_ []byte,

chains/manager.go

@@ -23,6 +23,8 @@ import (
 	"github.com/ava-labs/avalanchego/api/metrics"
 	"github.com/ava-labs/avalanchego/api/server"
 	"github.com/ava-labs/avalanchego/chains/atomic"
+	"github.com/ava-labs/avalanchego/database"
+	"github.com/ava-labs/avalanchego/database/meterdb"
 	"github.com/ava-labs/avalanchego/database/prefixdb"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/message"
@@ -57,7 +59,6 @@ import (
 	"github.com/ava-labs/avalanchego/vms/proposervm"
 	"github.com/ava-labs/avalanchego/vms/tracedvm"
 
-	dbManager "github.com/ava-labs/avalanchego/database/manager"
 	timetracker "github.com/ava-labs/avalanchego/snow/networking/tracker"
 
 	aveng "github.com/ava-labs/avalanchego/snow/engine/avalanche"
@@ -180,7 +181,7 @@ type ManagerConfig struct {
 	BlockAcceptorGroup          snow.AcceptorGroup
 	TxAcceptorGroup             snow.AcceptorGroup
 	VertexAcceptorGroup         snow.AcceptorGroup
-	DBManager                   dbManager.Manager
+	DB                          database.Database
 	MsgCreator                  message.OutboundMsgBuilder // message creator, shared with network
 	Router                      router.Router              // Routes incoming messages to the appropriate chain
 	Net                         network.Network            // Sends consensus messages to other validators
@@ -596,18 +597,16 @@ func (m *manager) createAvalancheChain(
 		State: snow.Initializing,
 	})
 
-	meterDBManager, err := m.DBManager.NewMeterDBManager("db", ctx.Registerer)
+	meterDB, err := meterdb.New("db", ctx.Registerer, m.DB)
 	if err != nil {
 		return nil, err
 	}
-	prefixDBManager := meterDBManager.NewPrefixDBManager(ctx.ChainID[:])
-	vmDBManager := prefixDBManager.NewPrefixDBManager(vmDBPrefix)
-
-	db := prefixDBManager.Current()
-	vertexDB := prefixdb.New(vertexDBPrefix, db.Database)
-	vertexBootstrappingDB := prefixdb.New(vertexBootstrappingDBPrefix, db.Database)
-	txBootstrappingDB := prefixdb.New(txBootstrappingDBPrefix, db.Database)
-	blockBootstrappingDB := prefixdb.New(blockBootstrappingDBPrefix, db.Database)
+	prefixDB := prefixdb.New(ctx.ChainID[:], meterDB)
+	vmDB := prefixdb.New(vmDBPrefix, prefixDB)
+	vertexDB := prefixdb.New(vertexDBPrefix, prefixDB)
+	vertexBootstrappingDB := prefixdb.New(vertexBootstrappingDBPrefix, prefixDB)
+	txBootstrappingDB := prefixdb.New(txBootstrappingDBPrefix, prefixDB)
+	blockBootstrappingDB := prefixdb.New(blockBootstrappingDBPrefix, prefixDB)
 
 	vtxBlocker, err := queue.NewWithMissing(vertexBootstrappingDB, "vtx", ctx.AvalancheRegisterer)
 	if err != nil {
@@ -730,7 +729,7 @@ func (m *manager) createAvalancheChain(
 	err = dagVM.Initialize(
 		context.TODO(),
 		ctx.Context,
-		vmDBManager,
+		vmDB,
 		genesisData,
 		chainConfig.Upgrade,
 		chainConfig.Config,
@@ -796,7 +795,7 @@ func (m *manager) createAvalancheChain(
 
 		registerer:   snowmanRegisterer,
 		ctx:          ctx.Context,
-		dbManager:    vmDBManager,
+		db:           vmDB,
 		genesisBytes: genesisData,
 		upgradeBytes: chainConfig.Upgrade,
 		configBytes:  chainConfig.Config,
@@ -1004,15 +1003,13 @@ func (m *manager) createSnowmanChain(
 		State: snow.Initializing,
 	})
 
-	meterDBManager, err := m.DBManager.NewMeterDBManager("db", ctx.Registerer)
+	meterDB, err := meterdb.New("db", ctx.Registerer, m.DB)
 	if err != nil {
 		return nil, err
 	}
-	prefixDBManager := meterDBManager.NewPrefixDBManager(ctx.ChainID[:])
-	vmDBManager := prefixDBManager.NewPrefixDBManager(vmDBPrefix)
-
-	db := prefixDBManager.Current()
-	bootstrappingDB := prefixdb.New(bootstrappingDB, db.Database)
+	prefixDB := prefixdb.New(ctx.ChainID[:], meterDB)
+	vmDB := prefixdb.New(vmDBPrefix, prefixDB)
+	bootstrappingDB := prefixdb.New(bootstrappingDB, prefixDB)
 
 	blocked, err := queue.NewWithMissing(bootstrappingDB, "block", ctx.Registerer)
 	if err != nil {
@@ -1145,7 +1142,7 @@ func (m *manager) createSnowmanChain(
 	if err := vm.Initialize(
 		context.TODO(),
 		ctx.Context,
-		vmDBManager,
+		vmDB,
 		genesisData,
 		chainConfig.Upgrade,
 		chainConfig.Config,

config/flags.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/ava-labs/avalanchego/database/leveldb"
 	"github.com/ava-labs/avalanchego/database/memdb"
+	"github.com/ava-labs/avalanchego/database/pebble"
 	"github.com/ava-labs/avalanchego/genesis"
 	"github.com/ava-labs/avalanchego/snow/consensus/snowball"
 	"github.com/ava-labs/avalanchego/trace"
@@ -103,7 +104,7 @@ func addNodeFlags(fs *pflag.FlagSet) {
 	fs.Uint64(AddSubnetDelegatorFeeKey, genesis.LocalParams.AddSubnetDelegatorFee, "Transaction fee, in nAVAX, for transactions that add new subnet delegators")
 
 	// Database
-	fs.String(DBTypeKey, leveldb.Name, fmt.Sprintf("Database type to use. Should be one of {%s, %s}", leveldb.Name, memdb.Name))
+	fs.String(DBTypeKey, leveldb.Name, fmt.Sprintf("Database type to use. Must be one of {%s, %s, %s}", leveldb.Name, memdb.Name, pebble.Name))
 	fs.String(DBPathKey, defaultDBDir, "Path to database directory")
 	fs.String(DBConfigFileKey, "", fmt.Sprintf("Path to database config file. Ignored if %s is specified", DBConfigContentKey))
 	fs.String(DBConfigContentKey, "", "Specifies base64 encoded database config content")