Remove the use of canonicaljson-go (#1611)

Author: DeividasK

go.mod

@@ -12,7 +12,6 @@ require (
 	github.com/dominikbraun/graph v0.23.0
 	github.com/fxamacker/cbor/v2 v2.7.0
 	github.com/gagliardetto/utilz v0.1.3
-	github.com/gibson042/canonicaljson-go v1.0.3
 	github.com/go-json-experiment/json v0.0.0-20250223041408-d3c622f1b874
 	github.com/go-playground/validator/v10 v10.26.0
 	github.com/go-viper/mapstructure/v2 v2.4.0

go.sum

@@ -68,8 +68,6 @@ github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrP
 github.com/gagliardetto/hashsearch v0.0.0-20191005111333-09dd671e19f9/go.mod h1:513DXpQPzeRo7d4dsCP3xO3XI8hgvruMl9njxyQeraQ=
 github.com/gagliardetto/utilz v0.1.3 h1:A+asc+6/3a9qNBrgticApj3yW5F7y4TaJd8Ijg+o0zM=
 github.com/gagliardetto/utilz v0.1.3/go.mod h1:b+rGFkRHz3HWJD0RYMzat47JyvbTtpE0iEcYTRJTLLA=
-github.com/gibson042/canonicaljson-go v1.0.3 h1:EAyF8L74AWabkyUmrvEFHEt/AGFQeD6RfwbAuf0j1bI=
-github.com/gibson042/canonicaljson-go v1.0.3/go.mod h1:DsLpJTThXyGNO+KZlI85C1/KDcImpP67k/RKVjcaEqo=
 github.com/go-json-experiment/json v0.0.0-20250223041408-d3c622f1b874 h1:F8d1AJ6M9UQCavhwmO6ZsrYLfG8zVFWfEfMS2MXPkSY=
 github.com/go-json-experiment/json v0.0.0-20250223041408-d3c622f1b874/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=

pkg/jsonrpc2/types.go

@@ -7,7 +7,8 @@ import (
 	"fmt"
 	"strings"
 
-	canonicaljson "github.com/gibson042/canonicaljson-go"
+	jsonv2 "github.com/go-json-experiment/json"
+	"github.com/go-json-experiment/json/jsontext"
 )
 
 const (
@@ -63,22 +64,27 @@ func (r *Request[Params]) ServiceName() string {
 // Digest returns a digest of the request. This is used for signature verification.
 // The digest is a SHA256 hash of the canonical JSON string of the request excluding the auth field.
 func (r *Request[Params]) Digest() (string, error) {
-	canonicalJSONBytes, err := canonicaljson.Marshal(Request[Params]{
+	JSONBytes, err := jsonv2.Marshal(Request[Params]{
 		Version: r.Version,
 		ID:      r.ID,
 		Method:  r.Method,
 		Params:  r.Params,
 		// Auth is intentionally excluded from the digest
-	})
+	}, jsonv2.Deterministic(true))
 	if err != nil {
 		return "", fmt.Errorf("error marshaling JSON: %w", err)
 	}
 
+	canonicalJSONBytes := jsontext.Value(JSONBytes)
+	err = canonicalJSONBytes.Canonicalize()
+	if err != nil {
+		return "", fmt.Errorf("error canonicalizing JSON: %w", err)
+	}
+
 	hasher := sha256.New()
 	hasher.Write(canonicalJSONBytes)
-	digestBytes := hasher.Sum(nil)
 
-	return hex.EncodeToString(digestBytes), nil
+	return hex.EncodeToString(hasher.Sum(nil)), nil
 }
 
 type Response[Result any] struct {
@@ -92,18 +98,23 @@ type Response[Result any] struct {
 // Digest returns a digest of the response. This is used for signature verification.
 // The digest is a SHA256 hash of the canonical JSON string of the response.
 func (r *Response[Result]) Digest() (string, error) {
-	canonicalJSONBytes, err := canonicaljson.Marshal(r)
+	JSONBytes, err := jsonv2.Marshal(r, jsonv2.Deterministic(true))
 	if err != nil {
 		return "", fmt.Errorf("error marshaling JSON: %w", err)
 	}
 
+	canonicalJSONBytes := jsontext.Value(JSONBytes)
+	err = canonicalJSONBytes.Canonicalize()
+	if err != nil {
+		return "", fmt.Errorf("error canonicalizing JSON: %w", err)
+	}
+
 	hasher := sha256.New()
 	if _, err := hasher.Write(canonicalJSONBytes); err != nil {
 		return "", fmt.Errorf("error writing to hasher: %w", err)
 	}
-	digestBytes := hasher.Sum(nil)
 
-	return hex.EncodeToString(digestBytes), nil
+	return hex.EncodeToString(hasher.Sum(nil)), nil
 }
 
 // WireError represents a structured error in a Response.

pkg/jsonrpc2/types_test.go

@@ -47,7 +47,7 @@ func TestTypes(t *testing.T) {
 
 		digest, err := req.Digest()
 		require.Error(t, err)
-		require.Equal(t, "error marshaling JSON: canonicaljson: unsupported type: chan string", err.Error())
+		require.Equal(t, "error marshaling JSON: json: cannot marshal from Go chan string within \"/params/channel\"", err.Error())
 		require.Empty(t, digest)
 	})