Merge branch 'develop' into 08-11-chore_indexer_Nuke_legacy_indexer

.github/dependabot.yml

@@ -20,49 +20,10 @@ updates:
     directory: "/"
     schedule:
       interval: daily
+      time: "16:30"
+      timezone: "America/New_York"
     open-pull-requests-limit: 10
-    labels:
-      - dependabot
-  - package-ecosystem: npm
-    directory: "/packages/chain-mon"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-    labels:
-      - dependabot
-  - package-ecosystem: npm
-    directory: "/packages/core-utils"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-    labels:
-      - dependabot
-  - package-ecosystem: npm
-    directory: "/packages/contracts-ts"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-    labels:
-      - dependabot
-  - package-ecosystem: npm
-    directory: "/packages/sdk"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-    labels:
-      - dependabot
-  - package-ecosystem: npm
-    directory: "/packages/fee-estimation"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-    labels:
-      - dependabot
-  - package-ecosystem: npm
-    directory: "/packages/common-ts"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
+    versioning-strategy: auto
     labels:
       - dependabot
 

indexer/cli/cli.go

@@ -72,15 +72,6 @@ var (
 		Usage:   "path to config file",
 		EnvVars: []string{"INDEXER_CONFIG"},
 	}
-	// Not used yet.  Use this flag to run legacy app instead
-	// Remove me after indexer is released
-	IndexerRefreshFlag = &cli.BoolFlag{
-		Name:    "indexer-refresh",
-		Value:   false,
-		Aliases: []string{"i"},
-		Usage:   "run new unreleased indexer by passing in flag",
-		EnvVars: []string{"INDEXER_REFRESH"},
-	}
 )
 
 // make a instance method on Cli called Run that runs cli

indexer/config/config_test.go

@@ -26,6 +26,7 @@ func TestLoadConfig(t *testing.T) {
 		port = 5432
 		user = "postgres"
 		password = "postgres"
+	  name = "indexer"
 
 		[api]
 		host = "127.0.0.1"
@@ -54,6 +55,7 @@ func TestLoadConfig(t *testing.T) {
 	require.Equal(t, conf.DB.Port, 5432)
 	require.Equal(t, conf.DB.User, "postgres")
 	require.Equal(t, conf.DB.Password, "postgres")
+	require.Equal(t, conf.DB.Name, "indexer")
 	require.Equal(t, conf.API.Host, "127.0.0.1")
 	require.Equal(t, conf.API.Port, 8080)
 	require.Equal(t, conf.Metrics.Host, "127.0.0.1")

indexer/example.env

@@ -2,8 +2,5 @@
 INDEXER_L1_ETH_RPC=FILL_ME_IN
 INDEXER_L2_ETH_RPC=FILL_ME_IN
 
-# temporary env variable to enable to new indexer
-INDEXER_REFRESH=1
-
 # Fill in to use prisma studio ui with a db other than the default
 # DATABASE_URL=FILL_ME_IN

indexer/indexer.toml

@@ -10,6 +10,7 @@ host = "127.0.0.1"
 port = 5432
 user = "postgres"
 password = "postgres"
+name = "indexer"
 
 [api]
 host = "127.0.0.1"