refactor: remove sia central

SiaFoundation · Feb 25, 2025 · 0745508 · 0745508
1 parent 2bdac41
commit 0745508
Show file tree

Hide file tree

Showing 100 changed files with 789 additions and 1,934 deletions.
diff --git a/.changeset/ten-geckos-rest.md b/.changeset/ten-geckos-rest.md
@@ -1,7 +1,6 @@
 ---
 '@siafoundation/e2e': minor
 '@siafoundation/sia-central-mock': minor
-'@siafoundation/walletd-mock': minor
 ---
 
 Upgraded playwright dependencies.
diff --git a/README.md b/README.md
@@ -73,8 +73,6 @@ The Sia web libraries provide developers with convenient TypeScript SDKs for usi
 - [explorer-e2e](apps/explorer-e2e) - App for testing explorer.
 - [e2e](libs/e2e) - Shared e2e testing code.
 - [@siafoundation/clusterd](libs/clusterd) - Methods for controlling `clusterd` in e2e testing.
-- [@siafoundation/walletd-mock](libs/walletd-mock) - `walletd` data and API mock library for testing.
-- [@siafoundation/sia-central-mock](libs/sia-central-mock) - Sia Central data and API mock library for testing.
 
 ## Development
 

diff --git a/apps/hostd-e2e/src/fixtures/beforeTest.ts b/apps/hostd-e2e/src/fixtures/beforeTest.ts
@@ -1,4 +1,3 @@
-import { mockApiSiaCentralHostsNetworkAverages } from '@siafoundation/sia-central-mock'
 import { login } from './login'
 import { Page } from 'playwright'
 import {
@@ -11,11 +10,12 @@ import {
   clickIf,
   setCurrencyDisplay,
   mockApiSiaScanExchangeRates,
+  mockApiSiaScanHostMetrics,
 } from '@siafoundation/e2e'
 
 export async function beforeTest(page: Page, { renterdCount = 0 } = {}) {
   await mockApiSiaScanExchangeRates({ page })
-  await mockApiSiaCentralHostsNetworkAverages({ page })
+  await mockApiSiaScanHostMetrics({ page })
   await setupCluster({ hostdCount: 1, renterdCount })
   const hostdNode = clusterd.nodes.find((n) => n.type === 'hostd')
   await hostdWaitForContracts({ hostdNode, renterdCount })

diff --git a/apps/hostd/components/CmdRoot/AppCmdGroup.tsx b/apps/hostd/components/CmdRoot/AppCmdGroup.tsx
@@ -46,12 +46,12 @@ export function AppCmdGroup({ currentPage, parentPage }: Props) {
         currentPage={currentPage}
         commandPage={commandPage}
         onSelect={() => {
-          setExternalDataSettings({ siaCentral: !settings.siaCentral })
+          setExternalDataSettings({ siascan: !settings.siascan })
           closeDialog()
         }}
       >
-        {(settings.siaCentral ? 'Disable' : 'Enable') +
-          ' external API - Sia Central exchange rates'}
+        {(settings.siascan ? 'Disable' : 'Enable') +
+          ' external API - Siascan exchange rates'}
       </CommandItemSearch>
       <CommandItemRootAndSearch
         currentPage={currentPage}

diff --git a/apps/renterd-e2e/src/fixtures/beforeTest.ts b/apps/renterd-e2e/src/fixtures/beforeTest.ts
@@ -1,6 +1,5 @@
 import { login } from './login'
 import { Page } from 'playwright'
-import { mockApiSiaCentralHostsNetworkAverages } from '@siafoundation/sia-central-mock'
 import {
   clusterd,
   setupCluster,
@@ -11,11 +10,12 @@ import {
   setCurrencyDisplay,
   mockApiSiaScanExchangeRates,
   clickIf,
+  mockApiSiaScanHostMetrics,
 } from '@siafoundation/e2e'
 
 export async function beforeTest(page: Page, { hostdCount = 0 } = {}) {
   await mockApiSiaScanExchangeRates({ page })
-  await mockApiSiaCentralHostsNetworkAverages({ page })
+  await mockApiSiaScanHostMetrics({ page })
   await setupCluster({ renterdCount: 1, hostdCount })
   const renterdNode = clusterd.nodes.find((n) => n.type === 'renterd')
   await renterdWaitForContracts({ renterdNode, hostdCount })

diff --git a/apps/renterd-e2e/src/specs/externalData.spec.ts b/apps/renterd-e2e/src/specs/externalData.spec.ts
@@ -2,11 +2,6 @@ import { test, expect } from '@playwright/test'
 import { afterTest } from '../fixtures/beforeTest'
 import { clusterd, setupCluster } from '@siafoundation/clusterd'
 import { login } from '../fixtures/login'
-import {
-  mockApiSiaCentralHostsNetworkAverages,
-  mockApiSiaCentralHostsNetworkAveragesHanging,
-  mockApiSiaCentralHostsNetworkAveragesUnroute,
-} from '@siafoundation/sia-central-mock'
 import { configResetBasicSettings } from '../fixtures/configResetSettings'
 import {
   expectTextInputByName,
@@ -15,11 +10,14 @@ import {
   mockApiSiaScanExchangeRatesUnroute,
   mockApiSiaScanExchangeRatesHanging,
   fillSelectInputByName,
+  mockApiSiaScanHostMetrics,
+  mockApiSiaScanHostMetricsUnroute,
+  mockApiSiaScanHostMetricsHanging,
 } from '@siafoundation/e2e'
 
 test.beforeEach(async ({ page }) => {
   await mockApiSiaScanExchangeRates({ page })
-  await mockApiSiaCentralHostsNetworkAverages({ page })
+  await mockApiSiaScanHostMetrics({ page })
   await setupCluster({ renterdCount: 1 })
   const renterdNode = clusterd.nodes.find((n) => n.type === 'renterd')
   await login({
@@ -83,8 +81,8 @@ test('configuration shows not-enabled message when exchange rates API hangs', as
 test('configuration does not show network averages when sia central API hangs', async ({
   page,
 }) => {
-  await mockApiSiaCentralHostsNetworkAveragesUnroute({ page })
-  await mockApiSiaCentralHostsNetworkAveragesHanging({ page })
+  await mockApiSiaScanHostMetricsUnroute({ page })
+  await mockApiSiaScanHostMetricsHanging({ page })
   await page.reload()
 
   await fillSelectInputByName(page, 'pinnedCurrency', 'usd')
@@ -120,8 +118,8 @@ test('configuration does not show network averages when sia central API hangs',
     page.getByTestId('maxDownloadPriceTBGroup').getByText('Network average')
   ).toBeHidden()
 
-  await mockApiSiaCentralHostsNetworkAveragesUnroute({ page })
-  await mockApiSiaCentralHostsNetworkAverages({ page })
+  await mockApiSiaScanHostMetricsUnroute({ page })
+  await mockApiSiaScanHostMetrics({ page })
   await page.reload()
 
   // Regular field should be shown.

diff --git a/apps/renterd/components/CmdRoot/AppCmdGroup.tsx b/apps/renterd/components/CmdRoot/AppCmdGroup.tsx
@@ -46,12 +46,12 @@ export function AppCmdGroup({ currentPage, parentPage }: Props) {
         currentPage={currentPage}
         commandPage={commandPage}
         onSelect={() => {
-          setExternalDataSettings({ siaCentral: !settings.siaCentral })
+          setExternalDataSettings({ siascan: !settings.siascan })
           closeDialog()
         }}
       >
-        {(settings.siaCentral ? 'Disable' : 'Enable') +
-          ' external API - Sia Central exchange rates'}
+        {(settings.siascan ? 'Disable' : 'Enable') +
+          ' external API - Siascan exchange rates'}
       </CommandItemSearch>
       <CommandItemRootAndSearch
         currentPage={currentPage}

diff --git a/apps/renterd/components/Hosts/HostMap/HostItem.tsx b/apps/renterd/components/Hosts/HostMap/HostItem.tsx
@@ -7,17 +7,15 @@ import {
 } from '@siafoundation/design-system'
 import { cx } from 'class-variance-authority'
 import BigNumber from 'bignumber.js'
-import { SiaCentralHost } from '@siafoundation/sia-central-types'
 import {
   monthsToBlocks,
   TBToBytes,
   humanBytes,
   humanSiacoin,
-  getDownloadSpeed,
-  getUploadSpeed,
 } from '@siafoundation/units'
+import { ExplorerHost } from '@siafoundation/explored-types'
 
-type Host = SiaCentralHost
+type Host = ExplorerHost
 
 type Props = {
   host: Host
@@ -39,14 +37,14 @@ export function HostItem({
   const storageCost = useMemo(
     () =>
       rates
-        ? `$${new BigNumber(host.settings?.storage_price || 0)
+        ? `$${new BigNumber(host.settings?.storageprice || 0)
             .times(TBToBytes(1))
             .times(monthsToBlocks(1))
             .div(1e24)
             .times(rates?.usd || 1)
             .toFixed(2)}/TB`
         : `${humanSiacoin(
-            new BigNumber(host.settings?.storage_price || 0)
+            new BigNumber(host.settings?.storageprice || 0)
               .times(TBToBytes(1))
               .times(monthsToBlocks(1)),
             { fixed: 0 }
@@ -57,13 +55,13 @@ export function HostItem({
   const downloadCost = useMemo(
     () =>
       rates
-        ? `$${new BigNumber(host.settings?.download_price || 0)
+        ? `$${new BigNumber(host.settings?.downloadbandwidthprice || 0)
             .times(TBToBytes(1))
             .div(1e24)
             .times(rates?.usd || 1)
             .toFixed(2)}/TB`
         : `${humanSiacoin(
-            new BigNumber(host.settings?.download_price || 0).times(
+            new BigNumber(host.settings?.downloadbandwidthprice || 0).times(
               TBToBytes(1)
             ),
             { fixed: 0 }
@@ -74,13 +72,15 @@ export function HostItem({
   const uploadCost = useMemo(
     () =>
       rates
-        ? `$${new BigNumber(host.settings?.upload_price || 0)
+        ? `$${new BigNumber(host.settings?.uploadbandwidthprice || 0)
             .times(TBToBytes(1))
             .div(1e24)
             .times(rates?.usd || 1)
             .toFixed(2)}/TB`
         : `${humanSiacoin(
-            new BigNumber(host.settings?.upload_price || 0).times(TBToBytes(1)),
+            new BigNumber(host.settings?.uploadbandwidthprice || 0).times(
+              TBToBytes(1)
+            ),
             { fixed: 0 }
           )}/TB`,
     [rates, host]
@@ -91,7 +91,7 @@ export function HostItem({
       content={
         <div className="flex flex-col gap-1">
           <Text size="12" color="contrast" weight="bold">
-            {countryCodeEmoji(host.country_code)} {host.country_code}
+            {countryCodeEmoji(host.countryCode)} {host.countryCode}
           </Text>
           <div className="flex gap-2">
             <div className="flex flex-col gap-1">
@@ -105,17 +105,6 @@ export function HostItem({
                 upload
               </Text>
             </div>
-            <div className="flex flex-col gap-1">
-              <Text size="12" color="contrast">
-                {humanBytes(host.settings?.total_storage || 0)}
-              </Text>
-              <Text size="12" color="contrast">
-                {getDownloadSpeed(host)}
-              </Text>
-              <Text size="12" color="contrast">
-                {getUploadSpeed(host)}
-              </Text>
-            </div>
             <div className="flex flex-col gap-1">
               <Text size="12" color="contrast">
                 {storageCost}
@@ -130,7 +119,7 @@ export function HostItem({
           </div>
         </div>
       }
-      key={host.public_key}
+      key={host.publicKey}
     >
       <Button
         variant="ghost"
@@ -140,30 +129,29 @@ export function HostItem({
           }
         }}
         onClick={() => {
-          selectActiveHost(host.public_key)
+          selectActiveHost(host.publicKey)
         }}
         className={cx(
           'flex gap-1',
-          host.public_key === activeHost?.public_key
+          host.publicKey === activeHost?.publicKey
             ? 'opacity-100'
             : 'opacity-50',
           'hover:opacity-100'
         )}
       >
         <Text size="12" noWrap>
-          {countryCodeEmoji(host.country_code)}
+          {countryCodeEmoji(host.countryCode)}
         </Text>
         <Text
           color="contrast"
           size="12"
           className="text-white"
           noWrap
           weight={
-            host.public_key === activeHost?.public_key ? 'semibold' : 'regular'
+            host.publicKey === activeHost?.publicKey ? 'semibold' : 'regular'
           }
         >
-          {humanBytes(host.settings?.total_storage || 0)}
-          {host.benchmark && ` · ${getDownloadSpeed(host)}`}
+          {humanBytes(host.settings?.totalstorage || 0)}
           {' · '}
           {storageCost}
         </Text>

diff --git a/apps/renterd/components/Hosts/HostMap/index.tsx b/apps/renterd/components/Hosts/HostMap/index.tsx
@@ -9,7 +9,7 @@ export function HostMap() {
   const { gpu, settings } = useAppSettings()
   const { setCmd, activeHost, onHostMapClick, hostsWithLocation } = useHosts()
 
-  if (settings.siaCentral && !gpu.shouldRender) {
+  if (settings.siascan && !gpu.shouldRender) {
     return null
   }
 

diff --git a/apps/renterd/components/Hosts/HostsActionsMenu.tsx b/apps/renterd/components/Hosts/HostsActionsMenu.tsx
@@ -20,8 +20,8 @@ export function HostsActionsMenu() {
       </Button>
       <Tooltip
         content={
-          !settings.siaCentral
-            ? 'Enable Sia Central to view interactive map'
+          !settings.siascan
+            ? 'Enable Siascan to view interactive map'
             : gpu.canGpuRender && gpu.isGpuEnabled
             ? 'Toggle interactive map'
             : 'Enable GPU to view interactive map'
@@ -30,7 +30,7 @@ export function HostsActionsMenu() {
         <Button
           disabled={!gpu.canGpuRender}
           onClick={() => {
-            if (!settings.siaCentral) {
+            if (!settings.siascan) {
               openDialog('settings')
               return
             }

diff --git a/apps/renterd/contexts/config/transform.spec.ts b/apps/renterd/contexts/config/transform.spec.ts
@@ -375,11 +375,6 @@ describe('tansforms', () => {
           gouging: { data: gouging },
           pinned: { data: pinned },
           upload: { data: upload },
-          appSettings: {
-            settings: {
-              siaCentral: false,
-            },
-          },
         },
         renterdState: {
           network: 'mainnet' as const,