Skip to content

Commit 0a21cb4

Browse files
authored
core/txpool/blobpool: use types.Sender instead of signer.Sender (#30473)
Use types.Sender(signer, tx) to utilize the transaction's sender cache and avoid repeated address recover.
1 parent 6b61b54 commit 0a21cb4

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

core/txpool/blobpool/blobpool.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ func (p *BlobPool) parseTransaction(id uint64, size uint32, blob []byte) error {
478478
log.Error("Rejecting duplicate blob pool entry", "id", id, "hash", tx.Hash())
479479
return errors.New("duplicate blob entry")
480480
}
481-
sender, err := p.signer.Sender(tx)
481+
sender, err := types.Sender(p.signer, tx)
482482
if err != nil {
483483
// This path is impossible unless the signature validity changes across
484484
// restarts. For that ever improbable case, recover gracefully by ignoring
@@ -892,7 +892,7 @@ func (p *BlobPool) reorg(oldHead, newHead *types.Header) (map[common.Address][]*
892892
// and accumulate the transactors and transactions
893893
for rem.NumberU64() > add.NumberU64() {
894894
for _, tx := range rem.Transactions() {
895-
from, _ := p.signer.Sender(tx)
895+
from, _ := types.Sender(p.signer, tx)
896896

897897
discarded[from] = append(discarded[from], tx)
898898
transactors[from] = struct{}{}
@@ -904,7 +904,7 @@ func (p *BlobPool) reorg(oldHead, newHead *types.Header) (map[common.Address][]*
904904
}
905905
for add.NumberU64() > rem.NumberU64() {
906906
for _, tx := range add.Transactions() {
907-
from, _ := p.signer.Sender(tx)
907+
from, _ := types.Sender(p.signer, tx)
908908

909909
included[from] = append(included[from], tx)
910910
inclusions[tx.Hash()] = add.NumberU64()
@@ -917,7 +917,7 @@ func (p *BlobPool) reorg(oldHead, newHead *types.Header) (map[common.Address][]*
917917
}
918918
for rem.Hash() != add.Hash() {
919919
for _, tx := range rem.Transactions() {
920-
from, _ := p.signer.Sender(tx)
920+
from, _ := types.Sender(p.signer, tx)
921921

922922
discarded[from] = append(discarded[from], tx)
923923
transactors[from] = struct{}{}
@@ -927,7 +927,7 @@ func (p *BlobPool) reorg(oldHead, newHead *types.Header) (map[common.Address][]*
927927
return nil, nil
928928
}
929929
for _, tx := range add.Transactions() {
930-
from, _ := p.signer.Sender(tx)
930+
from, _ := types.Sender(p.signer, tx)
931931

932932
included[from] = append(included[from], tx)
933933
inclusions[tx.Hash()] = add.NumberU64()
@@ -1127,7 +1127,7 @@ func (p *BlobPool) validateTx(tx *types.Transaction) error {
11271127
// If the transaction replaces an existing one, ensure that price bumps are
11281128
// adhered to.
11291129
var (
1130-
from, _ = p.signer.Sender(tx) // already validated above
1130+
from, _ = types.Sender(p.signer, tx) // already validated above
11311131
next = p.state.GetNonce(from)
11321132
)
11331133
if uint64(len(p.index[from])) > tx.Nonce()-next {

0 commit comments

Comments
 (0)