Fix extBlockTx rlp decode

This fixes a bug where transactions in a Block would not get filled in
during rlp decode. The existing `TestBlockEncoding` unit test in
core/types/block_test.go catches this.

Author: Inphi

accounts/abi/bind/bind_test.go

@@ -2098,7 +2098,12 @@ func TestGolangBindings(t *testing.T) {
 		t.Fatalf("failed to convert binding test to modules: %v\n%s", err, out)
 	}
 	pwd, _ := os.Getwd()
-	replacer := exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/ethereum/[email protected]", "-replace", "github.com/ethereum/go-ethereum="+filepath.Join(pwd, "..", "..", "..")) // Repo root
+	//replacer := exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/ethereum/[email protected]", "-replace", "github.com/ethereum/go-ethereum="+filepath.Join(pwd, "..", "..", "..")) // Repo root
+	// TODO(EIP-4844): Replace with above once go-kzg fork is upstreamed
+	replacer := exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/ethereum/[email protected]",
+		"-replace", "github.com/ethereum/go-ethereum="+filepath.Join(pwd, "..", "..", ".."),
+		"-replace", "github.com/protolambda/go-kzg=github.com/inphi/[email protected]",
+		"-replace", "github.com/kilic/bls12-381=github.com/inphi/[email protected]") // Repo root
 	replacer.Dir = pkg
 	if out, err := replacer.CombinedOutput(); err != nil {
 		t.Fatalf("failed to replace binding test dependency to current source tree: %v\n%s", err, out)

core/types/block.go

@@ -232,25 +232,26 @@ func (tx *minimalTx) EncodeRLP(w io.Writer) error {
 // a view over a regular transactions slice, to RLP decode/encode the transactions all the minimal way
 type extBlockTxs []*Transaction
 
-func (txs extBlockTxs) DecodeRLP(s *rlp.Stream) error {
+func (txs *extBlockTxs) DecodeRLP(s *rlp.Stream) error {
 	// we need generics to do this nicely...
 	var out []*minimalTx
-	for i, tx := range txs {
+	for i, tx := range *txs {
 		out[i] = (*minimalTx)(tx)
 	}
 	if err := s.Decode(&out); err != nil {
 		return fmt.Errorf("failed to decode list of minimal txs: %v", err)
 	}
-	txs = make([]*Transaction, len(out))
+	rawtxs := make([]*Transaction, len(out))
 	for i, tx := range out {
-		txs[i] = (*Transaction)(tx)
+		rawtxs[i] = (*Transaction)(tx)
 	}
+	*txs = rawtxs
 	return nil
 }
 
-func (txs extBlockTxs) EncodeRLP(w io.Writer) error {
-	out := make([]*minimalTx, len(txs))
-	for i, tx := range txs {
+func (txs *extBlockTxs) EncodeRLP(w io.Writer) error {
+	out := make([]*minimalTx, len(*txs))
+	for i, tx := range *txs {
 		out[i] = (*minimalTx)(tx)
 	}
 	return rlp.Encode(w, &out)
@@ -259,7 +260,7 @@ func (txs extBlockTxs) EncodeRLP(w io.Writer) error {
 // "external" block encoding. used for eth protocol, etc.
 type extblock struct {
 	Header *Header
-	Txs    extBlockTxs
+	Txs    *extBlockTxs
 	Uncles []*Header
 }
 
@@ -331,17 +332,17 @@ func CopyHeader(h *Header) *Header {
 
 // DecodeRLP decodes the Ethereum
 func (b *Block) DecodeRLP(s *rlp.Stream) error {
-	var eb extblock
+	eb := extblock{Txs: new(extBlockTxs)}
 	_, size, _ := s.Kind()
 	if err := s.Decode(&eb); err != nil {
 		return err
 	}
-	for i, tx := range eb.Txs {
+	for i, tx := range *eb.Txs {
 		if tx.wrapData != nil {
 			return fmt.Errorf("transactions in blocks must not contain wrap-data, tx %d is bad", i)
 		}
 	}
-	b.header, b.uncles, b.transactions = eb.Header, eb.Uncles, []*Transaction(eb.Txs)
+	b.header, b.uncles, b.transactions = eb.Header, eb.Uncles, []*Transaction(*eb.Txs)
 	b.size.Store(common.StorageSize(rlp.ListSize(size)))
 	return nil
 }
@@ -350,7 +351,7 @@ func (b *Block) DecodeRLP(s *rlp.Stream) error {
 func (b *Block) EncodeRLP(w io.Writer) error {
 	return rlp.Encode(w, extblock{
 		Header: b.header,
-		Txs:    (extBlockTxs)(b.transactions),
+		Txs:    (*extBlockTxs)(&b.transactions),
 		Uncles: b.uncles,
 	})
 }

les/catalyst/api_test.go

@@ -135,7 +135,7 @@ func TestExecutePayloadV1(t *testing.T) {
 		Timestamp:     fakeBlock.Time(),
 		ExtraData:     fakeBlock.Extra(),
 		BaseFeePerGas: fakeBlock.BaseFee(),
-		Blobs:         fakeBlock.ExcessBlobs(),
+		ExcessBlobs:   fakeBlock.ExcessBlobs(),
 		BlockHash:     fakeBlock.Hash(),
 		Transactions:  encodeTransactions(fakeBlock.Transactions()),
 	})