forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-02 04:58:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core/txpool/blobpool: change parseTransaction to return errLegacyTx

Browse source
This commit is contained in:
healthykim 2026-05-12 12:39:23 +02:00
parent f814ec33a3
commit 11531f7bd9
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -116,6 +116,8 @@ const (
announceThreshold = -1 announceThreshold = -1
) )
var errLegacyTx = errors.New("legacy transaction format")
// blobTxMeta is the minimal subset of types.BlobTx necessary to validate and // blobTxMeta is the minimal subset of types.BlobTx necessary to validate and
// schedule the blob transactions into the following blocks. Only ever add the // schedule the blob transactions into the following blocks. Only ever add the
// bare minimum needed fields to keep the size down (and thus number of entries // bare minimum needed fields to keep the size down (and thus number of entries
@ -574,11 +576,11 @@ func (p *BlobPool) Init(gasTip uint64, head *types.Header, reserver txpool.Reser
convertTxs []uint64 convertTxs []uint64
) )
index := func(id uint64, size uint32, blob []byte) { index := func(id uint64, size uint32, blob []byte) {
legacy, err := p.parseTransaction(id, size, blob) err := p.parseTransaction(id, size, blob)
if err != nil { if err != nil {
toDelete = append(toDelete, id) toDelete = append(toDelete, id)
} else if legacy { }
toDelete = append(toDelete, id) if errors.Is(err, errLegacyTx) {
convertTxs = append(convertTxs, id) convertTxs = append(convertTxs, id)
} }
} }
@ -716,22 +718,22 @@ func (p *BlobPool) Close() error {
// parseTransaction is a callback method on pool creation that gets called for // parseTransaction is a callback method on pool creation that gets called for
// each transaction on disk to create the in-memory metadata index. // each transaction on disk to create the in-memory metadata index.
// Return value `bool` is set to true when the entry has old Transaction type. // Return value `bool` is set to true when the entry has old Transaction type.
func (p *BlobPool) parseTransaction(id uint64, size uint32, blob []byte) (bool, error) { func (p *BlobPool) parseTransaction(id uint64, size uint32, blob []byte) error {
var ptx blobTxForPool var ptx blobTxForPool
if err := rlp.DecodeBytes(blob, &ptx); err != nil { if err := rlp.DecodeBytes(blob, &ptx); err != nil {
kind, content, _, splitErr := rlp.Split(blob) kind, content, _, splitErr := rlp.Split(blob)
// check whether it is legacy tx type // check whether it is legacy tx type
if splitErr == nil && kind == rlp.String && len(content) > 1 && content[0] == 3 { if splitErr == nil && kind == rlp.String && len(content) > 1 && content[0] == 3 {
return true, nil return errLegacyTx
} }
return false, err return err
} }
meta := newBlobTxMeta(id, ptx.TxSize(), size, &ptx) meta := newBlobTxMeta(id, ptx.TxSize(), size, &ptx)
sender, err := types.Sender(p.signer, ptx.Tx) sender, err := types.Sender(p.signer, ptx.Tx)
if err != nil { if err != nil {
return false, err return err
} }
return false, p.trackTransaction(meta, sender) return p.trackTransaction(meta, sender)
} }
// trackTransaction registers a transaction's metadata in the pool's indices. // trackTransaction registers a transaction's metadata in the pool's indices.