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

Adding standard Geth logging on NewFirehose and on OnBlockchainInit

Browse source
This commit is contained in:
Matthieu Vachon 2024-04-29 10:41:21 -04:00
parent bb041978a7
commit 8d802608f5
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
eth/tracers/firehose.go
View file

@ -27,6 +27,7 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
pbeth "github.com/ethereum/go-ethereum/pb/sf/ethereum/type/v2" pbeth "github.com/ethereum/go-ethereum/pb/sf/ethereum/type/v2"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
@ -60,8 +61,6 @@ func init() {
} }
func newFirehoseTracer(cfg json.RawMessage) (*tracing.Hooks, error) { func newFirehoseTracer(cfg json.RawMessage) (*tracing.Hooks, error) {
firehoseInfo("new firehose tracer")
var config FirehoseConfig var config FirehoseConfig
if len([]byte(cfg)) > 0 { if len([]byte(cfg)) > 0 {
if err := json.Unmarshal(cfg, &config); err != nil { if err := json.Unmarshal(cfg, &config); err != nil {
@ -111,6 +110,18 @@ type FirehoseConfig struct {
ApplyBackwardCompatibility *bool `json:"applyBackwardCompatibility"` ApplyBackwardCompatibility *bool `json:"applyBackwardCompatibility"`
} }
// LogKeValues returns a list of key-values to be logged when the config is printed.
func (c *FirehoseConfig) LogKeyValues() []any {
applyBackwardCompatibility := "<unspecified>"
if c.ApplyBackwardCompatibility != nil {
applyBackwardCompatibility = strconv.FormatBool(*c.ApplyBackwardCompatibility)
}
return []any{
"config.applyBackwardCompatibility", applyBackwardCompatibility,
}
}
type Firehose struct { type Firehose struct {
// Global state // Global state
outputBuffer *bytes.Buffer outputBuffer *bytes.Buffer
@ -157,6 +168,8 @@ type Firehose struct {
const FirehoseProtocolVersion = "3.0" const FirehoseProtocolVersion = "3.0"
func NewFirehose(config *FirehoseConfig) *Firehose { func NewFirehose(config *FirehoseConfig) *Firehose {
log.Info("Firehose tracer created", config.LogKeyValues()...)
return &Firehose{ return &Firehose{
// Global state // Global state
outputBuffer: bytes.NewBuffer(make([]byte, 0, 100*1024*1024)), outputBuffer: bytes.NewBuffer(make([]byte, 0, 100*1024*1024)),
@ -249,6 +262,8 @@ func (f *Firehose) OnBlockchainInit(chainConfig *params.ChainConfig) {
if f.applyBackwardCompatibility == nil { if f.applyBackwardCompatibility == nil {
f.applyBackwardCompatibility = ptr(chainNeedsLegacyBackwardCompatibility(chainConfig.ChainID)) f.applyBackwardCompatibility = ptr(chainNeedsLegacyBackwardCompatibility(chainConfig.ChainID))
} }
log.Info("Firehose tracer initialized", "chain_id", chainConfig.ChainID, "apply_backward_compatibility", *f.applyBackwardCompatibility, "protocol_version", FirehoseProtocolVersion)
} }
var mainnetChainID = big.NewInt(1) var mainnetChainID = big.NewInt(1)