Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
31b33349
G
go-ethereum
项目概览
whqwjb
/
go-ethereum
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
go-ethereum
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
31b33349
编写于
12月 10, 2018
作者:
P
Péter Szilágyi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cmd/utils, eth: minor polishes on whitelist code
上级
48b70ecf
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
29 addition
and
41 deletion
+29
-41
cmd/utils/flags.go
cmd/utils/flags.go
+18
-23
eth/handler.go
eth/handler.go
+11
-18
未找到文件。
cmd/utils/flags.go
浏览文件 @
31b33349
...
...
@@ -1077,30 +1077,25 @@ func setEthash(ctx *cli.Context, cfg *eth.Config) {
}
func
setWhitelist
(
ctx
*
cli
.
Context
,
cfg
*
eth
.
Config
)
{
if
ctx
.
GlobalIsSet
(
WhitelistFlag
.
Name
)
{
entries
:=
strings
.
Split
(
ctx
.
String
(
WhitelistFlag
.
Name
),
","
)
whitelist
:=
make
(
map
[
uint64
]
common
.
Hash
)
for
_
,
entry
:=
range
entries
{
split
:=
strings
.
SplitN
(
entry
,
"="
,
2
)
if
len
(
split
)
!=
2
{
Fatalf
(
"invalid whitelist entry: %s"
,
entry
)
}
bn
,
err
:=
strconv
.
ParseUint
(
split
[
0
],
0
,
64
)
if
err
!=
nil
{
Fatalf
(
"Invalid whitelist block number %s: %v"
,
split
[
0
],
err
)
}
hash
:=
common
.
Hash
{}
err
=
hash
.
UnmarshalText
([]
byte
(
split
[
1
]))
if
err
!=
nil
{
Fatalf
(
"Invalid whitelist hash %s: %v"
,
split
[
1
],
err
)
}
whitelist
[
bn
]
=
hash
whitelist
:=
ctx
.
GlobalString
(
WhitelistFlag
.
Name
)
if
whitelist
==
""
{
return
}
cfg
.
Whitelist
=
make
(
map
[
uint64
]
common
.
Hash
)
for
_
,
entry
:=
range
strings
.
Split
(
whitelist
,
","
)
{
parts
:=
strings
.
Split
(
entry
,
"="
)
if
len
(
parts
)
!=
2
{
Fatalf
(
"Invalid whitelist entry: %s"
,
entry
)
}
cfg
.
Whitelist
=
whitelist
number
,
err
:=
strconv
.
ParseUint
(
parts
[
0
],
0
,
64
)
if
err
!=
nil
{
Fatalf
(
"Invalid whitelist block number %s: %v"
,
parts
[
0
],
err
)
}
var
hash
common
.
Hash
if
err
=
hash
.
UnmarshalText
([]
byte
(
parts
[
1
]));
err
!=
nil
{
Fatalf
(
"Invalid whitelist hash %s: %v"
,
parts
[
1
],
err
)
}
cfg
.
Whitelist
[
number
]
=
hash
}
}
...
...
eth/handler.go
浏览文件 @
31b33349
...
...
@@ -17,7 +17,6 @@
package
eth
import
(
"bytes"
"encoding/json"
"errors"
"fmt"
...
...
@@ -311,17 +310,13 @@ func (pm *ProtocolManager) handle(p *peer) error {
}
}()
}
// If we have any explicit whitelist block hashes, request them
for
bn
:=
range
pm
.
whitelist
{
p
.
Log
()
.
Debug
(
"Requesting whitelist block"
,
"number"
,
bn
)
if
err
:=
p
.
RequestHeadersByNumber
(
bn
,
1
,
0
,
false
);
err
!=
nil
{
p
.
Log
()
.
Error
(
"whitelist request failed"
,
"err"
,
err
,
"number"
,
bn
,
"peer"
,
p
.
id
)
for
number
:=
range
pm
.
whitelist
{
if
err
:=
p
.
RequestHeadersByNumber
(
number
,
1
,
0
,
false
);
err
!=
nil
{
return
err
}
}
// main loop. handle incoming messages.
// Handle incoming messages until the connection is torn down
for
{
if
err
:=
pm
.
handleMsg
(
p
);
err
!=
nil
{
p
.
Log
()
.
Debug
(
"Ethereum message handling failed"
,
"err"
,
err
)
...
...
@@ -466,16 +461,6 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
// Filter out any explicitly requested headers, deliver the rest to the downloader
filter
:=
len
(
headers
)
==
1
if
filter
{
// Check for any responses not matching our whitelist
if
expected
,
ok
:=
pm
.
whitelist
[
headers
[
0
]
.
Number
.
Uint64
()];
ok
{
actual
:=
headers
[
0
]
.
Hash
()
if
!
bytes
.
Equal
(
expected
.
Bytes
(),
actual
.
Bytes
())
{
p
.
Log
()
.
Info
(
"Dropping peer with non-matching whitelist block"
,
"number"
,
headers
[
0
]
.
Number
.
Uint64
(),
"hash"
,
actual
,
"expected"
,
expected
)
return
errors
.
New
(
"whitelist block mismatch"
)
}
p
.
Log
()
.
Debug
(
"Whitelist block verified"
,
"number"
,
headers
[
0
]
.
Number
.
Uint64
(),
"hash"
,
expected
)
}
// If it's a potential DAO fork check, validate against the rules
if
p
.
forkDrop
!=
nil
&&
pm
.
chainconfig
.
DAOForkBlock
.
Cmp
(
headers
[
0
]
.
Number
)
==
0
{
// Disable the fork drop timer
...
...
@@ -490,6 +475,14 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
p
.
Log
()
.
Debug
(
"Verified to be on the same side of the DAO fork"
)
return
nil
}
// Otherwise if it's a whitelisted block, validate against the set
if
want
,
ok
:=
pm
.
whitelist
[
headers
[
0
]
.
Number
.
Uint64
()];
ok
{
if
hash
:=
headers
[
0
]
.
Hash
();
want
!=
hash
{
p
.
Log
()
.
Info
(
"Whitelist mismatch, dropping peer"
,
"number"
,
headers
[
0
]
.
Number
.
Uint64
(),
"hash"
,
hash
,
"want"
,
want
)
return
errors
.
New
(
"whitelist block mismatch"
)
}
p
.
Log
()
.
Debug
(
"Whitelist block verified"
,
"number"
,
headers
[
0
]
.
Number
.
Uint64
(),
"hash"
,
want
)
}
// Irrelevant of the fork checks, send the header to the fetcher just in case
headers
=
pm
.
fetcher
.
FilterHeaders
(
p
.
id
,
headers
,
time
.
Now
())
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录