forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-11 06:23:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Reverted changes to geth init

Browse source
This commit is contained in:
Matthieu Vachon 2023-08-23 12:00:55 -04:00
parent 1f947081a2
commit a2e2df461f
2 changed files with 2 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
core/genesis.go
View file

@ -167,21 +167,11 @@ func (ga *GenesisAlloc) flush(db ethdb.Database, triedb *trie.Database, blockhas
return err return err
} }
} }
// Marshal the genesis state specification and persist.
if err := writeGenesisStateSpec(db, blockhash, *ga); err != nil { blob, err := json.Marshal(ga)
return err
}
return nil
}
// writeGenesisStateSpec marshals the genesis state specification and persist to database.
func writeGenesisStateSpec(db ethdb.Database, blockhash common.Hash, alloc GenesisAlloc) error {
blob, err := json.Marshal(alloc)
if err != nil { if err != nil {
return err return err
} }
rawdb.WriteGenesisStateSpec(db, blockhash, blob) rawdb.WriteGenesisStateSpec(db, blockhash, blob)
return nil return nil
} }
@ -405,19 +395,10 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, triedb *trie.Database, gen
if compatErr != nil && ((head.Number.Uint64() != 0 && compatErr.RewindToBlock != 0) || (head.Time != 0 && compatErr.RewindToTime != 0)) { if compatErr != nil && ((head.Number.Uint64() != 0 && compatErr.RewindToBlock != 0) || (head.Time != 0 && compatErr.RewindToTime != 0)) {
return newcfg, stored, compatErr return newcfg, stored, compatErr
} }
// Don't overwrite if the old is identical to the new // Don't overwrite if the old is identical to the new
if newData, _ := json.Marshal(newcfg); !bytes.Equal(storedData, newData) { if newData, _ := json.Marshal(newcfg); !bytes.Equal(storedData, newData) {
rawdb.WriteChainConfig(db, stored, newcfg) rawdb.WriteChainConfig(db, stored, newcfg)
} }
// We only write genesis alloc if the `genesis` is non-nil, which happen on blockchain boot and custom network.
if genesis != nil && !rawdb.HasGenesisStateSpec(db, stored) {
if err := writeGenesisStateSpec(db, stored, genesis.Alloc); err != nil {
return newcfg, stored, fmt.Errorf("write genesis state spec: %w", err)
}
}
return newcfg, stored, nil return newcfg, stored, nil
} }
@ -549,7 +530,6 @@ func (g *Genesis) Commit(db ethdb.Database, triedb *trie.Database, bcLogger Bloc
if err := g.Alloc.flush(db, triedb, block.Hash(), bcLogger); err != nil { if err := g.Alloc.flush(db, triedb, block.Hash(), bcLogger); err != nil {
return nil, err return nil, err
} }
rawdb.WriteTd(db, block.Hash(), block.NumberU64(), block.Difficulty()) rawdb.WriteTd(db, block.Hash(), block.NumberU64(), block.Difficulty())
rawdb.WriteBlock(db, block) rawdb.WriteBlock(db, block)
rawdb.WriteReceipts(db, block.Hash(), block.NumberU64(), nil) rawdb.WriteReceipts(db, block.Hash(), block.NumberU64(), nil)

6
core/rawdb/accessors_metadata.go
View file

@ -81,12 +81,6 @@ func WriteChainConfig(db ethdb.KeyValueWriter, hash common.Hash, cfg *params.Cha
} }
} }
// HasGenesisStateSpec determines if the genesis state specification based on the
// given genesis (block-)hash exists in the database
func HasGenesisStateSpec(db ethdb.KeyValueReader, blockhash common.Hash) bool {
return len(ReadGenesisStateSpec(db, blockhash)) > 0
}
// ReadGenesisStateSpec retrieves the genesis state specification based on the // ReadGenesisStateSpec retrieves the genesis state specification based on the
// given genesis (block-)hash. // given genesis (block-)hash.
func ReadGenesisStateSpec(db ethdb.KeyValueReader, blockhash common.Hash) []byte { func ReadGenesisStateSpec(db ethdb.KeyValueReader, blockhash common.Hash) []byte {