From 9680a5f61ee15a40e4c3b1c23acf3197d50184fd Mon Sep 17 00:00:00 2001
From: islishude <islishude@gmail.com>
Date: Thu, 12 Sep 2024 16:02:51 +0800
Subject: [PATCH 1/2] core/types: fix json encoding for Request

---
 core/types/request.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/types/request.go b/core/types/request.go
index 7b1cade26e75..d8749c4f0de4 100644
--- a/core/types/request.go
+++ b/core/types/request.go
@@ -18,6 +18,7 @@ package types
 
 import (
 	"bytes"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -94,6 +95,11 @@ func (r *Request) encode(w *bytes.Buffer) error {
 	return r.inner.encode(w)
 }
 
+// MarshalJSON marshals as JSON.
+func (r *Request) MarshalJSON() ([]byte, error) {
+	return json.Marshal(r.inner)
+}
+
 // MarshalBinary returns the canonical encoding of the request.
 func (r *Request) MarshalBinary() ([]byte, error) {
 	var buf bytes.Buffer

From 3ec43eea5844e566ddbc9ce3aa6591be4d6d0867 Mon Sep 17 00:00:00 2001
From: islishude <islishude@gmail.com>
Date: Fri, 13 Sep 2024 10:06:24 +0800
Subject: [PATCH 2/2] add requestMarshaling type for json codec

---
 core/types/request.go      | 36 ++++++++++++++++++++--
 core/types/request_test.go | 63 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 core/types/request_test.go

diff --git a/core/types/request.go b/core/types/request.go
index d8749c4f0de4..e1b82fae939e 100644
--- a/core/types/request.go
+++ b/core/types/request.go
@@ -95,9 +95,41 @@ func (r *Request) encode(w *bytes.Buffer) error {
 	return r.inner.encode(w)
 }
 
-// MarshalJSON marshals as JSON.
+// Request intermediate type for json codec
+type requestMarshaling struct {
+	Type byte            `json:"type"`
+	Data json.RawMessage `json:"data"`
+}
+
+// UnmarshalJSON implements json.Marshaler interface
 func (r *Request) MarshalJSON() ([]byte, error) {
-	return json.Marshal(r.inner)
+	if r.inner == nil {
+		return nil, errors.New("no request data")
+	}
+
+	data, err := json.Marshal(r.inner)
+	if err != nil {
+		return nil, err
+	}
+
+	return json.Marshal(requestMarshaling{Type: r.inner.requestType(), Data: data})
+}
+
+// UnmarshalJSON implements json.Unmarshaler interface
+func (r *Request) UnmarshalJSON(b []byte) error {
+	var raw requestMarshaling
+	if err := json.Unmarshal(b, &raw); err != nil {
+		return err
+	}
+
+	switch raw.Type {
+	case DepositRequestType:
+		r.inner = new(Deposit)
+	default:
+		return ErrRequestTypeNotSupported
+	}
+
+	return json.Unmarshal(raw.Data, r.inner)
 }
 
 // MarshalBinary returns the canonical encoding of the request.
diff --git a/core/types/request_test.go b/core/types/request_test.go
new file mode 100644
index 000000000000..a321320cbe5f
--- /dev/null
+++ b/core/types/request_test.go
@@ -0,0 +1,63 @@
+// Copyright 2024 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
+package types
+
+import (
+	"encoding/json"
+	"reflect"
+	"testing"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+)
+
+func TestRequest_JSONCodec(t *testing.T) {
+	tests := []struct {
+		name   string
+		fields *Request
+	}{
+		{
+			name: "Deposit",
+			fields: NewRequest(&Deposit{
+				PublicKey:             [48]byte(hexutil.MustDecode("0xab89324e578c5b0162f260340bf9505080dab873c5269d112f95a90b6743442b918c36c4bfeadeec840266d801966a31")),
+				WithdrawalCredentials: common.HexToHash("0x01000000000000000000000005562e2e3725f641a140a098ec720f65595ae58d"),
+				Amount:                32000000000,
+				Signature:             [96]byte(hexutil.MustDecode("0xb1921ba4029eaa2e7d783ae4f0f3417b4a0b3ef5691eb4d3a717355479ec89cb28dfac62b94815fc4939492bd00460430dafc49006a0196574741141b0acca886009d85da019039977a7cdb6c995a5691bd87914f95783c36df9f0470e6b302e")),
+				Index:                 0x77a4190000000000,
+			}),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			raw, err := json.Marshal(tt.fields)
+			if err != nil {
+				t.Errorf("Request.MarshalJSON() error = %v", err)
+				return
+			}
+
+			req := new(Request)
+			if err := json.Unmarshal(raw, req); err != nil {
+				t.Errorf("Request.UnmarshalJSON() error = %v", err)
+				return
+			}
+
+			if !reflect.DeepEqual(req, tt.fields) {
+				t.Errorf("Request not deep equal: want: %v have: %v", tt.fields, req)
+			}
+		})
+	}
+}