refactor(renterd): settings APIs and daemon explorer exchange rates

.changeset/fluffy-emus-tease.md

@@ -0,0 +1,7 @@
+---
+'@siafoundation/renterd-js': minor
+'@siafoundation/renterd-react': minor
+'@siafoundation/renterd-types': minor
+---
+
+Removed deprecated setting APIs.

.changeset/four-plums-invent.md

@@ -0,0 +1,7 @@
+---
+'@siafoundation/renterd-js': minor
+'@siafoundation/renterd-react': minor
+'@siafoundation/renterd-types': minor
+---
+
+Added new strong settings APIs.

.changeset/loud-rockets-act.md

@@ -0,0 +1,5 @@
+---
+'renterd': minor
+---
+
+The configuration feature now internally uses the new strong settings APIs.

.changeset/lovely-bikes-push.md

@@ -0,0 +1,5 @@
+---
+'renterd': minor
+---
+
+The configuration feature no longer includes the enable pinning or forex endpoint options under price pinning.

.changeset/silver-pears-drop.md

@@ -0,0 +1,5 @@
+---
+'renterd': minor
+---
+
+The app now uses the daemon configured explorer for exchange rates.

.changeset/six-moons-relax.md

@@ -0,0 +1,5 @@
+---
+'renterd': minor
+---
+
+The keys feature now internally uses the new S3 settings API format.

.changeset/sour-masks-shake.md

@@ -0,0 +1,7 @@
+---
+'@siafoundation/renterd-js': minor
+'@siafoundation/renterd-react': minor
+'@siafoundation/renterd-types': minor
+---
+
+The bus state API now includes daemon configured explorer.

apps/renterd/components/Config/PinnedCurrencyWarning.tsx

@@ -2,35 +2,28 @@ import { Link, Panel, Text } from '@siafoundation/design-system'
 import { routes } from '../../config/routes'
 
 export function PinnedCurrencyWarning({
-  pinningEnabled,
+  canUseExchangeRates,
   pinnedCurrency,
-  forexEndpointURL,
 }: {
-  pinningEnabled: boolean
+  canUseExchangeRates: boolean
   pinnedCurrency: string
-  forexEndpointURL: string
 }) {
   return (
     <Panel className="px-2 pt-1 pb-2">
       <Text size="12" color="subtle">
         To pin this field:
       </Text>
       <div className="flex flex-col">
-        {!pinningEnabled && (
+        {!canUseExchangeRates && (
           <Link size="12" href={routes.config.pinning} underline="hover">
-            - Enable the pinning feature
+            - Enable an exchange rate API
           </Link>
         )}
         {!pinnedCurrency && (
           <Link size="12" href={routes.config.pinning} underline="hover">
             - Select a pinned currency
           </Link>
         )}
-        {!forexEndpointURL && (
-          <Link size="12" href={routes.config.pinning} underline="hover">
-            - Enter a forex endpoint URL
-          </Link>
-        )}
       </div>
     </Panel>
   )

apps/renterd/components/Config/index.tsx

@@ -18,20 +18,22 @@ import { StateConnError } from './StateConnError'
 import { Recommendations } from './Recommendations'
 import { ShouldPinSwitch } from './ShouldPinSwitch'
 import { PinnedCurrencyWarning } from './PinnedCurrencyWarning'
+import { useExchangeRate } from '@siafoundation/react-core'
 
 export function Config() {
   const { openDialog } = useDialog()
   const { form, fields, remoteError, configRef } = useConfig()
 
-  const pinningEnabled = form.watch('pinningEnabled')
   const pinnedCurrency = form.watch('pinnedCurrency')
-  const forexEndpointURL = form.watch('forexEndpointURL')
   const shouldPinAllowance = form.watch('shouldPinAllowance')
   const shouldPinMaxStoragePrice = form.watch('shouldPinMaxStoragePrice')
   const shouldPinMaxUploadPrice = form.watch('shouldPinMaxUploadPrice')
   const shouldPinMaxDownloadPrice = form.watch('shouldPinMaxDownloadPrice')
 
-  const canShowPinned = pinningEnabled && pinnedCurrency && forexEndpointURL
+  const { rate } = useExchangeRate({
+    currency: pinnedCurrency || undefined,
+  })
+  const canUseExchangeRates = !!rate
 
   return (
     <RenterdAuthedLayout
@@ -80,7 +82,7 @@ export function Config() {
                     fields={fields}
                   />
                   {shouldPinAllowance ? (
-                    canShowPinned ? (
+                    canUseExchangeRates ? (
                       <ConfigurationFiat
                         name="allowanceMonthPinned"
                         form={form}
@@ -89,9 +91,8 @@ export function Config() {
                       />
                     ) : (
                       <PinnedCurrencyWarning
-                        pinningEnabled={pinningEnabled}
+                        canUseExchangeRates={canUseExchangeRates}
                         pinnedCurrency={pinnedCurrency}
-                        forexEndpointURL={forexEndpointURL}
                       />
                     )
                   ) : (
@@ -148,7 +149,7 @@ export function Config() {
                     fields={fields}
                   />
                   {shouldPinMaxStoragePrice ? (
-                    canShowPinned ? (
+                    canUseExchangeRates ? (
                       <ConfigurationFiat
                         name="maxStoragePriceTBMonthPinned"
                         form={form}
@@ -157,9 +158,8 @@ export function Config() {
                       />
                     ) : (
                       <PinnedCurrencyWarning
-                        pinningEnabled={pinningEnabled}
+                        canUseExchangeRates={canUseExchangeRates}
                         pinnedCurrency={pinnedCurrency}
-                        forexEndpointURL={forexEndpointURL}
                       />
                     )
                   ) : (
@@ -184,7 +184,7 @@ export function Config() {
                     fields={fields}
                   />
                   {shouldPinMaxUploadPrice ? (
-                    canShowPinned ? (
+                    canUseExchangeRates ? (
                       <ConfigurationFiat
                         name="maxUploadPriceTBPinned"
                         form={form}
@@ -193,9 +193,8 @@ export function Config() {
                       />
                     ) : (
                       <PinnedCurrencyWarning
-                        pinningEnabled={pinningEnabled}
+                        canUseExchangeRates={canUseExchangeRates}
                         pinnedCurrency={pinnedCurrency}
-                        forexEndpointURL={forexEndpointURL}
                       />
                     )
                   ) : (
@@ -220,7 +219,7 @@ export function Config() {
                     fields={fields}
                   />
                   {shouldPinMaxDownloadPrice ? (
-                    canShowPinned ? (
+                    canUseExchangeRates ? (
                       <ConfigurationFiat
                         name="maxDownloadPriceTBPinned"
                         form={form}
@@ -229,9 +228,8 @@ export function Config() {
                       />
                     ) : (
                       <PinnedCurrencyWarning
-                        pinningEnabled={pinningEnabled}
+                        canUseExchangeRates={canUseExchangeRates}
                         pinnedCurrency={pinnedCurrency}
-                        forexEndpointURL={forexEndpointURL}
                       />
                     )
                   ) : (

apps/renterd/components/Files/checks/useDefaultContractSetNotSet.tsx

@@ -1,9 +1,9 @@
-import { useSettingContractSet } from '@siafoundation/renterd-react'
+import { useSettingsUpload } from '@siafoundation/renterd-react'
 
 export function useDefaultContractSetNotSet() {
-  const css = useSettingContractSet()
+  const su = useSettingsUpload()
 
   return {
-    active: css.data && !css.data?.default,
+    active: su.data && !su.data?.defaultContractSet,
   }
 }

apps/renterd/components/Files/checks/useNotEnoughContracts.tsx

@@ -1,18 +1,18 @@
-import { useSettingRedundancy } from '@siafoundation/renterd-react'
+import { useSettingsUpload } from '@siafoundation/renterd-react'
 import { useContracts } from '../../../contexts/contracts'
 
 export function useNotEnoughContracts() {
-  const redundancy = useSettingRedundancy()
+  const settingsUpload = useSettingsUpload()
   const { datasetCount, isLoading: isContractsLoading } = useContracts()
 
   const active =
-    redundancy.data &&
+    settingsUpload.data &&
     !isContractsLoading &&
-    datasetCount < redundancy.data.totalShards
+    datasetCount < settingsUpload.data.redundancy.totalShards
 
   return {
     active,
     count: datasetCount,
-    required: redundancy.data?.totalShards || 0,
+    required: settingsUpload.data?.redundancy.totalShards || 0,
   }
 }

apps/renterd/components/Keys/KeyContextMenu.tsx

@@ -12,8 +12,8 @@ import {
 } from '@siafoundation/design-system'
 import { CaretDown16, Delete16 } from '@siafoundation/react-icons'
 import {
-  useSettingS3Authentication,
-  useSettingUpdate,
+  useSettingsS3,
+  useSettingsS3Update,
 } from '@siafoundation/renterd-react'
 import { useCallback } from 'react'
 import { omit } from '@technically/lodash'
@@ -27,24 +27,29 @@ type Props = {
 
 export function KeyContextMenu({ s3Key, contentProps, buttonProps }: Props) {
   const { openConfirmDialog } = useDialog()
-  const s3AuthenticationSettings = useSettingS3Authentication()
-  const update = useSettingUpdate()
+  const settingsS3 = useSettingsS3()
+  const settingsS3Update = useSettingsS3Update()
   const deleteKey = useCallback(async () => {
-    const newKeys = omit(s3AuthenticationSettings.data?.v4Keypairs, s3Key)
-    const response = await update.put({
-      params: {
-        key: 's3authentication',
-      },
+    if (!settingsS3.data) {
+      triggerErrorToast({ title: 'Error deleting key' })
+      return
+    }
+    const newKeys = omit(settingsS3.data?.authentication.v4Keypairs, s3Key)
+    const response = await settingsS3Update.put({
       payload: {
-        v4Keypairs: newKeys,
+        ...settingsS3.data,
+        authentication: {
+          ...settingsS3.data.authentication,
+          v4Keypairs: newKeys,
+        },
       },
     })
     if (response.error) {
       triggerErrorToast({ title: 'Error deleting key', body: response.error })
     } else {
       triggerSuccessToast({ title: `Key ${s3Key} removed` })
     }
-  }, [s3AuthenticationSettings.data, s3Key, update])
+  }, [settingsS3.data, s3Key, settingsS3Update])
 
   return (
     <DropdownMenu

apps/renterd/components/Keys/KeysCreateDialog.tsx

@@ -13,8 +13,8 @@ import { useCallback, useMemo } from 'react'
 import { useForm } from 'react-hook-form'
 import { useDialog } from '../../contexts/dialog'
 import {
-  useSettingS3Authentication,
-  useSettingUpdate,
+  useSettingsS3,
+  useSettingsS3Update,
 } from '@siafoundation/renterd-react'
 import { Reset16 } from '@siafoundation/react-icons'
 
@@ -100,8 +100,8 @@ function getFields({
 
 export function KeysCreateDialog({ trigger, open, onOpenChange }: Props) {
   const { closeDialog } = useDialog()
-  const s3AuthenticationSettings = useSettingS3Authentication()
-  const update = useSettingUpdate()
+  const settingsS3 = useSettingsS3()
+  const settingsS3Update = useSettingsS3Update()
 
   const form = useForm({
     mode: 'all',
@@ -111,15 +111,16 @@ export function KeysCreateDialog({ trigger, open, onOpenChange }: Props) {
   const onSubmit = useCallback(
     async (values: Values) => {
       const v4Keypairs = {
-        ...s3AuthenticationSettings.data?.v4Keypairs,
+        ...settingsS3.data?.authentication.v4Keypairs,
         [values.name]: values.secret,
       }
-      const response = await update.put({
-        params: {
-          key: 's3authentication',
-        },
+      const response = await settingsS3Update.put({
         payload: {
-          v4Keypairs,
+          ...settingsS3.data,
+          authentication: {
+            ...settingsS3.data.authentication,
+            v4Keypairs,
+          },
         },
       })
       if (response.error) {
@@ -130,7 +131,7 @@ export function KeysCreateDialog({ trigger, open, onOpenChange }: Props) {
         closeDialog()
       }
     },
-    [form, closeDialog, update, s3AuthenticationSettings.data]
+    [form, closeDialog, settingsS3Update, settingsS3.data]
   )
 
   const fields = useMemo(
@@ -143,10 +144,10 @@ export function KeysCreateDialog({ trigger, open, onOpenChange }: Props) {
           form.setValue('secret', generateSecretAccessKey())
         },
         existingKeys: Object.keys(
-          s3AuthenticationSettings.data?.v4Keypairs || {}
+          settingsS3.data?.authentication.v4Keypairs || {}
         ),
       }),
-    [s3AuthenticationSettings.data, form]
+    [settingsS3.data, form]
   )
 
   const onInvalid = useOnInvalid(fields)

apps/renterd/contexts/config/fieldTips/MaxDownloadPrice.tsx

@@ -3,14 +3,11 @@ import {
   TipNumber,
   formSetField,
 } from '@siafoundation/design-system'
-import React from 'react'
-import { Categories, RecommendationItem, SettingsData } from '../types'
-import { toHastings, fiatToSiacoin } from '@siafoundation/units'
+import { fiatToSiacoin, toHastings } from '@siafoundation/units'
 import { UseFormReturn } from 'react-hook-form'
-import {
-  useAllowanceDerivedPricingForEnabledFields,
-  useForexExchangeRate,
-} from '../useAllowanceDerivedPricing'
+import { Categories, RecommendationItem, SettingsData } from '../types'
+import { useAllowanceDerivedPricingForEnabledFields } from '../useAllowanceDerivedPricing'
+import { useFormExchangeRate } from '../useFormExchangeRate'
 import {
   fitPriceToCurrentAllowanceTipContent,
   recommendationTipContent,
@@ -84,18 +81,16 @@ export function MaxDownloadPricePinnedTips({
   const derived = useAllowanceDerivedPricingForEnabledFields({
     form,
   })
-  const exchangeRate = useForexExchangeRate({
-    form,
-  })
+  const { rate } = useFormExchangeRate(form)
   const derivedPriceInSiacoin =
-    derived?.maxDownloadPriceTBPinned && exchangeRate
-      ? fiatToSiacoin(derived.maxDownloadPriceTBPinned, exchangeRate)
+    derived?.maxDownloadPriceTBPinned && rate
+      ? fiatToSiacoin(derived.maxDownloadPriceTBPinned, rate)
       : null
   const recommendationInFiat =
     recommendations?.maxDownloadPriceTBPinned?.targetValue
   const recommendationInSiacoin =
-    recommendationInFiat && exchangeRate
-      ? fiatToSiacoin(recommendationInFiat, exchangeRate)
+    recommendationInFiat && rate
+      ? fiatToSiacoin(recommendationInFiat, rate)
       : null
   return (
     <>