core/types: un-ssz blob txs, add json marshalling and tweaks (#27256)

core/types/gen_access_tuple.go

@@ -12,8 +12,8 @@ import (
 // MarshalJSON marshals as JSON.
 func (a AccessTuple) MarshalJSON() ([]byte, error) {
 	type AccessTuple struct {
-		Address     common.Address `json:"address"        gencodec:"required"`
-		StorageKeys []common.Hash  `json:"storageKeys"    gencodec:"required"`
+		Address     common.Address `json:"address"     gencodec:"required"`
+		StorageKeys []common.Hash  `json:"storageKeys" gencodec:"required"`
 	}
 	var enc AccessTuple
 	enc.Address = a.Address
@@ -24,8 +24,8 @@ func (a AccessTuple) MarshalJSON() ([]byte, error) {
 // UnmarshalJSON unmarshals from JSON.
 func (a *AccessTuple) UnmarshalJSON(input []byte) error {
 	type AccessTuple struct {
-		Address     *common.Address `json:"address"        gencodec:"required"`
-		StorageKeys []common.Hash   `json:"storageKeys"    gencodec:"required"`
+		Address     *common.Address `json:"address"     gencodec:"required"`
+		StorageKeys []common.Hash   `json:"storageKeys" gencodec:"required"`
 	}
 	var dec AccessTuple
 	if err := json.Unmarshal(input, &dec); err != nil {

core/types/transaction.go

@@ -198,7 +198,7 @@ func (tx *Transaction) decodeTyped(b []byte) (TxData, error) {
 		return &inner, err
 	case BlobTxType:
 		var inner BlobTx
-		err := rlp.DecodeBytes(b[1:], &inner) // TODO(karalabe): This needs to be ssz
+		err := rlp.DecodeBytes(b[1:], &inner)
 		return &inner, err
 	default:
 		return nil, ErrTxTypeNotSupported
@@ -417,11 +417,7 @@ func (tx *Transaction) Size() uint64 {
 		return size.(uint64)
 	}
 	c := writeCounter(0)
-	if tx.Type() == BlobTxType {
-		rlp.Encode(&c, &tx.inner) // TODO(karalabe): Replace with SSZ encoding
-	} else {
-		rlp.Encode(&c, &tx.inner)
-	}
+	rlp.Encode(&c, &tx.inner)
 
 	size := uint64(c)
 	if tx.Type() != LegacyTxType {

core/types/tx_access_list.go

@@ -29,8 +29,8 @@ type AccessList []AccessTuple
 
 // AccessTuple is the element type of an access list.
 type AccessTuple struct {
-	Address     common.Address `json:"address"        gencodec:"required"`
-	StorageKeys []common.Hash  `json:"storageKeys"    gencodec:"required"`
+	Address     common.Address `json:"address"     gencodec:"required"`
+	StorageKeys []common.Hash  `json:"storageKeys" gencodec:"required"`
 }
 
 // StorageKeys returns the total number of storage keys in the access list.

core/types/tx_blob.go

@@ -31,7 +31,7 @@ type BlobTx struct {
 	GasTipCap  *uint256.Int // a.k.a. maxPriorityFeePerGas
 	GasFeeCap  *uint256.Int // a.k.a. maxFeePerGas
 	Gas        uint64
-	To         *common.Address // `rlp:"nil"` // nil means contract creation
+	To         *common.Address `rlp:"nil"` // nil means contract creation
 	Value      *uint256.Int
 	Data       []byte
 	AccessList AccessList