From c08e72f53583de5671cd7f5f015596ceb55f4ca7 Mon Sep 17 00:00:00 2001
From: "Mr.P" <pro100skm@yandex.ru>
Date: Wed, 9 Oct 2024 04:28:24 +0300
Subject: [PATCH] cherry pick from #664

---
 cmd/XDC/main.go    |  1 +
 cmd/XDC/usage.go   |  1 +
 cmd/utils/flags.go | 11 ++++++++++-
 eth/config.go      |  7 +++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/cmd/XDC/main.go b/cmd/XDC/main.go
index 419978ba6e09..2a425d21aaf1 100644
--- a/cmd/XDC/main.go
+++ b/cmd/XDC/main.go
@@ -137,6 +137,7 @@ var (
 
 	rpcFlags = []cli.Flag{
 		utils.RPCEnabledFlag,
+		utils.RPCGlobalGasCapFlag,
 		utils.RPCListenAddrFlag,
 		utils.RPCPortFlag,
 		utils.RPCHttpWriteTimeoutFlag,
diff --git a/cmd/XDC/usage.go b/cmd/XDC/usage.go
index e6b2fc961f8f..8a4abadab038 100644
--- a/cmd/XDC/usage.go
+++ b/cmd/XDC/usage.go
@@ -143,6 +143,7 @@ var AppHelpFlagGroups = []flagGroup{
 		Name: "API AND CONSOLE",
 		Flags: []cli.Flag{
 			utils.RPCEnabledFlag,
+			utils.RPCGlobalGasCapFlag,
 			utils.RPCListenAddrFlag,
 			utils.RPCPortFlag,
 			utils.RPCHttpWriteTimeoutFlag,
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index a9fd25c4922a..e6e4a4716cbd 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -359,7 +359,7 @@ var (
 		Usage: "Record information useful for VM and contract debugging",
 	}
 	RPCGlobalGasCapFlag = cli.Uint64Flag{
-		Name:  "rpc.gascap",
+		Name:  "rpc-gascap",
 		Usage: "Sets a cap on gas that can be used in eth_call/estimateGas (0=infinite)",
 		Value: eth.DefaultConfig.RPCGasCap,
 	}
@@ -1171,6 +1171,15 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
 	if ctx.GlobalIsSet(DocRootFlag.Name) {
 		cfg.DocRoot = ctx.GlobalString(DocRootFlag.Name)
 	}
+<<<<<<< HEAD
+=======
+	if ctx.GlobalIsSet(RPCGlobalTxFeeCap.Name) {
+		cfg.RPCTxFeeCap = ctx.GlobalFloat64(RPCGlobalTxFeeCap.Name)
+	}
+	if ctx.GlobalIsSet(RPCGlobalGasCapFlag.Name) {
+		cfg.RPCGasCap = ctx.GlobalUint64(RPCGlobalGasCapFlag.Name)
+	}
+>>>>>>> 22c54206b (add flag rpc-gascap and set RPCGasCap to 50M (#664))
 	if ctx.GlobalIsSet(ExtraDataFlag.Name) {
 		cfg.ExtraData = []byte(ctx.GlobalString(ExtraDataFlag.Name))
 	}
diff --git a/eth/config.go b/eth/config.go
index 73a95aa6756f..af2f37ced4d8 100644
--- a/eth/config.go
+++ b/eth/config.go
@@ -50,12 +50,19 @@ var DefaultConfig = Config{
 	TrieTimeout:   5 * time.Minute,
 	GasPrice:      big.NewInt(0.25 * params.Shannon),
 
+<<<<<<< HEAD:eth/config.go
 	TxPool:    core.DefaultTxPoolConfig,
 	RPCGasCap: 25000000,
 	GPO: gasprice.Config{
 		Blocks:     20,
 		Percentile: 60,
 	},
+=======
+	TxPool:      core.DefaultTxPoolConfig,
+	RPCGasCap:   50000000,
+	GPO:         FullNodeGPO,
+	RPCTxFeeCap: 1, // 1 ether
+>>>>>>> 22c54206b (add flag rpc-gascap and set RPCGasCap to 50M (#664)):eth/ethconfig/config.go
 }
 
 func init() {