diff --git a/libs/design-system/src/app/WalletLayoutActions.tsx b/libs/design-system/src/app/WalletLayoutActions.tsx
index d28902a01..83adeffd5 100644
--- a/libs/design-system/src/app/WalletLayoutActions.tsx
+++ b/libs/design-system/src/app/WalletLayoutActions.tsx
@@ -12,6 +12,7 @@ type Props = {
unconfirmed: BigNumber
confirmed: BigNumber
spendable: BigNumber
+ immature?: BigNumber
}
receiveSiacoin?: () => void
sendSiacoin: () => void
diff --git a/libs/design-system/src/components/BlockList.tsx b/libs/design-system/src/components/BlockList.tsx
index 2a8c8326c..8a78b0829 100644
--- a/libs/design-system/src/components/BlockList.tsx
+++ b/libs/design-system/src/components/BlockList.tsx
@@ -2,8 +2,7 @@ import { Panel } from '../core/Panel'
import { Heading } from '../core/Heading'
import { Link } from '../core/Link'
import { Text } from '../core/Text'
-import { getEntityTypeLabel } from '../lib/entityTypes'
-import { humanNumber } from '@siafoundation/units'
+import { humanNumber, getEntityTypeLabel } from '@siafoundation/units'
import { formatDistance } from 'date-fns'
import { EntityAvatar } from './EntityAvatar'
import { cx } from 'class-variance-authority'
diff --git a/libs/design-system/src/components/DatumCard.tsx b/libs/design-system/src/components/DatumCard.tsx
index 79bfb1d7e..e4f7e1f3b 100644
--- a/libs/design-system/src/components/DatumCard.tsx
+++ b/libs/design-system/src/components/DatumCard.tsx
@@ -5,7 +5,7 @@ import { Tooltip } from '../core/Tooltip'
import BigNumber from 'bignumber.js'
import { upperFirst } from '@technically/lodash'
import { Panel } from '../core/Panel'
-import { EntityType, getEntityTypeLabel } from '../lib/entityTypes'
+import { EntityType, getEntityTypeLabel } from '@siafoundation/units'
import { cx } from 'class-variance-authority'
import { Skeleton } from '../core/Skeleton'
import { ValueScFiat } from './ValueScFiat'
diff --git a/libs/design-system/src/components/EntityAvatar.tsx b/libs/design-system/src/components/EntityAvatar.tsx
index 702959d3b..c5b7489fe 100644
--- a/libs/design-system/src/components/EntityAvatar.tsx
+++ b/libs/design-system/src/components/EntityAvatar.tsx
@@ -3,7 +3,7 @@
import { Avatar } from '../core/Avatar'
import { Link } from '../core/Link'
import { Tooltip } from '../core/Tooltip'
-import { EntityType, getEntityTypeLabel } from '../lib/entityTypes'
+import { EntityType, getEntityTypeLabel } from '@siafoundation/units'
type Props = {
initials?: string
diff --git a/libs/design-system/src/components/EntityListItem.tsx b/libs/design-system/src/components/EntityListItem.tsx
index 8df484f8f..3c701a05e 100644
--- a/libs/design-system/src/components/EntityListItem.tsx
+++ b/libs/design-system/src/components/EntityListItem.tsx
@@ -9,7 +9,7 @@ import {
getEntityTypeLabel,
getTxTypeLabel,
TxType,
-} from '../lib/entityTypes'
+} from '@siafoundation/units'
import { humanNumber } from '@siafoundation/units'
import { formatDistance } from 'date-fns'
import { upperFirst } from '@technically/lodash'
diff --git a/libs/design-system/src/components/EntityListItemLayout.tsx b/libs/design-system/src/components/EntityListItemLayout.tsx
index 4aaa9ba4f..de5b5d468 100644
--- a/libs/design-system/src/components/EntityListItemLayout.tsx
+++ b/libs/design-system/src/components/EntityListItemLayout.tsx
@@ -1,4 +1,4 @@
-import { EntityType } from '../lib/entityTypes'
+import { EntityType } from '@siafoundation/units'
import { EntityAvatar } from './EntityAvatar'
import { cx } from 'class-variance-authority'
diff --git a/libs/design-system/src/components/ValueCopyable.tsx b/libs/design-system/src/components/ValueCopyable.tsx
index 5f8705f7a..db5da2715 100644
--- a/libs/design-system/src/components/ValueCopyable.tsx
+++ b/libs/design-system/src/components/ValueCopyable.tsx
@@ -14,7 +14,7 @@ import {
getEntityTypeCopyLabel,
formatEntityValue,
defaultFormatValue,
-} from '../lib/entityTypes'
+} from '@siafoundation/units'
import { cx } from 'class-variance-authority'
import {
DropdownMenu,
diff --git a/libs/design-system/src/components/ValueMenu.tsx b/libs/design-system/src/components/ValueMenu.tsx
index d61f000e2..fdada8fc0 100644
--- a/libs/design-system/src/components/ValueMenu.tsx
+++ b/libs/design-system/src/components/ValueMenu.tsx
@@ -1,7 +1,7 @@
import { Text } from '../core/Text'
import { Link } from '../core/Link'
import { stripPrefix } from '../lib/utils'
-import { EntityType, getEntityDisplayLength } from '../lib/entityTypes'
+import { EntityType, getEntityDisplayLength } from '@siafoundation/units'
import { cx } from 'class-variance-authority'
type Props = {
diff --git a/libs/design-system/src/index.ts b/libs/design-system/src/index.ts
index 78828cb39..22d7a665c 100644
--- a/libs/design-system/src/index.ts
+++ b/libs/design-system/src/index.ts
@@ -96,7 +96,6 @@ export * from './app/WalletAddressCode'
export * from './app/WalletLayoutActions'
export * from './app/WalletBalanceEvolution'
export * from './app/WalletBalance'
-export * from './app/TxPoolList'
export * from './app/PeerList'
export * from './app/DataLabel'
export * from './app/DataPanel'
@@ -175,7 +174,6 @@ export * from './lib/toast'
export * from './lib/clipboard'
export * from './lib/image'
export * from './lib/links'
-export * from './lib/entityTypes'
export * from './lib/utils'
export * from './lib/time'
export * from './lib/numbers'
diff --git a/libs/design-system/src/lib/entityTypes.ts b/libs/design-system/src/lib/entityTypes.ts
deleted file mode 100644
index d86613825..000000000
--- a/libs/design-system/src/lib/entityTypes.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-import { Transaction } from '@siafoundation/types'
-import BigNumber from 'bignumber.js'
-
-export type EntityType =
- | 'contract'
- | 'transaction'
- | 'block'
- | 'output'
- | 'address'
- | 'ip'
- | 'hostIp'
- | 'hostPublicKey'
- | 'contract'
- | 'blockHash'
-
-export type TxType =
- | 'siacoin'
- | 'siafund'
- | 'storageProof'
- | 'contractFormation'
- | 'contractRevision'
- | 'contractRenewal'
- | 'contractPayout'
- | 'minerPayout'
- | 'siafundClaim'
- | 'foundationSubsidy'
- | 'hostAnnouncement'
-// | 'block'
-// | 'defrag'
-// | 'setup'
-
-export function getTransactionTotals(txn: Transaction) {
- const sc = (txn.siacoinOutputs || []).reduce(
- (acc, i) => acc.plus(i.value),
- new BigNumber(0)
- )
- const sf = (txn.siafundOutputs || []).reduce(
- (acc, i) => acc.plus(i.value),
- new BigNumber(0)
- )
-
- return {
- sc,
- sf: sf.toNumber(),
- }
-}
-
-export function getTransactionType(
- txn: Transaction,
- source?: string
-): TxType | undefined {
- if (source === 'miner') {
- return 'minerPayout'
- }
- if (source === 'siafundClaim') {
- return 'siafundClaim'
- }
- if (source === 'contract') {
- return 'contractPayout'
- }
- if (source === 'foundation') {
- return 'foundationSubsidy'
- }
- if (txn.storageProofs && txn.storageProofs.length > 0) {
- return 'storageProof'
- }
- if (
- txn.fileContracts &&
- txn.fileContracts.length > 0 &&
- txn.fileContractRevisions &&
- txn.fileContractRevisions.length > 0
- ) {
- return 'contractRenewal'
- }
- if (txn.fileContractRevisions && txn.fileContractRevisions.length > 0) {
- return 'contractRevision'
- }
- if (txn.fileContracts && txn.fileContracts.length > 0) {
- return 'contractFormation'
- }
- if (
- txn.arbitraryData &&
- txn.arbitraryData.length > 0 &&
- atob(txn.arbitraryData[0]).indexOf('HostAnnouncement') === 0
- ) {
- return 'hostAnnouncement'
- }
- if (txn.siafundOutputs && txn.siafundOutputs.length > 0) {
- return 'siafund'
- }
- if (txn.siacoinOutputs && txn.siacoinOutputs.length > 0) {
- return 'siacoin'
- }
-
- return undefined
-
- // if (
- // txn.siacoinOutputs &&
- // txn.siacoinInputs?.length === 0 &&
- // txn.siafundInputs?.length === 0
- // ) {
- // return 'block'
- // }
- // if (
- // (txn.siacoinInputs?.length || 0) >= 20 &&
- // txn.siacoinOutputs?.length === 1
- // ) {
- // return 'defrag'
- // }
-
- // return undefined
-}
-
-const entityLabels: Record = {
- transaction: 'transaction',
- contract: 'contract',
- block: 'block',
- output: 'output',
- address: 'address',
- hostIp: 'host',
- hostPublicKey: 'host',
- ip: 'IP',
- blockHash: 'block hash',
-}
-
-const entityCopyLabels: Record = {
- transaction: 'transaction ID',
- contract: 'contract ID',
- block: 'block',
- output: 'output ID',
- address: 'address',
- hostIp: 'host address',
- hostPublicKey: 'host public key',
- ip: 'IP',
- blockHash: 'block hash',
-}
-
-const txTypeMap: Record = {
- siacoin: 'siacoin transfer',
- siafund: 'siafund transfer',
- contractFormation: 'contract formation',
- contractRenewal: 'contract renewal',
- contractRevision: 'contract revision',
- contractPayout: 'contract payout',
- storageProof: 'storage proof',
- minerPayout: 'miner payout',
- siafundClaim: 'siafund claim',
- foundationSubsidy: 'foundation subsidy',
- hostAnnouncement: 'host announcement',
- // block: 'block',
- // defrag: 'defrag',
- // setup: 'setup',
-}
-
-export function getEntityTypeLabel(type?: EntityType): string | undefined {
- return type ? entityLabels[type] : undefined
-}
-
-export function getEntityTypeCopyLabel(type?: EntityType): string | undefined {
- return type ? entityCopyLabels[type] : undefined
-}
-
-export function getTxTypeLabel(type?: TxType): string | undefined {
- return type ? txTypeMap[type] : undefined
-}
-
-export function getEntityDisplayLength(type?: EntityType): number {
- const longList: EntityType[] = ['ip', 'hostIp']
- return type && longList.includes(type) ? 20 : 12
-}
-
-export function doesEntityHaveSiascanUrl(type?: EntityType) {
- const includeList: EntityType[] = [
- 'hostIp',
- 'hostPublicKey',
- 'contract',
- 'address',
- 'transaction',
- 'block',
- ]
- return type && includeList.includes(type)
-}
-
-export function getEntitySiascanUrl(
- baseUrl: string,
- type: EntityType,
- value: string
-) {
- switch (type) {
- case 'hostIp':
- return `${baseUrl}/host/${value}`
- case 'hostPublicKey':
- return `${baseUrl}/host/${value}`
- case 'contract':
- return `${baseUrl}/contract/${value}`
- case 'transaction':
- return `${baseUrl}/tx/${value}`
- case 'address':
- return `${baseUrl}/address/${value}`
- case 'block':
- return `${baseUrl}/block/${value}`
- default:
- return ''
- }
-}
-
-export function defaultFormatValue(text: string, maxLength: number) {
- return `${text?.slice(0, maxLength)}${
- (text?.length || 0) > maxLength ? '...' : ''
- }`
-}
-
-export function formatEntityValue(
- type: EntityType,
- text: string,
- maxLength: number
-) {
- switch (type) {
- case 'blockHash': {
- const halfMax = maxLength / 2
- // Floor and ceil here to handle odd maxLengths.
- // .slice() will round down on floats.
- const firstHalf = text.slice(0, Math.floor(halfMax))
- const lastHalf = text.slice(text.length - Math.ceil(halfMax))
- return firstHalf + '...' + lastHalf
- }
- default: {
- // We could also return null here, forcing the issue of defining
- // formats for the missing cases in the switch above.
- return defaultFormatValue(text, maxLength)
- }
- }
-}
diff --git a/libs/hostd-js/src/api.ts b/libs/hostd-js/src/api.ts
index 47cae24ee..e8b97b364 100644
--- a/libs/hostd-js/src/api.ts
+++ b/libs/hostd-js/src/api.ts
@@ -5,12 +5,21 @@ import {
AlertsParams,
AlertsPayload,
AlertsResponse,
+ ConsensusTipParams,
+ ConsensusTipPayload,
+ ConsensusTipResponse,
+ ConsensusTipStateParams,
+ ConsensusTipStatePayload,
+ ConsensusTipStateResponse,
ContractsIntegrityCheckParams,
ContractsIntegrityCheckPayload,
ContractsIntegrityCheckResponse,
ContractsParams,
ContractsPayload,
ContractsResponse,
+ IndexTipParams,
+ IndexTipPayload,
+ IndexTipResponse,
LogsSearchParams,
LogsSearchPayload,
LogsSearchResponse,
@@ -32,12 +41,9 @@ import {
SettingsUpdateParams,
SettingsUpdatePayload,
SettingsUpdateResponse,
- StateConsensusParams,
- StateConsensusPayload,
- StateConsensusResponse,
- StateHostParams,
- StateHostPayload,
- StateHostResponse,
+ HostStateParams,
+ HostStatePayload,
+ HostStateResponse,
SyncerConnectParams,
SyncerConnectPayload,
SyncerConnectResponse,
@@ -74,6 +80,9 @@ import {
VolumesParams,
VolumesPayload,
VolumesResponse,
+ WalletEventsParams,
+ WalletEventsPayload,
+ WalletEventsResponse,
WalletParams,
WalletPayload,
WalletPendingParams,
@@ -83,21 +92,20 @@ import {
WalletSendParams,
WalletSendPayload,
WalletSendResponse,
- WalletTransactionsParams,
- WalletTransactionsPayload,
- WalletTransactionsResponse,
alertsDismissRoute,
alertsRoute,
+ consensusTipRoute,
+ consensusTipStateRoute,
contractsIdIntegrityRoute,
contractsRoute,
+ indexTipRoute,
logEntriesRoute,
metricsIntervalRoute,
metricsRoute,
settingsAnnounceRoute,
settingsDdnsUpdateRoute,
settingsRoute,
- stateConsensusRoute,
- stateHostRoute,
+ hostStateRoute,
syncerPeersRoute,
systemDirRoute,
tpoolFeeRoute,
@@ -105,10 +113,10 @@ import {
volumesIdResizeRoute,
volumesIdRoute,
volumesRoute,
+ walletEventsRoute,
walletPendingRoute,
walletRoute,
walletSendRoute,
- walletTransactionsRoute,
} from '@siafoundation/hostd-types'
import { buildRequestHandler, initAxios } from '@siafoundation/request'
@@ -117,15 +125,25 @@ export function Hostd({ api, password }: { api: string; password?: string }) {
return {
axios,
stateHost: buildRequestHandler<
- StateHostParams,
- StateHostPayload,
- StateHostResponse
- >(axios, 'get', stateHostRoute),
- stateConsensus: buildRequestHandler<
- StateConsensusParams,
- StateConsensusPayload,
- StateConsensusResponse
- >(axios, 'get', stateConsensusRoute),
+ HostStateParams,
+ HostStatePayload,
+ HostStateResponse
+ >(axios, 'get', hostStateRoute),
+ consensusTip: buildRequestHandler<
+ ConsensusTipParams,
+ ConsensusTipPayload,
+ ConsensusTipResponse
+ >(axios, 'get', consensusTipRoute),
+ consensusTipState: buildRequestHandler<
+ ConsensusTipStateParams,
+ ConsensusTipStatePayload,
+ ConsensusTipStateResponse
+ >(axios, 'get', consensusTipStateRoute),
+ indexTip: buildRequestHandler<
+ IndexTipParams,
+ IndexTipPayload,
+ IndexTipResponse
+ >(axios, 'get', indexTipRoute),
syncerPeers: buildRequestHandler<
SyncerPeersParams,
SyncerPeersPayload,
@@ -141,16 +159,16 @@ export function Hostd({ api, password }: { api: string; password?: string }) {
'get',
walletRoute
),
- walletTransactions: buildRequestHandler<
- WalletTransactionsParams,
- WalletTransactionsPayload,
- WalletTransactionsResponse
- >(axios, 'get', walletTransactionsRoute),
walletPending: buildRequestHandler<
WalletPendingParams,
WalletPendingPayload,
WalletPendingResponse
>(axios, 'get', walletPendingRoute),
+ walletEvents: buildRequestHandler<
+ WalletEventsParams,
+ WalletEventsPayload,
+ WalletEventsResponse
+ >(axios, 'get', walletEventsRoute),
walletSend: buildRequestHandler<
WalletSendParams,
WalletSendPayload,
diff --git a/libs/hostd-react/src/api.ts b/libs/hostd-react/src/api.ts
index 300d51239..d454e3003 100644
--- a/libs/hostd-react/src/api.ts
+++ b/libs/hostd-react/src/api.ts
@@ -48,10 +48,8 @@ import {
SettingsUpdateParams,
SettingsUpdatePayload,
SettingsUpdateResponse,
- StateConsensusParams,
- StateConsensusResponse,
- StateHostParams,
- StateHostResponse,
+ HostStateParams,
+ HostStateResponse,
SyncerConnectParams,
SyncerConnectPayload,
SyncerConnectResponse,
@@ -90,8 +88,6 @@ import {
WalletSendParams,
WalletSendPayload,
WalletSendResponse,
- WalletTransactionsParams,
- WalletTransactionsResponse,
alertsDismissRoute,
alertsRoute,
contractsIdIntegrityRoute,
@@ -102,8 +98,7 @@ import {
settingsAnnounceRoute,
settingsDdnsUpdateRoute,
settingsRoute,
- stateConsensusRoute,
- stateHostRoute,
+ hostStateRoute,
syncerPeersRoute,
systemDirRoute,
tpoolFeeRoute,
@@ -114,31 +109,72 @@ import {
walletPendingRoute,
walletRoute,
walletSendRoute,
- walletTransactionsRoute,
+ ConsensusNetworkParams,
+ ConsensusNetworkResponse,
+ consensusNetworkRoute,
+ IndexTipParams,
+ IndexTipResponse,
+ indexTipRoute,
+ ConsensusTipParams,
+ ConsensusTipResponse,
+ ConsensusTipStateResponse,
+ ConsensusTipStateParams,
+ consensusTipStateRoute,
+ consensusTipRoute,
+ WalletEventsParams,
+ WalletEventsResponse,
+ walletEventsRoute,
} from '@siafoundation/hostd-types'
// state
-export function useStateHost(
- args?: HookArgsSwr
+export function useHostState(
+ args?: HookArgsSwr
) {
return useGetSwr({
...args,
- route: stateHostRoute,
+ route: hostStateRoute,
})
}
-export function useStateConsensus(
- args?: HookArgsSwr
+export function useConsensusTip(
+ args?: HookArgsSwr
) {
return useGetSwr({
...args,
- route: stateConsensusRoute,
+ route: consensusTipRoute,
+ })
+}
+
+export function useConsensusTipState(
+ args?: HookArgsSwr
+) {
+ return useGetSwr({
+ ...args,
+ route: consensusTipStateRoute,
+ })
+}
+
+export function useConsensusNetwork(
+ args?: HookArgsSwr
+) {
+ return useGetSwr({
+ ...args,
+ route: consensusNetworkRoute,
+ })
+}
+
+export function useIndexTip(
+ args?: HookArgsSwr
+) {
+ return useGetSwr({
+ ...args,
+ route: indexTipRoute,
})
}
export function useEstimatedNetworkBlockHeight(): number {
- const state = useStateHost({
+ const state = useConsensusNetwork({
config: {
swr: {
revalidateOnFocus: false,
@@ -148,7 +184,7 @@ export function useEstimatedNetworkBlockHeight(): number {
const res = useSWR(
state,
() => {
- if (state.data?.network === 'Zen Testnet') {
+ if (state.data?.name === 'zen') {
return getTestnetZenBlockHeight()
}
return getMainnetBlockHeight()
@@ -199,12 +235,12 @@ export function useWallet(args?: HookArgsSwr) {
})
}
-export function useWalletTransactions(
- args?: HookArgsSwr
+export function useWalletEvents(
+ args?: HookArgsSwr
) {
return useGetSwr({
...args,
- route: walletTransactionsRoute,
+ route: walletEventsRoute,
})
}
@@ -309,7 +345,7 @@ export function useSettingsUpdate(
) {
return usePatchFunc({ ...args, route: settingsRoute }, async (mutate) => {
await mutate((key) => {
- return key.startsWith(settingsRoute) || key.startsWith(stateHostRoute)
+ return key.startsWith(settingsRoute) || key.startsWith(hostStateRoute)
})
})
}
diff --git a/libs/hostd-types/src/api.ts b/libs/hostd-types/src/api.ts
index 0fd443fb0..7917d4ec3 100644
--- a/libs/hostd-types/src/api.ts
+++ b/libs/hostd-types/src/api.ts
@@ -4,14 +4,18 @@ import {
Currency,
TransactionID,
ChainIndex,
+ WalletEvent,
} from '@siafoundation/types'
import { Contract, ContractStatus, WalletTransaction } from './types'
-export const stateHostRoute = '/state/host'
-export const stateConsensusRoute = '/state/consensus'
+export const hostStateRoute = '/state'
+export const consensusNetworkRoute = '/consensus/network'
+export const consensusTipRoute = '/consensus/tip'
+export const consensusTipStateRoute = '/consensus/tipstate'
+export const indexTipRoute = '/index/tip'
export const syncerPeersRoute = '/syncer/peers'
export const walletRoute = '/wallet'
-export const walletTransactionsRoute = '/wallet/transactions'
+export const walletEventsRoute = '/wallet/events'
export const walletPendingRoute = '/wallet/pending'
export const walletSendRoute = '/wallet/send'
export const tpoolFeeRoute = '/tpool/fee'
@@ -33,13 +37,11 @@ export const alertsDismissRoute = '/alerts/dismiss'
// state
-export type StateHostParams = void
-export type StateHostPayload = void
-export type StateHostResponse = {
+export type HostStateParams = void
+export type HostStatePayload = void
+export type HostStateResponse = {
name?: string
publicKey: string
- walletAddress: string
- network: 'Mainnet' | 'Zen Testnet'
version: string
commit: string
os: string
@@ -56,16 +58,75 @@ export type StateHostResponse = {
}
}
-export type StateConsensusParams = void
-export type StateConsensusPayload = void
-export type StateConsensusResponse = {
- chainIndex: {
+export type ConsensusNetworkParams = void
+export type ConsensusNetworkPayload = void
+export type ConsensusNetworkResponse = {
+ name: 'mainnet' | 'zen'
+ initialCoinbase: string
+ minimumCoinbase: string
+ initialTarget: string
+ hardforkDevAddr: {
height: number
- id: string
+ oldAddress: string
+ newAddress: string
}
- synced: boolean
+ 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 ConsensusTipParams = void
+export type ConsensusTipPayload = void
+export type ConsensusTipResponse = ChainIndex
+
+export type ConsensusTipStateParams = void
+export type ConsensusTipStatePayload = void
+export type ConsensusTipStateResponse = {
+ 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 type IndexTipParams = void
+export type IndexTipPayload = void
+export type IndexTipResponse = ChainIndex
+
// syncer
type Peer = {
@@ -86,20 +147,24 @@ export type SyncerConnectResponse = never
export type WalletParams = void
export type WalletPayload = void
export type WalletResponse = {
- scanHeight: number
- address: string
spendable: string
confirmed: string
unconfirmed: string
+ immature: string
+ address: string
}
export type WalletTransactionsParams = { limit?: number; offset?: number }
export type WalletTransactionsPayload = void
export type WalletTransactionsResponse = WalletTransaction[]
+export type WalletEventsParams = { limit?: number; offset?: number }
+export type WalletEventsPayload = void
+export type WalletEventsResponse = WalletEvent[]
+
export type WalletPendingParams = void
export type WalletPendingPayload = void
-export type WalletPendingResponse = WalletTransaction[]
+export type WalletPendingResponse = WalletEvent[]
export type WalletSendParams = void
export type WalletSendPayload = {
diff --git a/libs/types/src/events.ts b/libs/types/src/events.ts
new file mode 100644
index 000000000..d2787a474
--- /dev/null
+++ b/libs/types/src/events.ts
@@ -0,0 +1,91 @@
+import {
+ ChainIndex,
+ Transaction,
+ SiacoinElement,
+ SiafundElement,
+ FileContractElement,
+ Hash256,
+ Address,
+} from './core'
+import {
+ V2Transaction,
+ V2FileContractResolutionType,
+ V2FileContractElement,
+} from './v2'
+
+export type UnconfirmedChainIndex = {
+ height: number
+}
+
+export type WalletEventBase = {
+ id: Hash256
+ timestamp: string
+ index: ChainIndex | UnconfirmedChainIndex
+ maturityHeight: number
+ relevant: Address[]
+}
+
+export type WalletEventTransactionV1 = WalletEventBase & {
+ type: 'v1Transaction'
+ data: {
+ transaction: Transaction
+ spentSiacoinElements?: SiacoinElement[]
+ spentSiafundElements?: SiafundElement[]
+ }
+}
+
+export type WalletEventTransactionV2 = WalletEventBase & {
+ type: 'v2Transaction'
+ data: V2Transaction
+}
+
+export type WalletEventContractResolutionV1 = WalletEventBase & {
+ type: 'v1ContractResolution'
+ data: {
+ parent: FileContractElement
+ siacoinElement: SiacoinElement
+ missed: boolean
+ }
+}
+
+export type WalletEventContractResolutionV2 = WalletEventBase & {
+ type: 'v2ContractResolution'
+ data: {
+ parent: V2FileContractElement
+ resolution: V2FileContractResolutionType
+ siacoinElement: SiacoinElement
+ missed: boolean
+ }
+}
+
+export type WalletEventMinerPayout = WalletEventBase & {
+ type: 'miner'
+ data: {
+ siacoinElement: SiacoinElement
+ }
+}
+
+export type WalletEventSiafundClaim = WalletEventBase & {
+ type: 'siafundClaim'
+ data: {
+ siacoinElement: SiacoinElement
+ }
+}
+
+export type WalletEventFoundationSubsidy = WalletEventBase & {
+ type: 'foundation'
+ data: {
+ siacoinElement: SiacoinElement
+ }
+}
+
+export type WalletEvent =
+ | WalletEventTransactionV1
+ | WalletEventTransactionV2
+ | WalletEventContractResolutionV1
+ | WalletEventContractResolutionV2
+ | WalletEventMinerPayout
+ | WalletEventFoundationSubsidy
+ | WalletEventSiafundClaim
+
+export type WalletEventType = WalletEvent['type']
diff --git a/libs/types/src/index.ts b/libs/types/src/index.ts
index afc97d4a9..0957f1243 100644
--- a/libs/types/src/index.ts
+++ b/libs/types/src/index.ts
@@ -1,2 +1,3 @@
export * from './core'
+export * from './events'
export * from './v2'
diff --git a/libs/units/package.json b/libs/units/package.json
index c1b4cfb9e..df3cdb440 100644
--- a/libs/units/package.json
+++ b/libs/units/package.json
@@ -8,7 +8,8 @@
"bignumber.js": "^9.0.2",
"@technically/lodash": "^4.17.0",
"blakejs": "^1.2.1",
- "@siafoundation/sia-central-types": "0.1.1"
+ "@siafoundation/sia-central-types": "0.1.1",
+ "@siafoundation/types": "0.4.0"
},
"types": "./src/index.d.ts"
}
diff --git a/libs/units/src/entityTypes.ts b/libs/units/src/entityTypes.ts
new file mode 100644
index 000000000..27fad01dc
--- /dev/null
+++ b/libs/units/src/entityTypes.ts
@@ -0,0 +1,109 @@
+export type EntityType =
+ | 'contract'
+ | 'transaction'
+ | 'block'
+ | 'output'
+ | 'address'
+ | 'ip'
+ | 'hostIp'
+ | 'hostPublicKey'
+ | 'contract'
+ | 'blockHash'
+
+const entityLabels: Record = {
+ transaction: 'transaction',
+ contract: 'contract',
+ block: 'block',
+ output: 'output',
+ address: 'address',
+ hostIp: 'host',
+ hostPublicKey: 'host',
+ ip: 'IP',
+ blockHash: 'block hash',
+}
+export function getEntityTypeLabel(type?: EntityType): string | undefined {
+ return type ? entityLabels[type] : undefined
+}
+
+const entityCopyLabels: Record = {
+ transaction: 'transaction ID',
+ contract: 'contract ID',
+ block: 'block',
+ output: 'output ID',
+ address: 'address',
+ hostIp: 'host address',
+ hostPublicKey: 'host public key',
+ ip: 'IP',
+ blockHash: 'block hash',
+}
+export function getEntityTypeCopyLabel(type?: EntityType): string | undefined {
+ return type ? entityCopyLabels[type] : undefined
+}
+
+export function getEntityDisplayLength(type?: EntityType): number {
+ const longList: EntityType[] = ['ip', 'hostIp']
+ return type && longList.includes(type) ? 20 : 12
+}
+
+export function doesEntityHaveSiascanUrl(type?: EntityType) {
+ const includeList: EntityType[] = [
+ 'hostIp',
+ 'hostPublicKey',
+ 'contract',
+ 'address',
+ 'transaction',
+ 'block',
+ ]
+ return type && includeList.includes(type)
+}
+
+export function getEntitySiascanUrl(
+ baseUrl: string,
+ type: EntityType,
+ value: string
+) {
+ switch (type) {
+ case 'hostIp':
+ return `${baseUrl}/host/${value}`
+ case 'hostPublicKey':
+ return `${baseUrl}/host/${value}`
+ case 'contract':
+ return `${baseUrl}/contract/${value}`
+ case 'transaction':
+ return `${baseUrl}/tx/${value}`
+ case 'address':
+ return `${baseUrl}/address/${value}`
+ case 'block':
+ return `${baseUrl}/block/${value}`
+ default:
+ return ''
+ }
+}
+
+export function defaultFormatValue(text: string, maxLength: number) {
+ return `${text?.slice(0, maxLength)}${
+ (text?.length || 0) > maxLength ? '...' : ''
+ }`
+}
+
+export function formatEntityValue(
+ type: EntityType,
+ text: string,
+ maxLength: number
+) {
+ switch (type) {
+ case 'blockHash': {
+ const halfMax = maxLength / 2
+ // Floor and ceil here to handle odd maxLengths.
+ // .slice() will round down on floats.
+ const firstHalf = text.slice(0, Math.floor(halfMax))
+ const lastHalf = text.slice(text.length - Math.ceil(halfMax))
+ return firstHalf + '...' + lastHalf
+ }
+ default: {
+ // We could also return null here, forcing the issue of defining
+ // formats for the missing cases in the switch above.
+ return defaultFormatValue(text, maxLength)
+ }
+ }
+}
diff --git a/libs/units/src/events.ts b/libs/units/src/events.ts
new file mode 100644
index 000000000..c35b194b2
--- /dev/null
+++ b/libs/units/src/events.ts
@@ -0,0 +1,49 @@
+import BigNumber from 'bignumber.js'
+import { WalletEvent } from '@siafoundation/types'
+import {
+ TxType,
+ getTransactionType,
+ getV2TransactionType,
+} from './transactionTypes'
+
+export function getEventFee(e: WalletEvent) {
+ if (e.type === 'v2Transaction') {
+ return new BigNumber(e.data.minerFee)
+ }
+ return 'transaction' in e.data && e.data.transaction.minerFees?.length
+ ? new BigNumber(e.data.transaction.minerFees[0])
+ : undefined
+}
+
+export function getEventContractId(e: WalletEvent) {
+ if (e.type === 'v1ContractResolution') {
+ return e.data.parent.id
+ }
+ if (e.type === 'v2ContractResolution') {
+ return e.data.parent.id
+ }
+ return undefined
+}
+
+export function getEventTxType(e: WalletEvent): TxType | undefined {
+ const eventType = e.type
+ if (eventType === 'v1Transaction') {
+ return getTransactionType(e.data.transaction)
+ }
+ if (eventType === 'v2Transaction') {
+ return getV2TransactionType(e.data)
+ }
+ if (eventType === 'v1ContractResolution') {
+ return 'contractPayout'
+ }
+ if (eventType === 'v2ContractResolution') {
+ return 'contractPayout'
+ }
+ if (eventType === 'miner') {
+ return 'minerPayout'
+ }
+ if (eventType === 'foundation') {
+ return 'foundationSubsidy'
+ }
+ return eventType
+}
diff --git a/libs/units/src/index.ts b/libs/units/src/index.ts
index 138440db2..14e6622ea 100644
--- a/libs/units/src/index.ts
+++ b/libs/units/src/index.ts
@@ -5,3 +5,7 @@ export * from './currency'
export * from './blockTime'
export * from './bytes'
export * from './valuePer'
+export * from './events'
+export * from './transactionValue'
+export * from './transactionTypes'
+export * from './entityTypes'
diff --git a/libs/units/src/transactionTypes.ts b/libs/units/src/transactionTypes.ts
new file mode 100644
index 000000000..294f4252b
--- /dev/null
+++ b/libs/units/src/transactionTypes.ts
@@ -0,0 +1,104 @@
+import {
+ Transaction,
+ V2FileContractResolutionType,
+ V2Transaction,
+} from '@siafoundation/types'
+
+export type TxType =
+ | 'siacoin'
+ | 'siafund'
+ | 'storageProof'
+ | 'contractFormation'
+ | 'contractRevision'
+ | 'contractRenewal'
+ | 'contractExpiration'
+ | 'contractFinalization'
+ | 'contractPayout'
+ | 'minerPayout'
+ | 'siafundClaim'
+ | 'foundationSubsidy'
+ | 'hostAnnouncement'
+
+export function getTransactionType(txn: Transaction): TxType | undefined {
+ if (txn.storageProofs && txn.storageProofs.length > 0) {
+ return 'storageProof'
+ }
+ if (
+ txn.fileContracts &&
+ txn.fileContracts.length > 0 &&
+ txn.fileContractRevisions &&
+ txn.fileContractRevisions.length > 0
+ ) {
+ return 'contractRenewal'
+ }
+ if (txn.fileContractRevisions && txn.fileContractRevisions.length > 0) {
+ return 'contractRevision'
+ }
+ if (txn.fileContracts && txn.fileContracts.length > 0) {
+ return 'contractFormation'
+ }
+ if (
+ txn.arbitraryData &&
+ txn.arbitraryData.length > 0 &&
+ atob(txn.arbitraryData[0]).indexOf('HostAnnouncement') === 0
+ ) {
+ return 'hostAnnouncement'
+ }
+ if (txn.siafundOutputs && txn.siafundOutputs.length > 0) {
+ return 'siafund'
+ }
+ if (txn.siacoinOutputs && txn.siacoinOutputs.length > 0) {
+ return 'siacoin'
+ }
+
+ return undefined
+}
+
+export function getV2TransactionType(txn: V2Transaction): TxType | undefined {
+ if (txn.fileContractResolutions && txn.fileContractResolutions.length > 0) {
+ const mapping: Record = {
+ expiration: 'contractExpiration',
+ finalization: 'contractFinalization',
+ renewal: 'contractRenewal',
+ 'storage proof': 'storageProof',
+ }
+ return mapping[txn.fileContractResolutions[0].resolution.type]
+ }
+ if (txn.fileContractRevisions && txn.fileContractRevisions.length > 0) {
+ return 'contractRevision'
+ }
+ if (txn.fileContracts && txn.fileContracts.length > 0) {
+ return 'contractFormation'
+ }
+ const announcement = txn.attestations?.filter(
+ (at) => at.key === 'HostAnnouncement'
+ )
+ if (announcement && announcement.length > 0) return 'hostAnnouncement'
+ if (txn.siafundOutputs && txn.siafundOutputs.length > 0) {
+ return 'siafund'
+ }
+ if (txn.siacoinOutputs && txn.siacoinOutputs.length > 0) {
+ return 'siacoin'
+ }
+
+ return undefined
+}
+
+const txTypeMap: Record = {
+ siacoin: 'siacoin transfer',
+ siafund: 'siafund transfer',
+ contractFormation: 'contract formation',
+ contractRenewal: 'contract renewal',
+ contractRevision: 'contract revision',
+ contractExpiration: 'contract expiration',
+ contractFinalization: 'contract finalization',
+ contractPayout: 'contract payout',
+ storageProof: 'storage proof',
+ minerPayout: 'miner payout',
+ siafundClaim: 'siafund claim',
+ foundationSubsidy: 'foundation subsidy',
+ hostAnnouncement: 'host announcement',
+}
+export function getTxTypeLabel(type?: TxType): string | undefined {
+ return type ? txTypeMap[type] : undefined
+}
diff --git a/apps/walletd/contexts/events/transactionValue.spec.ts b/libs/units/src/transactionValue.spec.ts
similarity index 96%
rename from apps/walletd/contexts/events/transactionValue.spec.ts
rename to libs/units/src/transactionValue.spec.ts
index b02028475..b3e5ff0ef 100644
--- a/apps/walletd/contexts/events/transactionValue.spec.ts
+++ b/libs/units/src/transactionValue.spec.ts
@@ -1,6 +1,6 @@
-import { WalletEvent } from '@siafoundation/walletd-types'
import { calculateScValue, calculateSfValue } from './transactionValue'
-import { toHastings } from '@siafoundation/units'
+import { toHastings } from './currency'
+import { WalletEvent } from '@siafoundation/types'
test('v1TxnCalculateScValue', () => {
const e: WalletEvent = {
@@ -62,7 +62,7 @@ test('v1TxnCalculateScValue', () => {
},
},
],
- spentSiafundElements: null,
+ spentSiafundElements: undefined,
},
relevant: ['addr:1', 'addr:2'],
}
@@ -95,8 +95,8 @@ test('v1TxnCalculateScValue when no relevant / spentSiacoinElements is null', ()
minerFees: ['1000000000000000000000000'],
signatures: [],
},
- spentSiacoinElements: null,
- spentSiafundElements: null,
+ spentSiacoinElements: undefined,
+ spentSiafundElements: undefined,
},
relevant: ['addr:1'],
}
@@ -193,7 +193,7 @@ test('v1TxnCalculateSfValue', () => {
minerFees: ['1000000000000000000000000'],
signatures: [],
},
- spentSiacoinElements: null,
+ spentSiacoinElements: undefined,
spentSiafundElements: [
{
id: 'id-1',
@@ -258,8 +258,8 @@ test('v1TxnCalculateSfValue when no relevant / spentSiafundElements is null', ()
minerFees: ['1000000000000000000000000'],
signatures: [],
},
- spentSiacoinElements: null,
- spentSiafundElements: null,
+ spentSiacoinElements: undefined,
+ spentSiafundElements: undefined,
},
relevant: ['addr:1'],
}
diff --git a/apps/walletd/contexts/events/transactionValue.ts b/libs/units/src/transactionValue.ts
similarity index 98%
rename from apps/walletd/contexts/events/transactionValue.ts
rename to libs/units/src/transactionValue.ts
index 0d9e7ca81..27d1a6add 100644
--- a/apps/walletd/contexts/events/transactionValue.ts
+++ b/libs/units/src/transactionValue.ts
@@ -3,7 +3,7 @@ import {
WalletEvent,
WalletEventTransactionV1,
WalletEventTransactionV2,
-} from '@siafoundation/walletd-types'
+} from '@siafoundation/types'
export function calculateScValue(e: WalletEvent) {
if (e.type === 'v2Transaction') {
diff --git a/libs/walletd-types/src/api.ts b/libs/walletd-types/src/api.ts
index bff9cb54c..108b01560 100644
--- a/libs/walletd-types/src/api.ts
+++ b/libs/walletd-types/src/api.ts
@@ -10,14 +10,9 @@ import {
SiafundElement,
Transaction,
V2Transaction,
-} from '@siafoundation/types'
-import {
WalletEvent,
- GatewayPeer,
- Wallet,
- WalletAddress,
- WalletMetadata,
-} from './types'
+} from '@siafoundation/types'
+import { GatewayPeer, Wallet, WalletAddress, WalletMetadata } from './types'
export const stateRoute = '/state'
export const consensusTipRoute = '/consensus/tip'
diff --git a/libs/walletd-types/src/types.ts b/libs/walletd-types/src/types.ts
index 911b2c0bd..200666e8b 100644
--- a/libs/walletd-types/src/types.ts
+++ b/libs/walletd-types/src/types.ts
@@ -1,129 +1,15 @@
-import {
- ChainIndex,
- Transaction,
- SiacoinElement,
- SiafundElement,
- FileContractElement,
- Hash256,
- FileContract,
- PublicKey,
- SpendPolicy,
- UnlockConditions,
- V2Transaction,
- V2FileContractResolutionType,
- Address,
- V2FileContractElement,
-} from '@siafoundation/types'
+import { SpendPolicy, UnlockConditions } from '@siafoundation/types'
export type GatewayPeer = {
addr: string
inbound: boolean
version: string
-
firstSeen?: string
connectedSince?: string
syncedBlocks?: number
syncDuration?: number
}
-export type UnconfirmedChainIndex = {
- height: number
-}
-
-export type WalletEventBase = {
- id: Hash256
- timestamp: string
- index: ChainIndex | UnconfirmedChainIndex
- maturityHeight: number
- 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 WalletEventTransactionV1 = WalletEventBase & {
- type: 'v1Transaction'
- data: {
- transaction: Transaction
- spentSiacoinElements?: SiacoinElement[]
- spentSiafundElements?: SiafundElement[]
- }
-}
-
-export type WalletEventTransactionV2 = WalletEventBase & {
- type: 'v2Transaction'
- data: V2Transaction
-}
-
-export type WalletEventContractResolutionV1 = WalletEventBase & {
- type: 'v1ContractResolution'
- data: {
- parent: FileContractElement
- siacoinElement: SiacoinElement
- missed: boolean
- }
-}
-
-export type WalletEventContractResolutionV2 = WalletEventBase & {
- type: 'v2ContractResolution'
- data: {
- parent: V2FileContractElement
- resolution: V2FileContractResolutionType
- siacoinElement: SiacoinElement
- missed: boolean
- }
-}
-
-export type WalletEventMinerPayout = WalletEventBase & {
- type: 'miner'
- data: {
- siacoinElement: SiacoinElement
- }
-}
-
-export type WalletEventSiafundClaim = WalletEventBase & {
- type: 'siafundClaim'
- data: {
- siacoinElement: SiacoinElement
- }
-}
-
-export type WalletEventFoundationSubsidy = WalletEventBase & {
- type: 'foundation'
- data: {
- siacoinElement: SiacoinElement
- }
-}
-
-export type WalletEvent =
- | WalletEventTransactionV1
- | WalletEventTransactionV2
- | WalletEventContractResolutionV1
- | WalletEventContractResolutionV2
- | WalletEventMinerPayout
- | WalletEventFoundationSubsidy
- | WalletEventSiafundClaim
-
export type Metadata = Record
export type WalletType = 'seed' | 'ledger' | 'watch'