Revert 'core/types: add MarshalBinary, UnmarshalBinary for Receipt (e…

…thereum#22806)
blockcypher · Feb 14, 2024 · ab82e92 · ab82e92
1 parent aa3968f
commit ab82e92
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 137 deletions.
diff --git a/core/types/receipt.go b/core/types/receipt.go
@@ -127,29 +127,13 @@ func (r *Receipt) EncodeRLP(w io.Writer) error {
 	buf := encodeBufferPool.Get().(*bytes.Buffer)
 	defer encodeBufferPool.Put(buf)
 	buf.Reset()
-	if err := r.encodeTyped(data, buf); err != nil {
+	buf.WriteByte(r.Type)
+	if err := rlp.Encode(buf, data); err != nil {
 		return err
 	}
 	return rlp.Encode(w, buf.Bytes())
 }
 
-// encodeTyped writes the canonical encoding of a typed receipt to w.
-func (r *Receipt) encodeTyped(data *receiptRLP, w *bytes.Buffer) error {
-	w.WriteByte(r.Type)
-	return rlp.Encode(w, data)
-}
-
-// MarshalBinary returns the consensus encoding of the receipt.
-func (r *Receipt) MarshalBinary() ([]byte, error) {
-	if r.Type == LegacyTxType {
-		return rlp.EncodeToBytes(r)
-	}
-	data := &receiptRLP{r.statusEncoding(), r.CumulativeGasUsed, r.Bloom, r.Logs}
-	var buf bytes.Buffer
-	err := r.encodeTyped(data, &buf)
-	return buf.Bytes(), err
-}
-
 // DecodeRLP implements rlp.Decoder, and loads the consensus fields of a receipt
 // from an RLP stream.
 func (r *Receipt) DecodeRLP(s *rlp.Stream) error {
@@ -181,23 +165,6 @@ func (r *Receipt) DecodeRLP(s *rlp.Stream) error {
 	}
 }
 
-// UnmarshalBinary decodes the consensus encoding of receipts.
-// It supports legacy RLP receipts and EIP-2718 typed receipts.
-func (r *Receipt) UnmarshalBinary(b []byte) error {
-	if len(b) > 0 && b[0] > 0x7f {
-		// It's a legacy receipt decode the RLP
-		var data receiptRLP
-		err := rlp.DecodeBytes(b, &data)
-		if err != nil {
-			return err
-		}
-		r.Type = LegacyTxType
-		return r.setFromRLP(data)
-	}
-	// It's an EIP2718 typed transaction envelope.
-	return r.decodeTyped(b)
-}
-
 // decodeTyped decodes a typed receipt from the canonical format.
 func (r *Receipt) decodeTyped(b []byte) error {
 	if len(b) <= 1 {
@@ -346,6 +313,9 @@ func (rs Receipts) DeriveFields(config *params.ChainConfig, hash common.Hash, nu
 		rs[i].BlockHash = hash
 		rs[i].BlockNumber = new(big.Int).SetUint64(number)
 		rs[i].TransactionIndex = uint(i)
+		rs[i].BlockHash = hash
+		rs[i].BlockNumber = new(big.Int).SetUint64(number)
+		rs[i].TransactionIndex = uint(i)
 
 		// The contract address can be derived from the transaction itself
 		if txs[i].To() == nil {

diff --git a/core/types/receipt_test.go b/core/types/receipt_test.go
@@ -21,7 +21,6 @@ import (
 	"encoding/json"
 	"math"
 	"math/big"
-	"reflect"
 	"testing"
 
 	"github.com/blockcypher/go-ethereum/common"
@@ -392,105 +391,6 @@ func TestTypedReceiptEncodingDecoding(t *testing.T) {
 	}
 }
 
-func TestReceiptMarshalBinary(t *testing.T) {
-	// Legacy Receipt
-	legacyReceipt.Bloom = CreateBloom(Receipts{legacyReceipt})
-	have, err := legacyReceipt.MarshalBinary()
-	if err != nil {
-		t.Fatalf("marshal binary error: %v", err)
-	}
-	legacyReceipts := Receipts{legacyReceipt}
-	buf := new(bytes.Buffer)
-	legacyReceipts.EncodeIndex(0, buf)
-	haveEncodeIndex := buf.Bytes()
-	if !bytes.Equal(have, haveEncodeIndex) {
-		t.Errorf("BinaryMarshal and EncodeIndex mismatch, got %x want %x", have, haveEncodeIndex)
-	}
-	buf.Reset()
-	if err := legacyReceipt.EncodeRLP(buf); err != nil {
-		t.Fatalf("encode rlp error: %v", err)
-	}
-	haveRLPEncode := buf.Bytes()
-	if !bytes.Equal(have, haveRLPEncode) {
-		t.Errorf("BinaryMarshal and EncodeRLP mismatch for legacy tx, got %x want %x", have, haveRLPEncode)
-	}
-	legacyWant := common.FromHex("f901c58001b9010000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000000000000000010000080000000000000000000004000000000000000000000000000040000000000000000000000000000800000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f8bef85d940000000000000000000000000000000000000011f842a0000000000000000000000000000000000000000000000000000000000000deada0000000000000000000000000000000000000000000000000000000000000beef830100fff85d940000000000000000000000000000000000000111f842a0000000000000000000000000000000000000000000000000000000000000deada0000000000000000000000000000000000000000000000000000000000000beef830100ff")
-	if !bytes.Equal(have, legacyWant) {
-		t.Errorf("encoded RLP mismatch, got %x want %x", have, legacyWant)
-	}
-
-	// 2930 Receipt
-	buf.Reset()
-	accessListReceipt.Bloom = CreateBloom(Receipts{accessListReceipt})
-	have, err = accessListReceipt.MarshalBinary()
-	if err != nil {
-		t.Fatalf("marshal binary error: %v", err)
-	}
-	accessListReceipts := Receipts{accessListReceipt}
-	accessListReceipts.EncodeIndex(0, buf)
-	haveEncodeIndex = buf.Bytes()
-	if !bytes.Equal(have, haveEncodeIndex) {
-		t.Errorf("BinaryMarshal and EncodeIndex mismatch, got %x want %x", have, haveEncodeIndex)
-	}
-	accessListWant := common.FromHex("01f901c58001b9010000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000000000000000010000080000000000000000000004000000000000000000000000000040000000000000000000000000000800000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f8bef85d940000000000000000000000000000000000000011f842a0000000000000000000000000000000000000000000000000000000000000deada0000000000000000000000000000000000000000000000000000000000000beef830100fff85d940000000000000000000000000000000000000111f842a0000000000000000000000000000000000000000000000000000000000000deada0000000000000000000000000000000000000000000000000000000000000beef830100ff")
-	if !bytes.Equal(have, accessListWant) {
-		t.Errorf("encoded RLP mismatch, got %x want %x", have, accessListWant)
-	}
-
-	// 1559 Receipt
-	buf.Reset()
-	eip1559Receipt.Bloom = CreateBloom(Receipts{eip1559Receipt})
-	have, err = eip1559Receipt.MarshalBinary()
-	if err != nil {
-		t.Fatalf("marshal binary error: %v", err)
-	}
-	eip1559Receipts := Receipts{eip1559Receipt}
-	eip1559Receipts.EncodeIndex(0, buf)
-	haveEncodeIndex = buf.Bytes()
-	if !bytes.Equal(have, haveEncodeIndex) {
-		t.Errorf("BinaryMarshal and EncodeIndex mismatch, got %x want %x", have, haveEncodeIndex)
-	}
-	eip1559Want := common.FromHex("02f901c58001b9010000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000000000000000010000080000000000000000000004000000000000000000000000000040000000000000000000000000000800000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f8bef85d940000000000000000000000000000000000000011f842a0000000000000000000000000000000000000000000000000000000000000deada0000000000000000000000000000000000000000000000000000000000000beef830100fff85d940000000000000000000000000000000000000111f842a0000000000000000000000000000000000000000000000000000000000000deada0000000000000000000000000000000000000000000000000000000000000beef830100ff")
-	if !bytes.Equal(have, eip1559Want) {
-		t.Errorf("encoded RLP mismatch, got %x want %x", have, eip1559Want)
-	}
-}
-
-func TestReceiptUnmarshalBinary(t *testing.T) {
-	// Legacy Receipt
-	legacyBinary := common.FromHex("f901c58001b9010000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000000000000000010000080000000000000000000004000000000000000000000000000040000000000000000000000000000800000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f8bef85d940000000000000000000000000000000000000011f842a0000000000000000000000000000000000000000000000000000000000000deada0000000000000000000000000000000000000000000000000000000000000beef830100fff85d940000000000000000000000000000000000000111f842a0000000000000000000000000000000000000000000000000000000000000deada0000000000000000000000000000000000000000000000000000000000000beef830100ff")
-	gotLegacyReceipt := new(Receipt)
-	if err := gotLegacyReceipt.UnmarshalBinary(legacyBinary); err != nil {
-		t.Fatalf("unmarshal binary error: %v", err)
-	}
-	legacyReceipt.Bloom = CreateBloom(Receipts{legacyReceipt})
-	if !reflect.DeepEqual(gotLegacyReceipt, legacyReceipt) {
-		t.Errorf("receipt unmarshalled from binary mismatch, got %v want %v", gotLegacyReceipt, legacyReceipt)
-	}
-
-	// 2930 Receipt
-	accessListBinary := common.FromHex("01f901c58001b9010000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000000000000000010000080000000000000000000004000000000000000000000000000040000000000000000000000000000800000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f8bef85d940000000000000000000000000000000000000011f842a0000000000000000000000000000000000000000000000000000000000000deada0000000000000000000000000000000000000000000000000000000000000beef830100fff85d940000000000000000000000000000000000000111f842a0000000000000000000000000000000000000000000000000000000000000deada0000000000000000000000000000000000000000000000000000000000000beef830100ff")
-	gotAccessListReceipt := new(Receipt)
-	if err := gotAccessListReceipt.UnmarshalBinary(accessListBinary); err != nil {
-		t.Fatalf("unmarshal binary error: %v", err)
-	}
-	accessListReceipt.Bloom = CreateBloom(Receipts{accessListReceipt})
-	if !reflect.DeepEqual(gotAccessListReceipt, accessListReceipt) {
-		t.Errorf("receipt unmarshalled from binary mismatch, got %v want %v", gotAccessListReceipt, accessListReceipt)
-	}
-
-	// 1559 Receipt
-	eip1559RctBinary := common.FromHex("02f901c58001b9010000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000000000000000010000080000000000000000000004000000000000000000000000000040000000000000000000000000000800000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f8bef85d940000000000000000000000000000000000000011f842a0000000000000000000000000000000000000000000000000000000000000deada0000000000000000000000000000000000000000000000000000000000000beef830100fff85d940000000000000000000000000000000000000111f842a0000000000000000000000000000000000000000000000000000000000000deada0000000000000000000000000000000000000000000000000000000000000beef830100ff")
-	got1559Receipt := new(Receipt)
-	if err := got1559Receipt.UnmarshalBinary(eip1559RctBinary); err != nil {
-		t.Fatalf("unmarshal binary error: %v", err)
-	}
-	eip1559Receipt.Bloom = CreateBloom(Receipts{eip1559Receipt})
-	if !reflect.DeepEqual(got1559Receipt, eip1559Receipt) {
-		t.Errorf("receipt unmarshalled from binary mismatch, got %v want %v", got1559Receipt, eip1559Receipt)
-	}
-}
-
 func clearComputedFieldsOnReceipts(receipts []*Receipt) []*Receipt {
 	r := make([]*Receipt, len(receipts))
 	for i, receipt := range receipts {

diff --git a/graphql/graphql.go b/graphql/graphql.go
@@ -638,7 +638,7 @@ func (t *Transaction) RawReceipt(ctx context.Context) (hexutil.Bytes, error) {
 	if err != nil || receipt == nil {
 		return hexutil.Bytes{}, err
 	}
-	return receipt.MarshalBinary()
+	return rlp.EncodeToBytes(receipt)
 }
 
 type BlockType int

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -2046,7 +2046,7 @@ func (api *DebugAPI) GetRawReceipts(ctx context.Context, blockNrOrHash rpc.Block
 	}
 	result := make([]hexutil.Bytes, len(receipts))
 	for i, receipt := range receipts {
-		b, err := receipt.MarshalBinary()
+		b, err := rlp.EncodeToBytes(receipt)
 		if err != nil {
 			return nil, err
 		}