Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
8d8fbff51a
|
@@ -0,0 +1,71 @@
|
|||||||
|
import { RedistributionState, BZZ, DAI } from '@ethersphere/bee-js'
|
||||||
|
import { useContext, useEffect, useState } from 'react'
|
||||||
|
import { Context } from '../providers/Settings'
|
||||||
|
import ExpandableListItem from './ExpandableListItem'
|
||||||
|
|
||||||
|
export function Redistribution() {
|
||||||
|
const { beeApi } = useContext(Context)
|
||||||
|
const [redistributionState, setRedistributionState] = useState<RedistributionState | null>(null)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const interval = setInterval(() => {
|
||||||
|
if (!beeApi) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
beeApi.getRedistributionState().then(setRedistributionState).catch(console.error) // eslint-disable-line
|
||||||
|
}, 3_000)
|
||||||
|
|
||||||
|
return () => clearInterval(interval)
|
||||||
|
})
|
||||||
|
|
||||||
|
const formatDurationSeconds = (s?: number) => {
|
||||||
|
if (s === null || s === undefined) {
|
||||||
|
return '-'
|
||||||
|
} else {
|
||||||
|
return `${s} s`
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const formatBzzAmount = (amount?: BZZ) => {
|
||||||
|
if (amount === null || amount === undefined) {
|
||||||
|
return '-'
|
||||||
|
} else {
|
||||||
|
return `${amount.toSignificantDigits(4)} xBZZ`
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const formatDaiAmount = (amount?: DAI) => {
|
||||||
|
if (amount === null || amount === undefined) {
|
||||||
|
return '-'
|
||||||
|
} else {
|
||||||
|
return `${amount.toSignificantDigits(4)} xDAI`
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<ExpandableListItem
|
||||||
|
label="Has sufficient funds"
|
||||||
|
value={redistributionState?.hasSufficientFunds?.toString() ?? '-'}
|
||||||
|
/>
|
||||||
|
<ExpandableListItem label="Fully synced" value={redistributionState?.isFullySynced?.toString() ?? '-'} />
|
||||||
|
<ExpandableListItem label="Frozen" value={redistributionState?.isFrozen?.toString() ?? '-'} />
|
||||||
|
<ExpandableListItem label="Phase" value={redistributionState?.phase ?? '-'} />
|
||||||
|
<ExpandableListItem label="Round" value={redistributionState?.round?.toString() ?? '-'} />
|
||||||
|
<ExpandableListItem
|
||||||
|
label="Last selected round"
|
||||||
|
value={redistributionState?.lastSelectedRound.toString() ?? '-'}
|
||||||
|
/>
|
||||||
|
<ExpandableListItem label="Last played round" value={redistributionState?.lastPlayedRound.toString() ?? '-'} />
|
||||||
|
<ExpandableListItem label="Last round won" value={redistributionState?.lastWonRound.toString() ?? '-'} />
|
||||||
|
<ExpandableListItem label="Last frozen round" value={redistributionState?.lastFrozenRound.toString() ?? '-'} />
|
||||||
|
<ExpandableListItem
|
||||||
|
label="Last sample duration"
|
||||||
|
value={formatDurationSeconds(redistributionState?.lastSampleDurationSeconds)}
|
||||||
|
/>
|
||||||
|
<ExpandableListItem label="Reward" value={formatBzzAmount(redistributionState?.reward)} />
|
||||||
|
<ExpandableListItem label="Fees" value={formatDaiAmount(redistributionState?.fees)} />
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -8,6 +8,7 @@ import FileManagerIcon from 'remixicon-react/FolderOpenLineIcon'
|
|||||||
import DocsIcon from 'remixicon-react/BookOpenLineIcon'
|
import DocsIcon from 'remixicon-react/BookOpenLineIcon'
|
||||||
import ExternalLinkIcon from 'remixicon-react/ExternalLinkLineIcon'
|
import ExternalLinkIcon from 'remixicon-react/ExternalLinkLineIcon'
|
||||||
import GithubIcon from 'remixicon-react/GithubFillIcon'
|
import GithubIcon from 'remixicon-react/GithubFillIcon'
|
||||||
|
import ExchangeDollarLineIcon from 'remixicon-react/ExchangeDollarLineIcon'
|
||||||
import HomeIcon from 'remixicon-react/Home3LineIcon'
|
import HomeIcon from 'remixicon-react/Home3LineIcon'
|
||||||
import SettingsIcon from 'remixicon-react/Settings2LineIcon'
|
import SettingsIcon from 'remixicon-react/Settings2LineIcon'
|
||||||
import AccountIcon from 'remixicon-react/Wallet3LineIcon'
|
import AccountIcon from 'remixicon-react/Wallet3LineIcon'
|
||||||
@@ -95,6 +96,11 @@ export default function SideBar(): ReactElement {
|
|||||||
icon: AccountIcon,
|
icon: AccountIcon,
|
||||||
pathMatcherSubstring: '/account/',
|
pathMatcherSubstring: '/account/',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: 'Redistribution',
|
||||||
|
path: ROUTES.REDISTRIBUTION,
|
||||||
|
icon: ExchangeDollarLineIcon,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: 'Settings',
|
label: 'Settings',
|
||||||
path: ROUTES.SETTINGS,
|
path: ROUTES.SETTINGS,
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import NodeInfoCard from './NodeInfoCard'
|
|||||||
import { WalletInfoCard } from './WalletInfoCard'
|
import { WalletInfoCard } from './WalletInfoCard'
|
||||||
|
|
||||||
export default function Status(): ReactElement {
|
export default function Status(): ReactElement {
|
||||||
const { beeVersion, status, topology, nodeInfo, walletBalance } = useContext(BeeContext)
|
const { beeVersion, status, topology, nodeInfo, nodeStatus, walletBalance } = useContext(BeeContext)
|
||||||
const { isDesktop, desktopUrl } = useContext(SettingsContext)
|
const { isDesktop, desktopUrl } = useContext(SettingsContext)
|
||||||
const { beeDesktopVersion } = useBeeDesktop(isDesktop, desktopUrl)
|
const { beeDesktopVersion } = useBeeDesktop(isDesktop, desktopUrl)
|
||||||
const { newBeeDesktopVersion } = useNewBeeDesktopVersion(isDesktop, desktopUrl, false)
|
const { newBeeDesktopVersion } = useNewBeeDesktopVersion(isDesktop, desktopUrl, false)
|
||||||
@@ -38,7 +38,10 @@ export default function Status(): ReactElement {
|
|||||||
<div style={{ height: '2px' }} />
|
<div style={{ height: '2px' }} />
|
||||||
<ExpandableListItem label="Connected peers" value={topology?.connected ?? '-'} />
|
<ExpandableListItem label="Connected peers" value={topology?.connected ?? '-'} />
|
||||||
<ExpandableListItem label="Population" value={topology?.population ?? '-'} />
|
<ExpandableListItem label="Population" value={topology?.population ?? '-'} />
|
||||||
|
<ExpandableListItem label="Pullsync rate" value={nodeStatus?.pullsyncRate} />
|
||||||
<ExpandableListItem label="Depth" value={topology?.depth ?? '-'} />
|
<ExpandableListItem label="Depth" value={topology?.depth ?? '-'} />
|
||||||
|
<ExpandableListItem label="Neighborhood size" value={nodeStatus?.neighborhoodSize} />
|
||||||
|
<ExpandableListItem label="Node is reachable" value={nodeStatus?.isReachable?.toString()} />
|
||||||
<ChainSync />
|
<ChainSync />
|
||||||
|
|
||||||
<div style={{ height: '16px' }} />
|
<div style={{ height: '16px' }} />
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
import CircularProgress from '@material-ui/core/CircularProgress'
|
||||||
|
import { ReactElement, useContext } from 'react'
|
||||||
|
import ExpandableList from '../../components/ExpandableList'
|
||||||
|
import { Redistribution } from '../../components/Redistribution'
|
||||||
|
import { Context as SettingsContext } from '../../providers/Settings'
|
||||||
|
|
||||||
|
export default function RedistributionPage(): ReactElement {
|
||||||
|
const { isLoading } = useContext(SettingsContext)
|
||||||
|
|
||||||
|
if (isLoading) {
|
||||||
|
return (
|
||||||
|
<div style={{ textAlign: 'center', width: '100%' }}>
|
||||||
|
<CircularProgress />
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<ExpandableList label="Redistribution" defaultOpen>
|
||||||
|
<Redistribution />
|
||||||
|
</ExpandableList>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -5,11 +5,13 @@ import {
|
|||||||
ChainState,
|
ChainState,
|
||||||
ChequebookAddressResponse,
|
ChequebookAddressResponse,
|
||||||
ChequebookBalanceResponse,
|
ChequebookBalanceResponse,
|
||||||
|
DebugStatus,
|
||||||
LastChequesResponse,
|
LastChequesResponse,
|
||||||
NodeAddresses,
|
NodeAddresses,
|
||||||
NodeInfo,
|
NodeInfo,
|
||||||
Peer,
|
Peer,
|
||||||
PeerBalance,
|
PeerBalance,
|
||||||
|
RedistributionState,
|
||||||
Topology,
|
Topology,
|
||||||
WalletBalance,
|
WalletBalance,
|
||||||
} from '@ethersphere/bee-js'
|
} from '@ethersphere/bee-js'
|
||||||
@@ -49,6 +51,7 @@ interface ContextInterface {
|
|||||||
apiHealth: boolean
|
apiHealth: boolean
|
||||||
nodeAddresses: NodeAddresses | null
|
nodeAddresses: NodeAddresses | null
|
||||||
nodeInfo: NodeInfo | null
|
nodeInfo: NodeInfo | null
|
||||||
|
nodeStatus: DebugStatus | null
|
||||||
topology: Topology | null
|
topology: Topology | null
|
||||||
chequebookAddress: ChequebookAddressResponse | null
|
chequebookAddress: ChequebookAddressResponse | null
|
||||||
peers: Peer[] | null
|
peers: Peer[] | null
|
||||||
@@ -59,6 +62,7 @@ interface ContextInterface {
|
|||||||
settlements: AllSettlements | null
|
settlements: AllSettlements | null
|
||||||
chainState: ChainState | null
|
chainState: ChainState | null
|
||||||
walletBalance: WalletBalance | null
|
walletBalance: WalletBalance | null
|
||||||
|
redistributionState: RedistributionState | null
|
||||||
latestBeeRelease: LatestBeeRelease | null
|
latestBeeRelease: LatestBeeRelease | null
|
||||||
isLoading: boolean
|
isLoading: boolean
|
||||||
lastUpdate: number | null
|
lastUpdate: number | null
|
||||||
@@ -79,6 +83,7 @@ const initialValues: ContextInterface = {
|
|||||||
apiHealth: false,
|
apiHealth: false,
|
||||||
nodeAddresses: null,
|
nodeAddresses: null,
|
||||||
nodeInfo: null,
|
nodeInfo: null,
|
||||||
|
nodeStatus: null,
|
||||||
topology: null,
|
topology: null,
|
||||||
chequebookAddress: null,
|
chequebookAddress: null,
|
||||||
stake: null,
|
stake: null,
|
||||||
@@ -89,6 +94,7 @@ const initialValues: ContextInterface = {
|
|||||||
settlements: null,
|
settlements: null,
|
||||||
chainState: null,
|
chainState: null,
|
||||||
walletBalance: null,
|
walletBalance: null,
|
||||||
|
redistributionState: null,
|
||||||
latestBeeRelease: null,
|
latestBeeRelease: null,
|
||||||
isLoading: true,
|
isLoading: true,
|
||||||
lastUpdate: null,
|
lastUpdate: null,
|
||||||
@@ -172,6 +178,7 @@ export function Provider({ children }: Props): ReactElement {
|
|||||||
const [apiHealth, setApiHealth] = useState<boolean>(false)
|
const [apiHealth, setApiHealth] = useState<boolean>(false)
|
||||||
const [nodeAddresses, setNodeAddresses] = useState<NodeAddresses | null>(null)
|
const [nodeAddresses, setNodeAddresses] = useState<NodeAddresses | null>(null)
|
||||||
const [nodeInfo, setNodeInfo] = useState<NodeInfo | null>(null)
|
const [nodeInfo, setNodeInfo] = useState<NodeInfo | null>(null)
|
||||||
|
const [nodeStatus, setNodeStatus] = useState<DebugStatus | null>(null)
|
||||||
const [topology, setNodeTopology] = useState<Topology | null>(null)
|
const [topology, setNodeTopology] = useState<Topology | null>(null)
|
||||||
const [chequebookAddress, setChequebookAddress] = useState<ChequebookAddressResponse | null>(null)
|
const [chequebookAddress, setChequebookAddress] = useState<ChequebookAddressResponse | null>(null)
|
||||||
const [peers, setPeers] = useState<Peer[] | null>(null)
|
const [peers, setPeers] = useState<Peer[] | null>(null)
|
||||||
@@ -182,6 +189,7 @@ export function Provider({ children }: Props): ReactElement {
|
|||||||
const [settlements, setSettlements] = useState<AllSettlements | null>(null)
|
const [settlements, setSettlements] = useState<AllSettlements | null>(null)
|
||||||
const [chainState, setChainState] = useState<ChainState | null>(null)
|
const [chainState, setChainState] = useState<ChainState | null>(null)
|
||||||
const [walletBalance, setWalletBalance] = useState<WalletBalance | null>(null)
|
const [walletBalance, setWalletBalance] = useState<WalletBalance | null>(null)
|
||||||
|
const [redistributionState, setRedistributionState] = useState<RedistributionState | null>(null)
|
||||||
const [startedAt] = useState(Date.now())
|
const [startedAt] = useState(Date.now())
|
||||||
|
|
||||||
const { latestBeeRelease } = useLatestBeeRelease()
|
const { latestBeeRelease } = useLatestBeeRelease()
|
||||||
@@ -257,6 +265,12 @@ export function Provider({ children }: Props): ReactElement {
|
|||||||
.then(setNodeInfo)
|
.then(setNodeInfo)
|
||||||
.catch(() => setNodeInfo(null)),
|
.catch(() => setNodeInfo(null)),
|
||||||
|
|
||||||
|
// NodeDebugInfo
|
||||||
|
beeApi
|
||||||
|
.getStatus({ timeout: TIMEOUT })
|
||||||
|
.then(setNodeStatus)
|
||||||
|
.catch(() => setNodeInfo(null)),
|
||||||
|
|
||||||
// Network Topology
|
// Network Topology
|
||||||
beeApi
|
beeApi
|
||||||
.getTopology({ timeout: TIMEOUT })
|
.getTopology({ timeout: TIMEOUT })
|
||||||
@@ -304,6 +318,12 @@ export function Provider({ children }: Props): ReactElement {
|
|||||||
.then(stake => setStake(stake))
|
.then(stake => setStake(stake))
|
||||||
.catch(() => setStake(null)),
|
.catch(() => setStake(null)),
|
||||||
|
|
||||||
|
// Redistribution stats
|
||||||
|
beeApi
|
||||||
|
.getRedistributionState({ timeout: TIMEOUT })
|
||||||
|
.then(setRedistributionState)
|
||||||
|
.catch(() => setRedistributionState(null)),
|
||||||
|
|
||||||
// Peer balances
|
// Peer balances
|
||||||
beeApi
|
beeApi
|
||||||
.getAllBalances({ timeout: TIMEOUT })
|
.getAllBalances({ timeout: TIMEOUT })
|
||||||
@@ -362,6 +382,7 @@ export function Provider({ children }: Props): ReactElement {
|
|||||||
apiHealth,
|
apiHealth,
|
||||||
nodeAddresses,
|
nodeAddresses,
|
||||||
nodeInfo,
|
nodeInfo,
|
||||||
|
nodeStatus,
|
||||||
topology,
|
topology,
|
||||||
chequebookAddress,
|
chequebookAddress,
|
||||||
peers,
|
peers,
|
||||||
@@ -372,6 +393,7 @@ export function Provider({ children }: Props): ReactElement {
|
|||||||
settlements,
|
settlements,
|
||||||
chainState,
|
chainState,
|
||||||
walletBalance,
|
walletBalance,
|
||||||
|
redistributionState,
|
||||||
latestBeeRelease,
|
latestBeeRelease,
|
||||||
isLoading,
|
isLoading,
|
||||||
lastUpdate,
|
lastUpdate,
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import { BankCardTopUpIndex } from './pages/top-up/BankCardTopUpIndex'
|
|||||||
import { CryptoTopUpIndex } from './pages/top-up/CryptoTopUpIndex'
|
import { CryptoTopUpIndex } from './pages/top-up/CryptoTopUpIndex'
|
||||||
import { GiftCardFund } from './pages/top-up/GiftCardFund'
|
import { GiftCardFund } from './pages/top-up/GiftCardFund'
|
||||||
import { GiftCardTopUpIndex } from './pages/top-up/GiftCardTopUpIndex'
|
import { GiftCardTopUpIndex } from './pages/top-up/GiftCardTopUpIndex'
|
||||||
|
import RedistributionPage from './pages/redistribution'
|
||||||
import { Swap } from './pages/top-up/Swap'
|
import { Swap } from './pages/top-up/Swap'
|
||||||
import { Context as SettingsContext } from './providers/Settings'
|
import { Context as SettingsContext } from './providers/Settings'
|
||||||
import { FileManagerPage } from './pages/filemanager'
|
import { FileManagerPage } from './pages/filemanager'
|
||||||
@@ -37,6 +38,7 @@ export enum ROUTES {
|
|||||||
UPLOAD_IN_PROGRESS = '/files/upload/workflow',
|
UPLOAD_IN_PROGRESS = '/files/upload/workflow',
|
||||||
DOWNLOAD = '/files/download',
|
DOWNLOAD = '/files/download',
|
||||||
HASH = '/files/hash/:hash',
|
HASH = '/files/hash/:hash',
|
||||||
|
REDISTRIBUTION = '/redistribution',
|
||||||
SETTINGS = '/settings',
|
SETTINGS = '/settings',
|
||||||
STATUS = '/status',
|
STATUS = '/status',
|
||||||
TOP_UP = '/account/wallet/top-up',
|
TOP_UP = '/account/wallet/top-up',
|
||||||
@@ -82,6 +84,7 @@ const BaseRouter = (): ReactElement => {
|
|||||||
<Route path={ROUTES.SETTINGS} element={<Settings />} />
|
<Route path={ROUTES.SETTINGS} element={<Settings />} />
|
||||||
<Route path={ROUTES.STATUS} element={<Status />} />
|
<Route path={ROUTES.STATUS} element={<Status />} />
|
||||||
<Route path={ROUTES.INFO} element={<Info />} />
|
<Route path={ROUTES.INFO} element={<Info />} />
|
||||||
|
<Route path={ROUTES.REDISTRIBUTION} element={<RedistributionPage />} />
|
||||||
<Route path={ROUTES.TOP_UP} element={<TopUp />} />
|
<Route path={ROUTES.TOP_UP} element={<TopUp />} />
|
||||||
<Route path={ROUTES.TOP_UP_CRYPTO} element={<CryptoTopUpIndex />} />
|
<Route path={ROUTES.TOP_UP_CRYPTO} element={<CryptoTopUpIndex />} />
|
||||||
<Route path={ROUTES.TOP_UP_CRYPTO_SWAP} element={<Swap header="Top-up with cryptocurrencies" />} />
|
<Route path={ROUTES.TOP_UP_CRYPTO_SWAP} element={<Swap header="Top-up with cryptocurrencies" />} />
|
||||||
|
|||||||
Reference in New Issue
Block a user