@@ -478,7 +478,7 @@ func (p *BlobPool) parseTransaction(id uint64, size uint32, blob []byte) error {
478
478
log .Error ("Rejecting duplicate blob pool entry" , "id" , id , "hash" , tx .Hash ())
479
479
return errors .New ("duplicate blob entry" )
480
480
}
481
- sender , err := p . signer . Sender (tx )
481
+ sender , err := types . Sender (p . signer , tx )
482
482
if err != nil {
483
483
// This path is impossible unless the signature validity changes across
484
484
// 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][]*
892
892
// and accumulate the transactors and transactions
893
893
for rem .NumberU64 () > add .NumberU64 () {
894
894
for _ , tx := range rem .Transactions () {
895
- from , _ := p . signer . Sender (tx )
895
+ from , _ := types . Sender (p . signer , tx )
896
896
897
897
discarded [from ] = append (discarded [from ], tx )
898
898
transactors [from ] = struct {}{}
@@ -904,7 +904,7 @@ func (p *BlobPool) reorg(oldHead, newHead *types.Header) (map[common.Address][]*
904
904
}
905
905
for add .NumberU64 () > rem .NumberU64 () {
906
906
for _ , tx := range add .Transactions () {
907
- from , _ := p . signer . Sender (tx )
907
+ from , _ := types . Sender (p . signer , tx )
908
908
909
909
included [from ] = append (included [from ], tx )
910
910
inclusions [tx .Hash ()] = add .NumberU64 ()
@@ -917,7 +917,7 @@ func (p *BlobPool) reorg(oldHead, newHead *types.Header) (map[common.Address][]*
917
917
}
918
918
for rem .Hash () != add .Hash () {
919
919
for _ , tx := range rem .Transactions () {
920
- from , _ := p . signer . Sender (tx )
920
+ from , _ := types . Sender (p . signer , tx )
921
921
922
922
discarded [from ] = append (discarded [from ], tx )
923
923
transactors [from ] = struct {}{}
@@ -927,7 +927,7 @@ func (p *BlobPool) reorg(oldHead, newHead *types.Header) (map[common.Address][]*
927
927
return nil , nil
928
928
}
929
929
for _ , tx := range add .Transactions () {
930
- from , _ := p . signer . Sender (tx )
930
+ from , _ := types . Sender (p . signer , tx )
931
931
932
932
included [from ] = append (included [from ], tx )
933
933
inclusions [tx .Hash ()] = add .NumberU64 ()
@@ -1127,7 +1127,7 @@ func (p *BlobPool) validateTx(tx *types.Transaction) error {
1127
1127
// If the transaction replaces an existing one, ensure that price bumps are
1128
1128
// adhered to.
1129
1129
var (
1130
- from , _ = p . signer . Sender (tx ) // already validated above
1130
+ from , _ = types . Sender (p . signer , tx ) // already validated above
1131
1131
next = p .state .GetNonce (from )
1132
1132
)
1133
1133
if uint64 (len (p .index [from ])) > tx .Nonce ()- next {
0 commit comments