forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-04-15 22:28:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add comments

Browse source
This commit is contained in:
maskpp 2025-08-10 20:28:39 +08:00
parent d959ad18bc
commit 9fac6aebbf
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/txpool/blobpool/blobpool.go
View file

@ -133,7 +133,7 @@ type blobTxMetaMarshal struct {
// EncodeRLP encodes the blobTxMeta into the given writer. // EncodeRLP encodes the blobTxMeta into the given writer.
func (b *blobTxMeta) EncodeRLP(w io.Writer) error { func (b *blobTxMeta) EncodeRLP(w io.Writer) error {
return rlp.Encode(w, blobTxMetaMarshal{ return rlp.Encode(w, &blobTxMetaMarshal{
Hash: b.hash, Hash: b.hash,
Vhashes: b.vhashes, Vhashes: b.vhashes,
ID: b.id, ID: b.id,
@ -468,8 +468,8 @@ func (p *BlobPool) Init(gasTip uint64, head *types.Header, reserver txpool.Reser
} }
p.store = store p.store = store
// If still exit blob txs in limbo, try to repair them. This is needed. // If still exit blob txs in limbo, delete the old reset a new one without tx content.
if err = p.limbo.tryRepair(p.store); err != nil { if err = p.limbo.setTxMeta(p.store); err != nil {
return err return err
} }
@ -552,6 +552,8 @@ func (p *BlobPool) parseTransaction(id uint64, size uint32, blob []byte) error {
} }
meta := newBlobTxMeta(id, tx.Size(), size, tx) meta := newBlobTxMeta(id, tx.Size(), size, tx)
// If the tx metadata is already in limbo, we don't need to add it to the pool.
if p.limbo.existsAndSet(meta) { if p.limbo.existsAndSet(meta) {
return nil return nil
} }

22
core/txpool/blobpool/limbo.go
View file

@ -32,10 +32,9 @@ import (
type limboBlob struct { type limboBlob struct {
TxHash common.Hash // Owner transaction's hash to support resurrecting reorged txs TxHash common.Hash // Owner transaction's hash to support resurrecting reorged txs
Block uint64 // Block in which the blob transaction was included Block uint64 // Block in which the blob transaction was included
Tx *types.Transaction `rlp:"omitempty"` Tx *types.Transaction `rlp:"omitempty"` // After this commitment the Tx field is optional, as the TxMeta contains the tx metadata.
// Optional blob transaction metadata. TxMeta *blobTxMeta `rlp:"omitempty"` // Optional blob transaction metadata.
TxMeta *blobTxMeta `rlp:"omitempty"` id uint64 // the billy id of limboBlob
id uint64 // the billy id of limboBlob
} }
// limbo is a light, indexed database to temporarily store recently included // limbo is a light, indexed database to temporarily store recently included
@ -115,7 +114,7 @@ func (l *limbo) parseBlob(id uint64, data []byte) error {
// existsAndSet checks whether a blob transaction is already tracked by the limbo. // existsAndSet checks whether a blob transaction is already tracked by the limbo.
func (l *limbo) existsAndSet(meta *blobTxMeta) bool { func (l *limbo) existsAndSet(meta *blobTxMeta) bool {
if item := l.index[meta.hash]; item != nil { if item := l.index[meta.hash]; item != nil {
if item.Tx != nil { if item.TxMeta == nil {
item.TxMeta, item.Tx = meta, nil item.TxMeta, item.Tx = meta, nil
} }
return true return true
@ -123,12 +122,12 @@ func (l *limbo) existsAndSet(meta *blobTxMeta) bool {
return false return false
} }
// tryRepair attempts to repair the limbo by re-encoding all transactions that are // setTxMeta attempts to repair the limbo by re-encoding all transactions that are
// currently in the limbo, but not yet stored in the database. This is useful // currently in the limbo, but not yet stored in the database. This is useful
// when the limbo is created from a previous state, and the transactions are not // when the limbo is created from a previous state, and the transactions are not
// yet stored in the database. The method will re-encode all transactions and // yet stored in the database. The method will re-encode all transactions and
// store them in the database, updating the in-memory indices at the same time. // store them in the database, updating the in-memory indices at the same time.
func (l *limbo) tryRepair(store billy.Database) error { func (l *limbo) setTxMeta(store billy.Database) error {
for _, item := range l.index { for _, item := range l.index {
if item.Tx == nil { if item.Tx == nil {
continue continue
@ -146,7 +145,12 @@ func (l *limbo) tryRepair(store billy.Database) error {
return err return err
} }
meta := newBlobTxMeta(id, tx.Size(), store.Size(id), tx) meta := newBlobTxMeta(id, tx.Size(), store.Size(id), tx)
l.existsAndSet(meta) if _, err := l.pull(meta.hash); err != nil {
return err
}
if err := l.push(meta, item.Block); err != nil {
return err
}
} }
return nil return nil
} }
@ -251,7 +255,7 @@ func (l *limbo) setAndIndex(meta *blobTxMeta, block uint64) error {
TxHash: txhash, TxHash: txhash,
Block: block, Block: block,
TxMeta: meta, TxMeta: meta,
Tx: nil, // The tx is stored in the blob database, not here. Tx: nil, // The tx already stored in the blob database, not here.
} }
data, err := rlp.EncodeToBytes(item) data, err := rlp.EncodeToBytes(item)
if err != nil { if err != nil {