Support cancun.

Author: mcdee

go.mod

@@ -8,14 +8,14 @@ require (
 	github.com/rs/zerolog v1.29.0
 	github.com/stretchr/testify v1.8.2
 	github.com/ybbus/jsonrpc/v2 v2.1.7
-	golang.org/x/crypto v0.17.0
+	golang.org/x/crypto v0.18.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -31,16 +31,16 @@ github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/ybbus/jsonrpc/v2 v2.1.7 h1:QjoXuZhkXZ3oLBkrONBe2avzFkYeYLorpeA+d8175XQ=
 github.com/ybbus/jsonrpc/v2 v2.1.7/go.mod h1:rIuG1+ORoiqocf9xs/v+ecaAVeo3zcZHQgInyKFMeg0=
-golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
-golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

jsonrpc/transactionreceipt.go

@@ -23,12 +23,12 @@ import (
 )
 
 // TransactionReceipt returns the transaction receipt for the given transaction hash.
-func (s *Service) TransactionReceipt(_ context.Context, hash types.Hash) (*spec.BerlinTransactionReceipt, error) {
+func (s *Service) TransactionReceipt(_ context.Context, hash types.Hash) (*spec.TransactionReceipt, error) {
 	if len(hash) == 0 {
 		return nil, errors.New("hash nil")
 	}
 
-	var receipt spec.BerlinTransactionReceipt
+	var receipt spec.TransactionReceipt
 	if err := s.client.CallFor(&receipt, "eth_getTransactionReceipt", fmt.Sprintf("%#x", hash)); err != nil {
 		return nil, err
 	}

service.go

@@ -116,7 +116,7 @@ type TransactionsProvider interface {
 // TransactionReceiptsProvider is the interface for providing transaction receipts.
 type TransactionReceiptsProvider interface {
 	// TransactionReceipt returns the transaction receipt for the given transaction hash.
-	TransactionReceipt(ctx context.Context, hash types.Hash) (*spec.BerlinTransactionReceipt, error)
+	TransactionReceipt(ctx context.Context, hash types.Hash) (*spec.TransactionReceipt, error)
 }
 
 // CallProvider is the interface for making calls to the execution client.

spec/berlintransactionreceipt.go

@@ -71,6 +71,7 @@ func (t *BerlinTransactionReceipt) MarshalJSON() ([]byte, error) {
 		tmp := util.MarshalNullableAddress(t.To[:])
 		to = &tmp
 	}
+
 	return json.Marshal(&berlinTransactionReceiptJSON{
 		BlockHash:         util.MarshalByteArray(t.BlockHash[:]),
 		BlockNumber:       util.MarshalUint32(t.BlockNumber),

spec/block.go

@@ -35,9 +35,12 @@ type Block struct {
 
 // blockTypeJSON is a struct that helps us identify the block type.
 type blockTypeJSON struct {
-	BaseFeePerGas         string                   `json:"baseFeePerGas"`
-	Withdrawals           []map[string]interface{} `json:"withdrawals"`
-	ParentBeaconBlockRoot string                   `json:"parentBeaconBlockRoot"`
+	// Present from London onwards.
+	BaseFeePerGas string `json:"baseFeePerGas"`
+	// Present from Shanghai onwards.
+	Withdrawals []map[string]interface{} `json:"withdrawals"`
+	// Present from Cancun onwards.
+	ParentBeaconBlockRoot string `json:"parentBeaconBlockRoot"`
 }
 
 // MarshalJSON marshals a typed transaction.
@@ -478,6 +481,28 @@ func (b *Block) ParentBeaconBlockRoot() (types.Root, bool) {
 	}
 }
 
+// BlobGasUsed returns the blob gas used of the block.
+// This is not available in all forks, so also returns a presence flag.
+func (b *Block) BlobGasUsed() (uint64, bool) {
+	switch b.Fork {
+	case ForkCancun:
+		return b.Cancun.BlobGasUsed, true
+	default:
+		return 0, false
+	}
+}
+
+// ExcessBlobGas returns the excess blob gas of the block.
+// This is not available in all forks, so also returns a presence flag.
+func (b *Block) ExcessBlobGas() (uint64, bool) {
+	switch b.Fork {
+	case ForkCancun:
+		return b.Cancun.ExcessBlobGas, true
+	default:
+		return 0, false
+	}
+}
+
 // String returns a string version of the structure.
 func (b *Block) String() string {
 	data, err := json.Marshal(b)

spec/block_test.go

@@ -1,4 +1,4 @@
-// Copyright © 2023 Attestant Limited.
+// Copyright © 2023, 2024 Attestant Limited.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -30,7 +30,9 @@ import (
 // CancunBlock contains a block after the Cancun hardfork.
 type CancunBlock struct {
 	BaseFeePerGas         uint64
+	BlobGasUsed           uint64
 	Difficulty            uint64
+	ExcessBlobGas         uint64
 	ExtraData             []byte
 	GasLimit              uint32
 	GasUsed               uint32
@@ -58,7 +60,9 @@ type CancunBlock struct {
 // cancunBlockJSON is the spec representation of the struct.
 type cancunBlockJSON struct {
 	BaseFeePerGas         string         `json:"baseFeePerGas"`
+	BlobGasUsed           string         `json:"blobGasUsed"`
 	Difficulty            string         `json:"difficulty"`
+	ExcessBlobGas         string         `json:"excessBlobGas"`
 	ExtraData             string         `json:"extraData"`
 	GasLimit              string         `json:"gasLimit"`
 	GasUsed               string         `json:"gasUsed"`
@@ -92,7 +96,9 @@ func (b *CancunBlock) MarshalJSON() ([]byte, error) {
 
 	return json.Marshal(&cancunBlockJSON{
 		BaseFeePerGas:         util.MarshalUint64(b.BaseFeePerGas),
+		BlobGasUsed:           util.MarshalUint64(b.BlobGasUsed),
 		Difficulty:            util.MarshalUint64(b.Difficulty),
+		ExcessBlobGas:         util.MarshalUint64(b.ExcessBlobGas),
 		ExtraData:             util.MarshalByteArray(b.ExtraData),
 		GasLimit:              util.MarshalUint32(b.GasLimit),
 		GasUsed:               util.MarshalUint32(b.GasUsed),
@@ -137,6 +143,15 @@ func (b *CancunBlock) UnmarshalJSON(input []byte) error {
 		}
 	}
 
+	if data.BlobGasUsed == "" {
+		return errors.New("blob gas used missing")
+	}
+	tmp, err := strconv.ParseUint(util.PreUnmarshalHexString(data.BlobGasUsed), 16, 32)
+	if err != nil {
+		return errors.Wrap(err, "blob gas used invalid")
+	}
+	b.BlobGasUsed = tmp
+
 	if data.Difficulty == "" {
 		return errors.New("difficulty missing")
 	}
@@ -145,6 +160,15 @@ func (b *CancunBlock) UnmarshalJSON(input []byte) error {
 		return errors.Wrap(err, "difficulty invalid")
 	}
 
+	if data.ExcessBlobGas == "" {
+		return errors.New("excess blob gas missing")
+	}
+	tmp, err = strconv.ParseUint(util.PreUnmarshalHexString(data.ExcessBlobGas), 16, 32)
+	if err != nil {
+		return errors.Wrap(err, "excess blob gas invalid")
+	}
+	b.ExcessBlobGas = tmp
+
 	if data.ExtraData == "" {
 		return errors.New("extra data missing")
 	}
@@ -156,7 +180,7 @@ func (b *CancunBlock) UnmarshalJSON(input []byte) error {
 	if data.GasUsed == "" {
 		return errors.New("gas used missing")
 	}
-	tmp, err := strconv.ParseUint(util.PreUnmarshalHexString(data.GasUsed), 16, 32)
+	tmp, err = strconv.ParseUint(util.PreUnmarshalHexString(data.GasUsed), 16, 32)
 	if err != nil {
 		return errors.Wrap(err, "gas used invalid")
 	}