refactor(renterd): contracts no longer provide hostIP

.changeset/long-llamas-develop.md

@@ -0,0 +1,5 @@
+---
+'renterd': minor
+---
+
+The contracts explorer no longer supports filtering by host IP.

.changeset/nine-crabs-beg.md

@@ -0,0 +1,5 @@
+---
+'renterd': minor
+---
+
+The blocklist dialog no longer shows how many active contacts match a suggestion.

.changeset/real-zebras-hang.md

@@ -0,0 +1,5 @@
+---
+'renterd': minor
+---
+
+The contracts explorer no longer includes a column for host IP.

.changeset/swift-seals-sin.md

@@ -0,0 +1,5 @@
+---
+'renterd': minor
+---
+
+The contracts multi-select menu no longer supports bulk blocklist actions.

apps/renterd-e2e/src/specs/contracts.spec.ts

@@ -125,40 +125,6 @@ test('contracts bulk allowlist', async ({ page }) => {
   await expect(dialog.getByText('The allowlist is empty')).toBeVisible()
 })
 
-test('contracts bulk blocklist', async ({ page }) => {
-  await navigateToContracts({ page })
-  const rows = await getContractRowsAll(page)
-  rows.at(0).click()
-  rows.at(-1).click({ modifiers: ['Shift'] })
-
-  const menu = page.getByLabel('contract multi-select menu')
-  const dialog = page.getByRole('dialog')
-
-  // Add selected contract hosts to the allowlist.
-  await menu.getByLabel('add host addresses to blocklist').click()
-  await dialog.getByRole('button', { name: 'Add to blocklist' }).click()
-
-  await openManageListsDialog(page)
-  await expect(
-    dialog.getByTestId('blocklistAddresses').getByTestId('item')
-  ).toHaveCount(3)
-  await dialog.getByLabel('view allowlist').click()
-  await expect(dialog.getByText('The allowlist is empty')).toBeVisible()
-  await dialog.getByLabel('close').click()
-
-  rows.at(0).click()
-  rows.at(-1).click({ modifiers: ['Shift'] })
-
-  // Remove selected contract hosts from the blocklist.
-  await menu.getByLabel('remove host addresses from blocklist').click()
-  await dialog.getByRole('button', { name: 'Remove from blocklist' }).click()
-
-  await openManageListsDialog(page)
-  await expect(dialog.getByText('The blocklist is empty')).toBeVisible()
-  await dialog.getByLabel('view allowlist').click()
-  await expect(dialog.getByText('The allowlist is empty')).toBeVisible()
-})
-
 test('new contracts do not show a renewed from', async ({ page }) => {
   await navigateToContracts({ page })
   await expect(getContractRows(page).getByTestId('renewedFrom')).toBeHidden()

apps/renterd/components/Contracts/ContractContextMenu.tsx

@@ -15,6 +15,7 @@ import {
   Delete16,
 } from '@siafoundation/react-icons'
 import {
+  useHost,
   useHostsAllowlist,
   useHostsBlocklist,
 } from '@siafoundation/renterd-react'
@@ -24,14 +25,12 @@ import { useContracts } from '../../contexts/contracts'
 import { useHosts } from '../../contexts/hosts'
 import { useAllowlistUpdate } from '../../hooks/useAllowlistUpdate'
 import { useBlocklistUpdate } from '../../hooks/useBlocklistUpdate'
-import { addressContainsFilter } from './ContractsFilterAddressDialog'
 import { publicKeyContainsFilter } from './ContractsFilterPublicKeyDialog'
 import { useContractConfirmDelete } from './useContractConfirmDelete'
 
 type Props = {
   id: string
   trigger?: React.ReactNode
-  hostAddress: string
   hostKey: string
   contentProps?: React.ComponentProps<typeof DropdownMenu>['contentProps']
   buttonProps?: React.ComponentProps<typeof Button>
@@ -40,7 +39,6 @@ type Props = {
 export function ContractContextMenu({
   id,
   trigger,
-  hostAddress,
   hostKey,
   contentProps,
   buttonProps,
@@ -67,22 +65,16 @@ export function ContractContextMenu({
         },
       }}
     >
-      <ContractContextMenuContent
-        id={id}
-        hostAddress={hostAddress}
-        hostKey={hostKey}
-      />
+      <ContractContextMenuContent id={id} hostKey={hostKey} />
     </DropdownMenu>
   )
 }
 
 export function ContractContextMenuContent({
   id,
-  hostAddress,
   hostKey,
 }: {
   id: string
-  hostAddress?: string
   hostKey?: string
 }) {
   const router = useRouter()
@@ -95,6 +87,13 @@ export function ContractContextMenuContent({
   const blocklistUpdate = useBlocklistUpdate()
   const allowlistUpdate = useAllowlistUpdate()
   const contractConfirmDelete = useContractConfirmDelete()
+  const host = useHost({
+    disabled: !hostKey,
+    params: {
+      hostkey: hostKey || '',
+    },
+  })
+  const hostAddress = host.data?.netAddress
   return (
     <>
       <div className="px-1.5 py-1">
@@ -120,22 +119,6 @@ export function ContractContextMenuContent({
         </DropdownMenuLeftSlot>
         Filter hosts by host address
       </DropdownMenuItem>
-      <DropdownMenuItem
-        disabled={!hostAddress}
-        onSelect={() => {
-          if (!hostAddress) {
-            return
-          }
-          resetContractsFilters()
-          setContractsFilter(addressContainsFilter(hostAddress))
-          router.push(routes.contracts.index)
-        }}
-      >
-        <DropdownMenuLeftSlot>
-          <Filter16 />
-        </DropdownMenuLeftSlot>
-        Filter contracts by host address
-      </DropdownMenuItem>
       <DropdownMenuItem
         disabled={!hostKey}
         onSelect={() => {

apps/renterd/components/Contracts/ContractContextMenuFromId.tsx

@@ -44,11 +44,5 @@ function ContractContextMenuFromIdContent({ id }: Props) {
     params: { id },
   })
 
-  return (
-    <ContractContextMenuContent
-      id={id}
-      hostAddress={contract.data?.hostIP}
-      hostKey={contract.data?.hostKey}
-    />
-  )
+  return <ContractContextMenuContent id={id} hostKey={contract.data?.hostKey} />
 }

apps/renterd/components/Contracts/ContractsBulkMenu/index.tsx

@@ -1,9 +1,7 @@
 import { MultiSelectionMenu } from '@siafoundation/design-system'
 import { useContracts } from '../../../contexts/contracts'
 import { ContractsBulkDelete } from './ContractsBulkDelete'
-import { ContractsAddBlocklist } from './ContractsAddBlocklist'
 import { ContractsAddAllowlist } from './ContractsAddAllowlist'
-import { ContractsRemoveBlocklist } from './ContractsRemoveBlocklist'
 import { ContractsRemoveAllowlist } from './ContractsRemoveAllowlist'
 import { ContractsRescanHosts } from './ContractsRescanHosts'
 
@@ -12,14 +10,8 @@ export function ContractsBulkMenu() {
 
   return (
     <MultiSelectionMenu multiSelect={multiSelect} entityWord="contract">
-      <div className="flex flex-col gap-1">
-        <ContractsAddAllowlist />
-        <ContractsAddBlocklist />
-      </div>
-      <div className="flex flex-col gap-1">
-        <ContractsRemoveAllowlist />
-        <ContractsRemoveBlocklist />
-      </div>
+      <ContractsAddAllowlist />
+      <ContractsRemoveAllowlist />
       <ContractsRescanHosts />
       <ContractsBulkDelete />
     </MultiSelectionMenu>

apps/renterd/components/Contracts/ContractsCmd/ContractsFilterCmd/ContractFilterCmdGroups/index.tsx

@@ -2,7 +2,6 @@ import { ExpiryCmdGroup } from './Expiry'
 import { FormationCmdGroup } from './Formation'
 import { RenewCmdGroup } from './Renew'
 import { Page } from '../../../../CmdRoot/types'
-import { AddressCmdGroup } from './Address'
 import { PublicKeyCmdGroup } from './PublicKey'
 
 type Props = {
@@ -13,7 +12,6 @@ type Props = {
 export function ContractFilterCmdGroups({ currentPage, select }: Props) {
   return (
     <>
-      <AddressCmdGroup currentPage={currentPage} select={select} />
       <PublicKeyCmdGroup currentPage={currentPage} select={select} />
       <ExpiryCmdGroup currentPage={currentPage} select={select} />
       <FormationCmdGroup currentPage={currentPage} select={select} />

apps/renterd/components/Contracts/ContractsCmd/ContractsFilterCmd/ContractFilterNav/index.tsx

@@ -3,7 +3,6 @@ import { contractFilterExpiryPage } from '../ContractFilterCmdGroups/Expiry'
 import { contractFilterFormationPage } from '../ContractFilterCmdGroups/Formation'
 import { contractFilterRenewPage } from '../ContractFilterCmdGroups/Renew'
 import { Page } from '../../../../CmdRoot/types'
-import { AddressCmdNav } from '../ContractFilterCmdGroups/Address'
 import { PublicKeyCmdNav } from '../ContractFilterCmdGroups/PublicKey'
 
 export const commandPage = {
@@ -26,12 +25,6 @@ export function ContractFilterNav({
 }: Props) {
   return (
     <>
-      <AddressCmdNav
-        currentPage={currentPage}
-        parentPage={parentPage}
-        commandPage={commandPage}
-        select={select}
-      />
       <PublicKeyCmdNav
         currentPage={currentPage}
         parentPage={parentPage}