fix: Switch cosmos latest block endpoint (#47)

cosmos/rest_latest_block.go

@@ -5,7 +5,6 @@ import (
 	"time"
 )
 
-// Block represents a block on a Cosmos blockchain.
 type Block struct {
 	BlockID struct {
 		Hash  string `json:"hash"`
@@ -56,7 +55,7 @@ type Block struct {
 				} `json:"parts"`
 			} `json:"block_id"`
 			Signatures []struct {
-				BlockIDFlag      int       `json:"block_id_flag"`
+				BlockIDFlag      string    `json:"block_id_flag"`
 				ValidatorAddress string    `json:"validator_address"`
 				Timestamp        time.Time `json:"timestamp"`
 				Signature        string    `json:"signature"`
@@ -68,6 +67,6 @@ type Block struct {
 // LatestBlock queries the latest block from the Cosmos REST API given the baseURL.
 func (c RestClient) LatestBlock(ctx context.Context) (Block, error) {
 	var latestBlock Block
-	err := c.get(ctx, "/blocks/latest", &latestBlock)
+	err := c.get(ctx, "/cosmos/base/tendermint/v1beta1/blocks/latest", &latestBlock)
 	return latestBlock, err
 }

cosmos/rest_latest_block_test.go

@@ -12,8 +12,8 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-//go:embed testdata/block.json
-var blockFixture []byte
+//go:embed testdata/latest_block.json
+var latestBlockFixture []byte
 
 type mockHTTPClient struct {
 	GetFn func(ctx context.Context, path string) (*http.Response, error)
@@ -35,18 +35,20 @@ func TestClient_LatestBlock(t *testing.T) {
 		var httpClient mockHTTPClient
 		httpClient.GetFn = func(ctx context.Context, path string) (*http.Response, error) {
 			require.NotNil(t, ctx)
-			require.Equal(t, "/blocks/latest", path)
+			require.Equal(t, "/cosmos/base/tendermint/v1beta1/blocks/latest", path)
 
 			return &http.Response{
 				StatusCode: 200,
-				Body:       io.NopCloser(bytes.NewReader(blockFixture)),
+				Body:       io.NopCloser(bytes.NewReader(latestBlockFixture)),
 			}, nil
 		}
 		client := NewRestClient(httpClient)
 		got, err := client.LatestBlock(ctx)
 
 		require.NoError(t, err)
-		require.Equal(t, "15226219", got.Block.Header.Height)
+		require.Equal(t, "15312655", got.Block.Header.Height)
+		require.Equal(t, "15312654", got.Block.LastCommit.Height)
+		require.Equal(t, "cosmoshub-4", got.Block.Header.ChainID)
 	})
 
 	t.Run("error", func(t *testing.T) {

cosmos/validator_task.go

@@ -3,7 +3,7 @@ package cosmos
 import (
 	"bytes"
 	"context"
-	"encoding/hex"
+	"encoding/base64"
 	"errors"
 	"fmt"
 	"strconv"
@@ -86,19 +86,21 @@ func (task ValidatorTask) processSignedBlocks(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	height, err := strconv.ParseFloat(block.Block.LastCommit.Height, 64)
-	if err != nil {
-		return fmt.Errorf("parse block last commit height: %w", err)
-	}
 
 	for _, sig := range block.Block.LastCommit.Signatures {
-		sigHex, err := hex.DecodeString(sig.ValidatorAddress)
+		sigHex, err := base64.StdEncoding.DecodeString(sig.ValidatorAddress)
 		if err != nil {
 			return err
 		}
 		if bytes.Equal(sigHex, valHex) {
-			task.metrics.SetValSignedBlock(task.chainID, task.consaddress, height)
 			task.metrics.IncValSignedBlocks(task.chainID, task.consaddress)
+
+			height, err := strconv.ParseFloat(block.Block.LastCommit.Height, 64)
+			if err != nil {
+				return fmt.Errorf("parse block last commit height: %w", err)
+			}
+			task.metrics.SetValSignedBlock(task.chainID, task.consaddress, height)
+
 			break
 		}
 	}

cosmos/validator_task_test.go

@@ -137,7 +137,7 @@ func TestValidatorTask_Run(t *testing.T) {
 		require.Zero(t, metrics.GotSignedBlock)
 
 		var block Block
-		require.NoError(t, json.Unmarshal(blockFixture, &block))
+		require.NoError(t, json.Unmarshal(latestBlockFixture, &block))
 		block.Block.LastCommit.Height = "9001"
 		client.StubBlock = block