Compare commits

..

7 Commits

Author SHA1 Message Date
bee-worker 8367f2b76a chore(master): release 0.24.0 (#621) 2023-08-12 00:47:34 +02:00
Cafe137 055a3002b3 feat: add stamp dilute and topup (#619)
* feat: add stamp dilute and topup

* fix: remove any

* chore: bump bee-js

* chore: remove obsolete workaround
2023-08-12 00:41:10 +02:00
bee-worker c9c4e7d7d1 chore(master): release 0.23.0 (#609) 2023-02-23 01:25:09 +01:00
bee-worker d97bc27c14 docs: update supported bee (#612) 2023-02-21 10:30:59 +01:00
Cafe137 e215c61ea1 feat: upgrade bee-js to 5.2.0 (#611) 2023-02-21 10:16:16 +01:00
bee-worker 8298d0bc66 docs: update supported bee (#610) 2023-02-19 23:29:11 +01:00
Cafe137 fac72b1299 feat: add staking for full nodes (#590)
* feat: add staking

* feat: enable staking in full mode, add loading state

* chore: revert constants
2023-02-19 22:58:55 +01:00
25 changed files with 698 additions and 1083 deletions
+15
View File
@@ -1,5 +1,20 @@
# Changelog # Changelog
## [0.24.0](https://github.com/ethersphere/bee-dashboard/compare/v0.23.0...v0.24.0) (2023-08-11)
### Features
* add stamp dilute and topup ([#619](https://github.com/ethersphere/bee-dashboard/issues/619)) ([055a300](https://github.com/ethersphere/bee-dashboard/commit/055a3002b303df45c7010ef4d365e14b979e9084))
## [0.23.0](https://github.com/ethersphere/bee-dashboard/compare/v0.22.0...v0.23.0) (2023-02-21)
### Features
* add staking for full nodes ([#590](https://github.com/ethersphere/bee-dashboard/issues/590)) ([fac72b1](https://github.com/ethersphere/bee-dashboard/commit/fac72b1299353c104231aa038c1bab9df78c1355))
* upgrade bee-js to 5.2.0 ([#611](https://github.com/ethersphere/bee-dashboard/issues/611)) ([e215c61](https://github.com/ethersphere/bee-dashboard/commit/e215c61ea1619fc388fe8b1904d160b04a1a5c0d))
## [0.22.0](https://github.com/ethersphere/bee-dashboard/compare/v0.21.1...v0.22.0) (2023-01-19) ## [0.22.0](https://github.com/ethersphere/bee-dashboard/compare/v0.21.1...v0.22.0) (2023-01-19)
+1 -1
View File
@@ -13,7 +13,7 @@
**Warning: This project is in alpha state. There might (and most probably will) be changes in the future to its API and **Warning: This project is in alpha state. There might (and most probably will) be changes in the future to its API and
working. Also, no guarantees can be made about its stability, efficiency, and security at this stage.** working. Also, no guarantees can be made about its stability, efficiency, and security at this stage.**
This project is intended to be used with **Bee version <!-- SUPPORTED_BEE_START -->1.9.0-13a47043<!-- SUPPORTED_BEE_END -->**. This project is intended to be used with **Bee version <!-- SUPPORTED_BEE_START -->1.12.0-88c1d236<!-- SUPPORTED_BEE_END -->**.
Using it with older or newer Bee versions is not recommended and may not work. Stay up to date by joining the Using it with older or newer Bee versions is not recommended and may not work. Stay up to date by joining the
[official Discord](https://discord.gg/GU22h2utj6) and by keeping an eye on the [official Discord](https://discord.gg/GU22h2utj6) and by keeping an eye on the
[releases tab](https://github.com/ethersphere/bee-dashboard/releases). [releases tab](https://github.com/ethersphere/bee-dashboard/releases).
+100 -886
View File
File diff suppressed because it is too large Load Diff
+7 -7
View File
@@ -1,6 +1,6 @@
{ {
"name": "@ethersphere/bee-dashboard", "name": "@ethersphere/bee-dashboard",
"version": "0.22.0", "version": "0.24.0",
"description": "An app which helps users to setup their Bee node and do actions like cash out cheques", "description": "An app which helps users to setup their Bee node and do actions like cash out cheques",
"keywords": [ "keywords": [
"bee", "bee",
@@ -26,8 +26,7 @@
"url": "https://github.com/ethersphere/bee-dashboard.git" "url": "https://github.com/ethersphere/bee-dashboard.git"
}, },
"dependencies": { "dependencies": {
"@ethersphere/bee-js": "^5.1.0", "@ethersphere/bee-js": "^6.2.0",
"@ethersphere/manifest-js": "1.2.1",
"@ethersphere/swarm-cid": "^0.1.0", "@ethersphere/swarm-cid": "^0.1.0",
"@material-ui/core": "4.12.3", "@material-ui/core": "4.12.3",
"@material-ui/icons": "4.11.2", "@material-ui/icons": "4.11.2",
@@ -44,13 +43,14 @@
"formik": "2.2.9", "formik": "2.2.9",
"formik-material-ui": "3.0.1", "formik-material-ui": "3.0.1",
"jszip": "^3.7.1", "jszip": "^3.7.1",
"mantaray-js": "^1.0.3",
"material-ui-dropzone": "3.5.0", "material-ui-dropzone": "3.5.0",
"notistack": "1.0.10", "notistack": "1.0.10",
"opener": "1.5.2", "opener": "1.5.2",
"qrcode.react": "1.0.1", "qrcode.react": "1.0.1",
"react": ">=17.0.0 || >=18.0.0", "react": ">= 17.0.2",
"react-copy-to-clipboard": "5.0.4", "react-copy-to-clipboard": "5.0.4",
"react-dom": ">=17.0.0 || >=18.0.0", "react-dom": ">= 17.0.2",
"react-identicons": "1.2.5", "react-identicons": "1.2.5",
"react-router": "6.2.1", "react-router": "6.2.1",
"react-router-dom": "6.2.1", "react-router-dom": "6.2.1",
@@ -137,7 +137,7 @@
"lint:check": "eslint \"src/**/*.ts\" \"src/**/*.tsx\" && prettier --check \"src/**/*.ts\" \"src/**/*.tsx\"", "lint:check": "eslint \"src/**/*.ts\" \"src/**/*.tsx\" && prettier --check \"src/**/*.ts\" \"src/**/*.tsx\"",
"check:types": "tsc --project tsconfig.lib.json", "check:types": "tsc --project tsconfig.lib.json",
"update-map-data": "node ./utils/update-map-data.js", "update-map-data": "node ./utils/update-map-data.js",
"bee": "bee-factory start" "bee": "npx bee-factory start"
}, },
"files": [ "files": [
"lib", "lib",
@@ -159,6 +159,6 @@
"engines": { "engines": {
"node": ">=14.0.0", "node": ">=14.0.0",
"npm": ">=6.9.0", "npm": ">=6.9.0",
"bee": "1.9.0-13a47043" "bee": "1.16.1-8e269c8"
} }
} }
+4 -4
View File
@@ -1,8 +1,8 @@
import { ReactElement, ReactNode } from 'react' import { Grid, IconButton, Tooltip, Typography } from '@material-ui/core'
import { makeStyles, Theme, createStyles } from '@material-ui/core/styles'
import { Typography, Grid, IconButton, Tooltip } from '@material-ui/core'
import Info from 'remixicon-react/InformationLineIcon'
import ListItem from '@material-ui/core/ListItem' import ListItem from '@material-ui/core/ListItem'
import { Theme, createStyles, makeStyles } from '@material-ui/core/styles'
import { ReactElement, ReactNode } from 'react'
import Info from 'remixicon-react/InformationLineIcon'
const useStyles = makeStyles((theme: Theme) => const useStyles = makeStyles((theme: Theme) =>
createStyles({ createStyles({
+97
View File
@@ -0,0 +1,97 @@
import { BeeDebug } from '@ethersphere/bee-js'
import Button from '@material-ui/core/Button'
import Dialog from '@material-ui/core/Dialog'
import DialogActions from '@material-ui/core/DialogActions'
import DialogContent from '@material-ui/core/DialogContent'
import DialogTitle from '@material-ui/core/DialogTitle'
import Input from '@material-ui/core/Input'
import { useSnackbar } from 'notistack'
import { ReactElement, ReactNode, useState } from 'react'
import { SwarmSelect } from './SwarmSelect'
interface Props {
label: string
icon: ReactNode
beeDebug: BeeDebug
stamp: string
}
export default function StampExtensionModal({ label, icon, beeDebug, stamp }: Props): ReactElement {
const [open, setOpen] = useState(false)
const [amount, setAmount] = useState('')
const [type, setType] = useState<'Topup' | 'Dilute'>('Topup')
const { enqueueSnackbar } = useSnackbar()
const handleClickOpen = (e: React.MouseEvent<HTMLButtonElement>) => {
setOpen(true)
e.stopPropagation()
}
const handleClose = () => {
setOpen(false)
}
const handleAction = async () => {
if (type === 'Topup') {
try {
await beeDebug.topUpBatch(stamp, amount)
enqueueSnackbar(`Successfully topped up stamp, your changes will appear soon`, { variant: 'success' })
} catch (error) {
enqueueSnackbar(`Failed to topup stamp: ${error || 'Unknown reason'}`, { variant: 'error' })
}
}
if (type === 'Dilute') {
try {
await beeDebug.diluteBatch(stamp, parseInt(amount, 10))
enqueueSnackbar(`Successfully diluted stamp, your changes will appear soon`, { variant: 'success' })
} catch (error) {
enqueueSnackbar(`Failed to dilute stamp: ${error || 'Unknown reason'}`, { variant: 'error' })
}
}
}
const handleChange = (event: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>) => {
setAmount(event.target.value)
}
return (
<div>
<Button variant="contained" onClick={handleClickOpen} startIcon={icon}>
{label}
</Button>
<Dialog open={open} onClose={handleClose} aria-labelledby="form-dialog-title">
<DialogTitle id="form-dialog-title">{label}</DialogTitle>
<DialogContent>
<SwarmSelect
label="Action"
defaultValue="Topup"
onChange={event => setType(event.target.value as 'Topup' | 'Dilute')}
options={[
{ value: 'Topup', label: 'Topup' },
{ value: 'Dilute', label: 'Dilute' },
]}
/>
<Input
autoFocus
margin="dense"
id="name"
type="text"
placeholder={type === 'Topup' ? 'Amount to add' : 'New depth to dilute'}
fullWidth
value={amount}
onChange={handleChange}
/>
</DialogContent>
<DialogActions>
<Button onClick={handleClose} color="primary">
Cancel
</Button>
<Button onClick={handleAction} color="primary">
{type}
</Button>
</DialogActions>
</Dialog>
</div>
)
}
+4
View File
@@ -30,6 +30,7 @@ interface Props {
formik?: boolean formik?: boolean
defaultValue?: string defaultValue?: string
placeholder?: string placeholder?: string
disabled?: boolean
} }
const useStyles = makeStyles((theme: Theme) => const useStyles = makeStyles((theme: Theme) =>
@@ -60,6 +61,7 @@ export function SwarmSelect({
onChange, onChange,
label, label,
placeholder, placeholder,
disabled = false,
}: Props): ReactElement { }: Props): ReactElement {
const classes = useStyles() const classes = useStyles()
@@ -69,6 +71,7 @@ export function SwarmSelect({
{label && <FormHelperText>{label}</FormHelperText>} {label && <FormHelperText>{label}</FormHelperText>}
<Field <Field
required required
disabled={disabled}
component={Select} component={Select}
name={name} name={name}
fullWidth fullWidth
@@ -94,6 +97,7 @@ export function SwarmSelect({
{label && <FormHelperText>{label}</FormHelperText>} {label && <FormHelperText>{label}</FormHelperText>}
<MuiSelect <MuiSelect
required required
disabled={disabled}
name={name} name={name}
fullWidth fullWidth
variant="outlined" variant="outlined"
+41
View File
@@ -0,0 +1,41 @@
import { BigNumber } from 'bignumber.js'
import { ReactElement, useContext } from 'react'
import Download from 'remixicon-react/DownloadLineIcon'
import WithdrawDepositModal from '../components/WithdrawDepositModal'
import { Context as BeeContext } from '../providers/Bee'
import { Context as SettingsContext } from '../providers/Settings'
interface Props {
onStarted: () => void
onFinished: () => void
}
export default function StakeModal({ onStarted, onFinished }: Props): ReactElement {
const { beeDebugApi } = useContext(SettingsContext)
const { refresh } = useContext(BeeContext)
return (
<WithdrawDepositModal
successMessage="Successfully deposited stake."
errorMessage="Error with depositing"
dialogMessage="Specify the amount of xBZZ you would like to stake. Your first stake must be at least 10 xBZZ. This will lock your tokens."
label="Stake"
icon={<Download size="1rem" />}
min={new BigNumber(0)}
action={async (amount: bigint) => {
if (!beeDebugApi) throw new Error('Bee Debug URL is not valid')
onStarted()
try {
await beeDebugApi.depositStake(amount.toString())
} finally {
refresh()
onFinished()
}
return 'unknown'
}}
/>
)
}
+16 -15
View File
@@ -1,6 +1,8 @@
import { BeeModes } from '@ethersphere/bee-js'
import { createStyles, makeStyles, Tab, Tabs, Theme } from '@material-ui/core' import { createStyles, makeStyles, Tab, Tabs, Theme } from '@material-ui/core'
import { ReactElement } from 'react' import { ReactElement, useContext } from 'react'
import { useNavigate } from 'react-router-dom' import { useNavigate } from 'react-router-dom'
import { Context } from '../../providers/Bee'
import { ACCOUNT_TABS } from '../../routes' import { ACCOUNT_TABS } from '../../routes'
const tabMap = { const tabMap = {
@@ -8,10 +10,11 @@ const tabMap = {
CHEQUEBOOK: 1, CHEQUEBOOK: 1,
STAMPS: 2, STAMPS: 2,
FEEDS: 3, FEEDS: 3,
STAKING: 4,
} }
interface Props { interface Props {
active: 'WALLET' | 'CHEQUEBOOK' | 'STAMPS' | 'FEEDS' active: 'WALLET' | 'CHEQUEBOOK' | 'STAMPS' | 'FEEDS' | 'STAKING'
} }
const useStyles = makeStyles((theme: Theme) => const useStyles = makeStyles((theme: Theme) =>
@@ -20,16 +23,12 @@ const useStyles = makeStyles((theme: Theme) =>
flexGrow: 1, flexGrow: 1,
marginBottom: theme.spacing(4), marginBottom: theme.spacing(4),
textTransform: 'none', textTransform: 'none',
marginLeft: theme.spacing(-0.25),
marginRight: theme.spacing(-0.25),
}, },
leftTab: { tab: {
marginRight: theme.spacing(0.125), marginLeft: theme.spacing(0.25),
}, marginRight: theme.spacing(0.25),
centerTab: {
marginLeft: theme.spacing(0.125),
marginRight: theme.spacing(0.125),
},
rightTab: {
marginLeft: theme.spacing(0.125),
}, },
}), }),
) )
@@ -37,6 +36,7 @@ const useStyles = makeStyles((theme: Theme) =>
export function AccountNavigation({ active }: Props): ReactElement { export function AccountNavigation({ active }: Props): ReactElement {
const classes = useStyles() const classes = useStyles()
const navigate = useNavigate() const navigate = useNavigate()
const { nodeInfo } = useContext(Context)
function onChange(event: React.ChangeEvent<Record<string, never>>, newValue: number) { function onChange(event: React.ChangeEvent<Record<string, never>>, newValue: number) {
navigate(ACCOUNT_TABS[newValue]) navigate(ACCOUNT_TABS[newValue])
@@ -45,10 +45,11 @@ export function AccountNavigation({ active }: Props): ReactElement {
return ( return (
<div className={classes.root}> <div className={classes.root}>
<Tabs value={tabMap[active]} onChange={onChange} variant="fullWidth"> <Tabs value={tabMap[active]} onChange={onChange} variant="fullWidth">
<Tab className={classes.leftTab} key="WALLET" label="Wallet" /> <Tab className={classes.tab} key="WALLET" label="Wallet" />
<Tab className={classes.centerTab} key="CHEQUEBOOK" label="Chequebook" /> <Tab className={classes.tab} key="CHEQUEBOOK" label="Chequebook" />
<Tab className={classes.centerTab} key="STAMPS" label="Stamps" /> <Tab className={classes.tab} key="STAMPS" label="Stamps" />
<Tab className={classes.rightTab} key="FEEDS" label="Feeds" /> <Tab className={classes.tab} key="FEEDS" label="Feeds" />
{nodeInfo?.beeMode === BeeModes.FULL ? <Tab className={classes.tab} key="STAKING" label="Staking" /> : null}
</Tabs> </Tabs>
</div> </div>
) )
@@ -0,0 +1,53 @@
import { ReactElement, useContext, useState } from 'react'
import ExpandableList from '../../../components/ExpandableList'
import ExpandableListItem from '../../../components/ExpandableListItem'
import ExpandableListItemActions from '../../../components/ExpandableListItemActions'
import { Loading } from '../../../components/Loading'
import TroubleshootConnectionCard from '../../../components/TroubleshootConnectionCard'
import StakeModal from '../../../containers/StakeModal'
import { CheckState, Context as BeeContext } from '../../../providers/Bee'
import { Context as BalanceContext } from '../../../providers/WalletBalance'
import { AccountNavigation } from '../AccountNavigation'
import { Header } from '../Header'
export function AccountStaking(): ReactElement {
const [loading, setLoading] = useState(false)
const { status, stake } = useContext(BeeContext)
const { balance } = useContext(BalanceContext)
if (status.all === CheckState.ERROR) return <TroubleshootConnectionCard />
function onStarted() {
setLoading(true)
}
function onFinished() {
setLoading(false)
}
return (
<>
<Header />
<AccountNavigation active="STAKING" />
<div>
{loading || stake?.toDecimal === undefined ? (
<Loading />
) : (
<ExpandableList label="Staking" defaultOpen>
<ExpandableListItem label="Staked BZZ" value={`${stake?.toSignificantDigits()} xBZZ`} />
{balance?.bzz ? (
<ExpandableListItem
label="Available xBZZ balance"
value={`${balance?.bzz.toSignificantDigits(4)} xBZZ`}
/>
) : null}
<ExpandableListItemActions>
<StakeModal onStarted={onStarted} onFinished={onFinished} />
</ExpandableListItemActions>
</ExpandableList>
)}
</div>
</>
)
}
+5 -8
View File
@@ -1,10 +1,11 @@
import { CircularProgress, Container, createStyles, makeStyles } from '@material-ui/core' import { CircularProgress, createStyles, makeStyles } from '@material-ui/core'
import { ReactElement, useContext, useEffect } from 'react' import { ReactElement, useContext, useEffect } from 'react'
import PlusSquare from 'remixicon-react/AddBoxLineIcon'
import { useNavigate } from 'react-router' import { useNavigate } from 'react-router'
import PlusSquare from 'remixicon-react/AddBoxLineIcon'
import { Loading } from '../../../components/Loading'
import { SwarmButton } from '../../../components/SwarmButton' import { SwarmButton } from '../../../components/SwarmButton'
import TroubleshootConnectionCard from '../../../components/TroubleshootConnectionCard' import TroubleshootConnectionCard from '../../../components/TroubleshootConnectionCard'
import { CheckState, Context as BeeContext } from '../../../providers/Bee' import { Context as BeeContext, CheckState } from '../../../providers/Bee'
import { Context as StampsContext } from '../../../providers/Stamps' import { Context as StampsContext } from '../../../providers/Stamps'
import { ROUTES } from '../../../routes' import { ROUTES } from '../../../routes'
import StampsTable from '../../stamps/StampsTable' import StampsTable from '../../stamps/StampsTable'
@@ -53,11 +54,7 @@ export function AccountStamps(): ReactElement {
<Header /> <Header />
<AccountNavigation active="STAMPS" /> <AccountNavigation active="STAMPS" />
<div className={classes.root}> <div className={classes.root}>
{error && ( {error && <Loading />}
<Container style={{ textAlign: 'center', padding: '50px' }}>
Error loading postage stamps details: {error.message}
</Container>
)}
{!error && ( {!error && (
<> <>
<div className={classes.actions}> <div className={classes.actions}>
+4 -2
View File
@@ -14,13 +14,15 @@ interface Props {
} }
export default function PeerBalances({ accounting, isLoadingUncashed, totalUncashed }: Props): ReactElement | null { export default function PeerBalances({ accounting, isLoadingUncashed, totalUncashed }: Props): ReactElement | null {
const uncashedPeers = accounting?.filter(({ uncashedAmount }) => uncashedAmount.toBigNumber.isGreaterThan('0')) || []
return ( return (
<ExpandableList <ExpandableList
label={`Peers (${accounting?.length || 0})`} label={`Peers (${uncashedPeers.length})`}
info={`${totalUncashed.toFixedDecimal()} xBZZ (uncashed)`} info={`${totalUncashed.toFixedDecimal()} xBZZ (uncashed)`}
> >
<ExpandableListItem label="Uncashed Amount Total" value={`${totalUncashed.toFixedDecimal()} xBZZ`} /> <ExpandableListItem label="Uncashed Amount Total" value={`${totalUncashed.toFixedDecimal()} xBZZ`} />
{accounting?.map(({ peer, balance, received, sent, uncashedAmount, total }) => ( {uncashedPeers.map(({ peer, balance, received, sent, uncashedAmount, total }) => (
<ExpandableList <ExpandableList
key={peer} key={peer}
label={`Peer ${peer.slice(0, 8)}[…]`} label={`Peer ${peer.slice(0, 8)}[…]`}
+2 -10
View File
@@ -1,12 +1,10 @@
import * as swarmCid from '@ethersphere/swarm-cid'
import { Box } from '@material-ui/core' import { Box } from '@material-ui/core'
import { ReactElement, useContext, useEffect, useState } from 'react' import { ReactElement, useContext, useEffect, useState } from 'react'
import X from 'remixicon-react/CloseLineIcon'
import { useNavigate, useParams } from 'react-router-dom' import { useNavigate, useParams } from 'react-router-dom'
import X from 'remixicon-react/CloseLineIcon'
import { DocumentationText } from '../../components/DocumentationText' import { DocumentationText } from '../../components/DocumentationText'
import ExpandableListItemActions from '../../components/ExpandableListItemActions' import ExpandableListItemActions from '../../components/ExpandableListItemActions'
import ExpandableListItemKey from '../../components/ExpandableListItemKey' import ExpandableListItemKey from '../../components/ExpandableListItemKey'
import ExpandableListItemLink from '../../components/ExpandableListItemLink'
import { HistoryHeader } from '../../components/HistoryHeader' import { HistoryHeader } from '../../components/HistoryHeader'
import { SwarmButton } from '../../components/SwarmButton' import { SwarmButton } from '../../components/SwarmButton'
import { Context as BeeContext } from '../../providers/Bee' import { Context as BeeContext } from '../../providers/Bee'
@@ -55,14 +53,8 @@ export function FeedSubpage(): ReactElement {
<UploadArea showHelp={false} uploadOrigin={{ origin: 'FEED', uuid }} /> <UploadArea showHelp={false} uploadOrigin={{ origin: 'FEED', uuid }} />
{available && identity.feedHash ? ( {available && identity.feedHash ? (
<> <>
<Box mb={0.25}>
<ExpandableListItemKey label="Feed hash" value={identity.feedHash} />
</Box>
<Box mb={4}> <Box mb={4}>
<ExpandableListItemLink <ExpandableListItemKey label="Feed hash" value={identity.feedHash} />
label="BZZ Link"
value={`https://${swarmCid.encodeFeedReference(identity.feedHash)}.bzz.link`}
/>
</Box> </Box>
</> </>
) : ( ) : (
+1 -12
View File
@@ -1,7 +1,6 @@
import * as swarmCid from '@ethersphere/swarm-cid' import { Utils } from '@ethersphere/bee-js'
import { Box } from '@material-ui/core' import { Box } from '@material-ui/core'
import { ReactElement } from 'react' import { ReactElement } from 'react'
import { Utils } from '@ethersphere/bee-js'
import { DocumentationText } from '../../components/DocumentationText' import { DocumentationText } from '../../components/DocumentationText'
import ExpandableListItemKey from '../../components/ExpandableListItemKey' import ExpandableListItemKey from '../../components/ExpandableListItemKey'
import ExpandableListItemLink from '../../components/ExpandableListItemLink' import ExpandableListItemLink from '../../components/ExpandableListItemLink'
@@ -19,16 +18,6 @@ export function AssetSummary({ isWebsite, reference }: Props): ReactElement {
<Box mb={4}> <Box mb={4}>
{isHash && <ExpandableListItemKey label="Swarm hash" value={reference} />} {isHash && <ExpandableListItemKey label="Swarm hash" value={reference} />}
{!isHash && <ExpandableListItemLink label="ENS" value={reference} />} {!isHash && <ExpandableListItemLink label="ENS" value={reference} />}
<ExpandableListItemLink
label="Share on Swarm Gateway"
value={`https://gateway.ethswarm.org/access/${reference}`}
/>
{isWebsite && isHash && (
<ExpandableListItemLink
label="BZZ Link"
value={`https://${swarmCid.encodeManifestReference(reference).toString()}.bzz.link`}
/>
)}
</Box> </Box>
<DocumentationText> <DocumentationText>
The Swarm Gateway is graciously provided by the Swarm Foundation. This service is under development and provided The Swarm Gateway is graciously provided by the Swarm Foundation. This service is under development and provided
+3 -5
View File
@@ -1,17 +1,17 @@
import { BeeModes, Utils } from '@ethersphere/bee-js' import { BeeModes, Utils } from '@ethersphere/bee-js'
import { ManifestJs } from '@ethersphere/manifest-js'
import { useSnackbar } from 'notistack' import { useSnackbar } from 'notistack'
import { ReactElement, useContext, useState } from 'react' import { ReactElement, useContext, useState } from 'react'
import { useNavigate } from 'react-router-dom' import { useNavigate } from 'react-router-dom'
import Search from 'remixicon-react/SearchLineIcon' import Search from 'remixicon-react/SearchLineIcon'
import ExpandableListItemInput from '../../components/ExpandableListItemInput' import ExpandableListItemInput from '../../components/ExpandableListItemInput'
import { History } from '../../components/History' import { History } from '../../components/History'
import { Context as BeeContext } from '../../providers/Bee'
import { Context as FileContext, defaultUploadOrigin } from '../../providers/File' import { Context as FileContext, defaultUploadOrigin } from '../../providers/File'
import { Context as SettingsContext } from '../../providers/Settings' import { Context as SettingsContext } from '../../providers/Settings'
import { Context as BeeContext } from '../../providers/Bee'
import { ROUTES } from '../../routes' import { ROUTES } from '../../routes'
import { recognizeEnsOrSwarmHash, regexpEns } from '../../utils' import { recognizeEnsOrSwarmHash, regexpEns } from '../../utils'
import { determineHistoryName, HISTORY_KEYS, putHistory } from '../../utils/local-storage' import { determineHistoryName, HISTORY_KEYS, putHistory } from '../../utils/local-storage'
import { ManifestJs } from '../../utils/manifest'
import { FileNavigation } from './FileNavigation' import { FileNavigation } from './FileNavigation'
export function Download(): ReactElement { export function Download(): ReactElement {
@@ -34,9 +34,7 @@ export function Download(): ReactElement {
) { ) {
setReferenceError(undefined) setReferenceError(undefined)
} else { } else {
setReferenceError( setReferenceError('Incorrect format of swarm hash. Expected 64 or 128 hexstring characters or ENS domain.')
'Incorrect format of swarm hash. Expected 64 or 128 hexstring characters, bzz.link url or ENS domain.',
)
} }
} }
+1 -1
View File
@@ -1,4 +1,3 @@
import { ManifestJs } from '@ethersphere/manifest-js'
import { Box, Typography } from '@material-ui/core' import { Box, Typography } from '@material-ui/core'
import { saveAs } from 'file-saver' import { saveAs } from 'file-saver'
import JSZip from 'jszip' import JSZip from 'jszip'
@@ -13,6 +12,7 @@ import { Context as BeeContext } from '../../providers/Bee'
import { Context as SettingsContext } from '../../providers/Settings' import { Context as SettingsContext } from '../../providers/Settings'
import { ROUTES } from '../../routes' import { ROUTES } from '../../routes'
import { determineHistoryName, HISTORY_KEYS, putHistory } from '../../utils/local-storage' import { determineHistoryName, HISTORY_KEYS, putHistory } from '../../utils/local-storage'
import { ManifestJs } from '../../utils/manifest'
import { AssetPreview } from './AssetPreview' import { AssetPreview } from './AssetPreview'
import { AssetSummary } from './AssetSummary' import { AssetSummary } from './AssetSummary'
import { DownloadActionBar } from './DownloadActionBar' import { DownloadActionBar } from './DownloadActionBar'
+4 -4
View File
@@ -7,11 +7,11 @@ import { HistoryHeader } from '../../components/HistoryHeader'
import { ProgressIndicator } from '../../components/ProgressIndicator' import { ProgressIndicator } from '../../components/ProgressIndicator'
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard' import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
import { META_FILE_NAME, PREVIEW_FILE_NAME } from '../../constants' import { META_FILE_NAME, PREVIEW_FILE_NAME } from '../../constants'
import { CheckState, Context as BeeContext } from '../../providers/Bee' import { Context as BeeContext, CheckState } from '../../providers/Bee'
import { Context as IdentityContext, Identity } from '../../providers/Feeds' import { Identity, Context as IdentityContext } from '../../providers/Feeds'
import { Context as FileContext } from '../../providers/File' import { Context as FileContext } from '../../providers/File'
import { Context as SettingsContext } from '../../providers/Settings' import { Context as SettingsContext } from '../../providers/Settings'
import { Context as StampsContext, EnrichedPostageBatch } from '../../providers/Stamps' import { EnrichedPostageBatch, Context as StampsContext } from '../../providers/Stamps'
import { ROUTES } from '../../routes' import { ROUTES } from '../../routes'
import { waitUntilStampUsable } from '../../utils' import { waitUntilStampUsable } from '../../utils'
import { detectIndexHtml, getAssetNameFromFiles, packageFile } from '../../utils/file' import { detectIndexHtml, getAssetNameFromFiles, packageFile } from '../../utils/file'
@@ -130,7 +130,7 @@ export function Upload(): ReactElement {
} }
beeApi beeApi
.uploadFiles(stamp.batchID, fls, { indexDocument }) .uploadFiles(stamp.batchID, fls, { indexDocument, deferred: true })
.then(hash => { .then(hash => {
putHistory(HISTORY_KEYS.UPLOAD_HISTORY, hash.reference, getAssetNameFromFiles(files)) putHistory(HISTORY_KEYS.UPLOAD_HISTORY, hash.reference, getAssetNameFromFiles(files))
+8 -5
View File
@@ -1,22 +1,22 @@
import { Box, Tooltip, Typography } from '@material-ui/core' import { Box, Tooltip, Typography } from '@material-ui/core'
import { Wallet } from 'ethers'
import { useSnackbar } from 'notistack' import { useSnackbar } from 'notistack'
import { ReactElement, useContext, useEffect, useState } from 'react' import { ReactElement, useContext, useEffect, useState } from 'react'
import { useNavigate } from 'react-router'
import Check from 'remixicon-react/CheckLineIcon' import Check from 'remixicon-react/CheckLineIcon'
import X from 'remixicon-react/CloseLineIcon' import X from 'remixicon-react/CloseLineIcon'
import { useNavigate } from 'react-router'
import { Wallet } from 'ethers'
import ExpandableListItem from '../../components/ExpandableListItem' import ExpandableListItem from '../../components/ExpandableListItem'
import ExpandableListItemActions from '../../components/ExpandableListItemActions' import ExpandableListItemActions from '../../components/ExpandableListItemActions'
import ExpandableListItemKey from '../../components/ExpandableListItemKey' import ExpandableListItemKey from '../../components/ExpandableListItemKey'
import { HistoryHeader } from '../../components/HistoryHeader' import { HistoryHeader } from '../../components/HistoryHeader'
import { Loading } from '../../components/Loading' import { Loading } from '../../components/Loading'
import { SwarmButton } from '../../components/SwarmButton' import { SwarmButton } from '../../components/SwarmButton'
import { Context as BalanceProvider } from '../../providers/WalletBalance' import { Token } from '../../models/Token'
import { Context as TopUpContext } from '../../providers/TopUp'
import { Context as SettingsContext } from '../../providers/Settings' import { Context as SettingsContext } from '../../providers/Settings'
import { Context as TopUpContext } from '../../providers/TopUp'
import { Context as BalanceProvider } from '../../providers/WalletBalance'
import { createGiftWallet } from '../../utils/desktop' import { createGiftWallet } from '../../utils/desktop'
import { ResolvedWallet } from '../../utils/wallet' import { ResolvedWallet } from '../../utils/wallet'
import { Token } from '../../models/Token'
const GIFT_WALLET_FUND_DAI_AMOUNT = Token.fromDecimal('0.1', 18) const GIFT_WALLET_FUND_DAI_AMOUNT = Token.fromDecimal('0.1', 18)
const GIFT_WALLET_FUND_BZZ_AMOUNT = Token.fromDecimal('0.5', 16) const GIFT_WALLET_FUND_BZZ_AMOUNT = Token.fromDecimal('0.5', 16)
@@ -31,6 +31,9 @@ export default function Index(): ReactElement {
useEffect(() => { useEffect(() => {
async function mapGiftWallets() { async function mapGiftWallets() {
if (!rpcProvider) {
return
}
const results = [] const results = []
for (const giftWallet of giftWallets) { for (const giftWallet of giftWallets) {
results.push(await ResolvedWallet.make(giftWallet, rpcProvider)) results.push(await ResolvedWallet.make(giftWallet, rpcProvider))
+113 -81
View File
@@ -1,11 +1,11 @@
import { PostageBatchOptions } from '@ethersphere/bee-js' import { PostageBatchOptions } from '@ethersphere/bee-js'
import { Box, Grid, Typography } from '@material-ui/core' import { Box, Grid, Typography } from '@material-ui/core'
import BigNumber from 'bignumber.js' import BigNumber from 'bignumber.js'
import { Form, Formik, FormikHelpers } from 'formik'
import { useSnackbar } from 'notistack' import { useSnackbar } from 'notistack'
import { ReactElement, useContext } from 'react' import { ReactElement, useContext, useEffect, useState } from 'react'
import Check from 'remixicon-react/CheckLineIcon' import Check from 'remixicon-react/CheckLineIcon'
import { SwarmButton } from '../../components/SwarmButton' import { SwarmButton } from '../../components/SwarmButton'
import { SwarmSelect } from '../../components/SwarmSelect'
import { SwarmTextInput } from '../../components/SwarmTextInput' import { SwarmTextInput } from '../../components/SwarmTextInput'
import { Context as BeeContext } from '../../providers/Bee' import { Context as BeeContext } from '../../providers/Bee'
import { Context as SettingsContext } from '../../providers/Settings' import { Context as SettingsContext } from '../../providers/Settings'
@@ -19,18 +19,6 @@ import {
} from '../../utils' } from '../../utils'
import { getHumanReadableFileSize } from '../../utils/file' import { getHumanReadableFileSize } from '../../utils/file'
interface FormValues {
depth?: string
amount?: string
label?: string
}
type FormErrors = Partial<FormValues>
const initialFormValues: FormValues = {
depth: '',
amount: '',
label: '',
}
interface Props { interface Props {
onFinished: () => void onFinished: () => void
} }
@@ -40,6 +28,13 @@ export function PostageStampCreation({ onFinished }: Props): ReactElement {
const { refresh } = useContext(StampsContext) const { refresh } = useContext(StampsContext)
const { beeDebugApi } = useContext(SettingsContext) const { beeDebugApi } = useContext(SettingsContext)
const [depthInput, setDepthInput] = useState<string>('')
const [amountInput, setAmountInput] = useState<string>('')
const [labelInput, setLabelInput] = useState('')
const [immutable, setImmutable] = useState(false)
const [errors, setErrors] = useState<Record<string, string>>({})
const [submitting, setSubmitting] = useState(false)
const { enqueueSnackbar } = useSnackbar() const { enqueueSnackbar } = useSnackbar()
function getFileSize(depth: number): string { function getFileSize(depth: number): string {
@@ -76,6 +71,73 @@ export function PostageStampCreation({ onFinished }: Props): ReactElement {
return `${price.toSignificantDigits()} xBZZ` return `${price.toSignificantDigits()} xBZZ`
} }
async function submit() {
try {
// This is really just a typeguard, the validation pretty much guarantees these will have the right values
if (!depthInput || !amountInput) {
return
}
if (!beeDebugApi) {
return
}
setSubmitting(true)
const amount = BigInt(amountInput)
const depth = Number.parseInt(depthInput)
const options: PostageBatchOptions = {
waitForUsable: false,
label: labelInput || undefined,
immutableFlag: immutable,
}
const batchId = await beeDebugApi.createPostageBatch(amount.toString(), depth, options)
await waitUntilStampExists(batchId, beeDebugApi)
await refresh()
onFinished()
} catch (e) {
console.error(e) // eslint-disable-line
enqueueSnackbar(`Error: ${(e as Error).message}`, { variant: 'error' })
}
setSubmitting(false)
}
useEffect(() => {
function validate() {
const errors: Record<string, string> = {}
if (!depthInput) {
errors.depth = 'Required field'
} else {
const depth = new BigNumber(depthInput)
if (!depth.isInteger()) {
errors.depth = 'Depth must be an integer'
} else if (depth.isLessThan(17)) {
errors.depth = 'Minimal depth is 17'
} else if (depth.isGreaterThan(255)) {
errors.depth = 'Depth has to be at most 255'
}
}
if (!amountInput) {
errors.amount = 'Required field'
} else {
const amount = new BigNumber(amountInput)
if (!amount.isInteger()) {
errors.amount = 'Amount must be an integer'
} else if (amount.isLessThanOrEqualTo(0)) {
errors.amount = 'Amount must be greater than 0'
}
}
return errors
}
setErrors(validate())
}, [depthInput, amountInput])
return ( return (
<> <>
<Box mb={4}> <Box mb={4}>
@@ -92,102 +154,72 @@ export function PostageStampCreation({ onFinished }: Props): ReactElement {
. .
</Typography> </Typography>
</Box> </Box>
<Formik
initialValues={initialFormValues}
onSubmit={async (values: FormValues, actions: FormikHelpers<FormValues>) => {
try {
// This is really just a typeguard, the validation pretty much guarantees these will have the right values
if (!values.depth || !values.amount) return
if (!beeDebugApi) return
const amount = BigInt(values.amount)
const depth = Number.parseInt(values.depth)
const options: PostageBatchOptions = { waitForUsable: false, label: values.label || undefined }
const batchId = await beeDebugApi.createPostageBatch(amount.toString(), depth, options)
await waitUntilStampExists(batchId, beeDebugApi)
actions.resetForm()
await refresh()
onFinished()
} catch (e) {
console.error(e) // eslint-disable-line
enqueueSnackbar(`Error: ${(e as Error).message}`, { variant: 'error' })
actions.setSubmitting(false)
}
}}
validate={(values: FormValues) => {
const errors: FormErrors = {}
// Depth
if (!values.depth) errors.depth = 'Required field'
else {
const depth = new BigNumber(values.depth)
if (!depth.isInteger()) errors.depth = 'Depth must be an integer'
else if (depth.isLessThan(17)) errors.depth = 'Minimal depth is 17'
else if (depth.isGreaterThan(255)) errors.depth = 'Depth has to be at most 255'
}
// Amount
if (!values.amount) errors.amount = 'Required field'
else {
const amount = new BigNumber(values.amount)
if (!amount.isInteger()) errors.amount = 'Amount must be an integer'
else if (amount.isLessThanOrEqualTo(0)) errors.amount = 'Amount must be greater than 0'
}
return errors
}}
>
{({ submitForm, isValid, isSubmitting, values, errors }) => (
<Form>
<Box mb={2}> <Box mb={2}>
<SwarmTextInput name="depth" label="Depth" formik /> <SwarmTextInput name="depth" label="Depth" onChange={event => setDepthInput(event.target.value)} />
<Box mt={0.25} sx={{ bgcolor: '#f6f6f6' }} p={2}> <Box mt={0.25} sx={{ bgcolor: '#f6f6f6' }} p={2}>
<Grid container justifyContent="space-between"> <Grid container justifyContent="space-between">
<Typography>Corresponding file size</Typography> <Typography>Corresponding file size</Typography>
<Typography> <Typography>{!errors.depth && depthInput ? getFileSize(parseInt(depthInput, 10)) : '-'}</Typography>
{!errors.depth && values.depth ? getFileSize(parseInt(values.depth, 10)) : '-'}
</Typography>
</Grid> </Grid>
</Box> </Box>
</Box> </Box>
<Box mb={2}> <Box mb={2}>
<SwarmTextInput name="amount" label="Amount" formik /> <SwarmTextInput name="amount" label="Amount" onChange={event => setAmountInput(event.target.value)} />
<Box mt={0.25} sx={{ bgcolor: '#f6f6f6' }} p={2}> <Box mt={0.25} sx={{ bgcolor: '#f6f6f6' }} p={2}>
<Grid container justifyContent="space-between"> <Grid container justifyContent="space-between">
<Typography>Corresponding TTL (Time to live)</Typography> <Typography>Corresponding TTL (Time to live)</Typography>
<Typography> <Typography>{!errors.amount && amountInput ? getTtl(Number.parseInt(amountInput, 10)) : '-'}</Typography>
{!errors.amount && values.amount ? getTtl(Number.parseInt(values.amount, 10)) : '-'}
</Typography>
</Grid> </Grid>
</Box> </Box>
</Box> </Box>
<Box mb={2}> <Box mb={2}>
<SwarmTextInput name="label" label="Label" optional formik /> <SwarmTextInput name="label" label="Label" optional onChange={event => setLabelInput(event.target.value)} />
</Box>
<Box mb={2}>
<SwarmSelect
label="Immutable"
defaultValue="No"
onChange={event => setImmutable(event.target.value === 'Yes')}
options={[
{ value: 'Yes', label: 'Yes' },
{ value: 'No', label: 'No' },
]}
/>
<Box mt={0.25} sx={{ bgcolor: '#f6f6f6' }} p={2}>
<Grid container justifyContent="space-between">
{immutable && (
<Typography>
Once an immutable stamp is maxed out, it disallows further content uploads, thereby safeguarding your
previously uploaded content from unintentional overwriting.
</Typography>
)}
{!immutable && (
<Typography>
When a mutable stamp reaches full capacity, it still permits new content uploads. However, this comes
with the caveat of overwriting previously uploaded content associated with the same stamp.
</Typography>
)}
</Grid>
</Box>
</Box> </Box>
<Box mb={4} sx={{ bgcolor: '#fcf2e8' }} p={2}> <Box mb={4} sx={{ bgcolor: '#fcf2e8' }} p={2}>
<Grid container justifyContent="space-between"> <Grid container justifyContent="space-between">
<Typography>Indicative Price</Typography> <Typography>Indicative Price</Typography>
<Typography> <Typography>
{!errors.amount && !errors.depth && values.amount && values.depth {!errors.amount && !errors.depth && amountInput && depthInput
? getPrice(parseInt(values.depth, 10), BigInt(values.amount)) ? getPrice(parseInt(depthInput, 10), BigInt(amountInput))
: '-'} : '-'}
</Typography> </Typography>
</Grid> </Grid>
</Box> </Box>
<SwarmButton <SwarmButton
disabled={isSubmitting || !isValid || !values.amount || !values.depth} disabled={submitting || Object.keys(errors).length > 0}
onClick={submitForm} onClick={submit}
iconType={Check} iconType={Check}
loading={isSubmitting} loading={submitting}
> >
Buy New Stamp Buy New Stamp
</SwarmButton> </SwarmButton>
</Form>
)}
</Formik>
</> </>
) )
} }
+19 -2
View File
@@ -1,8 +1,12 @@
import type { ReactElement } from 'react' import { ReactElement, useContext } from 'react'
import TimerFlash from 'remixicon-react/TimerFlashFillIcon'
import ExpandableElement from '../../components/ExpandableElement' import ExpandableElement from '../../components/ExpandableElement'
import ExpandableList from '../../components/ExpandableList' import ExpandableList from '../../components/ExpandableList'
import ExpandableListItem from '../../components/ExpandableListItem' import ExpandableListItem from '../../components/ExpandableListItem'
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
import ExpandableListItemKey from '../../components/ExpandableListItemKey' import ExpandableListItemKey from '../../components/ExpandableListItemKey'
import StampExtensionModal from '../../components/StampExtensionModal'
import { Context } from '../../providers/Settings'
import { EnrichedPostageBatch } from '../../providers/Stamps' import { EnrichedPostageBatch } from '../../providers/Stamps'
import { secondsToTimeString } from '../../utils' import { secondsToTimeString } from '../../utils'
import { getHumanReadableFileSize } from '../../utils/file' import { getHumanReadableFileSize } from '../../utils/file'
@@ -13,7 +17,11 @@ interface Props {
} }
function StampsTable({ postageStamps }: Props): ReactElement | null { function StampsTable({ postageStamps }: Props): ReactElement | null {
if (postageStamps === null) return null const { beeDebugApi } = useContext(Context)
if (!postageStamps || !beeDebugApi) {
return null
}
return ( return (
<ExpandableList label="Postage Stamps" defaultOpen> <ExpandableList label="Postage Stamps" defaultOpen>
@@ -38,7 +46,16 @@ function StampsTable({ postageStamps }: Props): ReactElement | null {
<ExpandableListItem label="Label" value={stamp.label} /> <ExpandableListItem label="Label" value={stamp.label} />
<ExpandableListItem label="Usable" value={stamp.usable ? 'yes' : 'no'} /> <ExpandableListItem label="Usable" value={stamp.usable ? 'yes' : 'no'} />
<ExpandableListItem label="Exists" value={stamp.exists ? 'yes' : 'no'} /> <ExpandableListItem label="Exists" value={stamp.exists ? 'yes' : 'no'} />
<ExpandableListItem label="Immutable" value={stamp.immutableFlag ? 'yes' : 'no'} />
<ExpandableListItem label="Purchase Block Number" value={stamp.blockNumber} /> <ExpandableListItem label="Purchase Block Number" value={stamp.blockNumber} />
<ExpandableListItemActions>
<StampExtensionModal
label="Topup & Dilute"
icon={<TimerFlash size="1rem" />}
beeDebug={beeDebugApi}
stamp={stamp.batchID}
/>
</ExpandableListItemActions>
</> </>
} }
> >
+11 -1
View File
@@ -9,10 +9,11 @@ import {
Peer, Peer,
Topology, Topology,
} from '@ethersphere/bee-js' } from '@ethersphere/bee-js'
import { createContext, ReactChild, ReactElement, useContext, useEffect, useState } from 'react' import { ReactChild, ReactElement, createContext, useContext, useEffect, useState } from 'react'
import semver from 'semver' import semver from 'semver'
import PackageJson from '../../package.json' import PackageJson from '../../package.json'
import { useLatestBeeRelease } from '../hooks/apiHooks' import { useLatestBeeRelease } from '../hooks/apiHooks'
import { BzzToken } from '../models/BzzToken'
import { Token } from '../models/Token' import { Token } from '../models/Token'
import type { Balance, ChequebookBalance, Settlements } from '../types' import type { Balance, ChequebookBalance, Settlements } from '../types'
import { Context as SettingsContext } from './Settings' import { Context as SettingsContext } from './Settings'
@@ -62,6 +63,7 @@ interface ContextInterface {
chequebookAddress: ChequebookAddressResponse | null chequebookAddress: ChequebookAddressResponse | null
peers: Peer[] | null peers: Peer[] | null
chequebookBalance: ChequebookBalance | null chequebookBalance: ChequebookBalance | null
stake: BzzToken | null
peerBalances: Balance[] | null peerBalances: Balance[] | null
peerCheques: LastChequesResponse | null peerCheques: LastChequesResponse | null
settlements: Settlements | null settlements: Settlements | null
@@ -98,6 +100,7 @@ const initialValues: ContextInterface = {
nodeInfo: null, nodeInfo: null,
topology: null, topology: null,
chequebookAddress: null, chequebookAddress: null,
stake: null,
peers: null, peers: null,
chequebookBalance: null, chequebookBalance: null,
peerBalances: null, peerBalances: null,
@@ -225,6 +228,7 @@ export function Provider({ children, isDesktop }: Props): ReactElement {
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)
const [chequebookBalance, setChequebookBalance] = useState<ChequebookBalance | null>(null) const [chequebookBalance, setChequebookBalance] = useState<ChequebookBalance | null>(null)
const [stake, setStake] = useState<BzzToken | null>(null)
const [peerBalances, setPeerBalances] = useState<Balance[] | null>(null) const [peerBalances, setPeerBalances] = useState<Balance[] | null>(null)
const [peerCheques, setPeerCheques] = useState<LastChequesResponse | null>(null) const [peerCheques, setPeerCheques] = useState<LastChequesResponse | null>(null)
const [settlements, setSettlements] = useState<Settlements | null>(null) const [settlements, setSettlements] = useState<Settlements | null>(null)
@@ -388,6 +392,11 @@ export function Provider({ children, isDesktop }: Props): ReactElement {
.then(setChequebookBalance) .then(setChequebookBalance)
.catch(() => setChequebookBalance(null)), .catch(() => setChequebookBalance(null)),
beeDebugApi
.getStake({ timeout: TIMEOUT })
.then(stake => setStake(new BzzToken(stake)))
.catch(() => setStake(null)),
// Peer balances // Peer balances
peerBalanceWrapper() peerBalanceWrapper()
.then(setPeerBalances) .then(setPeerBalances)
@@ -471,6 +480,7 @@ export function Provider({ children, isDesktop }: Props): ReactElement {
chequebookAddress, chequebookAddress,
peers, peers,
chequebookBalance, chequebookBalance,
stake,
peerBalances, peerBalances,
peerCheques, peerCheques,
settlements, settlements,
+4 -4
View File
@@ -1,8 +1,8 @@
import { Bee, BeeDebug } from '@ethersphere/bee-js' import { Bee, BeeDebug } from '@ethersphere/bee-js'
import { providers } from 'ethers' import { providers } from 'ethers'
import { createContext, ReactNode, ReactElement, useEffect, useState } from 'react' import { ReactElement, ReactNode, createContext, useEffect, useState } from 'react'
import { useGetBeeConfig } from '../hooks/apiHooks'
import { DEFAULT_BEE_API_HOST, DEFAULT_BEE_DEBUG_API_HOST, DEFAULT_RPC_URL } from '../constants' import { DEFAULT_BEE_API_HOST, DEFAULT_BEE_DEBUG_API_HOST, DEFAULT_RPC_URL } from '../constants'
import { useGetBeeConfig } from '../hooks/apiHooks'
const LocalStorageKeys = { const LocalStorageKeys = {
providerUrl: 'json-rpc-provider', providerUrl: 'json-rpc-provider',
@@ -18,7 +18,7 @@ interface ContextInterface {
isDesktop: boolean isDesktop: boolean
desktopUrl: string desktopUrl: string
rpcProviderUrl: string rpcProviderUrl: string
rpcProvider: providers.JsonRpcProvider rpcProvider: providers.JsonRpcProvider | null
cors: string | null cors: string | null
dataDir: string | null dataDir: string | null
ensResolver: string | null ensResolver: string | null
@@ -42,7 +42,7 @@ const initialValues: ContextInterface = {
desktopUrl: window.location.origin, desktopUrl: window.location.origin,
setAndPersistJsonRpcProvider: async () => {}, // eslint-disable-line setAndPersistJsonRpcProvider: async () => {}, // eslint-disable-line
rpcProviderUrl: '', rpcProviderUrl: '',
rpcProvider: new providers.JsonRpcProvider(''), rpcProvider: null,
cors: null, cors: null,
dataDir: null, dataDir: null,
ensResolver: null, ensResolver: null,
+5 -1
View File
@@ -2,6 +2,7 @@ import { ReactElement, useContext } from 'react'
import { Route, Routes } from 'react-router-dom' import { Route, Routes } from 'react-router-dom'
import { AccountChequebook } from './pages/account/chequebook/AccountChequebook' import { AccountChequebook } from './pages/account/chequebook/AccountChequebook'
import { AccountFeeds } from './pages/account/feeds/AccountFeeds' import { AccountFeeds } from './pages/account/feeds/AccountFeeds'
import { AccountStaking } from './pages/account/staking/AccountStaking'
import { AccountStamps } from './pages/account/stamps/AccountStamps' import { AccountStamps } from './pages/account/stamps/AccountStamps'
import { AccountWallet } from './pages/account/wallet/AccountWallet' import { AccountWallet } from './pages/account/wallet/AccountWallet'
import CreateNewFeed from './pages/feeds/CreateNewFeed' import CreateNewFeed from './pages/feeds/CreateNewFeed'
@@ -14,10 +15,10 @@ import { UploadLander } from './pages/files/UploadLander'
import GiftCards from './pages/gift-code' import GiftCards from './pages/gift-code'
import Info from './pages/info' import Info from './pages/info'
import LightModeRestart from './pages/restart/LightModeRestart' import LightModeRestart from './pages/restart/LightModeRestart'
import TopUp from './pages/top-up'
import Settings from './pages/settings' import Settings from './pages/settings'
import { CreatePostageStampPage } from './pages/stamps/CreatePostageStampPage' import { CreatePostageStampPage } from './pages/stamps/CreatePostageStampPage'
import Status from './pages/status' import Status from './pages/status'
import TopUp from './pages/top-up'
import { BankCardTopUpIndex } from './pages/top-up/BankCardTopUpIndex' 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'
@@ -51,6 +52,7 @@ export enum ROUTES {
ACCOUNT_FEEDS_UPDATE = '/account/feeds/update/:hash', ACCOUNT_FEEDS_UPDATE = '/account/feeds/update/:hash',
ACCOUNT_FEEDS_VIEW = '/account/feeds/:uuid', ACCOUNT_FEEDS_VIEW = '/account/feeds/:uuid',
ACCOUNT_INVITATIONS = '/account/invitations', ACCOUNT_INVITATIONS = '/account/invitations',
ACCOUNT_STAKING = '/account/staking',
} }
export const ACCOUNT_TABS = [ export const ACCOUNT_TABS = [
@@ -58,6 +60,7 @@ export const ACCOUNT_TABS = [
ROUTES.ACCOUNT_CHEQUEBOOK, ROUTES.ACCOUNT_CHEQUEBOOK,
ROUTES.ACCOUNT_STAMPS, ROUTES.ACCOUNT_STAMPS,
ROUTES.ACCOUNT_FEEDS, ROUTES.ACCOUNT_FEEDS,
ROUTES.ACCOUNT_STAKING,
] ]
const BaseRouter = (): ReactElement => { const BaseRouter = (): ReactElement => {
@@ -88,6 +91,7 @@ const BaseRouter = (): ReactElement => {
<Route path={ROUTES.ACCOUNT_FEEDS_NEW} element={<CreateNewFeed />} /> <Route path={ROUTES.ACCOUNT_FEEDS_NEW} element={<CreateNewFeed />} />
<Route path={ROUTES.ACCOUNT_FEEDS_UPDATE} element={<UpdateFeed />} /> <Route path={ROUTES.ACCOUNT_FEEDS_UPDATE} element={<UpdateFeed />} />
<Route path={ROUTES.ACCOUNT_FEEDS_VIEW} element={<FeedSubpage />} /> <Route path={ROUTES.ACCOUNT_FEEDS_VIEW} element={<FeedSubpage />} />
<Route path={ROUTES.ACCOUNT_STAKING} element={<AccountStaking />} />
{isDesktop && <Route path={ROUTES.ACCOUNT_INVITATIONS} element={<GiftCards />} />} {isDesktop && <Route path={ROUTES.ACCOUNT_INVITATIONS} element={<GiftCards />} />}
</Routes> </Routes>
) )
+3 -6
View File
@@ -1,4 +1,4 @@
import { BatchId, BeeDebug, BeeResponseError, PostageBatch } from '@ethersphere/bee-js' import { BatchId, BeeDebug, PostageBatch } from '@ethersphere/bee-js'
import { decodeCid } from '@ethersphere/swarm-cid' import { decodeCid } from '@ethersphere/swarm-cid'
import { BigNumber } from 'bignumber.js' import { BigNumber } from 'bignumber.js'
import { BZZ_LINK_DOMAIN } from '../constants' import { BZZ_LINK_DOMAIN } from '../constants'
@@ -258,11 +258,8 @@ async function waitForStamp(
const stamp = await beeDebug.getPostageBatch(batchId) const stamp = await beeDebug.getPostageBatch(batchId)
if (stamp[field]) return stamp if (stamp[field]) return stamp
} catch (e) { } catch {
// TODO: Workaround for https://github.com/ethersphere/bee/issues/3300 // ignore
if ((e as BeeResponseError).message !== 'Bad Request: cannot get batch') {
throw e
}
} }
await sleepMs(pollingFrequency) await sleepMs(pollingFrequency)
+149
View File
@@ -0,0 +1,149 @@
import { Bee, Utils } from '@ethersphere/bee-js'
import { loadAllNodes, MantarayNode, MetadataMapping, Reference } from 'mantaray-js'
interface ValueNode extends MantarayNode {
getEntry: Reference
}
/**
* The ASCII code of the character `/`.
*
* This prefix of the root node holds metadata such as the index document.
*/
const INDEX_DOCUMENT_FORK_PREFIX = '47'
export class ManifestJs {
private bee: Bee
constructor(bee: Bee) {
this.bee = bee
}
/**
* Tests whether a given Swarm hash is a valid mantaray manifest
*/
public async isManifest(hash: string): Promise<boolean> {
try {
const data = await this.bee.downloadData(hash)
const node = new MantarayNode()
node.deserialize(data)
return true
} catch {
return false
}
}
/**
* Retrieves `website-index-document` from a Swarm hash, or `null` if it is not present
*/
public async getIndexDocumentPath(hash: string): Promise<string | null> {
const metadata = await this.getRootSlashMetadata(hash)
if (!metadata) {
return null
}
return metadata['website-index-document'] || null
}
/**
* Retrieves all paths with the associated hashes from a Swarm manifest
*/
public async getHashes(hash: string): Promise<Record<string, string>> {
const data = await this.bee.downloadData(hash)
const node = new MantarayNode()
node.deserialize(data)
await loadAllNodes(this.load.bind(this), node)
const result = {}
this.extractHashes(result, node)
return result
}
/**
* Resolves an arbitrary Swarm feed manifest to its latest update reference.
* @returns `/bzz` root manifest hash, or `Promise<null>` if hash is not a feed manifest
* @throws in case of network errors or bad input
*/
public async resolveFeedManifest(hash: string): Promise<string | null> {
const metadata = await this.getRootSlashMetadata(hash)
if (!metadata) {
return null
}
const owner = metadata['swarm-feed-owner']
const topic = metadata['swarm-feed-topic']
if (!owner || !topic) {
return null
}
const reader = this.bee.makeFeedReader('sequence', topic, owner)
const response = await reader.download()
return response.reference
}
private async getRootSlashMetadata(hash: string): Promise<MetadataMapping | null> {
const data = await this.bee.downloadData(hash)
const node = new MantarayNode()
node.deserialize(data)
if (!node.forks) {
return null
}
const fork = node.forks[INDEX_DOCUMENT_FORK_PREFIX]
if (!fork) {
return null
}
const metadataNode = fork.node
if (!metadataNode.IsWithMetadataType()) {
return null
}
const metadata = metadataNode.getMetadata
if (!metadata) {
return null
}
return metadata
}
private extractHashes(result: Record<string, string>, node: MantarayNode, prefix = ''): void {
if (!node.forks) {
return
}
for (const fork of Object.values(node.forks)) {
const path = prefix + this.bytesToUtf8(fork.prefix)
const childNode = fork.node
if (this.isValueNode(childNode, path)) {
result[path] = Utils.bytesToHex(childNode.getEntry)
}
if (childNode.isEdgeType()) {
this.extractHashes(result, childNode, path)
}
}
}
private load(reference: Uint8Array) {
return this.bee.downloadData(Utils.bytesToHex(reference))
}
private bytesToUtf8(bytes: Uint8Array): string {
return new TextDecoder('utf-8').decode(bytes)
}
private isValueNode(node: MantarayNode, path: string): node is ValueNode {
return !this.isRootSlash(node, path) && node.isValueType() && typeof node.getEntry !== 'undefined'
}
private isRootSlash(node: MantarayNode, path: string): boolean {
return path === '/' && node.IsWithMetadataType()
}
}