cleanup & small improvements

Author: benleb

internal/cache/cache.go

@@ -11,6 +11,12 @@ import (
 	"github.com/spf13/viper"
 )
 
+// enable other cache/datastore backends besides redis?
+// type ExtCache interface {
+// 	cacheName(address common.Address, keyFunc func(common.Address) string, value string, duration time.Duration)
+// 	getName(address common.Address, keyFunc func(common.Address) string) (string, error)
+// }
+
 var gbCache *GbCache
 
 type GbCache struct {
@@ -58,6 +64,36 @@ func (c *GbCache) GetENSName(walletAddress common.Address) (string, error) {
 	return c.getName(walletAddress, keyENS)
 }
 
+func (c *GbCache) StoreEvent(contractAddress common.Address, collectionName string, tokenID uint64, priceWei uint64, numItems uint, eventTime time.Time, eventType int64) {
+	xAddArgs := &redis.XAddArgs{
+		Stream: "sales",
+		MaxLen: 100000,
+		Approx: true,
+		ID:     "*",
+		Values: map[string]any{
+			"contractAddress": contractAddress.Hex(),
+			"collectionName":  collectionName,
+			"tokenID":         tokenID,
+			"priceWei":        priceWei,
+			"numItems":        numItems,
+			"eventTime":       eventTime,
+			"eventType":       eventType,
+		},
+	}
+
+	if c.rdb != nil {
+		gbl.Log.Debugf("redis | adding sale: %s #%d", collectionName, int(tokenID))
+
+		if added, err := c.rdb.XAdd(c.rdb.Context(), xAddArgs).Result(); err == redis.Nil {
+			gbl.Log.Errorf("redis | strange redis.Nil while adding to stream: %s %d -xxx-> %s: %s", collectionName, tokenID, xAddArgs.Stream, err)
+		} else if err != nil {
+			gbl.Log.Errorf("redis | could not add event: %s", err)
+		} else {
+			gbl.Log.Debugf("redis | added event (%d) to stream: %s %d | %s", eventType, collectionName, tokenID, added)
+		}
+	}
+}
+
 func (c *GbCache) cacheName(address common.Address, keyFunc func(common.Address) string, value string, duration time.Duration) {
 	c.addressToName[address] = value
 

internal/gbnode/node.go

@@ -104,6 +104,22 @@ func New(endpoint string) (*ChainNode, error) {
 	}, nil
 }
 
+// New returns a new gbnode if connection to the given endpoint succeeds.
+func NewNode(nodeID int, name string, marker string, endpoint string) (*ChainNode, error) {
+	client, err := ethclient.DialContext(ctx, endpoint)
+	if err != nil {
+		return nil, err
+	}
+
+	return &ChainNode{
+		NodeID:             nodeID,
+		Name:               name,
+		Marker:             marker,
+		Client:             client,
+		WebsocketsEndpoint: endpoint,
+	}, nil
+}
+
 // GetNodesFromConfig reads the websockets endpoints slice from config, connects to them and returns a list with successfully connected nodes.
 func GetNodesFromConfig(endpoints []string) *NodeCollection {
 	var gbnodeWg sync.WaitGroup
@@ -137,9 +153,11 @@ func GetNodesFromConfig(endpoints []string) *NodeCollection {
 
 // ChainNode represents a w3 provider configuration.
 type ChainNode struct {
+	NodeID             int    `mapstructure:"id"`
 	Name               string `mapstructure:"name"`
+	Marker             string `mapstructure:"marker"`
 	Client             *ethclient.Client
-	WebsocketsEndpoint string     `mapstructure:"url"`
+	WebsocketsEndpoint string     `mapstructure:"endpoint"`
 	ReceivedMessages   uint64     `mapstructure:"received_messages"`
 	KillTimer          time.Timer `mapstructure:"kill_timer"`
 }

internal/style/style.go

@@ -307,36 +307,6 @@ func toFixed(num float64, precision int) float64 {
 	return float64(round(num*output)) / output
 }
 
-// func FormatTokenInfo(tokenID uint64, collection *gbCollections.Collection, isMint bool, color bool) string {
-// 	var (
-// 		collectionName = collection.Name
-// 		prefix         = " #"
-// 		id             = fmt.Sprint(tokenID)
-
-// 		tokenInfo string
-// 	)
-
-// 	collectionName = strings.ReplaceAll(collectionName, "Psychedelics Anonymous", "PA")
-// 	collectionName = strings.ReplaceAll(collectionName, "Open Edition", "OE")
-// 	collectionName = strings.ReplaceAll(collectionName, " Collection", "")
-
-// 	if collection.Address == common.HexToAddress("0x57f1887a8BF19b14fC0dF6Fd9B2acc9Af147eA85") {
-// 		collectionName = "ENS: Ethereum Name Service"
-// 		prefix = ""
-// 		id = ""
-// 	}
-
-// 	if color {
-// 		collectionName = collection.Style().Faint(isMint).Render(collectionName)
-// 		id = collection.Style().Faint(isMint).Render(fmt.Sprint(id))
-// 		prefix = collection.StyleSecondary().Faint(isMint).Render(prefix)
-// 	}
-
-// 	tokenInfo = fmt.Sprintf("%s %s%s", collectionName, prefix, id)
-
-// 	return tokenInfo
-// }
-
 // TerminalLink formats a link for the terminal using ANSI codes.
 func TerminalLink(params ...string) string {
 	var text string