fix: cleanup rebase

Signed-off-by: gfanton <[email protected]>

contribs/gnodev/go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/gnolang/gno v0.0.0-00010101000000-000000000000
 	github.com/gorilla/websocket v1.5.1
 	go.uber.org/zap v1.24.0
+	golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3
 	golang.org/x/term v0.16.0
 )
 
@@ -46,6 +47,7 @@ require (
 	github.com/peterbourgon/ff/v3 v3.4.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/rs/cors v1.10.1 // indirect
 	github.com/stretchr/testify v1.8.4 // indirect
 	github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
@@ -55,7 +57,6 @@ require (
 	go.uber.org/multierr v1.10.0 // indirect
 	go.uber.org/zap/exp v0.1.0 // indirect
 	golang.org/x/crypto v0.18.0 // indirect
-	golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
 	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect

contribs/gnodev/main.go

@@ -22,6 +22,7 @@ import (
 	"github.com/gnolang/gno/gnovm/pkg/gnomod"
 	"github.com/gnolang/gno/tm2/pkg/commands"
 	osm "github.com/gnolang/gno/tm2/pkg/os"
+	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
 
@@ -126,7 +127,8 @@ func execDev(cfg *devCfg, args []string, io commands.IO) error {
 		cancel(nil)
 	})
 
-	loggerEvents := tmlog.NewTMLogger(rt.NamespacedWriter(EventServerLogName))
+	zapLoggerEvents := NewZapLogger(rt.NamespacedWriter(EventServerLogName), zapcore.DebugLevel)
+	loggerEvents := log.ZapLoggerToSlog(zapLoggerEvents)
 	emitterServer := events.NewEmitterServer(loggerEvents)
 
 	// Setup Dev Node
@@ -311,8 +313,8 @@ func setupRawTerm(io commands.IO) (rt *rawterm.RawTerm, restore func() error, er
 // setupDevNode initializes and returns a new DevNode.
 func setupDevNode(ctx context.Context, emitter events.Emitter, rt *rawterm.RawTerm, pkgspath []string) (*gnodev.Node, error) {
 	nodeOut := rt.NamespacedWriter("Node")
-	zapLogger := log.NewZapConsoleLogger(nodeOut, zapcore.ErrorLevel)
-	return gnodev.NewDevNode(ctx, log.ZapLoggerToSlog(zapLogger), pkgspath)
+	zapLogger := NewZapLogger(nodeOut, zapcore.ErrorLevel)
+	return gnodev.NewDevNode(ctx, log.ZapLoggerToSlog(zapLogger), emitter, pkgspath)
 }
 
 // setupGnowebServer initializes and starts the Gnoweb server.
@@ -322,7 +324,7 @@ func setupGnoWebServer(cfg *devCfg, dnode *gnodev.Node, rt *rawterm.RawTerm) htt
 	webConfig.HelpChainID = dnode.Config().ChainID()
 	webConfig.HelpRemote = dnode.GetRemoteAddress()
 
-	zapLogger := log.NewZapConsoleLogger(rt.NamespacedWriter("GnoWeb"), zapcore.DebugLevel)
+	zapLogger := NewZapLogger(rt.NamespacedWriter("GnoWeb"), zapcore.DebugLevel)
 	app := gnoweb.MakeApp(log.ZapLoggerToSlog(zapLogger), webConfig)
 	return app.Router
 }
@@ -370,3 +372,16 @@ func checkForError(w io.Writer, err error) {
 
 	fmt.Fprintln(w, "[DONE]")
 }
+
+// NewZapLogger creates a zap logger with a console encoder for development use.
+func NewZapLogger(w io.Writer, level zapcore.Level) *zap.Logger {
+	// Build encoder config
+	consoleConfig := zap.NewDevelopmentEncoderConfig()
+	consoleConfig.TimeKey = ""
+	consoleConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
+	consoleConfig.EncodeName = zapcore.FullNameEncoder
+
+	// Build encoder
+	enc := zapcore.NewConsoleEncoder(consoleConfig)
+	return log.NewZapLogger(enc, w, level)
+}

contribs/gnodev/pkg/dev/node.go

@@ -31,7 +31,7 @@ type Node struct {
 
 	emitter events.Emitter
 	client  client.Client
-	logger  slog.Logger
+	logger  *slog.Logger
 	pkgs    PkgsMap // path -> pkg
 	// keep track of number of loaded package to be able to skip them on restore
 	loadedPackages int
@@ -367,7 +367,7 @@ func (pm PkgsMap) Load(creator bft.Address, fee std.Fee, deposit std.Coins) ([]s
 	return txs, nil
 }
 
-func newNode(ctx context.Context, logger slog.Logger, emitter events.Emitter, genesis gnoland.GnoGenesisState) (*node.Node, error) {
+func newNode(ctx context.Context, logger *slog.Logger, emitter events.Emitter, genesis gnoland.GnoGenesisState) (*node.Node, error) {
 	rootdir := gnoenv.RootDir()
 
 	// Setup node config

contribs/gnodev/pkg/events/server.go

@@ -7,22 +7,22 @@ import (
 	"sync"
 	"text/template"
 
-	"github.com/gnolang/gno/tm2/pkg/log"
 	"github.com/gorilla/websocket"
+	"golang.org/x/exp/slog"
 )
 
 type Emitter interface {
 	Emit(evt *Event)
 }
 
 type Server struct {
-	logger    log.Logger
+	logger    *slog.Logger
 	upgrader  websocket.Upgrader
 	clients   map[*websocket.Conn]struct{}
 	muClients sync.RWMutex
 }
 
-func NewEmitterServer(logger log.Logger) *Server {
+func NewEmitterServer(logger *slog.Logger) *Server {
 	return &Server{
 		logger:  logger,
 		clients: make(map[*websocket.Conn]struct{}),

contribs/gnodev/pkg/watcher/watch.go

@@ -9,10 +9,10 @@ import (
 	"time"
 
 	events "github.com/gnolang/gno/contribs/gnodev/pkg/events"
-	"github.com/gnolang/gno/tm2/pkg/log"
 
 	"github.com/fsnotify/fsnotify"
 	"github.com/gnolang/gno/gnovm/pkg/gnomod"
+	"golang.org/x/exp/slog"
 )
 
 type PackageWatcher struct {
@@ -22,13 +22,13 @@ type PackageWatcher struct {
 	ctx  context.Context
 	stop context.CancelFunc
 
-	logger  log.Logger
+	logger  *slog.Logger
 	watcher *fsnotify.Watcher
 	pkgsDir []string
 	emitter events.Emitter
 }
 
-func NewPackageWatcher(logger log.Logger, emitter events.Emitter) (*PackageWatcher, error) {
+func NewPackageWatcher(logger *slog.Logger, emitter events.Emitter) (*PackageWatcher, error) {
 	watcher, err := fsnotify.NewWatcher()
 	if err != nil {
 		return nil, fmt.Errorf("unable to watch files: %w", err)