Simplified db driver logic

Signed-off-by: Alexandros Filios <alexandros.filios@ibm.com>

Author: alexandrosfilios

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/gin-gonic/gin v1.10.0
 	github.com/gobuffalo/packr/v2 v2.7.1
 	github.com/hashicorp/go-uuid v1.0.3
-	github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250205113833-61674fc8947e
+	github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250210153725-90e0fbb00133
 	github.com/hyperledger-labs/orion-sdk-go v0.2.10
 	github.com/hyperledger-labs/orion-server v0.2.10
 	github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2

go.sum

@@ -1057,8 +1057,8 @@ github.com/hidal-go/hidalgo v0.0.0-20201109092204-05749a6d73df/go.mod h1:bPkrxDl
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
 github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
-github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250205113833-61674fc8947e h1:dbhZRYE6rJlnr2SoD0R0+w3Ci3oGguhZ8teK+cBVwLw=
-github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250205113833-61674fc8947e/go.mod h1:EdiA1cY2eOOZjqPlutIlFPkueUMMJOxLoiRH5KwOW1c=
+github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250210153725-90e0fbb00133 h1:UTyfnN+H+K9kK6TZw8ccal0+viXlf/RBHc7YiEY0XiU=
+github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250210153725-90e0fbb00133/go.mod h1:EdiA1cY2eOOZjqPlutIlFPkueUMMJOxLoiRH5KwOW1c=
 github.com/hyperledger-labs/orion-sdk-go v0.2.10 h1:lFgWgxyvngIhWnIqymYGBmtmq9D6uC5d0uLG9cbyh5s=
 github.com/hyperledger-labs/orion-sdk-go v0.2.10/go.mod h1:iN2xZB964AqwVJwL+EnwPOs8z1EkMEbbIg/qYeC7gDY=
 github.com/hyperledger-labs/orion-server v0.2.10 h1:G4zbQEL5Egk0Oj+TwHCZWdTOLDBHOjaAEvYOT4G7ozw=

token/sdk/dig/providers.go

@@ -8,120 +8,21 @@ package sdk
 
 import (
 	driver2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/driver"
-	sql2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/sql"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/core"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/driver"
-	dbconfig "github.com/hyperledger-labs/fabric-token-sdk/token/sdk/db"
-	"github.com/hyperledger-labs/fabric-token-sdk/token/services/auditdb"
-	config2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/config"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db"
 	dbdriver "github.com/hyperledger-labs/fabric-token-sdk/token/services/db/driver"
-	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/driver/unity"
-	"github.com/hyperledger-labs/fabric-token-sdk/token/services/identitydb"
-	"github.com/hyperledger-labs/fabric-token-sdk/token/services/tokendb"
-	tokensql "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokendb/db/sql"
-	"github.com/hyperledger-labs/fabric-token-sdk/token/services/tokenlockdb"
-	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttxdb"
 	"go.uber.org/dig"
 )
 
-// Token Lock DB
-
-func NewTokenLockDBManager(in struct {
-	dig.In
-	ConfigService  driver2.ConfigService
-	ConfigProvider *config2.Service
-	Drivers        []db.NamedDriver[dbdriver.TokenLockDBDriver] `group:"tokenlockdb-drivers"`
-}) *tokenlockdb.Manager {
-	return tokenlockdb.NewHolder(in.Drivers).NewManager(in.ConfigService, dbconfig.NewConfig(in.ConfigProvider, "tokenlockdb.persistence.type", "db.persistence.type"))
-}
-
-// Audit DB
-
-func NewAuditDBManager(in struct {
-	dig.In
-	ConfigService  driver2.ConfigService
-	ConfigProvider *config2.Service
-	Drivers        []db.NamedDriver[dbdriver.AuditDBDriver] `group:"auditdb-drivers"`
-}) *auditdb.Manager {
-	return auditdb.NewHolder(in.Drivers).NewManager(in.ConfigService, dbconfig.NewConfig(in.ConfigProvider, "auditdb.persistence.type", "db.persistence.type"))
-}
-
-// Transaction DB
-
-func NewTTXDBManager(in struct {
+func NewDriverHolder(in struct {
 	dig.In
-	ConfigService  driver2.ConfigService
-	ConfigProvider *config2.Service
-	Drivers        []db.NamedDriver[dbdriver.TTXDBDriver] `group:"ttxdb-drivers"`
-}) *ttxdb.Manager {
-	return ttxdb.NewHolder(in.Drivers).NewManager(in.ConfigService, dbconfig.NewConfig(in.ConfigProvider, "ttxdb.persistence.type", "db.persistence.type"))
+	Drivers        []dbdriver.NamedDriver `group:"token-db-drivers"`
+	ConfigProvider driver2.ConfigService
+}) *db.DriverHolder {
+	return db.NewDriverHolder(in.ConfigProvider, in.Drivers...)
 }
 
-// Identity DB
-
-func NewIdentityDBManager(in struct {
-	dig.In
-	ConfigService  driver2.ConfigService
-	ConfigProvider *config2.Service
-	Drivers        []db.NamedDriver[dbdriver.IdentityDBDriver] `group:"identitydb-drivers"`
-}) *identitydb.Manager {
-	return identitydb.NewManager(in.Drivers, in.ConfigService, dbconfig.NewConfig(in.ConfigProvider, "identitydb.persistence.type", "db.persistence.type"))
-}
-
-// Token DB
-
-type TokenDriverResult struct {
-	dig.Out
-	DBDriver       db.NamedDriver[dbdriver.TokenDBDriver]       `group:"tokendb-drivers"`
-	NotifierDriver db.NamedDriver[dbdriver.TokenNotifierDriver] `group:"tokennotifier-drivers"`
-}
-
-func NewTokenDrivers() TokenDriverResult {
-	return TokenDriverResult{
-		DBDriver:       db.NamedDriver[dbdriver.TokenDBDriver]{Name: sql2.SQLPersistence, Driver: tokensql.NewDBDriver()},
-		NotifierDriver: db.NamedDriver[dbdriver.TokenNotifierDriver]{Name: sql2.SQLPersistence, Driver: tokensql.NewNotifierDriver()},
-	}
-}
-
-func NewTokenManagers(in struct {
-	dig.In
-	ConfigService   driver2.ConfigService
-	ConfigProvider  *config2.Service
-	DBDrivers       []db.NamedDriver[dbdriver.TokenDBDriver]       `group:"tokendb-drivers"`
-	NotifierDrivers []db.NamedDriver[dbdriver.TokenNotifierDriver] `group:"tokennotifier-drivers"`
-}) (*tokendb.Manager, *tokendb.NotifierManager) {
-	dbConfig := dbconfig.NewConfig(in.ConfigProvider, "tokendb.persistence.type", "db.persistence.type")
-	return tokendb.NewHolder(in.DBDrivers).NewManager(in.ConfigService, dbConfig),
-		tokendb.NewNotifierHolder(in.NotifierDrivers).NewManager(in.ConfigService, dbConfig)
-}
-
-// Unity
-
-type DBDriverResult struct {
-	dig.Out
-	TTXDBDriver         db.NamedDriver[dbdriver.TTXDBDriver]         `group:"ttxdb-drivers"`
-	TokenDBDriver       db.NamedDriver[dbdriver.TokenDBDriver]       `group:"tokendb-drivers"`
-	TokenNotifierDriver db.NamedDriver[dbdriver.TokenNotifierDriver] `group:"tokennotifier-drivers"`
-	TokenLockDBDriver   db.NamedDriver[dbdriver.TokenLockDBDriver]   `group:"tokenlockdb-drivers"`
-	AuditDBDriver       db.NamedDriver[dbdriver.AuditDBDriver]       `group:"auditdb-drivers"`
-	IdentityDBDriver    db.NamedDriver[dbdriver.IdentityDBDriver]    `group:"identitydb-drivers"`
-}
-
-func NewDBDrivers() DBDriverResult {
-	ttxDBDriver, tokenDBDriver, tokenNotifierDriver, tokenLockDBDriver, auditDBDriver, identityDBDriver := unity.NewDBDrivers()
-	return DBDriverResult{
-		TTXDBDriver:         ttxDBDriver,
-		TokenDBDriver:       tokenDBDriver,
-		TokenNotifierDriver: tokenNotifierDriver,
-		TokenLockDBDriver:   tokenLockDBDriver,
-		AuditDBDriver:       auditDBDriver,
-		IdentityDBDriver:    identityDBDriver,
-	}
-}
-
-// Token SDK
-
 func newTokenDriverService(in struct {
 	dig.In
 	Drivers []core.NamedFactory[driver.Driver] `group:"token-drivers"`

token/sdk/dig/sdk.go

@@ -30,15 +30,17 @@ import (
 	"github.com/hyperledger-labs/fabric-token-sdk/token/sdk/tms"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/sdk/vault"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/auditdb"
-	auditdriver "github.com/hyperledger-labs/fabric-token-sdk/token/services/auditdb/db/sql"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/auditor"
 	_ "github.com/hyperledger-labs/fabric-token-sdk/token/services/certifier/dummy"
 	config2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/config"
+	db2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/db"
 	common2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/db/common"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/driver/memory"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/driver/sql"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/driver/unity"
 	identity2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity"
 	kvs2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/storage/kvs"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/identitydb"
-	identitydriver "github.com/hyperledger-labs/fabric-token-sdk/token/services/identitydb/db/sql"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/common"
@@ -47,11 +49,10 @@ import (
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/selector/sherdlock"
 	selector "github.com/hyperledger-labs/fabric-token-sdk/token/services/selector/simple"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/tokendb"
-	tokenlockdriver "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokenlockdb/db/sql"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/tokenlockdb"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttxdb"
-	ttxdriver "github.com/hyperledger-labs/fabric-token-sdk/token/services/ttxdb/db/sql"
 	"github.com/pkg/errors"
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/dig"
@@ -130,14 +131,28 @@ func (p *SDK) Install() error {
 				new(common2.TokenManagementServiceProvider),
 			),
 		),
-		p.Container().Provide(NewTTXDBManager),
+		p.Container().Provide(func(dh *db2.DriverHolder) *ttxdb.Manager {
+			return ttxdb.NewManager(dh, "ttxdb.persistence", "db.persistence")
+		}),
 		p.Container().Provide(digutils.Identity[*ttxdb.Manager](), dig.As(new(ttx.DBProvider), new(network2.TTXDBProvider))),
-		p.Container().Provide(NewTokenManagers),
+		p.Container().Provide(func(dh *db2.DriverHolder) *tokendb.Manager {
+			return tokendb.NewManager(dh, "tokendb.persistence", "db.persistence")
+		}),
+		p.Container().Provide(func(dh *db2.DriverHolder) *tokendb.NotifierManager {
+			return tokendb.NewNotifierManager(dh, "tokendb.persistence", "db.persistence")
+		}),
 		p.Container().Provide(digutils.Identity[*tokendb.Manager](), dig.As(new(tokens.DBProvider))),
-		p.Container().Provide(NewAuditDBManager),
+		p.Container().Provide(NewDriverHolder),
+		p.Container().Provide(func(dh *db2.DriverHolder) *auditdb.Manager {
+			return auditdb.NewManager(dh, "auditdb.persistence", "db.persistence")
+		}),
 		p.Container().Provide(digutils.Identity[*auditdb.Manager](), dig.As(new(auditor.AuditDBProvider))),
-		p.Container().Provide(NewIdentityDBManager),
-		p.Container().Provide(NewTokenLockDBManager),
+		p.Container().Provide(func(dh *db2.DriverHolder) *identitydb.Manager {
+			return identitydb.NewManager(dh, "identitydb.persistence", "db.persistence")
+		}),
+		p.Container().Provide(func(dh *db2.DriverHolder) *tokenlockdb.Manager {
+			return tokenlockdb.NewManager(dh, "tokenlockdb.persistence", "db.persistence")
+		}),
 		p.Container().Provide(digutils.Identity[*kvs.KVS](), dig.As(new(kvs2.KVS))),
 		p.Container().Provide(identity.NewDBStorageProvider),
 		p.Container().Provide(digutils.Identity[*identity.DBStorageProvider](), dig.As(new(identity2.StorageProvider))),
@@ -155,12 +170,9 @@ func (p *SDK) Install() error {
 		p.Container().Provide(func(tracerProvider trace.TracerProvider) *tracing.TracerProvider {
 			return tracing.NewTracerProvider(tracerProvider)
 		}),
-		p.Container().Provide(tokenlockdriver.NewDriver, dig.Group("tokenlockdb-drivers")),
-		p.Container().Provide(auditdriver.NewDriver, dig.Group("auditdb-drivers")),
-		p.Container().Provide(NewTokenDrivers),
-		p.Container().Provide(ttxdriver.NewDriver, dig.Group("ttxdb-drivers")),
-		p.Container().Provide(identitydriver.NewDriver, dig.Group("identitydb-drivers")),
-		p.Container().Provide(NewDBDrivers),
+		p.Container().Provide(unity.NewUnityDriver, dig.Group("token-db-drivers")),
+		p.Container().Provide(sql.NewDriver, dig.Group("token-db-drivers")),
+		p.Container().Provide(memory.NewDriver, dig.Group("token-db-drivers")),
 		p.Container().Provide(func(dbManager *tokendb.Manager, notifierManager *tokendb.NotifierManager, metricsProvider metrics.Provider) sherdlock.FetcherProvider {
 			return sherdlock.NewFetcherProvider(dbManager, notifierManager, metricsProvider, sherdlock.Mixed)
 		}),
@@ -233,7 +245,7 @@ func (p *SDK) Start(ctx context.Context) error {
 	)
 }
 
-func connectNetworks(configService *config2.Service, networkProvider *network.Provider, tmsProvider *token.ManagementServiceProvider) error {
+func connectNetworks(configService *config2.Service, networkProvider *network.Provider, _ *token.ManagementServiceProvider) error {
 	configurations, err := configService.Configurations()
 	if err != nil {
 		return err

token/services/auditdb/db.go

@@ -30,18 +30,15 @@ type tokenRequest interface {
 	PublicParamsHash() token.PPHash
 }
 
-type (
-	Holder  = db.DriverHolder[*DB, driver.AuditTransactionDB, driver.AuditDBDriver]
-	Manager = db.Manager[*DB, driver.AuditTransactionDB, driver.AuditDBDriver]
-)
+type Manager = db.Manager[*DB]
 
 var (
 	managerType = reflect.TypeOf((*Manager)(nil))
 	logger      = logging.MustGetLogger("token-sdk.auditdb")
 )
 
-func NewHolder(drivers []db.NamedDriver[driver.AuditDBDriver]) *Holder {
-	return db.NewDriverHolder[*DB, driver.AuditTransactionDB, driver.AuditDBDriver](newDB, drivers...)
+func NewManager(dh *db.DriverHolder, keys ...string) *Manager {
+	return db.MappedManager[driver.AuditTransactionDB, *DB](dh.NewAuditTransactionManager(keys...), newDB)
 }
 
 func GetByTMSId(sp token.ServiceProvider, tmsID token.TMSID) (*DB, error) {
@@ -146,13 +143,13 @@ type DB struct {
 	pendingTXs []string
 }
 
-func newDB(p driver.AuditTransactionDB) *DB {
+func newDB(p driver.AuditTransactionDB) (*DB, error) {
 	return &DB{
 		StatusSupport: common.NewStatusSupport(),
 		db:            p,
 		eIDsLocks:     sync.Map{},
 		pendingTXs:    make([]string, 0, 10000),
-	}
+	}, nil
 }
 
 // Append appends send and receive movements, and transaction records corresponding to the passed token request

token/services/auditdb/db/memory/memory.go

@@ -7,11 +7,7 @@ package certifier
 
 import (
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/certifier/driver"
-	"github.com/hyperledger-labs/fabric-token-sdk/token/services/drivers"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/drivers"
 )
 
-var holder = drivers.NewHolder[driver.Driver]()
-
-func Register(name string, driver driver.Driver) { holder.Register(name, driver) }
-
-func Drivers() []string { return holder.DriverNames() }
+var holder = drivers.NewHolder[string, driver.Driver]()

token/services/auditdb/db/sql/driver.go

@@ -0,0 +1,47 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package driver
+
+import (
+	"github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/sql/common"
+	driver2 "github.com/hyperledger-labs/fabric-token-sdk/token/driver"
+)
+
+type NamedDriver = driver.NamedDriver[Driver]
+
+type Config interface {
+	// ID identities the TMS this configuration refers to.
+	ID() driver2.TMSID
+	// IsSet checks to see if the key has been set in any of the data locations
+	IsSet(key string) bool
+	// UnmarshalKey takes a single key and unmarshals it into a struct.
+	// The key must be relative to the TMS this configuration refers to.
+	UnmarshalKey(key string, rawVal interface{}) error
+	// GetString returns the value associated with the key as a string
+	GetString(key string) string
+	// GetBool returns the value associated with the key as a bool
+	GetBool(key string) bool
+	// TranslatePath translates the passed path relative to the config path
+	TranslatePath(path string) string
+}
+
+type Driver interface {
+	NewTokenLock(opts common.Opts) (TokenLockDB, error)
+
+	NewWallet(opts common.Opts) (WalletDB, error)
+
+	NewIdentity(opts common.Opts) (IdentityDB, error)
+
+	NewToken(opts common.Opts) (TokenDB, error)
+
+	NewTokenNotifier(opts common.Opts) (TokenNotifier, error)
+
+	NewAuditTransaction(opts common.Opts) (AuditTransactionDB, error)
+
+	NewOwnerTransaction(opts common.Opts) (TokenTransactionDB, error)
+}