Chain id info added to err

etherclient/backoff.go

@@ -69,10 +69,14 @@ func (ec *etherClient) withBackoff(
 			// Move onto the next provider.
 			ec.provider.Next()
 		}
-		return handleRetryErr(ctx, method, opErr)
+		return handleRetryErr(ctx, method, ec.chainID, opErr)
 	}, bo)
 	if err != nil {
-		logrus.WithError(err).WithField("method", method).Error("retry failed with error")
+		logger := logrus.WithError(err).WithField("method", method)
+		if ec.chainID != nil {
+			logger = logger.WithField("chainID", ec.chainID.String())
+		}
+		logger.Error("retry failed with error")
 	}
 	return err
 }

etherclient/client.go

@@ -58,6 +58,7 @@ type EtherClient interface {
 
 	SetRetryInterval(d time.Duration)
 	SetMetricsHandler(h func(rpcHost, clientMethod string, err error))
+	SetChainID(chainID *big.Int)
 }
 
 type Extras interface {
@@ -86,6 +87,8 @@ type etherClient struct {
 	retryInterval time.Duration
 
 	metricsHandler func(rpcHost, clientMethod string, err error)
+
+	chainID *big.Int
 }
 
 var _ EtherClient = &etherClient{}
@@ -111,10 +114,12 @@ func DialContext(ctx context.Context, rawurls ...string) (*etherClient, error) {
 		}
 		clients = append(clients, &ethClientWrapper{url: rawurl, Client: c})
 	}
-	return &etherClient{
+	ec := &etherClient{
 		provider:      provider.NewRingProvider(clients...),
 		retryInterval: defaultRetryInterval,
-	}, nil
+	}
+
+	return ec, nil
 }
 
 func (ec *etherClient) SetRetryInterval(d time.Duration) {
@@ -125,6 +130,10 @@ func (ec *etherClient) SetMetricsHandler(h func(rpcHost, clientMethod string, er
 	ec.metricsHandler = h
 }
 
+func (ec *etherClient) SetChainID(chainID *big.Int) {
+	ec.chainID = chainID
+}
+
 func (ec *etherClient) Client() *rpc.Client {
 	return ec.provider.Provide().Client.Client()
 }

etherclient/errors.go

@@ -2,6 +2,7 @@ package etherclient
 
 import (
 	"context"
+	"math/big"
 	"strings"
 
 	"github.com/cenkalti/backoff"
@@ -32,14 +33,17 @@ func isPermanentError(err error) bool {
 	return false
 }
 
-func handleRetryErr(ctx context.Context, method string, err error) error {
+func handleRetryErr(ctx context.Context, method string, chainID *big.Int, err error) error {
 	if err == nil {
 		return nil
 	}
 	logger := logrus.NewEntry(logrus.StandardLogger())
 	if len(method) > 0 {
 		logger = logger.WithField("method", method)
 	}
+	if chainID != nil {
+		logger = logger.WithField("chainID", chainID.String())
+	}
 	if isPermanentError(err) {
 		logger.WithError(err).Error("backoff permanent error")
 		return backoff.Permanent(err)