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
782910ea
Commit
782910ea
authored
Apr 01, 2014
by
Maran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small tweaks
parent
3558dd5e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
11 deletions
+3
-11
block_chain.go
ethchain/block_chain.go
+0
-3
miner.go
ethminer/miner.go
+0
-2
peer.go
peer.go
+3
-6
No files found.
ethchain/block_chain.go
View file @
782910ea
...
...
@@ -146,8 +146,6 @@ func (bc *BlockChain) FindCanonicalChain(blocks []*Block, commonBlockHash []byte
log
.
Println
(
"[CHAIN] At genesis block, breaking"
)
break
}
log
.
Printf
(
"CHECKING OUR OWN BLOCKS: %x"
,
block
.
Hash
())
log
.
Printf
(
"%x"
,
bc
.
GenesisBlock
()
.
Hash
())
curChainDifficulty
.
Add
(
curChainDifficulty
,
bc
.
CalculateBlockTD
(
block
))
}
...
...
@@ -309,7 +307,6 @@ func (bc *BlockChain) Add(block *Block) {
bc
.
LastBlockHash
=
block
.
Hash
()
encodedBlock
:=
block
.
RlpEncode
()
log
.
Println
(
encodedBlock
)
ethutil
.
Config
.
Db
.
Put
(
block
.
Hash
(),
encodedBlock
)
ethutil
.
Config
.
Db
.
Put
([]
byte
(
"LastBlock"
),
encodedBlock
)
}
...
...
ethminer/miner.go
View file @
782910ea
...
...
@@ -130,7 +130,6 @@ func (miner *Miner) listener() {
err
:=
miner
.
ethereum
.
StateManager
()
.
ProcessBlock
(
miner
.
block
,
true
)
if
err
!=
nil
{
log
.
Println
(
"Error result from process block:"
,
err
)
log
.
Println
(
miner
.
block
)
}
else
{
if
!
miner
.
ethereum
.
StateManager
()
.
Pow
.
Verify
(
miner
.
block
.
HashNoNonce
(),
miner
.
block
.
Difficulty
,
miner
.
block
.
Nonce
)
{
...
...
@@ -138,7 +137,6 @@ func (miner *Miner) listener() {
}
miner
.
ethereum
.
Broadcast
(
ethwire
.
MsgBlockTy
,
[]
interface
{}{
miner
.
block
.
Value
()
.
Val
})
log
.
Printf
(
"[MINER] 🔨 Mined block %x
\n
"
,
miner
.
block
.
Hash
())
log
.
Println
(
miner
.
block
)
miner
.
txs
=
[]
*
ethchain
.
Transaction
{}
// Move this somewhere neat
miner
.
block
=
miner
.
ethereum
.
BlockChain
()
.
NewBlock
(
miner
.
coinbase
,
miner
.
txs
)
...
...
peer.go
View file @
782910ea
...
...
@@ -337,16 +337,16 @@ func (p *Peer) HandleInbound() {
block
=
ethchain
.
NewBlockFromRlpValue
(
msg
.
Data
.
Get
(
i
))
// Do we have this block on our chain? If so we can continue
if
p
.
ethereum
.
StateManager
()
.
BlockChain
()
.
HasBlock
(
block
.
Hash
())
{
fmt
.
Println
(
"[PEER] Block found, checking next one.
"
)
ethutil
.
Config
.
Log
.
Debugf
(
"[PEER] Block found, checking next one.
\n
"
)
}
else
{
// We don't have this block, but we do have a block with the same prevHash, diversion time!
if
p
.
ethereum
.
StateManager
()
.
BlockChain
()
.
HasBlockWithPrevHash
(
block
.
PrevHash
)
{
fmt
.
Printf
(
"[PEER] Local and foreign chain have diverted after %x, we are going to get freaky with it
!
\n
"
,
block
.
PrevHash
)
ethutil
.
Config
.
Log
.
Infof
(
"[PEER] Local and foreign chain have diverted after %x, finding best chain
!
\n
"
,
block
.
PrevHash
)
if
p
.
ethereum
.
StateManager
()
.
BlockChain
()
.
FindCanonicalChainFromMsg
(
msg
,
block
.
PrevHash
)
{
return
}
}
else
{
fmt
.
Println
(
"[PEER] Both local and foreign chain have same parent. Continue normally
"
)
ethutil
.
Config
.
Log
.
Debugf
(
"[PEER] Both local and foreign chain have same parent. Continue normally
\n
"
)
}
}
}
...
...
@@ -362,7 +362,6 @@ func (p *Peer) HandleInbound() {
if
ethutil
.
Config
.
Debug
{
ethutil
.
Config
.
Log
.
Infof
(
"[PEER] Block %x failed
\n
"
,
block
.
Hash
())
ethutil
.
Config
.
Log
.
Infof
(
"[PEER] %v
\n
"
,
err
)
ethutil
.
Config
.
Log
.
Infoln
(
block
)
}
break
}
else
{
...
...
@@ -637,8 +636,6 @@ func (p *Peer) SyncWithBlocks() {
if
p
.
blocksRequested
==
0
{
p
.
blocksRequested
=
10
}
fmt
.
Printf
(
"Currenb lock %x
\n
"
,
p
.
ethereum
.
BlockChain
()
.
CurrentBlock
.
Hash
())
fmt
.
Println
(
"Amount:"
,
p
.
blocksRequested
)
blocks
:=
p
.
ethereum
.
BlockChain
()
.
GetChain
(
p
.
ethereum
.
BlockChain
()
.
CurrentBlock
.
Hash
(),
p
.
blocksRequested
)
var
hashes
[]
interface
{}
...
...
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