fix: hostd metrics

Author: alexfreska

.changeset/shiny-onions-unite.md

@@ -0,0 +1,5 @@
+---
+'hostd': minor
+---
+
+The contracts metrics now show active, rejected, failed, renewed, finalized, and successful.

.changeset/spicy-boats-sneeze.md

@@ -0,0 +1,7 @@
+---
+'@siafoundation/hostd-types': minor
+'@siafoundation/hostd-js': minor
+'@siafoundation/hostd-react': minor
+---
+
+The metrics API types now include all available fields.

.changeset/sweet-meals-flash.md

@@ -0,0 +1,7 @@
+---
+'@siafoundation/hostd-types': minor
+'@siafoundation/hostd-js': minor
+'@siafoundation/hostd-react': minor
+---
+
+The metrics APIs now include wallet with balance and immatureBalance. Closes https://github.com/SiaFoundation/hostd/issues/450

apps/hostd/components/Home/HomeContracts.tsx

@@ -34,6 +34,16 @@ export function HomeContracts() {
           isLoading={contracts.isLoading}
           enabledModes={['latest', 'average']}
         />
+        <DatumCardConfigurable
+          category="contracts"
+          label="Renewed contracts"
+          color={contracts.config.data['renewed'].color}
+          value={contracts.stats['renewed']}
+          valueFormat={(v) => v.toFixed(0)}
+          defaultMode="latest"
+          isLoading={contracts.isLoading}
+          enabledModes={['latest', 'average']}
+        />
         <DatumCardConfigurable
           category="contracts"
           label="Failed contracts"

apps/hostd/config/charts.ts

@@ -2,24 +2,26 @@ import { colors } from '@siafoundation/design-system'
 
 export const chartConfigs = {
   // states
-  successful: {
-    color: colors.green[600],
-  },
   active: {
     color: colors.amber[600],
     // pattern: true,
   },
-  pending: {
-    color: colors.amber[600],
-    pattern: true,
-  },
   rejected: {
     color: colors.red[600],
     // pattern: true,
   },
   failed: {
     color: colors.red[600],
   },
+  renewed: {
+    color: colors.blue[600],
+  },
+  finalized: {
+    color: colors.yellow[600],
+  },
+  successful: {
+    color: colors.green[600],
+  },
   // potential: {
   //   color: colors.amber[600],
   //   pattern: true,

apps/hostd/contexts/metrics/index.tsx

@@ -381,9 +381,10 @@ function useMetricsMain() {
       metricsPeriod.data
         ?.map((m) => ({
           active: m.contracts.active,
-          failed: m.contracts.failed,
-          pending: m.contracts.pending,
           rejected: m.contracts.rejected,
+          failed: m.contracts.failed,
+          renewed: m.contracts.renewed,
+          finalized: m.contracts.finalized,
           successful: m.contracts.successful,
           timestamp: new Date(m.timestamp).getTime(),
         }))
@@ -395,13 +396,28 @@ function useMetricsMain() {
       data,
       stats,
       config: {
-        enabledGraph: ['successful', 'active', 'pending', 'rejected', 'failed'],
-        enabledTip: ['successful', 'active', 'pending', 'rejected', 'failed'],
+        enabledGraph: [
+          'active',
+          'rejected',
+          'failed',
+          'renewed',
+          'finalized',
+          'successful',
+        ],
+        enabledTip: [
+          'active',
+          'rejected',
+          'failed',
+          'renewed',
+          'finalized',
+          'successful',
+        ],
         data: {
           active: chartConfigs.active,
-          failed: chartConfigs.failed,
-          pending: chartConfigs.pending,
           rejected: chartConfigs.rejected,
+          failed: chartConfigs.failed,
+          renewed: chartConfigs.renewed,
+          finalized: chartConfigs.finalized,
           successful: chartConfigs.successful,
         },
         format: (v) => `${v} contracts`,

apps/hostd/contexts/metrics/types.tsx

@@ -30,10 +30,11 @@ export type PricingKeys =
   | 'storage'
 
 export type ContractsKeys =
-  | 'failed'
-  | 'rejected'
-  | 'pending'
   | 'active'
+  | 'rejected'
+  | 'failed'
+  | 'renewed'
+  | 'finalized'
   | 'successful'
 
 export type StorageKeys =

apps/hostd/contexts/transactions/index.tsx

@@ -160,7 +160,7 @@ function useTransactionsMain() {
       (metrics.data || [])
         .map((t) => {
           return {
-            sc: Number(t.balance),
+            sc: Number(t.wallet.balance),
             timestamp: new Date(t.timestamp).getTime(),
           }
         })

internal/cluster/bin/clusterd

@@ -231,27 +231,25 @@ type Revenue = {
   registryWrite: string
 }
 
-// Data is a collection of metrics related to data usage.
-type Data = {
+type DataRHPMetrics = {
   // Ingress returns the number of bytes received by the host.
   ingress: number
   // Egress returns the number of bytes sent by the host.
   egress: number
 }
 
-// Contracts is a collection of metrics related to contracts.
-type Contracts = {
-  pending: number
+type ContractMetrics = {
   active: number
   rejected: number
   failed: number
+  renewed: number
+  finalized: number
   successful: number
   lockedCollateral: string
   riskedCollateral: string
 }
 
-// Pricing is a collection of metrics related to the host's pricing settings.
-type Pricing = {
+type PricingMetrics = {
   contractPrice: string
   ingressPrice: string
   egressPrice: string
@@ -261,44 +259,54 @@ type Pricing = {
   collateralMultiplier: number
 }
 
-// Registry is a collection of metrics related to the host's registry.
-type Registry = {
+type RegistryMetrics = {
   entries: number
   maxEntries: number
 
   reads: number
   writes: number
 }
 
-// Storage is a collection of metrics related to storage.
-type Storage = {
+type StorageMetrics = {
   totalSectors: number
   physicalSectors: number
+  lostSectors: number
   contractSectors: number
   tempSectors: number
   reads: number
   writes: number
+  sectorCacheHits: number
+  sectorCacheMisses: number
 }
 
-// RevenueMetrics is a collection of metrics related to revenue.
 type RevenueMetrics = {
   potential: Revenue
   earned: Revenue
 }
 
-// DataMetrics is a collection of metrics related to data usage.
 type DataMetrics = {
-  rhp: Data
+  rhp: DataRHPMetrics
+}
+
+type AccountMetrics = {
+  active: number
+  balance: string
+}
+
+type WalletMetrics = {
+  balance: string
+  immatureBalance: string
 }
 
 export type Metrics = {
+  accounts: AccountMetrics
   revenue: RevenueMetrics
-  pricing: Pricing
-  contracts: Contracts
-  storage: Storage
-  registry: Registry
+  pricing: PricingMetrics
+  contracts: ContractMetrics
+  storage: StorageMetrics
+  registry: RegistryMetrics
   data: DataMetrics
-  balance: string
+  wallet: WalletMetrics
   timestamp: string
 }
 

libs/hostd-types/src/api.ts

@@ -189,6 +189,15 @@ export type WalletSignPayload = {
 }
 export type WalletSignResponse = Transaction
 
+export type WalletSendParams = void
+export type WalletSendPayload = {
+  address: string
+  amount: Currency
+  subtractMinerFee: boolean
+  useUnconfirmed: boolean
+}
+export type WalletSendResponse = Transaction
+
 export type WalletRedistributeParams = void
 export type WalletRedistributePayload = {
   amount: Currency