fix(eventindexer): add some startup logs (#17276)

taikoxyz · May 21, 2024 · c170497 · c170497
1 parent fae5e68
commit c170497
Show file tree

Hide file tree

Showing 18 changed files with 14 additions and 741 deletions.
diff --git a/packages/eventindexer/cmd/flags/common.go b/packages/eventindexer/cmd/flags/common.go
@@ -8,7 +8,6 @@ var (
 	commonCategory    = "COMMON"
 	indexerCategory   = "INDEXER"
 	generatorCategory = "GENERATOR"
-	disperserCategory = "DISPERSER"
 	txmgrCategory     = "TX_MANAGER"
 )
 

diff --git a/packages/eventindexer/cmd/flags/disperser.go b/packages/eventindexer/cmd/flags/disperser.go
diff --git a/packages/eventindexer/cmd/flags/indexer.go b/packages/eventindexer/cmd/flags/indexer.go
@@ -37,27 +37,13 @@ var (
 		Category: indexerCategory,
 		EnvVars:  []string{"BRIDGE_ADDRESS"},
 	}
-	SwapAddresses = &cli.StringFlag{
-		Name:     "swapAddresses",
-		Usage:    "Comma-delinated list of Swap contract addresses",
-		Required: false,
-		Category: indexerCategory,
-		EnvVars:  []string{"SWAP_ADDRESSES"},
-	}
 	AssignmentHookAddress = &cli.StringFlag{
 		Name:     "assignmentHookAddress",
 		Usage:    "Address of the AssignmentHook contract",
 		Required: false,
 		Category: indexerCategory,
 		EnvVars:  []string{"ASSIGNMENT_HOOK_ADDRESS"},
 	}
-	SgxVerifierAddress = &cli.StringFlag{
-		Name:     "sgxVerifierAddress",
-		Usage:    "Address of the SGXVerifier contract",
-		Required: false,
-		Category: indexerCategory,
-		EnvVars:  []string{"SGX_VERIFIER_ADDRESS"},
-	}
 	BlockBatchSize = &cli.Uint64Flag{
 		Name:     "blockBatchSize",
 		Usage:    "Block batch size when iterating through blocks",
@@ -96,8 +82,6 @@ var IndexerFlags = MergeFlags(CommonFlags, []cli.Flag{
 	ETHClientTimeout,
 	L1TaikoAddress,
 	BridgeAddress,
-	SwapAddresses,
-	SgxVerifierAddress,
 	AssignmentHookAddress,
 	BlockBatchSize,
 	SubscriptionBackoff,

diff --git a/packages/eventindexer/cmd/main.go b/packages/eventindexer/cmd/main.go
@@ -9,7 +9,6 @@ import (
 	"github.com/taikoxyz/taiko-mono/packages/eventindexer/api"
 	"github.com/taikoxyz/taiko-mono/packages/eventindexer/cmd/flags"
 	"github.com/taikoxyz/taiko-mono/packages/eventindexer/cmd/utils"
-	"github.com/taikoxyz/taiko-mono/packages/eventindexer/disperser"
 	"github.com/taikoxyz/taiko-mono/packages/eventindexer/generator"
 	"github.com/taikoxyz/taiko-mono/packages/eventindexer/indexer"
 	"github.com/urfave/cli/v2"
@@ -59,13 +58,6 @@ func main() {
 			Description: "Taiko time-series data generator",
 			Action:      utils.SubcommandAction(new(generator.Generator)),
 		},
-		{
-			Name:        "disperser",
-			Flags:       flags.DisperserFlags,
-			Usage:       "Starts the disperser software",
-			Description: "Taiko TTKO disperser",
-			Action:      utils.SubcommandAction(new(disperser.Disperser)),
-		},
 	}
 
 	if err := app.Run(os.Args); err != nil {

diff --git a/packages/eventindexer/disperser/config.go b/packages/eventindexer/disperser/config.go
diff --git a/packages/eventindexer/disperser/disperser.go b/packages/eventindexer/disperser/disperser.go
diff --git a/packages/eventindexer/indexer/config.go b/packages/eventindexer/indexer/config.go
@@ -2,7 +2,6 @@ package indexer
 
 import (
 	"database/sql"
-	"strings"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/taikoxyz/taiko-mono/packages/eventindexer/cmd/flags"
@@ -33,8 +32,6 @@ type Config struct {
 	L1TaikoAddress          common.Address
 	BridgeAddress           common.Address
 	AssignmentHookAddress   common.Address
-	SgxVerifierAddress      common.Address
-	SwapAddresses           []common.Address
 	BlockBatchSize          uint64
 	SubscriptionBackoff     uint64
 	SyncMode                SyncMode
@@ -45,16 +42,6 @@ type Config struct {
 
 // NewConfigFromCliContext creates a new config instance from command line flags.
 func NewConfigFromCliContext(c *cli.Context) (*Config, error) {
-	// swapAddresses is a comma-delinated list of addresses to index, so we need to
-	// parse that from a single string.
-	swapAddresses := strings.Split(c.String(flags.SwapAddresses.Name), ",")
-
-	swaps := make([]common.Address, 0)
-
-	for _, v := range swapAddresses {
-		swaps = append(swaps, common.HexToAddress(v))
-	}
-
 	return &Config{
 		DatabaseUsername:        c.String(flags.DatabaseUsername.Name),
 		DatabasePassword:        c.String(flags.DatabasePassword.Name),
@@ -68,8 +55,6 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) {
 		L1TaikoAddress:          common.HexToAddress(c.String(flags.L1TaikoAddress.Name)),
 		BridgeAddress:           common.HexToAddress(c.String(flags.BridgeAddress.Name)),
 		AssignmentHookAddress:   common.HexToAddress(c.String(flags.AssignmentHookAddress.Name)),
-		SgxVerifierAddress:      common.HexToAddress(c.String(flags.SgxVerifierAddress.Name)),
-		SwapAddresses:           swaps,
 		BlockBatchSize:          c.Uint64(flags.BlockBatchSize.Name),
 		SubscriptionBackoff:     c.Uint64(flags.SubscriptionBackoff.Name),
 		RPCUrl:                  c.String(flags.IndexerRPCUrl.Name),

diff --git a/packages/eventindexer/indexer/config_test.go b/packages/eventindexer/indexer/config_test.go
@@ -14,7 +14,6 @@ var (
 	l1TaikoAddress          = "0x63FaC9201494f0bd17B9892B9fae4d52fe3BD377"
 	bridgeAddress           = "0x73FaC9201494f0bd17B9892B9fae4d52fe3BD377"
 	assignmentHookAddress   = "0x83FaC9201494f0bd17B9892B9fae4d52fe3BD377"
-	swapAddresses           = "0x33FaC9201494f0bd17B9892B9fae4d52fe3BD377,0x13FaC9201494f0bd17B9892B9fae4d52fe3BD377"
 	databaseMaxIdleConns    = "10"
 	databaseMaxOpenConns    = "10"
 	databaseMaxConnLifetime = "30"
@@ -78,7 +77,6 @@ func TestNewConfigFromCliContext(t *testing.T) {
 		"--" + flags.DatabaseName.Name, "dbname",
 		"--" + flags.L1TaikoAddress.Name, l1TaikoAddress,
 		"--" + flags.BridgeAddress.Name, bridgeAddress,
-		"--" + flags.SwapAddresses.Name, swapAddresses,
 		"--" + flags.AssignmentHookAddress.Name, assignmentHookAddress,
 		"--" + flags.MetricsHTTPPort.Name, metricsHttpPort,
 		"--" + flags.DatabaseMaxIdleConns.Name, databaseMaxIdleConns,