Merge changes to remove watched addresses fill service code

cmd/serve.go

@@ -33,7 +33,6 @@ import (
 	"github.com/vulcanize/gap-filler/pkg/mux"
 
 	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
-	fill "github.com/vulcanize/ipld-eth-server/v4/pkg/fill"
 	"github.com/vulcanize/ipld-eth-server/v4/pkg/graphql"
 	srpc "github.com/vulcanize/ipld-eth-server/v4/pkg/rpc"
 	s "github.com/vulcanize/ipld-eth-server/v4/pkg/serve"
@@ -101,25 +100,12 @@ func serve() {
 		logWithCommand.Info("state validator disabled")
 	}
 
-	var watchedAddressFillService *fill.Service
-	if serverConfig.WatchedAddressGapFillerEnabled {
-		watchedAddressFillService = fill.New(serverConfig)
-		wg.Add(1)
-		go watchedAddressFillService.Start(wg)
-		logWithCommand.Info("watched address gap filler enabled")
-	} else {
-		logWithCommand.Info("watched address gap filler disabled")
-	}
-
 	shutdown := make(chan os.Signal, 1)
 	signal.Notify(shutdown, os.Interrupt)
 	<-shutdown
 	if graphQL != nil {
 		graphQL.Stop()
 	}
-	if watchedAddressFillService != nil {
-		watchedAddressFillService.Stop()
-	}
 	server.Stop()
 	wg.Wait()
 }
@@ -374,10 +360,6 @@ func init() {
 	serveCmd.PersistentFlags().Bool("validator-enabled", false, "turn on the state validator")
 	serveCmd.PersistentFlags().Uint("validator-every-nth-block", 1500, "only validate every Nth block")
 
-	// watched address gap filler flags
-	serveCmd.PersistentFlags().Bool("watched-address-gap-filler-enabled", false, "turn on the watched address gap filler")
-	serveCmd.PersistentFlags().Int("watched-address-gap-filler-interval", 60, "watched address gap fill interval in secs")
-
 	// and their bindings
 	// eth graphql server
 	viper.BindPFlag("eth.server.graphql", serveCmd.PersistentFlags().Lookup("eth-server-graphql"))
@@ -426,8 +408,4 @@ func init() {
 	// state validator flags
 	viper.BindPFlag("validator.enabled", serveCmd.PersistentFlags().Lookup("validator-enabled"))
 	viper.BindPFlag("validator.everyNthBlock", serveCmd.PersistentFlags().Lookup("validator-every-nth-block"))
-
-	// watched address gap filler flags
-	viper.BindPFlag("watch.fill.enabled", serveCmd.PersistentFlags().Lookup("watched-address-gap-filler-enabled"))
-	viper.BindPFlag("watch.fill.interval", serveCmd.PersistentFlags().Lookup("watched-address-gap-filler-interval"))
 }