Add relay all feature

docs/config-file/node-config-doc.md

@@ -2412,12 +2412,13 @@ ApiKeys=[]
 **Type:** : `object`
 **Description:** ApiRelay defines the relay configuration for the API
 
-| Property                            | Pattern | Type            | Deprecated | Definition | Title/Description |
-| ----------------------------------- | ------- | --------------- | ---------- | ---------- | ----------------- |
-| - [Enabled](#RPC_ApiRelay_Enabled ) | No      | boolean         | No         | -          | -                 |
-| - [DestURI](#RPC_ApiRelay_DestURI ) | No      | string          | No         | -          | -                 |
-| - [RPCs](#RPC_ApiRelay_RPCs )       | No      | array of string | No         | -          | -                 |
-| - [Rerun](#RPC_ApiRelay_Rerun )     | No      | boolean         | No         | -          | -                 |
+| Property                              | Pattern | Type            | Deprecated | Definition | Title/Description |
+| ------------------------------------- | ------- | --------------- | ---------- | ---------- | ----------------- |
+| - [Enabled](#RPC_ApiRelay_Enabled )   | No      | boolean         | No         | -          | -                 |
+| - [DestURI](#RPC_ApiRelay_DestURI )   | No      | string          | No         | -          | -                 |
+| - [RPCs](#RPC_ApiRelay_RPCs )         | No      | array of string | No         | -          | -                 |
+| - [Rerun](#RPC_ApiRelay_Rerun )       | No      | boolean         | No         | -          | -                 |
+| - [RelayAll](#RPC_ApiRelay_RelayAll ) | No      | boolean         | No         | -          | -                 |
 
 #### <a name="RPC_ApiRelay_Enabled"></a>8.30.1. `RPC.ApiRelay.Enabled`
 
@@ -2467,6 +2468,18 @@ RPCs=[]
 Rerun=false
 ```
 
+#### <a name="RPC_ApiRelay_RelayAll"></a>8.30.5. `RPC.ApiRelay.RelayAll`
+
+**Type:** : `boolean`
+
+**Default:** `false`
+
+**Example setting the default value** (false):
+```
+[RPC.ApiRelay]
+RelayAll=false
+```
+
 ## <a name="Synchronizer"></a>9. `[Synchronizer]`
 
 **Type:** : `object`

docs/config-file/node-config-schema.json

@@ -964,6 +964,10 @@
 						"Rerun": {
 							"type": "boolean",
 							"default": false
+						},
+						"RelayAll": {
+							"type": "boolean",
+							"default": false
 						}
 					},
 					"additionalProperties": false,

jsonrpc/api_relay_xlayer.go

@@ -1,6 +1,8 @@
 package jsonrpc
 
 import (
+	"time"
+
 	"github.com/0xPolygonHermez/zkevm-node/jsonrpc/client"
 	"github.com/0xPolygonHermez/zkevm-node/jsonrpc/metrics"
 	"github.com/0xPolygonHermez/zkevm-node/jsonrpc/types"
@@ -9,13 +11,14 @@ import (
 
 // ApiRelayConfig is the api relay config
 type ApiRelayConfig struct {
-	Enabled bool     `mapstructure:"Enabled"`
-	DestURI string   `mapstructure:"DestURI"`
-	RPCs    []string `mapstructure:"RPCs"`
-	Rerun   bool     `mapstructure:"Rerun"`
+	Enabled  bool     `mapstructure:"Enabled"`
+	DestURI  string   `mapstructure:"DestURI"`
+	RPCs     []string `mapstructure:"RPCs"`
+	Rerun    bool     `mapstructure:"Rerun"`
+	RelayAll bool     `mapstructure:"RelayAll"`
 }
 
-func shouldRelay(localCfg ApiRelayConfig, name string) bool {
+func shouldRelayByMethod(localCfg ApiRelayConfig, name string) bool {
 	enable := localCfg.Enabled && localCfg.DestURI != ""
 	contained := types.Contains(localCfg.RPCs, name)
 	if getApolloConfig().Enable() {
@@ -50,17 +53,37 @@ func getRelayDestURI(localDestURI string) string {
 }
 
 func tryRelay(localCfg ApiRelayConfig, request types.Request) (types.Response, bool) {
-	if shouldRelay(localCfg, request.Method) && pass(&request) {
+	if shouldRelay(localCfg, &request) {
 		destURI := getRelayDestURI(localCfg.DestURI)
+		ts := time.Now()
 		res, err := client.JSONRPCRelay(destURI, request, shouldRerun(localCfg))
 		if err != nil {
 			log.Errorf("failed to relay %v to %s: %v", request.Method, destURI, err)
 			metrics.RequestRelayFailCount(request.Method)
 			return types.Response{}, false
 		}
+		log.Infof("relayed %v to %s in %v", request.Method, destURI, time.Since(ts))
 
 		return res, true
 	}
 
 	return types.Response{}, false
 }
+
+func shouldRelay(localCfg ApiRelayConfig, request *types.Request) bool {
+	enable := localCfg.Enabled &&
+		localCfg.DestURI != ""
+	relayAll := localCfg.RelayAll
+	if getApolloConfig().Enable() {
+		getApolloConfig().RLock()
+		defer getApolloConfig().RUnlock()
+		enable = getApolloConfig().ApiRelay.Enabled &&
+			getApolloConfig().ApiRelay.DestURI != ""
+		relayAll = getApolloConfig().ApiRelay.RelayAll
+	}
+	if enable && relayAll {
+		return true
+	}
+
+	return shouldRelayByMethod(localCfg, request.Method) && pass(request)
+}

jsonrpc/apollo_xlayer.go

@@ -56,6 +56,7 @@ func (c *ApolloConfig) setApiRelayCfg(apiRelayCfg ApiRelayConfig) {
 	c.ApiRelay.DestURI = apiRelayCfg.DestURI
 	c.ApiRelay.RPCs = make([]string, len(apiRelayCfg.RPCs))
 	c.ApiRelay.Rerun = apiRelayCfg.Rerun
+	c.ApiRelay.RelayAll = apiRelayCfg.RelayAll
 	copy(c.ApiRelay.RPCs, apiRelayCfg.RPCs)
 }
 

pool/pool_xlayer.go

@@ -8,9 +8,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/0xPolygonHermez/zkevm-node/hex"
 	"github.com/0xPolygonHermez/zkevm-node/log"
-	"github.com/ethereum/go-ethereum/common"
 )
 
 const (
@@ -134,6 +135,7 @@ func (p *Pool) checkFreeGp(ctx context.Context, poolTx Transaction, from common.
 		fromToName, freeGpList := GetSpecialFreeGasList(p.cfg.FreeGasList)
 		info := freeGpList[fromToName[from.String()]]
 		if info != nil &&
+			poolTx.To() != nil &&
 			Contains(info.ToList, *poolTx.To()) &&
 			ContainsMethod("0x"+common.Bytes2Hex(poolTx.Data()), info.MethodSigs) {
 			return true, nil