[NONEVM-984][solana] - Reorg Detection + lighter rpc call

pkg/solana/client/client.go

@@ -36,6 +36,8 @@ type Reader interface {
 	ChainID(ctx context.Context) (mn.StringID, error)
 	GetFeeForMessage(ctx context.Context, msg string) (uint64, error)
 	GetLatestBlock(ctx context.Context) (*rpc.GetBlockResult, error)
+	// GetLatestBlockHeight returns the latest block height of the node based on the configured commitment type
+	GetLatestBlockHeight(ctx context.Context) (uint64, error)
 	GetTransaction(ctx context.Context, txHash solana.Signature, opts *rpc.GetTransactionOpts) (*rpc.GetTransactionResult, error)
 	GetBlocks(ctx context.Context, startSlot uint64, endSlot *uint64) (rpc.BlocksResult, error)
 	GetBlocksWithLimit(ctx context.Context, startSlot uint64, limit uint64) (*rpc.BlocksResult, error)
@@ -331,6 +333,19 @@ func (c *Client) GetLatestBlock(ctx context.Context) (*rpc.GetBlockResult, error
 	return v.(*rpc.GetBlockResult), err
 }
 
+// GetLatestBlockHeight returns the latest block height of the node based on the configured commitment type
+func (c *Client) GetLatestBlockHeight(ctx context.Context) (uint64, error) {
+	done := c.latency("latest_block_height")
+	defer done()
+	ctx, cancel := context.WithTimeout(ctx, c.txTimeout)
+	defer cancel()
+
+	v, err, _ := c.requestGroup.Do("GetBlockHeight", func() (interface{}, error) {
+		return c.rpc.GetBlockHeight(ctx, c.commitment)
+	})
+	return v.(uint64), err
+}
+
 func (c *Client) GetBlock(ctx context.Context, slot uint64) (*rpc.GetBlockResult, error) {
 	// get block based on slot
 	done := c.latency("get_block")

pkg/solana/client/client_test.go

@@ -125,6 +125,12 @@ func TestClient_Reader_Integration(t *testing.T) {
 		assert.GreaterOrEqual(t, slot, startSlot)
 		assert.LessOrEqual(t, slot, slot0)
 	}
+
+	// GetLatestBlockHeight
+	// Test fetching the latest block height
+	blockHeight, err := c.GetLatestBlockHeight(ctx)
+	require.NoError(t, err)
+	require.Greater(t, blockHeight, uint64(0), "Block height should be greater than 0")
 }
 
 func TestClient_Reader_ChainID(t *testing.T) {
@@ -288,6 +294,32 @@ func TestClient_GetBlocks(t *testing.T) {
 		requestTimeout, 500*time.Millisecond)
 }
 
+func TestClient_GetLatestBlockHeight(t *testing.T) {
+	t.Parallel()
+
+	ctx := tests.Context(t)
+	url := SetupLocalSolNode(t)
+	requestTimeout := 5 * time.Second
+	lggr := logger.Test(t)
+	cfg := config.NewDefault()
+
+	// Initialize the client
+	c, err := NewClient(url, cfg, requestTimeout, lggr)
+	require.NoError(t, err)
+
+	// Get the latest block height
+	blockHeight, err := c.GetLatestBlockHeight(ctx)
+	require.NoError(t, err)
+	require.Greater(t, blockHeight, uint64(0), "Block height should be greater than 0")
+
+	// Wait until the block height increases
+	require.Eventually(t, func() bool {
+		newBlockHeight, err := c.GetLatestBlockHeight(ctx)
+		require.NoError(t, err)
+		return newBlockHeight > blockHeight
+	}, 10*time.Second, 1*time.Second, "Block height should eventually increase")
+}
+
 func TestClient_SendTxDuplicates_Integration(t *testing.T) {
 	ctx := tests.Context(t)
 	// set up environment