From d66e3104fd476b0ca606cdfb2272f6839965aca7 Mon Sep 17 00:00:00 2001
From: Alex Freska <alex.freska@gmail.com>
Date: Wed, 20 Mar 2024 12:31:25 -0400
Subject: [PATCH] feat: walletd api changes and app updates

---
 .changeset/cool-buses-exercise.md             |   5 +
 .changeset/fair-rats-return.md                |   5 +
 .changeset/neat-pumpkins-cheat.md             |   5 +
 apps/walletd/components/Node/index.tsx        |   3 +-
 .../components/Wallet/WalletActionsMenu.tsx   |   6 +-
 .../components/Wallet/WalletNavMenu.tsx       |   4 +-
 .../WalletAddresses/AddressContextMenu.tsx    |  10 +-
 .../WalletAddresses/AddressesActionsMenu.tsx  |   6 +-
 apps/walletd/components/WalletContextMenu.tsx |  10 +-
 apps/walletd/contexts/addresses/columns.tsx   |   6 +-
 apps/walletd/contexts/addresses/dataset.tsx   |  67 ++++++
 apps/walletd/contexts/addresses/index.tsx     |  44 +---
 apps/walletd/contexts/addresses/types.ts      |  10 +-
 apps/walletd/contexts/events/columns.tsx      |   6 +-
 apps/walletd/contexts/events/index.tsx        |  47 ++--
 apps/walletd/contexts/wallets/columns.tsx     |  11 +-
 apps/walletd/contexts/wallets/index.tsx       |  39 ++--
 apps/walletd/contexts/wallets/types.ts        |  26 ++-
 .../dialogs/AddressUpdateDialog/index.tsx     |  10 +-
 apps/walletd/dialogs/FieldMnemonic.tsx        |   2 +-
 .../dialogs/WalletAddLedgerDialog/index.tsx   |  35 +--
 .../dialogs/WalletAddNewDialog/index.tsx      |  22 +-
 .../dialogs/WalletAddRecoverDialog/index.tsx  |  22 +-
 .../dialogs/WalletAddWatchDialog/index.tsx    |  20 +-
 .../dialogs/WalletAddressesAddDialog.tsx      |  87 ++++++--
 .../index.tsx                                 |  19 +-
 .../index.tsx                                 |  12 +-
 .../WalletSendLedgerDialog/useSign.tsx        |  19 +-
 .../WalletSendSeedDialog/useSendForm.tsx      |   2 +-
 .../useSignAndBroadcast.tsx                   |  35 +--
 apps/walletd/dialogs/WalletUnlockDialog.tsx   |   2 +-
 .../dialogs/WalletUpdateDialog/index.tsx      |  38 ++--
 .../dialogs/_sharedWalletSend/useFund.tsx     |  15 +-
 apps/walletd/hooks/useWalletAddresses.tsx     |  49 +----
 apps/walletd/hooks/useWalletCachedSeed.tsx    |   8 +-
 apps/walletd/lib/sign.ts                      |  12 +-
 apps/walletd/lib/signLedger.spec.ts           |   7 +-
 apps/walletd/lib/signLedger.ts                |   2 +-
 apps/walletd/lib/signSeed.spec.ts             |   7 +-
 apps/walletd/lib/signSeed.ts                  |   5 +-
 apps/walletd/lib/testMocks.ts                 |  27 ++-
 libs/react-walletd/src/api.ts                 | 134 ++++++++----
 libs/react-walletd/src/siaTypes.ts            | 113 +++++++---
 libs/types/src/core.ts                        | 197 +++++++++++++++++
 libs/types/src/index.ts                       | 207 +-----------------
 libs/types/src/v2.ts                          |  97 ++++++++
 46 files changed, 912 insertions(+), 603 deletions(-)
 create mode 100644 .changeset/cool-buses-exercise.md
 create mode 100644 .changeset/fair-rats-return.md
 create mode 100644 .changeset/neat-pumpkins-cheat.md
 create mode 100644 apps/walletd/contexts/addresses/dataset.tsx
 create mode 100644 libs/types/src/core.ts
 create mode 100644 libs/types/src/v2.ts

diff --git a/.changeset/cool-buses-exercise.md b/.changeset/cool-buses-exercise.md
new file mode 100644
index 000000000..eb7c1fd4a
--- /dev/null
+++ b/.changeset/cool-buses-exercise.md
@@ -0,0 +1,5 @@
+---
+'@siafoundation/types': minor
+---
+
+The library now includes v2 types.
diff --git a/.changeset/fair-rats-return.md b/.changeset/fair-rats-return.md
new file mode 100644
index 000000000..217f433ed
--- /dev/null
+++ b/.changeset/fair-rats-return.md
@@ -0,0 +1,5 @@
+---
+'walletd': minor
+---
+
+The UI now uses the new daemon endpoints and changes. Closes https://github.com/SiaFoundation/walletd/issues/73
diff --git a/.changeset/neat-pumpkins-cheat.md b/.changeset/neat-pumpkins-cheat.md
new file mode 100644
index 000000000..583a5cbad
--- /dev/null
+++ b/.changeset/neat-pumpkins-cheat.md
@@ -0,0 +1,5 @@
+---
+'@siafoundation/react-walletd': minor
+---
+
+The React hooks have been updated for the daemon endpoint changes. Closes https://github.com/SiaFoundation/walletd/issues/73
diff --git a/apps/walletd/components/Node/index.tsx b/apps/walletd/components/Node/index.tsx
index d59d09703..b57f2392c 100644
--- a/apps/walletd/components/Node/index.tsx
+++ b/apps/walletd/components/Node/index.tsx
@@ -28,7 +28,8 @@ export function Node() {
   const { openDialog } = useDialog()
 
   const transactionCount = txPool.data
-    ? txPool.data.transactions.length + txPool.data.v2Transactions.length
+    ? (txPool.data.transactions?.length || 0) +
+      (txPool.data.v2Transactions?.length || 0)
     : 0
 
   return (
diff --git a/apps/walletd/components/Wallet/WalletActionsMenu.tsx b/apps/walletd/components/Wallet/WalletActionsMenu.tsx
index 990e4becc..3181575b1 100644
--- a/apps/walletd/components/Wallet/WalletActionsMenu.tsx
+++ b/apps/walletd/components/Wallet/WalletActionsMenu.tsx
@@ -30,16 +30,16 @@ export function WalletActionsMenu() {
         isSynced={status.isSynced}
       />
       <AddressesButton />
-      {wallet?.type !== 'watch' && (
+      {wallet?.metadata.type !== 'watch' && (
         <Button
           size="small"
           variant="accent"
           onClick={() => {
-            if (wallet?.type === 'seed') {
+            if (wallet?.metadata.type === 'seed') {
               openDialog('walletSendSeed', {
                 walletId,
               })
-            } else if (wallet?.type === 'ledger') {
+            } else if (wallet?.metadata.type === 'ledger') {
               openDialog('walletSendLedger', {
                 walletId,
               })
diff --git a/apps/walletd/components/Wallet/WalletNavMenu.tsx b/apps/walletd/components/Wallet/WalletNavMenu.tsx
index 07a6cd100..acee93ccf 100644
--- a/apps/walletd/components/Wallet/WalletNavMenu.tsx
+++ b/apps/walletd/components/Wallet/WalletNavMenu.tsx
@@ -17,9 +17,9 @@ export function WalletNavMenu() {
           })
         }
         className="!p-0"
-        tip={walletTypes[wallet?.type]?.title}
+        tip={walletTypes[wallet?.metadata.type]?.title}
       >
-        {walletTypes[wallet?.type]?.icon}
+        {walletTypes[wallet?.metadata.type]?.icon}
       </Button>
     </div>
   )
diff --git a/apps/walletd/components/WalletAddresses/AddressContextMenu.tsx b/apps/walletd/components/WalletAddresses/AddressContextMenu.tsx
index 05f98a166..ae6715515 100644
--- a/apps/walletd/components/WalletAddresses/AddressContextMenu.tsx
+++ b/apps/walletd/components/WalletAddresses/AddressContextMenu.tsx
@@ -18,7 +18,7 @@ type Props = {
 } & Omit<React.ComponentProps<typeof DropdownMenu>, 'children'>
 
 export function AddressContextMenu({
-  address: { walletId, id, index },
+  address: { walletId, id, metadata },
   ...props
 }: Props) {
   const { openDialog } = useDialog()
@@ -31,8 +31,8 @@ export function AddressContextMenu({
         onSelect={() =>
           openDialog('confirm', {
             title:
-              index !== undefined
-                ? `Remove address ${index}`
+              metadata.index !== undefined
+                ? `Remove address ${metadata.index}`
                 : 'Remove address',
             action: 'Remove',
             variant: 'red',
@@ -57,8 +57,8 @@ export function AddressContextMenu({
                 triggerErrorToast(`Failed to delete address: ${response.error}`)
               } else {
                 triggerSuccessToast(
-                  index !== undefined
-                    ? `Address ${index} removed.`
+                  metadata.index !== undefined
+                    ? `Address ${metadata.index} removed.`
                     : 'Address removed.'
                 )
               }
diff --git a/apps/walletd/components/WalletAddresses/AddressesActionsMenu.tsx b/apps/walletd/components/WalletAddresses/AddressesActionsMenu.tsx
index e13f5ded5..73edb4743 100644
--- a/apps/walletd/components/WalletAddresses/AddressesActionsMenu.tsx
+++ b/apps/walletd/components/WalletAddresses/AddressesActionsMenu.tsx
@@ -15,15 +15,15 @@ export function AddressesActionsMenu() {
       <Button
         variant="accent"
         onClick={() => {
-          if (wallet?.type === 'seed') {
+          if (wallet?.metadata.type === 'seed') {
             openDialog('walletAddressesGenerate', { walletId: id })
             return
           }
-          if (wallet?.type === 'watch') {
+          if (wallet?.metadata.type === 'watch') {
             openDialog('walletAddressesAdd', { walletId: id })
             return
           }
-          if (wallet?.type === 'ledger') {
+          if (wallet?.metadata.type === 'ledger') {
             openDialog('walletLedgerAddressGenerate', { walletId: id })
             return
           }
diff --git a/apps/walletd/components/WalletContextMenu.tsx b/apps/walletd/components/WalletContextMenu.tsx
index 9d1a865fe..f6d652373 100644
--- a/apps/walletd/components/WalletContextMenu.tsx
+++ b/apps/walletd/components/WalletContextMenu.tsx
@@ -18,18 +18,18 @@ type Props = {
 } & Omit<React.ComponentProps<typeof DropdownMenu>, 'children'>
 
 export function WalletContextMenu({
-  wallet: { id, type, status, lock, unlock },
+  wallet: { id, metadata, state, actions },
   ...props
 }: Props) {
   const { openDialog } = useDialog()
   return (
     <DropdownMenu {...props}>
       <DropdownMenuLabel>Actions</DropdownMenuLabel>
-      {type === 'seed' ? (
-        status === 'unlocked' ? (
+      {metadata.type === 'seed' ? (
+        state.status === 'unlocked' ? (
           <DropdownMenuItem
             onClick={(e) => e.stopPropagation()}
-            onSelect={() => lock()}
+            onSelect={() => actions.lock()}
           >
             <DropdownMenuLeftSlot>
               <Locked16 />
@@ -39,7 +39,7 @@ export function WalletContextMenu({
         ) : (
           <DropdownMenuItem
             onClick={(e) => e.stopPropagation()}
-            onSelect={() => unlock()}
+            onSelect={() => actions.unlock()}
           >
             <DropdownMenuLeftSlot>
               <Unlocked16 />
diff --git a/apps/walletd/contexts/addresses/columns.tsx b/apps/walletd/contexts/addresses/columns.tsx
index 725da8f6e..a1b7a0ebb 100644
--- a/apps/walletd/contexts/addresses/columns.tsx
+++ b/apps/walletd/contexts/addresses/columns.tsx
@@ -72,13 +72,13 @@ export const columns: AddressesTableColumn[] = [
     id: 'index',
     label: 'index',
     category: 'general',
-    render: ({ data: { index } }) => {
-      if (index === undefined) {
+    render: ({ data: { metadata } }) => {
+      if (metadata.index === undefined) {
         return null
       }
       return (
         <div className="flex flex-col gap-2">
-          <Text>{index.toLocaleString()}</Text>
+          <Text>{metadata.index.toLocaleString()}</Text>
         </div>
       )
     },
diff --git a/apps/walletd/contexts/addresses/dataset.tsx b/apps/walletd/contexts/addresses/dataset.tsx
new file mode 100644
index 000000000..842dfd871
--- /dev/null
+++ b/apps/walletd/contexts/addresses/dataset.tsx
@@ -0,0 +1,67 @@
+import {
+  useDatasetEmptyState,
+  ClientFilterItem,
+} from '@siafoundation/design-system'
+import { useWalletAddresses } from '@siafoundation/react-walletd'
+import { useMemo } from 'react'
+import { AddressData } from './types'
+import { useDialog } from '../dialog'
+
+export function useDataset({
+  walletId,
+  response,
+  filters,
+}: {
+  walletId: string
+  response: ReturnType<typeof useWalletAddresses>
+  filters: ClientFilterItem<AddressData>[]
+}) {
+  const { openDialog } = useDialog()
+  const dataset = useMemo<AddressData[] | null>(() => {
+    if (!response.data) {
+      return null
+    }
+    const data: AddressData[] = response.data.map((addressObject) => {
+      const { address, description, metadata, spendPolicy } = addressObject
+      return {
+        id: address,
+        address,
+        description: description,
+        spendPolicy: spendPolicy,
+        metadata: {
+          index: metadata?.index as number,
+          publicKey: metadata?.publicKey as string,
+        },
+        walletId,
+        onClick: () =>
+          openDialog('addressUpdate', {
+            walletId: walletId,
+            address,
+          }),
+        raw: addressObject,
+      }
+    })
+    return data
+  }, [response.data, openDialog, walletId])
+
+  const dataState = useDatasetEmptyState(
+    dataset,
+    response.isValidating,
+    response.error,
+    filters
+  )
+
+  const lastIndex = (dataset || []).reduce(
+    (highest, { metadata }) =>
+      metadata.index > highest ? metadata.index : highest,
+    -1
+  )
+
+  return {
+    dataset,
+    dataState,
+    error: response.error,
+    lastIndex,
+    filters,
+  }
+}
diff --git a/apps/walletd/contexts/addresses/index.tsx b/apps/walletd/contexts/addresses/index.tsx
index c2dce8f5b..bb943c2cc 100644
--- a/apps/walletd/contexts/addresses/index.tsx
+++ b/apps/walletd/contexts/addresses/index.tsx
@@ -1,6 +1,5 @@
 import {
   useTableState,
-  useDatasetEmptyState,
   useClientFilters,
   useClientFilteredDataset,
 } from '@siafoundation/design-system'
@@ -15,12 +14,11 @@ import {
 } from './types'
 import { columns } from './columns'
 import { useRouter } from 'next/router'
-import { useDialog } from '../dialog'
 import { useSiascanUrl } from '../../hooks/useSiascanUrl'
 import { defaultDatasetRefreshInterval } from '../../config/swr'
+import { useDataset } from './dataset'
 
 export function useAddressesMain() {
-  const { openDialog } = useDialog()
   const router = useRouter()
   const walletId = router.query.id as string
 
@@ -36,31 +34,15 @@ export function useAddressesMain() {
     },
   })
 
-  const dataset = useMemo<AddressData[] | null>(() => {
-    if (!response.data) {
-      return null
-    }
-    const data: AddressData[] = Object.entries(response.data || {}).map(
-      ([address, meta]) => ({
-        id: address,
-        address,
-        description: meta.description as string,
-        index: meta.index as number,
-        publicKey: meta.publicKey as string,
-        walletId,
-        onClick: () =>
-          openDialog('addressUpdate', {
-            walletId: walletId,
-            address,
-          }),
-      })
-    )
-    return data
-  }, [response.data, openDialog, walletId])
-
   const { filters, setFilter, removeFilter, removeLastFilter, resetFilters } =
     useClientFilters<AddressData>()
 
+  const { dataset, dataState, lastIndex } = useDataset({
+    walletId,
+    response,
+    filters,
+  })
+
   const {
     configurableColumns,
     enabledColumns,
@@ -96,18 +78,6 @@ export function useAddressesMain() {
     [enabledColumns]
   )
 
-  const dataState = useDatasetEmptyState(
-    dataset,
-    response.isValidating,
-    response.error,
-    filters
-  )
-
-  const lastIndex = (dataset || []).reduce(
-    (highest, { index }) => (index > highest ? index : highest),
-    -1
-  )
-
   const siascanUrl = useSiascanUrl()
   const cellContext = useMemo<CellContext>(
     () => ({
diff --git a/apps/walletd/contexts/addresses/types.ts b/apps/walletd/contexts/addresses/types.ts
index 86a4102f5..8bdf60fdf 100644
--- a/apps/walletd/contexts/addresses/types.ts
+++ b/apps/walletd/contexts/addresses/types.ts
@@ -1,3 +1,5 @@
+import { WalletAddress } from '@siafoundation/react-walletd'
+
 export type CellContext = {
   siascanUrl: string
 }
@@ -6,9 +8,13 @@ export type AddressData = {
   id: string
   address: string
   description?: string
-  publicKey?: string
-  index?: number
+  spendPolicy?: string
+  metadata: {
+    index?: number
+    publicKey?: string
+  }
   walletId: string
+  raw?: WalletAddress
 }
 
 export type TableColumnId = 'actions' | 'address' | 'index'
diff --git a/apps/walletd/contexts/events/columns.tsx b/apps/walletd/contexts/events/columns.tsx
index a60efa370..1042cfcd0 100644
--- a/apps/walletd/contexts/events/columns.tsx
+++ b/apps/walletd/contexts/events/columns.tsx
@@ -43,14 +43,14 @@ export const columns: EventsTableColumn[] = [
     id: 'transactionId',
     label: 'transaction ID',
     category: 'general',
-    render: ({ data: { transactionId }, context }) => {
-      if (!transactionId) {
+    render: ({ data: { id }, context }) => {
+      if (!id) {
         return null
       }
       return (
         <ValueCopyable
           size="12"
-          value={transactionId}
+          value={id}
           label="transaction ID"
           type="transaction"
           siascanUrl={context.siascanUrl}
diff --git a/apps/walletd/contexts/events/index.tsx b/apps/walletd/contexts/events/index.tsx
index ddad87dd9..34d8449fb 100644
--- a/apps/walletd/contexts/events/index.tsx
+++ b/apps/walletd/contexts/events/index.tsx
@@ -4,17 +4,11 @@ import {
   useServerFilters,
 } from '@siafoundation/design-system'
 import {
+  useResubscribe,
   useWalletEvents,
-  useWalletSubscribe,
   useWalletTxPool,
 } from '@siafoundation/react-walletd'
-import {
-  createContext,
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-} from 'react'
+import { createContext, useCallback, useContext, useMemo } from 'react'
 import {
   CellContext,
   EventData,
@@ -62,25 +56,12 @@ export function useEventsMain() {
     },
   })
 
-  const walletSub = useWalletSubscribe()
-  const subscribe = useCallback(async () => {
-    // do not handle error because the common case of
-    // already being subscribed returns a 500.
-    walletSub.post({
-      params: {
-        id,
-      },
+  const _resubscribe = useResubscribe()
+  const resubscribe = useCallback(async () => {
+    _resubscribe.post({
       payload: 0,
     })
-  }, [walletSub, id])
-
-  // Make sure the wallet is subscribed
-  useEffect(() => {
-    if (id) {
-      subscribe()
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [id])
+  }, [_resubscribe])
 
   const dataset = useMemo<EventData[] | null>(() => {
     if (!responseEvents.data || !responseTxPool.data) {
@@ -88,7 +69,6 @@ export function useEventsMain() {
     }
     const dataTxPool: EventData[] = responseTxPool.data.map((e) => ({
       id: e.id,
-      transactionId: e.id,
       timestamp: 0,
       pending: true,
       type: e.type,
@@ -134,10 +114,12 @@ export function useEventsMain() {
       if (e.type === 'miner payout') {
         amountSc = new BigNumber(e.val.siacoinOutput.siacoinOutput.value)
       }
+      if (e.type === 'foundation subsidy') {
+        amountSc = new BigNumber(e.val.siacoinOutput.siacoinOutput.value)
+      }
 
-      const id = String(index)
       const res: EventData = {
-        id,
+        id: e.id,
         type: e.type,
         timestamp: new Date(e.timestamp).getTime(),
         height: e.index.height,
@@ -145,16 +127,12 @@ export function useEventsMain() {
         amountSc,
         amountSf,
       }
-      if ('fee' in e.val) {
+      if (e.type === 'transaction') {
         res.fee = new BigNumber(e.val.fee)
       }
-      if ('fileContract' in e.val) {
+      if (e.type === 'contract payout') {
         res.contractId = e.val.fileContract.id
       }
-      if ('id' in e.val) {
-        res.id += e.val.id
-        res.transactionId = e.val.id
-      }
       return res
     })
     return [...dataTxPool.reverse(), ...dataEvents]
@@ -226,6 +204,7 @@ export function useEventsMain() {
     removeFilter,
     removeLastFilter,
     resetFilters,
+    resubscribe,
     offset,
     limit,
   }
diff --git a/apps/walletd/contexts/wallets/columns.tsx b/apps/walletd/contexts/wallets/columns.tsx
index a1929dd52..e6326862a 100644
--- a/apps/walletd/contexts/wallets/columns.tsx
+++ b/apps/walletd/contexts/wallets/columns.tsx
@@ -105,7 +105,11 @@ export const columns: WalletsTableColumn[] = [
     id: 'type',
     label: 'type',
     category: 'general',
-    render: ({ data: { type } }) => {
+    render: ({
+      data: {
+        metadata: { type },
+      },
+    }) => {
       return (
         <Tooltip content={walletTypes[type]?.title}>
           <Badge interactive={false} className="flex gap-0.5 items-center">
@@ -123,9 +127,12 @@ export const columns: WalletsTableColumn[] = [
     label: 'status',
     category: 'general',
     render: ({
-      data: { type, status, activityAt, unlock, lock },
+      data,
       context: { walletAutoLockEnabled, walletAutoLockTimeout },
     }) => {
+      const { type } = data.metadata
+      const { status, activityAt } = data.state
+      const { unlock, lock } = data.actions
       if (type === 'seed') {
         const sinceActivityMs = new Date().getTime() - activityAt
         const remainingMs = Math.max(walletAutoLockTimeout - sinceActivityMs, 0)
diff --git a/apps/walletd/contexts/wallets/index.tsx b/apps/walletd/contexts/wallets/index.tsx
index 458848b45..4ee5b5725 100644
--- a/apps/walletd/contexts/wallets/index.tsx
+++ b/apps/walletd/contexts/wallets/index.tsx
@@ -11,7 +11,7 @@ import {
   columnsDefaultVisible,
   defaultSortField,
   sortOptions,
-  WalletType,
+  WalletMetadata,
 } from './types'
 import { columns } from './columns'
 import { useRouter } from 'next/router'
@@ -54,19 +54,25 @@ function useWalletsMain() {
     if (!response.data) {
       return null
     }
-    const data: WalletData[] = Object.entries(response.data || {}).map(
-      ([id, meta]) => ({
+    const data: WalletData[] = response.data.map((wallet) => {
+      const { id, name, description, dateCreated, lastUpdated, metadata } =
+        wallet
+      return {
         id,
-        name: meta.name as string,
-        seed: seedCache[id],
-        status: seedCache[id] ? 'unlocked' : 'locked',
-        activityAt: walletActivityAt[id],
-        seedHash: meta.seedHash as string,
-        description: meta.description as string,
-        createdAt: (meta.createdAt as number) || 0,
-        type: meta.type as WalletType,
-        unlock: () => openDialog('walletUnlock', { walletId: id }),
-        lock: () => saveWalletSeed(id, undefined),
+        name,
+        description,
+        createdAt: new Date(dateCreated).getTime() || 0,
+        updatedAt: new Date(lastUpdated).getTime() || 0,
+        metadata: (metadata || {}) as WalletMetadata,
+        state: {
+          seed: seedCache[id],
+          status: seedCache[id] ? 'unlocked' : 'locked',
+          activityAt: walletActivityAt[id],
+        },
+        actions: {
+          unlock: () => openDialog('walletUnlock', { walletId: id }),
+          lock: () => saveWalletSeed(id, undefined),
+        },
         onClick: () =>
           router.push({
             pathname: routes.wallet.view,
@@ -74,8 +80,9 @@ function useWalletsMain() {
               id,
             },
           }),
-      })
-    )
+        raw: wallet,
+      }
+    })
     return data
   }, [
     router,
@@ -145,7 +152,7 @@ function useWalletsMain() {
     dataState,
     error: response.error,
     datasetCount: datasetFiltered?.length || 0,
-    unlockedCount: dataset?.filter((d) => d.seed).length || 0,
+    unlockedCount: dataset?.filter((d) => d.state.seed).length || 0,
     columns: filteredTableColumns,
     dataset: datasetFiltered,
     context,
diff --git a/apps/walletd/contexts/wallets/types.ts b/apps/walletd/contexts/wallets/types.ts
index dfccc36ee..5a8643450 100644
--- a/apps/walletd/contexts/wallets/types.ts
+++ b/apps/walletd/contexts/wallets/types.ts
@@ -1,17 +1,29 @@
+import { Wallet } from '@siafoundation/react-walletd'
+
 export type WalletType = 'seed' | 'watch' | 'ledger'
 
+export type WalletMetadata = {
+  type: WalletType
+  seedHash?: string
+}
+
 export type WalletData = {
   id: string
   name?: string
   description?: string
-  type?: WalletType
-  seed?: string
-  activityAt?: number
-  status: 'unlocked' | 'locked'
-  seedHash?: string
   createdAt?: number
-  unlock: () => void
-  lock: () => void
+  updatedAt?: number
+  metadata: WalletMetadata
+  state: {
+    seed?: string
+    activityAt?: number
+    status: 'unlocked' | 'locked'
+  }
+  actions: {
+    unlock: () => void
+    lock: () => void
+  }
+  raw?: Wallet
 }
 
 export type TableColumnId =
diff --git a/apps/walletd/dialogs/AddressUpdateDialog/index.tsx b/apps/walletd/dialogs/AddressUpdateDialog/index.tsx
index f5d5cb548..4d7eca919 100644
--- a/apps/walletd/dialogs/AddressUpdateDialog/index.tsx
+++ b/apps/walletd/dialogs/AddressUpdateDialog/index.tsx
@@ -18,7 +18,9 @@ const defaultValues = {
   description: '',
 }
 
-function getFields(): ConfigFields<typeof defaultValues, never> {
+type Values = typeof defaultValues
+
+function getFields(): ConfigFields<Values, never> {
   return {
     description: {
       type: 'text',
@@ -71,14 +73,14 @@ export function AddressUpdateDialog({
 
   const fields = getFields()
   const onSubmit = useCallback(
-    async (values) => {
+    async (values: Values) => {
       const response = await addressAdd.put({
         params: {
           id: walletId,
-          addr,
         },
         payload: {
-          ...address,
+          ...address.raw,
+          address: addr,
           description: values.description,
         },
       })
diff --git a/apps/walletd/dialogs/FieldMnemonic.tsx b/apps/walletd/dialogs/FieldMnemonic.tsx
index e0e67489c..e7b0a0e24 100644
--- a/apps/walletd/dialogs/FieldMnemonic.tsx
+++ b/apps/walletd/dialogs/FieldMnemonic.tsx
@@ -19,7 +19,7 @@ export function FieldMnemonic<
 >({ walletId, name, form, fields, actionText }: Props<Values, Categories>) {
   const { dataset, walletAutoLockEnabled, walletAutoLockTimeout } = useWallets()
   const wallet = dataset?.find((w) => w.id === walletId)
-  const cachedSeed = wallet?.seed
+  const cachedSeed = wallet?.state.seed
   const isSeedCached = !!cachedSeed
   const cacheTime = humanTimeAndUnits(walletAutoLockTimeout)
   const fullActionText = actionText ? ` and ${actionText}` : ''
diff --git a/apps/walletd/dialogs/WalletAddLedgerDialog/index.tsx b/apps/walletd/dialogs/WalletAddLedgerDialog/index.tsx
index 25b0f250a..6527929a8 100644
--- a/apps/walletd/dialogs/WalletAddLedgerDialog/index.tsx
+++ b/apps/walletd/dialogs/WalletAddLedgerDialog/index.tsx
@@ -15,7 +15,6 @@ import { useForm } from 'react-hook-form'
 import { useWalletAdd, useWalletAddressAdd } from '@siafoundation/react-walletd'
 import { useDialog } from '../../contexts/dialog'
 import { useWallets } from '../../contexts/wallets'
-import { v4 as uuidv4 } from 'uuid'
 import { walletAddTypes } from '../../config/walletTypes'
 import { DeviceConnectForm } from '../DeviceConnectForm'
 import { useLedger } from '../../contexts/ledger'
@@ -26,11 +25,13 @@ const defaultValues = {
   ledgerConnectedAndVerified: false,
 }
 
+type Values = typeof defaultValues
+
 function getFields({
   walletNames,
 }: {
   walletNames: string[]
-}): ConfigFields<typeof defaultValues, never> {
+}): ConfigFields<Values, never> {
   return {
     name: {
       type: 'text',
@@ -128,11 +129,14 @@ export function WalletAddLedgerDialog({ trigger, open, onOpenChange }: Props) {
       const response = await addressAdd.put({
         params: {
           id: walletId,
-          addr: address,
         },
         payload: {
-          index: 0,
-          publicKey,
+          address,
+          description: '',
+          metadata: {
+            index: 0,
+            publicKey,
+          },
         },
       })
       if (response.error) {
@@ -144,36 +148,33 @@ export function WalletAddLedgerDialog({ trigger, open, onOpenChange }: Props) {
   )
 
   const onSubmit = useCallback(
-    async (values: typeof defaultValues) => {
+    async (values: Values) => {
       if (!values.ledgerConnectedAndVerified) {
         return
       }
       if (!device.publicKey0 || !device.address0) {
         return
       }
-      const id = uuidv4()
-      const response = await walletAdd.put({
-        params: {
-          id,
-        },
+      const response = await walletAdd.post({
         payload: {
-          type: 'ledger',
-          publicKey0: device.publicKey0,
-          address0: device.address0,
           name: values.name,
-          createdAt: new Date().getTime(),
           description: values.description,
+          metadata: {
+            type: 'ledger',
+            publicKey0: device.publicKey0,
+            address0: device.address0,
+          },
         },
       })
       if (response.error) {
         triggerErrorToast(response.error)
       } else {
-        addAddress0(id, {
+        addAddress0(response.data.id, {
           publicKey: device.publicKey0,
           address: device.address0,
         })
         openDialog('walletLedgerAddressGenerate', {
-          walletId: id,
+          walletId: response.data.id,
           walletJustCreated: true,
         })
         form.reset(defaultValues)
diff --git a/apps/walletd/dialogs/WalletAddNewDialog/index.tsx b/apps/walletd/dialogs/WalletAddNewDialog/index.tsx
index f8bcb1555..8508a4156 100644
--- a/apps/walletd/dialogs/WalletAddNewDialog/index.tsx
+++ b/apps/walletd/dialogs/WalletAddNewDialog/index.tsx
@@ -16,7 +16,6 @@ import { useForm } from 'react-hook-form'
 import { useWalletAdd } from '@siafoundation/react-walletd'
 import { useDialog } from '../../contexts/dialog'
 import { useWallets } from '../../contexts/wallets'
-import { v4 as uuidv4 } from 'uuid'
 import { walletAddTypes } from '../../config/walletTypes'
 import { blake2bHex } from 'blakejs'
 import { SeedLayout } from '../SeedLayout'
@@ -30,13 +29,15 @@ const defaultValues = {
   hasCopied: false,
 }
 
+type Values = typeof defaultValues
+
 function getFields({
   walletNames,
   copySeed,
 }: {
   walletNames: string[]
   copySeed: () => void
-}): ConfigFields<typeof defaultValues, never> {
+}): ConfigFields<Values, never> {
   return {
     name: {
       type: 'text',
@@ -136,27 +137,24 @@ export function WalletAddNewDialog({ trigger, open, onOpenChange }: Props) {
   const fields = getFields({ walletNames, copySeed })
 
   const onSubmit = useCallback(
-    async (values) => {
-      const id = uuidv4()
+    async (values: Values) => {
       const { seed } = getWalletWasm().seedFromPhrase(values.mnemonic)
       const seedHash = blake2bHex(seed)
-      const response = await walletAdd.put({
-        params: {
-          id,
-        },
+      const response = await walletAdd.post({
         payload: {
-          type: 'seed',
-          seedHash,
           name: values.name,
-          createdAt: new Date().getTime(),
           description: values.description,
+          metadata: {
+            type: 'seed',
+            seedHash,
+          },
         },
       })
       if (response.error) {
         triggerErrorToast(response.error)
       } else {
         openDialog('walletAddressesGenerate', {
-          walletId: id,
+          walletId: response.data.id,
         })
         form.reset(defaultValues)
       }
diff --git a/apps/walletd/dialogs/WalletAddRecoverDialog/index.tsx b/apps/walletd/dialogs/WalletAddRecoverDialog/index.tsx
index fb83ae049..3a4dd87c8 100644
--- a/apps/walletd/dialogs/WalletAddRecoverDialog/index.tsx
+++ b/apps/walletd/dialogs/WalletAddRecoverDialog/index.tsx
@@ -12,7 +12,6 @@ import { useCallback } from 'react'
 import { useForm } from 'react-hook-form'
 import { useDialog } from '../../contexts/dialog'
 import { useWallets } from '../../contexts/wallets'
-import { v4 as uuidv4 } from 'uuid'
 import { useWalletAdd } from '@siafoundation/react-walletd'
 import { blake2bHex } from 'blakejs'
 import { SeedLayout } from '../SeedLayout'
@@ -26,11 +25,13 @@ const defaultValues = {
   mnemonic: '',
 }
 
+type Values = typeof defaultValues
+
 function getFields({
   walletNames,
 }: {
   walletNames: string[]
-}): ConfigFields<typeof defaultValues, never> {
+}): ConfigFields<Values, never> {
   return {
     name: {
       type: 'text',
@@ -93,27 +94,24 @@ export function WalletAddRecoverDialog({ trigger, open, onOpenChange }: Props) {
   const walletAdd = useWalletAdd()
 
   const onSubmit = useCallback(
-    async (values) => {
-      const id = uuidv4()
+    async (values: Values) => {
       const { seed } = getWalletWasm().seedFromPhrase(values.mnemonic)
       const seedHash = blake2bHex(seed)
-      const response = await walletAdd.put({
-        params: {
-          id,
-        },
+      const response = await walletAdd.post({
         payload: {
-          type: 'seed',
-          seedHash,
           name: values.name,
-          createdAt: new Date().getTime(),
           description: values.description,
+          metadata: {
+            type: 'seed',
+            seedHash,
+          },
         },
       })
       if (response.error) {
         triggerErrorToast(response.error)
       } else {
         openDialog('walletAddressesGenerate', {
-          walletId: id,
+          walletId: response.data.id,
         })
         form.reset(defaultValues)
       }
diff --git a/apps/walletd/dialogs/WalletAddWatchDialog/index.tsx b/apps/walletd/dialogs/WalletAddWatchDialog/index.tsx
index 6e58b7cf3..c59d91d74 100644
--- a/apps/walletd/dialogs/WalletAddWatchDialog/index.tsx
+++ b/apps/walletd/dialogs/WalletAddWatchDialog/index.tsx
@@ -14,7 +14,6 @@ import { useForm } from 'react-hook-form'
 import { useWalletAdd } from '@siafoundation/react-walletd'
 import { useDialog } from '../../contexts/dialog'
 import { useWallets } from '../../contexts/wallets'
-import { v4 as uuidv4 } from 'uuid'
 import { walletAddTypes } from '../../config/walletTypes'
 
 const defaultValues = {
@@ -22,11 +21,13 @@ const defaultValues = {
   description: '',
 }
 
+type Values = typeof defaultValues
+
 function getFields({
   walletNames,
 }: {
   walletNames: string[]
-}): ConfigFields<typeof defaultValues, never> {
+}): ConfigFields<Values, never> {
   return {
     name: {
       type: 'text',
@@ -75,24 +76,21 @@ export function WalletAddWatchDialog({ trigger, open, onOpenChange }: Props) {
   const fields = getFields({ walletNames })
 
   const onSubmit = useCallback(
-    async (values) => {
-      const id = uuidv4()
-      const response = await walletAdd.put({
-        params: {
-          id,
-        },
+    async (values: Values) => {
+      const response = await walletAdd.post({
         payload: {
-          type: 'watch',
           name: values.name,
           description: values.description,
-          createdAt: new Date().getTime(),
+          metadata: {
+            type: 'watch',
+          },
         },
       })
       if (response.error) {
         triggerErrorToast(response.error)
       } else {
         openDialog('walletAddressesAdd', {
-          walletId: id,
+          walletId: response.data.id,
         })
         form.reset(defaultValues)
       }
diff --git a/apps/walletd/dialogs/WalletAddressesAddDialog.tsx b/apps/walletd/dialogs/WalletAddressesAddDialog.tsx
index 992144d27..d1ca5747e 100644
--- a/apps/walletd/dialogs/WalletAddressesAddDialog.tsx
+++ b/apps/walletd/dialogs/WalletAddressesAddDialog.tsx
@@ -2,6 +2,7 @@
 import {
   ConfigFields,
   Dialog,
+  FieldSwitch,
   FieldTextArea,
   FormSubmitButton,
   Paragraph,
@@ -9,7 +10,10 @@ import {
   triggerSuccessToast,
   useDialogFormHelpers,
 } from '@siafoundation/design-system'
-import { useWalletAddressAdd } from '@siafoundation/react-walletd'
+import {
+  useResubscribe,
+  useWalletAddressAdd,
+} from '@siafoundation/react-walletd'
 import { useCallback } from 'react'
 import { useForm } from 'react-hook-form'
 import { useWallets } from '../contexts/wallets'
@@ -29,8 +33,11 @@ type Props = {
 
 const defaultValues = {
   addresses: '',
+  shouldResubscribe: false,
 }
 
+type Values = typeof defaultValues
+
 const placeholder = `91acbc0feb9e20d538db1f8a509d508362d1b1f3d725d9b6639306531d770c1ef9eb637b4903
 b58849e347356878bb0098908191550ff3e46cc35ed166d0c571fe184d2f17b835747991c266
 b811a04859809fe081884c10d50ca069f1429112ba4a8dc9181c95de41f7eca01416923daa6d
@@ -51,7 +58,7 @@ function isCorrectLength(addr: string) {
   return addr.length === 76
 }
 
-function getFields(): ConfigFields<typeof defaultValues, never> {
+function getFields(): ConfigFields<Values, never> {
   return {
     addresses: {
       type: 'text',
@@ -76,6 +83,11 @@ function getFields(): ConfigFields<typeof defaultValues, never> {
         },
       },
     },
+    shouldResubscribe: {
+      type: 'boolean',
+      title: 'Resubscribe',
+      validation: {},
+    },
   }
 }
 
@@ -102,47 +114,73 @@ export function WalletAddressesAddDialog({
   const fields = getFields()
 
   const addressAdd = useWalletAddressAdd()
+  const resubscribe = useResubscribe()
   const addAllAddresses = useCallback(
     async (addresses: string) => {
       const addrs = formatAddresses(addresses)
-      const count = addrs.length
-      for (let i = 0; i < count; i++) {
+      const total = addrs.length
+      let successful = 0
+      for (let i = 0; i < total; i++) {
         const addr = addrs[i]
         const response = await addressAdd.put({
           params: {
             id: walletId,
-            addr,
           },
-          payload: {},
+          payload: {
+            address: addr,
+            description: '',
+            metadata: {},
+          },
         })
         if (response.error) {
-          if (count === 1) {
-            triggerErrorToast('Error saving address.')
-          } else {
-            triggerErrorToast(
-              `Error saving addresses. ${
-                i > 0 ? 'Not all addresses were saved.' : ''
-              }`
-            )
+          return {
+            error: response.error,
+            successful,
+            total,
           }
-          return
         }
+        successful += 1
       }
-      if (count === 1) {
-        triggerSuccessToast('Successfully added 1 address.')
-      } else {
-        triggerSuccessToast(`Successfully added ${count} addresses.`)
+      return {
+        successful,
+        total,
       }
-      closeAndReset()
     },
-    [walletId, addressAdd, closeAndReset]
+    [walletId, addressAdd]
   )
 
   const onSubmit = useCallback(
-    (values: typeof defaultValues) => {
-      return addAllAddresses(values.addresses)
+    async (values: Values) => {
+      const result = await addAllAddresses(values.addresses)
+      if (result.error) {
+        if (result.total === 1) {
+          triggerErrorToast('Error saving address.')
+        } else {
+          triggerErrorToast(
+            `Error saving addresses. ${
+              result.successful > 0
+                ? `${result.successful} of ${result.total} addresses were saved.`
+                : ''
+            }`
+          )
+        }
+        return
+      }
+      if (result.total === 1) {
+        triggerSuccessToast('Successfully added 1 address.')
+      } else {
+        triggerSuccessToast(
+          `Successfully added ${result.successful} addresses.`
+        )
+      }
+      if (values.shouldResubscribe) {
+        resubscribe.post({
+          payload: 0,
+        })
+      }
+      closeAndReset()
     },
-    [addAllAddresses]
+    [addAllAddresses, closeAndReset, resubscribe]
   )
 
   const addressesText = form.watch('addresses')
@@ -175,6 +213,7 @@ export function WalletAddressesAddDialog({
           Enter multiple addresses separated by spaces or commas.
         </Paragraph>
         <FieldTextArea form={form} fields={fields} name="addresses" />
+        <FieldSwitch form={form} fields={fields} name="shouldResubscribe" />
       </div>
     </Dialog>
   )
diff --git a/apps/walletd/dialogs/WalletAddressesGenerateLedgerDialog/index.tsx b/apps/walletd/dialogs/WalletAddressesGenerateLedgerDialog/index.tsx
index 6c14e5da1..19dd77219 100644
--- a/apps/walletd/dialogs/WalletAddressesGenerateLedgerDialog/index.tsx
+++ b/apps/walletd/dialogs/WalletAddressesGenerateLedgerDialog/index.tsx
@@ -41,7 +41,9 @@ function getDefaultValues(lastIndex: number) {
   }
 }
 
-function getFields(): ConfigFields<ReturnType<typeof getDefaultValues>, never> {
+type Values = ReturnType<typeof getDefaultValues>
+
+function getFields(): ConfigFields<Values, never> {
   return {
     ledgerConnected: {
       type: 'boolean',
@@ -213,12 +215,14 @@ export function WalletAddressesGenerateLedgerDialog({
   const indiciesWithAddresses = useMemo(() => {
     const indiciesWithAddresses: Record<string, AddressMeta> = {}
     for (const [index, { address, publicKey }] of Object.entries(indices)) {
-      const existing = existingAddresses?.find((a) => a.index === Number(index))
+      const existing = existingAddresses?.find(
+        (a) => a.metadata.index === Number(index)
+      )
       indiciesWithAddresses[index] = {
         isNew: !existing,
         index: Number(index),
         address: existing?.address || address,
-        publicKey: existing?.publicKey || publicKey,
+        publicKey: existing?.metadata.publicKey || publicKey,
       }
     }
     return indiciesWithAddresses
@@ -241,11 +245,14 @@ export function WalletAddressesGenerateLedgerDialog({
       const response = await addressAdd.put({
         params: {
           id: walletId,
-          addr: address,
         },
         payload: {
-          index,
-          publicKey,
+          address,
+          description: '',
+          metadata: {
+            index,
+            publicKey,
+          },
         },
       })
       if (response.error) {
diff --git a/apps/walletd/dialogs/WalletAddressesGenerateSeedDialog/index.tsx b/apps/walletd/dialogs/WalletAddressesGenerateSeedDialog/index.tsx
index 708fc6e5c..4e1ec85c4 100644
--- a/apps/walletd/dialogs/WalletAddressesGenerateSeedDialog/index.tsx
+++ b/apps/walletd/dialogs/WalletAddressesGenerateSeedDialog/index.tsx
@@ -113,7 +113,7 @@ export function WalletAddressesGenerateSeedDialog({
   const count = form.watch('count')
 
   const fields = getFields({
-    seedHash: wallet?.seedHash,
+    seedHash: wallet?.metadata.seedHash,
     mnemonicFieldType,
     setMnemonicFieldType,
   })
@@ -137,11 +137,15 @@ export function WalletAddressesGenerateSeedDialog({
         const response = await addressAdd.put({
           params: {
             id: walletId,
-            addr: pkResponse.address,
           },
           payload: {
-            index: i,
-            publicKey: pkResponse.publicKey,
+            address: pkResponse.address,
+            description: '',
+            // spendPolicy: '', // TODO: use sdk and replace
+            metadata: {
+              index: i,
+              publicKey: pkResponse.publicKey,
+            },
           },
         })
         if (response.error) {
diff --git a/apps/walletd/dialogs/WalletSendLedgerDialog/useSign.tsx b/apps/walletd/dialogs/WalletSendLedgerDialog/useSign.tsx
index 84db2330f..4bf4a50a8 100644
--- a/apps/walletd/dialogs/WalletSendLedgerDialog/useSign.tsx
+++ b/apps/walletd/dialogs/WalletSendLedgerDialog/useSign.tsx
@@ -1,5 +1,8 @@
 import { Transaction } from '@siafoundation/types'
-import { useWalletOutputs } from '@siafoundation/react-walletd'
+import {
+  useWalletOutputsSiacoin,
+  useWalletOutputsSiafund,
+} from '@siafoundation/react-walletd'
 import { useWallets } from '../../contexts/wallets'
 import { useCallback } from 'react'
 import { useWalletAddresses } from '../../hooks/useWalletAddresses'
@@ -9,7 +12,13 @@ import { useLedger } from '../../contexts/ledger'
 export function useSign({ cancel }: { cancel: (t: Transaction) => void }) {
   const { wallet } = useWallets()
   const walletId = wallet?.id
-  const outputs = useWalletOutputs({
+  const siacoinOutputs = useWalletOutputsSiacoin({
+    disabled: !walletId,
+    params: {
+      id: walletId,
+    },
+  })
+  const siafundOutputs = useWalletOutputsSiafund({
     disabled: !walletId,
     params: {
       id: walletId,
@@ -35,8 +44,8 @@ export function useSign({ cancel }: { cancel: (t: Transaction) => void }) {
         transaction: fundedTransaction,
         toSign,
         addresses,
-        siacoinOutputs: outputs.data?.siacoinOutputs,
-        siafundOutputs: outputs.data?.siafundOutputs,
+        siacoinOutputs: siacoinOutputs.data,
+        siafundOutputs: siafundOutputs.data,
       })
       if (signResponse.error) {
         cancel(fundedTransaction)
@@ -48,7 +57,7 @@ export function useSign({ cancel }: { cancel: (t: Transaction) => void }) {
         signedTransaction: signResponse.transaction,
       }
     },
-    [device, addresses, outputs.data, cancel]
+    [device, addresses, siacoinOutputs.data, siafundOutputs.data, cancel]
   )
 
   return sign
diff --git a/apps/walletd/dialogs/WalletSendSeedDialog/useSendForm.tsx b/apps/walletd/dialogs/WalletSendSeedDialog/useSendForm.tsx
index dfe72dda7..3d621c628 100644
--- a/apps/walletd/dialogs/WalletSendSeedDialog/useSendForm.tsx
+++ b/apps/walletd/dialogs/WalletSendSeedDialog/useSendForm.tsx
@@ -54,7 +54,7 @@ export function useSendForm({ walletId, params, onConfirm }: Props) {
   const { isSeedCached, getSeedFromCacheOrForm } = useWalletCachedSeed(walletId)
   const { dataset } = useWallets()
   const wallet = dataset?.find((w) => w.id === walletId)
-  const seedHash = wallet?.seedHash
+  const seedHash = wallet?.metadata.seedHash
 
   const form = useForm({
     mode: 'all',
diff --git a/apps/walletd/dialogs/WalletSendSeedDialog/useSignAndBroadcast.tsx b/apps/walletd/dialogs/WalletSendSeedDialog/useSignAndBroadcast.tsx
index cad46ced9..e6d09baae 100644
--- a/apps/walletd/dialogs/WalletSendSeedDialog/useSignAndBroadcast.tsx
+++ b/apps/walletd/dialogs/WalletSendSeedDialog/useSignAndBroadcast.tsx
@@ -1,7 +1,8 @@
 import {
   useConsensusNetwork,
-  useWalletOutputs,
+  useWalletOutputsSiacoin,
   useConsensusTipState,
+  useWalletOutputsSiafund,
 } from '@siafoundation/react-walletd'
 import { useWallets } from '../../contexts/wallets'
 import { useCallback } from 'react'
@@ -16,7 +17,13 @@ export function useSignAndBroadcast() {
   const { wallet, saveWalletSeed } = useWallets()
   const walletId = wallet?.id
 
-  const outputs = useWalletOutputs({
+  const siacoinOutputs = useWalletOutputsSiacoin({
+    disabled: !walletId,
+    params: {
+      id: walletId,
+    },
+  })
+  const siafundOutputs = useWalletOutputsSiafund({
     disabled: !walletId,
     params: {
       id: walletId,
@@ -47,17 +54,16 @@ export function useSignAndBroadcast() {
           error: fundingError,
         }
       }
-      const { signedTransaction, error: signingError } =
-        await signTransactionSeed({
-          seed,
-          transaction: fundedTransaction,
-          toSign,
-          cs: cs.data,
-          cn: cn.data,
-          addresses,
-          siacoinOutputs: outputs.data?.siacoinOutputs,
-          siafundOutputs: outputs.data?.siafundOutputs,
-        })
+      const { signedTransaction, error: signingError } = signTransactionSeed({
+        seed,
+        transaction: fundedTransaction,
+        toSign,
+        cs: cs.data,
+        cn: cn.data,
+        addresses,
+        siacoinOutputs: siacoinOutputs.data,
+        siafundOutputs: siafundOutputs.data,
+      })
       if (signingError) {
         cancel(fundedTransaction)
         return {
@@ -78,7 +84,8 @@ export function useSignAndBroadcast() {
       walletId,
       cs.data,
       cn.data,
-      outputs.data,
+      siacoinOutputs.data,
+      siafundOutputs.data,
       saveWalletSeed,
       broadcast,
     ]
diff --git a/apps/walletd/dialogs/WalletUnlockDialog.tsx b/apps/walletd/dialogs/WalletUnlockDialog.tsx
index 9c5215c96..6f4e63ce5 100644
--- a/apps/walletd/dialogs/WalletUnlockDialog.tsx
+++ b/apps/walletd/dialogs/WalletUnlockDialog.tsx
@@ -72,7 +72,7 @@ export function WalletUnlockDialog({
   })
 
   const fields = getFields({
-    seedHash: wallet?.seedHash,
+    seedHash: wallet?.metadata.seedHash,
     mnemonicFieldType,
     setMnemonicFieldType,
   })
diff --git a/apps/walletd/dialogs/WalletUpdateDialog/index.tsx b/apps/walletd/dialogs/WalletUpdateDialog/index.tsx
index c050460ce..871c8df62 100644
--- a/apps/walletd/dialogs/WalletUpdateDialog/index.tsx
+++ b/apps/walletd/dialogs/WalletUpdateDialog/index.tsx
@@ -11,7 +11,7 @@ import {
 } from '@siafoundation/design-system'
 import { useCallback, useEffect, useMemo } from 'react'
 import { useForm } from 'react-hook-form'
-import { useWalletAdd } from '@siafoundation/react-walletd'
+import { useWalletUpdate } from '@siafoundation/react-walletd'
 import { useWallets } from '../../contexts/wallets'
 
 const defaultValues = {
@@ -19,11 +19,13 @@ const defaultValues = {
   description: '',
 }
 
+type Values = typeof defaultValues
+
 function getFields({
   walletNames,
 }: {
   walletNames: string[]
-}): ConfigFields<typeof defaultValues, never> {
+}): ConfigFields<Values, never> {
   return {
     name: {
       type: 'text',
@@ -69,7 +71,7 @@ export function WalletUpdateDialog({
   const { walletId } = params || {}
   const { dataset } = useWallets()
   const wallet = dataset?.find((d) => d.id === walletId)
-  const walletAdd = useWalletAdd()
+  const walletUpdate = useWalletUpdate()
   const form = useForm({
     mode: 'all',
     defaultValues,
@@ -80,18 +82,14 @@ export function WalletUpdateDialog({
     defaultValues,
   })
   useEffect(() => {
-    // timeout 0 gets around a react-hook-form glitch where both fields
-    // do not get initialized.
-    setTimeout(() => {
-      form.reset(
-        wallet
-          ? {
-              name: wallet.name,
-              description: wallet.description,
-            }
-          : defaultValues
-      )
-    }, 0)
+    form.reset(
+      wallet
+        ? {
+            name: wallet.name,
+            description: wallet.description,
+          }
+        : defaultValues
+    )
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [walletId])
 
@@ -107,13 +105,13 @@ export function WalletUpdateDialog({
   )
   const fields = getFields({ walletNames })
   const onSubmit = useCallback(
-    async (values) => {
-      const response = await walletAdd.put({
+    async (values: Values) => {
+      const response = await walletUpdate.post({
         params: {
           id: walletId,
         },
         payload: {
-          ...wallet,
+          ...wallet.raw,
           name: values.name,
           description: values.description,
         },
@@ -124,7 +122,7 @@ export function WalletUpdateDialog({
         closeAndReset()
       }
     },
-    [walletId, walletAdd, wallet, closeAndReset]
+    [walletId, walletUpdate, wallet, closeAndReset]
   )
 
   return (
@@ -150,7 +148,7 @@ export function WalletUpdateDialog({
         <div className="flex flex-col gap-1">
           <Label>Type</Label>
           <div>
-            <Badge>{wallet?.type}</Badge>
+            <Badge>{wallet?.metadata.type}</Badge>
           </div>
         </div>
         <FieldText name="name" form={form} fields={fields} />
diff --git a/apps/walletd/dialogs/_sharedWalletSend/useFund.tsx b/apps/walletd/dialogs/_sharedWalletSend/useFund.tsx
index 8ce9672f6..9784f5e01 100644
--- a/apps/walletd/dialogs/_sharedWalletSend/useFund.tsx
+++ b/apps/walletd/dialogs/_sharedWalletSend/useFund.tsx
@@ -1,4 +1,7 @@
-import { useWalletFund, useWalletFundSf } from '@siafoundation/react-walletd'
+import {
+  useWalletFundSiacoin,
+  useWalletFundSiafund,
+} from '@siafoundation/react-walletd'
 import { useWallets } from '../../contexts/wallets'
 import { useCallback } from 'react'
 import { SendParams } from './types'
@@ -6,8 +9,8 @@ import { SendParams } from './types'
 export function useFund() {
   const { wallet } = useWallets()
   const walletId = wallet?.id
-  const walletFund = useWalletFund()
-  const walletFundSf = useWalletFundSf()
+  const walletFundSc = useWalletFundSiacoin()
+  const walletFundSf = useWalletFundSiafund()
 
   const fund = useCallback(
     async ({
@@ -27,7 +30,7 @@ export function useFund() {
 
       // fund
       if (mode === 'siacoin') {
-        const fundResponse = await walletFund.post({
+        const fundResponse = await walletFundSc.post({
           params: {
             id: walletId,
           },
@@ -83,7 +86,7 @@ export function useFund() {
           }
         }
         toSign.push(...fundResponse.data.toSign)
-        fundResponse = await walletFund.post({
+        fundResponse = await walletFundSc.post({
           params: {
             id: walletId,
           },
@@ -105,7 +108,7 @@ export function useFund() {
         }
       }
     },
-    [walletFund, walletFundSf, walletId]
+    [walletFundSc, walletFundSf, walletId]
   )
 
   return fund
diff --git a/apps/walletd/hooks/useWalletAddresses.tsx b/apps/walletd/hooks/useWalletAddresses.tsx
index 2e78bb8b8..2c9f26787 100644
--- a/apps/walletd/hooks/useWalletAddresses.tsx
+++ b/apps/walletd/hooks/useWalletAddresses.tsx
@@ -1,16 +1,6 @@
-import { useDatasetEmptyState } from '@siafoundation/design-system'
-import { useWalletAddresses as useData } from '@siafoundation/react-walletd'
-import { useMemo } from 'react'
+import { useWalletAddresses as useWalletAddressData } from '@siafoundation/react-walletd'
 import { defaultDatasetRefreshInterval } from '../config/swr'
-
-type AddressData = {
-  id: string
-  address: string
-  description?: string
-  publicKey?: string
-  index?: number
-  walletId: string
-}
+import { useDataset } from '../contexts/addresses/dataset'
 
 const filters = []
 
@@ -18,7 +8,7 @@ const filters = []
 // is based on the active wallet, this hook can be used in wallet specific
 // dialogs regardless of the active wallet.
 export function useWalletAddresses({ id }: { id: string }) {
-  const response = useData({
+  const response = useWalletAddressData({
     disabled: !id,
     params: {
       id,
@@ -30,34 +20,11 @@ export function useWalletAddresses({ id }: { id: string }) {
     },
   })
 
-  const dataset = useMemo<AddressData[] | null>(() => {
-    if (!response.data) {
-      return null
-    }
-    const data: AddressData[] = Object.entries(response.data || {}).map(
-      ([address, meta]) => ({
-        id: address,
-        address,
-        description: meta.description as string,
-        publicKey: meta.publicKey as string,
-        index: meta.index as number,
-        walletId: id,
-      })
-    )
-    return data
-  }, [response.data, id])
-
-  const dataState = useDatasetEmptyState(
-    dataset,
-    response.isValidating,
-    response.error,
-    filters
-  )
-
-  const lastIndex = (dataset || []).reduce(
-    (highest, { index }) => (index > highest ? index : highest),
-    -1
-  )
+  const { dataset, dataState, lastIndex } = useDataset({
+    walletId: id,
+    response,
+    filters,
+  })
 
   return {
     dataState,
diff --git a/apps/walletd/hooks/useWalletCachedSeed.tsx b/apps/walletd/hooks/useWalletCachedSeed.tsx
index aa8d1f70a..3f1f309a5 100644
--- a/apps/walletd/hooks/useWalletCachedSeed.tsx
+++ b/apps/walletd/hooks/useWalletCachedSeed.tsx
@@ -4,10 +4,14 @@ import { useWallets } from '../contexts/wallets'
 export function useWalletCachedSeed(walletId: string) {
   const { dataset } = useWallets()
   const wallet = dataset?.find((w) => w.id === walletId)
-  const cachedSeed = wallet?.seed
+  const cachedSeed = wallet?.state.seed
   const isSeedCached = !!cachedSeed
 
-  const getSeedFromCacheOrForm = ({ mnemonic }: { mnemonic: string }) => {
+  const getSeedFromCacheOrForm = ({
+    mnemonic,
+  }: {
+    mnemonic: string
+  }): { seed?: string; error?: string } => {
     if (isSeedCached) {
       return { seed: cachedSeed }
     } else {
diff --git a/apps/walletd/lib/sign.ts b/apps/walletd/lib/sign.ts
index 256a2b505..18e803d26 100644
--- a/apps/walletd/lib/sign.ts
+++ b/apps/walletd/lib/sign.ts
@@ -56,7 +56,7 @@ export function addUnlockConditionsAndSignatures({
       // build the unlock conditions with the utxo funding element's public key
       siacoinInput.unlockConditions = {
         timelock: 0,
-        publicKeys: [address.publicKey],
+        publicKeys: [address.metadata.publicKey],
         signaturesRequired: 1,
       }
     }
@@ -65,7 +65,7 @@ export function addUnlockConditionsAndSignatures({
       // build the unlock conditions with the utxo funding element's public key
       siafundInput.unlockConditions = {
         timelock: 0,
-        publicKeys: [address.publicKey],
+        publicKeys: [address.metadata.publicKey],
         signaturesRequired: 1,
       }
     }
@@ -114,10 +114,10 @@ export function getSiacoinUtxoAndAddress({
   if (!addressData) {
     return { error: 'Missing address' }
   }
-  if (addressData.index === undefined) {
+  if (addressData.metadata.index === undefined) {
     return { error: 'Missing address index' }
   }
-  if (!addressData.publicKey) {
+  if (!addressData.metadata.publicKey) {
     return { error: 'Missing address public key' }
   }
 
@@ -153,10 +153,10 @@ export function getSiafundUtxoAndAddress({
   if (!addressData) {
     return { error: 'Missing address' }
   }
-  if (addressData.index === undefined) {
+  if (addressData.metadata.index === undefined) {
     return { error: 'Missing address index' }
   }
-  if (!addressData.publicKey) {
+  if (!addressData.metadata.publicKey) {
     return { error: 'Missing address public key' }
   }
 
diff --git a/apps/walletd/lib/signLedger.spec.ts b/apps/walletd/lib/signLedger.spec.ts
index 49c059432..f803acd96 100644
--- a/apps/walletd/lib/signLedger.spec.ts
+++ b/apps/walletd/lib/signLedger.spec.ts
@@ -59,7 +59,9 @@ describe('signLedger', () => {
               id: 'id',
               walletId: 'id',
               address: 'address not in addresses',
-              index: 5,
+              metadata: {
+                index: 5,
+              },
             },
           ],
           siacoinOutputs: getSiacoinOutputs(),
@@ -83,6 +85,7 @@ describe('signLedger', () => {
               id: 'id',
               walletId: 'id',
               address: getSiacoinOutputs()[1].siacoinOutput.address,
+              metadata: {},
             },
           ],
           siacoinOutputs: getSiacoinOutputs(),
@@ -97,7 +100,7 @@ describe('signLedger', () => {
       await loadWASMTestEnv()
       const device = getMockDevice()
       const addresses = getAddresses()
-      addresses[0].publicKey = undefined
+      addresses[0].metadata.publicKey = undefined
       expect(
         await signTransactionLedger({
           device,
diff --git a/apps/walletd/lib/signLedger.ts b/apps/walletd/lib/signLedger.ts
index 78d7971ac..743ddced1 100644
--- a/apps/walletd/lib/signLedger.ts
+++ b/apps/walletd/lib/signLedger.ts
@@ -60,7 +60,7 @@ export async function signTransactionLedger({
       device,
       transaction,
       signatureIndex: i,
-      keyIndex: addressInfo.address.index,
+      keyIndex: addressInfo.address.metadata.index,
     })
 
     if (signTxnResponse.error) {
diff --git a/apps/walletd/lib/signSeed.spec.ts b/apps/walletd/lib/signSeed.spec.ts
index 526efda73..e8ac268c4 100644
--- a/apps/walletd/lib/signSeed.spec.ts
+++ b/apps/walletd/lib/signSeed.spec.ts
@@ -64,7 +64,9 @@ describe('signSeed', () => {
             id: 'id',
             walletId: 'id',
             address: 'address not in addresses',
-            index: 5,
+            metadata: {
+              index: 5,
+            },
           },
         ],
         siacoinOutputs: getSiacoinOutputs(),
@@ -89,6 +91,7 @@ describe('signSeed', () => {
             id: 'id',
             walletId: 'id',
             address: getSiacoinOutputs()[1].siacoinOutput.address,
+            metadata: {},
           },
         ],
         siacoinOutputs: getSiacoinOutputs(),
@@ -102,7 +105,7 @@ describe('signSeed', () => {
   it('errors when an address is missing its public key', async () => {
     await loadWASMTestEnv()
     const addresses = getAddresses()
-    addresses[0].publicKey = undefined
+    addresses[0].metadata.publicKey = undefined
     expect(
       signTransactionSeed({
         seed,
diff --git a/apps/walletd/lib/signSeed.ts b/apps/walletd/lib/signSeed.ts
index 955568f8d..5e9e62c0a 100644
--- a/apps/walletd/lib/signSeed.ts
+++ b/apps/walletd/lib/signSeed.ts
@@ -65,7 +65,10 @@ export function signTransactionSeed({
       return { error: utxoAddressError }
     }
 
-    const pkResponse = getWalletWasm().privateKeyFromSeed(seed, address.index)
+    const pkResponse = getWalletWasm().privateKeyFromSeed(
+      seed,
+      address.metadata.index
+    )
 
     if (pkResponse.error) {
       return {
diff --git a/apps/walletd/lib/testMocks.ts b/apps/walletd/lib/testMocks.ts
index ba3075e0c..a3f2fa6c7 100644
--- a/apps/walletd/lib/testMocks.ts
+++ b/apps/walletd/lib/testMocks.ts
@@ -88,27 +88,36 @@ export function getAddresses() {
       id: 'addr:934b885229a9f98153401d7a647a1862aede399c656f33ec8492dfffca557ca907a3d22089c8',
       address:
         'addr:934b885229a9f98153401d7a647a1862aede399c656f33ec8492dfffca557ca907a3d22089c8',
-      publicKey:
-        'ed25519:b5b9196a3c19f94982bcdba250a973181b22112437832a8f818f4aa73b8add74',
-      index: 1,
+      description: '',
+      metadata: {
+        publicKey:
+          'ed25519:b5b9196a3c19f94982bcdba250a973181b22112437832a8f818f4aa73b8add74',
+        index: 1,
+      },
       walletId: 'ad18cbe1-3281-4ec7-a7ad-93615009fbbc',
     },
     {
       id: 'addr:eb2ee5169dd9aaab804b38f7e70043690ac21da1144990a4a28c1dcf66cd7ee9845aef03006f',
       address:
         'addr:eb2ee5169dd9aaab804b38f7e70043690ac21da1144990a4a28c1dcf66cd7ee9845aef03006f',
-      publicKey:
-        'ed25519:8a7496aa59f17a4aae68c7e41e09d5ca94e64ba27f74cdb0b143f70dcc67b206',
-      index: 2,
+      description: '',
+      metadata: {
+        publicKey:
+          'ed25519:8a7496aa59f17a4aae68c7e41e09d5ca94e64ba27f74cdb0b143f70dcc67b206',
+        index: 2,
+      },
       walletId: 'ad18cbe1-3281-4ec7-a7ad-93615009fbbc',
     },
     {
       id: 'addr:fc9bc3482711e9f83642d07be385c0d434892245842b4c3f3b83b26d42cec15fe1aaac1be1ff',
       address:
         'addr:fc9bc3482711e9f83642d07be385c0d434892245842b4c3f3b83b26d42cec15fe1aaac1be1ff',
-      publicKey:
-        'ed25519:e80ab90d5baab391ec2e8fe31bf100f7ca3d4b5e3055eacf86afd42ab05798ba',
-      index: 0,
+      description: '',
+      metadata: {
+        publicKey:
+          'ed25519:e80ab90d5baab391ec2e8fe31bf100f7ca3d4b5e3055eacf86afd42ab05798ba',
+        index: 0,
+      },
       walletId: 'ad18cbe1-3281-4ec7-a7ad-93615009fbbc',
     },
   ]
diff --git a/libs/react-walletd/src/api.ts b/libs/react-walletd/src/api.ts
index 18c5ca267..1a121b493 100644
--- a/libs/react-walletd/src/api.ts
+++ b/libs/react-walletd/src/api.ts
@@ -21,8 +21,16 @@ import {
   SiacoinElement,
   SiafundElement,
   Transaction,
+  V2Transaction,
 } from '@siafoundation/types'
-import { PoolTransaction, WalletEvent, GatewayPeer } from './siaTypes'
+import {
+  PoolTransaction,
+  WalletEvent,
+  GatewayPeer,
+  Wallet,
+  Metadata,
+  WalletAddress,
+} from './siaTypes'
 
 // consensus
 
@@ -100,20 +108,29 @@ export function useSyncerConnect(args?: HookArgsCallback<void, string, never>) {
 
 // txpool
 
-type TxPoolTransactions = {
+type TxPoolTransactionsResponse = {
   transactions: Transaction[]
-  v2Transactions: unknown[]
+  v2Transactions: V2Transaction[]
 }
 
 const txPoolTransactionsRoute = '/txpool/transactions'
 export function useTxPoolTransactions(
-  args?: HookArgsSwr<void, TxPoolTransactions>
+  args?: HookArgsSwr<void, TxPoolTransactionsResponse>
 ) {
   return useGetSwr({ ...args, route: txPoolTransactionsRoute })
 }
 
+export function useTxPoolFee(args?: HookArgsSwr<void, Currency>) {
+  return useGetSwr({ ...args, route: '/txpool/fee' })
+}
+
+type TxPoolBroadcastPayload = {
+  transactions: Transaction[]
+  v2Transactions: V2Transaction[]
+}
+
 export function useTxPoolBroadcast(
-  args?: HookArgsCallback<void, TxPoolTransactions, unknown>
+  args?: HookArgsCallback<void, TxPoolBroadcastPayload, unknown>
 ) {
   return usePostFunc(
     {
@@ -133,37 +150,52 @@ export function useTxPoolBroadcast(
   )
 }
 
-// wallet
+// subscribe
 
-type Wallet = Record<string, unknown>
-type Wallets = Record<string, Wallet>
+export function useResubscribe(
+  args?: HookArgsCallback<void, BlockHeight, void>
+) {
+  return usePostFunc({
+    ...args,
+    route: '/resubscribe',
+  })
+}
+
+// wallet
 
 const walletsRoute = '/wallets'
 
-export function useWallets(args?: HookArgsSwr<void, Wallets>) {
+export function useWallets(args?: HookArgsSwr<void, Wallet[]>) {
   return useGetSwr({
     ...args,
     route: walletsRoute,
   })
 }
 
-type Address = Record<string, unknown>
-type Addresses = Record<string, Address>
+type WalletUpdatePayload = {
+  name: string
+  description: string
+  metadata: Metadata
+}
 
-export const walletAddressesRoute = '/wallets/:id/addresses'
-export function useWalletAddresses(
-  args: HookArgsSwr<{ id: string }, Addresses>
+export function useWalletAdd(
+  args?: HookArgsCallback<void, WalletUpdatePayload, Wallet>
 ) {
-  return useGetSwr({
-    ...args,
-    route: walletAddressesRoute,
-  })
+  return usePostFunc(
+    {
+      ...args,
+      route: '/wallets',
+    },
+    async (mutate) => {
+      mutate((key) => key.startsWith(walletsRoute))
+    }
+  )
 }
 
-export function useWalletAdd(
-  args?: HookArgsCallback<{ id: string }, Wallet, void>
+export function useWalletUpdate(
+  args?: HookArgsCallback<{ id: string }, WalletUpdatePayload, Wallet>
 ) {
-  return usePutFunc(
+  return usePostFunc(
     {
       ...args,
       route: '/wallets/:id',
@@ -187,22 +219,25 @@ export function useWalletDelete(
   )
 }
 
-export function useWalletSubscribe(
-  args?: HookArgsCallback<{ id: string }, BlockHeight, void>
+// addresses
+
+export const walletAddressesRoute = '/wallets/:id/addresses'
+export function useWalletAddresses(
+  args: HookArgsSwr<{ id: string }, WalletAddress[]>
 ) {
-  return usePostFunc({
+  return useGetSwr({
     ...args,
-    route: '/wallets/:id/subscribe',
+    route: walletAddressesRoute,
   })
 }
 
 export function useWalletAddressAdd(
-  args?: HookArgsCallback<{ id: string; addr: string }, Address, void>
+  args?: HookArgsCallback<{ id: string }, WalletAddress, void>
 ) {
   return usePutFunc(
     {
       ...args,
-      route: '/wallets/:id/addresses/:addr',
+      route: '/wallets/:id/addresses',
     },
     async (mutate, data) => {
       mutate((key) =>
@@ -227,7 +262,10 @@ export function useWalletAddressDelete(
 
 const walletBalanceRoute = '/wallets/:id/balance'
 export function useWalletBalance(
-  args: HookArgsSwr<{ id: string }, { siacoins: string; siafunds: number }>
+  args: HookArgsSwr<
+    { id: string },
+    { siacoins: Currency; immatureSiacoins: Currency; siafunds: number }
+  >
 ) {
   return useGetSwr({
     ...args,
@@ -259,21 +297,25 @@ export function useWalletTxPool(
   })
 }
 
-type WalletOutputsResponse = {
-  siacoinOutputs: SiacoinElement[]
-  siafundOutputs: SiafundElement[]
+export function useWalletOutputsSiacoin(
+  args: HookArgsSwr<{ id: string }, SiacoinElement[]>
+) {
+  return useGetSwr({
+    ...args,
+    route: '/wallets/:id/outputs/siacoin',
+  })
 }
 
-export function useWalletOutputs(
-  args: HookArgsSwr<{ id: string }, WalletOutputsResponse>
+export function useWalletOutputsSiafund(
+  args: HookArgsSwr<{ id: string }, SiafundElement[]>
 ) {
   return useGetSwr({
     ...args,
-    route: '/wallets/:id/outputs',
+    route: '/wallets/:id/outputs/siafund',
   })
 }
 
-type WalletFundRequest = {
+type WalletFundSiacoinPayload = {
   transaction: Transaction
   amount: Currency
   changeAddress: string
@@ -285,48 +327,52 @@ export type WalletFundResponse = {
   dependsOn: Transaction[]
 }
 
-export function useWalletFund(
-  args?: HookArgsCallback<{ id: string }, WalletFundRequest, WalletFundResponse>
+export function useWalletFundSiacoin(
+  args?: HookArgsCallback<
+    { id: string },
+    WalletFundSiacoinPayload,
+    WalletFundResponse
+  >
 ) {
   return usePostFunc({ ...args, route: '/wallets/:id/fund' })
 }
 
-type WalletFundRequestSf = {
+type WalletFundSiafundPayload = {
   transaction: Transaction
   amount: number
   changeAddress: string
   claimAddress: string
 }
 
-export function useWalletFundSf(
+export function useWalletFundSiafund(
   args?: HookArgsCallback<
     { id: string },
-    WalletFundRequestSf,
+    WalletFundSiafundPayload,
     WalletFundResponse
   >
 ) {
   return usePostFunc({ ...args, route: '/wallets/:id/fundsf' })
 }
 
-type WalletReserveRequest = {
+type WalletReservePayload = {
   siacoinOutputs?: SiacoinOutputID[]
   siafundOutputs?: SiafundOutputID[]
   duration: number
 }
 
 export function useWalletReserve(
-  args?: HookArgsCallback<{ id: string }, WalletReserveRequest, void>
+  args?: HookArgsCallback<{ id: string }, WalletReservePayload, void>
 ) {
   return usePostFunc({ ...args, route: '/wallets/:id/reserve' })
 }
 
-type WalletReleaseRequest = {
+type WalletReleasePayload = {
   siacoinOutputs?: SiacoinOutputID[]
   siafundOutputs?: SiafundOutputID[]
 }
 
 export function useWalletRelease(
-  args?: HookArgsCallback<{ id: string }, WalletReleaseRequest, void>
+  args?: HookArgsCallback<{ id: string }, WalletReleasePayload, void>
 ) {
   return usePostFunc({ ...args, route: '/wallets/:id/release' })
 }
diff --git a/libs/react-walletd/src/siaTypes.ts b/libs/react-walletd/src/siaTypes.ts
index 432c84303..ecf82b185 100644
--- a/libs/react-walletd/src/siaTypes.ts
+++ b/libs/react-walletd/src/siaTypes.ts
@@ -4,9 +4,14 @@ import {
   Transaction,
   Address,
   SiacoinElement,
-  SiafundElementAndClaim,
   SiafundElement,
   FileContractElement,
+  Hash256,
+  FileContract,
+  V2FileContractResolutionType,
+  PublicKey,
+  TransactionID,
+  SpendPolicy,
 } from '@siafoundation/types'
 
 export type GatewayPeer = {
@@ -14,14 +19,14 @@ export type GatewayPeer = {
   inbound: boolean
   version: string
 
-  firstSeen: string
-  connectedSince: string
-  syncedBlocks: number
-  syncDuration: number
+  firstSeen?: string
+  connectedSince?: string
+  syncedBlocks?: number
+  syncDuration?: number
 }
 
 export type PoolTransaction = {
-  id: string
+  id: TransactionID
   raw: Transaction
   type: string
   sent: Currency
@@ -29,42 +34,72 @@ export type PoolTransaction = {
   locked: Currency
 }
 
-export type WalletEventTransaction = {
+export type WalletEventBase = {
+  id: Hash256
   timestamp: string
   index: ChainIndex
   relevant: Address[]
+}
+
+export type WalletSiafundInput = {
+  siafundElement: SiafundElement
+  claimElement: SiacoinElement
+}
+
+export type WalletFileContract = {
+  fileContract: FileContractElement
+  revision?: FileContract
+  validOutputs?: SiacoinElement[]
+}
+
+export type WalletV2FileContract = {
+  fileContract: FileContractElement
+  revision?: FileContract
+  resolution?: V2FileContractResolutionType
+  outputs?: SiacoinElement[]
+}
+
+export type WalletHostAnnouncement = {
+  publicKey: PublicKey
+  netAddress: string
+}
+
+export type WalletEventTransaction = WalletEventBase & {
   type: 'transaction'
   val: {
-    // transactionID: string
-    // transaction: Transaction
-    id: string
-    siacoinInputs: SiacoinElement[]
-    siacoinOutputs: SiacoinElement[]
-    siafundInputs: SiafundElementAndClaim[]
-    siafundOutputs: SiafundElement[]
-    fileContracts: FileContractElement[]
-    v2FileContracts: null
-    hostAnnouncements: null
+    siacoinInputs?: SiacoinElement[]
+    siacoinOutputs?: SiacoinElement[]
+    siafundInputs?: WalletSiafundInput[]
+    siafundOutputs?: SiafundElement[]
+    fileContracts?: WalletFileContract[]
+    v2FileContracts?: WalletV2FileContract[]
+    hostAnnouncements?: WalletHostAnnouncement[]
     fee: number
   }
 }
 
-export type WalletEventMissedFileContract = {
-  timestamp: string
-  index: ChainIndex
-  relevant: Address[]
-  type: 'missed file contract'
+export type WalletEventMinerPayout = WalletEventBase & {
+  type: 'miner payout'
+  val: {
+    siacoinOutput: SiacoinElement
+  }
+}
+
+export type WalletEventContractPayout = WalletEventBase & {
+  type: 'contract payout'
   val: {
     fileContract: FileContractElement
-    missedOutputs: SiacoinElement[]
+    siacoinOutput: SiacoinElement
+    missed: boolean
   }
 }
 
-export type WalletEventMinerPayout = {
-  timestamp: string
-  index: ChainIndex
-  relevant: Address[]
-  type: 'miner payout'
+export type WalletEventSiafundClaim = WalletEventBase & {
+  type: 'siafund claim'
+}
+
+export type WalletEventFoundationSubsidy = WalletEventBase & {
+  type: 'foundation subsidy'
   val: {
     siacoinOutput: SiacoinElement
   }
@@ -72,5 +107,25 @@ export type WalletEventMinerPayout = {
 
 export type WalletEvent =
   | WalletEventTransaction
-  | WalletEventMissedFileContract
   | WalletEventMinerPayout
+  | WalletEventContractPayout
+  | WalletEventSiafundClaim
+  | WalletEventFoundationSubsidy
+
+export type Metadata = Record<string, unknown>
+
+export type Wallet = {
+  id: string
+  name: string
+  description: string
+  dateCreated: string
+  lastUpdated: string
+  metadata: Metadata
+}
+
+export type WalletAddress = {
+  address: string
+  description: string
+  spendPolicy?: SpendPolicy
+  metadata: Metadata
+}
diff --git a/libs/types/src/core.ts b/libs/types/src/core.ts
new file mode 100644
index 000000000..aff0d7e63
--- /dev/null
+++ b/libs/types/src/core.ts
@@ -0,0 +1,197 @@
+export type ID = string
+export type Hash256 = string
+export type Signature = string
+export type Currency = string
+export type BlockHeight = number
+export type Hash = string
+export type OutputID = string
+export type EncryptionKey = string
+export type FileContractID = string
+export type PublicKey = string
+export type TransactionID = Hash256
+export type SiacoinOutputID = Hash256
+export type SiafundOutputID = Hash256
+export type Address = string
+
+export type StateElement = {
+  id: string
+  leafIndex: number
+  merkleProof: Hash256[] | null
+}
+
+export type UnlockConditions = {
+  timelock: number
+  publicKeys?: PublicKey[]
+  signaturesRequired: number
+}
+
+export type FileContractRevision = {
+  parentID: string
+  unlockConditions: UnlockConditions
+  revisionNumber: number
+  filesize: number
+  fileMerkleRoot: string
+  windowStart: number
+  windowEnd: number
+  validProofOutputs?: SiacoinOutput[]
+  missedProofOutputs?: SiacoinOutput[]
+  unlockHash: string
+}
+
+export type TransactionSignature = {
+  parentID: string
+  publicKeyIndex: number
+  timelock: number
+  coveredFields: CoveredFields
+  signature?: string
+}
+
+export type SiacoinInput = {
+  parentID: string
+  unlockConditions: UnlockConditions
+}
+
+export type SiacoinOutput = {
+  value: Currency
+  address: string
+}
+
+export type SiacoinElement = StateElement & {
+  siacoinOutput: SiacoinOutput
+  maturityHeight: number
+}
+
+export type SiafundElement = StateElement & {
+  siafundOutput: SiafundOutput
+  claimStart: string
+}
+
+export type CoveredFields = {
+  wholeTransaction: boolean
+  siacoinInputs?: number[]
+  siacoinOutputs?: number[]
+  fileContracts?: number[]
+  fileContractRevisions?: number[]
+  storageProofs?: number[]
+  siafundInputs?: number[]
+  siafundOutputs?: number[]
+  minerFees?: number[]
+  arbitraryData?: number[]
+  signatures?: number[]
+}
+
+export type FileContractElement = StateElement & {
+  fileContract: FileContract
+}
+
+export type FileContract = {
+  filesize: number
+  fileMerkleRoot: string
+  windowStart: number
+  windowEnd: number
+  payout: Currency
+  validProofOutputs?: SiacoinOutput[]
+  missedProofOutputs?: SiacoinOutput[]
+  unlockHash: string
+  revisionNumber: number
+}
+
+export type StorageProof = {
+  parentID: string
+  segment: string
+  hashset?: Hash[]
+}
+
+export type SiafundInput = {
+  parentID: string
+  unlockConditions: UnlockConditions
+  claimAddress: string
+}
+
+export type SiafundOutput = {
+  value: number
+  address: string
+}
+
+export type Transaction = {
+  siacoinInputs?: SiacoinInput[]
+  siacoinOutputs?: SiacoinOutput[]
+  fileContracts?: FileContract[]
+  fileContractRevisions?: FileContractRevision[]
+  storageProofs?: StorageProof[]
+  siafundInputs?: SiafundInput[]
+  siafundOutputs?: SiafundOutput[]
+  minerFees?: Currency[]
+  arbitraryData?: string[]
+  signatures?: TransactionSignature[]
+}
+
+export type Block = {
+  parentID: string
+  nonce: string
+  timestamp: number
+  minerPayouts?: SiacoinOutput[]
+  transactions?: Transaction[]
+}
+
+export type ChainIndex = {
+  height: number
+  id: string
+}
+
+export type ConsensusNetwork = {
+  name: 'mainnet' | 'zen'
+  initialCoinbase: Currency
+  minimumCoinbase: Currency
+  initialTarget: string
+  hardforkDevAddr: {
+    height: number
+    oldAddress: string
+    newAddress: string
+  }
+  hardforkTax: {
+    height: number
+  }
+  hardforkStorageProof: {
+    height: number
+  }
+  hardforkOak: {
+    height: number
+    fixHeight: number
+    genesisTimestamp: string
+  }
+  hardforkASIC: {
+    height: number
+    oakTime: number
+    oakTarget: string
+  }
+  hardforkFoundation: {
+    height: number
+    primaryAddress: string
+    failsafeAddress: string
+  }
+  hardforkV2: {
+    allowHeight: number
+    requireHeight: number
+  }
+}
+
+export type ConsensusState = {
+  index: ChainIndex
+  prevTimestamps: string[]
+  depth: string
+  childTarget: string
+  siafundPool: string
+  oakTime: number
+  oakTarget: string
+  foundationPrimaryAddress: string
+  foundationFailsafeAddress: string
+  totalWork: string
+  difficulty: string
+  oakWork: string
+  elements: {
+    numLeaves: number
+    trees: string[]
+  }
+  attestations: number
+}
diff --git a/libs/types/src/index.ts b/libs/types/src/index.ts
index 76ff4623f..afc97d4a9 100644
--- a/libs/types/src/index.ts
+++ b/libs/types/src/index.ts
@@ -1,205 +1,2 @@
-export type ID = string
-export type Hash256 = string
-export type Signature = string
-export type Currency = string
-export type BlockHeight = number
-export type Hash = string
-export type OutputID = string
-export type EncryptionKey = string
-export type FileContractID = string
-export type PublicKey = string
-export type TransactionID = string
-export type SiacoinOutputID = Hash256
-export type SiafundOutputID = Hash256
-export type Address = string
-
-export type UnlockConditions = {
-  timelock: number
-  publicKeys?: PublicKey[]
-  signaturesRequired: number
-}
-
-export type FileContractRevision = {
-  parentID: string
-  unlockConditions: UnlockConditions
-  revisionNumber: number
-  filesize: number
-  fileMerkleRoot: string
-  windowStart: number
-  windowEnd: number
-  validProofOutputs?: SiacoinOutput[]
-  missedProofOutputs?: SiacoinOutput[]
-  unlockHash: string
-}
-
-export type TransactionSignature = {
-  parentID: string
-  publicKeyIndex: number
-  timelock: number
-  coveredFields: CoveredFields
-  signature?: string
-}
-
-export type SiacoinInput = {
-  parentID: string
-  unlockConditions: UnlockConditions
-}
-
-export type SiacoinOutput = {
-  value: Currency
-  address: string
-}
-
-export type SiacoinElement = {
-  id: string
-  leafIndex: number
-  merkleProof: string[] | null
-  siacoinOutput: SiacoinOutput
-  maturityHeight: number
-}
-
-export type SiafundElement = {
-  id: string
-  leafIndex: number
-  merkleProof: string[] | null
-  siafundOutput: SiafundOutput
-  claimStart: string
-}
-
-export type SiafundElementAndClaim = {
-  siafundElement: SiafundElement
-  claimElement: SiacoinElement
-}
-
-export type CoveredFields = {
-  wholeTransaction: boolean
-  siacoinInputs?: number[]
-  siacoinOutputs?: number[]
-  fileContracts?: number[]
-  fileContractRevisions?: number[]
-  storageProofs?: number[]
-  siafundInputs?: number[]
-  siafundOutputs?: number[]
-  minerFees?: number[]
-  arbitraryData?: number[]
-  signatures?: number[]
-}
-
-export type FileContractElement = {
-  id: string
-  leafIndex: number
-  merkleProof: string[] | null
-  fileContract: FileContract
-}
-
-export type FileContract = {
-  filesize: number
-  fileMerkleRoot: string
-  windowStart: number
-  windowEnd: number
-  payout: Currency
-  validProofOutputs?: SiacoinOutput[]
-  missedProofOutputs?: SiacoinOutput[]
-  unlockHash: string
-  revisionNumber: number
-}
-
-export type StorageProof = {
-  parentID: string
-  segment: string
-  hashset?: Hash[]
-}
-
-export type SiafundInput = {
-  parentID: string
-  unlockConditions: UnlockConditions
-  claimAddress: string
-}
-
-export type SiafundOutput = {
-  value: number
-  address: string
-}
-
-export type Transaction = {
-  siacoinInputs?: SiacoinInput[]
-  siacoinOutputs?: SiacoinOutput[]
-  fileContracts?: FileContract[]
-  fileContractRevisions?: FileContractRevision[]
-  storageProofs?: StorageProof[]
-  siafundInputs?: SiafundInput[]
-  siafundOutputs?: SiafundOutput[]
-  minerFees?: Currency[]
-  arbitraryData?: string[]
-  signatures?: TransactionSignature[]
-}
-
-export type Block = {
-  parentID: string
-  nonce: string
-  timestamp: number
-  minerPayouts?: SiacoinOutput[]
-  transactions?: Transaction[]
-}
-
-export type ChainIndex = {
-  height: number
-  id: string
-}
-
-export type ConsensusNetwork = {
-  name: 'mainnet' | 'zen'
-  initialCoinbase: Currency
-  minimumCoinbase: Currency
-  initialTarget: string
-  hardforkDevAddr: {
-    height: number
-    oldAddress: string
-    newAddress: string
-  }
-  hardforkTax: {
-    height: number
-  }
-  hardforkStorageProof: {
-    height: number
-  }
-  hardforkOak: {
-    height: number
-    fixHeight: number
-    genesisTimestamp: string
-  }
-  hardforkASIC: {
-    height: number
-    oakTime: number
-    oakTarget: string
-  }
-  hardforkFoundation: {
-    height: number
-    primaryAddress: string
-    failsafeAddress: string
-  }
-  hardforkV2: {
-    allowHeight: number
-    requireHeight: number
-  }
-}
-
-export type ConsensusState = {
-  index: ChainIndex
-  prevTimestamps: string[]
-  depth: string
-  childTarget: string
-  siafundPool: string
-  oakTime: number
-  oakTarget: string
-  foundationPrimaryAddress: string
-  foundationFailsafeAddress: string
-  totalWork: string
-  difficulty: string
-  oakWork: string
-  elements: {
-    numLeaves: number
-    trees: string[]
-  }
-  attestations: number
-}
+export * from './core'
+export * from './v2'
diff --git a/libs/types/src/v2.ts b/libs/types/src/v2.ts
new file mode 100644
index 000000000..e54932482
--- /dev/null
+++ b/libs/types/src/v2.ts
@@ -0,0 +1,97 @@
+import {
+  Address,
+  Currency,
+  Hash256,
+  PublicKey,
+  SiacoinElement,
+  SiacoinOutput,
+  SiafundElement,
+  SiafundOutput,
+  Signature,
+  StateElement,
+} from './core'
+
+export type SpendPolicy = string
+
+export type V2SiacoinInput = {
+  parent: SiacoinElement
+  satisfiedPolicy: SatisfiedPolicy
+}
+
+export type V2SiafundInput = {
+  parent: SiafundElement
+  claimAddress: Address
+  satisfiedPolicy: SatisfiedPolicy
+}
+
+export type V2FileContractRevision = {
+  parent: V2FileContractElement
+  revision: V2FileContract
+}
+
+export type V2FileContract = {
+  filesize: number
+  fileMerkleRoot: Hash256
+  proofHeight: number
+  expirationHeight: number
+  renterOutput: SiacoinOutput
+  hostOutput: SiacoinOutput
+  missedHostValue: Currency
+  totalCollateral: Currency
+  renterPublicKey: PublicKey
+  hostPublicKey: PublicKey
+  revisionNumber: number
+  renterSignature?: Signature
+  hostSignature?: Signature
+}
+
+export type V2FileContractResolution = {
+  parent: V2FileContractElement
+  resolution: V2FileContractResolutionType
+}
+
+export type V2FileContractRenewal = {
+  finalRevision: V2FileContract
+  initialRevision: V2FileContract
+  renterRollover: Currency
+  hostRollover: Currency
+  renterSignature?: Signature
+  hostSignature?: Signature
+}
+
+export type V2Transaction = {
+  siacoinInputs?: V2SiacoinInput[]
+  siacoinOutputs?: SiacoinOutput[]
+  siafundInputs?: V2SiafundInput[]
+  siafundOutputs?: SiafundOutput[]
+  fileContracts?: V2FileContract[]
+  fileContractRevisions?: V2FileContractRevision[]
+  fileContractResolutions?: V2FileContractResolution[]
+  attestations?: Attestation[]
+  arbitraryData?: Uint8Array
+  newFoundationAddress?: Address
+  minerFee: Currency
+}
+
+export type Attestation = {
+  publicKey: PublicKey
+  key: string
+  value: Uint8Array
+  signature: Signature
+}
+
+export type SatisfiedPolicy = {
+  policy: SpendPolicy
+  signatures?: Signature[]
+  preimages?: string[]
+}
+
+export type V2FileContractElement = StateElement & {
+  v2FileContract: V2FileContract
+}
+
+export type AttestationElement = StateElement & {
+  attestation: Attestation
+}
+
+export type V2FileContractResolutionType = unknown // TODO: replace `unknown` with the actual type