Skip to content

chore: log rpc calls #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akundaz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: log rpc calls #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions server/analyse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,12 @@ func (s *Server) analyseTxpool(ctx context.Context, status map[string]*types.Bui
continue
}

l.Debug("Calling builder RPC",
zap.String("builder", builder),
zap.String("method", "eth_getTransactionCount"),
zap.String("addr", addr),
)

noncePending, err := s.builders[builder].NonceAt(ctx, addrEth, nil)
if err != nil {
l.Warn("Failed to get pending nonce",
Expand Down
28 changes: 22 additions & 6 deletions server/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func (s *Server) monitor(ctx context.Context, ts time.Time) {
go func() {
defer wg.Done()

s := s.getStatus(ctx, rpc)
s := s.getStatus(ctx, name, rpc)
mx.Lock()
status[name] = s
mx.Unlock()
Expand All @@ -50,28 +50,30 @@ func (s *Server) process(ctx context.Context, status map[string]*types.BuilderSt
s.analyseTxpool(ctx, status)
}

func (s *Server) getStatus(ctx context.Context, builder *ethclient.Client) *types.BuilderStatus {
func (s *Server) getStatus(ctx context.Context, name string, builder *ethclient.Client) *types.BuilderStatus {
l := logutils.LoggerFromContext(ctx)

res := &types.BuilderStatus{}
errs := make([]error, 0)

if peers, err := s.getPeers(ctx, builder); err == nil {
if peers, err := s.getPeers(ctx, name, builder); err == nil {
res.Peers = peers
} else {
errs = append(errs, err)
l.Error("Failed to get builder's peers",
zap.Error(err),
zap.String("builder", name),
)
}

if !s.cfg.Monitor.NoTxpool {
if txpool, err := s.getTxpool(ctx, builder); err == nil {
if txpool, err := s.getTxpool(ctx, name, builder); err == nil {
res.Txpool = txpool
} else {
errs = append(errs, err)
l.Error("Failed to get builder's txpool",
zap.Error(err),
zap.String("builder", name),
)
}
}
Expand All @@ -81,10 +83,17 @@ func (s *Server) getStatus(ctx context.Context, builder *ethclient.Client) *type
return res
}

func (s *Server) getPeers(ctx context.Context, builder *ethclient.Client) (*jrpc.AdminPeers, error) {
func (s *Server) getPeers(ctx context.Context, name string, builder *ethclient.Client) (*jrpc.AdminPeers, error) {
l := logutils.LoggerFromContext(ctx)

ctx, cancel := context.WithTimeout(ctx, s.cfg.Monitor.Timeout)
defer cancel()

l.Debug("Calling builder RPC",
zap.String("builder", name),
zap.String("method", "admin_peers"),
)

res := &jrpc.AdminPeers{}
if err := builder.Client().CallContext(ctx, res, "admin_peers"); err != nil {
return nil, err
Expand All @@ -93,10 +102,17 @@ func (s *Server) getPeers(ctx context.Context, builder *ethclient.Client) (*jrpc
return res, nil
}

func (s *Server) getTxpool(ctx context.Context, builder *ethclient.Client) (*jrpc.TxpoolContent, error) {
func (s *Server) getTxpool(ctx context.Context, name string, builder *ethclient.Client) (*jrpc.TxpoolContent, error) {
l := logutils.LoggerFromContext(ctx)

ctx, cancel := context.WithTimeout(ctx, s.cfg.Monitor.Timeout)
defer cancel()

l.Debug("Calling builder RPC",
zap.String("builder", name),
zap.String("method", "txpool_content"),
)

res := &jrpc.TxpoolContent{}
if err := builder.Client().CallContext(ctx, res, "txpool_content"); err != nil {
return nil, err
Expand Down