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
26c0fa1c
Commit
26c0fa1c
authored
Jul 19, 2015
by
Jeffrey Wilcke
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1480 from obscuren/miner-state-sync
miner: moved state sync
parents
a38f3740
1b9ef0e5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
worker.go
miner/worker.go
+1
-1
No files found.
miner/worker.go
View file @
26c0fa1c
...
...
@@ -263,6 +263,7 @@ func (self *worker) wait() {
}
block
:=
result
.
Block
self
.
current
.
state
.
Sync
()
if
self
.
fullValidation
{
if
_
,
err
:=
self
.
chain
.
InsertChain
(
types
.
Blocks
{
block
});
err
!=
nil
{
glog
.
V
(
logger
.
Error
)
.
Infoln
(
"mining err"
,
err
)
...
...
@@ -489,7 +490,6 @@ func (self *worker) commitNewWork() {
// commit state root after all state transitions.
core
.
AccumulateRewards
(
self
.
current
.
state
,
header
,
uncles
)
current
.
state
.
SyncObjects
()
self
.
current
.
state
.
Sync
()
header
.
Root
=
current
.
state
.
Root
()
}
...
...
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