chore(cleanup): Remove the AppConfig and KeyManager singletons

Makefile

@@ -44,7 +44,7 @@ stake: build
 client: build	
 	@./bin/masa-node-cli
 
-# TODO Add -race and fix race conditions
+# TODO: Add -race and fix race conditions
 test: contracts/node_modules
 	@go test -coverprofile=coverage.txt -covermode=atomic -v -count=1 -shuffle=on ./...
 

cmd/masa-node/config.go

@@ -3,14 +3,23 @@
 import (
 	"github.com/masa-finance/masa-oracle/node"
 	"github.com/masa-finance/masa-oracle/pkg/config"
+	"github.com/masa-finance/masa-oracle/pkg/masacrypto"
 	pubsub "github.com/masa-finance/masa-oracle/pkg/pubsub"
 	"github.com/masa-finance/masa-oracle/pkg/workers"
 )
 
-func initOptions(cfg *config.AppConfig) ([]node.Option, *workers.WorkHandlerManager, *pubsub.PublicKeySubscriptionHandler) {
+func initOptions(cfg *config.AppConfig, keyManager *masacrypto.KeyManager) ([]node.Option, *workers.WorkHandlerManager, *pubsub.PublicKeySubscriptionHandler) {
 	// WorkerManager configuration
-	// XXX: this needs to be moved under config, but now it's here as there are import cycles given singletons
-	workerManagerOptions := []workers.WorkerOptionFunc{}
+	// TODO: this needs to be moved under config, but now it's here as there are import cycles given singletons
+	workerManagerOptions := []workers.WorkerOptionFunc{
+		workers.WithLlmChatUrl(cfg.LLMChatUrl),
+		workers.WithMasaDir(cfg.MasaDir),
+	}
+
+	cachePath := cfg.CachePath
+	if cachePath == "" {
+		cachePath = cfg.MasaDir + "/cache"
+	}
 
 	masaNodeOptions := []node.Option{
 		node.EnableStaked,
@@ -19,6 +28,10 @@
 		node.WithVersion(cfg.Version),
 		node.WithPort(cfg.PortNbr),
 		node.WithBootNodes(cfg.Bootnodes...),
+		node.WithMasaDir(cfg.MasaDir),
+		node.WithCachePath(cachePath),
+		node.WithLLMCloudFlareURL(cfg.LLMCfUrl),
+		node.WithKeyManager(keyManager),
 	}
 
 	if cfg.TwitterScraper {
@@ -50,8 +63,7 @@
 	blockChainEventTracker := node.NewBlockChain()
 	pubKeySub := &pubsub.PublicKeySubscriptionHandler{}
 
-	// TODO: Where the config is involved, move to the config the generation of
-	// Node options
+	// TODO: Where the config is involved, move to the config the generation of Node options
 	masaNodeOptions = append(masaNodeOptions, []node.Option{
 		// Register the worker manager
 		node.WithMasaProtocolHandler(
@@ -68,7 +80,7 @@
 		// and other peers can do work we only need to check this here
 		// if this peer can or cannot scrape or write that is checked in other places
 		masaNodeOptions = append(masaNodeOptions,
-			node.WithService(blockChainEventTracker.Start(config.GetInstance().MasaDir)),
+			node.WithService(blockChainEventTracker.Start(cfg.MasaDir)),
 		)
 	}
 

cmd/masa-node/main.go

@@ -34,13 +34,16 @@
 	cfg.LogConfig()
 	cfg.SetupLogging()
 
-	keyManager := masacrypto.KeyManagerInstance()
+	keyManager, err := masacrypto.NewKeyManager(cfg.PrivateKey, cfg.PrivateKeyFile)
+	if err != nil {
+		logrus.Fatal("[-] Failed to initialize keys:", err)
+	}
 
 	// Create a cancellable context
 	ctx, cancel := context.WithCancel(context.Background())
 
 	if cfg.Faucet {
-		err := handleFaucet(keyManager.EcdsaPrivKey)
+		err := handleFaucet(cfg.RpcUrl, keyManager.EcdsaPrivKey)
 		if err != nil {
 			logrus.Errorf("[-] %v", err)
 			os.Exit(1)
@@ -51,7 +54,7 @@
 	}
 
 	if cfg.StakeAmount != "" {
-		err := handleStaking(keyManager.EcdsaPrivKey)
+		err := handleStaking(cfg.RpcUrl, keyManager.EcdsaPrivKey, cfg.StakeAmount)
 		if err != nil {
 			logrus.Warningf("%v", err)
 		} else {
@@ -61,7 +64,7 @@
 	}
 
 	// Verify the staking event
-	isStaked, err := staking.VerifyStakingEvent(keyManager.EthAddress)
+	isStaked, err := staking.VerifyStakingEvent(cfg.RpcUrl, keyManager.EthAddress)
 	if err != nil {
 		logrus.Error(err)
 	}
@@ -70,7 +73,7 @@
 		logrus.Warn("No staking event found for this address")
 	}
 
-	masaNodeOptions, workHandlerManager, pubKeySub := initOptions(cfg)
+	masaNodeOptions, workHandlerManager, pubKeySub := initOptions(cfg, keyManager)
 	// Create a new OracleNode
 	masaNode, err := node.NewOracleNode(ctx, masaNodeOptions...)
 
@@ -95,7 +98,7 @@
 	}
 
 	// Init cache resolver
-	db.InitResolverCache(masaNode, keyManager)
+	db.InitResolverCache(masaNode, keyManager, cfg.AllowedPeerId, cfg.AllowedPeerPublicKey, cfg.Validator)
 
 	// Cancel the context when SIGINT is received
 	go handleSignals(cancel, masaNode, cfg)

cmd/masa-node/staking.go

@@ -9,20 +9,19 @@
 	"github.com/fatih/color"
 	"github.com/sirupsen/logrus"
 
-	"github.com/masa-finance/masa-oracle/pkg/config"
 	"github.com/masa-finance/masa-oracle/pkg/staking"
 )
 
-func handleStaking(privateKey *ecdsa.PrivateKey) error {
+func handleStaking(rpcUrl string, privateKey *ecdsa.PrivateKey, stakeAmount string) error {
 	// Staking logic
 	// Convert the stake amount to the smallest unit, assuming 18 decimal places
-	amountBigInt, ok := new(big.Int).SetString(config.GetInstance().StakeAmount, 10)
+	amountBigInt, ok := new(big.Int).SetString(stakeAmount, 10)
 	if !ok {
 		logrus.Fatal("Invalid stake amount")
 	}
 	amountInSmallestUnit := new(big.Int).Mul(amountBigInt, big.NewInt(1e18))
 
-	stakingClient, err := staking.NewClient(privateKey)
+	stakingClient, err := staking.NewClient(rpcUrl, privateKey)
 	if err != nil {
 		return err
 	}
@@ -86,8 +85,8 @@
 	return nil
 }
 
-func handleFaucet(privateKey *ecdsa.PrivateKey) error {
-	faucetClient, err := staking.NewClient(privateKey)
+func handleFaucet(rpcUrl string, privateKey *ecdsa.PrivateKey) error {
+	faucetClient, err := staking.NewClient(rpcUrl, privateKey)
 	if err != nil {
 		logrus.Error("[-] Failed to create staking client:", err)
 		return err

docs/oracle-node/twitter-sentiment.md

@@ -64,7 +64,7 @@ const (
 
 #### Masa cli or code integration
 
-Tweets are fetched using the Twitter Scraper library, as seen in the [llmbridge](file:///Users/john/Projects/masa/masa-oracle/pkg/llmbridge/sentiment_twitter.go#1%2C9-1%2C9) package. This process does not require Twitter API keys, making it accessible and straightforward.
+Tweets are fetched using the Twitter Scraper library, as seen in the [llmbridge](../pkg/llmbridge/sentiment_twitter.go#1%2C9-1%2C9) package. This process does not require Twitter API keys, making it accessible and straightforward.
 
 ```go
 func AnalyzeSentimentTweets(tweets []*twitterscraper.Tweet, model string) (string, string, error) { ... }

node/options.go

@@ -4,6 +4,7 @@
 	"context"
 
 	"github.com/masa-finance/masa-oracle/node/types"
+	"github.com/masa-finance/masa-oracle/pkg/masacrypto"
 
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/protocol"
@@ -30,6 +31,10 @@
 	MasaProtocolHandlers map[string]network.StreamHandler
 	Environment          string
 	Version              string
+	MasaDir              string
+	CachePath            string
+	LLMCloudflareUrl     string
+	KeyManager           *masacrypto.KeyManager
 }
 
 type PubSubHandlers struct {
@@ -150,3 +155,27 @@
 		o.PortNbr = port
 	}
 }
+
+func WithMasaDir(directory string) Option {
+	return func(o *NodeOption) {
+		o.MasaDir = directory
+	}
+}
+
+func WithCachePath(path string) Option {
+	return func(o *NodeOption) {
+		o.CachePath = path
+	}
+}
+
+func WithLLMCloudFlareURL(url string) Option {
+	return func(o *NodeOption) {
+		o.LLMCloudflareUrl = url
+	}
+}
+
+func WithKeyManager(km *masacrypto.KeyManager) Option {
+	return func(o *NodeOption) {
+		o.KeyManager = km
+	}
+}

node/oracle_node.go

@@ -27,7 +27,6 @@
 	"github.com/masa-finance/masa-oracle/internal/versioning"
 	"github.com/masa-finance/masa-oracle/pkg/chain"
 	"github.com/masa-finance/masa-oracle/pkg/config"
-	"github.com/masa-finance/masa-oracle/pkg/masacrypto"
 	myNetwork "github.com/masa-finance/masa-oracle/pkg/network"
 	"github.com/masa-finance/masa-oracle/pkg/pubsub"
 )
@@ -48,6 +47,7 @@
 	Blockchain    *chain.Chain
 	Options       NodeOption
 	Context       context.Context
+	Config        *config.AppConfig
 }
 
 // GetMultiAddrs returns the priority multiaddr for this node.
@@ -102,7 +102,7 @@
 	if o.RandomIdentity {
 		libp2pOptions = append(libp2pOptions, libp2p.RandomIdentity)
 	} else {
-		libp2pOptions = append(libp2pOptions, libp2p.Identity(masacrypto.KeyManagerInstance().Libp2pPrivKey))
+		libp2pOptions = append(libp2pOptions, libp2p.Identity(o.KeyManager.Libp2pPrivKey))
 	}
 
 	securityOptions := []libp2p.Option{
@@ -179,7 +179,7 @@
 	if node.Options.RandomIdentity {
 		publicEthAddress, _ = node.generateEthHexKeyForRandomIdentity()
 	} else {
-		publicEthAddress = masacrypto.KeyManagerInstance().EthAddress
+		publicEthAddress = node.Options.KeyManager.EthAddress
 	}
 
 	nodeData := pubsub.NewNodeData(node.priorityAddrs, node.Host.ID(), publicEthAddress, pubsub.ActivityJoined)
@@ -245,7 +245,7 @@
 		go p(node.Context, node)
 	}
 
-	go myNetwork.Discover(node.Context, node.Host, node.DHT, node.Protocol)
+	go myNetwork.Discover(node.Context, node.Options.Bootnodes, node.Host, node.DHT, node.Protocol)
 
 	nodeData := node.NodeTracker.GetNodeData(node.Host.ID().String())
 	if nodeData == nil {
@@ -328,15 +328,14 @@
 
 // IsWorker determines if the OracleNode is configured to act as an actor.
 // An actor node is one that has at least one of the following scrapers enabled:
-// TwitterScraper, DiscordScraper, or WebScraper.
+// TwitterScraper, DiscordScraper, TelegramScraper or WebScraper.
 // It returns true if any of these scrapers are enabled, otherwise false.
 func (node *OracleNode) IsWorker() bool {
 	// need to get this by node data
-	cfg := config.GetInstance()
-	if cfg.TwitterScraper || cfg.DiscordScraper || cfg.TelegramScraper || cfg.WebScraper {
-		return true
-	}
-	return false
+	return node.Options.IsTwitterScraper ||
+		node.Options.IsDiscordScraper ||
+		node.Options.IsTelegramScraper ||
+		node.Options.IsWebScraper
 }
 
 // IsPublisher returns true if this node is a publisher node.
@@ -348,7 +347,7 @@
 
 // Version returns the current version string of the oracle node software.
 func (node *OracleNode) Version() string {
-	return config.GetInstance().Version
+	return node.Options.Version
 }
 
 // LogActiveTopics logs the currently active topic names to the

pkg/api/handlers_data.go

@@ -781,7 +781,7 @@
 		}
 		api.sendTrackingEvent(data_types.LLMChat, bodyBytes)
 
-		cfUrl := config.GetInstance().LLMCfUrl
+		cfUrl := api.Node.Options.LLMCloudflareUrl
 		if cfUrl == "" {
 			c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Errorf("missing env LLM_CF_URL")})
 			return

pkg/api/handlers_node.go

@@ -11,7 +11,6 @@
 
 	"github.com/masa-finance/masa-oracle/pkg/consensus"
 	"github.com/masa-finance/masa-oracle/pkg/db"
-	"github.com/masa-finance/masa-oracle/pkg/masacrypto"
 	"github.com/sirupsen/logrus"
 
 	"github.com/gin-gonic/gin"
@@ -181,7 +180,7 @@
 			return
 		}
 
-		keyManager := masacrypto.KeyManagerInstance()
+		keyManager := api.Node.Options.KeyManager
 
 		// Set the data to be signed as the signer's Peer ID
 		data := []byte(api.Node.Host.ID().String())

pkg/config/app.go

@@ -91,6 +91,7 @@
 		instance = &AppConfig{}
 
 		instance.setDefaultConfig()
+		// TODO Shouldn't the env vars override the file config, instead of the other way around?
 		instance.setEnvVariableConfig()
 
 		instance.setFileConfig(viper.GetString("FILE_PATH"))

pkg/db/access_control.go

@@ -8,11 +8,11 @@
 
 import (
 	"encoding/hex"
+
 	libp2pCrypto "github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/sirupsen/logrus"
 
-	"github.com/masa-finance/masa-oracle/pkg/config"
 	"github.com/masa-finance/masa-oracle/pkg/consensus"
 )
 
@@ -34,14 +34,7 @@
 }
 
 // Verifier checks if the given host is allowed to access to the database and verifies the signature
-func Verifier(h host.Host, data []byte, signature []byte) bool {
-	// Load configuration instance
-	cfg := config.GetInstance()
-
-	// Get allowed peer ID and public key from the configuration
-	allowedPeerID := cfg.AllowedPeerId
-	allowedPeerPubKeyString := cfg.AllowedPeerPublicKey
-
+func Verifier(h host.Host, data []byte, signature []byte, allowedPeerID string, allowedPeerPubKeyString string, isValidator bool) bool {
 	if allowedPeerID == "" || allowedPeerPubKeyString == "" {
 		logrus.Warn("[-] Allowed peer ID or public key not found in configuration")
 		return false
@@ -81,7 +74,7 @@
 		return false
 	}
 
-	if cfg.Validator {
+	if isValidator {
 
 		logrus.WithFields(logrus.Fields{
 			"hostID":        h.ID().String(),

pkg/db/operations.go

@@ -1,4 +1,4 @@
-// TODO Rename this to something else, this is NOT a database (it just stores data in the DHT and in a cache)
+// TODO: Rename this to something else, this is NOT a database (it just stores data in the DHT and in a cache)
 package db
 
 import (

pkg/db/resolver_cache.go

@@ -43,13 +43,10 @@
 // The purpose of this function is to initialize the resolver cache and perform any necessary setup or configuration. It associates the resolver cache with the provided Masa Oracle node and key manager.
 //
 // Note: The specific implementation details of the `InitResolverCache` function are not provided in the given code snippet. The function signature suggests that it initializes the resolver cache, but the actual initialization logic would be present in the function body.
-func InitResolverCache(node *node.OracleNode, keyManager *masacrypto.KeyManager) {
+func InitResolverCache(node *node.OracleNode, keyManager *masacrypto.KeyManager, allowedPeerID string, allowedPeerPubKeyString string, isValidator bool) {
 	var err error
-	cachePath := config.GetInstance().CachePath
-	if cachePath == "" {
-		cachePath = config.GetInstance().MasaDir + "/cache"
-	}
-	cache, err = leveldb.NewDatastore(cachePath, nil)
+
+	cache, err = leveldb.NewDatastore(node.Options.CachePath, nil)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -60,7 +57,7 @@
 	if err != nil {
 		logrus.Errorf("[-] Error signing data: %v", err)
 	}
-	_ = Verifier(node.Host, data, signature)
+	_ = Verifier(node.Host, data, signature, allowedPeerID, allowedPeerPubKeyString, isValidator)
 
 	go monitorNodeData(context.Background(), node)