feat(eventindexer): Timeseries data indexing + refactor to taiko-clie…

…nt/relayer CLI approach and architecture (#14663)
taikoxyz · Sep 28, 2023 · f951f54 · f951f54
1 parent e969363
commit f951f54
Show file tree

Hide file tree

Showing 16 changed files with 163 additions and 337 deletions.
diff --git a/packages/eventindexer/.l1.env b/packages/eventindexer/.l1.env
@@ -7,11 +7,10 @@ DATABASE_HOST=localhost:3306
 DATABASE_MAX_IDLE_CONNS=50
 DATABASE_MAX_OPEN_CONNS=3000
 DATABASE_CONN_MAX_LIFETIME_IN_MS=100000
-L1_TAIKO_ADDRESS=0x95fF8D3CE9dcB7455BEB7845143bEA84Fe5C4F6f
-BRIDGE_ADDRESS=0x5293Bb897db0B64FFd11E0194984E8c5F1f06178
-RPC_URL=wss://l1ws.jolnir.taiko.xyz
+L1_TAIKO_ADDRESS=0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82
+BRIDGE_ADDRESS=0x9A9f2CCfdE556A7E9Ff0848998Aa4a0CFD8863AE
+RPC_URL=wss://l1ws.internal.taiko.xyz
 CORS_ORIGINS=*
 BLOCK_BATCH_SIZE=10
 CACHE_INTERVAL_IN_SECONDS=60
 LAYER=l1
-GENESIS_DATE=2023-09-08
diff --git a/packages/eventindexer/cmd/flags/generator.go b/packages/eventindexer/cmd/flags/generator.go
@@ -10,15 +10,7 @@ var (
 		Category: generatorCategory,
 		EnvVars:  []string{"GENESIS_DATE"},
 	}
-	Regenerate = &cli.StringFlag{
-		Name:     "regenerate",
-		Usage:    "True to delete all existing data and regenerate from genesis, false to not",
-		Required: false,
-		Category: generatorCategory,
-		EnvVars:  []string{"REGENERATE"},
-	}
 )
 var GeneratorFlags = MergeFlags(CommonFlags, []cli.Flag{
 	GenesisDate,
-	Regenerate,
 })
diff --git a/packages/eventindexer/cmd/flags/indexer.go b/packages/eventindexer/cmd/flags/indexer.go
@@ -121,7 +121,6 @@ var (
 var IndexerFlags = MergeFlags(CommonFlags, []cli.Flag{
 	RPCUrl,
 	// optional
-	ETHClientTimeout,
 	L1TaikoAddress,
 	HTTPPort,
 	MetricsHTTPPort,

diff --git a/packages/eventindexer/db/db.go b/packages/eventindexer/db/db.go
@@ -46,14 +46,14 @@ func OpenDBConnection(opts DBConnectionOpts) (*DB, error) {
 	dsn := ""
 	if opts.Password == "" {
 		dsn = fmt.Sprintf(
-			"%v@tcp(%v)/%v?charset=utf8mb4&parseTime=True",
+			"%v@tcp(%v)/%v?charset=utf8mb4&parseTime=True&loc=Local",
 			opts.Name,
 			opts.Host,
 			opts.Database,
 		)
 	} else {
 		dsn = fmt.Sprintf(
-			"%v:%v@tcp(%v)/%v?charset=utf8mb4&parseTime=True",
+			"%v:%v@tcp(%v)/%v?charset=utf8mb4&parseTime=True&loc=Local",
 			opts.Name,
 			opts.Password,
 			opts.Host,

diff --git a/packages/eventindexer/generator/config.go b/packages/eventindexer/generator/config.go
@@ -28,7 +28,6 @@ type Config struct {
 	DatabaseMaxConnLifetime uint64
 	MetricsHTTPPort         uint64
 	GenesisDate             time.Time
-	Regenerate              bool
 	OpenDBFunc              func() (DB, error)
 }
 
@@ -49,7 +48,6 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) {
 		DatabaseMaxConnLifetime: c.Uint64(flags.DatabaseConnMaxLifetime.Name),
 		MetricsHTTPPort:         c.Uint64(flags.MetricsHTTPPort.Name),
 		GenesisDate:             date,
-		Regenerate:              c.Bool(flags.Regenerate.Name),
 		OpenDBFunc: func() (DB, error) {
 			return db.OpenDBConnection(db.DBConnectionOpts{
 				Name:            c.String(flags.DatabaseUsername.Name),

diff --git a/packages/eventindexer/generator/config_test.go b/packages/eventindexer/generator/config_test.go
@@ -32,7 +32,6 @@ func TestNewConfigFromCliContext(t *testing.T) {
 		assert.Equal(t, "dbpass", c.DatabasePassword)
 		assert.Equal(t, "dbname", c.DatabaseName)
 		assert.Equal(t, "dbhost", c.DatabaseHost)
-		assert.Equal(t, true, c.Regenerate)
 
 		wantTime, _ := time.Parse("2006-01-02", "2023-07-07")
 		assert.Equal(t, wantTime, c.GenesisDate)
@@ -53,6 +52,5 @@ func TestNewConfigFromCliContext(t *testing.T) {
 		"-" + flags.DatabaseHost.Name, "dbhost",
 		"-" + flags.DatabaseName.Name, "dbname",
 		"-" + flags.GenesisDate.Name, "2023-07-07",
-		"-" + flags.Regenerate.Name, "true",
 	}))
 }