forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-13 19:46:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add drop method

Browse source
This commit is contained in:
maskpp 2025-08-10 21:11:38 +08:00
parent 9fac6aebbf
commit 666bff4d01
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -145,9 +145,11 @@ func (l *limbo) setTxMeta(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)
if _, err := l.pull(meta.hash); err != nil { // Delete the old item which hash blob tx content.
if err := l.drop(meta.hash); err != nil {
return err return err
} }
// Set the new one which has blob tx metadata.
if err := l.push(meta, item.Block); err != nil { if err := l.push(meta, item.Block); err != nil {
return err return err
} }
@ -167,10 +169,9 @@ func (l *limbo) finalize(final *types.Header, fn func(id uint64, txHash common.H
if item.Block > final.Number.Uint64() { if item.Block > final.Number.Uint64() {
continue continue
} }
if err := l.store.Delete(item.id); err != nil { if err := l.drop(item.TxHash); err != nil {
log.Error("Failed to drop finalized blob", "block", item.Block, "id", item.id, "err", err) log.Error("Failed to drop finalized blob", "block", item.Block, "id", item.id, "err", err)
} }
delete(l.index, item.TxHash)
if fn != nil { if fn != nil {
meta := item.TxMeta meta := item.TxMeta
fn(meta.id, meta.hash) fn(meta.id, meta.hash)
@ -206,7 +207,7 @@ func (l *limbo) pull(txhash common.Hash) (*blobTxMeta, error) {
log.Trace("Limbo cannot pull non-tracked blobs", "tx", txhash) log.Trace("Limbo cannot pull non-tracked blobs", "tx", txhash)
return nil, errors.New("unseen blob transaction") return nil, errors.New("unseen blob transaction")
} }
if err := l.store.Delete(item.id); err != nil { if err := l.drop(item.TxHash); err != nil {
return nil, err return nil, err
} }
return item.TxMeta, nil return item.TxMeta, nil
@ -234,10 +235,8 @@ func (l *limbo) update(txhash common.Hash, block uint64) {
log.Trace("Blob transaction unchanged in limbo", "tx", txhash, "block", block) log.Trace("Blob transaction unchanged in limbo", "tx", txhash, "block", block)
return return
} }
// Retrieve the old blobs from the data store and write them back with a new if err := l.drop(txhash); err != nil {
// block number. IF anything fails, there's not much to do, go on. log.Error("Failed to drop old limboed metadata", "tx", txhash, "err", err)
if err := l.store.Delete(item.id); err != nil {
log.Error("Failed to drop old limboed blobs", "tx", txhash, "err", err)
return return
} }
if err := l.setAndIndex(item.TxMeta, block); err != nil { if err := l.setAndIndex(item.TxMeta, block); err != nil {
@ -247,6 +246,20 @@ func (l *limbo) update(txhash common.Hash, block uint64) {
log.Trace("Blob transaction updated in limbo", "tx", txhash, "old-block", item.Block, "new-block", block) log.Trace("Blob transaction updated in limbo", "tx", txhash, "old-block", item.Block, "new-block", block)
} }
// drop removes the blob metadata from the limbo.
func (l *limbo) drop(txhash common.Hash) error {
if item, ok := l.index[txhash]; ok {
// Retrieve the old blobs from the data store and write them back with a new
// block number. IF anything fails, there's not much to do, go on.
if err := l.store.Delete(item.id); err != nil {
log.Error("Failed to drop old limboed blobs", "tx", txhash, "err", err)
return err
}
delete(l.index, txhash)
}
return nil
}
// setAndIndex assembles a limbo blob database entry and stores it, also updating // setAndIndex assembles a limbo blob database entry and stores it, also updating
// the in-memory indices. // the in-memory indices.
func (l *limbo) setAndIndex(meta *blobTxMeta, block uint64) error { func (l *limbo) setAndIndex(meta *blobTxMeta, block uint64) error {