Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
8bbf83e7
Unverified
Commit
8bbf83e7
authored
Dec 17, 2021
by
xwjack
Committed by
GitHub
Dec 17, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
core: ignore basefee when comparing with pool gasprice in txpool (#24080)
This reverts commit
94898533
.
parent
2295640e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
tx_pool.go
core/tx_pool.go
+2
-3
No files found.
core/tx_pool.go
View file @
8bbf83e7
...
...
@@ -621,9 +621,8 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error {
if
err
!=
nil
{
return
ErrInvalidSender
}
// Drop non-local transactions under our own minimal accepted gas price or tip.
pendingBaseFee
:=
pool
.
priced
.
urgent
.
baseFee
if
!
local
&&
tx
.
EffectiveGasTipIntCmp
(
pool
.
gasPrice
,
pendingBaseFee
)
<
0
{
// Drop non-local transactions under our own minimal accepted gas price or tip
if
!
local
&&
tx
.
GasTipCapIntCmp
(
pool
.
gasPrice
)
<
0
{
return
ErrUnderpriced
}
// Ensure the transaction adheres to nonce ordering
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment