Merge branch 'release/0.9.34'v0.9.34

1 files changed, 24 insertions, 0 deletions

diff --git a/rpc/api/debug_args.go b/rpc/api/debug_args.go
index b9b5aa27e..b72fb03ae 100644
--- a/rpc/api/debug_args.go
+++ b/rpc/api/debug_args.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"math/big"
+	"reflect"
 
 	"github.com/ethereum/go-ethereum/rpc/shared"
 )
@@ -45,3 +46,26 @@ func (args *WaitForBlockArgs) UnmarshalJSON(b []byte) (err error) {
 
 	return nil
 }
+
+type MetricsArgs struct {
+	Raw bool
+}
+
+func (args *MetricsArgs) UnmarshalJSON(b []byte) (err error) {
+	var obj []interface{}
+	if err := json.Unmarshal(b, &obj); err != nil {
+		return shared.NewDecodeParamError(err.Error())
+	}
+	if len(obj) > 1 {
+		return fmt.Errorf("metricsArgs needs 0, 1 arguments")
+	}
+	// default values when not provided
+	if len(obj) >= 1 && obj[0] != nil {
+		if value, ok := obj[0].(bool); !ok {
+			return fmt.Errorf("invalid argument %v", reflect.TypeOf(obj[0]))
+		} else {
+			args.Raw = value
+		}
+	}
+	return nil
+}