From 8a4460c47edc4b01c9b713e3d5b439c07116b962 Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Mon, 14 Jun 2021 14:04:44 +0200
Subject: [PATCH] core: change baseFee into baseFeePerGas in genesis json
---
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 f5a3f5b4b..4e0844e88 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 f478df423..cf421ca25 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -62,7 +62,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.
--
GitLab