pkg/solana: expand HealthReport (#1019)

pkg/solana/chain.go

@@ -229,11 +229,12 @@ func (v *verifiedCachedClient) GetAccountInfoWithOpts(ctx context.Context, addr
 }
 
 func newChain(id string, cfg *config.TOMLConfig, ks core.Keystore, lggr logger.Logger, ds sqlutil.DataSource) (*chain, error) {
+	lggr = logger.Named(lggr, "Chain")
 	lggr = logger.With(lggr, "chainID", id, "chain", "solana")
 	var ch = chain{
 		id:          id,
 		cfg:         cfg,
-		lggr:        logger.Named(lggr, "Chain"),
+		lggr:        lggr,
 		clientCache: map[string]*verifiedCachedClient{},
 	}
 
@@ -531,6 +532,11 @@ func (c *chain) Ready() error {
 func (c *chain) HealthReport() map[string]error {
 	report := map[string]error{c.Name(): c.Healthy()}
 	services.CopyHealth(report, c.txm.HealthReport())
+	services.CopyHealth(report, c.balanceMonitor.HealthReport())
+	if c.cfg.MultiNode.Enabled() {
+		report[c.multiNode.Name()] = c.multiNode.Healthy()
+		report[c.txSender.Name()] = c.txSender.Healthy()
+	}
 	return report
 }
 

pkg/solana/client/multinode/multi_node.go

@@ -86,6 +86,10 @@ func NewMultiNode[
 	return c
 }
 
+func (c *MultiNode[CHAIN_ID, RPC]) Name() string {
+	return c.lggr.Name()
+}
+
 func (c *MultiNode[CHAIN_ID, RPC]) ChainID() CHAIN_ID {
 	return c.chainID
 }

pkg/solana/client/multinode/transaction_sender.go

@@ -72,6 +72,10 @@ type TransactionSender[TX any, RESULT SendTxResult, CHAIN_ID ID, RPC SendTxRPCCl
 	chStop services.StopChan
 }
 
+func (txSender *TransactionSender[TX, RESULT, CHAIN_ID, RPC]) Name() string {
+	return txSender.lggr.Name()
+}
+
 // SendTransaction - broadcasts transaction to all the send-only and primary nodes in MultiNode.
 // A returned nil or error does not guarantee that the transaction will or won't be included. Additional checks must be
 // performed to determine the final state.