mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-23 05:06:43 +00:00
core/txpool/blobpool: update messages
This commit is contained in:
parent
71759beb4d
commit
10d737b304
1 changed files with 5 additions and 7 deletions
|
|
@ -970,9 +970,7 @@ func (p *BlobPool) convertLegacySidecar(sender common.Address, hash common.Hash,
|
||||||
data, err := p.store.Get(id)
|
data, err := p.store.Get(id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
p.lock.RUnlock()
|
p.lock.RUnlock()
|
||||||
|
// The transaction may have been evicted simultaneously, safe to skip conversion.
|
||||||
// The transaction may have been evicted simultaneously,
|
|
||||||
// safe to skip conversion.
|
|
||||||
log.Debug("Blob transaction is missing", "hash", hash, "id", id, "err", err)
|
log.Debug("Blob transaction is missing", "hash", hash, "id", id, "err", err)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
@ -980,8 +978,8 @@ func (p *BlobPool) convertLegacySidecar(sender common.Address, hash common.Hash,
|
||||||
p.lock.RUnlock()
|
p.lock.RUnlock()
|
||||||
|
|
||||||
// Decode the transaction, the failure is not expected and report the error
|
// Decode the transaction, the failure is not expected and report the error
|
||||||
// loudly if possible. If The blob transaction in this slot is corrupted.
|
// loudly if possible. If the blob transaction in this slot is corrupted,
|
||||||
// Leave it in the store, it will be dropped during the next pool
|
// leave it in the store, it will be dropped during the next pool
|
||||||
// initialization.
|
// initialization.
|
||||||
var tx types.Transaction
|
var tx types.Transaction
|
||||||
if err = rlp.DecodeBytes(data, &tx); err != nil {
|
if err = rlp.DecodeBytes(data, &tx); err != nil {
|
||||||
|
|
@ -1016,7 +1014,7 @@ func (p *BlobPool) convertLegacySidecar(sender common.Address, hash common.Hash,
|
||||||
log.Error("Failed to replace the legacy transaction", "hash", hash)
|
log.Error("Failed to replace the legacy transaction", "hash", hash)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
log.Debug("Converted the legacy transaction", "hash", hash, "elapsed", common.PrettyDuration(time.Since(start)))
|
log.Debug("Converted legacy blob transaction", "hash", hash, "elapsed", common.PrettyDuration(time.Since(start)))
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1049,7 +1047,7 @@ func (p *BlobPool) convertLegacySidecars(ids map[common.Address]map[uint64]uint6
|
||||||
if p.sidecarMigrationDoneCh != nil {
|
if p.sidecarMigrationDoneCh != nil {
|
||||||
close(p.sidecarMigrationDoneCh)
|
close(p.sidecarMigrationDoneCh)
|
||||||
}
|
}
|
||||||
log.Info("Completed the blob transaction conversion", "discarded", failure, "injected", success, "elapsed", common.PrettyDuration(time.Since(start)))
|
log.Info("Completed blob transaction conversion", "discarded", failure, "injected", success, "elapsed", common.PrettyDuration(time.Since(start)))
|
||||||
}
|
}
|
||||||
|
|
||||||
// reorg assembles all the transactors and missing transactions between an old
|
// reorg assembles all the transactors and missing transactions between an old
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue