Skip to content

Commit

Permalink
Merge pull request ethereum#23013 from holiman/genesis_fix
Browse files Browse the repository at this point in the history
core: make genesis parse baseFee correctly
  • Loading branch information
karalabe authored Jun 14, 2021
2 parents eff998e + f763846 commit ccf53da
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
8 changes: 4 additions & 4 deletions core/gen_genesis.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions core/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ type genesisSpecMarshaling struct {
GasUsed math.HexOrDecimal64
Number math.HexOrDecimal64
Difficulty *math.HexOrDecimal256
BaseFee *math.HexOrDecimal256
Alloc map[common.UnprefixedAddress]GenesisAccount
}

Expand Down

0 comments on commit ccf53da

Please sign in to comment.