refactor: split out walletd-types

SiaFoundation · Apr 15, 2024 · 48d9c7f · 48d9c7f
1 parent 25903c7
commit 48d9c7f
Show file tree

Hide file tree

Showing 48 changed files with 573 additions and 209 deletions.
diff --git a/apps/walletd-e2e/src/fixtures/createWallet.ts b/apps/walletd-e2e/src/fixtures/createWallet.ts
@@ -4,9 +4,9 @@ import {
   Wallet,
   WalletAddressesResponse,
   WalletBalanceResponse,
-  WalletFundResponse,
+  WalletFundSiacoinResponse,
   WalletOutputsSiacoinResponse,
-} from '@siafoundation/walletd-react'
+} from '@siafoundation/walletd-types'
 
 export async function createWallet({
   page,
@@ -21,7 +21,7 @@ export async function createWallet({
   responses?: {
     balance?: WalletBalanceResponse
     outputsSiacoin?: WalletOutputsSiacoinResponse
-    fund?: WalletFundResponse
+    fundSiacoin?: WalletFundSiacoinResponse
     addresses?: WalletAddressesResponse
   }
   expects?: {

diff --git a/apps/walletd-e2e/src/specs/seedSendSiacoin.spec.ts b/apps/walletd-e2e/src/specs/seedSendSiacoin.spec.ts
@@ -87,7 +87,7 @@ test('errors if the input to sign is not found on the transaction', async ({
     mnemonic,
     responses: {
       ...getDefaultMockWalletResponses(mocks),
-      fund: mockFundInvalid,
+      fundSiacoin: mockFundInvalid,
     },
     expects: {
       fundSiacoinPost: (data) =>

diff --git a/apps/walletd/contexts/addresses/dataset.tsx b/apps/walletd/contexts/addresses/dataset.tsx
@@ -5,8 +5,8 @@ import {
 import {
   WalletAddressMetadata,
   WalletAddressesResponse,
-  useWalletAddresses,
-} from '@siafoundation/walletd-react'
+} from '@siafoundation/walletd-types'
+import { useWalletAddresses } from '@siafoundation/walletd-react'
 import { useMemo } from 'react'
 import { AddressData } from './types'
 import { OpenDialog, useDialog } from '../dialog'

diff --git a/apps/walletd/contexts/addresses/types.ts b/apps/walletd/contexts/addresses/types.ts
@@ -1,7 +1,7 @@
 import {
   WalletAddress,
   WalletAddressMetadata,
-} from '@siafoundation/walletd-react'
+} from '@siafoundation/walletd-types'
 
 export type CellContext = {
   siascanUrl: string

diff --git a/apps/walletd/contexts/wallets/index.tsx b/apps/walletd/contexts/wallets/index.tsx
@@ -4,10 +4,8 @@ import {
   useClientFilters,
   useClientFilteredDataset,
 } from '@siafoundation/design-system'
-import {
-  WalletMetadata,
-  useWallets as useWalletsData,
-} from '@siafoundation/walletd-react'
+import { WalletMetadata } from '@siafoundation/walletd-types'
+import { useWallets as useWalletsData } from '@siafoundation/walletd-react'
 import { createContext, useContext, useEffect, useMemo } from 'react'
 import {
   WalletData,

diff --git a/apps/walletd/contexts/wallets/types.ts b/apps/walletd/contexts/wallets/types.ts
@@ -1,4 +1,4 @@
-import { Wallet, WalletMetadata } from '@siafoundation/walletd-react'
+import { Wallet, WalletMetadata } from '@siafoundation/walletd-types'
 
 export type WalletData = {
   id: string

diff --git a/apps/walletd/dialogs/WalletAddLedgerDialog/index.tsx b/apps/walletd/dialogs/WalletAddLedgerDialog/index.tsx
@@ -15,9 +15,8 @@ import { useForm } from 'react-hook-form'
 import {
   WalletAddressMetadata,
   WalletMetadata,
-  useWalletAdd,
-  useWalletAddressAdd,
-} from '@siafoundation/walletd-react'
+} from '@siafoundation/walletd-types'
+import { useWalletAdd, useWalletAddressAdd } from '@siafoundation/walletd-react'
 import { useDialog } from '../../contexts/dialog'
 import { useWallets } from '../../contexts/wallets'
 import { walletAddTypes } from '../../config/walletTypes'

diff --git a/apps/walletd/dialogs/WalletAddNewDialog/index.tsx b/apps/walletd/dialogs/WalletAddNewDialog/index.tsx
@@ -13,7 +13,8 @@ import {
 import { Redo16, Copy16 } from '@siafoundation/react-icons'
 import { MouseEvent, useCallback, useEffect } from 'react'
 import { useForm } from 'react-hook-form'
-import { WalletMetadata, useWalletAdd } from '@siafoundation/walletd-react'
+import { WalletMetadata } from '@siafoundation/walletd-types'
+import { useWalletAdd } from '@siafoundation/walletd-react'
 import { useDialog } from '../../contexts/dialog'
 import { useWallets } from '../../contexts/wallets'
 import { walletAddTypes } from '../../config/walletTypes'

diff --git a/apps/walletd/dialogs/WalletAddRecoverDialog/index.tsx b/apps/walletd/dialogs/WalletAddRecoverDialog/index.tsx
@@ -12,7 +12,8 @@ import { useCallback } from 'react'
 import { useForm } from 'react-hook-form'
 import { useDialog } from '../../contexts/dialog'
 import { useWallets } from '../../contexts/wallets'
-import { WalletMetadata, useWalletAdd } from '@siafoundation/walletd-react'
+import { WalletMetadata } from '@siafoundation/walletd-types'
+import { useWalletAdd } from '@siafoundation/walletd-react'
 import { blake2bHex } from 'blakejs'
 import { SeedLayout } from '../SeedLayout'
 import { SeedIcon } from '@siafoundation/react-icons'

diff --git a/apps/walletd/dialogs/WalletAddWatchDialog/index.tsx b/apps/walletd/dialogs/WalletAddWatchDialog/index.tsx
@@ -11,7 +11,8 @@ import {
 } from '@siafoundation/design-system'
 import { useCallback } from 'react'
 import { useForm } from 'react-hook-form'
-import { WalletMetadata, useWalletAdd } from '@siafoundation/walletd-react'
+import { WalletMetadata } from '@siafoundation/walletd-types'
+import { useWalletAdd } from '@siafoundation/walletd-react'
 import { useDialog } from '../../contexts/dialog'
 import { useWallets } from '../../contexts/wallets'
 import { walletAddTypes } from '../../config/walletTypes'

diff --git a/apps/walletd/dialogs/WalletAddressesAddDialog.tsx b/apps/walletd/dialogs/WalletAddressesAddDialog.tsx
@@ -9,10 +9,8 @@ import {
   triggerSuccessToast,
   useDialogFormHelpers,
 } from '@siafoundation/design-system'
-import {
-  WalletAddressMetadata,
-  useWalletAddressAdd,
-} from '@siafoundation/walletd-react'
+import { WalletAddressMetadata } from '@siafoundation/walletd-types'
+import { useWalletAddressAdd } from '@siafoundation/walletd-react'
 import { useCallback } from 'react'
 import { useForm } from 'react-hook-form'
 import { useWallets } from '../contexts/wallets'

diff --git a/apps/walletd/dialogs/WalletAddressesGenerateLedgerDialog/index.tsx b/apps/walletd/dialogs/WalletAddressesGenerateLedgerDialog/index.tsx
@@ -11,10 +11,8 @@ import {
   triggerSuccessToast,
   useDialogFormHelpers,
 } from '@siafoundation/design-system'
-import {
-  WalletAddressMetadata,
-  useWalletAddressAdd,
-} from '@siafoundation/walletd-react'
+import { WalletAddressMetadata } from '@siafoundation/walletd-types'
+import { useWalletAddressAdd } from '@siafoundation/walletd-react'
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { useForm } from 'react-hook-form'
 import { useWallets } from '../../contexts/wallets'

diff --git a/apps/walletd/dialogs/WalletAddressesGenerateSeedDialog/index.tsx b/apps/walletd/dialogs/WalletAddressesGenerateSeedDialog/index.tsx
@@ -7,10 +7,8 @@ import {
   triggerSuccessToast,
   useDialogFormHelpers,
 } from '@siafoundation/design-system'
-import {
-  WalletAddressMetadata,
-  useWalletAddressAdd,
-} from '@siafoundation/walletd-react'
+import { WalletAddressMetadata } from '@siafoundation/walletd-types'
+import { useWalletAddressAdd } from '@siafoundation/walletd-react'
 import { useCallback, useEffect, useState } from 'react'
 import { useForm } from 'react-hook-form'
 import { useWallets } from '../../contexts/wallets'

diff --git a/apps/walletd/lib/testMocks.ts b/apps/walletd/lib/testMocks.ts
@@ -1,7 +1,7 @@
 import Sia from '@siacentral/ledgerjs-sia'
 import { LedgerDevice } from '../contexts/ledger/types'
 import { transformAddressesResponse } from '../contexts/addresses/dataset'
-import { Wallet, WalletAddressesResponse } from '@siafoundation/walletd-react'
+import { Wallet, WalletAddressesResponse } from '@siafoundation/walletd-types'
 
 export function getMockDevice() {
   return {

diff --git a/libs/walletd-mock/package.json b/libs/walletd-mock/package.json
@@ -5,10 +5,10 @@
   "license": "MIT",
   "dependencies": {
     "@siafoundation/types": "0.2.0",
-    "@siafoundation/walletd-react": "4.0.0",
     "@siafoundation/sia-central-mock": "0.0.0",
     "@siafoundation/units": "3.0.0",
-    "playwright": "^1.42.1"
+    "playwright": "^1.42.1",
+    "@siafoundation/walletd-types": "0.0.0"
   },
   "types": "./src/index.d.ts"
 }
diff --git a/libs/walletd-mock/src/mocks/consensusTip.ts b/libs/walletd-mock/src/mocks/consensusTip.ts
@@ -1,4 +1,4 @@
-import { ConsensusTipResponse } from '@siafoundation/walletd-react'
+import { ConsensusTipResponse } from '@siafoundation/walletd-types'
 import { Page } from 'playwright'
 
 export function getMockConsensusTipResponse(): ConsensusTipResponse {

diff --git a/libs/walletd-mock/src/mocks/defaults.ts b/libs/walletd-mock/src/mocks/defaults.ts
@@ -8,7 +8,7 @@ import { mockApiWallets } from './wallets'
 import { mockApiTxPoolBroadcast } from './txPoolBroadcast'
 import { mockApiWallet } from './wallet'
 import { mockApiRescan } from './rescan'
-import { RescanResponse } from '@siafoundation/walletd-react'
+import { RescanResponse } from '@siafoundation/walletd-types'
 
 type Responses = {
   rescan?: RescanResponse

diff --git a/libs/walletd-mock/src/mocks/peers.ts b/libs/walletd-mock/src/mocks/peers.ts
@@ -1,4 +1,4 @@
-import { SyncerPeersResponse } from '@siafoundation/walletd-react'
+import { SyncerPeersResponse } from '@siafoundation/walletd-types'
 import { Page } from 'playwright'
 
 export function getMockPeersResponse(): SyncerPeersResponse {

diff --git a/libs/walletd-mock/src/mocks/rescan.ts b/libs/walletd-mock/src/mocks/rescan.ts
@@ -1,4 +1,4 @@
-import { RescanResponse } from '@siafoundation/walletd-react'
+import { RescanResponse } from '@siafoundation/walletd-types'
 import { Page } from 'playwright'
 
 export function getMockRescanResponse(): RescanResponse {

diff --git a/libs/walletd-mock/src/mocks/wallet.ts b/libs/walletd-mock/src/mocks/wallet.ts
@@ -3,9 +3,9 @@ import {
   Wallet,
   WalletAddressesResponse,
   WalletBalanceResponse,
-  WalletFundResponse,
+  WalletFundSiacoinResponse,
   WalletOutputsSiacoinResponse,
-} from '@siafoundation/walletd-react'
+} from '@siafoundation/walletd-types'
 import { mockApiWalletBalance } from './walletBalance'
 import { mockApiWalletAddresses } from './walletAddresses'
 import { mockApiWalletEvents } from './walletEvents'
@@ -27,7 +27,7 @@ export async function mockApiWallet({
   responses?: {
     balance?: WalletBalanceResponse
     outputsSiacoin?: WalletOutputsSiacoinResponse
-    fund?: WalletFundResponse
+    fundSiacoin?: WalletFundSiacoinResponse
     addresses?: WalletAddressesResponse
   }
   expects?: {
@@ -59,7 +59,7 @@ export async function mockApiWallet({
   await mockApiWalletFundSiacoin({
     page,
     walletId: wallet.id,
-    response: responses.fund,
+    response: responses.fundSiacoin,
     expectPost: expects.fundSiacoinPost,
   })
   await mockApiWalletRelease({

diff --git a/libs/walletd-mock/src/mocks/walletAddresses.ts b/libs/walletd-mock/src/mocks/walletAddresses.ts
@@ -1,7 +1,7 @@
 import {
   WalletAddress,
   WalletAddressesResponse,
-} from '@siafoundation/walletd-react'
+} from '@siafoundation/walletd-types'
 import { Page } from 'playwright'
 
 export function getMockWalletAddressesResponse(): WalletAddressesResponse {

diff --git a/libs/walletd-mock/src/mocks/walletBalance.ts b/libs/walletd-mock/src/mocks/walletBalance.ts
@@ -1,4 +1,4 @@
-import { WalletBalanceResponse } from '@siafoundation/walletd-react'
+import { WalletBalanceResponse } from '@siafoundation/walletd-types'
 import { toHastings } from '@siafoundation/units'
 import { Page } from 'playwright'
 

diff --git a/libs/walletd-mock/src/mocks/walletEvents.ts b/libs/walletd-mock/src/mocks/walletEvents.ts
@@ -1,4 +1,4 @@
-import { WalletEventsResponse } from '@siafoundation/walletd-react'
+import { WalletEventsResponse } from '@siafoundation/walletd-types'
 import { Page } from 'playwright'
 
 export function getMockWalletEventsResponse(): WalletEventsResponse {

diff --git a/libs/walletd-mock/src/mocks/walletFundSiacoin.ts b/libs/walletd-mock/src/mocks/walletFundSiacoin.ts
@@ -1,7 +1,7 @@
-import { WalletFundResponse } from '@siafoundation/walletd-react'
+import { WalletFundSiacoinResponse } from '@siafoundation/walletd-types'
 import { Page } from 'playwright'
 
-export function getMockWalletFundSiacoinResponse(): WalletFundResponse {
+export function getMockWalletFundSiacoinResponse(): WalletFundSiacoinResponse {
   return {
     transaction: {
       siacoinInputs: [
@@ -54,7 +54,7 @@ export async function mockApiWalletFundSiacoin({
 }: {
   page: Page
   walletId: string
-  response?: WalletFundResponse
+  response?: WalletFundSiacoinResponse
   expectPost?: (data: string | null) => void
 }) {
   const json = response || getMockWalletFundSiacoinResponse()

diff --git a/libs/walletd-mock/src/mocks/walletFundSiafund.ts b/libs/walletd-mock/src/mocks/walletFundSiafund.ts
@@ -1,7 +1,7 @@
-import { WalletFundResponse } from '@siafoundation/walletd-react'
+import { WalletFundSiafundResponse } from '@siafoundation/walletd-types'
 import { Page } from 'playwright'
 
-export function getMockWalletFundSiafundResponse(): WalletFundResponse {
+export function getMockWalletFundSiafundResponse(): WalletFundSiafundResponse {
   return {
     transaction: {
       minerFees: ['3930000000000000000000'],
@@ -19,7 +19,7 @@ export async function mockApiWalletFundSiafund({
 }: {
   page: Page
   walletId: string
-  response?: WalletFundResponse
+  response?: WalletFundSiafundResponse
   expectPost?: (data: string | null) => void
 }) {
   const json = response || getMockWalletFundSiafundResponse()

diff --git a/libs/walletd-mock/src/mocks/walletOutputsSiacoin.ts b/libs/walletd-mock/src/mocks/walletOutputsSiacoin.ts
@@ -1,4 +1,4 @@
-import { WalletOutputsSiacoinResponse } from '@siafoundation/walletd-react'
+import { WalletOutputsSiacoinResponse } from '@siafoundation/walletd-types'
 import { SiacoinElement } from '@siafoundation/types'
 import { Page } from 'playwright'
 

diff --git a/libs/walletd-mock/src/mocks/walletOutputsSiafund.ts b/libs/walletd-mock/src/mocks/walletOutputsSiafund.ts
@@ -1,4 +1,4 @@
-import { WalletOutputsSiafundResponse } from '@siafoundation/walletd-react'
+import { WalletOutputsSiafundResponse } from '@siafoundation/walletd-types'
 import { Page } from 'playwright'
 
 export function getMockWalletOutputsSiafundResponse(): WalletOutputsSiafundResponse {

diff --git a/libs/walletd-mock/src/mocks/walletRelease.ts b/libs/walletd-mock/src/mocks/walletRelease.ts
@@ -1,4 +1,4 @@
-import { WalletFundResponse } from '@siafoundation/walletd-react'
+import { WalletReleaseResponse } from '@siafoundation/walletd-types'
 import { Page } from 'playwright'
 
 export async function mockApiWalletRelease({
@@ -7,7 +7,7 @@ export async function mockApiWalletRelease({
 }: {
   page: Page
   walletId: string
-  response?: WalletFundResponse
+  response?: WalletReleaseResponse
 }) {
   await page.route(`**/api/wallets/${walletId}/release*`, async (route) => {
     await route.fulfill()

diff --git a/libs/walletd-mock/src/mocks/walletTxPool.ts b/libs/walletd-mock/src/mocks/walletTxPool.ts
@@ -1,4 +1,4 @@
-import { WalletTxPoolResponse } from '@siafoundation/walletd-react'
+import { WalletTxPoolResponse } from '@siafoundation/walletd-types'
 import { Page } from 'playwright'
 
 export function getMockWalletTxPoolResponse(): WalletTxPoolResponse {

diff --git a/libs/walletd-mock/src/mocks/wallets.ts b/libs/walletd-mock/src/mocks/wallets.ts
@@ -1,4 +1,4 @@
-import { Wallet, WalletsResponse } from '@siafoundation/walletd-react'
+import { Wallet, WalletsResponse } from '@siafoundation/walletd-types'
 import { Page } from 'playwright'
 
 export function getMockWalletsResponse(): WalletsResponse {

diff --git a/libs/walletd-mock/src/scenarios/seedWallet.ts b/libs/walletd-mock/src/scenarios/seedWallet.ts
@@ -3,8 +3,8 @@ import {
   Wallet,
   WalletAddress,
   WalletBalanceResponse,
-  WalletFundResponse,
-} from '@siafoundation/walletd-react'
+  WalletFundSiacoinResponse,
+} from '@siafoundation/walletd-types'
 import { toHastings } from '@siafoundation/units'
 import { getMockConsensusNetworkResponse } from '../mocks/consensusNetwork'
 import { getMockConsensusTipStateResponse } from '../mocks/consensusTipState'
@@ -83,7 +83,7 @@ export function getMockScenarioSeedWallet() {
 
   const walletOutputsSiafundResponse: SiafundElement[] = []
 
-  const walletFundResponse: WalletFundResponse = {
+  const walletFundResponse: WalletFundSiacoinResponse = {
     transaction: {
       siacoinInputs: [
         {

diff --git a/libs/walletd-react/package.json b/libs/walletd-react/package.json
@@ -3,10 +3,10 @@
   "description": "React hooks for interacting with `walletd`.",
   "version": "4.0.0",
   "license": "MIT",
-  "peerDependencies": {
+  "dependencies": {
     "@siafoundation/react-core": "^1.1.0",
-    "@siafoundation/types": "^0.2.0",
-    "swr": "^2.1.1"
+    "swr": "^2.1.1",
+    "@siafoundation/walletd-types": "0.0.0"
   },
   "types": "./src/index.d.ts"
 }