forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-17 02:10:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

params: log chain config a bit saner (#24904)

Browse source
This commit is contained in:
Daniel Liu 2025-02-05 11:42:49 +08:00
parent ec0e07b100
commit bb8324357c
3 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
eth/backend.go
View file

@ -22,6 +22,7 @@ import (
"fmt" "fmt"
"math/big" "math/big"
"runtime" "runtime"
"strings"
"sync" "sync"
"sync/atomic" "sync/atomic"
@ -128,7 +129,11 @@ func New(ctx *node.ServiceContext, config *ethconfig.Config, XDCXServ *XDCx.XDCX
return nil, genesisErr return nil, genesisErr
} }
log.Info("Initialised chain configuration", "config", chainConfig) log.Info(strings.Repeat("-", 153))
for _, line := range strings.Split(chainConfig.Description(), "\n") {
log.Info(line)
}
log.Info(strings.Repeat("-", 153))
eth := &Ethereum{ eth := &Ethereum{
config: config, config: config,

7
les/backend.go
View file

@ -19,6 +19,7 @@ package les
import ( import (
"errors" "errors"
"strings"
"sync" "sync"
"time" "time"
@ -90,7 +91,11 @@ func New(ctx *node.ServiceContext, config *ethconfig.Config) (*LightEthereum, er
if _, isCompat := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !isCompat { if _, isCompat := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !isCompat {
return nil, genesisErr return nil, genesisErr
} }
log.Info("Initialised chain configuration", "config", chainConfig) log.Info(strings.Repeat("-", 153))
for _, line := range strings.Split(chainConfig.Description(), "\n") {
log.Info(line)
}
log.Info(strings.Repeat("-", 153))
peers := newPeerSet() peers := newPeerSet()
quitSync := make(chan struct{}) quitSync := make(chan struct{})

43
params/config.go
View file

@ -536,8 +536,8 @@ func (v *V2) ConfigIndex() []uint64 {
return v.configIndex return v.configIndex
} }
// String implements the fmt.Stringer interface. // Description returns a human-readable description of ChainConfig.
func (c *ChainConfig) String() string { func (c *ChainConfig) Description() string {
var engine interface{} var engine interface{}
switch { switch {
case c.Ethash != nil: case c.Ethash != nil:
@ -571,25 +571,26 @@ func (c *ChainConfig) String() string {
if c.CancunBlock != nil { if c.CancunBlock != nil {
cancunBlock = c.CancunBlock cancunBlock = c.CancunBlock
} }
return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v Istanbul: %v BerlinBlock: %v LondonBlock: %v MergeBlock: %v ShanghaiBlock: %v Eip1559Block: %v CancunBlock: %v Engine: %v}",
c.ChainId, var banner = "Chain configuration:\n"
c.HomesteadBlock, banner += fmt.Sprintf(" - ChainID: %-8v\n", c.ChainId)
c.DAOForkBlock, banner += fmt.Sprintf(" - Homestead: %-8v\n", c.HomesteadBlock)
c.DAOForkSupport, banner += fmt.Sprintf(" - DAO Fork: %-8v\n", c.DAOForkBlock)
c.EIP150Block, banner += fmt.Sprintf(" - DAO Support: %-8v\n", c.DAOForkSupport)
c.EIP155Block, banner += fmt.Sprintf(" - Tangerine Whistle (EIP 150): %-8v\n", c.EIP150Block)
c.EIP158Block, banner += fmt.Sprintf(" - Spurious Dragon (EIP 155): %-8v\n", c.EIP155Block)
c.ByzantiumBlock, banner += fmt.Sprintf(" - Byzantium: %-8v\n", c.ByzantiumBlock)
c.ConstantinopleBlock, banner += fmt.Sprintf(" - Constantinople: %-8v\n", c.ConstantinopleBlock)
common.TIPXDCXCancellationFee, banner += fmt.Sprintf(" - Petersburg: %-8v\n", c.PetersburgBlock)
berlinBlock, banner += fmt.Sprintf(" - Istanbul: %-8v\n", c.IstanbulBlock)
londonBlock, banner += fmt.Sprintf(" - Berlin: %-8v\n", berlinBlock)
mergeBlock, banner += fmt.Sprintf(" - London: %-8v\n", londonBlock)
shanghaiBlock, banner += fmt.Sprintf(" - Merge: %-8v\n", mergeBlock)
eip1559Block, banner += fmt.Sprintf(" - Shanghai: %-8v\n", shanghaiBlock)
cancunBlock, banner += fmt.Sprintf(" - Eip1559: %-8v\n", eip1559Block)
engine, banner += fmt.Sprintf(" - Cancun: %-8v\n", cancunBlock)
) banner += fmt.Sprintf(" - Engine: %v", engine)
return banner
} }
// IsHomestead returns whether num is either equal to the homestead block or greater. // IsHomestead returns whether num is either equal to the homestead block or greater.