|
|
@ -30,7 +30,7 @@ func (g Genesis) MarshalJSON() ([]byte, error) { |
|
|
|
Number math.HexOrDecimal64 `json:"number"` |
|
|
|
Number math.HexOrDecimal64 `json:"number"` |
|
|
|
GasUsed math.HexOrDecimal64 `json:"gasUsed"` |
|
|
|
GasUsed math.HexOrDecimal64 `json:"gasUsed"` |
|
|
|
ParentHash common.Hash `json:"parentHash"` |
|
|
|
ParentHash common.Hash `json:"parentHash"` |
|
|
|
BaseFee *math.HexOrDecimal256 `json:"baseFee"` |
|
|
|
BaseFee *math.HexOrDecimal256 `json:"baseFeePerGas"` |
|
|
|
} |
|
|
|
} |
|
|
|
var enc Genesis |
|
|
|
var enc Genesis |
|
|
|
enc.Config = g.Config |
|
|
|
enc.Config = g.Config |
|
|
@ -69,7 +69,7 @@ func (g *Genesis) UnmarshalJSON(input []byte) error { |
|
|
|
Number *math.HexOrDecimal64 `json:"number"` |
|
|
|
Number *math.HexOrDecimal64 `json:"number"` |
|
|
|
GasUsed *math.HexOrDecimal64 `json:"gasUsed"` |
|
|
|
GasUsed *math.HexOrDecimal64 `json:"gasUsed"` |
|
|
|
ParentHash *common.Hash `json:"parentHash"` |
|
|
|
ParentHash *common.Hash `json:"parentHash"` |
|
|
|
BaseFee *math.HexOrDecimal256 `json:"baseFee"` |
|
|
|
BaseFee *math.HexOrDecimal256 `json:"baseFeePerGas"` |
|
|
|
} |
|
|
|
} |
|
|
|
var dec Genesis |
|
|
|
var dec Genesis |
|
|
|
if err := json.Unmarshal(input, &dec); err != nil { |
|
|
|
if err := json.Unmarshal(input, &dec); err != nil { |
|
|
|