Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
3b053185
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 搜索 >>
未验证
提交
3b053185
编写于
7月 02, 2021
作者:
U
ucwong
提交者:
GitHub
7月 02, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cmd/evm, eth/ethconfig: regenerate struct codecs (#23140)
上级
a182c768
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
12 deletion
+19
-12
cmd/evm/internal/t8ntool/gen_stenv.go
cmd/evm/internal/t8ntool/gen_stenv.go
+8
-8
eth/ethconfig/gen_config.go
eth/ethconfig/gen_config.go
+11
-4
未找到文件。
cmd/evm/internal/t8ntool/gen_stenv.go
浏览文件 @
3b053185
...
@@ -16,11 +16,11 @@ var _ = (*stEnvMarshaling)(nil)
...
@@ -16,11 +16,11 @@ var _ = (*stEnvMarshaling)(nil)
// MarshalJSON marshals as JSON.
// MarshalJSON marshals as JSON.
func
(
s
stEnv
)
MarshalJSON
()
([]
byte
,
error
)
{
func
(
s
stEnv
)
MarshalJSON
()
([]
byte
,
error
)
{
type
stEnv
struct
{
type
stEnv
struct
{
Coinbase
common
.
UnprefixedAddress
`json:"currentCoinbase" gencodec:"required"`
Coinbase
common
.
UnprefixedAddress
`json:"currentCoinbase"
gencodec:"required"`
Difficulty
*
math
.
HexOrDecimal256
`json:"currentDifficulty" gencodec:"required"`
Difficulty
*
math
.
HexOrDecimal256
`json:"currentDifficulty" gencodec:"required"`
GasLimit
math
.
HexOrDecimal64
`json:"currentGasLimit" gencodec:"required"`
GasLimit
math
.
HexOrDecimal64
`json:"currentGasLimit"
gencodec:"required"`
Number
math
.
HexOrDecimal64
`json:"currentNumber" gencodec:"required"`
Number
math
.
HexOrDecimal64
`json:"currentNumber"
gencodec:"required"`
Timestamp
math
.
HexOrDecimal64
`json:"currentTimestamp" gencodec:"required"`
Timestamp
math
.
HexOrDecimal64
`json:"currentTimestamp"
gencodec:"required"`
BlockHashes
map
[
math
.
HexOrDecimal64
]
common
.
Hash
`json:"blockHashes,omitempty"`
BlockHashes
map
[
math
.
HexOrDecimal64
]
common
.
Hash
`json:"blockHashes,omitempty"`
Ommers
[]
ommer
`json:"ommers,omitempty"`
Ommers
[]
ommer
`json:"ommers,omitempty"`
BaseFee
*
math
.
HexOrDecimal256
`json:"currentBaseFee,omitempty"`
BaseFee
*
math
.
HexOrDecimal256
`json:"currentBaseFee,omitempty"`
...
@@ -40,11 +40,11 @@ func (s stEnv) MarshalJSON() ([]byte, error) {
...
@@ -40,11 +40,11 @@ func (s stEnv) MarshalJSON() ([]byte, error) {
// UnmarshalJSON unmarshals from JSON.
// UnmarshalJSON unmarshals from JSON.
func
(
s
*
stEnv
)
UnmarshalJSON
(
input
[]
byte
)
error
{
func
(
s
*
stEnv
)
UnmarshalJSON
(
input
[]
byte
)
error
{
type
stEnv
struct
{
type
stEnv
struct
{
Coinbase
*
common
.
UnprefixedAddress
`json:"currentCoinbase" gencodec:"required"`
Coinbase
*
common
.
UnprefixedAddress
`json:"currentCoinbase"
gencodec:"required"`
Difficulty
*
math
.
HexOrDecimal256
`json:"currentDifficulty" gencodec:"required"`
Difficulty
*
math
.
HexOrDecimal256
`json:"currentDifficulty" gencodec:"required"`
GasLimit
*
math
.
HexOrDecimal64
`json:"currentGasLimit" gencodec:"required"`
GasLimit
*
math
.
HexOrDecimal64
`json:"currentGasLimit"
gencodec:"required"`
Number
*
math
.
HexOrDecimal64
`json:"currentNumber" gencodec:"required"`
Number
*
math
.
HexOrDecimal64
`json:"currentNumber"
gencodec:"required"`
Timestamp
*
math
.
HexOrDecimal64
`json:"currentTimestamp" gencodec:"required"`
Timestamp
*
math
.
HexOrDecimal64
`json:"currentTimestamp"
gencodec:"required"`
BlockHashes
map
[
math
.
HexOrDecimal64
]
common
.
Hash
`json:"blockHashes,omitempty"`
BlockHashes
map
[
math
.
HexOrDecimal64
]
common
.
Hash
`json:"blockHashes,omitempty"`
Ommers
[]
ommer
`json:"ommers,omitempty"`
Ommers
[]
ommer
`json:"ommers,omitempty"`
BaseFee
*
math
.
HexOrDecimal256
`json:"currentBaseFee,omitempty"`
BaseFee
*
math
.
HexOrDecimal256
`json:"currentBaseFee,omitempty"`
...
...
eth/ethconfig/gen_config.go
浏览文件 @
3b053185
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
package
ethconfig
package
ethconfig
import
(
import
(
"math/big"
"time"
"time"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common"
...
@@ -55,10 +56,11 @@ func (c Config) MarshalTOML() (interface{}, error) {
...
@@ -55,10 +56,11 @@ func (c Config) MarshalTOML() (interface{}, error) {
DocRoot
string
`toml:"-"`
DocRoot
string
`toml:"-"`
EWASMInterpreter
string
EWASMInterpreter
string
EVMInterpreter
string
EVMInterpreter
string
RPCGasCap
uint64
`toml:",omitempty"`
RPCGasCap
uint64
RPCTxFeeCap
float64
`toml:",omitempty"`
RPCTxFeeCap
float64
Checkpoint
*
params
.
TrustedCheckpoint
`toml:",omitempty"`
Checkpoint
*
params
.
TrustedCheckpoint
`toml:",omitempty"`
CheckpointOracle
*
params
.
CheckpointOracleConfig
`toml:",omitempty"`
CheckpointOracle
*
params
.
CheckpointOracleConfig
`toml:",omitempty"`
OverrideLondon
*
big
.
Int
`toml:",omitempty"`
}
}
var
enc
Config
var
enc
Config
enc
.
Genesis
=
c
.
Genesis
enc
.
Genesis
=
c
.
Genesis
...
@@ -103,6 +105,7 @@ func (c Config) MarshalTOML() (interface{}, error) {
...
@@ -103,6 +105,7 @@ func (c Config) MarshalTOML() (interface{}, error) {
enc
.
RPCTxFeeCap
=
c
.
RPCTxFeeCap
enc
.
RPCTxFeeCap
=
c
.
RPCTxFeeCap
enc
.
Checkpoint
=
c
.
Checkpoint
enc
.
Checkpoint
=
c
.
Checkpoint
enc
.
CheckpointOracle
=
c
.
CheckpointOracle
enc
.
CheckpointOracle
=
c
.
CheckpointOracle
enc
.
OverrideLondon
=
c
.
OverrideLondon
return
&
enc
,
nil
return
&
enc
,
nil
}
}
...
@@ -147,10 +150,11 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error {
...
@@ -147,10 +150,11 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error {
DocRoot
*
string
`toml:"-"`
DocRoot
*
string
`toml:"-"`
EWASMInterpreter
*
string
EWASMInterpreter
*
string
EVMInterpreter
*
string
EVMInterpreter
*
string
RPCGasCap
*
uint64
`toml:",omitempty"`
RPCGasCap
*
uint64
RPCTxFeeCap
*
float64
`toml:",omitempty"`
RPCTxFeeCap
*
float64
Checkpoint
*
params
.
TrustedCheckpoint
`toml:",omitempty"`
Checkpoint
*
params
.
TrustedCheckpoint
`toml:",omitempty"`
CheckpointOracle
*
params
.
CheckpointOracleConfig
`toml:",omitempty"`
CheckpointOracle
*
params
.
CheckpointOracleConfig
`toml:",omitempty"`
OverrideLondon
*
big
.
Int
`toml:",omitempty"`
}
}
var
dec
Config
var
dec
Config
if
err
:=
unmarshal
(
&
dec
);
err
!=
nil
{
if
err
:=
unmarshal
(
&
dec
);
err
!=
nil
{
...
@@ -282,5 +286,8 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error {
...
@@ -282,5 +286,8 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error {
if
dec
.
CheckpointOracle
!=
nil
{
if
dec
.
CheckpointOracle
!=
nil
{
c
.
CheckpointOracle
=
dec
.
CheckpointOracle
c
.
CheckpointOracle
=
dec
.
CheckpointOracle
}
}
if
dec
.
OverrideLondon
!=
nil
{
c
.
OverrideLondon
=
dec
.
OverrideLondon
}
return
nil
return
nil
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录