forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-21 20:26:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

removed unnecessary changes

Browse source
This commit is contained in:
Felix H 2026-01-20 09:57:11 +00:00
parent def5237da5
commit f2ef135774
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/gen_genesis.go
View file

@ -35,7 +35,7 @@ func (g Genesis) MarshalJSON() ([]byte, error) {
ExcessBlobGas *math.HexOrDecimal64 `json:"excessBlobGas"` ExcessBlobGas *math.HexOrDecimal64 `json:"excessBlobGas"`
BlobGasUsed *math.HexOrDecimal64 `json:"blobGasUsed"` BlobGasUsed *math.HexOrDecimal64 `json:"blobGasUsed"`
BlockAccessListHash *common.Hash `json:"blockAccessListHash,omitempty"` BlockAccessListHash *common.Hash `json:"blockAccessListHash,omitempty"`
SlotNumber *math.HexOrDecimal64 `json:"slotNumber"` SlotNumber *uint64 `json:"slotNumber"`
} }
var enc Genesis var enc Genesis
enc.Config = g.Config enc.Config = g.Config
@ -59,7 +59,7 @@ func (g Genesis) MarshalJSON() ([]byte, error) {
enc.ExcessBlobGas = (*math.HexOrDecimal64)(g.ExcessBlobGas) enc.ExcessBlobGas = (*math.HexOrDecimal64)(g.ExcessBlobGas)
enc.BlobGasUsed = (*math.HexOrDecimal64)(g.BlobGasUsed) enc.BlobGasUsed = (*math.HexOrDecimal64)(g.BlobGasUsed)
enc.BlockAccessListHash = g.BlockAccessListHash enc.BlockAccessListHash = g.BlockAccessListHash
enc.SlotNumber = (*math.HexOrDecimal64)(g.SlotNumber) enc.SlotNumber = g.SlotNumber
return json.Marshal(&enc) return json.Marshal(&enc)
} }
@ -82,7 +82,7 @@ func (g *Genesis) UnmarshalJSON(input []byte) error {
ExcessBlobGas *math.HexOrDecimal64 `json:"excessBlobGas"` ExcessBlobGas *math.HexOrDecimal64 `json:"excessBlobGas"`
BlobGasUsed *math.HexOrDecimal64 `json:"blobGasUsed"` BlobGasUsed *math.HexOrDecimal64 `json:"blobGasUsed"`
BlockAccessListHash *common.Hash `json:"blockAccessListHash,omitempty"` BlockAccessListHash *common.Hash `json:"blockAccessListHash,omitempty"`
SlotNumber *math.HexOrDecimal64 `json:"slotNumber"` SlotNumber *uint64 `json:"slotNumber"`
} }
var dec Genesis var dec Genesis
if err := json.Unmarshal(input, &dec); err != nil { if err := json.Unmarshal(input, &dec); err != nil {
@ -143,7 +143,7 @@ func (g *Genesis) UnmarshalJSON(input []byte) error {
g.BlockAccessListHash = dec.BlockAccessListHash g.BlockAccessListHash = dec.BlockAccessListHash
} }
if dec.SlotNumber != nil { if dec.SlotNumber != nil {
g.SlotNumber = (*uint64)(dec.SlotNumber) g.SlotNumber = dec.SlotNumber
} }
return nil return nil
} }

1
core/genesis.go
View file

@ -264,7 +264,6 @@ type genesisSpecMarshaling struct {
BaseFee *math.HexOrDecimal256 BaseFee *math.HexOrDecimal256
ExcessBlobGas *math.HexOrDecimal64 ExcessBlobGas *math.HexOrDecimal64
BlobGasUsed *math.HexOrDecimal64 BlobGasUsed *math.HexOrDecimal64
SlotNumber *math.HexOrDecimal64
} }
// GenesisMismatchError is raised when trying to overwrite an existing // GenesisMismatchError is raised when trying to overwrite an existing