Remove dependency on Etherscan, remove unused inline-contract indexing

Layr-Labs · Oct 30, 2024 · dc31254 · dc31254
1 parent 703e966
commit dc31254
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 861 deletions.
diff --git a/README.md b/README.md
@@ -94,7 +94,6 @@ mkdir ./sidecar-data || true
 ./bin/sidecar run \
     --ethereum.rpc-url="http://34.229.43.36:8545" \
     --chain="holesky" \
-    --etherscan.api-keys="<your etherscan key>" \
     --statsd.url="localhost:8125" \
     --datadir="./sidecar-data"
 
@@ -109,7 +108,6 @@ docker run -it --rm \
   -e SIDECAR_DEBUG=false \
   -e SIDECAR_ETHEREUM_RPC_BASE_URL="http://34.229.43.36:8545" \
   -e SIDECAR_CHAIN="holesky" \
-  -e SIDECAR_ETHERSCAN_API_KEYS="<your etherscan key>" \
   -e SIDECAR_STATSD_URL="localhost:8125" \
   -e SIDECAR_DATADIR="/sidecar" \
   -v "$(pwd)/sqlite:/sidecar" \
@@ -128,7 +126,6 @@ docker run \
   -e "SIDECAR_DEBUG=false" \
   -e "SIDECAR_ETHEREUM_RPC_BASE_URL=http://34.229.43.36:8545" \
   -e "SIDECAR_CHAIN=holesky" \
-  -e "SIDECAR_ETHERSCAN_API_KEYS='<your etherscan key>'" \
   -e "SIDECAR_STATSD_URL=localhost:8125" \
   -e SIDECAR_DATADIR="/sidecar" \
   -v "$(pwd)/sqlite:/sidecar" \

diff --git a/cmd/debugger/main.go b/cmd/debugger/main.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"github.com/Layr-Labs/go-sidecar/pkg/clients/ethereum"
-	"github.com/Layr-Labs/go-sidecar/pkg/clients/etherscan"
 	"github.com/Layr-Labs/go-sidecar/pkg/contractCaller"
 	"github.com/Layr-Labs/go-sidecar/pkg/contractManager"
 	"github.com/Layr-Labs/go-sidecar/pkg/contractStore/postgresContractStore"
@@ -41,7 +40,6 @@ func main() {
 		l.Sugar().Fatal("Failed to setup statsd client", zap.Error(err))
 	}
 
-	etherscanClient := etherscan.NewEtherscanClient(cfg, l)
 	client := ethereum.NewClient(cfg.EthereumRpcConfig.BaseUrl, l)
 
 	pgConfig := postgres.PostgresConfigFromDbConfig(&cfg.DatabaseConfig)
@@ -67,7 +65,7 @@ func main() {
 		log.Fatalf("Failed to initialize core contracts: %v", err)
 	}
 
-	cm := contractManager.NewContractManager(contractStore, etherscanClient, client, sdc, l)
+	cm := contractManager.NewContractManager(contractStore, client, sdc, l)
 
 	mds := pgStorage.NewPostgresBlockStore(grm, l, cfg)
 	if err != nil {
@@ -99,7 +97,7 @@ func main() {
 
 	cc := contractCaller.NewContractCaller(client, l)
 
-	idxr := indexer.NewIndexer(mds, contractStore, etherscanClient, cm, client, fetchr, cc, l, cfg)
+	idxr := indexer.NewIndexer(mds, contractStore, cm, client, fetchr, cc, l, cfg)
 
 	p := pipeline.NewPipeline(fetchr, idxr, mds, sm, l)
 

diff --git a/cmd/root.go b/cmd/root.go
@@ -32,8 +32,6 @@ func init() {
 	rootCmd.PersistentFlags().String("ethereum.rpc-url", "", `e.g. "http://34.229.43.36:8545"`)
 	rootCmd.PersistentFlags().String("ethereum.ws-url", "", `e.g. "ws://34.229.43.36:8546"`)
 
-	rootCmd.PersistentFlags().String("etherscan.api-keys", "", `Comma-separated string of keys. e.g. "key1,key2,key3"`)
-
 	rootCmd.PersistentFlags().String(config.DatabaseHost, "localhost", `Defaults to 'localhost'. Set to something else if you are running PostgreSQL on your own`)
 	rootCmd.PersistentFlags().Int(config.DatabasePort, 5432, `Defaults to '5432'`)
 	rootCmd.PersistentFlags().String(config.DatabaseUser, "sidecar", `Defaults to 'sidecar'`)

diff --git a/cmd/run.go b/cmd/run.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"github.com/Layr-Labs/go-sidecar/pkg/clients/ethereum"
-	"github.com/Layr-Labs/go-sidecar/pkg/clients/etherscan"
 	"github.com/Layr-Labs/go-sidecar/pkg/contractCaller"
 	"github.com/Layr-Labs/go-sidecar/pkg/contractManager"
 	"github.com/Layr-Labs/go-sidecar/pkg/contractStore/postgresContractStore"
@@ -50,7 +49,6 @@ var runCmd = &cobra.Command{
 			l.Sugar().Fatal("Failed to setup statsd client", zap.Error(err))
 		}
 
-		etherscanClient := etherscan.NewEtherscanClient(cfg, l)
 		client := ethereum.NewClient(cfg.EthereumRpcConfig.BaseUrl, l)
 
 		pgConfig := postgres.PostgresConfigFromDbConfig(&cfg.DatabaseConfig)
@@ -76,7 +74,7 @@ var runCmd = &cobra.Command{
 			log.Fatalf("Failed to initialize core contracts: %v", err)
 		}
 
-		cm := contractManager.NewContractManager(contractStore, etherscanClient, client, sdc, l)
+		cm := contractManager.NewContractManager(contractStore, client, sdc, l)
 
 		mds := pgStorage.NewPostgresBlockStore(grm, l, cfg)
 		if err != nil {
@@ -108,7 +106,7 @@ var runCmd = &cobra.Command{
 
 		cc := contractCaller.NewContractCaller(client, l)
 
-		idxr := indexer.NewIndexer(mds, contractStore, etherscanClient, cm, client, fetchr, cc, l, cfg)
+		idxr := indexer.NewIndexer(mds, contractStore, cm, client, fetchr, cc, l, cfg)
 
 		p := pipeline.NewPipeline(fetchr, idxr, mds, sm, l)
 

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -60,7 +60,6 @@ type Config struct {
 	Debug             bool
 	StatsdUrl         string
 	EthereumRpcConfig EthereumRpcConfig
-	EtherscanConfig   EtherscanConfig
 	DatabaseConfig    DatabaseConfig
 	RpcConfig         RpcConfig
 	Chain             Chain
@@ -72,10 +71,6 @@ type EthereumRpcConfig struct {
 	WsUrl   string
 }
 
-type EtherscanConfig struct {
-	ApiKeys []string
-}
-
 type DatabaseConfig struct {
 	Host     string
 	Port     int
@@ -115,10 +110,6 @@ func NewConfig() *Config {
 			WsUrl:   viper.GetString(normalizeFlagName("ethereum.ws_url")),
 		},
 
-		EtherscanConfig: EtherscanConfig{
-			ApiKeys: parseListEnvVar(viper.GetString(normalizeFlagName("etherscan.api_keys"))),
-		},
-
 		DatabaseConfig: DatabaseConfig{
 			Host:     viper.GetString(normalizeFlagName(DatabaseHost)),
 			Port:     viper.GetInt(normalizeFlagName(DatabasePort)),

diff --git a/internal/metrics/metrics.go b/internal/metrics/metrics.go
@@ -28,7 +28,3 @@ func GetStatsdClient() *statsd.Client {
 	}
 	return statsdClient
 }
-
-const (
-	Etherscan_ContractAbi = "etherscan.contract_abi"
-)
diff --git a/pkg/clients/etherscan/client.go b/pkg/clients/etherscan/client.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,3 @@ func GetStatsdClient() *statsd.Client { @@
     	}
     	return statsdClient
     }
-    const (
-    	Etherscan_ContractAbi = "etherscan.contract_abi"
-    )