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
7f7877a0
Unverified
Commit
7f7877a0
authored
Dec 07, 2021
by
rjl493456442
Committed by
GitHub
Dec 07, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
miner: update pending block even after the PoS transition (#24075)
parent
d7859056
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
7 deletions
+5
-7
worker.go
miner/worker.go
+5
-7
No files found.
miner/worker.go
View file @
7f7877a0
...
...
@@ -1039,17 +1039,15 @@ func (w *worker) commit(uncles []*types.Header, interval func(), update bool, st
if
err
!=
nil
{
return
err
}
if
w
.
isRunning
()
{
if
interval
!=
nil
{
interval
()
}
// If we're post merge, just ignore
td
,
ttd
:=
w
.
chain
.
GetTd
(
block
.
ParentHash
(),
block
.
NumberU64
()
-
1
),
w
.
chain
.
Config
()
.
TerminalTotalDifficulty
if
td
!=
nil
&&
ttd
!=
nil
&&
td
.
Cmp
(
ttd
)
>=
0
{
return
nil
}
if
w
.
isRunning
()
{
if
interval
!=
nil
{
interval
()
}
select
{
case
w
.
taskCh
<-
&
task
{
receipts
:
receipts
,
state
:
s
,
block
:
block
,
createdAt
:
time
.
Now
()}
:
w
.
unconfirmed
.
Shift
(
block
.
NumberU64
()
-
1
)
...
...
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