forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-23 05:06:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core/txpool/blobpool: migrate blobpool

Browse source
This commit is contained in:
MariusVanDerWijden 2025-07-07 18:59:01 +02:00 committed by lightclient
parent ea153654ce
commit 71c1d7c84e
No known key found for this signature in database
GPG key ID: 657913021EF45A6A
1 changed files with 3 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -358,35 +358,6 @@ func (p *BlobPool) Filter(tx *types.Transaction) bool {
return tx.Type() == types.BlobTxType return tx.Type() == types.BlobTxType
} }
// migrateBilly migrates the blob data from one billy instance to another one
// with a different slotter.
func migrateBilly(path string, maxBlobs int) error {
oldSlotter := newSlotter(maxBlobs)
newSlotter := newSlotterEIP7594(maxBlobs)
// Open the new billy instance
newStore, err := billy.Open(billy.Options{Path: path, Repair: true}, newSlotter, nil)
if err != nil {
return err
}
// Iterate over the old billy instance and copy the data to the new instance
var indexingErr error
index := func(key uint64, size uint32, data []byte) {
_, indexingErr = newStore.Put(data)
}
oldStore, err := billy.Open(billy.Options{Path: path, Repair: true}, oldSlotter, index)
if err != nil {
return err
}
if indexingErr != nil {
return indexingErr
}
// TODO (MariusVanDerWijden)
// remove the old shelves here
oldStore.Close()
newStore.Close()
return nil
}
// Init sets the gas price needed to keep a transaction in the pool and the chain // Init sets the gas price needed to keep a transaction in the pool and the chain
// head to allow balance / nonce checks. The transaction journal will be loaded // head to allow balance / nonce checks. The transaction journal will be loaded
// from disk and filtered based on the provided starting settings. // from disk and filtered based on the provided starting settings.
@ -425,9 +396,11 @@ func (p *BlobPool) Init(gasTip uint64, head *types.Header, reserver txpool.Reser
// Check if we need to migrate our blob db to the new slotter // Check if we need to migrate our blob db to the new slotter
oldSlotSize := 135168 oldSlotSize := 135168
if os.Stat(filepath.Join(queuedir, fmt.Sprintf("bkt_%08d.bag", oldSlotSize))); err == nil { if os.Stat(filepath.Join(queuedir, fmt.Sprintf("bkt_%08d.bag", oldSlotSize))); err == nil {
if err := migrateBilly(queuedir, eip4844.LatestMaxBlobsPerBlock(p.chain.Config())); err != nil { newSlotter := newSlotterEIP7594(eip4844.LatestMaxBlobsPerBlock(p.chain.Config()))
if err := billy.Migrate(billy.Options{Path: queuedir, Repair: true}, slotter, newSlotter); err != nil {
return err return err
} }
} }
slotter = newSlotterEIP7594(eip4844.LatestMaxBlobsPerBlock(p.chain.Config())) slotter = newSlotterEIP7594(eip4844.LatestMaxBlobsPerBlock(p.chain.Config()))
} }