improvements (#181)

Author: pkieltyka

cmd/chain-ethgas/main.go

@@ -4,13 +4,14 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"log/slog"
+	"os"
 	"time"
 
 	"github.com/0xsequence/ethkit/ethgas"
 	"github.com/0xsequence/ethkit/ethmonitor"
 	"github.com/0xsequence/ethkit/ethrpc"
 	"github.com/0xsequence/ethkit/util"
-	"github.com/goware/logger"
 )
 
 var ETH_NODE_URL = "http://localhost:8545"
@@ -68,7 +69,7 @@ func main() {
 	}()
 	defer monitor.Stop()
 
-	logger := logger.NewLogger(logger.LogLevel_INFO)
+	logger := slog.New(slog.NewTextHandler(os.Stdout, nil))
 
 	gasGague, err := ethgas.NewGasGauge(logger, monitor, 1, false)
 	if err != nil {

cmd/chain-receipts/main.go

@@ -5,6 +5,8 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"log/slog"
+	"os"
 	"sync"
 	"time"
 
@@ -16,7 +18,6 @@ import (
 	"github.com/0xsequence/ethkit/go-ethereum/core/types"
 	"github.com/0xsequence/ethkit/go-ethereum/crypto"
 	"github.com/0xsequence/ethkit/util"
-	"github.com/goware/logger"
 )
 
 var ETH_NODE_URL = "http://localhost:8545"
@@ -84,7 +85,11 @@ func listener(provider *ethrpc.Provider, monitorOptions ethmonitor.Options, rece
 	// monitorSub := monitor.Subscribe()
 	// defer monitorSub.Unsubscribe()
 
-	receiptListener, err := ethreceipts.NewReceiptsListener(logger.NewLogger(logger.LogLevel_INFO), provider, monitor, receiptListenerOptions)
+	logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
+		Level: slog.LevelInfo,
+	}))
+
+	receiptListener, err := ethreceipts.NewReceiptsListener(logger, provider, monitor, receiptListenerOptions)
 	if err != nil {
 		log.Fatal(err)
 	}

cmd/chain-watch/main.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"log/slog"
 	"math/big"
 	"os"
 	"path/filepath"
@@ -16,7 +17,6 @@ import (
 	"github.com/0xsequence/ethkit/util"
 	rediscache "github.com/goware/cachestore-redis"
 	cachestore "github.com/goware/cachestore2"
-	"github.com/goware/logger"
 	"github.com/goware/pp"
 )
 
@@ -93,7 +93,7 @@ func main() {
 	// monitorOptions.StartBlockNumber = big.NewInt(3754824)
 	// monitorOptions.Bootstrap = true
 
-	monitorOptions.Logger = logger.NewLogger(logger.LogLevel_DEBUG)
+	monitorOptions.Logger = slog.Default()
 	monitorOptions.DebugLogging = true
 
 	// monitorOptions.TrailNumBlocksBehindHead = 4

cmd/ethkit/_receipts.go

@@ -3,12 +3,12 @@ package main
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"time"
 
 	"github.com/0xsequence/ethkit/ethmonitor"
 	"github.com/0xsequence/ethkit/ethreceipts"
 	"github.com/0xsequence/ethkit/ethrpc"
-	"github.com/goware/logger"
 	"github.com/spf13/cobra"
 )
 
@@ -33,15 +33,15 @@ type watch struct {
 func (c *watch) Run(cmd *cobra.Command, args []string) {
 	fmt.Println("xx")
 
-	log := logger.NewLogger(logger.LogLevel_DEBUG)
+	logger := slog.Default()
 
 	provider, err := ethrpc.NewProvider("https://xxx")
 	if err != nil {
 		panic(err)
 	}
 
 	monitorOptions := ethmonitor.DefaultOptions
-	monitorOptions.Logger = log
+	monitorOptions.Logger = logger
 	monitorOptions.WithLogs = true
 	monitorOptions.BlockRetentionLimit = 1000
 
@@ -50,7 +50,7 @@ func (c *watch) Run(cmd *cobra.Command, args []string) {
 		panic(err)
 	}
 
-	receipts, err := ethreceipts.NewReceiptsListener(log, provider, monitor)
+	receipts, err := ethreceipts.NewReceiptsListener(logger, provider, monitor)
 	if err != nil {
 		panic(err)
 	}

cmd/ethkit/wallet.go

@@ -14,7 +14,7 @@ import (
 	"github.com/0xsequence/ethkit/go-ethereum/accounts/keystore"
 	"github.com/0xsequence/ethkit/go-ethereum/common"
 	"github.com/spf13/cobra"
-	"golang.org/x/crypto/ssh/terminal"
+	"golang.org/x/term"
 )
 
 func init() {
@@ -261,7 +261,7 @@ func fileExists(filename string) bool {
 
 func readSecretInput(prompt string) ([]byte, error) {
 	fmt.Print(prompt)
-	password, err := terminal.ReadPassword(int(syscall.Stdin))
+	password, err := term.ReadPassword(int(syscall.Stdin))
 	if err != nil {
 		return nil, err
 	}

ethgas/ethgas.go

@@ -3,12 +3,12 @@ package ethgas
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"math/big"
 	"sort"
 	"sync/atomic"
 
 	"github.com/0xsequence/ethkit/ethmonitor"
-	"github.com/goware/logger"
 )
 
 const (
@@ -23,7 +23,7 @@ var (
 )
 
 type GasGauge struct {
-	log                   logger.Logger
+	log                   *slog.Logger
 	monitor               *ethmonitor.Monitor
 	chainID               uint64
 	gasPriceBidReader     GasPriceReader
@@ -79,7 +79,7 @@ func (p SuggestedGasPrice) WithMin(minWei *big.Int) SuggestedGasPrice {
 	return p
 }
 
-func NewGasGaugeWei(log logger.Logger, monitor *ethmonitor.Monitor, minGasPriceInWei uint64, useEIP1559 bool) (*GasGauge, error) {
+func NewGasGaugeWei(log *slog.Logger, monitor *ethmonitor.Monitor, minGasPriceInWei uint64, useEIP1559 bool) (*GasGauge, error) {
 	if minGasPriceInWei == 0 {
 		return nil, fmt.Errorf("minGasPriceInWei cannot be 0, pass at least 1")
 	}
@@ -106,7 +106,7 @@ func NewGasGaugeWei(log logger.Logger, monitor *ethmonitor.Monitor, minGasPriceI
 	}, nil
 }
 
-func NewGasGauge(log logger.Logger, monitor *ethmonitor.Monitor, minGasPriceInGwei uint64, useEIP1559 bool) (*GasGauge, error) {
+func NewGasGauge(log *slog.Logger, monitor *ethmonitor.Monitor, minGasPriceInGwei uint64, useEIP1559 bool) (*GasGauge, error) {
 	if minGasPriceInGwei >= ONE_GWEI {
 		return nil, fmt.Errorf("minGasPriceInGwei argument expected to be passed as Gwei, but your units look like wei")
 	}

ethgas/ethgas_test.go

@@ -2,6 +2,7 @@ package ethgas_test
 
 import (
 	"context"
+	"log/slog"
 	"testing"
 	"time"
 
@@ -10,7 +11,6 @@ import (
 	"github.com/0xsequence/ethkit/ethrpc"
 	"github.com/0xsequence/ethkit/util"
 	"github.com/go-chi/httpvcr"
-	"github.com/goware/logger"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -54,7 +54,7 @@ func TestGasGauge(t *testing.T) {
 	assert.NoError(t, err)
 
 	// Setup gas tracker
-	gasGauge, err := ethgas.NewGasGauge(logger.NewLogger(logger.LogLevel_DEBUG), monitor, 1, false)
+	gasGauge, err := ethgas.NewGasGauge(slog.Default(), monitor, 1, false)
 	assert.NoError(t, err)
 
 	// wait before we start to ensure any other http requests above are completed

ethmempool/ethmempool.go

@@ -3,22 +3,22 @@ package ethmempool
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"strings"
 	"sync"
 	"sync/atomic"
 
 	"github.com/0xsequence/ethkit/go-ethereum/rpc"
-	"github.com/goware/logger"
 )
 
 type Options struct {
-	Logger logger.Logger
+	Logger *slog.Logger
 }
 
 type Mempool struct {
 	options Options
 
-	log              logger.Logger
+	log              *slog.Logger
 	nodeWebsocketURL string
 	client           *rpc.Client
 	subscribers      []*subscriber