remove: dataProvider

Author: Aman035

cmd/tss/main.go

@@ -23,7 +23,6 @@ import (
 	"github.com/pushchain/push-chain-node/universalClient/pushcore"
 	"github.com/pushchain/push-chain-node/universalClient/store"
 	"github.com/pushchain/push-chain-node/universalClient/tss"
-	"github.com/pushchain/push-chain-node/universalClient/tss/coordinator"
 	"github.com/pushchain/push-chain-node/universalClient/tss/eventstore"
 	"github.com/pushchain/push-chain-node/x/uvalidator/types"
 )
@@ -233,20 +232,18 @@ func runNode() {
 	}
 	defer database.Close()
 
-	// Create data provider - use PushCoreDataProvider if gRPC URL is provided
-	var dataProvider coordinator.DataProvider
+	// Create pushcore client - required for TSS node
+	var pushClient *pushcore.Client
 	var tssListener *push.PushTSSEventListener
 	if *grpcURL != "" {
 		// Create pushcore client directly
-		pushClient, err := pushcore.New([]string{*grpcURL}, logger)
+		var err error
+		pushClient, err = pushcore.New([]string{*grpcURL}, logger)
 		if err != nil {
 			logger.Fatal().Err(err).Str("grpc_url", *grpcURL).Msg("failed to create pushcore client")
 		}
 		defer pushClient.Close()
-
-		// Create data provider using the client
-		dataProvider = NewPushCoreDataProvider(pushClient, logger)
-		logger.Info().Str("grpc_url", *grpcURL).Msg("using pushcore data provider (connected to blockchain)")
+		logger.Info().Str("grpc_url", *grpcURL).Msg("using pushcore client (connected to blockchain)")
 
 		// Create event store from database
 		evtStore := eventstore.NewStore(database.Client(), logger)
@@ -259,8 +256,12 @@ func runNode() {
 		defer tssListener.Stop()
 		logger.Info().Msg("started Push TSS event listener")
 	} else {
-		dataProvider = NewStaticPushChainDataProvider(*validatorAddr, logger)
-		logger.Info().Msg("using static data provider (demo mode)")
+		// For demo mode, we still need a pushcore client, but we'll use static data
+		// Create a dummy client (this won't work for real operations, but allows the code to compile)
+		// In practice, grpcURL should always be provided
+		logger.Warn().Msg("no gRPC URL provided - TSS node requires pushcore client")
+		// We'll need to handle this case - for now, let's require grpcURL
+		logger.Fatal().Msg("gRPC URL is required for TSS node")
 	}
 
 	// Initialize TSS node
@@ -271,7 +272,7 @@ func runNode() {
 		HomeDir:           *homeDir,
 		Password:          *password,
 		Database:          database,
-		DataProvider:      dataProvider,
+		PushCore:          pushClient,
 		Logger:            logger,
 		PollInterval:      2 * time.Second,
 		ProcessingTimeout: 2 * time.Minute,

universalClient/core/client.go

@@ -174,9 +174,6 @@ func NewUniversalClient(ctx context.Context, log zerolog.Logger, dbManager *db.C
 			tssHomeDir = filepath.Join(homeDir, ".puniversal", "tss")
 		}
 
-		// Create TSS data provider using pushcore
-		tssDataProvider := pushcore.NewDataProvider(pushCore, log)
-
 		// Create TSS node configuration
 		tssCfg := tss.Config{
 			ValidatorAddress: validatorAddr,
@@ -185,7 +182,7 @@ func NewUniversalClient(ctx context.Context, log zerolog.Logger, dbManager *db.C
 			HomeDir:          tssHomeDir,
 			Password:         cfg.TSSPassword,
 			Database:         tssDB,
-			DataProvider:     tssDataProvider,
+			PushCore:         pushCore,
 			Logger:           log,
 		}
 

universalClient/pushcore/dataprovider.go

@@ -13,6 +13,7 @@ import (
 
 	session "go-wrapper/go-dkls/sessions"
 
+	"github.com/pushchain/push-chain-node/universalClient/pushcore"
 	"github.com/pushchain/push-chain-node/universalClient/store"
 	"github.com/pushchain/push-chain-node/universalClient/tss/eventstore"
 	"github.com/pushchain/push-chain-node/universalClient/tss/keyshare"
@@ -22,7 +23,7 @@ import (
 // Coordinator handles coordinator logic for TSS events.
 type Coordinator struct {
 	eventStore       *eventstore.Store
-	dataProvider     DataProvider
+	pushCore         *pushcore.Client
 	keyshareManager  *keyshare.Manager
 	validatorAddress string
 	coordinatorRange uint64
@@ -51,7 +52,7 @@ type ackState struct {
 // NewCoordinator creates a new coordinator.
 func NewCoordinator(
 	eventStore *eventstore.Store,
-	dataProvider DataProvider,
+	pushCore *pushcore.Client,
 	keyshareManager *keyshare.Manager,
 	validatorAddress string,
 	coordinatorRange uint64,
@@ -64,7 +65,7 @@ func NewCoordinator(
 	}
 	return &Coordinator{
 		eventStore:       eventStore,
-		dataProvider:     dataProvider,
+		pushCore:         pushCore,
 		keyshareManager:  keyshareManager,
 		validatorAddress: validatorAddress,
 		coordinatorRange: coordinatorRange,
@@ -155,15 +156,15 @@ func (c *Coordinator) GetMultiAddrsFromPeerID(ctx context.Context, peerID string
 	return nil, errors.Errorf("peerID %s not found in validators", peerID)
 }
 
-// GetLatestBlockNum gets the latest block number from the data provider.
+// GetLatestBlockNum gets the latest block number from pushCore.
 func (c *Coordinator) GetLatestBlockNum() (uint64, error) {
-	return c.dataProvider.GetLatestBlockNum()
+	return c.pushCore.GetLatestBlockNum()
 }
 
 // IsPeerCoordinator checks if the given peerID is the coordinator for the current block.
 // Uses cached allValidators for performance.
 func (c *Coordinator) IsPeerCoordinator(ctx context.Context, peerID string) (bool, error) {
-	currentBlock, err := c.dataProvider.GetLatestBlockNum()
+	currentBlock, err := c.pushCore.GetLatestBlockNum()
 	if err != nil {
 		return false, errors.Wrap(err, "failed to get latest block number")
 	}
@@ -210,9 +211,9 @@ func (c *Coordinator) IsPeerCoordinator(ctx context.Context, peerID string) (boo
 	return coordValidatorAddr == validatorAddress, nil
 }
 
-// GetCurrentTSSKeyId gets the current TSS key ID from the data provider.
+// GetCurrentTSSKeyId gets the current TSS key ID from pushCore.
 func (c *Coordinator) GetCurrentTSSKeyId() (string, error) {
-	return c.dataProvider.GetCurrentTSSKeyId()
+	return c.pushCore.GetCurrentTSSKeyId()
 }
 
 // GetEligibleUV returns eligible validators for the given protocol type.
@@ -293,7 +294,7 @@ func (c *Coordinator) pollLoop(ctx context.Context) {
 
 // updateValidators fetches and caches all validators.
 func (c *Coordinator) updateValidators() {
-	allValidators, err := c.dataProvider.GetUniversalValidators()
+	allValidators, err := c.pushCore.GetUniversalValidators()
 	if err != nil {
 		c.logger.Warn().Err(err).Msg("failed to update validators cache")
 		return
@@ -308,7 +309,7 @@ func (c *Coordinator) updateValidators() {
 
 // processPendingEvents checks if this node is coordinator, and only then reads DB and processes events.
 func (c *Coordinator) processPendingEvents(ctx context.Context) error {
-	currentBlock, err := c.dataProvider.GetLatestBlockNum()
+	currentBlock, err := c.pushCore.GetLatestBlockNum()
 	if err != nil {
 		return errors.Wrap(err, "failed to get latest block number")
 	}
@@ -605,8 +606,8 @@ func (c *Coordinator) createKeygenSetup(threshold int, partyIDs []string) ([]byt
 // createSignSetup creates a sign setup message.
 // Requires loading the keyshare to extract keyID and messageHash from event data.
 func (c *Coordinator) createSignSetup(ctx context.Context, eventData []byte, partyIDs []string) ([]byte, error) {
-	// Get current TSS keyId from dataProvider
-	keyIDStr, err := c.dataProvider.GetCurrentTSSKeyId()
+	// Get current TSS keyId from pushCore
+	keyIDStr, err := c.pushCore.GetCurrentTSSKeyId()
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get current TSS keyId")
 	}
@@ -665,8 +666,8 @@ func (c *Coordinator) createSignSetup(ctx context.Context, eventData []byte, par
 // oldParticipantIndices: indices of Active validators (staying participants)
 // newParticipantIndices: indices of Pending Join validators (new participants)
 func (c *Coordinator) createQcSetup(ctx context.Context, threshold int, partyIDs []string, participants []*types.UniversalValidator) ([]byte, error) {
-	// Get current TSS keyId from dataProvider
-	keyIDStr, err := c.dataProvider.GetCurrentTSSKeyId()
+	// Get current TSS keyId from pushCore
+	keyIDStr, err := c.pushCore.GetCurrentTSSKeyId()
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get current TSS keyId")
 	}

universalClient/tss/coordinator/coordinator.go

@@ -2,22 +2,13 @@ package coordinator
 
 import (
 	"context"
-
-	"github.com/pushchain/push-chain-node/x/uvalidator/types"
 )
 
 // SendFunc is a function type for sending messages to participants.
 // peerID: The peer ID of the recipient
 // data: The message bytes
 type SendFunc func(ctx context.Context, peerID string, data []byte) error
 
-// DataProvider provides access to Push Chain data.
-type DataProvider interface {
-	GetLatestBlockNum() (uint64, error)
-	GetUniversalValidators() ([]*types.UniversalValidator, error)
-	GetCurrentTSSKeyId() (string, error)
-}
-
 // ProtocolType enumerates the supported DKLS protocol flows.
 type ProtocolType string
 

universalClient/tss/coordinator/types.go

@@ -16,6 +16,7 @@ import (
 	"github.com/rs/zerolog"
 
 	"github.com/pushchain/push-chain-node/universalClient/db"
+	"github.com/pushchain/push-chain-node/universalClient/pushcore"
 	"github.com/pushchain/push-chain-node/universalClient/tss/coordinator"
 	"github.com/pushchain/push-chain-node/universalClient/tss/eventstore"
 	"github.com/pushchain/push-chain-node/universalClient/tss/keyshare"
@@ -32,7 +33,7 @@ type Config struct {
 	HomeDir          string
 	Password         string
 	Database         *db.DB
-	DataProvider     coordinator.DataProvider
+	PushCore         *pushcore.Client
 	Logger           zerolog.Logger
 
 	// Optional configuration
@@ -86,7 +87,7 @@ type Node struct {
 	network          networking.Network
 	keyshareManager  *keyshare.Manager
 	database         *db.DB
-	dataProvider     coordinator.DataProvider
+	pushCore         *pushcore.Client
 	logger           zerolog.Logger
 	eventStore       *eventstore.Store
 	coordinator      *coordinator.Coordinator
@@ -123,8 +124,8 @@ func NewNode(ctx context.Context, cfg Config) (*Node, error) {
 	if cfg.P2PPrivateKeyHex == "" {
 		return nil, fmt.Errorf("private key is required")
 	}
-	if cfg.DataProvider == nil {
-		return nil, fmt.Errorf("data provider is required")
+	if cfg.PushCore == nil {
+		return nil, fmt.Errorf("pushCore is required")
 	}
 	if cfg.HomeDir == "" {
 		return nil, fmt.Errorf("home directory is required")
@@ -211,7 +212,7 @@ func NewNode(ctx context.Context, cfg Config) (*Node, error) {
 		validatorAddress:           cfg.ValidatorAddress,
 		keyshareManager:            mgr,
 		database:                   database,
-		dataProvider:               cfg.DataProvider,
+		pushCore:                   cfg.PushCore,
 		logger:                     logger,
 		eventStore:                 evtStore,
 		sessionManager:             nil, // Will be initialized in Start()
@@ -274,7 +275,7 @@ func (n *Node) Start(ctx context.Context) error {
 	if n.coordinator == nil {
 		coord := coordinator.NewCoordinator(
 			n.eventStore,
-			n.dataProvider,
+			n.pushCore,
 			n.keyshareManager,
 			n.validatorAddress,
 			n.coordinatorRange,