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
544b7fba
Commit
544b7fba
authored
Sep 24, 2014
by
obscuren
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'tmp' into develop
Conflicts: peer.go
parents
b66fcf85
cba2f6c2
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
169 additions
and
66 deletions
+169
-66
block_pool.go
block_pool.go
+148
-19
state_manager.go
ethchain/state_manager.go
+1
-3
ethereum.go
ethereum.go
+4
-0
miner.go
ethminer/miner.go
+0
-7
trie.go
ethtrie/trie.go
+2
-2
vm.go
ethvm/vm.go
+0
-1
peer.go
peer.go
+14
-34
No files found.
block_pool.go
View file @
544b7fba
package
eth
import
(
"bytes"
"container/list"
"math"
"math/big"
"sync"
"time"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethwire"
)
var
poollogger
=
ethlog
.
NewLogger
(
"[BPOOL]"
)
type
block
struct
{
from
*
Peer
peer
*
Peer
block
*
ethchain
.
Block
reqAt
time
.
Time
requested
int
}
type
BlockPool
struct
{
...
...
@@ -23,6 +33,9 @@ type BlockPool struct {
pool
map
[
string
]
*
block
td
*
big
.
Int
quit
chan
bool
ChainLength
,
BlocksProcessed
int
}
func
NewBlockPool
(
eth
*
Ethereum
)
*
BlockPool
{
...
...
@@ -30,6 +43,7 @@ func NewBlockPool(eth *Ethereum) *BlockPool {
eth
:
eth
,
pool
:
make
(
map
[
string
]
*
block
),
td
:
ethutil
.
Big0
,
quit
:
make
(
chan
bool
),
}
}
...
...
@@ -45,9 +59,9 @@ func (self *BlockPool) HasCommonHash(hash []byte) bool {
return
self
.
eth
.
BlockChain
()
.
GetBlock
(
hash
)
!=
nil
}
func
(
self
*
BlockPool
)
AddHash
(
hash
[]
byte
)
{
func
(
self
*
BlockPool
)
AddHash
(
hash
[]
byte
,
peer
*
Peer
)
{
if
self
.
pool
[
string
(
hash
)]
==
nil
{
self
.
pool
[
string
(
hash
)]
=
&
block
{
nil
,
nil
}
self
.
pool
[
string
(
hash
)]
=
&
block
{
peer
,
nil
,
nil
,
time
.
Now
(),
0
}
self
.
hashPool
=
append
([][]
byte
{
hash
},
self
.
hashPool
...
)
}
...
...
@@ -58,24 +72,54 @@ func (self *BlockPool) SetBlock(b *ethchain.Block, peer *Peer) {
if
self
.
pool
[
hash
]
==
nil
&&
!
self
.
eth
.
BlockChain
()
.
HasBlock
(
b
.
Hash
())
{
self
.
hashPool
=
append
(
self
.
hashPool
,
b
.
Hash
())
self
.
pool
[
hash
]
=
&
block
{
peer
,
b
}
self
.
pool
[
hash
]
=
&
block
{
peer
,
peer
,
b
,
time
.
Now
(),
0
}
}
else
if
self
.
pool
[
hash
]
!=
nil
{
self
.
pool
[
hash
]
.
block
=
b
}
self
.
BlocksProcessed
++
}
func
(
self
*
BlockPool
)
CheckLinkAndProcess
(
f
func
(
block
*
ethchain
.
Block
))
{
func
(
self
*
BlockPool
)
getParent
(
block
*
ethchain
.
Block
)
*
ethchain
.
Block
{
for
_
,
item
:=
range
self
.
pool
{
if
item
.
block
!=
nil
{
if
bytes
.
Compare
(
item
.
block
.
Hash
(),
block
.
PrevHash
)
==
0
{
return
item
.
block
}
}
}
return
nil
}
func
(
self
*
BlockPool
)
GetChainFromBlock
(
block
*
ethchain
.
Block
)
ethchain
.
Blocks
{
var
blocks
ethchain
.
Blocks
for
b
:=
block
;
b
!=
nil
;
b
=
self
.
getParent
(
b
)
{
blocks
=
append
(
ethchain
.
Blocks
{
b
},
blocks
...
)
}
return
blocks
}
func
(
self
*
BlockPool
)
Blocks
()
(
blocks
ethchain
.
Blocks
)
{
for
_
,
item
:=
range
self
.
pool
{
if
item
.
block
!=
nil
{
blocks
=
append
(
blocks
,
item
.
block
)
}
}
return
}
func
(
self
*
BlockPool
)
ProcessCanonical
(
f
func
(
block
*
ethchain
.
Block
))
(
procAmount
int
)
{
blocks
:=
self
.
Blocks
()
ethchain
.
BlockBy
(
ethchain
.
Number
)
.
Sort
(
blocks
)
for
_
,
block
:=
range
blocks
{
if
self
.
eth
.
BlockChain
()
.
HasBlock
(
block
.
PrevHash
)
{
procAmount
++
f
(
block
)
hash
:=
block
.
Hash
()
...
...
@@ -84,23 +128,108 @@ func (self *BlockPool) CheckLinkAndProcess(f func(block *ethchain.Block)) {
}
}
return
}
func
(
self
*
BlockPool
)
Take
(
amount
int
,
peer
*
Peer
)
(
hashes
[][]
byte
)
{
self
.
mut
.
Lock
()
defer
self
.
mut
.
Unlock
()
func
(
self
*
BlockPool
)
DistributeHashes
()
{
var
(
peerLen
=
self
.
eth
.
peers
.
Len
()
amount
=
200
*
peerLen
dist
=
make
(
map
[
*
Peer
][][]
byte
)
)
num
:=
int
(
math
.
Min
(
float64
(
amount
),
float64
(
len
(
self
.
pool
))))
j
:=
0
for
i
:=
0
;
i
<
len
(
self
.
hashPool
)
&&
j
<
num
;
i
++
{
hash
:=
string
(
self
.
hashPool
[
i
])
if
self
.
pool
[
hash
]
!=
nil
&&
(
self
.
pool
[
hash
]
.
peer
==
nil
||
self
.
pool
[
hash
]
.
peer
==
peer
)
&&
self
.
pool
[
hash
]
.
block
==
nil
{
self
.
pool
[
hash
]
.
peer
=
peer
for
i
,
j
:=
0
,
0
;
i
<
len
(
self
.
hashPool
)
&&
j
<
num
;
i
++
{
hash
:=
self
.
hashPool
[
i
]
item
:=
self
.
pool
[
string
(
hash
)]
if
item
!=
nil
&&
item
.
block
==
nil
{
var
peer
*
Peer
lastFetchFailed
:=
time
.
Since
(
item
.
reqAt
)
>
5
*
time
.
Second
// Handle failed requests
if
lastFetchFailed
&&
item
.
requested
>
0
&&
item
.
peer
!=
nil
{
if
item
.
requested
<
100
{
// Select peer the hash was retrieved off
peer
=
item
.
from
}
else
{
// Remove it
self
.
hashPool
=
ethutil
.
DeleteFromByteSlice
(
self
.
hashPool
,
hash
)
delete
(
self
.
pool
,
string
(
hash
))
}
}
else
if
lastFetchFailed
||
item
.
peer
==
nil
{
// Find a suitable, available peer
eachPeer
(
self
.
eth
.
peers
,
func
(
p
*
Peer
,
v
*
list
.
Element
)
{
if
peer
==
nil
&&
len
(
dist
[
p
])
<
amount
/
peerLen
{
peer
=
p
}
})
}
hashes
=
append
(
hashes
,
self
.
hashPool
[
i
])
j
++
if
peer
!=
nil
{
item
.
reqAt
=
time
.
Now
()
item
.
peer
=
peer
item
.
requested
++
dist
[
peer
]
=
append
(
dist
[
peer
],
hash
)
}
}
}
return
for
peer
,
hashes
:=
range
dist
{
peer
.
FetchBlocks
(
hashes
)
}
}
func
(
self
*
BlockPool
)
Start
()
{
go
self
.
update
()
}
func
(
self
*
BlockPool
)
Stop
()
{
close
(
self
.
quit
)
}
func
(
self
*
BlockPool
)
update
()
{
serviceTimer
:=
time
.
NewTicker
(
100
*
time
.
Millisecond
)
procTimer
:=
time
.
NewTicker
(
500
*
time
.
Millisecond
)
out
:
for
{
select
{
case
<-
self
.
quit
:
break
out
case
<-
serviceTimer
.
C
:
// Check if we're catching up. If not distribute the hashes to
// the peers and download the blockchain
done
:=
true
eachPeer
(
self
.
eth
.
peers
,
func
(
p
*
Peer
,
v
*
list
.
Element
)
{
if
p
.
statusKnown
&&
p
.
FetchingHashes
()
{
done
=
false
}
})
if
done
&&
len
(
self
.
hashPool
)
>
0
{
self
.
DistributeHashes
()
}
if
self
.
ChainLength
<
len
(
self
.
hashPool
)
{
self
.
ChainLength
=
len
(
self
.
hashPool
)
}
case
<-
procTimer
.
C
:
// XXX We can optimize this lifting this on to a new goroutine.
// We'd need to make sure that the pools are properly protected by a mutex
amount
:=
self
.
ProcessCanonical
(
func
(
block
*
ethchain
.
Block
)
{
err
:=
self
.
eth
.
StateManager
()
.
Process
(
block
,
false
)
if
err
!=
nil
{
poollogger
.
Infoln
(
err
)
}
})
// Do not propagate to the network on catchups
if
amount
==
1
{
block
:=
self
.
eth
.
BlockChain
()
.
CurrentBlock
self
.
eth
.
Broadcast
(
ethwire
.
MsgBlockTy
,
[]
interface
{}{
block
.
Value
()
.
Val
})
}
}
}
}
ethchain/state_manager.go
View file @
544b7fba
...
...
@@ -250,15 +250,13 @@ func (sm *StateManager) Process(block *Block, dontReact bool) (err error) {
fk
:=
append
([]
byte
(
"bloom"
),
block
.
Hash
()
...
)
sm
.
Ethereum
.
Db
()
.
Put
(
fk
,
filter
.
Bin
())
statelogger
.
Info
f
(
"Added block #%d (%x)
\n
"
,
block
.
Number
,
block
.
Hash
())
statelogger
.
Debug
f
(
"Added block #%d (%x)
\n
"
,
block
.
Number
,
block
.
Hash
())
if
dontReact
==
false
{
sm
.
Ethereum
.
Reactor
()
.
Post
(
"newBlock"
,
block
)
state
.
Manifest
()
.
Reset
()
}
sm
.
Ethereum
.
Broadcast
(
ethwire
.
MsgBlockTy
,
[]
interface
{}{
block
.
Value
()
.
Val
})
sm
.
Ethereum
.
TxPool
()
.
RemoveInvalid
(
state
)
}
else
{
statelogger
.
Errorln
(
"total diff failed"
)
...
...
ethereum.go
View file @
544b7fba
...
...
@@ -158,6 +158,9 @@ func (s *Ethereum) StateManager() *ethchain.StateManager {
func
(
s
*
Ethereum
)
TxPool
()
*
ethchain
.
TxPool
{
return
s
.
txPool
}
func
(
s
*
Ethereum
)
BlockPool
()
*
BlockPool
{
return
s
.
blockPool
}
func
(
self
*
Ethereum
)
Db
()
ethutil
.
Database
{
return
self
.
db
}
...
...
@@ -503,6 +506,7 @@ func (s *Ethereum) Stop() {
s
.
stateManager
.
Stop
()
s
.
reactor
.
Flush
()
s
.
reactor
.
Stop
()
s
.
blockPool
.
Stop
()
ethlogger
.
Infoln
(
"Server stopped"
)
close
(
s
.
shutdownChan
)
...
...
ethminer/miner.go
View file @
544b7fba
...
...
@@ -3,7 +3,6 @@ package ethminer
import
(
"bytes"
"sort"
"time"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethlog"
...
...
@@ -136,12 +135,6 @@ func (miner *Miner) listener() {
}
}
default
:
// This hack is only temporarily
if
len
(
miner
.
txs
)
==
0
{
time
.
Sleep
(
2
*
time
.
Second
)
continue
}
miner
.
mineNewBlock
()
}
}
...
...
ethtrie/trie.go
View file @
544b7fba
...
...
@@ -196,8 +196,8 @@ func (t *Trie) Update(key, value string) {
}
func
(
t
*
Trie
)
Get
(
key
string
)
string
{
t
.
mut
.
R
Lock
()
defer
t
.
mut
.
R
Unlock
()
t
.
mut
.
Lock
()
defer
t
.
mut
.
Unlock
()
k
:=
CompactHexDecode
(
key
)
c
:=
ethutil
.
NewValue
(
t
.
getState
(
t
.
Root
,
k
))
...
...
ethvm/vm.go
View file @
544b7fba
...
...
@@ -961,7 +961,6 @@ func (self *Message) Addr() []byte {
}
func
(
self
*
Message
)
Exec
(
codeAddr
[]
byte
,
caller
ClosureRef
)
(
ret
[]
byte
,
err
error
)
{
fmt
.
Printf
(
"%x %x
\n
"
,
codeAddr
[
0
:
4
],
self
.
address
[
0
:
4
])
queue
:=
self
.
vm
.
queue
self
.
vm
.
queue
=
list
.
New
()
...
...
peer.go
View file @
544b7fba
...
...
@@ -131,7 +131,7 @@ type Peer struct {
// Last received pong message
lastPong
int64
lastBlockReceived
time
.
Time
l
astHashReceived
time
.
Time
L
astHashReceived
time
.
Time
host
[]
byte
port
uint16
...
...
@@ -177,6 +177,7 @@ func NewPeer(conn net.Conn, ethereum *Ethereum, inbound bool) *Peer {
caps
:
ethereum
.
ServerCaps
(),
version
:
ethereum
.
ClientIdentity
()
.
String
(),
protocolCaps
:
ethutil
.
NewValue
(
nil
),
td
:
big
.
NewInt
(
0
),
}
}
...
...
@@ -192,6 +193,7 @@ func NewOutboundPeer(addr string, ethereum *Ethereum, caps Caps) *Peer {
caps
:
caps
,
version
:
ethereum
.
ClientIdentity
()
.
String
(),
protocolCaps
:
ethutil
.
NewValue
(
nil
),
td
:
big
.
NewInt
(
0
),
}
// Set up the connection in another goroutine so we don't block the main thread
...
...
@@ -507,7 +509,7 @@ func (p *Peer) HandleInbound() {
hash
:=
it
.
Value
()
.
Bytes
()
p
.
lastReceivedHash
=
hash
p
.
l
astHashReceived
=
time
.
Now
()
p
.
L
astHashReceived
=
time
.
Now
()
if
blockPool
.
HasCommonHash
(
hash
)
{
foundCommonHash
=
true
...
...
@@ -515,12 +517,10 @@ func (p *Peer) HandleInbound() {
break
}
blockPool
.
AddHash
(
hash
)
blockPool
.
AddHash
(
hash
,
p
)
}
if
foundCommonHash
||
msg
.
Data
.
Len
()
==
0
{
p
.
FetchBlocks
()
}
else
{
if
!
foundCommonHash
&&
msg
.
Data
.
Len
()
!=
0
{
p
.
FetchHashes
()
}
...
...
@@ -538,20 +538,6 @@ func (p *Peer) HandleInbound() {
p
.
lastBlockReceived
=
time
.
Now
()
}
var
err
error
blockPool
.
CheckLinkAndProcess
(
func
(
block
*
ethchain
.
Block
)
{
err
=
p
.
ethereum
.
StateManager
()
.
Process
(
block
,
false
)
})
if
err
!=
nil
{
peerlogger
.
Infoln
(
err
)
}
/*else {
// Don't trigger if there's just one block.
if blockPool.Len() != 0 && msg.Data.Len() > 1 {
p.FetchBlocks()
}
}*/
}
}
}
...
...
@@ -560,10 +546,7 @@ func (p *Peer) HandleInbound() {
p
.
Stop
()
}
func
(
self
*
Peer
)
FetchBlocks
()
{
blockPool
:=
self
.
ethereum
.
blockPool
hashes
:=
blockPool
.
Take
(
100
,
self
)
func
(
self
*
Peer
)
FetchBlocks
(
hashes
[][]
byte
)
{
if
len
(
hashes
)
>
0
{
self
.
QueueMessage
(
ethwire
.
NewMessage
(
ethwire
.
MsgGetBlocksTy
,
ethutil
.
ByteSliceToInterface
(
hashes
)))
}
...
...
@@ -572,7 +555,7 @@ func (self *Peer) FetchBlocks() {
func
(
self
*
Peer
)
FetchHashes
()
{
blockPool
:=
self
.
ethereum
.
blockPool
if
self
.
td
.
Cmp
(
blockPool
.
td
)
>=
0
{
if
self
.
td
.
Cmp
(
self
.
ethereum
.
HighestTDPeer
()
)
>=
0
{
blockPool
.
td
=
self
.
td
if
!
blockPool
.
HasLatestHash
()
{
...
...
@@ -581,6 +564,10 @@ func (self *Peer) FetchHashes() {
}
}
func
(
self
*
Peer
)
FetchingHashes
()
bool
{
return
time
.
Since
(
self
.
LastHashReceived
)
<
5
*
time
.
Second
}
// General update method
func
(
self
*
Peer
)
update
()
{
serviceTimer
:=
time
.
NewTicker
(
100
*
time
.
Millisecond
)
...
...
@@ -592,19 +579,12 @@ out:
if
self
.
IsCap
(
"eth"
)
{
var
(
sinceBlock
=
time
.
Since
(
self
.
lastBlockReceived
)
sinceHash
=
time
.
Since
(
self
.
l
astHashReceived
)
sinceHash
=
time
.
Since
(
self
.
L
astHashReceived
)
)
if
sinceBlock
>
5
*
time
.
Second
&&
sinceHash
>
5
*
time
.
Second
{
self
.
catchingUp
=
false
}
if
sinceHash
>
10
*
time
.
Second
&&
self
.
ethereum
.
blockPool
.
Len
()
!=
0
{
// XXX While this is completely and utterly incorrect, in order to do anything on the test net is to do it this way
// Assume that when fetching hashes timeouts, we are done.
//self.FetchHashes()
self
.
FetchBlocks
()
}
}
case
<-
self
.
quit
:
break
out
...
...
@@ -728,7 +708,7 @@ func (self *Peer) handleStatus(msg *ethwire.Msg) {
// Compare the total TD with the blockchain TD. If remote is higher
// fetch hashes from highest TD node.
if
self
.
td
.
Cmp
(
self
.
ethereum
.
BlockChain
()
.
TD
)
>
0
{
self
.
ethereum
.
blockPool
.
AddHash
(
self
.
lastReceivedHash
)
self
.
ethereum
.
blockPool
.
AddHash
(
self
.
lastReceivedHash
,
self
)
self
.
FetchHashes
()
}
...
...
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