refactor: request api, renterd and sia central sdks

SiaFoundation · Apr 16, 2024 · 859a281 · 859a281
1 parent f97a2c6
commit 859a281
Show file tree

Hide file tree

Showing 67 changed files with 372 additions and 612 deletions.
diff --git a/.changeset/breezy-bees-design.md b/.changeset/breezy-bees-design.md
@@ -0,0 +1,6 @@
+---
+'@siafoundation/renterd-js': minor
+'@siafoundation/request': minor
+---
+
+The request API has been updated to return [data, error, response].
diff --git a/.changeset/chilly-pants-provide.md b/.changeset/chilly-pants-provide.md
@@ -0,0 +1,6 @@
+---
+'explorer': minor
+'website': minor
+---
+
+The site now uses the updated Sia Central SDK.
diff --git a/.changeset/odd-pets-fix.md b/.changeset/odd-pets-fix.md
@@ -0,0 +1,5 @@
+---
+'@siafoundation/sia-central-js': minor
+---
+
+The SDK has been updated to use the request library.
diff --git a/apps/explorer/app/address/[id]/opengraph-image.tsx b/apps/explorer/app/address/[id]/opengraph-image.tsx
@@ -1,7 +1,6 @@
-import { getSiaCentralAddress } from '@siafoundation/sia-central-js'
 import { humanSiacoin, humanSiafund } from '@siafoundation/units'
 import { getOGImage } from '../../../components/OGImageEntity'
-import { siaCentralApi } from '../../../config'
+import { siaCentral } from '../../../config/siaCentral'
 import { truncate } from '@siafoundation/design-system'
 
 export const revalidate = 0
@@ -16,13 +15,10 @@ export const contentType = 'image/png'
 
 export default async function Image({ params }) {
   const id = params?.id as string
-  const { data: a } = await getSiaCentralAddress({
+  const [a] = await siaCentral.address({
     params: {
       id,
     },
-    config: {
-      api: siaCentralApi,
-    },
   })
 
   if (!a) {

diff --git a/apps/explorer/app/address/[id]/page.tsx b/apps/explorer/app/address/[id]/page.tsx
@@ -1,9 +1,8 @@
-import { getSiaCentralAddress } from '@siafoundation/sia-central-js'
 import { Address } from '../../../components/Address'
 import { Metadata } from 'next'
 import { routes } from '../../../config/routes'
 import { buildMetadata } from '../../../lib/utils'
-import { siaCentralApi } from '../../../config'
+import { siaCentral } from '../../../config/siaCentral'
 import { notFound } from 'next/navigation'
 import { truncate } from '@siafoundation/design-system'
 
@@ -23,19 +22,12 @@ export const revalidate = 0
 
 export default async function Page({ params }) {
   const id = params?.id as string
-  const { data: a, error } = await getSiaCentralAddress({
+  const [a] = await siaCentral.address({
     params: {
       id,
     },
-    config: {
-      api: siaCentralApi,
-    },
   })
 
-  if (error) {
-    throw Error(error)
-  }
-
   if (a?.unspent_siacoins == undefined) {
     return notFound()
   }

diff --git a/apps/explorer/app/block/[id]/opengraph-image.tsx b/apps/explorer/app/block/[id]/opengraph-image.tsx
@@ -1,7 +1,6 @@
-import { getSiaCentralBlock } from '@siafoundation/sia-central-js'
 import { humanDate } from '@siafoundation/units'
 import { getOGImage } from '../../../components/OGImageEntity'
-import { siaCentralApi } from '../../../config'
+import { siaCentral } from '../../../config/siaCentral'
 import { truncate } from '@siafoundation/design-system'
 
 export const revalidate = 0
@@ -16,13 +15,10 @@ export const contentType = 'image/png'
 
 export default async function Image({ params }) {
   const id = params?.id as string
-  const { data: b } = await getSiaCentralBlock({
+  const [b] = await siaCentral.block({
     params: {
       id,
     },
-    config: {
-      api: siaCentralApi,
-    },
   })
 
   if (!b || !b.block) {

diff --git a/apps/explorer/app/block/[id]/page.tsx b/apps/explorer/app/block/[id]/page.tsx
@@ -2,9 +2,8 @@ import { getTitleId } from '@siafoundation/design-system'
 import { Block } from '../../../components/Block'
 import { routes } from '../../../config/routes'
 import { Metadata } from 'next'
-import { getSiaCentralBlock } from '@siafoundation/sia-central-js'
 import { buildMetadata } from '../../../lib/utils'
-import { siaCentralApi } from '../../../config'
+import { siaCentral } from '../../../config/siaCentral'
 import { notFound } from 'next/navigation'
 
 export function generateMetadata({ params }): Metadata {
@@ -34,19 +33,12 @@ export const revalidate = 0
 
 export default async function Page({ params }) {
   const id = params?.id as string
-  const { data: b, error } = await getSiaCentralBlock({
+  const [b] = await siaCentral.block({
     params: {
       id,
     },
-    config: {
-      api: siaCentralApi,
-    },
   })
 
-  if (error) {
-    throw Error(error)
-  }
-
   if (!b?.block) {
     return notFound()
   }

diff --git a/apps/explorer/app/contract/[id]/opengraph-image.tsx b/apps/explorer/app/contract/[id]/opengraph-image.tsx
@@ -1,10 +1,6 @@
-import {
-  getSiaCentralContract,
-  getSiaCentralExchangeRates,
-} from '@siafoundation/sia-central-js'
 import { humanBytes, humanDate } from '@siafoundation/units'
 import { getOGImage } from '../../../components/OGImageEntity'
-import { siaCentralApi } from '../../../config'
+import { siaCentral } from '../../../config/siaCentral'
 import { truncate } from '@siafoundation/design-system'
 import { lowerCase } from '@technically/lodash'
 import { siacoinToFiat } from '../../../lib/currency'
@@ -25,18 +21,15 @@ const currency = currencyOptions.find((c) => c.id === 'usd') as CurrencyOption
 export default async function Image({ params }) {
   const id = params?.id as string
 
-  const [{ data: c }, { data: r }] = await Promise.all([
-    getSiaCentralContract({
+  const [[c], [r]] = await Promise.all([
+    siaCentral.contract({
       params: {
         id,
       },
-      config: {
-        api: siaCentralApi,
-      },
     }),
-    getSiaCentralExchangeRates({
-      config: {
-        api: siaCentralApi,
+    siaCentral.exchangeRates({
+      params: {
+        currencies: 'sc',
       },
     }),
   ])

diff --git a/apps/explorer/app/contract/[id]/page.tsx b/apps/explorer/app/contract/[id]/page.tsx
@@ -1,14 +1,9 @@
 import { SiaCentralContract } from '@siafoundation/sia-central-types'
-import {
-  getSiaCentralContract,
-  getSiaCentralExchangeRates,
-  getSiaCentralTransaction,
-} from '@siafoundation/sia-central-js'
 import { ContractView } from '../../../components/ContractView'
 import { Metadata } from 'next'
 import { routes } from '../../../config/routes'
 import { buildMetadata } from '../../../lib/utils'
-import { siaCentralApi } from '../../../config'
+import { siaCentral } from '../../../config/siaCentral'
 import { notFound } from 'next/navigation'
 import { truncate } from '@siafoundation/design-system'
 
@@ -28,50 +23,40 @@ export const revalidate = 0
 
 export default async function Page({ params }) {
   const id = params?.id as string
-  const [{ data: c, error }, { data: r }] = await Promise.all([
-    getSiaCentralContract({
+  const [[c, error], [r]] = await Promise.all([
+    siaCentral.contract({
       params: {
         id,
       },
-      config: {
-        api: siaCentralApi,
-      },
     }),
-    getSiaCentralExchangeRates({
-      config: {
-        api: siaCentralApi,
+    siaCentral.exchangeRates({
+      params: {
+        currencies: 'sc',
       },
     }),
   ])
 
   if (error) {
-    throw Error(error)
+    throw error
   }
 
   if (!c?.contract) {
     return notFound()
   }
 
-  const contract = c.contract
-  const formationTxnId = getFormationTxnId(contract)
-  const finalRevisionTxnId = contract?.transaction_id || ''
+  const formationTxnId = getFormationTxnId(c.contract)
+  const finalRevisionTxnId = c.contract?.transaction_id || ''
 
-  const [{ data: ft }, { data: rt }] = await Promise.all([
-    getSiaCentralTransaction({
+  const [[ft], [rt]] = await Promise.all([
+    siaCentral.transaction({
       params: {
         id: formationTxnId,
       },
-      config: {
-        api: siaCentralApi,
-      },
     }),
-    getSiaCentralTransaction({
+    siaCentral.transaction({
       params: {
         id: finalRevisionTxnId,
       },
-      config: {
-        api: siaCentralApi,
-      },
     }),
   ])
 
@@ -82,7 +67,7 @@ export default async function Page({ params }) {
 
   return (
     <ContractView
-      contract={contract}
+      contract={c.contract}
       rates={r?.rates}
       renewedFrom={renewedFrom}
       renewedTo={renewedTo}

diff --git a/apps/explorer/app/host/[id]/opengraph-image.tsx b/apps/explorer/app/host/[id]/opengraph-image.tsx
@@ -1,9 +1,5 @@
-import {
-  getSiaCentralExchangeRates,
-  getSiaCentralHost,
-} from '@siafoundation/sia-central-js'
 import { getOGImage } from '../../../components/OGImageEntity'
-import { siaCentralApi } from '../../../config'
+import { siaCentral } from '../../../config/siaCentral'
 import {
   getDownloadCost,
   getDownloadSpeed,
@@ -29,18 +25,15 @@ export const contentType = 'image/png'
 
 export default async function Image({ params }) {
   const id = params?.id as string
-  const [{ data: h }, { data: r }] = await Promise.all([
-    getSiaCentralHost({
+  const [[h], [r]] = await Promise.all([
+    siaCentral.host({
       params: {
         id,
       },
-      config: {
-        api: siaCentralApi,
-      },
     }),
-    getSiaCentralExchangeRates({
-      config: {
-        api: siaCentralApi,
+    siaCentral.exchangeRates({
+      params: {
+        currencies: 'sc',
       },
     }),
   ])

diff --git a/apps/explorer/app/host/[id]/page.tsx b/apps/explorer/app/host/[id]/page.tsx
@@ -1,14 +1,10 @@
-import {
-  getSiaCentralExchangeRates,
-  getSiaCentralHost,
-} from '@siafoundation/sia-central-js'
 import { Metadata } from 'next'
 import { routes } from '../../../config/routes'
 import { buildMetadata } from '../../../lib/utils'
 import { Host } from '../../../components/Host'
-import { siaCentralApi } from '../../../config'
 import { notFound } from 'next/navigation'
 import { truncate } from '@siafoundation/design-system'
+import { siaCentral } from '../../../config/siaCentral'
 
 export function generateMetadata({ params }): Metadata {
   const id = decodeURIComponent((params?.id as string) || '')
@@ -26,24 +22,21 @@ export const revalidate = 0
 
 export default async function Page({ params }) {
   const id = params?.id as string
-  const [{ data: h, error }, { data: r }] = await Promise.all([
-    getSiaCentralHost({
+  const [[h, error], [r]] = await Promise.all([
+    siaCentral.host({
       params: {
         id,
       },
-      config: {
-        api: siaCentralApi,
-      },
     }),
-    getSiaCentralExchangeRates({
-      config: {
-        api: siaCentralApi,
+    siaCentral.exchangeRates({
+      params: {
+        currencies: 'sc',
       },
     }),
   ])
 
   if (error) {
-    throw Error(error)
+    throw error
   }
 
   if (!h?.host) {

diff --git a/apps/explorer/app/opengraph-image.tsx b/apps/explorer/app/opengraph-image.tsx
@@ -1,11 +1,8 @@
-import {
-  getSiaCentralBlockLatest,
-  getSiaCentralHostsNetworkMetrics,
-} from '@siafoundation/sia-central-js'
 import { getOGImage } from '../components/OGImage'
-import { network, siaCentralApi } from '../config'
+import { network } from '../config'
 import { humanBytes } from '@siafoundation/units'
 import { PreviewValue } from '../components/OGImage/Preview'
+import { siaCentral } from '../config/siaCentral'
 
 export const revalidate = 0
 
@@ -18,20 +15,12 @@ export const size = {
 export const contentType = 'image/png'
 
 export default async function Image() {
-  const [{ data: metrics }, { data: latestBlock }] = await Promise.all([
-    getSiaCentralHostsNetworkMetrics({
-      config: {
-        api: siaCentralApi,
-      },
-    }),
-    getSiaCentralBlockLatest({
-      config: {
-        api: siaCentralApi,
-      },
-    }),
+  const [[metrics], [latestBlock]] = await Promise.all([
+    siaCentral.hostsNetworkMetrics(),
+    siaCentral.blockLatest(),
   ])
 
-  const lastBlockHeight = Number(latestBlock?.block.height || 0)
+  const lastBlockHeight = Number(latestBlock?.block?.height || 0)
 
   const values: PreviewValue[] = []
   if (latestBlock) {