fix(relayer): return consensus block height

lib/cchain/provider/abci.go

@@ -382,7 +382,7 @@ func newABCIFetchFunc(attCl atypes.QueryClient, cmtCl cmtservice.ServiceClient,
 		// Caller has to wait and retry in both cases
 		if !ok || earliestAttestationAtLatestHeight.AttestOffset < fromOffset {
 			// First attestation hasn't happened yet, return empty and set cursor to latest height
-			return []xchain.Attestation{}, earliestAttestationAtLatestHeight.BlockHeight, nil
+			return []xchain.Attestation{}, cursor, nil
 		}
 
 		latestBlockResp, err := cmtCl.GetLatestBlock(ctx, &cmtservice.GetLatestBlockRequest{})

lib/cchain/provider/provider.go

@@ -195,10 +195,10 @@ func (p Provider) stream(
 	deps := stream.Deps[xchain.Attestation]{
 		FetchBatch: func(ctx context.Context, offset uint64) ([]xchain.Attestation, error) {
 			atts, cursor, err := p.fetch(ctx, chainVer, offset, fetchCursor)
+			fetchCursor = cursor // always set cursor, in case of an error is set to 0, safer for retry
 			if err != nil {
 				return nil, err
 			}
-			fetchCursor = cursor
 
 			return atts, nil
 		},