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
912ae803
Commit
912ae803
authored
May 27, 2015
by
obscuren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
miner: Added 5 blocks wait in prep for #1067
parent
12650e16
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
worker.go
miner/worker.go
+5
-4
No files found.
miner/worker.go
View file @
912ae803
...
...
@@ -219,7 +219,7 @@ out:
func
newLocalMinedBlock
(
blockNumber
uint64
,
prevMinedBlocks
*
uint64RingBuffer
)
(
minedBlocks
*
uint64RingBuffer
)
{
if
prevMinedBlocks
==
nil
{
minedBlocks
=
&
uint64RingBuffer
{
next
:
0
,
ints
:
make
([]
uint64
,
miningLogAtDepth
+
1
)}
minedBlocks
=
&
uint64RingBuffer
{
next
:
0
,
ints
:
make
([]
uint64
,
miningLogAtDepth
+
1
)}
}
else
{
minedBlocks
=
prevMinedBlocks
}
...
...
@@ -244,15 +244,16 @@ func (self *worker) wait() {
}
self
.
mux
.
Post
(
core
.
NewMinedBlockEvent
{
block
})
var
stale
string
var
stale
,
confirm
string
canonBlock
:=
self
.
chain
.
GetBlockByNumber
(
block
.
NumberU64
())
if
canonBlock
!=
nil
&&
canonBlock
.
Hash
()
!=
block
.
Hash
()
{
stale
=
"stale
-
"
stale
=
"stale
"
}
else
{
confirm
=
"Wait 5 blocks for confirmation"
self
.
current
.
localMinedBlocks
=
newLocalMinedBlock
(
block
.
Number
()
.
Uint64
(),
self
.
current
.
localMinedBlocks
)
}
glog
.
V
(
logger
.
Info
)
.
Infof
(
"🔨 Mined %sblock
#%v (%x)"
,
stale
,
block
.
Number
(),
block
.
Hash
()
.
Bytes
()[
:
4
]
)
glog
.
V
(
logger
.
Info
)
.
Infof
(
"🔨 Mined %sblock
(#%v / %x). %s"
,
stale
,
block
.
Number
(),
block
.
Hash
()
.
Bytes
()[
:
4
],
confirm
)
jsonlogger
.
LogJson
(
&
logger
.
EthMinerNewBlock
{
BlockHash
:
block
.
Hash
()
.
Hex
(),
...
...
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