From 084e0d65dbeb02ecc41656446ebf3ec2225f7d61 Mon Sep 17 00:00:00 2001
From: Pham Tu <tubackkhoa@gmail.com>
Date: Tue, 5 Mar 2024 14:48:47 +0700
Subject: [PATCH] fix uptime

---
 src/components/UptimeBar.vue         | 8 ++++++--
 src/modules/[chain]/uptime/index.vue | 9 ++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/UptimeBar.vue b/src/components/UptimeBar.vue
index 03ae9138..d91a321b 100644
--- a/src/components/UptimeBar.vue
+++ b/src/components/UptimeBar.vue
@@ -1,5 +1,7 @@
 <script lang="ts" setup>
+import { toHex } from '@cosmjs/encoding';
 import type { Commit } from '@cosmjs/tendermint-rpc';
+import { toBase64 } from '@injectivelabs/sdk-ts';
 import { computed, type PropType } from 'vue';
 
 const props = defineProps({
@@ -12,9 +14,11 @@ const bars = computed(() => {
   if (!props.blocks) return uptime;
   props.blocks.filter(Boolean).forEach((element) => {
     const has = element.signatures?.findIndex(
-      (sig) => sig.validatorAddress === props.validator
+      (sig) =>
+        sig.validatorAddress &&
+        toHex(sig.validatorAddress).toUpperCase() === props.validator
     );
-    // console.log(has, props.validato, element)
+
     uptime.push({
       height: element.height,
       color: has > -1 ? 'bg-green-500' : 'bg-red-500',
diff --git a/src/modules/[chain]/uptime/index.vue b/src/modules/[chain]/uptime/index.vue
index ee753054..ebef2382 100644
--- a/src/modules/[chain]/uptime/index.vue
+++ b/src/modules/[chain]/uptime/index.vue
@@ -56,7 +56,7 @@ const list = computed(() => {
       return {
         v,
         signing,
-        hex: toBase64(fromHex(hexAddress)),
+        hex: hexAddress,
         uptime:
           signing && window > 0
             ? (window - Number(signing.missedBlocksCounter)) / window
@@ -72,7 +72,7 @@ const list = computed(() => {
       return {
         v,
         signing,
-        hex: toBase64(fromHex(consensusPubkeyToHexAddress(v.consensusPubkey))),
+        hex: consensusPubkeyToHexAddress(v.consensusPubkey),
         uptime:
           signing && window > 0
             ? (window - Number(signing.missedBlocksCounter)) / window
@@ -313,7 +313,10 @@ function fetchAllKeyRotation() {
                   :data-tip="`Window size: ${slashingParam.signedBlocksWindow}`"
                   ><span class="ml-2 btn btn-error btn-xs">{{
                     slashingParam.minSignedPerWindow &&
-                    format.percent(fromAscii(slashingParam.minSignedPerWindow))
+                    format.percent(
+                      fromAscii(slashingParam.minSignedPerWindow),
+                      1e18
+                    )
                   }}</span>
                 </span>
               </td>