From 28ccbeb7de18212954310588994058874fb180af Mon Sep 17 00:00:00 2001
From: Aaron Buchwald <aaron.buchwald56@gmail.com>
Date: Tue, 27 Oct 2020 14:04:01 -0400
Subject: Parse config to set enabled APIs

---
 plugin/evm/vm.go | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'plugin/evm/vm.go')

diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go
index c429bca..1f7e501 100644
--- a/plugin/evm/vm.go
+++ b/plugin/evm/vm.go
@@ -10,6 +10,7 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
+	"strings"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -231,6 +232,10 @@ func (vm *VM) Initialize(
 	toEngine chan<- commonEng.Message,
 	fxs []*commonEng.Fx,
 ) error {
+	if vm.CLIConfig.ParsingError != nil {
+		return vm.CLIConfig.ParsingError
+	}
+
 	if len(fxs) > 0 {
 		return errUnsupportedFXs
 	}
@@ -514,18 +519,20 @@ func newHandler(name string, service interface{}, lockOption ...commonEng.LockOp
 // CreateHandlers makes new http handlers that can handle API calls
 func (vm *VM) CreateHandlers() map[string]*commonEng.HTTPHandler {
 	handler := vm.chain.NewRPCHandler()
+	enabledAPIs := vm.CLIConfig.EthAPIs()
 	vm.chain.AttachEthService(handler, vm.CLIConfig.EthAPIs())
 
 	if vm.CLIConfig.SnowmanAPIEnabled {
 		handler.RegisterName("snowman", &SnowmanAPI{vm})
-	}
-	if vm.CLIConfig.Web3APIEnabled {
-		handler.RegisterName("web3", &Web3API{})
+		enabledAPIs = append(enabledAPIs, "snowman")
 	}
 	if vm.CLIConfig.CorethAdminAPIEnabled {
 		handler.RegisterName("admin", &admin.Performance{})
+		enabledAPIs = append(enabledAPIs, "coreth-admin")
 	}
 
+	log.Info(fmt.Sprintf("Enabled APIs: %s", strings.Join(enabledAPIs, ", ")))
+
 	return map[string]*commonEng.HTTPHandler{
 		"/rpc":  {LockOptions: commonEng.NoLock, Handler: handler},
 		"/avax": newHandler("avax", &AvaxAPI{vm}),
-- 
cgit v1.2.3-70-g09d2


From 4862c2d3a6c18855fee72137db54ed62a0ce6704 Mon Sep 17 00:00:00 2001
From: Aaron Buchwald <aaron.buchwald56@gmail.com>
Date: Fri, 30 Oct 2020 11:33:41 -0400
Subject: Add back net API

---
 plugin/evm/config.go  |  1 +
 plugin/evm/service.go | 12 ++++++++++++
 plugin/evm/vm.go      |  4 ++++
 plugin/params.go      |  1 +
 4 files changed, 18 insertions(+)

(limited to 'plugin/evm/vm.go')

diff --git a/plugin/evm/config.go b/plugin/evm/config.go
index c38a798..4d6650a 100644
--- a/plugin/evm/config.go
+++ b/plugin/evm/config.go
@@ -5,6 +5,7 @@ type CommandLineConfig struct {
 	// Coreth APIs
 	SnowmanAPIEnabled     bool `json:"snowman-api-enabled"`
 	CorethAdminAPIEnabled bool `json:"coreth-admin-api-enabled"`
+	NetAPIEnabled         bool `json:"net-api-enabled"`
 
 	// Coreth API Gas/Price Caps
 	RPCGasCap   uint64  `json:"rpc-gas-cap"`
diff --git a/plugin/evm/service.go b/plugin/evm/service.go
index f1c30c5..a934941 100644
--- a/plugin/evm/service.go
+++ b/plugin/evm/service.go
@@ -38,6 +38,18 @@ type SnowmanAPI struct{ vm *VM }
 // AvaxAPI offers Avalanche network related API methods
 type AvaxAPI struct{ vm *VM }
 
+// NetAPI offers network related API methods
+type NetAPI struct{ vm *VM }
+
+// Listening returns an indication if the node is listening for network connections.
+func (s *NetAPI) Listening() bool { return true } // always listening
+
+// PeerCount returns the number of connected peers
+func (s *NetAPI) PeerCount() hexutil.Uint { return hexutil.Uint(0) } // TODO: report number of connected peers
+
+// Version returns the current ethereum protocol version.
+func (s *NetAPI) Version() string { return fmt.Sprintf("%d", s.vm.networkID) }
+
 // GetAcceptedFrontReply defines the reply that will be sent from the
 // GetAcceptedFront API call
 type GetAcceptedFrontReply struct {
diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go
index 1f7e501..c902f85 100644
--- a/plugin/evm/vm.go
+++ b/plugin/evm/vm.go
@@ -530,6 +530,10 @@ func (vm *VM) CreateHandlers() map[string]*commonEng.HTTPHandler {
 		handler.RegisterName("admin", &admin.Performance{})
 		enabledAPIs = append(enabledAPIs, "coreth-admin")
 	}
+	if vm.CLIConfig.NetAPIEnabled {
+		handler.RegisterName("net", &NetAPI{vm})
+		enabledAPIs = append(enabledAPIs, "net")
+	}
 
 	log.Info(fmt.Sprintf("Enabled APIs: %s", strings.Join(enabledAPIs, ", ")))
 
diff --git a/plugin/params.go b/plugin/params.go
index d780d00..6615798 100644
--- a/plugin/params.go
+++ b/plugin/params.go
@@ -26,6 +26,7 @@ func init() {
 		cliConfig.EthAPIEnabled = true
 		cliConfig.PersonalAPIEnabled = true
 		cliConfig.TxPoolAPIEnabled = true
+		cliConfig.NetAPIEnabled = true
 		cliConfig.RPCGasCap = 2500000000 // 25000000 x 100
 		cliConfig.RPCTxFeeCap = 100      // 100 AVAX
 	} else {
-- 
cgit v1.2.3-70-g09d2