state/stateobject: skip lcoal revive in snap expired;

rpc: using jsoniter as json encode/decoder;

rpc/client.go

@@ -28,6 +28,8 @@ import (
 	"sync/atomic"
 	"time"
 
+	jsoniter "github.com/json-iterator/go"
+
 	"github.com/ethereum/go-ethereum/log"
 )
 
@@ -371,6 +373,7 @@ func (c *Client) CallContext(ctx context.Context, result interface{}, method str
 		if result == nil {
 			return nil
 		}
+		var json = jsoniter.ConfigCompatibleWithStandardLibrary
 		return json.Unmarshal(resp.Result, result)
 	}
 }
@@ -453,6 +456,7 @@ func (c *Client) BatchCallContext(ctx context.Context, b []BatchElem) error {
 		case resp.Result == nil:
 			elem.Error = ErrNoResult
 		default:
+			var json = jsoniter.ConfigCompatibleWithStandardLibrary
 			elem.Error = json.Unmarshal(resp.Result, elem.Result)
 		}
 	}
@@ -549,6 +553,7 @@ func (c *Client) newMessage(method string, paramsIn ...interface{}) (*jsonrpcMes
 	msg := &jsonrpcMessage{Version: vsn, ID: c.nextID(), Method: method}
 	if paramsIn != nil { // prevent sending "params":null
 		var err error
+		var json = jsoniter.ConfigCompatibleWithStandardLibrary
 		if msg.Params, err = json.Marshal(paramsIn); err != nil {
 			return nil, err
 		}

rpc/handler.go

@@ -25,6 +25,8 @@ import (
 	"sync"
 	"time"
 
+	jsoniter "github.com/json-iterator/go"
+
 	"github.com/ethereum/go-ethereum/common/gopool"
 
 	"github.com/ethereum/go-ethereum/log"
@@ -409,6 +411,7 @@ func (h *handler) handleResponses(batch []*jsonrpcMessage, handleCall func(*json
 			if msg.Error != nil {
 				op.err = msg.Error
 			} else {
+				var json = jsoniter.ConfigCompatibleWithStandardLibrary
 				op.err = json.Unmarshal(msg.Result, &op.sub.subid)
 				if op.err == nil {
 					go op.sub.run()
@@ -450,6 +453,7 @@ func (h *handler) handleResponses(batch []*jsonrpcMessage, handleCall func(*json
 // handleSubscriptionResult processes subscription notifications.
 func (h *handler) handleSubscriptionResult(msg *jsonrpcMessage) {
 	var result subscriptionResult
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err := json.Unmarshal(msg.Params, &result); err != nil {
 		h.log.Debug("Dropping invalid subscription message")
 		return

rpc/http.go

@@ -19,7 +19,6 @@ package rpc
 import (
 	"bytes"
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -30,6 +29,8 @@ import (
 	"strconv"
 	"sync"
 	"time"
+
+	jsoniter "github.com/json-iterator/go"
 )
 
 const (
@@ -178,6 +179,7 @@ func (c *Client) sendHTTP(ctx context.Context, op *requestOp, msg interface{}) e
 
 	var resp jsonrpcMessage
 	batch := [1]*jsonrpcMessage{&resp}
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err := json.NewDecoder(respBody).Decode(&resp); err != nil {
 		return err
 	}
@@ -194,6 +196,7 @@ func (c *Client) sendBatchHTTP(ctx context.Context, op *requestOp, msgs []*jsonr
 	defer respBody.Close()
 
 	var respmsgs []*jsonrpcMessage
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err := json.NewDecoder(respBody).Decode(&respmsgs); err != nil {
 		return err
 	}
@@ -202,6 +205,7 @@ func (c *Client) sendBatchHTTP(ctx context.Context, op *requestOp, msgs []*jsonr
 }
 
 func (hc *httpConn) doRequest(ctx context.Context, msg interface{}) (io.ReadCloser, error) {
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	body, err := json.Marshal(msg)
 	if err != nil {
 		return nil, err
@@ -258,6 +262,7 @@ func newHTTPServerConn(r *http.Request, w http.ResponseWriter) ServerCodec {
 
 	encoder := func(v any, isErrorResponse bool) error {
 		if !isErrorResponse {
+			var json = jsoniter.ConfigCompatibleWithStandardLibrary
 			return json.NewEncoder(conn).Encode(v)
 		}
 
@@ -267,6 +272,7 @@ func newHTTPServerConn(r *http.Request, w http.ResponseWriter) ServerCodec {
 		// server's write timeout occurs. So we need to flush the response. The
 		// Content-Length header also needs to be set to ensure the client knows
 		// when it has the full response.
+		var json = jsoniter.ConfigCompatibleWithStandardLibrary
 		encdata, err := json.Marshal(v)
 		if err != nil {
 			return err
@@ -287,6 +293,7 @@ func newHTTPServerConn(r *http.Request, w http.ResponseWriter) ServerCodec {
 		return err
 	}
 
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	dec := json.NewDecoder(conn)
 	dec.UseNumber()
 

rpc/json.go

@@ -27,6 +27,8 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	jsoniter "github.com/json-iterator/go"
 )
 
 const (
@@ -91,6 +93,7 @@ func (msg *jsonrpcMessage) namespace() string {
 }
 
 func (msg *jsonrpcMessage) String() string {
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	b, _ := json.Marshal(msg)
 	return string(b)
 }
@@ -102,6 +105,7 @@ func (msg *jsonrpcMessage) errorResponse(err error) *jsonrpcMessage {
 }
 
 func (msg *jsonrpcMessage) response(result interface{}) *jsonrpcMessage {
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	enc, err := json.Marshal(result)
 	if err != nil {
 		return msg.errorResponse(&internalServerError{errcodeMarshalError, err.Error()})
@@ -199,6 +203,7 @@ func NewFuncCodec(conn deadlineCloser, encode encodeFunc, decode decodeFunc) Ser
 // NewCodec creates a codec on the given connection. If conn implements ConnRemoteAddr, log
 // messages will use it to include the remote address of the connection.
 func NewCodec(conn Conn) ServerCodec {
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	enc := json.NewEncoder(conn)
 	dec := json.NewDecoder(conn)
 	dec.UseNumber()
@@ -267,6 +272,7 @@ func (c *jsonCodec) closed() <-chan interface{} {
 func parseMessage(raw json.RawMessage) ([]*jsonrpcMessage, bool) {
 	if !isBatch(raw) {
 		msgs := []*jsonrpcMessage{{}}
+		var json = jsoniter.ConfigCompatibleWithStandardLibrary
 		json.Unmarshal(raw, &msgs[0])
 		return msgs, false
 	}

rpc/subscription.go

@@ -29,6 +29,8 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	jsoniter "github.com/json-iterator/go"
 )
 
 var (
@@ -182,6 +184,7 @@ func (n *Notifier) activate() error {
 }
 
 func (n *Notifier) send(sub *Subscription, data json.RawMessage) error {
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	params, _ := json.Marshal(&subscriptionResult{ID: string(sub.ID), Result: data})
 	ctx := context.Background()
 
@@ -208,6 +211,7 @@ func (s *Subscription) Err() <-chan error {
 
 // MarshalJSON marshals a subscription as its ID.
 func (s *Subscription) MarshalJSON() ([]byte, error) {
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	return json.Marshal(s.ID)
 }
 
@@ -376,6 +380,7 @@ func (sub *ClientSubscription) forward() (unsubscribeServer bool, err error) {
 
 func (sub *ClientSubscription) unmarshal(result json.RawMessage) (interface{}, error) {
 	val := reflect.New(sub.etype)
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	err := json.Unmarshal(result, val.Interface())
 	return val.Elem().Interface(), err
 }

rpc/types.go

@@ -18,12 +18,13 @@ package rpc
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"math"
 	"strconv"
 	"strings"
 
+	jsoniter "github.com/json-iterator/go"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 )
@@ -152,6 +153,7 @@ type BlockNumberOrHash struct {
 func (bnh *BlockNumberOrHash) UnmarshalJSON(data []byte) error {
 	type erased BlockNumberOrHash
 	e := erased{}
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	err := json.Unmarshal(data, &e)
 	if err == nil {
 		if e.BlockNumber != nil && e.BlockHash != nil {