From be6cd1af7c778ca6bf99d5db749b6f281b4ae080 Mon Sep 17 00:00:00 2001
From: liangping <18786721@qq.com>
Date: Thu, 18 May 2023 21:20:19 +0800
Subject: [PATCH] improve ui

---
 package.json                                  |  2 +-
 src/components/dynamic/ArrayObjectElement.vue |  2 +-
 src/components/dynamic/ObjectElement.vue      |  4 +-
 src/libs/registry.ts                          |  4 +-
 src/modules/[chain]/ibc/index.vue             |  2 +-
 src/modules/[chain]/params/index.vue          |  2 +-
 src/modules/[chain]/uptime/index.vue          | 52 ++++++++++++-------
 src/plugins/i18n/locales/en.json              |  2 +-
 src/stores/useBlockchain.ts                   |  4 +-
 src/types/index.ts                            |  3 +-
 src/types/slashing.ts                         | 20 ++++---
 yarn.lock                                     |  8 +--
 12 files changed, 66 insertions(+), 39 deletions(-)

diff --git a/package.json b/package.json
index 46d9d45e..361b8c14 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "md-editor-v3": "^2.8.1",
     "numeral": "^2.0.6",
     "osmojs": "^14.0.0-rc.0",
-    "ping-widget": "^0.0.13",
+    "ping-widget": "^0.0.15",
     "pinia": "^2.0.28",
     "postcss": "^8.4.23",
     "prismjs": "^1.29.0",
diff --git a/src/components/dynamic/ArrayObjectElement.vue b/src/components/dynamic/ArrayObjectElement.vue
index 6ac1fc3e..c693525a 100644
--- a/src/components/dynamic/ArrayObjectElement.vue
+++ b/src/components/dynamic/ArrayObjectElement.vue
@@ -22,7 +22,7 @@ const header = computed(() => {
     <VTable
       v-if="header.length > 0"
       density="compact"
-      height="300px"
+      :height="value.length > 5? '300px': ''"
       fixed-header
       hover
     >
diff --git a/src/components/dynamic/ObjectElement.vue b/src/components/dynamic/ObjectElement.vue
index 4da1192b..74edd991 100644
--- a/src/components/dynamic/ObjectElement.vue
+++ b/src/components/dynamic/ObjectElement.vue
@@ -5,10 +5,10 @@ const props = defineProps(['value']);
 </script>
 <template>
   <div class="overflow-x-auto">
-    <table class="table w-full text-sm">
+    <table class="table table-compact w-full text-sm">
       <tbody>
         <tr v-for="(v, k) of value">
-          <td class="text-capitalize" style="max-width: 100px">{{ String(k).replaceAll("_", " ") }}</td>
+          <td class="text-capitalize whitespace-break-spaces w-1/5" style="min-width: 180px;">{{ String(k).replaceAll("_", " ") }}</td>
           <td>
             <div
               class="overflow-hidden w-auto whitespace-normal"
diff --git a/src/libs/registry.ts b/src/libs/registry.ts
index e3da974c..0b47f38d 100644
--- a/src/libs/registry.ts
+++ b/src/libs/registry.ts
@@ -30,7 +30,7 @@ import type {
   PaginatedProposals,
   Tally,
 } from '@/types/gov';
-import type { PaginatedSigningInfo } from '@/types/slashing';
+import type { PaginatedSigningInfo, SlashingParam } from '@/types/slashing';
 import type {
   Delegation,
   PaginatedDelegations,
@@ -90,7 +90,7 @@ export interface RequestRegistry extends AbstractRegistry {
   }>;
   mint_annual_provisions: Request<{ annual_provisions: string }>;
 
-  slashing_params: Request<any>;
+  slashing_params: Request<{params: SlashingParam}>;
   slashing_signing_info: Request<PaginatedSigningInfo>;
 
   gov_params_voting: Request<GovParams>;
diff --git a/src/modules/[chain]/ibc/index.vue b/src/modules/[chain]/ibc/index.vue
index 1456a2ea..1ae96b85 100644
--- a/src/modules/[chain]/ibc/index.vue
+++ b/src/modules/[chain]/ibc/index.vue
@@ -71,7 +71,7 @@ function color(v: string) {
     {
       meta: {
         i18n: 'ibc',
-        order: 8
+        order: 9
       }
     }
 </route>
diff --git a/src/modules/[chain]/params/index.vue b/src/modules/[chain]/params/index.vue
index 699074ad..d1f1ae51 100644
--- a/src/modules/[chain]/params/index.vue
+++ b/src/modules/[chain]/params/index.vue
@@ -56,7 +56,7 @@ onMounted(() => {
 {
   meta: {
     i18n: 'parameters',
-    order: 10
+    order: 50
   }
 }
 </route>
diff --git a/src/modules/[chain]/uptime/index.vue b/src/modules/[chain]/uptime/index.vue
index 923dc876..c7707b54 100644
--- a/src/modules/[chain]/uptime/index.vue
+++ b/src/modules/[chain]/uptime/index.vue
@@ -1,17 +1,16 @@
 <script lang="ts" setup>
 import { ref, onMounted, computed, watchEffect } from 'vue';
 import { fromHex, toBase64 } from '@cosmjs/encoding';
-import { Icon } from '@iconify/vue';
 import {
   useFormatter,
   useStakingStore,
   useBaseStore,
   useBlockchain,
+useParamStore,
 } from '@/stores';
 import UptimeBar from '@/components/UptimeBar.vue';
-import type { Block, Commit } from '@/types';
+import type { Commit, SlashingParam, SigningInfo } from '@/types';
 import { consensusPubkeyToHexAddress, valconsToBase64 } from '@/libs';
-import type { SigningInfo } from '@/types/slashing';
 
 const props = defineProps(['chain']);
 
@@ -23,6 +22,7 @@ const latest = ref(0);
 const commits = ref([] as Commit[]);
 const keyword = ref('');
 const live = ref(true);
+const slashingParam = ref({} as SlashingParam)
 
 const signingInfo = ref({} as Record<string, SigningInfo>);
 
@@ -36,15 +36,20 @@ const validators = computed(() => {
 });
 
 const list = computed(() => {
-  return validators.value.map(v => ({
-    v, 
-    signing: signingInfo.value[consensusPubkeyToHexAddress(v.consensus_pubkey)],
-    hex: toBase64(fromHex(consensusPubkeyToHexAddress(v.consensus_pubkey)))
-  }))
+  const window = Number(slashingParam.value.signed_blocks_window|| 0)
+  return validators.value.map(v => {
+    const signing = signingInfo.value[consensusPubkeyToHexAddress(v.consensus_pubkey)]
+    return {
+      v, 
+      signing,
+      hex: toBase64(fromHex(consensusPubkeyToHexAddress(v.consensus_pubkey))),
+      uptime: signing && window > 0 ? (window - Number(signing.missed_blocks_counter)) / window: undefined
+    }})
 })
 
 onMounted(() => {
   live.value = true;
+  
   baseStore.fetchLatest().then(b => {
     latest.value = Number(b.block.header.height);
     commits.value.unshift(b.block.last_commit);
@@ -74,6 +79,10 @@ onMounted(() => {
       signingInfo.value[valconsToBase64(i.address)] = i;
     });
   });
+
+  chainStore.rpc.getSlashingParams().then(x => {
+    slashingParam.value = x.params
+  })
 });
 
 const commits2 = computed(() => {
@@ -140,23 +149,24 @@ function changeTab(v: string) {
           <thead class=" capitalize">
             <tr>
               <td>Validator</td>
-              <td>Start Height</td>
-              <td>Signed Precommits</td>
-              <td>Missing blocks</td>
+              <td class="text-right">Uptime</td>
+              <td class="text-right">Signed Precommits</td>
+              <td class="text-right">Start Height</td>
               <td>Last Jailed Time</td>
               <td>Tombstoned</td>
             </tr>
           </thead>
-          <tr v-for="({v, signing}, i) in list">
+          <tr v-for="({v, signing, uptime}, i) in list" class="hover">
             <td><div class="truncate max-w-sm">{{ i+1 }}. {{ v.description.moniker }}</div></td>
-            <td>{{ signing?.start_height }}</td>
-            <td>
-              {{ signing?.index_offset }}
-              <span v-if="signing && signing.jailed_until.startsWith('1970')" class="badge badge-sm">{{ format.percent(Number(signing.index_offset)/(latest-Number(signing.start_height))) }}</span>
+            <td class="text-right">
+              <span v-if="signing" class="" :class="uptime > 0.95 ? 'text-green-500':'text-red-500'"><div class="tooltip" :data-tip="`${signing.missed_blocks_counter} missing blocks`"> {{ format.percent(uptime) }} </div> </span>
             </td>
-            <td>
-              <span v-if="signing" class="badge badge-sm text-white" :class="Number(signing?.missed_blocks_counter) < 10?'badge-success':'badge-error'">{{ signing?.missed_blocks_counter }}</span>
+            <td class="text-right text-xs">
+              {{ signing?.index_offset }}<br>       
+              <span v-if="signing && signing.jailed_until.startsWith('1970')" class="text-xs">{{ format.percent(Number(signing.index_offset)/(latest-Number(signing.start_height))) }}</span>
+      
             </td>
+            <td class="text-right">{{ signing?.start_height }}</td>
             <td><span v-if="signing && !signing.jailed_until.startsWith('1970')">
               <div class="tooltip" :data-tip="format.toDay(signing?.jailed_until, 'long')">
                 <span>{{ format.toDay(signing?.jailed_until, "from") }}</span>
@@ -164,6 +174,12 @@ function changeTab(v: string) {
             </span></td>
             <td class=" capitalize">{{ signing?.tombstoned }}</td>
           </tr>
+          <tfoot>
+            <tr>
+              <td colspan="2" class="text-right"> Minimum uptime per window: <span class="lowercase tooltip" :data-tip="`Window size: ${ slashingParam.signed_blocks_window }`"><span class="ml-2 btn btn-error btn-xs">{{ format.percent(slashingParam.min_signed_per_window) }}</span> </span></td>
+              <td colspan="8"></td>
+            </tr>
+          </tfoot>
         </table>
       </div>
 
diff --git a/src/plugins/i18n/locales/en.json b/src/plugins/i18n/locales/en.json
index caf0f810..68b88651 100644
--- a/src/plugins/i18n/locales/en.json
+++ b/src/plugins/i18n/locales/en.json
@@ -1,7 +1,7 @@
 {
   "module": {
     "dashboard": "Dashboard",
-    "blocks": "Blocks&Transaction",
+    "blocks": "Blocks",
     "staking": "Staking",
     "governance": "Governance",
     "parameters": "Parameters",
diff --git a/src/stores/useBlockchain.ts b/src/stores/useBlockchain.ts
index a9f4738b..6c8f4adf 100644
--- a/src/stores/useBlockchain.ts
+++ b/src/stores/useBlockchain.ts
@@ -15,6 +15,7 @@ import {
   useGovStore,
   useMintStore,
   useStakingStore,
+  useWalletStore,
 } from '.';
 import { useBlockModule } from '@/modules/[chain]/block/block';
 import { DEFAULT } from '@/libs';
@@ -67,7 +68,7 @@ export const useBlockchain = defineStore('blockchain', {
             icon: { image: this.current.logo, size: '22' },
             i18n: false,
             badgeContent: this.isConsumerChain? 'Consumer': undefined,
-            badgeClass: 'bg-secondary',
+            badgeClass: 'bg-warning',
             children: routes
               .filter((x) => x.meta.i18n) // defined menu name
               .filter((x) => !this.current?.features || this.current.features.includes(String(x.meta.i18n))) // filter none-custom module
@@ -124,6 +125,7 @@ export const useBlockchain = defineStore('blockchain', {
       //     const { global } = useTheme();
       //     global.current
       // }
+      useWalletStore().$reset()
       await this.randomSetupEndpoint();
       await useStakingStore().init();
       useBankStore().initial();
diff --git a/src/types/index.ts b/src/types/index.ts
index fda4c486..f5c7aeb1 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -7,4 +7,5 @@ export * from './distribution'
 export * from './gov'
 export * from './staking'
 export * from './tx'
-export * from './ibc'
\ No newline at end of file
+export * from './ibc'
+export * from './slashing'
\ No newline at end of file
diff --git a/src/types/slashing.ts b/src/types/slashing.ts
index 9e4385a1..9208fed1 100644
--- a/src/types/slashing.ts
+++ b/src/types/slashing.ts
@@ -1,14 +1,22 @@
 import type { PaginatedResponse } from "./common";
 
 export interface SigningInfo {
-    "address": string,
-    "start_height": string,
-    "index_offset": string,
-    "jailed_until": string,
-    "tombstoned": boolean,
-    "missed_blocks_counter": string
+    address: string,
+    start_height: string,
+    index_offset: string,
+    jailed_until: string,
+    tombstoned: boolean,
+    missed_blocks_counter: string
 }
 
+export interface SlashingParam{
+    signed_blocks_window: string,
+    min_signed_per_window: string,
+    downtime_jail_duration: string,
+    slash_fraction_double_sign: string,
+    slash_fraction_downtime: string
+  }
+
 export interface PaginatedSigningInfo extends PaginatedResponse {
     info: SigningInfo[]
 }
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 476a400e..b3e2d9af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6808,10 +6808,10 @@ pify@^3.0.0:
   resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"
   integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
 
-ping-widget@^0.0.13:
-  version "0.0.13"
-  resolved "https://registry.yarnpkg.com/ping-widget/-/ping-widget-0.0.13.tgz#3738882da243871f7ed322cd75ef7b1bed8fd3bb"
-  integrity sha512-BPpPcwDdffqHFO/6MeD3JleGWLFhOSSQLG2L0WaI1aiAe1em8gTC03refg86CjjwXtU4XtwJ0xnXgbJAVvZzjA==
+ping-widget@^0.0.15:
+  version "0.0.15"
+  resolved "https://registry.yarnpkg.com/ping-widget/-/ping-widget-0.0.15.tgz#b15698ab7649fc8bd2318d7488366f3b30bcf5c6"
+  integrity sha512-aWUJwtwWbL7AXsAXpzQX8G5IQgGbhV5EM96wmcEez9Wp/UbwJ5BYOj8fdVDdW4yjzScnJ35R9KnHlpoOhzlF0g==
   dependencies:
     "@cosmjs/amino" "^0.30.1"
     "@cosmjs/ledger-amino" "^0.30.1"