From 28a07729126e7bd40e307485cbf25091c05b7731 Mon Sep 17 00:00:00 2001 From: krish Date: Wed, 17 Apr 2024 22:51:12 +0800 Subject: [PATCH] chore: fix log errors --- op-node/client/polling.go | 2 +- op-node/client/rpc.go | 3 +- op-node/cmd/main.go | 2 +- op-node/eth/heads.go | 3 +- op-node/heartbeat/service.go | 2 +- {logutil => op-node/logutil}/log/CONTRIBUTORS | 0 {logutil => op-node/logutil}/log/LICENSE | 0 {logutil => op-node/logutil}/log/README.md | 0 .../logutil}/log/README_ETHEREUM.md | 0 {logutil => op-node/logutil}/log/doc.go | 0 {logutil => op-node/logutil}/log/format.go | 0 .../logutil}/log/format_test.go | 0 {logutil => op-node/logutil}/log/handler.go | 0 .../logutil}/log/handler_glog.go | 0 .../logutil}/log/handler_go13.go | 0 .../logutil}/log/handler_go14.go | 0 {logutil => op-node/logutil}/log/logger.go | 0 {logutil => op-node/logutil}/log/root.go | 0 {logutil => op-node/logutil}/log/syslog.go | 0 op-node/node/api.go | 3 +- op-node/node/client.go | 3 +- op-node/node/node.go | 15 ++++---- op-node/node/runtime_config.go | 3 +- op-node/node/server.go | 3 +- op-node/p2p/config.go | 3 +- op-node/p2p/discovery.go | 3 +- op-node/p2p/gossip.go | 3 +- op-node/p2p/host.go | 2 +- op-node/p2p/node.go | 3 +- op-node/p2p/notifications.go | 3 +- op-node/p2p/peer_gater.go | 3 +- op-node/p2p/peer_scorer.go | 2 +- op-node/p2p/peer_scores.go | 4 +-- op-node/p2p/prepared.go | 7 ++-- op-node/p2p/rpc_server.go | 3 +- op-node/rollup/derive/attributes_queue.go | 3 +- op-node/rollup/derive/batch_queue.go | 3 +- op-node/rollup/derive/batches.go | 3 +- op-node/rollup/derive/calldata_source.go | 15 ++++---- op-node/rollup/derive/channel_bank.go | 3 +- op-node/rollup/derive/channel_in_reader.go | 3 +- op-node/rollup/derive/engine_consolidate.go | 3 +- op-node/rollup/derive/engine_queue.go | 3 +- op-node/rollup/derive/engine_update.go | 3 +- op-node/rollup/derive/frame_queue.go | 3 +- op-node/rollup/derive/l1_retrieval.go | 3 +- op-node/rollup/derive/l1_traversal.go | 3 +- op-node/rollup/derive/pipeline.go | 3 +- op-node/rollup/driver/driver.go | 3 +- op-node/rollup/driver/l1_state.go | 3 +- op-node/rollup/driver/metered_engine.go | 3 +- op-node/rollup/driver/origin_selector.go | 2 +- op-node/rollup/driver/sequencer.go | 3 +- op-node/rollup/driver/state.go | 3 +- op-node/rollup/sync/start.go | 3 +- op-node/rollup/types.go | 3 +- op-node/service.go | 16 ++++----- op-node/sources/engine_client.go | 2 +- op-node/sources/eth_client.go | 2 +- op-node/sources/l1_client.go | 3 +- op-node/sources/l2_client.go | 2 +- op-node/sources/sync_client.go | 3 +- op-service/log/cli.go | 35 +++++++++---------- op-service/log/defaults.go | 10 +++--- 64 files changed, 93 insertions(+), 129 deletions(-) rename {logutil => op-node/logutil}/log/CONTRIBUTORS (100%) rename {logutil => op-node/logutil}/log/LICENSE (100%) rename {logutil => op-node/logutil}/log/README.md (100%) rename {logutil => op-node/logutil}/log/README_ETHEREUM.md (100%) rename {logutil => op-node/logutil}/log/doc.go (100%) rename {logutil => op-node/logutil}/log/format.go (100%) rename {logutil => op-node/logutil}/log/format_test.go (100%) rename {logutil => op-node/logutil}/log/handler.go (100%) rename {logutil => op-node/logutil}/log/handler_glog.go (100%) rename {logutil => op-node/logutil}/log/handler_go13.go (100%) rename {logutil => op-node/logutil}/log/handler_go14.go (100%) rename {logutil => op-node/logutil}/log/logger.go (100%) rename {logutil => op-node/logutil}/log/root.go (100%) rename {logutil => op-node/logutil}/log/syslog.go (100%) diff --git a/op-node/client/polling.go b/op-node/client/polling.go index d3b531480a50..c01aa445deff 100644 --- a/op-node/client/polling.go +++ b/op-node/client/polling.go @@ -11,7 +11,7 @@ import ( "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum-optimism/optimism/logutil/log" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" ) var ErrSubscriberClosed = errors.New("subscriber closed") diff --git a/op-node/client/rpc.go b/op-node/client/rpc.go index 0b5ad070dcb5..c764876bb16d 100644 --- a/op-node/client/rpc.go +++ b/op-node/client/rpc.go @@ -9,8 +9,7 @@ import ( "github.com/ethereum/go-ethereum" "github.com/prometheus/client_golang/prometheus" - "github.com/ethereum-optimism/optimism/logutil/log" - + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-service/backoff" "github.com/ethereum/go-ethereum/rpc" diff --git a/op-node/cmd/main.go b/op-node/cmd/main.go index 03263eeb4027..da4dbe8ee3f7 100644 --- a/op-node/cmd/main.go +++ b/op-node/cmd/main.go @@ -8,9 +8,9 @@ import ( "strconv" "syscall" - "github.com/ethereum-optimism/optimism/logutil/log" "github.com/ethereum-optimism/optimism/op-node/chaincfg" "github.com/ethereum-optimism/optimism/op-node/cmd/doc" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/urfave/cli" diff --git a/op-node/eth/heads.go b/op-node/eth/heads.go index 4759197bda67..94e0b983c78e 100644 --- a/op-node/eth/heads.go +++ b/op-node/eth/heads.go @@ -8,8 +8,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/event" - "github.com/ethereum-optimism/optimism/logutil/log" - + "github.com/ethereum-optimism/optimism/op-node/logutil/log" opservice "github.com/ethereum-optimism/optimism/op-service" ) diff --git a/op-node/heartbeat/service.go b/op-node/heartbeat/service.go index 85efc19dbb49..9fc4a7df4138 100644 --- a/op-node/heartbeat/service.go +++ b/op-node/heartbeat/service.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - "github.com/ethereum-optimism/optimism/logutil/log" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" ) // SendInterval determines the delay between requests. This must be larger than the MinHeartbeatInterval in the server. diff --git a/logutil/log/CONTRIBUTORS b/op-node/logutil/log/CONTRIBUTORS similarity index 100% rename from logutil/log/CONTRIBUTORS rename to op-node/logutil/log/CONTRIBUTORS diff --git a/logutil/log/LICENSE b/op-node/logutil/log/LICENSE similarity index 100% rename from logutil/log/LICENSE rename to op-node/logutil/log/LICENSE diff --git a/logutil/log/README.md b/op-node/logutil/log/README.md similarity index 100% rename from logutil/log/README.md rename to op-node/logutil/log/README.md diff --git a/logutil/log/README_ETHEREUM.md b/op-node/logutil/log/README_ETHEREUM.md similarity index 100% rename from logutil/log/README_ETHEREUM.md rename to op-node/logutil/log/README_ETHEREUM.md diff --git a/logutil/log/doc.go b/op-node/logutil/log/doc.go similarity index 100% rename from logutil/log/doc.go rename to op-node/logutil/log/doc.go diff --git a/logutil/log/format.go b/op-node/logutil/log/format.go similarity index 100% rename from logutil/log/format.go rename to op-node/logutil/log/format.go diff --git a/logutil/log/format_test.go b/op-node/logutil/log/format_test.go similarity index 100% rename from logutil/log/format_test.go rename to op-node/logutil/log/format_test.go diff --git a/logutil/log/handler.go b/op-node/logutil/log/handler.go similarity index 100% rename from logutil/log/handler.go rename to op-node/logutil/log/handler.go diff --git a/logutil/log/handler_glog.go b/op-node/logutil/log/handler_glog.go similarity index 100% rename from logutil/log/handler_glog.go rename to op-node/logutil/log/handler_glog.go diff --git a/logutil/log/handler_go13.go b/op-node/logutil/log/handler_go13.go similarity index 100% rename from logutil/log/handler_go13.go rename to op-node/logutil/log/handler_go13.go diff --git a/logutil/log/handler_go14.go b/op-node/logutil/log/handler_go14.go similarity index 100% rename from logutil/log/handler_go14.go rename to op-node/logutil/log/handler_go14.go diff --git a/logutil/log/logger.go b/op-node/logutil/log/logger.go similarity index 100% rename from logutil/log/logger.go rename to op-node/logutil/log/logger.go diff --git a/logutil/log/root.go b/op-node/logutil/log/root.go similarity index 100% rename from logutil/log/root.go rename to op-node/logutil/log/root.go diff --git a/logutil/log/syslog.go b/op-node/logutil/log/syslog.go similarity index 100% rename from logutil/log/syslog.go rename to op-node/logutil/log/syslog.go diff --git a/op-node/node/api.go b/op-node/node/api.go index fe6b3517e800..61d333ea780e 100644 --- a/op-node/node/api.go +++ b/op-node/node/api.go @@ -8,11 +8,10 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-bindings/bindings" "github.com/ethereum-optimism/optimism/op-bindings/predeploys" "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/version" ) diff --git a/op-node/node/client.go b/op-node/node/client.go index 9a95564c59fd..b0630ac86b64 100644 --- a/op-node/node/client.go +++ b/op-node/node/client.go @@ -6,10 +6,9 @@ import ( "fmt" "github.com/ethereum-optimism/optimism/op-node/client" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/sources" - "github.com/ethereum-optimism/optimism/logutil/log" - gn "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/rpc" ) diff --git a/op-node/node/node.go b/op-node/node/node.go index 144968124704..62b13a51e6b4 100644 --- a/op-node/node/node.go +++ b/op-node/node/node.go @@ -12,10 +12,9 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/event" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/client" "github.com/ethereum-optimism/optimism/op-node/eth" + log2 "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/metrics" "github.com/ethereum-optimism/optimism/op-node/p2p" "github.com/ethereum-optimism/optimism/op-node/rollup/driver" @@ -23,7 +22,7 @@ import ( ) type OpNode struct { - log log.Logger + log log2.Logger appVersion string metrics *metrics.Metrics @@ -49,7 +48,7 @@ type OpNode struct { // The OpNode handles incoming gossip var _ p2p.GossipIn = (*OpNode)(nil) -func New(ctx context.Context, cfg *Config, log log.Logger, snapshotLog log.Logger, appVersion string, m *metrics.Metrics) (*OpNode, error) { +func New(ctx context.Context, cfg *Config, log log2.Logger, snapshotLog log2.Logger, appVersion string, m *metrics.Metrics) (*OpNode, error) { if err := cfg.Check(); err != nil { return nil, err } @@ -74,7 +73,7 @@ func New(ctx context.Context, cfg *Config, log log.Logger, snapshotLog log.Logge return n, nil } -func (n *OpNode) init(ctx context.Context, cfg *Config, snapshotLog log.Logger) error { +func (n *OpNode) init(ctx context.Context, cfg *Config, snapshotLog log2.Logger) error { if err := n.initTracer(ctx, cfg); err != nil { return err } @@ -180,7 +179,7 @@ func (n *OpNode) initRuntimeConfig(ctx context.Context, cfg *Config) error { return errors.New("failed to load runtime configuration repeatedly") } -func (n *OpNode) initL2(ctx context.Context, cfg *Config, snapshotLog log.Logger) error { +func (n *OpNode) initL2(ctx context.Context, cfg *Config, snapshotLog log2.Logger) error { rpcClient, err := cfg.L2.Setup(ctx, n.log) if err != nil { return fmt.Errorf("failed to setup L2 execution-engine RPC client: %w", err) @@ -202,7 +201,7 @@ func (n *OpNode) initL2(ctx context.Context, cfg *Config, snapshotLog log.Logger // If the L2 sync config is present, use it to create a sync client if cfg.L2Sync != nil { if err := cfg.L2Sync.Check(); err != nil { - log.Info("L2 sync config is not present, skipping L2 sync client setup", "err", err) + log2.Info("L2 sync config is not present, skipping L2 sync client setup", "err", err) } else { rpcSyncClient, err := cfg.L2Sync.Setup(ctx, n.log) if err != nil { @@ -252,7 +251,7 @@ func (n *OpNode) initMetricsServer(ctx context.Context, cfg *Config) error { n.log.Info("starting metrics server", "addr", cfg.Metrics.ListenAddr, "port", cfg.Metrics.ListenPort) go func() { if err := n.metrics.Serve(ctx, cfg.Metrics.ListenAddr, cfg.Metrics.ListenPort); err != nil { - log.Crit("error starting metrics server", "err", err) + log2.Crit("error starting metrics server", "err", err) } }() return nil diff --git a/op-node/node/runtime_config.go b/op-node/node/runtime_config.go index 8cb32ceaa335..2b04b4dd43f9 100644 --- a/op-node/node/runtime_config.go +++ b/op-node/node/runtime_config.go @@ -7,9 +7,8 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/p2p" "github.com/ethereum-optimism/optimism/op-node/rollup" ) diff --git a/op-node/node/server.go b/op-node/node/server.go index 0b450d4cfd66..310b47281935 100644 --- a/op-node/node/server.go +++ b/op-node/node/server.go @@ -10,9 +10,8 @@ import ( "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum-optimism/optimism/logutil/log" - ophttp "github.com/ethereum-optimism/optimism/op-node/http" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/metrics" "github.com/ethereum-optimism/optimism/op-node/p2p" diff --git a/op-node/p2p/config.go b/op-node/p2p/config.go index 4b7b2c648bf3..8647ec1bbf17 100644 --- a/op-node/p2p/config.go +++ b/op-node/p2p/config.go @@ -20,8 +20,7 @@ import ( "github.com/libp2p/go-libp2p/p2p/net/conngater" cmgr "github.com/libp2p/go-libp2p/p2p/net/connmgr" - userlog "github.com/ethereum-optimism/optimism/logutil/log" - + userlog "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" ) diff --git a/op-node/p2p/discovery.go b/op-node/p2p/discovery.go index 1e1aa3bd0d49..0112dc2e0568 100644 --- a/op-node/p2p/discovery.go +++ b/op-node/p2p/discovery.go @@ -23,11 +23,10 @@ import ( "github.com/ethereum/go-ethereum/p2p/enr" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/btcsuite/btcd/blockchain" "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" ) diff --git a/op-node/p2p/gossip.go b/op-node/p2p/gossip.go index 34d8100a3069..8232d05e9d5c 100644 --- a/op-node/p2p/gossip.go +++ b/op-node/p2p/gossip.go @@ -19,9 +19,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" ) diff --git a/op-node/p2p/host.go b/op-node/p2p/host.go index 71adcec0e43c..47236e0688b5 100644 --- a/op-node/p2p/host.go +++ b/op-node/p2p/host.go @@ -25,7 +25,7 @@ import ( ma "github.com/multiformats/go-multiaddr" madns "github.com/multiformats/go-multiaddr-dns" - "github.com/ethereum-optimism/optimism/logutil/log" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" ) type ExtraHostFeatures interface { diff --git a/op-node/p2p/node.go b/op-node/p2p/node.go index 436bb1ab5490..f311a2d05011 100644 --- a/op-node/p2p/node.go +++ b/op-node/p2p/node.go @@ -13,13 +13,12 @@ import ( p2pmetrics "github.com/libp2p/go-libp2p/core/metrics" ma "github.com/multiformats/go-multiaddr" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/metrics" "github.com/ethereum/go-ethereum/p2p/discover" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/rollup" ) diff --git a/op-node/p2p/notifications.go b/op-node/p2p/notifications.go index 297a5a58d653..4ba2468bfec1 100644 --- a/op-node/p2p/notifications.go +++ b/op-node/p2p/notifications.go @@ -4,9 +4,8 @@ import ( "github.com/libp2p/go-libp2p/core/network" ma "github.com/multiformats/go-multiaddr" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/metrics" - - "github.com/ethereum-optimism/optimism/logutil/log" ) type NotificationsMetricer interface { diff --git a/op-node/p2p/peer_gater.go b/op-node/p2p/peer_gater.go index d36b8ae278a5..446e933d89f3 100644 --- a/op-node/p2p/peer_gater.go +++ b/op-node/p2p/peer_gater.go @@ -1,9 +1,10 @@ package p2p import ( - log "github.com/ethereum-optimism/optimism/logutil/log" peer "github.com/libp2p/go-libp2p/core/peer" slices "golang.org/x/exp/slices" + + "github.com/ethereum-optimism/optimism/op-node/logutil/log" ) // ConnectionFactor is the factor by which we multiply the connection score. diff --git a/op-node/p2p/peer_scorer.go b/op-node/p2p/peer_scorer.go index 86558fc38a6b..2ed98b477e21 100644 --- a/op-node/p2p/peer_scorer.go +++ b/op-node/p2p/peer_scorer.go @@ -4,7 +4,7 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" peer "github.com/libp2p/go-libp2p/core/peer" - log "github.com/ethereum-optimism/optimism/logutil/log" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" ) type scorer struct { diff --git a/op-node/p2p/peer_scores.go b/op-node/p2p/peer_scores.go index 0a4feb65b253..e3003e043928 100644 --- a/op-node/p2p/peer_scores.go +++ b/op-node/p2p/peer_scores.go @@ -1,10 +1,10 @@ package p2p import ( - log "github.com/ethereum-optimism/optimism/logutil/log" - pubsub "github.com/libp2p/go-libp2p-pubsub" host "github.com/libp2p/go-libp2p/core/host" + + "github.com/ethereum-optimism/optimism/op-node/logutil/log" ) // ConfigurePeerScoring configures the peer scoring parameters for the pubsub diff --git a/op-node/p2p/prepared.go b/op-node/p2p/prepared.go index d3fab28d26a0..6decda319dfc 100644 --- a/op-node/p2p/prepared.go +++ b/op-node/p2p/prepared.go @@ -12,8 +12,7 @@ import ( "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enr" - userlog "github.com/ethereum-optimism/optimism/logutil/log" - + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" ) @@ -42,12 +41,12 @@ func (p *Prepared) Check() error { } // Host creates a libp2p host service. Returns nil, nil if p2p is disabled. -func (p *Prepared) Host(log userlog.Logger, reporter metrics.Reporter) (host.Host, error) { +func (p *Prepared) Host(log log.Logger, reporter metrics.Reporter) (host.Host, error) { return p.HostP2P, nil } // Discovery creates a disc-v5 service. Returns nil, nil, nil if discovery is disabled. -func (p *Prepared) Discovery(log userlog.Logger, rollupCfg *rollup.Config, tcpPort uint16) (*enode.LocalNode, *discover.UDPv5, error) { +func (p *Prepared) Discovery(log log.Logger, rollupCfg *rollup.Config, tcpPort uint16) (*enode.LocalNode, *discover.UDPv5, error) { if p.LocalNode != nil { dat := OpStackENRData{ chainID: rollupCfg.L2ChainID.Uint64(), diff --git a/op-node/p2p/rpc_server.go b/op-node/p2p/rpc_server.go index d9dc3dbf09da..60fd63f83903 100644 --- a/op-node/p2p/rpc_server.go +++ b/op-node/p2p/rpc_server.go @@ -21,8 +21,7 @@ import ( "github.com/ethereum/go-ethereum/p2p/discover" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum-optimism/optimism/logutil/log" - + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/metrics" ) diff --git a/op-node/rollup/derive/attributes_queue.go b/op-node/rollup/derive/attributes_queue.go index 8908493cf648..da742e0e7bbc 100644 --- a/op-node/rollup/derive/attributes_queue.go +++ b/op-node/rollup/derive/attributes_queue.go @@ -6,9 +6,8 @@ import ( "io" "time" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" ) diff --git a/op-node/rollup/derive/batch_queue.go b/op-node/rollup/derive/batch_queue.go index 0e9c918b9a34..1af15f0bf623 100644 --- a/op-node/rollup/derive/batch_queue.go +++ b/op-node/rollup/derive/batch_queue.go @@ -6,9 +6,8 @@ import ( "fmt" "io" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" ) diff --git a/op-node/rollup/derive/batches.go b/op-node/rollup/derive/batches.go index b21cb9598e04..1068c274d924 100644 --- a/op-node/rollup/derive/batches.go +++ b/op-node/rollup/derive/batches.go @@ -3,9 +3,8 @@ package derive import ( "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" ) diff --git a/op-node/rollup/derive/calldata_source.go b/op-node/rollup/derive/calldata_source.go index 0a097ebb417f..bbba3df839d3 100644 --- a/op-node/rollup/derive/calldata_source.go +++ b/op-node/rollup/derive/calldata_source.go @@ -10,9 +10,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + log2 "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" ) @@ -28,12 +27,12 @@ type L1TransactionFetcher interface { // batch submitter transactions. // This is not a stage in the pipeline, but a wrapper for another stage in the pipeline type DataSourceFactory struct { - log log.Logger + log log2.Logger cfg *rollup.Config fetcher L1TransactionFetcher } -func NewDataSourceFactory(log log.Logger, cfg *rollup.Config, fetcher L1TransactionFetcher) *DataSourceFactory { +func NewDataSourceFactory(log log2.Logger, cfg *rollup.Config, fetcher L1TransactionFetcher) *DataSourceFactory { return &DataSourceFactory{log: log, cfg: cfg, fetcher: fetcher} } @@ -53,14 +52,14 @@ type DataSource struct { id eth.BlockID cfg *rollup.Config // TODO: `DataFromEVMTransactions` should probably not take the full config fetcher L1TransactionFetcher - log log.Logger + log log2.Logger batcherAddr common.Address } // NewDataSource creates a new calldata source. It suppresses errors in fetching the L1 block if they occur. // If there is an error, it will attempt to fetch the result on the next call to `Next`. -func NewDataSource(ctx context.Context, log log.Logger, cfg *rollup.Config, fetcher L1TransactionFetcher, block eth.BlockID, batcherAddr common.Address) DataIter { +func NewDataSource(ctx context.Context, log log2.Logger, cfg *rollup.Config, fetcher L1TransactionFetcher, block eth.BlockID, batcherAddr common.Address) DataIter { _, txs, err := fetcher.InfoAndTxsByHash(ctx, block.Hash) if err != nil { return &DataSource{ @@ -86,7 +85,7 @@ func (ds *DataSource) Next(ctx context.Context) (eth.Data, error) { if !ds.open { if _, txs, err := ds.fetcher.InfoAndTxsByHash(ctx, ds.id.Hash); err == nil { ds.open = true - ds.data = DataFromEVMTransactions(ds.cfg, ds.batcherAddr, txs, log.New("origin", ds.id)) + ds.data = DataFromEVMTransactions(ds.cfg, ds.batcherAddr, txs, log2.New("origin", ds.id)) } else if errors.Is(err, ethereum.NotFound) { return nil, NewResetError(fmt.Errorf("failed to open calldata source: %w", err)) } else { @@ -105,7 +104,7 @@ func (ds *DataSource) Next(ctx context.Context) (eth.Data, error) { // DataFromEVMTransactions filters all of the transactions and returns the calldata from transactions // that are sent to the batch inbox address from the batch sender address. // This will return an empty array if no valid transactions are found. -func DataFromEVMTransactions(config *rollup.Config, batcherAddr common.Address, txs types.Transactions, log log.Logger) []eth.Data { +func DataFromEVMTransactions(config *rollup.Config, batcherAddr common.Address, txs types.Transactions, log log2.Logger) []eth.Data { var out []eth.Data l1Signer := config.L1Signer() for j, tx := range txs { diff --git a/op-node/rollup/derive/channel_bank.go b/op-node/rollup/derive/channel_bank.go index 8f69e546cbcc..aa777f982734 100644 --- a/op-node/rollup/derive/channel_bank.go +++ b/op-node/rollup/derive/channel_bank.go @@ -6,9 +6,8 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" ) diff --git a/op-node/rollup/derive/channel_in_reader.go b/op-node/rollup/derive/channel_in_reader.go index 94f65a03448c..7706abc9d8b2 100644 --- a/op-node/rollup/derive/channel_in_reader.go +++ b/op-node/rollup/derive/channel_in_reader.go @@ -5,9 +5,8 @@ import ( "context" "io" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" ) // Channel In Reader reads a batch from the channel diff --git a/op-node/rollup/derive/engine_consolidate.go b/op-node/rollup/derive/engine_consolidate.go index 395f258d1fe3..df9f6eb75cb2 100644 --- a/op-node/rollup/derive/engine_consolidate.go +++ b/op-node/rollup/derive/engine_consolidate.go @@ -8,9 +8,8 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" ) // AttributesMatchBlock checks if the L2 attributes pre-inputs match the output diff --git a/op-node/rollup/derive/engine_queue.go b/op-node/rollup/derive/engine_queue.go index eed7ce8d3367..e392fd7f721b 100644 --- a/op-node/rollup/derive/engine_queue.go +++ b/op-node/rollup/derive/engine_queue.go @@ -11,9 +11,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/rollup/sync" ) diff --git a/op-node/rollup/derive/engine_update.go b/op-node/rollup/derive/engine_update.go index 6782ff549aa4..2ac99147d00a 100644 --- a/op-node/rollup/derive/engine_update.go +++ b/op-node/rollup/derive/engine_update.go @@ -7,9 +7,8 @@ import ( "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" ) // isDepositTx checks an opaqueTx to determine if it is a Deposit Transaction diff --git a/op-node/rollup/derive/frame_queue.go b/op-node/rollup/derive/frame_queue.go index 6dc6317505ba..deb69f74fcbd 100644 --- a/op-node/rollup/derive/frame_queue.go +++ b/op-node/rollup/derive/frame_queue.go @@ -4,9 +4,8 @@ import ( "context" "io" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" ) var _ NextFrameProvider = &FrameQueue{} diff --git a/op-node/rollup/derive/l1_retrieval.go b/op-node/rollup/derive/l1_retrieval.go index aa53578467dd..f95b6507ec0a 100644 --- a/op-node/rollup/derive/l1_retrieval.go +++ b/op-node/rollup/derive/l1_retrieval.go @@ -6,9 +6,8 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" ) type DataAvailabilitySource interface { diff --git a/op-node/rollup/derive/l1_traversal.go b/op-node/rollup/derive/l1_traversal.go index 80763a6334be..903a07c9e9de 100644 --- a/op-node/rollup/derive/l1_traversal.go +++ b/op-node/rollup/derive/l1_traversal.go @@ -10,9 +10,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" ) diff --git a/op-node/rollup/derive/pipeline.go b/op-node/rollup/derive/pipeline.go index f46ba2155e9c..70e600fa6ad3 100644 --- a/op-node/rollup/derive/pipeline.go +++ b/op-node/rollup/derive/pipeline.go @@ -5,9 +5,8 @@ import ( "fmt" "io" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" ) diff --git a/op-node/rollup/driver/driver.go b/op-node/rollup/driver/driver.go index 6d28e891b556..f85d5208a160 100644 --- a/op-node/rollup/driver/driver.go +++ b/op-node/rollup/driver/driver.go @@ -6,9 +6,8 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-node/sources" diff --git a/op-node/rollup/driver/l1_state.go b/op-node/rollup/driver/l1_state.go index 7e4cf16ba112..94934933693a 100644 --- a/op-node/rollup/driver/l1_state.go +++ b/op-node/rollup/driver/l1_state.go @@ -1,9 +1,8 @@ package driver import ( - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" ) type L1Metrics interface { diff --git a/op-node/rollup/driver/metered_engine.go b/op-node/rollup/driver/metered_engine.go index 117af7810574..59b11c81a192 100644 --- a/op-node/rollup/driver/metered_engine.go +++ b/op-node/rollup/driver/metered_engine.go @@ -4,9 +4,8 @@ import ( "context" "time" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/rollup/derive" ) diff --git a/op-node/rollup/driver/origin_selector.go b/op-node/rollup/driver/origin_selector.go index 7c9078ecad0e..6cdf37297067 100644 --- a/op-node/rollup/driver/origin_selector.go +++ b/op-node/rollup/driver/origin_selector.go @@ -6,9 +6,9 @@ import ( "fmt" "github.com/ethereum/go-ethereum" - "github.com/ethereum-optimism/optimism/logutil/log" "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/rollup/derive" ) diff --git a/op-node/rollup/driver/sequencer.go b/op-node/rollup/driver/sequencer.go index c6157745c630..7d4ac0fcac2e 100644 --- a/op-node/rollup/driver/sequencer.go +++ b/op-node/rollup/driver/sequencer.go @@ -9,9 +9,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/rollup/derive" ) diff --git a/op-node/rollup/driver/state.go b/op-node/rollup/driver/state.go index 53b2f277a53d..abca3f93fbbd 100644 --- a/op-node/rollup/driver/state.go +++ b/op-node/rollup/driver/state.go @@ -12,9 +12,8 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-node/sources" diff --git a/op-node/rollup/sync/start.go b/op-node/rollup/sync/start.go index 16f6eb0ebb98..adea1d5428b4 100644 --- a/op-node/rollup/sync/start.go +++ b/op-node/rollup/sync/start.go @@ -31,9 +31,8 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" ) diff --git a/op-node/rollup/types.go b/op-node/rollup/types.go index cd9f4af9c14a..01322b4d2b4f 100644 --- a/op-node/rollup/types.go +++ b/op-node/rollup/types.go @@ -11,9 +11,8 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/params" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" ) var ( diff --git a/op-node/service.go b/op-node/service.go index 181e2a46cdb5..c9cd10531ba1 100644 --- a/op-node/service.go +++ b/op-node/service.go @@ -8,8 +8,8 @@ import ( "os" "strings" - "github.com/ethereum-optimism/optimism/logutil/log" "github.com/ethereum-optimism/optimism/op-node/chaincfg" + log2 "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/sources" oppprof "github.com/ethereum-optimism/optimism/op-service/pprof" @@ -26,7 +26,7 @@ import ( ) // NewConfig creates a Config from the provided flags or environment variables. -func NewConfig(ctx *cli.Context, log log.Logger) (*node.Config, error) { +func NewConfig(ctx *cli.Context, log log2.Logger) (*node.Config, error) { if err := flags.CheckRequired(ctx); err != nil { return nil, err } @@ -101,7 +101,7 @@ func NewL1EndpointConfig(ctx *cli.Context) *node.L1EndpointConfig { } } -func NewL2EndpointConfig(ctx *cli.Context, log log.Logger) (*node.L2EndpointConfig, error) { +func NewL2EndpointConfig(ctx *cli.Context, log log2.Logger) (*node.L2EndpointConfig, error) { l2Addr := ctx.GlobalString(flags.L2EngineAddr.Name) fileName := ctx.GlobalString(flags.L2EngineJWTSecret.Name) var secret [32]byte @@ -174,18 +174,18 @@ func NewRollupConfig(ctx *cli.Context) (*rollup.Config, error) { return &rollupConfig, nil } -func NewSnapshotLogger(ctx *cli.Context) (log.Logger, error) { +func NewSnapshotLogger(ctx *cli.Context) (log2.Logger, error) { snapshotFile := ctx.GlobalString(flags.SnapshotLog.Name) - handler := log.DiscardHandler() + handler := log2.DiscardHandler() if snapshotFile != "" { var err error - handler, err = log.FileHandler(snapshotFile, log.JSONFormat()) + handler, err = log2.FileHandler(snapshotFile, log2.JSONFormat()) if err != nil { return nil, err } - handler = log.SyncHandler(handler) + handler = log2.SyncHandler(handler) } - logger := log.New() + logger := log2.New() logger.SetHandler(handler) return logger, nil } diff --git a/op-node/sources/engine_client.go b/op-node/sources/engine_client.go index a05206e5326b..a9533db9dfb3 100644 --- a/op-node/sources/engine_client.go +++ b/op-node/sources/engine_client.go @@ -7,9 +7,9 @@ import ( "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum-optimism/optimism/logutil/log" "github.com/ethereum-optimism/optimism/op-node/client" "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/sources/caching" ) diff --git a/op-node/sources/eth_client.go b/op-node/sources/eth_client.go index 9a0449618b7b..47bfc4149a13 100644 --- a/op-node/sources/eth_client.go +++ b/op-node/sources/eth_client.go @@ -18,10 +18,10 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum-optimism/optimism/logutil/log" "github.com/ethereum-optimism/optimism/op-node/client" "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/sources/caching" ) diff --git a/op-node/sources/l1_client.go b/op-node/sources/l1_client.go index f58eff297414..7592fc82f3e3 100644 --- a/op-node/sources/l1_client.go +++ b/op-node/sources/l1_client.go @@ -8,10 +8,9 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/client" "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/sources/caching" ) diff --git a/op-node/sources/l2_client.go b/op-node/sources/l2_client.go index 9b21cf09d3a4..8a6913fceb6e 100644 --- a/op-node/sources/l2_client.go +++ b/op-node/sources/l2_client.go @@ -7,10 +7,10 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum-optimism/optimism/logutil/log" "github.com/ethereum-optimism/optimism/op-node/client" "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-node/sources/caching" diff --git a/op-node/sources/sync_client.go b/op-node/sources/sync_client.go index 0c94bb15b504..e682c29d259b 100644 --- a/op-node/sources/sync_client.go +++ b/op-node/sources/sync_client.go @@ -7,10 +7,9 @@ import ( "github.com/libp2p/go-libp2p/core/peer" - "github.com/ethereum-optimism/optimism/logutil/log" - "github.com/ethereum-optimism/optimism/op-node/client" "github.com/ethereum-optimism/optimism/op-node/eth" + "github.com/ethereum-optimism/optimism/op-node/logutil/log" "github.com/ethereum-optimism/optimism/op-node/rollup" "github.com/ethereum-optimism/optimism/op-node/sources/caching" ) diff --git a/op-service/log/cli.go b/op-service/log/cli.go index d25b9b9c7eb6..84efed6bcaa2 100644 --- a/op-service/log/cli.go +++ b/op-service/log/cli.go @@ -8,8 +8,7 @@ import ( "github.com/urfave/cli" "golang.org/x/term" - "github.com/ethereum-optimism/optimism/logutil/log" - + log2 "github.com/ethereum-optimism/optimism/op-node/logutil/log" opservice "github.com/ethereum-optimism/optimism/op-service" ) @@ -55,21 +54,21 @@ func (cfg CLIConfig) Check() error { } level := strings.ToLower(cfg.Level) - _, err := log.LvlFromString(level) + _, err := log2.LvlFromString(level) if err != nil { return fmt.Errorf("unrecognized log level: %w", err) } return nil } -func NewLogger(cfg CLIConfig) log.Logger { - handler := log.StreamHandler(os.Stdout, Format(cfg.Format, cfg.Color)) - handler = log.SyncHandler(handler) - handler = log.LvlFilterHandler(Level(cfg.Level), handler) +func NewLogger(cfg CLIConfig) log2.Logger { + handler := log2.StreamHandler(os.Stdout, Format(cfg.Format, cfg.Color)) + handler = log2.SyncHandler(handler) + handler = log2.LvlFilterHandler(Level(cfg.Level), handler) // Set the root handle to what we have configured. Some components like go-ethereum's RPC // server use log.Root() instead of being able to pass in a log. - log.Root().SetHandler(handler) - logger := log.New() + log2.Root().SetHandler(handler) + logger := log2.New() logger.SetHandler(handler) return logger } @@ -103,31 +102,31 @@ func ReadCLIConfig(ctx *cli.Context) CLIConfig { } // Format turns a string and color into a structured Format object -func Format(lf string, color bool) log.Format { +func Format(lf string, color bool) log2.Format { switch lf { case "json": - return log.JSONFormat() + return log2.JSONFormat() case "json-pretty": - return log.JSONFormatEx(true, true) + return log2.JSONFormatEx(true, true) case "text": if term.IsTerminal(int(os.Stdout.Fd())) { - return log.TerminalFormat(color) + return log2.TerminalFormat(color) } else { - return log.LogfmtFormat() + return log2.LogfmtFormat() } case "terminal": - return log.TerminalFormat(color) + return log2.TerminalFormat(color) case "logfmt": - return log.LogfmtFormat() + return log2.LogfmtFormat() default: panic("Failed to create `log.Format` from options") } } // Level parses the level string into an appropriate object -func Level(s string) log.Lvl { +func Level(s string) log2.Lvl { s = strings.ToLower(s) // ignore case - l, err := log.LvlFromString(s) + l, err := log2.LvlFromString(s) if err != nil { panic(fmt.Sprintf("Could not parse log level: %v", err)) } diff --git a/op-service/log/defaults.go b/op-service/log/defaults.go index 6ffdd8aa924b..b3782bd3aa1f 100644 --- a/op-service/log/defaults.go +++ b/op-service/log/defaults.go @@ -3,14 +3,14 @@ package log import ( "os" - "github.com/ethereum-optimism/optimism/logutil/log" + log2 "github.com/ethereum-optimism/optimism/op-node/logutil/log" ) func SetupDefaults() { - log.Root().SetHandler( - log.LvlFilterHandler( - log.LvlInfo, - log.StreamHandler(os.Stdout, log.LogfmtFormat()), + log2.Root().SetHandler( + log2.LvlFilterHandler( + log2.LvlInfo, + log2.StreamHandler(os.Stdout, log2.LogfmtFormat()), ), )