Merge pull request #661 from Adamant-im/fix/service-nodes-tab

Fix: service nodes tab

Author: bludnic

src/components/SendFundsForm.vue

@@ -189,7 +189,7 @@
 <script>
 import { adm } from '@/lib/nodes'
 import klyIndexer from '@/lib/nodes/kly-indexer'
-import { AllNodesOfflineError } from '@/lib/nodes/utils/errors'
+import { AllNodesDisabledError, AllNodesOfflineError } from '@/lib/nodes/utils/errors'
 import { PendingTransactionError } from '@/lib/pending-transactions'
 import axios from 'axios'
 import { nextTick } from 'vue'
@@ -755,6 +755,10 @@ export default {
             message = this.$t('errors.all_nodes_offline', {
               crypto: error.nodeLabel.toUpperCase()
             })
+          } else if (error instanceof AllNodesDisabledError) {
+            message = this.$t('errors.all_nodes_disabled', {
+              crypto: error.nodeLabel.toUpperCase()
+            })
           } else if (error instanceof PendingTransactionError) {
             message = this.$t('transfer.error_pending_transaction', {
               crypto: error.crypto

src/components/nodes/hooks/useNodeStatus.ts

@@ -22,9 +22,12 @@ function getNodeStatusTitle(node: NodeStatusResult, t: VueI18nTranslation) {
     sync: 'nodes.sync',
     unsupported_version: 'nodes.unsupported'
   }
-  const i18nKey = i18n[node.status]
-
-  return t(i18nKey)
+  if (node.status === 'online') {
+    return i18n[node.status]
+  } else {
+    const i18nKey = i18n[node.status]
+    return t(i18nKey)
+  }
 }
 
 function getNodeStatusDetail(

src/components/nodes/services/ServiceNodesTableItem.vue

@@ -10,6 +10,7 @@
 
     <NodeColumn>
       <NodeUrl :node="node" />
+      <NodeVersion v-if="node.version && active" :node="node" />
     </NodeColumn>
 
     <NodeColumn ping :colspan="isUnsupported ? 2 : 1">
@@ -28,6 +29,7 @@ import NodeColumn from '@/components/nodes/components/NodeColumn.vue'
 import NodeLabel from '@/components/nodes/components/NodeLabel.vue'
 import NodeStatus from '@/components/nodes/components/NodeStatus.vue'
 import NodeStatusCheckbox from '@/components/nodes/components/NodeStatusCheckbox.vue'
+import NodeVersion from '@/components/nodes/components/NodeVersion.vue'
 
 const className = 'nodes-table-item'
 const classes = {
@@ -39,6 +41,7 @@ const classes = {
 
 export default {
   components: {
+    NodeVersion,
     NodeColumn,
     NodeStatus,
     NodeLabel,

src/lib/nodes/eth-indexer/EthIndexer.ts

@@ -39,8 +39,9 @@ export class EthIndexer extends Node<AxiosInstance> {
   }
 
   private async fetchServiceInfo(): Promise<{ height: number }> {
-    const [{ max }] = await this.request('GET /max_block')
+    const [{ max, version }] = await this.request('GET /max_block')
     this.height = max
+    this.version = version
 
     return {
       height: this.height

src/lib/nodes/eth-indexer/types/api/endpoints.ts

@@ -17,6 +17,7 @@ export type Endpoints = {
     result: [
       {
         max: number
+        version: string
       }
     ]
   }

src/lib/nodes/rate-info-service/RateInfoService.ts

@@ -5,6 +5,7 @@ import { NODE_LABELS } from '@/lib/nodes/constants'
 import { RateInfoResponse } from '@/lib/nodes/rate-info-service/types/RateInfoResponse'
 import { RateHistoryInfoResponse } from '@/lib/nodes/rate-info-service/types/RateHistoryInfoResponse'
 import { GetHistoryParams } from '@/lib/nodes/rate-info-service/types/GetHistoryParams'
+import { normalizeHeight } from './utils'
 
 export class RateInfoService extends Node<AxiosInstance> {
   constructor(url: string) {
@@ -31,9 +32,10 @@ export class RateInfoService extends Node<AxiosInstance> {
   protected async checkHealth(): Promise<HealthcheckResult> {
     const start = Date.now()
     const response = await this.getAllRates()
+    this.height = normalizeHeight(response.date)
     return {
       ping: Date.now() - start,
-      height: response.date
+      height: this.height
     }
   }
 }

src/lib/nodes/rate-info-service/utils.ts

@@ -0,0 +1,14 @@
+/**
+ * Normalize the height to 8 digits.
+ * Rounds the timestamp to seconds and removes the first two digits.
+ * @param timestamp Timestamp in milliseconds
+ */
+export const normalizeHeight = (timestamp: number) => {
+  if (!timestamp) return 0
+
+  return Number(
+    Math.ceil(timestamp / 1000)
+      .toString()
+      .substring(2)
+  )
+}

src/locales/ru.json

@@ -190,9 +190,9 @@
     "service": "Сервис",
     "socket": "Сокеты",
     "tabs": {
-      "adm_nodes": "ADM ноды",
-      "coin_nodes": "Coin ноды",
-      "service_nodes": "Сервис ноды"
+      "adm_nodes": "Узлы ADM",
+      "coin_nodes": "Крипто-ноды",
+      "service_nodes": "Крипто-сервисы"
     },
     "unsupported": "Не поддерживается",
     "unsupported_reason_protocol": "HTTP не поддерживается",

src/views/Transactions.vue

@@ -43,6 +43,7 @@ import AppToolbarCentered from '@/components/AppToolbarCentered.vue'
 import InlineSpinner from '@/components/InlineSpinner.vue'
 import TransactionListItem from '@/components/TransactionListItem.vue'
 import { isStringEqualCI } from '@/lib/textHelpers'
+import { AllNodesDisabledError, AllNodesOfflineError } from '@/lib/nodes/utils/errors'
 
 export default {
   components: {
@@ -183,8 +184,18 @@ export default {
           })
           .catch((err) => {
             this.isRejected = true
+            let message = err.message
+            if (err instanceof AllNodesOfflineError) {
+              message = this.$t('errors.all_nodes_offline', {
+                crypto: err.nodeLabel.toUpperCase()
+              })
+            } else if (err instanceof AllNodesDisabledError) {
+              message = this.$t('errors.all_nodes_disabled', {
+                crypto: err.nodeLabel.toUpperCase()
+              })
+            }
             this.$store.dispatch('snackbar/show', {
-              message: err.message
+              message: message
             })
           })
       }