Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
21672900
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 搜索 >>
提交
21672900
编写于
2月 16, 2016
作者:
P
Péter Szilágyi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
eth/downloader: fix partial rollback and ancestor lookup
上级
4f28c5b6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
28 addition
and
2 deletion
+28
-2
eth/downloader/downloader.go
eth/downloader/downloader.go
+28
-2
未找到文件。
eth/downloader/downloader.go
浏览文件 @
21672900
...
...
@@ -571,8 +571,14 @@ func (d *Downloader) findAncestor61(p *peer) (uint64, error) {
// Check if a common ancestor was found
finished
=
true
for
i
:=
len
(
hashes
)
-
1
;
i
>=
0
;
i
--
{
// Skip any headers that underflow/overflow our requested set
header
:=
d
.
getHeader
(
hashes
[
i
])
if
header
==
nil
||
header
.
Number
.
Int64
()
<
from
||
header
.
Number
.
Uint64
()
>
head
{
continue
}
// Otherwise check if we already know the header or not
if
d
.
hasBlockAndState
(
hashes
[
i
])
{
number
,
hash
=
uint64
(
from
)
+
uint64
(
i
),
hashes
[
i
]
number
,
hash
=
header
.
Number
.
Uint64
(),
header
.
Hash
()
break
}
}
...
...
@@ -990,12 +996,28 @@ func (d *Downloader) findAncestor(p *peer) (uint64, error) {
// Make sure the peer actually gave something valid
headers
:=
packet
.
(
*
headerPack
)
.
headers
if
len
(
headers
)
==
0
{
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"%v: empty head header set"
,
p
)
glog
.
V
(
logger
.
Warn
)
.
Infof
(
"%v: empty head header set"
,
p
)
return
0
,
errEmptyHeaderSet
}
// Make sure the peer's reply conforms to the request
for
i
:=
0
;
i
<
len
(
headers
);
i
++
{
if
number
:=
headers
[
i
]
.
Number
.
Int64
();
number
!=
from
+
int64
(
i
)
{
glog
.
V
(
logger
.
Warn
)
.
Infof
(
"%v: head header set (item %d) broke chain ordering: requested %d, got %d"
,
p
,
i
,
from
+
int64
(
i
),
number
)
return
0
,
errInvalidChain
}
if
i
>
0
&&
headers
[
i
-
1
]
.
Hash
()
!=
headers
[
i
]
.
ParentHash
{
glog
.
V
(
logger
.
Warn
)
.
Infof
(
"%v: head header set (item %d) broke chain ancestry: expected [%x], got [%x]"
,
p
,
i
,
headers
[
i
-
1
]
.
Hash
()
.
Bytes
()[
:
4
],
headers
[
i
]
.
ParentHash
[
:
4
])
return
0
,
errInvalidChain
}
}
// Check if a common ancestor was found
finished
=
true
for
i
:=
len
(
headers
)
-
1
;
i
>=
0
;
i
--
{
// Skip any headers that underflow/overflow our requested set
if
headers
[
i
]
.
Number
.
Int64
()
<
from
||
headers
[
i
]
.
Number
.
Uint64
()
>
head
{
continue
}
// Otherwise check if we already know the header or not
if
(
d
.
mode
!=
LightSync
&&
d
.
hasBlockAndState
(
headers
[
i
]
.
Hash
()))
||
(
d
.
mode
==
LightSync
&&
d
.
hasHeader
(
headers
[
i
]
.
Hash
()))
{
number
,
hash
=
headers
[
i
]
.
Number
.
Uint64
(),
headers
[
i
]
.
Hash
()
break
...
...
@@ -1206,6 +1228,10 @@ func (d *Downloader) fetchHeaders(p *peer, td *big.Int, from uint64) error {
frequency
=
1
}
if
n
,
err
:=
d
.
insertHeaders
(
headers
,
frequency
);
err
!=
nil
{
// If some headers were inserted, add them too to the rollback list
if
n
>
0
{
rollback
=
append
(
rollback
,
headers
[
:
n
]
...
)
}
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"%v: invalid header #%d [%x…]: %v"
,
p
,
headers
[
n
]
.
Number
,
headers
[
n
]
.
Hash
()
.
Bytes
()[
:
4
],
err
)
return
errInvalidChain
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录