From 6da65c2173e6da457423d67e958ce153c5598a17 Mon Sep 17 00:00:00 2001
From: Aaron Buchwald <aaron.buchwald56@gmail.com>
Date: Tue, 20 Oct 2020 11:57:31 -0400
Subject: Add CLI config to coreth plugin

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

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

diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go
index f19c105..a6370e1 100644
--- a/plugin/evm/vm.go
+++ b/plugin/evm/vm.go
@@ -154,6 +154,8 @@ func init() {
 type VM struct {
 	ctx *snow.Context
 
+	CLIConfig CommandLineConfig
+
 	chainID          *big.Int
 	networkID        uint64
 	genesisHash      common.Hash
@@ -512,12 +514,17 @@ 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()
-	vm.chain.AttachEthService(handler, []string{"eth", "personal", "txpool"})
-	handler.RegisterName("net", &NetAPI{vm})
-	handler.RegisterName("snowman", &SnowmanAPI{vm})
-	handler.RegisterName("web3", &Web3API{})
-	handler.RegisterName("debug", &DebugAPI{vm})
-	handler.RegisterName("admin", &admin.Performance{})
+	vm.chain.AttachEthService(handler, vm.CLIConfig.EthAPIs())
+
+	if vm.CLIConfig.SnowmanAPIEnabled {
+		handler.RegisterName("snowman", &SnowmanAPI{vm})
+	}
+	if vm.CLIConfig.Web3APIEnabled {
+		handler.RegisterName("web3", &Web3API{})
+	}
+	if vm.CLIConfig.CorethAdminAPIEnabled {
+		handler.RegisterName("admin", &admin.Performance{})
+	}
 
 	return map[string]*commonEng.HTTPHandler{
 		"/rpc":  {LockOptions: commonEng.NoLock, Handler: handler},
-- 
cgit v1.2.3


From cccb47666b2bccce378a9a56824061ea3a9a95fa Mon Sep 17 00:00:00 2001
From: Aaron Buchwald <aaron.buchwald56@gmail.com>
Date: Tue, 20 Oct 2020 12:20:49 -0400
Subject: Add RPC GasCap and TxFeeCap to CLI config

---
 plugin/evm/vm.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go
index a6370e1..c429bca 100644
--- a/plugin/evm/vm.go
+++ b/plugin/evm/vm.go
@@ -261,8 +261,8 @@ func (vm *VM) Initialize(
 	// Set minimum price for mining and default gas price oracle value to the min
 	// gas price to prevent so transactions and blocks all use the correct fees
 	config.Miner.GasPrice = params.MinGasPrice
-	config.RPCGasCap = 2500000000 // 25000000 x 100
-	config.RPCTxFeeCap = 100      // 100 AVAX
+	config.RPCGasCap = vm.CLIConfig.RPCGasCap
+	config.RPCTxFeeCap = vm.CLIConfig.RPCTxFeeCap
 	config.GPO.Default = params.MinGasPrice
 	config.TxPool.PriceLimit = params.MinGasPrice.Uint64()
 	config.TxPool.NoLocals = true
-- 
cgit v1.2.3