mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-06-03 21:48:36 +00:00
core/txpool/blobpool: use var ptx blobTxForPool instead of new()
This commit is contained in:
parent
5905a2baec
commit
c03867d66a
1 changed files with 10 additions and 10 deletions
|
|
@ -706,8 +706,8 @@ func (p *BlobPool) Close() error {
|
||||||
// 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) (bool, error) {
|
||||||
ptx := new(blobTxForPool)
|
var ptx blobTxForPool
|
||||||
if err := rlp.DecodeBytes(blob, ptx); err != nil {
|
if err := rlp.DecodeBytes(blob, &ptx); err != nil {
|
||||||
tx := new(types.Transaction)
|
tx := new(types.Transaction)
|
||||||
if err := rlp.DecodeBytes(blob, tx); err != nil {
|
if err := rlp.DecodeBytes(blob, tx); err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
|
|
@ -717,7 +717,7 @@ func (p *BlobPool) parseTransaction(id uint64, size uint32, blob []byte) (bool,
|
||||||
}
|
}
|
||||||
return true, nil
|
return true, nil
|
||||||
}
|
}
|
||||||
meta := newBlobTxMeta(id, ptx.TxSize(), size, ptx)
|
meta := newBlobTxMeta(id, ptx.TxSize(), size, &ptx)
|
||||||
if p.lookup.exists(meta.hash) {
|
if p.lookup.exists(meta.hash) {
|
||||||
return false, errors.New("duplicate blob entry")
|
return false, errors.New("duplicate blob entry")
|
||||||
}
|
}
|
||||||
|
|
@ -1011,8 +1011,8 @@ func (p *BlobPool) offload(addr common.Address, nonce uint64, id uint64, inclusi
|
||||||
log.Error("Blobs missing for included transaction", "from", addr, "nonce", nonce, "id", id, "err", err)
|
log.Error("Blobs missing for included transaction", "from", addr, "nonce", nonce, "id", id, "err", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
ptx := new(blobTxForPool)
|
var ptx blobTxForPool
|
||||||
if err := rlp.DecodeBytes(data, ptx); err != nil {
|
if err := rlp.DecodeBytes(data, &ptx); err != nil {
|
||||||
log.Error("Blobs corrupted for included transaction", "from", addr, "nonce", nonce, "id", id, "err", err)
|
log.Error("Blobs corrupted for included transaction", "from", addr, "nonce", nonce, "id", id, "err", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
@ -1021,7 +1021,7 @@ func (p *BlobPool) offload(addr common.Address, nonce uint64, id uint64, inclusi
|
||||||
log.Warn("Blob transaction swapped out by signer", "from", addr, "nonce", nonce, "id", id)
|
log.Warn("Blob transaction swapped out by signer", "from", addr, "nonce", nonce, "id", id)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err := p.limbo.push(ptx, block); err != nil {
|
if err := p.limbo.push(&ptx, block); err != nil {
|
||||||
log.Warn("Failed to offload blob tx into limbo", "err", err)
|
log.Warn("Failed to offload blob tx into limbo", "err", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
@ -1551,8 +1551,8 @@ func (p *BlobPool) Get(hash common.Hash) *types.Transaction {
|
||||||
if len(data) == 0 {
|
if len(data) == 0 {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
ptx := new(blobTxForPool)
|
var ptx blobTxForPool
|
||||||
if err := rlp.DecodeBytes(data, ptx); err != nil {
|
if err := rlp.DecodeBytes(data, &ptx); err != nil {
|
||||||
id, _ := p.lookup.storeidOfTx(hash)
|
id, _ := p.lookup.storeidOfTx(hash)
|
||||||
|
|
||||||
log.Error("Blobs corrupted for traced transaction",
|
log.Error("Blobs corrupted for traced transaction",
|
||||||
|
|
@ -1642,8 +1642,8 @@ func (p *BlobPool) GetBlobs(vhashes []common.Hash, version byte) ([]*kzg4844.Blo
|
||||||
}
|
}
|
||||||
|
|
||||||
// Decode the blob transaction
|
// Decode the blob transaction
|
||||||
ptx := new(blobTxForPool)
|
var ptx blobTxForPool
|
||||||
if err := rlp.DecodeBytes(data, ptx); err != nil {
|
if err := rlp.DecodeBytes(data, &ptx); err != nil {
|
||||||
log.Error("Blobs corrupted for traced transaction", "id", txID, "err", err)
|
log.Error("Blobs corrupted for traced transaction", "id", txID, "err", err)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue