feat: add chainID to BlockValidated rpc

rpc/client/client.go

@@ -62,7 +62,8 @@ type Client struct {
 }
 
 type ResultBlockValidated struct {
-	Result BlockValidationStatus
+	ChainID string
+	Result  BlockValidationStatus
 }
 
 // NewClient returns Client working with given node.
@@ -807,22 +808,23 @@ func (c *Client) CheckTx(ctx context.Context, tx tmtypes.Tx) (*ctypes.ResultChec
 	return &ctypes.ResultCheckTx{ResponseCheckTx: *res}, nil
 }
 
-func (c *Client) BlockValidated(ctx context.Context, height *int64) (*ResultBlockValidated, error) {
+func (c *Client) BlockValidated(height *int64) (*ResultBlockValidated, error) {
+	_, _, chainID := c.node.P2P.Info()
 	// invalid height
 	if height == nil || *height < 0 {
-		return &ResultBlockValidated{Result: -1}, nil
+		return &ResultBlockValidated{Result: -1, ChainID: chainID}, nil
 	}
 	// node has not reached the height yet
 	if uint64(*height) > c.node.BlockManager.State.Height() {
-		return &ResultBlockValidated{Result: NotValidated}, nil
+		return &ResultBlockValidated{Result: NotValidated, ChainID: chainID}, nil
 	}
 
 	if uint64(*height) <= c.node.BlockManager.SettlementValidator.GetLastValidatedHeight() {
-		return &ResultBlockValidated{Result: SLValidated}, nil
+		return &ResultBlockValidated{Result: SLValidated, ChainID: chainID}, nil
 	}
 
 	// block is applied, and therefore it is validated at block level but not at state update level
-	return &ResultBlockValidated{Result: P2PValidated}, nil
+	return &ResultBlockValidated{Result: P2PValidated, ChainID: chainID}, nil
 }
 
 func (c *Client) eventsRoutine(sub tmtypes.Subscription, subscriber string, q tmpubsub.Query, outc chan<- ctypes.ResultEvent) {

rpc/client/client_test.go

@@ -369,13 +369,11 @@ func TestValidatedHeight(t *testing.T) {
 
 			node.BlockManager.State.SetHeight(test.nodeHeight)
 
-			validationResponse, err := rpc.BlockValidated(context.Background(), test.queryHeight)
+			validationResponse, err := rpc.BlockValidated(test.queryHeight)
 			require.NoError(err)
 			require.NotNil(validationResponse)
 			assert.Equal(test.result, validationResponse.Result)
-
 		})
-
 	}
 
 	err = node.Stop()

rpc/json/service.go

@@ -293,5 +293,5 @@ func (s *service) BroadcastEvidence(req *http.Request, args *broadcastEvidenceAr
 
 func (s *service) BlockValidated(req *http.Request, args *blockArgs) (*client.ResultBlockValidated, error) {
 	fmt.Println(args)
-	return s.client.BlockValidated(req.Context(), (*int64)(&args.Height))
+	return s.client.BlockValidated((*int64)(&args.Height))
 }