From 3a64eb9626bd02c59bbb6e9fd2950b3db547b98d Mon Sep 17 00:00:00 2001 From: Daniel Liu Date: Fri, 24 May 2024 22:25:10 +0800 Subject: [PATCH] core: change baseFee into baseFeePerGas in genesis json (#23039) --- core/gen_genesis.go | 4 ++-- core/genesis.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/gen_genesis.go b/core/gen_genesis.go index 21297313c811..27dcb1f7cc13 100644 --- a/core/gen_genesis.go +++ b/core/gen_genesis.go @@ -30,7 +30,7 @@ func (g Genesis) MarshalJSON() ([]byte, error) { Number math.HexOrDecimal64 `json:"number"` GasUsed math.HexOrDecimal64 `json:"gasUsed"` ParentHash common.Hash `json:"parentHash"` - BaseFee *math.HexOrDecimal256 `json:"baseFee"` + BaseFee *math.HexOrDecimal256 `json:"baseFeePerGas"` } var enc Genesis enc.Config = g.Config @@ -69,7 +69,7 @@ func (g *Genesis) UnmarshalJSON(input []byte) error { Number *math.HexOrDecimal64 `json:"number"` GasUsed *math.HexOrDecimal64 `json:"gasUsed"` ParentHash *common.Hash `json:"parentHash"` - BaseFee *math.HexOrDecimal256 `json:"baseFee"` + BaseFee *math.HexOrDecimal256 `json:"baseFeePerGas"` } var dec Genesis if err := json.Unmarshal(input, &dec); err != nil { diff --git a/core/genesis.go b/core/genesis.go index a9cc02c1799a..ca397ccbf6c5 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -61,7 +61,7 @@ type Genesis struct { Number uint64 `json:"number"` GasUsed uint64 `json:"gasUsed"` ParentHash common.Hash `json:"parentHash"` - BaseFee *big.Int `json:"baseFee"` + BaseFee *big.Int `json:"baseFeePerGas"` } // GenesisAlloc specifies the initial state that is part of the genesis block.