🚑️ Fix JSON field requestsHash naming of ethereum/rpc.Header (#87)

🚑️ Fix JSON field naming of `ethereum/rpc.Header`

Author: nmvalera

ethereum/rpc/types.go

@@ -32,7 +32,7 @@ type Header struct {
 	BlobGasUsed      *hexutil.Uint64      `json:"blobGasUsed,omitempty"`
 	ExcessBlobGas    *hexutil.Uint64      `json:"excessBlobGas,omitempty"`
 	ParentBeaconRoot *gethcommon.Hash     `json:"parentBeaconBlockRoot,omitempty"`
-	RequestsRoot     *gethcommon.Hash     `json:"requestsRoot,omitempty"`
+	RequestsHash     *gethcommon.Hash     `json:"requestsHash,omitempty"`
 	Hash             gethcommon.Hash      `json:"hash"`
 }
 
@@ -56,7 +56,7 @@ func (h *Header) Header() *gethtypes.Header {
 		BaseFee:          (*big.Int)(h.BaseFee),
 		WithdrawalsHash:  h.WithdrawalsRoot,
 		ParentBeaconRoot: h.ParentBeaconRoot,
-		RequestsHash:     h.RequestsRoot,
+		RequestsHash:     h.RequestsHash,
 	}
 
 	if h.BlobGasUsed != nil {
@@ -89,7 +89,7 @@ func (h *Header) FromHeader(header *gethtypes.Header) *Header {
 	h.BaseFee = (*hexutil.Big)(header.BaseFee)
 	h.WithdrawalsRoot = header.WithdrawalsHash
 	h.ParentBeaconRoot = header.ParentBeaconRoot
-	h.RequestsRoot = header.RequestsHash
+	h.RequestsHash = header.RequestsHash
 
 	if header.BlobGasUsed != nil {
 		h.BlobGasUsed = (*hexutil.Uint64)(header.BlobGasUsed)

ethereum/rpc/types_test.go

@@ -9,33 +9,40 @@ import (
 	gethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	gethtypes "github.com/ethereum/go-ethereum/core/types"
+	"github.com/kkrt-labs/go-utils/common"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestRPCHeader(t *testing.T) {
 	header := &gethtypes.Header{
-		ParentHash:  gethcommon.Hash{},
-		UncleHash:   gethcommon.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-		ReceiptHash: gethcommon.HexToHash("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"),
-		TxHash:      gethcommon.HexToHash("0x661a9febcfa8f1890af549b874faf9fa274aede26ef489d9db0b25daa569450e"),
-		Number:      big.NewInt(100),
-		GasLimit:    1000,
-		GasUsed:     10000,
-		Time:        1000,
-		Difficulty:  big.NewInt(100),
-		Extra:       hexutil.MustDecode("0xabcd"),
-		Bloom:       gethtypes.Bloom{},
-		Coinbase:    gethcommon.HexToAddress("0x5E0c840B55d49377070e131ed93B69393218C444"),
-		MixDigest:   gethcommon.Hash{},
-		Nonce:       gethtypes.EncodeNonce(25),
-		Root:        gethcommon.Hash{},
+		ParentHash:       gethcommon.Hash{},
+		UncleHash:        gethcommon.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
+		ReceiptHash:      gethcommon.HexToHash("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"),
+		TxHash:           gethcommon.HexToHash("0x661a9febcfa8f1890af549b874faf9fa274aede26ef489d9db0b25daa569450e"),
+		Number:           big.NewInt(100),
+		GasLimit:         1000,
+		GasUsed:          10000,
+		Time:             1000,
+		Difficulty:       big.NewInt(100),
+		Extra:            hexutil.MustDecode("0xabcd"),
+		Bloom:            gethtypes.Bloom{},
+		Coinbase:         gethcommon.HexToAddress("0x5E0c840B55d49377070e131ed93B69393218C444"),
+		MixDigest:        gethcommon.Hash{},
+		Nonce:            gethtypes.EncodeNonce(25),
+		Root:             gethcommon.Hash{},
+		BaseFee:          big.NewInt(100),
+		WithdrawalsHash:  common.Ptr(gethcommon.Hash{}),
+		BlobGasUsed:      common.Ptr(uint64(8)),
+		ExcessBlobGas:    common.Ptr(uint64(9)),
+		ParentBeaconRoot: common.Ptr(gethcommon.HexToHash("0xeacd31ced729baf258bd42cdbd42617ad326b0c64ac2079f97c072d8c086c27f")),
+		RequestsHash:     common.Ptr(gethcommon.HexToHash("0xc420b56fcdd9edfe80e9fc11d773cb48793778f46216963bc418133579e6963b")),
 	}
 
 	rpcHeader := new(Header).FromHeader(header)
 	assert.Equal(t, header.Hash(), rpcHeader.Hash)
 
-	b, err := json.Marshal(rpcHeader)
+	b, err := json.Marshal(header)
 	require.NoError(t, err)
 
 	rpcHeader2 := new(Header)