Merge remote-tracking branch 'remotes/vulc/master' into metrics

# Conflicts:
#	go.sum
#	pkg/serve/config.go

pkg/serve/api.go

@@ -23,8 +23,9 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 	log "github.com/sirupsen/logrus"
 
+	"github.com/vulcanize/ipld-eth-indexer/pkg/shared"
+
 	"github.com/vulcanize/ipld-eth-server/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/pkg/shared"
 	v "github.com/vulcanize/ipld-eth-server/version"
 )
 
@@ -87,7 +88,7 @@ func (api *PublicServerAPI) Stream(ctx context.Context, params eth.SubscriptionS
 
 // Chain returns the chain type that this watcher instance supports
 func (api *PublicServerAPI) Chain() shared.ChainType {
-	return api.w.Chain()
+	return shared.Ethereum
 }
 
 // Struct for holding watcher meta data

pkg/serve/config.go

@@ -17,17 +17,20 @@
 package serve
 
 import (
+	"math/big"
 	"os"
 	"path/filepath"
 
+	"github.com/ethereum/go-ethereum/common"
+
+	"github.com/ethereum/go-ethereum/params"
+	"github.com/spf13/viper"
 	"github.com/vulcanize/ipld-eth-indexer/pkg/node"
+	"github.com/vulcanize/ipld-eth-indexer/pkg/postgres"
+	"github.com/vulcanize/ipld-eth-indexer/utils"
 	"github.com/vulcanize/ipld-eth-server/pkg/prom"
 
-	"github.com/spf13/viper"
-
-	"github.com/vulcanize/ipld-eth-indexer/pkg/postgres"
-
-	"github.com/vulcanize/ipld-eth-indexer/utils"
+	"github.com/vulcanize/ipld-eth-server/pkg/eth"
 )
 
 // Env variables
@@ -39,15 +42,24 @@ const (
 	SERVER_MAX_IDLE_CONNECTIONS = "SERVER_MAX_IDLE_CONNECTIONS"
 	SERVER_MAX_OPEN_CONNECTIONS = "SERVER_MAX_OPEN_CONNECTIONS"
 	SERVER_MAX_CONN_LIFETIME    = "SERVER_MAX_CONN_LIFETIME"
+
+	ETH_CHAIN_ID = "ETH_CHAIN_ID"
+
+	ETH_DEFAULT_SENDER_ADDR = "ETH_DEFAULT_SENDER_ADDR"
+
+	ETH_RPC_GAS_CAP = "ETH_RPC_GAS_CAP"
 )
 
 // Config struct
 type Config struct {
-	DB           *postgres.DB
-	DBConfig     postgres.Config
-	WSEndpoint   string
-	HTTPEndpoint string
-	IPCEndpoint  string
+	DB            *postgres.DB
+	DBConfig      postgres.Config
+	WSEndpoint    string
+	HTTPEndpoint  string
+	IPCEndpoint   string
+	ChainConfig   *params.ChainConfig
+	DefaultSender *common.Address
+	RPCGasCap     *big.Int
 }
 
 // NewConfig is used to initialize a watcher config from a .toml file
@@ -58,6 +70,9 @@ func NewConfig() (*Config, error) {
 	viper.BindEnv("server.wsPath", SERVER_WS_PATH)
 	viper.BindEnv("server.ipcPath", SERVER_IPC_PATH)
 	viper.BindEnv("server.httpPath", SERVER_HTTP_PATH)
+	viper.BindEnv("ethereum.chainID", ETH_CHAIN_ID)
+	viper.BindEnv("ethereum.defaultSender", ETH_DEFAULT_SENDER_ADDR)
+	viper.BindEnv("ethereum.rpcGasCap", ETH_RPC_GAS_CAP)
 
 	c.DBConfig.Init()
 
@@ -85,7 +100,21 @@ func NewConfig() (*Config, error) {
 	prom.RegisterDBCollector(c.DBConfig.Name, serveDB.DB)
 	c.DB = &serveDB
 
-	return c, nil
+	defaultSenderStr := viper.GetString("ethereum.defaultSender")
+	if defaultSenderStr != "" {
+		sender := common.HexToAddress(defaultSenderStr)
+		c.DefaultSender = &sender
+	}
+	rpcGasCapStr := viper.GetString("ethereum.rpcGasCap")
+	if rpcGasCapStr != "" {
+		if rpcGasCap, ok := new(big.Int).SetString(rpcGasCapStr, 10); ok {
+			c.RPCGasCap = rpcGasCap
+		}
+	}
+	chainID := viper.GetUint64("ethereum.chainID")
+	var err error
+	c.ChainConfig, err = eth.ChainConfig(chainID)
+	return c, err
 }
 
 func overrideDBConnConfig(con *postgres.Config) {

pkg/serve/service.go

@@ -20,6 +20,8 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/ethereum/go-ethereum/core/vm"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	ethnode "github.com/ethereum/go-ethereum/node"
@@ -32,7 +34,6 @@ import (
 	"github.com/vulcanize/ipld-eth-indexer/pkg/postgres"
 
 	"github.com/vulcanize/ipld-eth-server/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/pkg/shared"
 )
 
 const (
@@ -51,8 +52,6 @@ type Server interface {
 	Subscribe(id rpc.ID, sub chan<- SubscriptionPayload, quitChan chan<- bool, params eth.SubscriptionSettings)
 	// Method to unsubscribe from the service
 	Unsubscribe(id rpc.ID)
-	// Method to access chain type
-	Chain() shared.ChainType
 }
 
 // Service is the underlying struct for the watcher
@@ -75,6 +74,8 @@ type Service struct {
 	db *postgres.DB
 	// wg for syncing serve processes
 	serveWg *sync.WaitGroup
+	// config for backend
+	config *eth.Config
 }
 
 // NewServer creates a new Server using an underlying Service struct
@@ -87,6 +88,12 @@ func NewServer(settings *Config) (Server, error) {
 	sn.QuitChan = make(chan bool)
 	sn.Subscriptions = make(map[common.Hash]map[rpc.ID]Subscription)
 	sn.SubscriptionTypes = make(map[common.Hash]eth.SubscriptionSettings)
+	sn.config = &eth.Config{
+		ChainConfig:   settings.ChainConfig,
+		VmConfig:      vm.Config{},
+		DefaultSender: settings.DefaultSender,
+		RPCGasCap:     settings.RPCGasCap,
+	}
 	return sn, nil
 }
 
@@ -124,7 +131,7 @@ func (sap *Service) APIs() []rpc.API {
 			Public:    true,
 		},
 	}
-	backend, err := eth.NewEthBackend(sap.db)
+	backend, err := eth.NewEthBackend(sap.db, sap.config)
 	if err != nil {
 		log.Error(err)
 		return nil
@@ -349,11 +356,6 @@ func (sap *Service) Stop() error {
 	return nil
 }
 
-// Chain returns the chain type for this service
-func (sap *Service) Chain() shared.ChainType {
-	return shared.Ethereum
-}
-
 // close is used to close all listening subscriptions
 // close needs to be called with subscription access locked
 func (sap *Service) close() {