import changes from old outdated branch to avoid conflicts

Author: derrandz

shared/config/config.go

@@ -6,21 +6,23 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
+	"path/filepath"
 
 	cryptoPocket "github.com/pokt-network/pocket/shared/crypto"
-	"github.com/pokt-network/pocket/shared/types/genesis"
 )
 
 type Config struct {
-	RootDir       string                 `json:"root_dir"`
-	GenesisSource *genesis.GenesisSource `json:"genesis_source"` // TECHDEBT(olshansky): we should be able to pass the struct in here.
+	RootDir string `json:"root_dir"`
+	Genesis string `json:"genesis"` // FIXME(olshansky): we should be able to pass the struct in here.
 
-	EnableTelemetry bool                           `json:"enable_telemetry"`
-	PrivateKey      cryptoPocket.Ed25519PrivateKey `json:"private_key"`
+	PrivateKey cryptoPocket.Ed25519PrivateKey `json:"private_key"`
 
-	P2P       *P2PConfig       `json:"p2p"`
-	Consensus *ConsensusConfig `json:"consensus"`
-	// TECHDEBT(team): Consolidate `Persistence` and `PrePersistence`
+	EnableTelemetry bool   `json:"enable_telemetry"`
+	GlobalLogLevel  string `json:"global_log_level"`
+
+	Pre2P          *Pre2PConfig          `json:"pre2p"` // TECHDEBT(team): consolidate/replace this with P2P configs depending on next steps
+	P2P            *P2PConfig            `json:"p2p"`
+	Consensus      *ConsensusConfig      `json:"consensus"`
 	PrePersistence *PrePersistenceConfig `json:"pre_persistence"`
 	Persistence    *PersistenceConfig    `json:"persistence"`
 	Utility        *UtilityConfig        `json:"utility"`
@@ -35,16 +37,33 @@ const (
 )
 
 // TECHDEBT(team): consolidate/replace this with P2P configs depending on next steps
-type P2PConfig struct {
+type Pre2PConfig struct {
 	ConsensusPort  uint32         `json:"consensus_port"`
 	UseRainTree    bool           `json:"use_raintree"`
 	ConnectionType ConnectionType `json:"connection_type"`
+	LogLevel       string         `json:"log_level"`
 }
 
 type PrePersistenceConfig struct {
-	Capacity        int `json:"capacity"`
-	MempoolMaxBytes int `json:"mempool_max_bytes"`
-	MempoolMaxTxs   int `json:"mempool_max_txs"`
+	Capacity        int    `json:"capacity"`
+	MempoolMaxBytes int    `json:"mempool_max_bytes"`
+	MempoolMaxTxs   int    `json:"mempool_max_txs"`
+	LogLevel        string `json:"log_level"`
+}
+
+type P2PConfig struct {
+	Protocol string `json:"protocol"`
+	Address  string `json:"address"`
+	// TODO(derrandz): Fix the config imports appropriately
+	// Address          cryptoPocket.Address `json:"address"`
+	ExternalIp       string   `json:"external_ip"`
+	Peers            []string `json:"peers"`
+	MaxInbound       uint32   `json:"max_inbound"`
+	MaxOutbound      uint32   `json:"max_outbound"`
+	BufferSize       uint     `json:"connection_buffer_size"`
+	WireHeaderLength uint     `json:"max_wire_header_length"`
+	TimeoutInMs      uint     `json:"timeout_in_ms"`
+	LogLevel         string   `json:"log_level"`
 }
 
 type PacemakerConfig struct {
@@ -62,20 +81,24 @@ type ConsensusConfig struct {
 
 	// Pacemaker
 	Pacemaker *PacemakerConfig `json:"pacemaker"`
+
+	// The Log level for the consensus module
+	LogLevel string `json:"log_level"`
 }
 
 type PersistenceConfig struct {
-	PostgresUrl    string `json:"postgres_url"`
-	NodeSchema     string `json:"schema"`
-	BlockStorePath string `json:"block_store_path"`
+	DataDir     string `json:"datadir"`
+	PostgresUrl string `json:"postgres_url"`
+	NodeSchema  string `json:"schema"`
+	LogLevel    string `json:"log_level"`
 }
 
 type UtilityConfig struct {
 }
 
 type TelemetryConfig struct {
-	Address  string // The address the telemetry module will use to listen for metrics PULL requests (e.g. 0.0.0.0:9000 for prometheus)
-	Endpoint string // The endpoint available to fetch recorded metrics (e.g. /metrics for prometheus)
+	Address  string // The address that the telemetry module will use to listen for metrics pulling requests (e.g: 0.0.0.0:9000 for prometheus)
+	Endpoint string // the endpoint that will be provided to scrapers to fetch recorded metrics (e.g: /metrics for prometheus)
 }
 
 // TODO(insert tooling issue # here): Re-evaluate how load configs should be handeled.
@@ -103,35 +126,28 @@ func LoadConfig(file string) (c *Config) {
 	return
 }
 
-// TODO: Exhaust all the configuration validation checks
 func (c *Config) ValidateAndHydrate() error {
 	if len(c.PrivateKey) == 0 {
 		return fmt.Errorf("private key in config file cannot be empty")
 	}
 
-	if c.GenesisSource == nil {
-		return fmt.Errorf("genesis source cannot be nil in config")
+	if len(c.Genesis) == 0 {
+		return fmt.Errorf("must specify a genesis file or string")
 	}
+	c.Genesis = rootify(c.Genesis, c.RootDir)
 
-	if err := c.HydrateGenesisState(); err != nil {
-		return fmt.Errorf("error getting genesis state: %v", err)
+	if err := c.Consensus.ValidateAndHydrate(); err != nil {
+		log.Fatalln("Error validating or completing consensus config: ", err)
 	}
 
-	if err := c.Consensus.ValidateAndHydrate(); err != nil {
-		return fmt.Errorf("error validating or completing consensus config: %v", err)
+	if err := c.P2P.ValidateAndHydrate(); err != nil {
+		log.Fatalln("Error validating or completing P2P config: ", err)
 	}
 
 	return nil
 }
 
-func (c *Config) HydrateGenesisState() error {
-	genesisState, err := genesis.GenesisStateFromGenesisSource(c.GenesisSource)
-	if err != nil {
-		return fmt.Errorf("error getting genesis state: %v", err)
-	}
-	c.GenesisSource.Source = &genesis.GenesisSource_State{
-		State: genesisState,
-	}
+func (c *P2PConfig) ValidateAndHydrate() error {
 	return nil
 }
 
@@ -154,3 +170,11 @@ func (c *ConsensusConfig) ValidateAndHydrate() error {
 func (c *PacemakerConfig) ValidateAndHydrate() error {
 	return nil
 }
+
+// Helper function to make config creation independent of root dir
+func rootify(path, root string) string {
+	if filepath.IsAbs(path) {
+		return path
+	}
+	return filepath.Join(root, path)
+}

shared/logging/loggers.go

@@ -0,0 +1,9 @@
+package logging
+
+var (
+	singletonLogger = CreateStdLogger(LOG_LEVEL_ALL)
+)
+
+func GetGlobalLogger() Logger {
+	return singletonLogger
+}

shared/logging/std_logger.go

@@ -0,0 +1,82 @@
+package logging
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"sync"
+)
+
+type stdLogger struct {
+	*log.Logger
+	*sync.Mutex
+	namespace Namespace
+	level     LogLevel
+}
+
+func CreateStdLogger(level LogLevel) Logger {
+	return &stdLogger{
+		Mutex:     &sync.Mutex{},
+		Logger:    log.New(os.Stdout, "[pocket]", 0),
+		level:     LOG_LEVEL_ALL,
+		namespace: GLOBAL_NAMESPACE,
+	}, nil
+}
+
+func (sla *stdLogger) decorate(decor string, args []any) []any {
+	fArgs := []any{decor}
+	fArgs = append(fArgs, args...)
+	return fArgs
+}
+
+func (sla *stdLogger) logIfAtLevel(level LogLevel, args ...any) {
+	if sla.level != LOG_LEVEL_NONE && (sla.level == level || sla.level == LOG_LEVEL_ALL) {
+		defer sla.Unlock()
+		sla.Lock()
+
+		namespacedArgs := []any{
+			sla.namespace,
+		}
+		namespacedArgs = append(namespacedArgs, args...)
+		logLine := sla.decorate(fmt.Sprintf("[%s]:", level), namespacedArgs)
+
+		if sla.level == LOG_LEVEL_FATAL {
+			sla.Logger.Fatal(logLine...)
+		} else {
+			sla.Logger.Println(logLine...)
+		}
+	}
+}
+
+// Interface for logging
+func (sla *stdLogger) Info(args ...any) {
+	sla.logIfAtLevel(LOG_LEVEL_INFO, args...)
+}
+
+func (sla *stdLogger) Error(args ...any) {
+	sla.logIfAtLevel(LOG_LEVEL_ERROR, args...)
+}
+
+func (sla *stdLogger) Warn(args ...any) {
+	sla.logIfAtLevel(LOG_LEVEL_WARN, args...)
+}
+
+func (sla *stdLogger) Debug(args ...any) {
+	sla.logIfAtLevel(LOG_LEVEL_DEBUG, args...)
+}
+
+func (sla *stdLogger) Fatal(args ...any) {
+	sla.logIfAtLevel(LOG_LEVEL_FATAL, args...)
+}
+
+func (sla *stdLogger) Log(args ...any) {
+	sla.logIfAtLevel(LOG_LEVEL_ALL, args...)
+}
+
+func (sla *stdLogger) SetLevel(l LogLevel) {
+	sla.level = l
+}
+
+func (sla *stdLogger) SetNamespace(namespace Namespace) {
+	sla.namespace = namespace
+}