eth/catalyst: add newPayloadV5 methods

Author: MariusVanDerWijden

consensus/beacon/consensus.go

@@ -373,6 +373,14 @@ func (beacon *Beacon) FinalizeAndAssemble(chain consensus.ChainHeaderReader, hea
 			return nil, errors.New("withdrawals set before Shanghai activation")
 		}
 	}
+	if chain.Config().IsCancun(header.Number, header.Time) {
+		var blobs int
+		for _, tx := range txs {
+			blobs += len(tx.BlobHashes())
+		}
+		blobGasUsed := uint64(blobs * params.BlobTxBlobGasPerBlob)
+		header.BlobGasUsed = &blobGasUsed
+	}
 	// Finalize and assemble the block.
 	beacon.Finalize(chain, header, state, txs, uncles, withdrawals)
 

consensus/misc/eip4844/eip4844_test.go

@@ -45,8 +45,8 @@ func TestCalcExcessBlobGas(t *testing.T) {
 		// The excess data gas should decrease by however much the target was
 		// under-shot, capped at zero.
 		{params.BlobTxTargetBlobGasPerBlock, params.BlobTxTargetBlobGasPerBlock / params.BlobTxBlobGasPerBlob, params.BlobTxTargetBlobGasPerBlock},
-		{params.BlobTxTargetBlobGasPerBlock, (params.BlobTxTargetBlobGasPerBlock / params.BlobTxBlobGasPerBlob) - 1, params.BlobTxBlobGasPerBlob},
-		{params.BlobTxTargetBlobGasPerBlock, (params.BlobTxTargetBlobGasPerBlock / params.BlobTxBlobGasPerBlob) - 2, 0},
+		{params.BlobTxTargetBlobGasPerBlock, (params.BlobTxTargetBlobGasPerBlock / params.BlobTxBlobGasPerBlob) - 1, 2 * params.BlobTxBlobGasPerBlob},
+		{params.BlobTxTargetBlobGasPerBlock, (params.BlobTxTargetBlobGasPerBlock / params.BlobTxBlobGasPerBlob) - 2, params.BlobTxBlobGasPerBlob},
 		{params.BlobTxBlobGasPerBlob - 1, (params.BlobTxTargetBlobGasPerBlock / params.BlobTxBlobGasPerBlob) - 1, 0},
 	}
 	for _, tt := range tests {
@@ -64,8 +64,9 @@ func TestCalcBlobFee(t *testing.T) {
 	}{
 		{0, 1},
 		{1542706, 1},
-		{1542707, 2},
-		{10 * 1024 * 1024, 111},
+		{1542707, 1},
+		{3085414, 2},
+		{10 * 1024 * 1024, 23},
 	}
 	for i, tt := range tests {
 		have := CalcBlobFee(tt.excessBlobGas)

core/genesis.go

@@ -487,6 +487,14 @@ func (g *Genesis) ToBlock() *types.Block {
 			}
 		}
 	}
+	if g.Config != nil && g.Config.IsCancun(big.NewInt(int64(g.Number)), g.Timestamp) {
+		if g.ExcessBlobGas == nil {
+			var excessBlobGas uint64
+			head.ExcessBlobGas = &excessBlobGas
+		} else {
+			head.ExcessBlobGas = g.ExcessBlobGas
+		}
+	}
 	return types.NewBlock(head, nil, nil, nil, trie.NewStackTrie(nil)).WithWithdrawals(withdrawals)
 }
 

core/state_transition.go

@@ -339,7 +339,6 @@ func (st *StateTransition) preCheck() error {
 			}
 		}
 	}
-
 	return st.buyGas()
 }
 

core/txpool/blobpool/blobpool.go

@@ -955,6 +955,8 @@ func (p *BlobPool) reinject(addr common.Address, tx *types.Transaction) {
 	}
 	p.lookup[meta.hash] = meta.id
 	p.stored += uint64(meta.size)
+
+	p.eventFeed.Send(core.NewTxsEvent{Txs: types.Transactions{tx}})
 }
 
 // SetGasTip implements txpool.SubPool, allowing the blob pool's gas requirements
@@ -1037,7 +1039,6 @@ func (p *BlobPool) validateTx(tx *types.Transaction, blobs []kzg4844.Blob, commi
 	// Ensure the transaction adheres to the stateful pool filters (nonce, balance)
 	stateOpts := &txpool.ValidationOptionsWithState{
 		State: p.state,
-
 		FirstNonceGap: func(addr common.Address) uint64 {
 			// Nonce gaps are not permitted in the blob pool, the first gap will
 			// be the next nonce shifted by however many transactions we already
@@ -1303,6 +1304,7 @@ func (p *BlobPool) add(tx *types.Transaction, blobs []kzg4844.Blob, commits []kz
 	}
 	p.updateStorageMetrics()
 
+	p.eventFeed.Send(core.NewTxsEvent{Txs: types.Transactions{tx}})
 	return nil
 }
 

core/txpool/subpool.go

@@ -37,6 +37,16 @@ type Transaction struct {
 	BlobTxProofs  []kzg4844.Proof      // Proofs needed by the blob pool
 }
 
+func (t *Transaction) Size() uint64 {
+	size := t.Tx.Size()
+	if len(t.BlobTxBlobs) > 0 {
+		size += uint64(len(t.BlobTxBlobs) * len(t.BlobTxBlobs[0]))
+		size += uint64(len(t.BlobTxCommits) * len(t.BlobTxCommits[0]))
+		size += uint64(len(t.BlobTxProofs) * len(t.BlobTxProofs[0]))
+	}
+	return size
+}
+
 // LazyTransaction contains a small subset of the transaction properties that is
 // enough for the miner and other APIs to handle large batches of transactions;
 // and supports pulling up the entire transaction when really needed.

core/types/receipt.go

@@ -355,6 +355,11 @@ func (rs Receipts) DeriveFields(config *params.ChainConfig, hash common.Hash, nu
 			rs[i].GasUsed = rs[i].CumulativeGasUsed - rs[i-1].CumulativeGasUsed
 		}
 
+		if len(txs[i].BlobHashes()) != 0 {
+			rs[i].BlobGasUsed = uint64(len(txs[i].BlobHashes()) * params.BlobTxBlobGasPerBlob)
+			rs[i].BlobGasPrice = blobGasPrice
+		}
+
 		// The derived log fields can simply be set from the block and transaction
 		for j := 0; j < len(rs[i].Logs); j++ {
 			rs[i].Logs[j].BlockNumber = number

core/types/transaction.go

@@ -294,7 +294,7 @@ func (tx *Transaction) BlobGas() uint64 { return tx.inner.blobGas() }
 // BlobGasFeeCap returns the data gas fee cap per data gas of the transaction for blob transactions, nil otherwise.
 func (tx *Transaction) BlobGasFeeCap() *big.Int { return tx.inner.blobGasFeeCap() }
 
-// BlobHashes returns the hases of the blob commitments for blob transactions, nil otherwise.
+// BlobHashes returns the hashes of the blob commitments for blob transactions, nil otherwise.
 func (tx *Transaction) BlobHashes() []common.Hash { return tx.inner.blobHashes() }
 
 // Value returns the ether amount of the transaction.

core/types/tx_blob_with_blob.go

@@ -0,0 +1,116 @@
+package types
+
+import (
+	"bytes"
+	"io"
+
+	"github.com/ethereum/go-ethereum/crypto/kzg4844"
+	"github.com/ethereum/go-ethereum/rlp"
+)
+
+type BlobTxWithBlobs struct {
+	*Transaction
+	Blobs       []kzg4844.Blob
+	Commitments []kzg4844.Commitment
+	Proofs      []kzg4844.Proof
+}
+
+func NewBlobTxWithBlobs(tx *Transaction, blobs []kzg4844.Blob, commitments []kzg4844.Commitment, proofs []kzg4844.Proof) *BlobTxWithBlobs {
+	if tx == nil {
+		return nil
+	}
+	return &BlobTxWithBlobs{
+		Transaction: tx,
+		Blobs:       blobs,
+		Commitments: commitments,
+		Proofs:      proofs,
+	}
+}
+
+type innerType struct {
+	BlobTx      *BlobTx
+	Blobs       []kzg4844.Blob
+	Commitments []kzg4844.Commitment
+	Proofs      []kzg4844.Proof
+}
+
+func (tx *BlobTxWithBlobs) DecodeRLP(s *rlp.Stream) error {
+	tx.Transaction = new(Transaction)
+	kind, _, err := s.Kind()
+	switch {
+	case err != nil:
+		return err
+	case kind == rlp.List:
+		return tx.Transaction.DecodeRLP(s)
+	default:
+		b, err := s.Bytes()
+		if err != nil {
+			return err
+		}
+		return tx.UnmarshalBinary(b)
+	}
+}
+
+func (tx *BlobTxWithBlobs) EncodeRLP(w io.Writer) error {
+	blobTx, ok := tx.Transaction.inner.(*BlobTx)
+	if !ok {
+		// For non-blob transactions, the encoding is just the transaction.
+		return tx.Transaction.EncodeRLP(w)
+	}
+
+	// For blob transactions, the encoding is the transaction together with the blobs.
+	// Use temporary buffer from pool.
+	buf := encodeBufferPool.Get().(*bytes.Buffer)
+	defer encodeBufferPool.Put(buf)
+	buf.Reset()
+
+	buf.WriteByte(BlobTxType)
+	innerValue := &innerType{
+		BlobTx:      blobTx,
+		Blobs:       tx.Blobs,
+		Commitments: tx.Commitments,
+		Proofs:      tx.Proofs,
+	}
+	err := rlp.Encode(buf, innerValue)
+	if err != nil {
+		return err
+	}
+	return rlp.Encode(w, buf.Bytes())
+}
+
+func (tx *BlobTxWithBlobs) UnmarshalBinary(b []byte) error {
+	tx.Transaction = new(Transaction)
+	if len(b) < 1 {
+		return errShortTypedTx
+	}
+	if b[0] == BlobTxType {
+		var blobTypedTx innerType
+		if err := rlp.DecodeBytes(b[1:], &blobTypedTx); err != nil {
+			return err
+		}
+		tx.Transaction = NewTx(blobTypedTx.BlobTx)
+		tx.Blobs = blobTypedTx.Blobs
+		tx.Commitments = blobTypedTx.Commitments
+		tx.Proofs = blobTypedTx.Proofs
+		return nil
+	}
+	return tx.Transaction.UnmarshalBinary(b)
+}
+
+func (tx *BlobTxWithBlobs) MarshalBinary() ([]byte, error) {
+	blobTx, ok := tx.Transaction.inner.(*BlobTx)
+	if !ok {
+		// For non-blob transactions, the encoding is just the transaction.
+		return tx.Transaction.MarshalBinary()
+	}
+	var buf bytes.Buffer
+	buf.WriteByte(BlobTxType)
+	innerValue := &innerType{
+		BlobTx:      blobTx,
+		Blobs:       tx.Blobs,
+		Commitments: tx.Commitments,
+		Proofs:      tx.Proofs,
+	}
+	err := rlp.Encode(&buf, innerValue)
+	return buf.Bytes(), err
+}

core/types/types_test.go

@@ -33,6 +33,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/txpool"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/ethereum/go-ethereum/crypto/kzg4844"
 	"github.com/ethereum/go-ethereum/eth/gasprice"
 	"github.com/ethereum/go-ethereum/eth/tracers"
 	"github.com/ethereum/go-ethereum/ethdb"
@@ -297,6 +298,10 @@ func (b *EthAPIBackend) SendTx(ctx context.Context, signedTx *types.Transaction)
 	return b.eth.txPool.Add([]*txpool.Transaction{{Tx: signedTx}}, true, false)[0]
 }
 
+func (b *EthAPIBackend) SendBlobTx(ctx context.Context, signedTx *types.Transaction, blobTxBlobs []kzg4844.Blob, blobTxCommits []kzg4844.Commitment, blobTxProofs []kzg4844.Proof) error {
+	return b.eth.txPool.Add([]*txpool.Transaction{&txpool.Transaction{Tx: signedTx, BlobTxBlobs: blobTxBlobs, BlobTxCommits: blobTxCommits, BlobTxProofs: blobTxProofs}}, true, false)[0]
+}
+
 func (b *EthAPIBackend) GetPoolTransactions() (types.Transactions, error) {
 	pending := b.eth.txPool.Pending(false)
 	var txs types.Transactions

eth/api_backend.go

@@ -261,7 +261,7 @@ func (f *TxFetcher) Notify(peer string, hashes []common.Hash) error {
 // and the fetcher. This method may be called by both transaction broadcasts and
 // direct request replies. The differentiation is important so the fetcher can
 // re-schedule missing transactions as soon as possible.
-func (f *TxFetcher) Enqueue(peer string, txs []*types.Transaction, direct bool) error {
+func (f *TxFetcher) Enqueue(peer string, txs []*types.BlobTxWithBlobs, direct bool) error {
 	var (
 		inMeter          = txReplyInMeter
 		knownMeter       = txReplyKnownMeter
@@ -297,7 +297,7 @@ func (f *TxFetcher) Enqueue(peer string, txs []*types.Transaction, direct bool)
 
 		wrapped := make([]*txpool.Transaction, len(batch))
 		for j, tx := range batch {
-			wrapped[j] = &txpool.Transaction{Tx: tx}
+			wrapped[j] = &txpool.Transaction{Tx: tx.Transaction, BlobTxBlobs: tx.Blobs, BlobTxCommits: tx.Commitments, BlobTxProofs: tx.Proofs}
 		}
 		for j, err := range f.addTxs(wrapped) {
 			// Track the transaction hash if the price is too low for us.

eth/fetcher/tx_fetcher.go

@@ -1287,7 +1287,11 @@ func testTransactionFetcher(t *testing.T, tt txFetcherTest) {
 			}
 
 		case doTxEnqueue:
-			if err := fetcher.Enqueue(step.peer, step.txs, step.direct); err != nil {
+			var txs []*types.BlobTxWithBlobs
+			for _, tx := range step.txs {
+				txs = append(txs, types.NewBlobTxWithBlobs(tx, nil, nil, nil))
+			}
+			if err := fetcher.Enqueue(step.peer, txs, step.direct); err != nil {
 				t.Errorf("step %d: %v", i, err)
 			}
 			<-wait // Fetcher needs to process this, wait until it's done

eth/fetcher/tx_fetcher_test.go

@@ -623,7 +623,7 @@ func (h *handler) BroadcastTransactions(txs types.Transactions) {
 		peers := h.peers.peersWithoutTransaction(tx.Hash())
 
 		var numDirect int
-		if tx.Size() <= txMaxBroadcastSize {
+		if tx.Size() <= txMaxBroadcastSize && tx.Type() != types.BlobTxType {
 			numDirect = int(math.Sqrt(float64(len(peers))))
 		}
 		// Send the tx unconditionally to a subset of our peers

eth/handler.go

@@ -73,7 +73,11 @@ func (h *ethHandler) Handle(peer *eth.Peer, packet eth.Packet) error {
 		return h.txFetcher.Notify(peer.ID(), packet.Hashes)
 
 	case *eth.TransactionsPacket:
-		return h.txFetcher.Enqueue(peer.ID(), *packet, false)
+		var txs []*types.BlobTxWithBlobs
+		for _, tx := range *packet {
+			txs = append(txs, types.NewBlobTxWithBlobs(tx, nil, nil, nil))
+		}
+		return h.txFetcher.Enqueue(peer.ID(), txs, false)
 
 	case *eth.PooledTransactionsPacket:
 		return h.txFetcher.Enqueue(peer.ID(), *packet, true)