Merge pull request #415 from sonicfromnewyoke/sonic/perf-rpc-json-serde

perf(json): swap encoding/json and jsoniter for goccy/go-json

Author: HealthyBuilder

cmd/slnc/cmd/get_account.go

@@ -19,11 +19,10 @@ package cmd
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 
 	"github.com/gagliardetto/solana-go"
-
+	json "github.com/goccy/go-json"
 	"github.com/spf13/cobra"
 )
 

cmd/slnc/cmd/get_block.go

@@ -19,10 +19,10 @@ package cmd
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strconv"
 
+	json "github.com/goccy/go-json"
 	"github.com/spf13/cobra"
 )
 

cmd/slnc/cmd/get_latest_blockhash.go

@@ -19,9 +19,9 @@ package cmd
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 
+	json "github.com/goccy/go-json"
 	"github.com/spf13/cobra"
 )
 

cmd/slnc/cmd/get_program_accounts.go

@@ -18,14 +18,12 @@
 package cmd
 
 import (
-	"encoding/json"
 	"fmt"
 	"os"
 
-	"github.com/gagliardetto/solana-go/text"
-
 	"github.com/gagliardetto/solana-go"
-
+	"github.com/gagliardetto/solana-go/text"
+	json "github.com/goccy/go-json"
 	"github.com/spf13/cobra"
 )
 

go.mod

@@ -6,7 +6,9 @@ require (
 	github.com/gagliardetto/binary v0.8.0
 	github.com/gagliardetto/gofuzz v1.2.2
 	github.com/gagliardetto/treeout v0.1.4
+	github.com/goccy/go-json v0.10.6
 	github.com/google/uuid v1.6.0
+	github.com/json-iterator/go v1.1.12
 	github.com/mr-tron/base58 v1.2.0
 	go.mongodb.org/mongo-driver/v2 v2.5.0
 )
@@ -30,7 +32,7 @@ require (
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -67,7 +69,6 @@ require (
 	github.com/google/go-cmp v0.7.0
 	github.com/gorilla/rpc v1.2.1
 	github.com/gorilla/websocket v1.5.3
-	github.com/json-iterator/go v1.1.12
 	github.com/klauspost/compress v1.18.0
 	github.com/logrusorgru/aurora v2.0.3+incompatible
 	github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1

go.sum

@@ -43,6 +43,8 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
 github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/goccy/go-json v0.10.6 h1:p8HrPJzOakx/mn/bQtjgNjdTcN+/S6FcG2CTtQOrHVU=
+github.com/goccy/go-json v0.10.6/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
@@ -94,9 +96,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU=
 github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 h1:mPMvm6X6tf4w8y7j9YIt6V9jfWhL6QlbEc7CCmeQlWk=

json.go

@@ -15,7 +15,24 @@
 package solana
 
 import (
-	jsoniter "github.com/json-iterator/go"
+	"io"
+
+	gojson "github.com/goccy/go-json"
 )
 
-var json = jsoniter.ConfigCompatibleWithStandardLibrary
+// json is a package-local alias for the JSON library in use. It keeps the
+// existing `json.Marshal`/`json.Unmarshal`/`json.NewDecoder`/`json.NewEncoder`
+// call sites working while the underlying library is swapped.
+var json = struct {
+	Marshal       func(v any) ([]byte, error)
+	MarshalIndent func(v any, prefix, indent string) ([]byte, error)
+	Unmarshal     func(data []byte, v any) error
+	NewDecoder    func(r io.Reader) *gojson.Decoder
+	NewEncoder    func(w io.Writer) *gojson.Encoder
+}{
+	Marshal:       gojson.Marshal,
+	MarshalIndent: gojson.MarshalIndent,
+	Unmarshal:     gojson.Unmarshal,
+	NewDecoder:    gojson.NewDecoder,
+	NewEncoder:    gojson.NewEncoder,
+}

programs/token-2022/json.go

@@ -1,7 +1,21 @@
 package token2022
 
 import (
-	jsoniter "github.com/json-iterator/go"
+	"io"
+
+	gojson "github.com/goccy/go-json"
 )
 
-var json = jsoniter.ConfigCompatibleWithStandardLibrary
+var json = struct {
+	Marshal       func(v any) ([]byte, error)
+	MarshalIndent func(v any, prefix, indent string) ([]byte, error)
+	Unmarshal     func(data []byte, v any) error
+	NewDecoder    func(r io.Reader) *gojson.Decoder
+	NewEncoder    func(w io.Writer) *gojson.Encoder
+}{
+	Marshal:       gojson.Marshal,
+	MarshalIndent: gojson.MarshalIndent,
+	Unmarshal:     gojson.Unmarshal,
+	NewDecoder:    gojson.NewDecoder,
+	NewEncoder:    gojson.NewEncoder,
+}

programs/token/json.go

@@ -15,7 +15,21 @@
 package token
 
 import (
-	jsoniter "github.com/json-iterator/go"
+	"io"
+
+	gojson "github.com/goccy/go-json"
 )
 
-var json = jsoniter.ConfigCompatibleWithStandardLibrary
+var json = struct {
+	Marshal       func(v any) ([]byte, error)
+	MarshalIndent func(v any, prefix, indent string) ([]byte, error)
+	Unmarshal     func(data []byte, v any) error
+	NewDecoder    func(r io.Reader) *gojson.Decoder
+	NewEncoder    func(w io.Writer) *gojson.Encoder
+}{
+	Marshal:       gojson.Marshal,
+	MarshalIndent: gojson.MarshalIndent,
+	Unmarshal:     gojson.Unmarshal,
+	NewDecoder:    gojson.NewDecoder,
+	NewEncoder:    gojson.NewEncoder,
+}

rpc/client_test.go

@@ -21,17 +21,16 @@ import (
 	"bytes"
 	"context"
 	"encoding/base64"
-	stdjson "encoding/json"
 	"fmt"
 	"math/big"
 	"testing"
 
 	"github.com/AlekSi/pointer"
 	bin "github.com/gagliardetto/binary"
+	"github.com/gagliardetto/solana-go"
+	stdjson "github.com/goccy/go-json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
-	"github.com/gagliardetto/solana-go"
 )
 
 func TestClient_GetAccountInfo(t *testing.T) {