Add relay all feature

okx · Aug 28, 2024 · a2c27b7 · a2c27b7
1 parent 9d5563d
commit a2c27b7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/jsonrpc/api_relay_xlayer.go b/jsonrpc/api_relay_xlayer.go
@@ -9,13 +9,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,7 +51,7 @@ 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)
 		res, err := client.JSONRPCRelay(destURI, request, shouldRerun(localCfg))
 		if err != nil {
@@ -64,3 +65,21 @@ func tryRelay(localCfg ApiRelayConfig, request types.Request) (types.Response, b
 
 	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)
+}
diff --git a/jsonrpc/apollo_xlayer.go b/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)
 }