removes grpc and makes the seawatcher great again

cmd/live.go

@@ -16,8 +16,6 @@ import (
 	"github.com/benleb/gloomberg/internal/gbl"
 	"github.com/benleb/gloomberg/internal/jobs"
 	"github.com/benleb/gloomberg/internal/nemo/gloomberg"
-	"github.com/benleb/gloomberg/internal/nemo/gloomberg/gbgrpc"
-	"github.com/benleb/gloomberg/internal/nemo/gloomberg/remote"
 	"github.com/benleb/gloomberg/internal/nemo/provider"
 	"github.com/benleb/gloomberg/internal/nemo/token"
 	"github.com/benleb/gloomberg/internal/nemo/totra"
@@ -95,12 +93,10 @@ func runGloomberg(_ *cobra.Command, _ []string) {
 
 	gloomberg.PrModf("exp", "active experiments 🧪 %s", style.BoldAlmostWhite(strings.Join(activeExperiments.ToSlice(), style.GrayStyle.Render(" · "))))
 
-	go func() {
-		gb.DegenDB = degendb.NewDegenDB()
-	}()
-
-	// cleanup for redis db/cache
-	// defer gb.Rdb.Close()
+	// disabled for now
+	// go func() {
+	// 	gb.DegenDB = degendb.NewDegenDB()
+	// }()
 
 	// compatibility with old config key
 	var providerConfig interface{}
@@ -374,14 +370,10 @@ func runGloomberg(_ *cobra.Command, _ []string) {
 
 	//
 	// subscribe to OpenSea API
-	if viper.GetBool("seawatcher.local") || viper.GetBool("grpc.client.enabled") || viper.GetBool("pubsub.client.enabled") {
+	if viper.GetBool("seawatcher.local") || viper.GetBool("pubsub.client.enabled") {
 		go trapri.SeaWatcherEventsHandler(gb)
 	}
 
-	if viper.GetBool("grpc.server.enabled") {
-		gbgrpc.StartServer(gb, seawa)
-	}
-
 	//
 	// subscribe to redis pubsub channel to receive events from gloomberg central
 	if viper.GetBool("pubsub.client.enabled") {
@@ -391,12 +383,12 @@ func runGloomberg(_ *cobra.Command, _ []string) {
 		go pusu.SubscribeToListingsViaRedis(gb)
 
 		// initially send all our slugs & events to subscribe to
-		go gb.SendSlugsToServer()
+		go gb.PublishOwnCollectionsSlugs()
 
 		// subscribe to redis pubsub mgmt channel to listen for "SendSlugs" events
 		go func() {
 			err := gb.Rdb.Receive(context.Background(), gb.Rdb.B().Subscribe().Channel(internal.PubSubSeaWatcherMgmt).Build(), func(msg rueidis.PubSubMessage) {
-				gbl.Log.Debug(fmt.Sprintf("🚇 received msg on %s: %s", msg.Channel, msg.Message))
+				gbl.Log.Debug(fmt.Sprintf("👔 received msg on %s: %s", msg.Channel, msg.Message))
 
 				var mgmtEvent *seawaModels.MgmtEvent
 
@@ -405,8 +397,8 @@ func runGloomberg(_ *cobra.Command, _ []string) {
 				}
 
 				if mgmtEvent.Action == seawaModels.SendSlugs {
-					gbl.Log.Info(fmt.Sprintf("🚇 SendSlugs received on channel %s", msg.Channel))
-					gb.SendSlugsToServer()
+					gbl.Log.Info(fmt.Sprintf("👔 SendSlugs received on channel %s", msg.Channel))
+					gb.PublishOwnCollectionsSlugs()
 				}
 			})
 			if err != nil {

cmd/root.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"net"
 	"os"
 	"strings"
 	"time"
@@ -26,10 +25,6 @@ var (
 	certPath string
 	keyPath  string
 
-	// grpc.
-	grpcServerListen net.IP
-	grpcClientHost   net.IP
-
 	gb *gloomberg.Gloomberg
 )
 
@@ -138,15 +133,6 @@ func init() {
 	viper.SetDefault("cache.salira_ttl", 1*time.Hour)
 	viper.SetDefault("cache.slug_ttl", 3*24*time.Hour)
 	viper.SetDefault("cache.notifications_lock_ttl", time.Millisecond*1337)
-
-	// grpc server
-	viper.SetDefault("grpc.server.enabled", false)
-	viper.SetDefault("grpc.server.listenAddress", net.IPv4(127, 0, 0, 1))
-	viper.SetDefault("grpc.server.port", 31337)
-	// grpc client
-	viper.SetDefault("grpc.client.enabled", false)
-	viper.SetDefault("grpc.client.host", net.IPv4(127, 0, 0, 1))
-	viper.SetDefault("grpc.client.port", 31337)
 }
 
 // initConfig reads in config file and ENV variables if set.

cmd/seawatcherCmd.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"net"
 
-	"github.com/benleb/gloomberg/internal/nemo/gloomberg/gbgrpc"
 	"github.com/benleb/gloomberg/internal/seawa"
 	"github.com/benleb/gloomberg/internal/trapri"
 	"github.com/benleb/gloomberg/internal/web"
@@ -28,16 +27,6 @@ func init() {
 	viper.SetDefault("manifoldSNS.enabled", false)
 	viper.SetDefault("manifoldSNS.host", net.IPv4(127, 0, 0, 1))
 	viper.SetDefault("manifoldSNS.port", viper.GetUint16("web.port")-1)
-
-	// grpc
-	seaWatcherCmd.Flags().Uint16("grpc-port", 31337, "gRPC server port")
-	_ = viper.BindPFlag("grpc.port", seaWatcherCmd.Flags().Lookup("grpc-port"))
-	// grpc server
-	seaWatcherCmd.Flags().IPVar(&grpcServerListen, "grpc-listen", nil, "gRPC server listen address")
-	_ = viper.BindPFlag("grpc.listen", seaWatcherCmd.Flags().Lookup("grpc-listen"))
-	// grpc client
-	seaWatcherCmd.Flags().IPVar(&grpcClientHost, "grpc", nil, "server gRPC client connects to")
-	_ = viper.BindPFlag("grpc.client.host", seaWatcherCmd.Flags().Lookup("grpc"))
 }
 
 func runSeawatcher(_ *cobra.Command, _ []string) {
@@ -68,11 +57,6 @@ func runSeawatcher(_ *cobra.Command, _ []string) {
 		sw.Pr("requested slugs from clients…")
 	}
 
-	// sw.Prf("seaWatcherCmd.CalledAs(): %+v", cmd.CalledAs())
-	if viper.GetBool("grpc.server.enabled") {
-		gbgrpc.StartServer(gb, sw)
-	}
-
 	//
 	// manifold SNS receiver
 	if viper.GetBool("manifoldSNS.enabled") {

internal/degendb/event_type.go

@@ -47,7 +47,7 @@ var (
 	Unknown                 = &GBEventType{name: "Unknown", actionName: "did something", icon: "❓", openseaEventName: ""}
 	Transfer                = &GBEventType{name: "Transfer", actionName: "transferred", icon: "📦", openseaEventName: "item_transferred"}
 	Sale                    = &GBEventType{name: "Sale", actionName: "sold", icon: "💰", openseaEventName: "item_sold"}
-	Purchase                = &GBEventType{name: "Purchase", actionName: "purchased", icon: "💰", openseaEventName: "item_sold"}
+	Purchase                = &GBEventType{name: "Purchase", actionName: "purchased", icon: "🛍️", openseaEventName: "item_sold"}
 	Mint                    = &GBEventType{name: "Mint", actionName: "minted", icon: "Ⓜ️", openseaEventName: ""}
 	Airdrop                 = &GBEventType{name: "Airdrop", actionName: "got airdropped", icon: "🎁", openseaEventName: ""}
 	Burn                    = &GBEventType{name: "Burn", actionName: "burned", icon: "🔥", openseaEventName: ""}
@@ -57,11 +57,10 @@ var (
 	Listing                 = &GBEventType{name: "Listing", actionName: "listed", icon: "📢", openseaEventName: "item_listed"}
 	Bid                     = &GBEventType{name: "Bid", actionName: "(got) bid", icon: "💦", openseaEventName: "item_received_bid"}
 	OwnBid                  = &GBEventType{name: "OwnBid", actionName: "bid", icon: "🤑", openseaEventName: ""}
-	Offer                   = &GBEventType{name: "Offer", actionName: "(got) offered", icon: "💦", openseaEventName: "item_received_offer"}
 	AcceptedOffer           = &GBEventType{name: "AcceptedOffer", actionName: "accepted offer", icon: "🤝", openseaEventName: ""}
-	CollectionOffer         = &GBEventType{name: "CollectionOffer", actionName: "(got) collection-offered", icon: "🧊", openseaEventName: "collection_offer"}
+	CollectionOffer         = &GBEventType{name: "CollectionOffer", actionName: "(got) collection-offered", icon: "☂️", openseaEventName: "collection_offer"} // 🧊
 	AcceptedCollectionOffer = &GBEventType{name: "AcceptedCollectionOffer", actionName: "accepted collection offer", icon: "🤝", openseaEventName: ""}
-	MetadataUpdate          = &GBEventType{name: "MetadataUpdate", actionName: "metadata updated", icon: "♻️", openseaEventName: "item_metadata_updated"}
+	MetadataUpdated         = &GBEventType{name: "MetadataUpdated", actionName: "metadata updated", icon: "♻️", openseaEventName: "item_metadata_updated"}
 	Cancelled               = &GBEventType{name: "Cancelled", actionName: "cancelled", icon: "❌", openseaEventName: "item_cancelled"}
 
 	// event type sets.
@@ -73,8 +72,7 @@ var (
 		"item_sold":             Sale,
 		"item_listed":           Listing,
 		"item_received_bid":     Bid,
-		"item_received_offer":   Offer,
-		"item_metadata_updated": MetadataUpdate,
+		"item_metadata_updated": MetadataUpdated,
 		"item_cancelled":        Cancelled,
 		"collection_offer":      CollectionOffer,
 	}