Add Configuration parameter 'SkipGethAdmin' to support skipping 'admin_peers' checks

cmd/run.go

@@ -91,7 +91,7 @@ func runRunCmd(cmd *cobra.Command, args []string) error {
 		}
 
 		var err error
-		client, err = ethereum.NewClient(cfg.GethURL, cfg.Params)
+		client, err = ethereum.NewClient(cfg.GethURL, cfg.Params, cfg.SkipGethAdmin)
 		if err != nil {
 			return fmt.Errorf("%w: cannot initialize ethereum client", err)
 		}

configuration/configuration.go

@@ -72,6 +72,11 @@ const (
 	// when GethEnv is not populated.
 	DefaultGethURL = "http://localhost:8545"
 
+	// SkipGethAdmin is an optional environment variable
+	// to skip geth `admin` calls which are typically not supported
+	// by hosted node services.
+	SkipGethAdmin = "SKIP_GETH_ADMIN"
+
 	// MiddlewareVersion is the version of rosetta-ethereum.
 	MiddlewareVersion = "0.0.4"
 )
@@ -85,6 +90,7 @@ type Configuration struct {
 	RemoteGeth             bool
 	Port                   int
 	GethArguments          string
+	SkipGethAdmin          bool
 
 	// Block Reward Data
 	Params *params.ChainConfig
@@ -138,6 +144,16 @@ func LoadConfiguration() (*Configuration, error) {
 		config.GethURL = envGethURL
 	}
 
+	config.SkipGethAdmin = false
+	envSkipGethAdmin := os.Getenv(SkipGethAdmin)
+	if len(envSkipGethAdmin) > 0 {
+		val, err := strconv.ParseBool(envSkipGethAdmin)
+		if err != nil {
+			return nil, fmt.Errorf("%w: unable to parse SKIP_GETH_ADMIN %s", err, envSkipGethAdmin)
+		}
+		config.SkipGethAdmin = val
+	}
+
 	portValue := os.Getenv(PortEnv)
 	if len(portValue) == 0 {
 		return nil, errors.New("PORT must be populated")

configuration/configuration_test.go

@@ -17,6 +17,7 @@ package configuration
 import (
 	"errors"
 	"os"
+	"strconv"
 	"testing"
 
 	"github.com/coinbase/rosetta-ethereum/ethereum"
@@ -28,10 +29,11 @@ import (
 
 func TestLoadConfiguration(t *testing.T) {
 	tests := map[string]struct {
-		Mode    string
-		Network string
-		Port    string
-		Geth    string
+		Mode          string
+		Network       string
+		Port          string
+		Geth          string
+		SkipGethAdmin bool
 
 		cfg *Configuration
 		err error
@@ -63,13 +65,15 @@ func TestLoadConfiguration(t *testing.T) {
 				Port:                   1000,
 				GethURL:                DefaultGethURL,
 				GethArguments:          ethereum.MainnetGethArguments,
+				SkipGethAdmin:          false,
 			},
 		},
 		"all set (mainnet) + geth": {
-			Mode:    string(Online),
-			Network: Mainnet,
-			Port:    "1000",
-			Geth:    "http://blah",
+			Mode:          string(Online),
+			Network:       Mainnet,
+			Port:          "1000",
+			Geth:          "http://blah",
+			SkipGethAdmin: true,
 			cfg: &Configuration{
 				Mode: Online,
 				Network: &types.NetworkIdentifier{
@@ -82,12 +86,14 @@ func TestLoadConfiguration(t *testing.T) {
 				GethURL:                "http://blah",
 				RemoteGeth:             true,
 				GethArguments:          ethereum.MainnetGethArguments,
+				SkipGethAdmin:          true,
 			},
 		},
 		"all set (testnet)": {
-			Mode:    string(Online),
-			Network: Testnet,
-			Port:    "1000",
+			Mode:          string(Online),
+			Network:       Testnet,
+			Port:          "1000",
+			SkipGethAdmin: true,
 			cfg: &Configuration{
 				Mode: Online,
 				Network: &types.NetworkIdentifier{
@@ -99,6 +105,7 @@ func TestLoadConfiguration(t *testing.T) {
 				Port:                   1000,
 				GethURL:                DefaultGethURL,
 				GethArguments:          ethereum.TestnetGethArguments,
+				SkipGethAdmin:          true,
 			},
 		},
 		"invalid mode": {
@@ -127,6 +134,8 @@ func TestLoadConfiguration(t *testing.T) {
 			os.Setenv(NetworkEnv, test.Network)
 			os.Setenv(PortEnv, test.Port)
 			os.Setenv(GethEnv, test.Geth)
+			os.Setenv(GethEnv, test.Geth)
+			os.Setenv(SkipGethAdmin, strconv.FormatBool(test.SkipGethAdmin))
 
 			cfg, err := LoadConfiguration()
 			if test.err != nil {

ethereum/client.go

@@ -60,10 +60,12 @@ type Client struct {
 	g GraphQL
 
 	traceSemaphore *semaphore.Weighted
+
+	skipAdminCalls bool
 }
 
 // NewClient creates a Client that from the provided url and params.
-func NewClient(url string, params *params.ChainConfig) (*Client, error) {
+func NewClient(url string, params *params.ChainConfig, skipAdminCalls bool) (*Client, error) {
 	c, err := rpc.DialHTTPWithClient(url, &http.Client{
 		Timeout: gethHTTPTimeout,
 	})
@@ -81,7 +83,7 @@ func NewClient(url string, params *params.ChainConfig) (*Client, error) {
 		return nil, fmt.Errorf("%w: unable to create GraphQL client", err)
 	}
 
-	return &Client{params, tc, c, g, semaphore.NewWeighted(maxTraceConcurrency)}, nil
+	return &Client{params, tc, c, g, semaphore.NewWeighted(maxTraceConcurrency), skipAdminCalls}, nil
 }
 
 // Close shuts down the RPC client connection.
@@ -155,6 +157,11 @@ func (ec *Client) SuggestGasPrice(ctx context.Context) (*big.Int, error) {
 // Peers retrieves all peers of the node.
 func (ec *Client) peers(ctx context.Context) ([]*RosettaTypes.Peer, error) {
 	var info []*p2p.PeerInfo
+
+	if ec.skipAdminCalls {
+		return []*RosettaTypes.Peer{}, nil
+	}
+
 	if err := ec.c.CallContext(ctx, &info, "admin_peers"); err != nil {
 		return nil, err
 	}