feat: add names to wallets

Author: 0x416e746f6e

cmd/serve.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"slices"
 	"strings"
 	"time"
@@ -78,7 +79,18 @@ func CommandServe(cfg *config.Config) *cli.Command {
 		Flags: flags,
 
 		Before: func(_ *cli.Context) error {
-			cfg.Eth.WalletAddresses = walletAddresses.Value()
+			_walletAddresses := make(map[string]string, len(walletAddresses.Value()))
+			for _, wa := range walletAddresses.Value() {
+				parts := strings.Split(wa, "=")
+				if len(parts) != 2 {
+					return fmt.Errorf("invalid wallet address (mush be like `name=0xNNNN`): %s", wa)
+				}
+				name := strings.TrimSpace(parts[0])
+				addr := strings.TrimSpace(parts[1])
+				_walletAddresses[name] = addr
+			}
+
+			cfg.Eth.WalletAddresses = _walletAddresses
 			return cfg.Validate()
 		},
 

config/eth.go

@@ -10,11 +10,11 @@ import (
 )
 
 type Eth struct {
-	BlockTime       time.Duration `yaml:"block_time"`
-	BuilderAddress  string        `yaml:"builder_address"`
-	ReorgWindow     int           `yaml:"reorg_window"`
-	RPC             string        `yaml:"rpc"`
-	WalletAddresses []string      `yaml:"wallet_addresses"`
+	BlockTime       time.Duration     `yaml:"block_time"`
+	BuilderAddress  string            `yaml:"builder_address"`
+	ReorgWindow     int               `yaml:"reorg_window"`
+	RPC             string            `yaml:"rpc"`
+	WalletAddresses map[string]string `yaml:"wallet_addresses"`
 }
 
 const (

readme.md

@@ -7,7 +7,7 @@ go run github.com/flashbots/chain-monitor/cmd serve \
   --eth-block-time 1s \
   --eth-rpc http://127.0.0.1:8645 \
   --eth-builder-address 0xdD11751cdD3f6EFf01B1f6151B640685bfa5dB4a \
-  --eth-monitor-wallets 0xdD11751cdD3f6EFf01B1f6151B640685bfa5dB4a
+  --eth-monitor-wallets builder=0xdD11751cdD3f6EFf01B1f6151B640685bfa5dB4a
 ```
 
 ```shell

server/eth.go

@@ -162,7 +162,7 @@ func (s *Server) hasBuilderTx(ctx context.Context, block *ethtypes.Block) bool {
 func (s *Server) observeWallets(ctx context.Context, o otelapi.Observer) error {
 	errs := make([]error, 0)
 
-	for _, addr := range s.wallets {
+	for name, addr := range s.wallets {
 		_balance, err := s.eth.BalanceAt(ctx, addr, nil)
 		if err != nil {
 			errs = append(errs, err)
@@ -172,7 +172,8 @@ func (s *Server) observeWallets(ctx context.Context, o otelapi.Observer) error {
 		balance, _ := _balance.Float64()
 
 		o.ObserveFloat64(metrics.WalletBalance, balance, otelapi.WithAttributes(
-			attribute.KeyValue{Key: "address", Value: attribute.StringValue(addr.String())},
+			attribute.KeyValue{Key: "wallet_address", Value: attribute.StringValue(addr.String())},
+			attribute.KeyValue{Key: "wallet_name", Value: attribute.StringValue(name)},
 		))
 	}
 

server/server.go

@@ -41,13 +41,13 @@ type Server struct {
 	blocksLanded int64
 
 	blocks  *types.RingBuffer[bool]
-	wallets []ethcommon.Address
+	wallets map[string]ethcommon.Address
 }
 
 func New(cfg *config.Config) (*Server, error) {
 	var (
 		builderAddr ethcommon.Address
-		wallets     = make([]ethcommon.Address, 0, len(cfg.Eth.WalletAddresses))
+		wallets     = make(map[string]ethcommon.Address, len(cfg.Eth.WalletAddresses))
 	)
 
 	{ // builder address
@@ -61,7 +61,7 @@ func New(cfg *config.Config) (*Server, error) {
 		copy(builderAddr[:], addr)
 	}
 
-	for _, wa := range cfg.Eth.WalletAddresses {
+	for name, wa := range cfg.Eth.WalletAddresses {
 		_addr, err := ethcommon.ParseHexOrString(wa)
 		if err != nil {
 			return nil, err
@@ -71,7 +71,7 @@ func New(cfg *config.Config) (*Server, error) {
 		}
 		var addr ethcommon.Address
 		copy(addr[:], _addr)
-		wallets = append(wallets, addr)
+		wallets[name] = addr
 	}
 
 	eth, err := ethclient.Dial(cfg.Eth.RPC)