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

neacon/config: fix LoadForks with non-string values

Browse source
This commit is contained in:
Klimov Sergei 2025-09-15 00:23:54 +08:00 committed by GitHub
parent 41f580f209
commit 090cf7ccec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
beacon/params/config.go
View file

@ -95,7 +95,7 @@ func (c *ChainConfig) LoadForks(path string) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to read beacon chain config file: %v", err) return fmt.Errorf("failed to read beacon chain config file: %v", err)
} }
config := make(map[string]string) config := make(map[string]any)
if err := yaml.Unmarshal(file, &config); err != nil { if err := yaml.Unmarshal(file, &config); err != nil {
return fmt.Errorf("failed to parse beacon chain config file: %v", err) return fmt.Errorf("failed to parse beacon chain config file: %v", err)
} }
@ -108,18 +108,18 @@ func (c *ChainConfig) LoadForks(path string) error {
for key, value := range config { for key, value := range config {
if strings.HasSuffix(key, "_FORK_VERSION") { if strings.HasSuffix(key, "_FORK_VERSION") {
name := key[:len(key)-len("_FORK_VERSION")] name := key[:len(key)-len("_FORK_VERSION")]
if v, err := hexutil.Decode(value); err == nil { if v, err := hexutil.Decode(fmt.Sprintf("0x%x", value)); err == nil {
versions[name] = v versions[name] = v
} else { } else {
return fmt.Errorf("failed to decode hex fork id %q in beacon chain config file: %v", value, err) return fmt.Errorf("failed to decode hex fork id %v in beacon chain config file: %v", value, err)
} }
} }
if strings.HasSuffix(key, "_FORK_EPOCH") { if strings.HasSuffix(key, "_FORK_EPOCH") {
name := key[:len(key)-len("_FORK_EPOCH")] name := key[:len(key)-len("_FORK_EPOCH")]
if v, err := strconv.ParseUint(value, 10, 64); err == nil { if v, err := hexutil.DecodeUint64(fmt.Sprintf("0x%x", value)); err == nil {
epochs[name] = v epochs[name] = v
} else { } else {
return fmt.Errorf("failed to parse epoch number %q in beacon chain config file: %v", value, err) return fmt.Errorf("failed to parse epoch number %v in beacon chain config file: %v", value, err)
} }
} }
} }