Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
682c4531
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 搜索 >>
提交
682c4531
编写于
7月 08, 2016
作者:
P
Péter Szilágyi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[release/1.4.10] cmd/geth, miner, params: special extradata for DAO fork start
(cherry picked from commit
1e24c2e4
)
上级
5c3051e6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
6 deletion
+22
-6
cmd/geth/genesis_test.go
cmd/geth/genesis_test.go
+1
-0
miner/worker.go
miner/worker.go
+9
-1
params/util.go
params/util.go
+12
-5
未找到文件。
cmd/geth/genesis_test.go
浏览文件 @
682c4531
...
...
@@ -75,6 +75,7 @@ var customGenesisTests = []struct {
"timestamp" : "0x00",
"config" : {
"homesteadBlock" : 314,
"daoForkBlock" : 141
},
}`
,
query
:
"eth.getBlock(0).nonce"
,
...
...
miner/worker.go
浏览文件 @
682c4531
...
...
@@ -33,6 +33,7 @@ import (
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/pow"
"gopkg.in/fatih/set.v0"
)
...
...
@@ -468,7 +469,14 @@ func (self *worker) commitNewWork() {
Extra
:
self
.
extra
,
Time
:
big
.
NewInt
(
tstamp
),
}
// If we are doing a DAO hard-fork check whether to override the extra-data or not
if
daoBlock
:=
self
.
config
.
DAOForkBlock
;
daoBlock
!=
nil
{
// Check whether the block is among the fork extra-override range
limit
:=
new
(
big
.
Int
)
.
Add
(
daoBlock
,
params
.
DAOForkExtraRange
)
if
daoBlock
.
Cmp
(
header
.
Number
)
<=
0
&&
header
.
Number
.
Cmp
(
limit
)
<
0
{
header
.
Extra
=
common
.
CopyBytes
(
params
.
DAOForkBlockExtra
)
}
}
previous
:=
self
.
current
// Could potentially happen if starting to mine in an odd state.
err
:=
self
.
makeCurrent
(
parent
,
header
)
...
...
params/util.go
浏览文件 @
682c4531
...
...
@@ -16,11 +16,18 @@
package
params
import
"math/big"
import
(
"math/big"
"github.com/ethereum/go-ethereum/common"
)
var
(
TestNetHomesteadBlock
=
big
.
NewInt
(
494000
)
// testnet homestead block
MainNetHomesteadBlock
=
big
.
NewInt
(
1150000
)
// mainnet homestead block
TestNetDAOForkBlock
=
big
.
NewInt
(
8888888
)
// testnet dao hard-fork block
MainNetDAOForkBlock
=
big
.
NewInt
(
9999999
)
// mainnet dao hard-fork block
TestNetHomesteadBlock
=
big
.
NewInt
(
494000
)
// Testnet homestead block
MainNetHomesteadBlock
=
big
.
NewInt
(
1150000
)
// Mainnet homestead block
TestNetDAOForkBlock
=
big
.
NewInt
(
8888888
)
// Testnet dao hard-fork block
MainNetDAOForkBlock
=
big
.
NewInt
(
9999999
)
// Mainnet dao hard-fork block
DAOForkBlockExtra
=
common
.
FromHex
(
"0x64616f2d686172642d666f726b"
)
// Block extradata to signel the fork with ("dao-hard-fork")
DAOForkExtraRange
=
big
.
NewInt
(
10
)
// Number of blocks to override the extradata (prevent no-fork attacks)
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录