refactor: types library

README.md

@@ -40,7 +40,7 @@ The `explorer` user interface, a Sia blockchain explorer interface that powers [
 
 The Sia web libraries provide developers with convenient TypeScript SDKs for using Sia core types, blockchain utilities, data fetching, daemon-specific React hooks, and components for common functionality such as Siacoin/fiat input fields, transaction lists, files, and more.
 
-- [@siafoundation/react-core](libs/react-core) - Core Sia types and library methods.
+- [@siafoundation/react-core](libs/react-core) - Core library for building React hooks for interacting with a Sia daemon.
 - [@siafoundation/react-renterd](libs/react-renterd) - React hooks for interacting with `renterd`.
 - [@siafoundation/react-hostd](libs/react-hostd) - React hooks for interacting with `hostd`.
 - [@siafoundation/react-walletd](libs/react-walletd) - React hooks for interacting with `walletd`.
@@ -50,6 +50,7 @@ The Sia web libraries provide developers with convenient TypeScript SDKs for usi
 - [@siafoundation/data-sources](libs/data-sources) - Data sources used for stats on the website.
 - [@siafoundation/fonts](libs/fonts) - Next font configuration for use across apps.
 - [@siafoundation/units](libs/units) - Methods and types for converting and displaying units.
+- [@siafoundation/types](libs/types) - Core Sia types and library methods.
 
 ## Internal
 

apps/hostd/contexts/contracts/types.ts

@@ -4,7 +4,7 @@ import {
   Signature,
   UnlockConditions,
   SiacoinOutput,
-} from '@siafoundation/react-core'
+} from '@siafoundation/types'
 import {
   ContractFilterSortField,
   ContractStatus,

apps/hostd/contexts/transactions/index.tsx

@@ -15,7 +15,7 @@ import { useDialog } from '../dialog'
 import BigNumber from 'bignumber.js'
 import { useRouter } from 'next/router'
 import { useSiascanUrl } from '../../hooks/useSiascanUrl'
-import { Transaction } from '@siafoundation/react-core'
+import { Transaction } from '@siafoundation/types'
 
 const defaultLimit = 50
 const filters = []

apps/renterd/contexts/transactions/index.tsx

@@ -16,7 +16,7 @@ import { useDialog } from '../dialog'
 import BigNumber from 'bignumber.js'
 import { useRouter } from 'next/router'
 import { useSiascanUrl } from '../../hooks/useSiascanUrl'
-import { Transaction } from '@siafoundation/react-core'
+import { Transaction } from '@siafoundation/types'
 
 const defaultLimit = 50
 const filters = []

apps/walletd/dialogs/WalletSendLedgerDialog/useFundAndSign.tsx

@@ -1,4 +1,4 @@
-import { Transaction } from '@siafoundation/react-core'
+import { Transaction } from '@siafoundation/types'
 import { useCallback } from 'react'
 import { SendParams } from '../_sharedWalletSend/types'
 

apps/walletd/dialogs/WalletSendLedgerDialog/useSendForm.tsx

@@ -10,7 +10,7 @@ import {
 } from '@siafoundation/design-system'
 import { DeviceConnectForm } from '../DeviceConnectForm'
 import { useLedger } from '../../contexts/ledger'
-import { Transaction } from '@siafoundation/react-core'
+import { Transaction } from '@siafoundation/types'
 import { LedgerSignTxn } from './LedgerSignTxn'
 import { useSign } from './useSign'
 import { useBroadcast } from '../_sharedWalletSend/useBroadcast'

apps/walletd/dialogs/WalletSendLedgerDialog/useSign.tsx

@@ -1,4 +1,4 @@
-import { Transaction } from '@siafoundation/react-core'
+import { Transaction } from '@siafoundation/types'
 import { useWalletOutputs } from '@siafoundation/react-walletd'
 import { useWallets } from '../../contexts/wallets'
 import { useCallback } from 'react'

apps/walletd/dialogs/_sharedWalletSend/useBroadcast.tsx

@@ -1,4 +1,4 @@
-import { Transaction } from '@siafoundation/react-core'
+import { Transaction } from '@siafoundation/types'
 import { useTxPoolBroadcast } from '@siafoundation/react-walletd'
 import { useCallback } from 'react'
 

apps/walletd/dialogs/_sharedWalletSend/useCancel.tsx

@@ -1,4 +1,4 @@
-import { Transaction } from '@siafoundation/react-core'
+import { Transaction } from '@siafoundation/types'
 import { useWalletRelease } from '@siafoundation/react-walletd'
 import { useWallets } from '../../contexts/wallets'
 import { useCallback } from 'react'

apps/walletd/lib/sign.ts

@@ -4,7 +4,7 @@ import {
   SiafundElement,
   SiafundInput,
   Transaction,
-} from '@siafoundation/react-core'
+} from '@siafoundation/types'
 import { stripPrefix } from '@siafoundation/design-system'
 import { AddressData } from '../contexts/addresses/types'
 

apps/walletd/lib/signLedger.ts

@@ -2,7 +2,7 @@ import {
   SiacoinElement,
   SiafundElement,
   Transaction,
-} from '@siafoundation/react-core'
+} from '@siafoundation/types'
 import { getWalletWasm } from './wasm'
 import { AddressData } from '../contexts/addresses/types'
 import { LedgerDevice } from '../contexts/ledger/types'

apps/walletd/lib/signSeed.ts

@@ -3,7 +3,7 @@ import {
   SiacoinElement,
   Transaction,
   SiafundElement,
-} from '@siafoundation/react-core'
+} from '@siafoundation/types'
 import { getWalletWasm } from './wasm'
 import { AddressData } from '../contexts/addresses/types'
 import { addUnlockConditionsAndSignatures, getToSignMetadata } from './sign'

apps/walletd/lib/testMocks.ts

@@ -1,6 +1,6 @@
 import Sia from '@siacentral/ledgerjs-sia'
 import { LedgerDevice } from '../contexts/ledger/types'
-import { Transaction } from '@siafoundation/react-core'
+import { Transaction } from '@siafoundation/types'
 
 export function getMockDevice() {
   return {

apps/walletd/lib/wasm.ts

@@ -1,4 +1,4 @@
-import { Transaction, UnlockConditions } from '@siafoundation/react-core'
+import { Transaction, UnlockConditions } from '@siafoundation/types'
 import { initWasmGo } from './wasm_exec_mod'
 
 interface WalletWASM {

libs/design-system/package.json

@@ -7,6 +7,7 @@
     "@siafoundation/react-icons": "^0.1.0",
     "@siafoundation/react-core": "^0.15.0",
     "@siafoundation/units": "^0.1.3",
+    "@siafoundation/types": "^0.0.1",
     "@visx/group": "2.17.0",
     "@visx/react-spring": "2.18.0",
     "@visx/glyph": "2.17.0",

libs/design-system/src/app/TransactionDetailsDialog.tsx

@@ -5,7 +5,7 @@ import { humanDate } from '@siafoundation/units'
 import BigNumber from 'bignumber.js'
 import { Dialog } from '../core/Dialog'
 import { getTitleId } from '../lib/utils'
-import { Transaction } from '@siafoundation/react-core'
+import { Transaction } from '@siafoundation/types'
 import { getTxTypeLabel, TxType } from '../lib/entityTypes'
 import { upperFirst } from 'lodash'
 

libs/design-system/src/app/TxPoolList.tsx

@@ -1,6 +1,6 @@
 import { EntityList } from '../components/EntityList'
 import { getTransactionTotals, getTransactionType } from '../lib/entityTypes'
-import { Transaction } from '@siafoundation/react-core'
+import { Transaction } from '@siafoundation/types'
 
 type Props = {
   isLoading?: boolean

libs/design-system/src/lib/entityTypes.ts

@@ -1,4 +1,4 @@
-import { Transaction } from '@siafoundation/react-core'
+import { Transaction } from '@siafoundation/types'
 import BigNumber from 'bignumber.js'
 
 export type EntityType =

libs/react-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@siafoundation/react-core",
-  "description": "Core Sia types and library methods.",
+  "description": "Core library for building React hooks for interacting with a Sia daemon.",
   "version": "0.15.0",
   "license": "MIT",
   "dependencies": {

libs/react-core/src/index.ts

@@ -1,5 +1,4 @@
 export * from './types'
-export * from './siaTypes'
 export * from './utils'
 export * from './usePost'
 export * from './usePut'

libs/react-hostd/package.json

@@ -5,6 +5,7 @@
   "license": "MIT",
   "dependencies": {
     "@siafoundation/react-core": "^0.15.0",
+    "@siafoundation/types": "^0.0.1",
     "swr": "^2.1.1"
   },
   "types": "./src/index.d.ts"

libs/react-hostd/src/api.ts

@@ -6,17 +6,19 @@ import {
   HookArgsSwr,
   HookArgsCallback,
   HookArgsWithPayloadSwr,
-  FileContractID,
-  PublicKey,
   getTestnetZenBlockHeight,
   getMainnetBlockHeight,
-  Currency,
   usePutSwr,
   useDeleteFunc,
   delay,
-  TransactionID,
   usePatchFunc,
 } from '@siafoundation/react-core'
+import {
+  FileContractID,
+  PublicKey,
+  Currency,
+  TransactionID,
+} from '@siafoundation/types'
 import useSWR from 'swr'
 import { Contract, ContractStatus, WalletTransaction } from './siaTypes'
 

libs/react-hostd/src/siaTypes.ts

@@ -6,7 +6,7 @@ import {
   Signature,
   Currency,
   FileContractID,
-} from '@siafoundation/react-core'
+} from '@siafoundation/types'
 
 export interface WalletTransaction {
   id: string

libs/react-renterd/package.json

@@ -5,6 +5,7 @@
   "license": "MIT",
   "dependencies": {
     "@siafoundation/react-core": "^0.15.0",
+    "@siafoundation/types": "^0.0.1",
     "swr": "^2.1.1",
     "lodash": "^4.17.21"
   },

libs/react-renterd/src/bus.ts

@@ -8,18 +8,20 @@ import {
   HookArgsSwr,
   HookArgsCallback,
   HookArgsWithPayloadSwr,
-  Currency,
-  PublicKey,
-  Transaction,
   getMainnetBlockHeight,
   getTestnetZenBlockHeight,
   delay,
+} from '@siafoundation/react-core'
+import {
+  Currency,
+  PublicKey,
+  Transaction,
   FileContractRevision,
   OutputID,
   CoveredFields,
   FileContractID,
   Block,
-} from '@siafoundation/react-core'
+} from '@siafoundation/types'
 import {
   ConsensusState,
   Contract,

libs/react-renterd/src/siaTypes.ts

@@ -6,7 +6,7 @@ import {
   EncryptionKey,
   PublicKey,
   TransactionSignature,
-} from '@siafoundation/react-core'
+} from '@siafoundation/types'
 
 export type ConsensusState = {
   blockHeight: number

libs/react-walletd/package.json

@@ -5,6 +5,7 @@
   "license": "MIT",
   "dependencies": {
     "@siafoundation/react-core": "^0.15.0",
+    "@siafoundation/types": "^0.0.1",
     "swr": "^2.1.1"
   },
   "types": "./src/index.d.ts"

libs/react-walletd/src/api.ts

@@ -9,6 +9,8 @@ import {
   getMainnetBlockHeight,
   getTestnetZenBlockHeight,
   useDeleteFunc,
+} from '@siafoundation/react-core'
+import {
   Currency,
   BlockHeight,
   ChainIndex,
@@ -17,7 +19,7 @@ import {
   SiacoinElement,
   SiafundElement,
   Transaction,
-} from '@siafoundation/react-core'
+} from '@siafoundation/types'
 import {
   ConsensusState,
   ConsensusNetwork,

libs/react-walletd/src/siaTypes.ts

@@ -7,7 +7,7 @@ import {
   SiafundElementAndClaim,
   SiafundElement,
   FileContractElement,
-} from '@siafoundation/react-core'
+} from '@siafoundation/types'
 
 export type ConsensusNetwork = {
   name: 'mainnet' | 'zen'

libs/types/.babelrc

@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "@nx/react/babel",
+      {
+        "runtime": "automatic",
+        "useBuiltIns": "usage"
+      }
+    ]
+  ],
+  "plugins": []
+}

libs/types/.eslintrc.json

@@ -0,0 +1,13 @@
+{
+  "extends": ["plugin:@nx/react", "../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.json"],
+      "parser": "jsonc-eslint-parser",
+      "rules": {
+        "@nx/dependency-checks": "error"
+      }
+    }
+  ]
+}

libs/types/CHANGELOG.md

@@ -0,0 +1 @@
+# @siafoundation/types

libs/types/README.md

@@ -0,0 +1,7 @@
+# types
+
+Core Sia types and library methods.
+
+## Running unit tests
+
+Run `nx test types` to execute the unit tests via [Jest](https://jestjs.io).

libs/types/jest.config.ts

@@ -0,0 +1,10 @@
+/* eslint-disable */
+export default {
+  displayName: 'types',
+  preset: '../../jest.preset.js',
+  transform: {
+    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+  coverageDirectory: '../../coverage/libs/types',
+}

libs/types/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "@siafoundation/types",
+  "description": "Core Sia types and library methods.",
+  "version": "0.0.1",
+  "license": "MIT",
+  "dependencies": {},
+  "types": "./src/index.d.ts"
+}

libs/types/project.json

@@ -0,0 +1,48 @@
+{
+  "name": "types",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/types/src",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@nrwl/rollup:rollup",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/types",
+        "tsConfig": "libs/types/tsconfig.lib.json",
+        "project": "libs/types/package.json",
+        "entryFile": "libs/types/src/index.ts",
+        "external": ["react/jsx-runtime"],
+        "rollupConfig": "@nx/react/plugins/bundle-rollup",
+        "compiler": "swc",
+        "assets": [
+          {
+            "glob": "libs/types/*.md",
+            "input": ".",
+            "output": "."
+          }
+        ]
+      },
+      "configurations": {}
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": [
+          "libs/types/**/*.{ts,tsx,js,jsx}",
+          "libs/types/package.json"
+        ]
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/libs/types"],
+      "options": {
+        "jestConfig": "libs/types/jest.config.ts",
+        "passWithNoTests": true
+      }
+    }
+  }
+}

libs/react-core/src/siaTypes.ts → libs/types/src/index.ts

@@ -13,11 +13,6 @@ export type SiacoinOutputID = Hash256
 export type SiafundOutputID = Hash256
 export type Address = string
 
-// export type SiaPublicKey = {
-//   algorithm: string
-//   key?: string
-// }
-
 export type UnlockConditions = {
   timelock: number
   publicKeys?: PublicKey[]