Compare commits
33 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 145ebc1232 | |||
| bfe38e96b4 | |||
| 86978b7e99 | |||
| efd3158b2b | |||
| 07561aaed2 | |||
| 1e2face10e | |||
| b6b9914548 | |||
| 87b0b71cc6 | |||
| 8114fa7d73 | |||
| e454a7eba0 | |||
| 3784b29f14 | |||
| a67be7a31e | |||
| 23dea07f6e | |||
| 906a457ae5 | |||
| 0a69409077 | |||
| 9026e65b1f | |||
| a21e60f2d8 | |||
| 39f59fcc07 | |||
| 75967b2bf5 | |||
| ecaf2054fc | |||
| 9b5b2973cb | |||
| 36da804ca4 | |||
| 8f51aa9e89 | |||
| 0a31a04148 | |||
| eb9e309c8b | |||
| 5d0fbf705d | |||
| cd332c4dfd | |||
| 224fe4ce25 | |||
| 4736e82da5 | |||
| 8baecb783f | |||
| bf24d61584 | |||
| 01351a0380 | |||
| d0b3f1abee |
@@ -0,0 +1,13 @@
|
|||||||
|
# See config in https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates
|
||||||
|
|
||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
# Enable version updates for npm
|
||||||
|
- package-ecosystem: 'npm'
|
||||||
|
# Look for `package.json` and `lock` files in the `root` directory
|
||||||
|
directory: '/'
|
||||||
|
# Check the npm registry for updates every day (weekdays)
|
||||||
|
schedule:
|
||||||
|
interval: 'weekly'
|
||||||
|
# Always increase the version in package.json as well (for patch versions by default only package-lock.json i updated)
|
||||||
|
versioning-strategy: increase
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
# Always validate the PR title, and ignore the commits
|
||||||
|
titleOnly: true
|
||||||
@@ -52,6 +52,9 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
CI: true
|
CI: true
|
||||||
|
|
||||||
|
- name: Dependency check
|
||||||
|
run: npm run depcheck
|
||||||
|
|
||||||
- name: Types check
|
- name: Types check
|
||||||
run: npm run check:types
|
run: npm run check:types
|
||||||
|
|
||||||
@@ -62,7 +65,7 @@ jobs:
|
|||||||
uses: ethersphere/update-supported-bee-action@v1
|
uses: ethersphere/update-supported-bee-action@v1
|
||||||
if: github.ref == 'refs/heads/master'
|
if: github.ref == 'refs/heads/master'
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.REPO_GHA_PAT }}
|
token: ${{ secrets.GHA_PAT_BASIC }}
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: npm run build
|
run: npm run build
|
||||||
@@ -71,15 +74,18 @@ jobs:
|
|||||||
run: npm run build:component
|
run: npm run build:component
|
||||||
|
|
||||||
- name: Create preview
|
- name: Create preview
|
||||||
uses: ethersphere/beeload-action@v1
|
uses: ethersphere/swarm-actions/pr-preview@v0
|
||||||
with:
|
with:
|
||||||
bee-url: https://unlimited.gateway.ethswarm.org
|
bee-url: https://unlimited.gateway.ethswarm.org
|
||||||
preview: 'true'
|
token: ${{ secrets.GHA_PAT_BASIC }}
|
||||||
token: ${{ secrets.REPO_GHA_PAT }}
|
error-document: index.html
|
||||||
extra-params: '-H "${{ secrets.GATEWAY_AUTHORIZATION_HEADER }}"'
|
headers: "${{ secrets.GATEWAY_AUTHORIZATION_HEADER }}"
|
||||||
|
|
||||||
- name: Upload to testnet
|
- name: Upload to testnet
|
||||||
|
uses: ethersphere/swarm-actions/upload-dir@v0
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
uses: ethersphere/beeload-action@v1
|
|
||||||
with:
|
with:
|
||||||
|
index-document: index.html
|
||||||
|
error-document: index.html
|
||||||
|
dir: ./build
|
||||||
bee-url: https://api.gateway.testnet.ethswarm.org
|
bee-url: https://api.gateway.testnet.ethswarm.org
|
||||||
|
|||||||
@@ -11,10 +11,10 @@ jobs:
|
|||||||
release-please:
|
release-please:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: GoogleCloudPlatform/release-please-action@v2
|
- uses: GoogleCloudPlatform/release-please-action@v3
|
||||||
id: release
|
id: release
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.REPO_GHA_PAT }}
|
token: ${{ secrets.GHA_PAT_BASIC }}
|
||||||
release-type: node
|
release-type: node
|
||||||
package-name: bee-dashboard
|
package-name: bee-dashboard
|
||||||
bump-minor-pre-major: true
|
bump-minor-pre-major: true
|
||||||
|
|||||||
@@ -1,5 +1,39 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [0.15.0](https://github.com/ethersphere/bee-dashboard/compare/v0.14.0...v0.15.0) (2022-05-16)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add aditional information to the stamps overview ([#349](https://github.com/ethersphere/bee-dashboard/issues/349)) ([23dea07](https://github.com/ethersphere/bee-dashboard/commit/23dea07f6e53da91f87078749f07bd95c9e65983))
|
||||||
|
* add bee desktop toolkit ([#311](https://github.com/ethersphere/bee-dashboard/issues/311)) ([ecaf205](https://github.com/ethersphere/bee-dashboard/commit/ecaf2054fc5aaa5fa4f1d0b3fb2753af9d9b233e))
|
||||||
|
* add bee-desktop settings capabilities ([#323](https://github.com/ethersphere/bee-dashboard/issues/323)) ([87b0b71](https://github.com/ethersphere/bee-dashboard/commit/87b0b71cc63098a5d886ff47d52715c250d1b659))
|
||||||
|
* support for bzz.link cids when downloading files ([#350](https://github.com/ethersphere/bee-dashboard/issues/350)) ([3784b29](https://github.com/ethersphere/bee-dashboard/commit/3784b29f148b706d5bc40b69b5ae898efa2c1990))
|
||||||
|
* wait for postage stamp to be usable when bying it ([#352](https://github.com/ethersphere/bee-dashboard/issues/352)) ([1e2face](https://github.com/ethersphere/bee-dashboard/commit/1e2face10e93818f281526d8245f84834e5ecb86))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* app crash caused by inputing non-number characters ([#347](https://github.com/ethersphere/bee-dashboard/issues/347)) ([a67be7a](https://github.com/ethersphere/bee-dashboard/commit/a67be7a31ec88e9ce9c7764ec4523496c157d08a))
|
||||||
|
* connection health indicator values to reflect the current network conditions ([#353](https://github.com/ethersphere/bee-dashboard/issues/353)) ([07561aa](https://github.com/ethersphere/bee-dashboard/commit/07561aaed2ce7f7ffd7ecfd8ae8b5190cc9893bc))
|
||||||
|
* nested directory upload preserves the directory structure ([#365](https://github.com/ethersphere/bee-dashboard/issues/365)) ([86978b7](https://github.com/ethersphere/bee-dashboard/commit/86978b7e999584173b082eef86074af698523752))
|
||||||
|
* remove restrictions on postage stamp label ([#354](https://github.com/ethersphere/bee-dashboard/issues/354)) ([b6b9914](https://github.com/ethersphere/bee-dashboard/commit/b6b9914548a0ac00ed293ea35490ce38e9d6adaa))
|
||||||
|
* show current postage stamp price per block ([#348](https://github.com/ethersphere/bee-dashboard/issues/348)) ([906a457](https://github.com/ethersphere/bee-dashboard/commit/906a457ae5a8683f82d218759fd66dc1b7c9a220))
|
||||||
|
|
||||||
|
## [0.14.0](https://www.github.com/ethersphere/bee-dashboard/compare/v0.13.0...v0.14.0) (2022-04-14)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add hook that detects if the bee-dashboard is run within bee-desktop ([#334](https://www.github.com/ethersphere/bee-dashboard/issues/334)) ([eb9e309](https://www.github.com/ethersphere/bee-dashboard/commit/eb9e309c8bc0327d137f190d6873618cb215fece))
|
||||||
|
* detect bee mode and enable/disable status checks accordingly ([#318](https://www.github.com/ethersphere/bee-dashboard/issues/318)) ([8baecb7](https://www.github.com/ethersphere/bee-dashboard/commit/8baecb783f1574af1cd1f17738efae4b0ac9f0c8))
|
||||||
|
* optional status checks (e.g. connected peers > 0 or funded chequebook) ([#331](https://www.github.com/ethersphere/bee-dashboard/issues/331)) ([5d0fbf7](https://www.github.com/ethersphere/bee-dashboard/commit/5d0fbf705dfed6738980c751a9654199d60a3787))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* postage stamp price and TTL calculation ([#305](https://www.github.com/ethersphere/bee-dashboard/issues/305)) ([d0b3f1a](https://www.github.com/ethersphere/bee-dashboard/commit/d0b3f1abee7ea017bdd05954d5fadafb67365efd))
|
||||||
|
|
||||||
## [0.13.0](https://www.github.com/ethersphere/bee-dashboard/compare/v0.12.0...v0.13.0) (2022-01-28)
|
## [0.13.0](https://www.github.com/ethersphere/bee-dashboard/compare/v0.12.0...v0.13.0) (2022-01-28)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -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.4.1-238867f1<!-- SUPPORTED_BEE_END -->**.
|
This project is intended to be used with **Bee version <!-- SUPPORTED_BEE_START -->1.5.1-d0a77598<!-- 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).
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
module.exports = {
|
||||||
|
extends: ['@commitlint/config-conventional'],
|
||||||
|
rules: {
|
||||||
|
'body-max-line-length': [0, 'always', Infinity], // disable commit body length restriction
|
||||||
|
},
|
||||||
|
}
|
||||||
Generated
+1903
-427
File diff suppressed because it is too large
Load Diff
+14
-8
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ethersphere/bee-dashboard",
|
"name": "@ethersphere/bee-dashboard",
|
||||||
"version": "0.13.0",
|
"version": "0.15.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,7 +26,7 @@
|
|||||||
"url": "https://github.com/ethersphere/bee-dashboard.git"
|
"url": "https://github.com/ethersphere/bee-dashboard.git"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@ethersphere/bee-js": "3.1.0",
|
"@ethersphere/bee-js": "^3.3.4",
|
||||||
"@ethersphere/manifest-js": "1.1.0",
|
"@ethersphere/manifest-js": "1.1.0",
|
||||||
"@ethersphere/swarm-cid": "^0.1.0",
|
"@ethersphere/swarm-cid": "^0.1.0",
|
||||||
"@material-ui/core": "4.12.3",
|
"@material-ui/core": "4.12.3",
|
||||||
@@ -35,6 +35,7 @@
|
|||||||
"axios": "0.24.0",
|
"axios": "0.24.0",
|
||||||
"bignumber.js": "9.0.1",
|
"bignumber.js": "9.0.1",
|
||||||
"ethereumjs-wallet": "^1.0.2",
|
"ethereumjs-wallet": "^1.0.2",
|
||||||
|
"ethers": "^5.6.4",
|
||||||
"file-saver": "^2.0.5",
|
"file-saver": "^2.0.5",
|
||||||
"formik": "2.2.9",
|
"formik": "2.2.9",
|
||||||
"formik-material-ui": "3.0.1",
|
"formik-material-ui": "3.0.1",
|
||||||
@@ -59,18 +60,21 @@
|
|||||||
"@babel/plugin-proposal-class-properties": "7.16.0",
|
"@babel/plugin-proposal-class-properties": "7.16.0",
|
||||||
"@babel/plugin-transform-runtime": "7.16.4",
|
"@babel/plugin-transform-runtime": "7.16.4",
|
||||||
"@babel/preset-env": "7.16.4",
|
"@babel/preset-env": "7.16.4",
|
||||||
"@babel/preset-react": "7.16.0",
|
"@babel/preset-react": "7.16.7",
|
||||||
"@babel/preset-typescript": "7.16.0",
|
"@babel/preset-typescript": "7.16.0",
|
||||||
"@commitlint/config-conventional": "14.1.0",
|
"@commitlint/config-conventional": "14.1.0",
|
||||||
"@testing-library/jest-dom": "5.15.0",
|
"@testing-library/jest-dom": "5.16.4",
|
||||||
"@testing-library/react": "12.1.2",
|
"@testing-library/react": "12.1.2",
|
||||||
|
"@testing-library/react-hooks": "^8.0.0",
|
||||||
|
"@types/cors": "^2.8.12",
|
||||||
|
"@types/express": "^4.17.13",
|
||||||
"@types/file-saver": "2.0.4",
|
"@types/file-saver": "2.0.4",
|
||||||
"@types/jest": "27.0.2",
|
"@types/jest": "27.0.2",
|
||||||
"@types/qrcode.react": "1.0.2",
|
"@types/qrcode.react": "1.0.2",
|
||||||
"@types/react": "17.0.34",
|
"@types/react": "17.0.34",
|
||||||
"@types/react-copy-to-clipboard": "5.0.2",
|
"@types/react-copy-to-clipboard": "5.0.2",
|
||||||
"@types/react-dom": "17.0.11",
|
"@types/react-dom": "17.0.11",
|
||||||
"@types/react-router": "5.1.17",
|
"@types/react-router": "5.1.18",
|
||||||
"@types/react-router-dom": "5.3.2",
|
"@types/react-router-dom": "5.3.2",
|
||||||
"@types/react-syntax-highlighter": "13.5.2",
|
"@types/react-syntax-highlighter": "13.5.2",
|
||||||
"@types/semver": "7.3.9",
|
"@types/semver": "7.3.9",
|
||||||
@@ -80,9 +84,10 @@
|
|||||||
"babel-loader": "8.1.0",
|
"babel-loader": "8.1.0",
|
||||||
"babel-plugin-syntax-dynamic-import": "6.18.0",
|
"babel-plugin-syntax-dynamic-import": "6.18.0",
|
||||||
"babel-plugin-tsconfig-paths": "1.0.2",
|
"babel-plugin-tsconfig-paths": "1.0.2",
|
||||||
"depcheck": "1.4.2",
|
"cors": "^2.8.5",
|
||||||
|
"depcheck": "^1.4.3",
|
||||||
"eslint": "7.24.0",
|
"eslint": "7.24.0",
|
||||||
"eslint-config-prettier": "8.2.0",
|
"eslint-config-prettier": "8.5.0",
|
||||||
"eslint-config-react-app": "6.0.0",
|
"eslint-config-react-app": "6.0.0",
|
||||||
"eslint-plugin-flowtype": "5.10.0",
|
"eslint-plugin-flowtype": "5.10.0",
|
||||||
"eslint-plugin-import": "2.25.2",
|
"eslint-plugin-import": "2.25.2",
|
||||||
@@ -92,10 +97,11 @@
|
|||||||
"eslint-plugin-react": "7.23.2",
|
"eslint-plugin-react": "7.23.2",
|
||||||
"eslint-plugin-react-hooks": "4.2.0",
|
"eslint-plugin-react-hooks": "4.2.0",
|
||||||
"eslint-plugin-testing-library": "3.10.2",
|
"eslint-plugin-testing-library": "3.10.2",
|
||||||
|
"express": "^4.17.3",
|
||||||
"file-loader": "6.2.0",
|
"file-loader": "6.2.0",
|
||||||
"prettier": "2.4.1",
|
"prettier": "2.4.1",
|
||||||
"react-scripts": "4.0.3",
|
"react-scripts": "4.0.3",
|
||||||
"ts-node": "^10.4.0",
|
"ts-node": "^10.7.0",
|
||||||
"typescript": "4.4.4",
|
"typescript": "4.4.4",
|
||||||
"web-vitals": "2.1.2",
|
"web-vitals": "2.1.2",
|
||||||
"webpack": "4.44.2",
|
"webpack": "4.44.2",
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ interface Props {
|
|||||||
confirmLabelDisabled?: boolean
|
confirmLabelDisabled?: boolean
|
||||||
loading?: boolean
|
loading?: boolean
|
||||||
onChange?: (value: string) => void
|
onChange?: (value: string) => void
|
||||||
onConfirm: (value: string) => void
|
onConfirm?: (value: string) => void
|
||||||
mapperFn?: (value: string) => string
|
mapperFn?: (value: string) => string
|
||||||
locked?: boolean
|
locked?: boolean
|
||||||
}
|
}
|
||||||
@@ -138,7 +138,9 @@ export default function ExpandableListItemKey({
|
|||||||
}
|
}
|
||||||
loading={loading}
|
loading={loading}
|
||||||
iconType={Search}
|
iconType={Search}
|
||||||
onClick={() => onConfirm(inputValue)}
|
onClick={() => {
|
||||||
|
if (onConfirm) onConfirm(inputValue)
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{confirmLabel || 'Save'}
|
{confirmLabel || 'Save'}
|
||||||
</SwarmButton>
|
</SwarmButton>
|
||||||
|
|||||||
@@ -66,11 +66,9 @@ export default function SideBarItem({ path }: Props): ReactElement {
|
|||||||
disableRipple
|
disableRipple
|
||||||
>
|
>
|
||||||
<ListItemIcon style={{ marginLeft: '30px' }}>
|
<ListItemIcon style={{ marginLeft: '30px' }}>
|
||||||
<StatusIcon isOk={status.all} isLoading={isLoading} />
|
<StatusIcon checkState={status.all} isLoading={isLoading} />
|
||||||
</ListItemIcon>
|
</ListItemIcon>
|
||||||
<ListItemText
|
<ListItemText primary={<Typography className={classes.smallerText}>{`Node ${status.all}`}</Typography>} />
|
||||||
primary={<Typography className={classes.smallerText}>{`Node ${status.all ? 'OK' : 'Error'}`}</Typography>}
|
|
||||||
/>
|
|
||||||
<ListItemIcon className={classes.icon}>
|
<ListItemIcon className={classes.icon}>
|
||||||
{status.all ? null : <ArrowRight className={classes.iconSmall} />}
|
{status.all ? null : <ArrowRight className={classes.iconSmall} />}
|
||||||
</ListItemIcon>
|
</ListItemIcon>
|
||||||
|
|||||||
@@ -1,23 +1,40 @@
|
|||||||
import type { ReactElement } from 'react'
|
import type { ReactElement } from 'react'
|
||||||
import { CircularProgress } from '@material-ui/core'
|
import { CircularProgress } from '@material-ui/core'
|
||||||
|
import { CheckState } from '../providers/Bee'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
isOk: boolean
|
checkState: CheckState
|
||||||
isLoading?: boolean
|
isLoading?: boolean
|
||||||
size?: number | string
|
size?: number | string
|
||||||
className?: string
|
className?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function StatusIcon({ isOk, size, className, isLoading }: Props): ReactElement {
|
export default function StatusIcon({ checkState, size, className, isLoading }: Props): ReactElement {
|
||||||
const s = size || '1rem'
|
const s = size || '1rem'
|
||||||
|
|
||||||
if (isLoading) return <CircularProgress size={s} className={className} />
|
if (isLoading) return <CircularProgress size={s} className={className} />
|
||||||
|
|
||||||
|
let backgroundColor: string
|
||||||
|
switch (checkState) {
|
||||||
|
case CheckState.OK:
|
||||||
|
backgroundColor = '#1de600'
|
||||||
|
break
|
||||||
|
case CheckState.WARNING:
|
||||||
|
backgroundColor = 'orange'
|
||||||
|
break
|
||||||
|
case CheckState.ERROR:
|
||||||
|
backgroundColor = '#ff3a52'
|
||||||
|
break
|
||||||
|
default:
|
||||||
|
// Default is error
|
||||||
|
backgroundColor = '#ff3a52'
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<span
|
<span
|
||||||
className={className}
|
className={className}
|
||||||
style={{
|
style={{
|
||||||
backgroundColor: isOk ? '#1de600' : '#ff3a52',
|
backgroundColor,
|
||||||
height: s,
|
height: s,
|
||||||
width: s,
|
width: s,
|
||||||
borderRadius: '50%',
|
borderRadius: '50%',
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ interface Props {
|
|||||||
disabled?: boolean
|
disabled?: boolean
|
||||||
loading?: boolean
|
loading?: boolean
|
||||||
cancel?: boolean
|
cancel?: boolean
|
||||||
|
variant?: 'text' | 'contained' | 'outlined'
|
||||||
}
|
}
|
||||||
|
|
||||||
const useStyles = makeStyles(() =>
|
const useStyles = makeStyles(() =>
|
||||||
@@ -49,6 +50,7 @@ export function SwarmButton({
|
|||||||
disabled,
|
disabled,
|
||||||
loading,
|
loading,
|
||||||
cancel,
|
cancel,
|
||||||
|
variant = 'contained',
|
||||||
}: Props): ReactElement {
|
}: Props): ReactElement {
|
||||||
const classes = useStyles()
|
const classes = useStyles()
|
||||||
|
|
||||||
@@ -76,7 +78,7 @@ export function SwarmButton({
|
|||||||
onClick()
|
onClick()
|
||||||
event.currentTarget.blur()
|
event.currentTarget.blur()
|
||||||
}}
|
}}
|
||||||
variant="contained"
|
variant={variant}
|
||||||
startIcon={icon}
|
startIcon={icon}
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ interface Props {
|
|||||||
password?: boolean
|
password?: boolean
|
||||||
formik?: boolean
|
formik?: boolean
|
||||||
optional?: boolean
|
optional?: boolean
|
||||||
|
defaultValue?: string
|
||||||
onChange?: (event: ChangeEvent<HTMLTextAreaElement>) => void
|
onChange?: (event: ChangeEvent<HTMLTextAreaElement>) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -32,7 +33,15 @@ const useStyles = makeStyles((theme: Theme) =>
|
|||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
|
|
||||||
export function SwarmTextInput({ name, label, password, optional, formik, onChange }: Props): ReactElement {
|
export function SwarmTextInput({
|
||||||
|
name,
|
||||||
|
label,
|
||||||
|
password,
|
||||||
|
optional,
|
||||||
|
formik,
|
||||||
|
onChange,
|
||||||
|
defaultValue,
|
||||||
|
}: Props): ReactElement {
|
||||||
const classes = useStyles()
|
const classes = useStyles()
|
||||||
|
|
||||||
if (formik) {
|
if (formik) {
|
||||||
@@ -46,7 +55,7 @@ export function SwarmTextInput({ name, label, password, optional, formik, onChan
|
|||||||
fullWidth
|
fullWidth
|
||||||
variant="filled"
|
variant="filled"
|
||||||
className={classes.field}
|
className={classes.field}
|
||||||
defaultValue=""
|
defaultValue={defaultValue || ''}
|
||||||
InputProps={{ disableUnderline: true }}
|
InputProps={{ disableUnderline: true }}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
@@ -60,7 +69,7 @@ export function SwarmTextInput({ name, label, password, optional, formik, onChan
|
|||||||
fullWidth
|
fullWidth
|
||||||
variant="filled"
|
variant="filled"
|
||||||
className={classes.field}
|
className={classes.field}
|
||||||
defaultValue=""
|
defaultValue={defaultValue || ''}
|
||||||
onChange={onChange}
|
onChange={onChange}
|
||||||
InputProps={{ disableUnderline: true }}
|
InputProps={{ disableUnderline: true }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ class Config {
|
|||||||
public readonly BEE_DOCS_HOST: string
|
public readonly BEE_DOCS_HOST: string
|
||||||
public readonly BEE_DISCORD_HOST: string
|
public readonly BEE_DISCORD_HOST: string
|
||||||
public readonly GITHUB_REPO_URL: string
|
public readonly GITHUB_REPO_URL: string
|
||||||
|
public readonly BEE_DESKTOP_URL: string
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
this.BEE_API_HOST =
|
this.BEE_API_HOST =
|
||||||
@@ -21,6 +22,7 @@ class Config {
|
|||||||
this.BEE_DISCORD_HOST = getProcessEnv('REACT_APP_BEE_DISCORD_HOST') || 'https://discord.gg/eKr9XPv7'
|
this.BEE_DISCORD_HOST = getProcessEnv('REACT_APP_BEE_DISCORD_HOST') || 'https://discord.gg/eKr9XPv7'
|
||||||
this.GITHUB_REPO_URL =
|
this.GITHUB_REPO_URL =
|
||||||
getProcessEnv('REACT_APP_BEE_GITHUB_REPO_URL') || 'https://api.github.com/repos/ethersphere/bee'
|
getProcessEnv('REACT_APP_BEE_GITHUB_REPO_URL') || 'https://api.github.com/repos/ethersphere/bee'
|
||||||
|
this.BEE_DESKTOP_URL = getProcessEnv('REACT_APP_BEE_DESKTOP_URL') || window.location.origin
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
export const META_FILE_NAME = '.swarmgatewaymeta.json'
|
export const META_FILE_NAME = '.swarmgatewaymeta.json'
|
||||||
export const PREVIEW_FILE_NAME = '.swarmgatewaypreview.jpeg'
|
export const PREVIEW_FILE_NAME = '.swarmgatewaypreview.jpeg'
|
||||||
export const PREVIEW_DIMENSIONS = { maxWidth: 250, maxHeight: 175 }
|
export const PREVIEW_DIMENSIONS = { maxWidth: 250, maxHeight: 175 }
|
||||||
|
export const BZZ_LINK_DOMAIN = process.env.REACT_APP_BZZ_LINK_DOMAIN || 'bzz.link'
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
import { renderHook } from '@testing-library/react-hooks'
|
||||||
|
import express from 'express'
|
||||||
|
import cors from 'cors'
|
||||||
|
import type { Server } from 'http'
|
||||||
|
import { useIsBeeDesktop } from './apiHooks'
|
||||||
|
|
||||||
|
interface AddressInfo {
|
||||||
|
address: string
|
||||||
|
family: string
|
||||||
|
port: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export function mockServer(data: Record<string | number | symbol, string>): Promise<Server> {
|
||||||
|
const app = express()
|
||||||
|
app.use(cors())
|
||||||
|
|
||||||
|
app.get('/info', (req, res) => {
|
||||||
|
res.send(data)
|
||||||
|
})
|
||||||
|
|
||||||
|
return new Promise(resolve => {
|
||||||
|
const server = app.listen(() => {
|
||||||
|
resolve(server)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
let serverCorrect: Server
|
||||||
|
let serverWrong: Server
|
||||||
|
|
||||||
|
let serverCorrectURL: string
|
||||||
|
let serverWrongURL: string
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
serverCorrect = await mockServer({ name: 'bee-desktop' })
|
||||||
|
const portServerCorrect = (serverCorrect.address() as AddressInfo).port
|
||||||
|
serverCorrectURL = `http://localhost:${portServerCorrect}`
|
||||||
|
|
||||||
|
serverWrong = await mockServer({ foo: 'bar' })
|
||||||
|
const portServerWrong = (serverWrong.address() as AddressInfo).port
|
||||||
|
serverWrongURL = `http://localhost:${portServerWrong}`
|
||||||
|
})
|
||||||
|
|
||||||
|
afterAll(async () => {
|
||||||
|
await new Promise(resolve => serverCorrect.close(resolve))
|
||||||
|
await new Promise(resolve => serverWrong.close(resolve))
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('useIsBeeDesktop', () => {
|
||||||
|
it('should fail when connected to wrong server', async () => {
|
||||||
|
const { result, waitFor } = renderHook(() => useIsBeeDesktop({ BEE_DESKTOP_URL: serverWrongURL }))
|
||||||
|
|
||||||
|
expect(result.current.isLoading).toBe(true)
|
||||||
|
expect(result.current.isBeeDesktop).toBe(false)
|
||||||
|
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(result.current.isLoading).toBe(false)
|
||||||
|
})
|
||||||
|
expect(result.current.isBeeDesktop).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should return isBeeDesktop true when connected to bee-desktop', async () => {
|
||||||
|
const { result, waitFor } = renderHook(() => useIsBeeDesktop({ BEE_DESKTOP_URL: serverCorrectURL }))
|
||||||
|
|
||||||
|
expect(result.current.isLoading).toBe(true)
|
||||||
|
expect(result.current.isBeeDesktop).toBe(false)
|
||||||
|
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(result.current.isLoading).toBe(false)
|
||||||
|
})
|
||||||
|
expect(result.current.isBeeDesktop).toBe(true)
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { config } from '../config'
|
import { config } from '../config'
|
||||||
|
import { getJson } from '../utils/net'
|
||||||
|
|
||||||
export interface LatestBeeReleaseHook {
|
export interface LatestBeeReleaseHook {
|
||||||
latestBeeRelease: LatestBeeRelease | null
|
latestBeeRelease: LatestBeeRelease | null
|
||||||
@@ -8,6 +9,90 @@ export interface LatestBeeReleaseHook {
|
|||||||
error: Error | null
|
error: Error | null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface IsBeeDesktopHook {
|
||||||
|
isBeeDesktop: boolean
|
||||||
|
isLoading: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Config {
|
||||||
|
BEE_DESKTOP_URL: string
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Detect if the dashboard is run within bee-desktop
|
||||||
|
*
|
||||||
|
* @returns isBeeDesktop true if this is run within bee-desktop
|
||||||
|
*/
|
||||||
|
export const useIsBeeDesktop = (conf: Config = config): IsBeeDesktopHook => {
|
||||||
|
const [isBeeDesktop, setIsBeeDesktop] = useState<boolean>(false)
|
||||||
|
const [isLoading, setLoading] = useState<boolean>(true)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
axios
|
||||||
|
.get(`${conf.BEE_DESKTOP_URL}/info`)
|
||||||
|
.then(res => {
|
||||||
|
if (res.data?.name === 'bee-desktop') setIsBeeDesktop(true)
|
||||||
|
else setIsBeeDesktop(false)
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
setIsBeeDesktop(false)
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
setLoading(false)
|
||||||
|
})
|
||||||
|
}, [conf])
|
||||||
|
|
||||||
|
return { isBeeDesktop, isLoading }
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface BeeConfig {
|
||||||
|
'api-addr': string
|
||||||
|
'debug-api-addr': string
|
||||||
|
'debug-api-enable': boolean
|
||||||
|
password: string
|
||||||
|
'swap-enable': boolean
|
||||||
|
'swap-initial-deposit': bigint
|
||||||
|
mainnet: boolean
|
||||||
|
'full-node': boolean
|
||||||
|
'chain-enable': boolean
|
||||||
|
'cors-allowed-origins': string
|
||||||
|
'resolver-options': string
|
||||||
|
'use-postage-snapshot': boolean
|
||||||
|
'data-dir': string
|
||||||
|
transaction: string
|
||||||
|
'block-hash': string
|
||||||
|
'swap-endpoint'?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface GetBeeConfig {
|
||||||
|
config: BeeConfig | null
|
||||||
|
isLoading: boolean
|
||||||
|
error: Error | null
|
||||||
|
}
|
||||||
|
|
||||||
|
export const useGetBeeConfig = (conf: Config = config): GetBeeConfig => {
|
||||||
|
const [beeConfig, setBeeConfig] = useState<BeeConfig | null>(null)
|
||||||
|
const [isLoading, setLoading] = useState<boolean>(true)
|
||||||
|
const [error, setError] = useState<Error | null>(null)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
getJson<BeeConfig>(`${conf.BEE_DESKTOP_URL}/config`)
|
||||||
|
.then(beeConf => {
|
||||||
|
setBeeConfig(beeConf)
|
||||||
|
setError(null)
|
||||||
|
})
|
||||||
|
.catch((err: Error) => {
|
||||||
|
setError(err)
|
||||||
|
setBeeConfig(null)
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
setLoading(false)
|
||||||
|
})
|
||||||
|
}, [conf])
|
||||||
|
|
||||||
|
return { config: beeConfig, isLoading, error }
|
||||||
|
}
|
||||||
|
|
||||||
export const useLatestBeeRelease = (): LatestBeeReleaseHook => {
|
export const useLatestBeeRelease = (): LatestBeeReleaseHook => {
|
||||||
const [latestBeeRelease, setLatestBeeRelease] = useState<LatestBeeRelease | null>(null)
|
const [latestBeeRelease, setLatestBeeRelease] = useState<LatestBeeRelease | null>(null)
|
||||||
const [isLoadingLatestBeeRelease, setLoading] = useState<boolean>(false)
|
const [isLoadingLatestBeeRelease, setLoading] = useState<boolean>(false)
|
||||||
|
|||||||
@@ -57,4 +57,25 @@ export class Token {
|
|||||||
toFixedDecimal(digits = 7): string {
|
toFixedDecimal(digits = 7): string {
|
||||||
return this.toDecimal.toFixed(digits)
|
return this.toDecimal.toFixed(digits)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
toSignificantDigits(digits = 4): string {
|
||||||
|
const asString = this.toDecimal.toFixed(16)
|
||||||
|
|
||||||
|
let indexOfSignificantDigit = -1
|
||||||
|
let reachedDecimalPoint = false
|
||||||
|
|
||||||
|
for (let i = 0; i < asString.length; i++) {
|
||||||
|
const char = asString[i]
|
||||||
|
|
||||||
|
if (char === '.') {
|
||||||
|
reachedDecimalPoint = true
|
||||||
|
indexOfSignificantDigit = i + 1
|
||||||
|
} else if (reachedDecimalPoint && char !== '0') {
|
||||||
|
indexOfSignificantDigit = i
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return asString.slice(0, indexOfSignificantDigit + digits)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { ReactElement, useContext } from 'react'
|
|||||||
|
|
||||||
import PeerBalances from './PeerBalances'
|
import PeerBalances from './PeerBalances'
|
||||||
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
|
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
|
||||||
import { Context as BeeContext } from '../../providers/Bee'
|
import { CheckState, Context as BeeContext } from '../../providers/Bee'
|
||||||
import { Context as SettingsContext } from '../../providers/Settings'
|
import { Context as SettingsContext } from '../../providers/Settings'
|
||||||
import { useAccounting } from '../../hooks/accounting'
|
import { useAccounting } from '../../hooks/accounting'
|
||||||
import ExpandableList from '../../components/ExpandableList'
|
import ExpandableList from '../../components/ExpandableList'
|
||||||
@@ -19,7 +19,7 @@ export default function Accounting(): ReactElement {
|
|||||||
|
|
||||||
const { accounting, totalUncashed, isLoadingUncashed } = useAccounting(beeDebugApi, settlements, peerBalances)
|
const { accounting, totalUncashed, isLoadingUncashed } = useAccounting(beeDebugApi, settlements, peerBalances)
|
||||||
|
|
||||||
if (!status.all) return <TroubleshootConnectionCard />
|
if (status.all === CheckState.ERROR) return <TroubleshootConnectionCard />
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import ExpandableListItemActions from '../../components/ExpandableListItemAction
|
|||||||
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
||||||
import { SwarmButton } from '../../components/SwarmButton'
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
|
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
|
||||||
import { Context as BeeContext } from '../../providers/Bee'
|
import { CheckState, Context as BeeContext } from '../../providers/Bee'
|
||||||
import { Context as IdentityContext, Identity } from '../../providers/Feeds'
|
import { Context as IdentityContext, Identity } from '../../providers/Feeds'
|
||||||
import { ROUTES } from '../../routes'
|
import { ROUTES } from '../../routes'
|
||||||
import { formatEnum } from '../../utils'
|
import { formatEnum } from '../../utils'
|
||||||
@@ -60,7 +60,7 @@ export default function Feeds(): ReactElement {
|
|||||||
setShowDelete(true)
|
setShowDelete(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!status.all) return <TroubleshootConnectionCard />
|
if (status.all === CheckState.ERROR) return <TroubleshootConnectionCard />
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { History } from '../../components/History'
|
|||||||
import { Context, defaultUploadOrigin } from '../../providers/File'
|
import { Context, defaultUploadOrigin } from '../../providers/File'
|
||||||
import { Context as SettingsContext } from '../../providers/Settings'
|
import { Context as SettingsContext } from '../../providers/Settings'
|
||||||
import { ROUTES } from '../../routes'
|
import { ROUTES } from '../../routes'
|
||||||
import { extractSwarmHash } from '../../utils'
|
import { recognizeSwarmHash } from '../../utils'
|
||||||
import { determineHistoryName, HISTORY_KEYS, putHistory } from '../../utils/local-storage'
|
import { determineHistoryName, HISTORY_KEYS, putHistory } from '../../utils/local-storage'
|
||||||
import { FileNavigation } from './FileNavigation'
|
import { FileNavigation } from './FileNavigation'
|
||||||
|
|
||||||
@@ -71,20 +71,6 @@ export function Download(): ReactElement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function recognizeSwarmHash(value: string) {
|
|
||||||
if (value.length < 64) {
|
|
||||||
return value
|
|
||||||
}
|
|
||||||
|
|
||||||
const hash = extractSwarmHash(value)
|
|
||||||
|
|
||||||
if (hash) {
|
|
||||||
return hash
|
|
||||||
}
|
|
||||||
|
|
||||||
return value
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<FileNavigation active="DOWNLOAD" />
|
<FileNavigation active="DOWNLOAD" />
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { DocumentationText } from '../../components/DocumentationText'
|
|||||||
import { HistoryHeader } from '../../components/HistoryHeader'
|
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 { Context as BeeContext } from '../../providers/Bee'
|
import { CheckState, Context as BeeContext } from '../../providers/Bee'
|
||||||
import { Context as IdentityContext, Identity } from '../../providers/Feeds'
|
import { Context as IdentityContext, Identity } 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'
|
||||||
@@ -43,7 +43,7 @@ export function Upload(): ReactElement {
|
|||||||
refresh()
|
refresh()
|
||||||
}, []) // eslint-disable-line react-hooks/exhaustive-deps
|
}, []) // eslint-disable-line react-hooks/exhaustive-deps
|
||||||
|
|
||||||
if (!status.all) return <TroubleshootConnectionCard />
|
if (status.all === CheckState.ERROR) return <TroubleshootConnectionCard />
|
||||||
|
|
||||||
if (!files.length) {
|
if (!files.length) {
|
||||||
setFiles([])
|
setFiles([])
|
||||||
@@ -71,7 +71,7 @@ export function Upload(): ReactElement {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
let fls = files.map(packageFile) // Apart from packaging, this is needed to not modify the original files array as it can trigger effects
|
let fls: FilePath[] = files.map(f => packageFile(f)) // Apart from packaging, this is needed to not modify the original files array as it can trigger effects
|
||||||
let indexDocument: string | undefined = undefined // This means we assume it's folder
|
let indexDocument: string | undefined = undefined // This means we assume it's folder
|
||||||
|
|
||||||
if (files.length === 1) indexDocument = files[0].name
|
if (files.length === 1) indexDocument = files[0].name
|
||||||
@@ -84,10 +84,10 @@ export function Upload(): ReactElement {
|
|||||||
if (idx.commonPrefix) {
|
if (idx.commonPrefix) {
|
||||||
const substrStart = idx.commonPrefix.length
|
const substrStart = idx.commonPrefix.length
|
||||||
indexDocument = idx.indexPath.substr(substrStart)
|
indexDocument = idx.indexPath.substr(substrStart)
|
||||||
fls = fls.map(f => {
|
fls = files.map(f => {
|
||||||
const path = (f.path as string).substr(substrStart)
|
const path = (f.path as string).substr(substrStart)
|
||||||
|
|
||||||
return { ...f, path, webkitRelativePath: path, fullPath: path }
|
return packageFile(f, path)
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
// The website is not packed in a directory
|
// The website is not packed in a directory
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { ReactElement, useContext } from 'react'
|
|||||||
import { Button } from '@material-ui/core'
|
import { Button } from '@material-ui/core'
|
||||||
|
|
||||||
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
|
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
|
||||||
import { Context as BeeContext } from '../../providers/Bee'
|
import { CheckState, Context as BeeContext } from '../../providers/Bee'
|
||||||
import ExpandableList from '../../components/ExpandableList'
|
import ExpandableList from '../../components/ExpandableList'
|
||||||
import ExpandableListItem from '../../components/ExpandableListItem'
|
import ExpandableListItem from '../../components/ExpandableListItem'
|
||||||
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
||||||
@@ -17,13 +17,15 @@ export default function Status(): ReactElement {
|
|||||||
topology,
|
topology,
|
||||||
nodeAddresses,
|
nodeAddresses,
|
||||||
chequebookAddress,
|
chequebookAddress,
|
||||||
|
nodeInfo,
|
||||||
} = useContext(BeeContext)
|
} = useContext(BeeContext)
|
||||||
|
|
||||||
if (!status.all) return <TroubleshootConnectionCard />
|
if (status.all === CheckState.ERROR) return <TroubleshootConnectionCard />
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<ExpandableList label="Bee Node" defaultOpen>
|
<ExpandableList label="Bee Node" defaultOpen>
|
||||||
|
<ExpandableListItem label="Mode" value={nodeInfo?.beeMode} />
|
||||||
<ExpandableListItem
|
<ExpandableListItem
|
||||||
label="Agent"
|
label="Agent"
|
||||||
value={
|
value={
|
||||||
|
|||||||
@@ -1,10 +1,36 @@
|
|||||||
|
import CircularProgress from '@material-ui/core/CircularProgress'
|
||||||
import { ReactElement, useContext } from 'react'
|
import { ReactElement, useContext } from 'react'
|
||||||
import ExpandableList from '../../components/ExpandableList'
|
import ExpandableList from '../../components/ExpandableList'
|
||||||
import ExpandableListItemInput from '../../components/ExpandableListItemInput'
|
import ExpandableListItemInput from '../../components/ExpandableListItemInput'
|
||||||
import { Context as SettingsContext } from '../../providers/Settings'
|
import { Context as SettingsContext } from '../../providers/Settings'
|
||||||
|
|
||||||
export default function Settings(): ReactElement {
|
export default function SettingsPage(): ReactElement {
|
||||||
const { apiUrl, apiDebugUrl, setApiUrl, setDebugApiUrl, lockedApiSettings } = useContext(SettingsContext)
|
const { apiUrl, apiDebugUrl, setApiUrl, setDebugApiUrl, lockedApiSettings, config, isLoading } =
|
||||||
|
useContext(SettingsContext)
|
||||||
|
|
||||||
|
if (isLoading) {
|
||||||
|
return (
|
||||||
|
<div style={{ textAlign: 'center', width: '100%' }}>
|
||||||
|
<CircularProgress />
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Run within Bee Desktop, display read only config
|
||||||
|
if (config) {
|
||||||
|
return (
|
||||||
|
<ExpandableList label="Bee Desktop Settings" defaultOpen>
|
||||||
|
<ExpandableListItemInput label="Bee API" value={config['api-addr']} locked />
|
||||||
|
<ExpandableListItemInput label="Bee Debug API" value={config['debug-api-addr']} locked />
|
||||||
|
<ExpandableListItemInput label="CORS" value={config['cors-allowed-origins']} locked />
|
||||||
|
<ExpandableListItemInput label="Data DIR" value={config['data-dir']} locked />
|
||||||
|
<ExpandableListItemInput label="ENS resolver URL" value={config['resolver-options']} locked />
|
||||||
|
{config['swap-endpoint'] && (
|
||||||
|
<ExpandableListItemInput label="SWAP endpoint" value={config['swap-endpoint']} locked />
|
||||||
|
)}
|
||||||
|
</ExpandableList>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ExpandableList label="API Settings" defaultOpen>
|
<ExpandableList label="API Settings" defaultOpen>
|
||||||
|
|||||||
@@ -9,10 +9,13 @@ interface Props {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function PostageStamp({ stamp, shorten }: Props): ReactElement {
|
export function PostageStamp({ stamp, shorten }: Props): ReactElement {
|
||||||
|
const batchId = shorten ? stamp.batchID.slice(0, 8) : stamp.batchID
|
||||||
|
const label = `${batchId}${stamp.label ? ` - ${stamp.label}` : ''}`
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box p={2} width="100%">
|
<Box p={2} width="100%">
|
||||||
<Grid container justifyContent="space-between" alignItems="center" direction="row">
|
<Grid container justifyContent="space-between" alignItems="center" direction="row">
|
||||||
<Typography variant="subtitle2">{shorten ? stamp.batchID.slice(0, 8) : stamp.batchID}</Typography>
|
<Typography variant="subtitle2">{label}</Typography>
|
||||||
<Capacity width="100px" usage={stamp.usage} />
|
<Capacity width="100px" usage={stamp.usage} />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ 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 { Form, Formik, FormikHelpers } from 'formik'
|
||||||
import { useSnackbar } from 'notistack'
|
import { useSnackbar } from 'notistack'
|
||||||
import React, { ReactElement, useContext } from 'react'
|
import { ReactElement, useContext } from 'react'
|
||||||
import { Check } from 'react-feather'
|
import { Check } from 'react-feather'
|
||||||
import { SwarmButton } from '../../components/SwarmButton'
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
import { SwarmTextInput } from '../../components/SwarmTextInput'
|
import { SwarmTextInput } from '../../components/SwarmTextInput'
|
||||||
@@ -13,8 +13,8 @@ import {
|
|||||||
calculateStampPrice,
|
calculateStampPrice,
|
||||||
convertAmountToSeconds,
|
convertAmountToSeconds,
|
||||||
convertDepthToBytes,
|
convertDepthToBytes,
|
||||||
formatBzz,
|
|
||||||
secondsToTimeString,
|
secondsToTimeString,
|
||||||
|
waitUntilStampUsable,
|
||||||
} from '../../utils'
|
} from '../../utils'
|
||||||
import { getHumanReadableFileSize } from '../../utils/file'
|
import { getHumanReadableFileSize } from '../../utils/file'
|
||||||
|
|
||||||
@@ -50,24 +50,29 @@ export function PostageStampCreation({ onFinished }: Props): ReactElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function getTtl(amount: number): string {
|
function getTtl(amount: number): string {
|
||||||
if (isNaN(amount) || amount <= 0) {
|
|
||||||
return '-'
|
|
||||||
}
|
|
||||||
|
|
||||||
return secondsToTimeString(convertAmountToSeconds(amount))
|
|
||||||
}
|
|
||||||
|
|
||||||
function getPrice(depth: number, amount: number): string {
|
|
||||||
const hasInvalidInput = isNaN(amount) || amount <= 0 || isNaN(depth) || depth < 17 || depth > 255
|
|
||||||
const isCurrentPriceAvailable = chainState && chainState.currentPrice
|
const isCurrentPriceAvailable = chainState && chainState.currentPrice
|
||||||
|
|
||||||
if (hasInvalidInput || !isCurrentPriceAvailable) {
|
if (amount <= 0 || !isCurrentPriceAvailable) {
|
||||||
return '-'
|
return '-'
|
||||||
}
|
}
|
||||||
|
|
||||||
const price = calculateStampPrice(depth, amount, chainState.currentPrice)
|
const pricePerBlock = Number.parseInt(chainState.currentPrice, 10)
|
||||||
|
|
||||||
return `${formatBzz(price)} BZZ`
|
return `${secondsToTimeString(
|
||||||
|
convertAmountToSeconds(amount, pricePerBlock),
|
||||||
|
)} (with price of ${pricePerBlock.toFixed(0)} per block)`
|
||||||
|
}
|
||||||
|
|
||||||
|
function getPrice(depth: number, amount: bigint): string {
|
||||||
|
const hasInvalidInput = amount <= 0 || isNaN(depth) || depth < 17 || depth > 255
|
||||||
|
|
||||||
|
if (hasInvalidInput) {
|
||||||
|
return '-'
|
||||||
|
}
|
||||||
|
|
||||||
|
const price = calculateStampPrice(depth, amount)
|
||||||
|
|
||||||
|
return `${price.toSignificantDigits()} BZZ`
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -83,7 +88,8 @@ export function PostageStampCreation({ onFinished }: Props): ReactElement {
|
|||||||
const amount = BigInt(values.amount)
|
const amount = BigInt(values.amount)
|
||||||
const depth = Number.parseInt(values.depth)
|
const depth = Number.parseInt(values.depth)
|
||||||
const options = values.label ? { label: values.label } : undefined
|
const options = values.label ? { label: values.label } : undefined
|
||||||
await beeDebugApi.createPostageBatch(amount.toString(), depth, options)
|
const batch = await beeDebugApi.createPostageBatch(amount.toString(), depth, options)
|
||||||
|
await waitUntilStampUsable(batch, beeDebugApi)
|
||||||
actions.resetForm()
|
actions.resetForm()
|
||||||
await refresh()
|
await refresh()
|
||||||
onFinished()
|
onFinished()
|
||||||
@@ -114,20 +120,17 @@ export function PostageStampCreation({ onFinished }: Props): ReactElement {
|
|||||||
else if (amount.isLessThanOrEqualTo(0)) errors.amount = 'Amount must be greater than 0'
|
else if (amount.isLessThanOrEqualTo(0)) errors.amount = 'Amount must be greater than 0'
|
||||||
}
|
}
|
||||||
|
|
||||||
// Label
|
|
||||||
if (values.label && !/^[0-9a-z]*$/i.test(values.label)) errors.label = 'Label must be an alphanumeric string'
|
|
||||||
|
|
||||||
return errors
|
return errors
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{({ submitForm, isValid, isSubmitting, values }) => (
|
{({ submitForm, isValid, isSubmitting, values, errors }) => (
|
||||||
<Form>
|
<Form>
|
||||||
<Box mb={2}>
|
<Box mb={2}>
|
||||||
<SwarmTextInput name="depth" label="Depth" formik />
|
<SwarmTextInput name="depth" label="Depth" formik />
|
||||||
<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>{getFileSize(parseInt(values.depth || '0', 10))}</Typography>
|
<Typography>{!errors.depth && values.depth ? getFileSize(parseInt(values.depth, 10)) : '-'}</Typography>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
@@ -136,7 +139,9 @@ export function PostageStampCreation({ onFinished }: Props): ReactElement {
|
|||||||
<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>{getTtl(parseInt(values.amount || '0', 10))}</Typography>
|
<Typography>
|
||||||
|
{!errors.amount && values.amount ? getTtl(Number.parseInt(values.amount, 10)) : '-'}
|
||||||
|
</Typography>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
@@ -146,7 +151,11 @@ export function PostageStampCreation({ onFinished }: Props): ReactElement {
|
|||||||
<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>{getPrice(parseInt(values.depth || '0', 10), parseInt(values.amount || '0', 10))}</Typography>
|
<Typography>
|
||||||
|
{!errors.amount && !errors.depth && values.amount && values.depth
|
||||||
|
? getPrice(parseInt(values.depth, 10), BigInt(values.amount))
|
||||||
|
: '-'}
|
||||||
|
</Typography>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Box>
|
</Box>
|
||||||
<SwarmButton
|
<SwarmButton
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import ExpandableList from '../../components/ExpandableList'
|
|||||||
import ExpandableListItem from '../../components/ExpandableListItem'
|
import ExpandableListItem from '../../components/ExpandableListItem'
|
||||||
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
||||||
import { EnrichedPostageBatch } from '../../providers/Stamps'
|
import { EnrichedPostageBatch } from '../../providers/Stamps'
|
||||||
|
import { secondsToTimeString } from '../../utils'
|
||||||
import { getHumanReadableFileSize } from '../../utils/file'
|
import { getHumanReadableFileSize } from '../../utils/file'
|
||||||
import { PostageStamp } from './PostageStamp'
|
import { PostageStamp } from './PostageStamp'
|
||||||
|
|
||||||
@@ -30,6 +31,14 @@ function StampsTable({ postageStamps }: Props): ReactElement | null {
|
|||||||
)}`}
|
)}`}
|
||||||
/>
|
/>
|
||||||
<ExpandableListItem label="Amount" value={parseInt(stamp.amount, 10).toLocaleString()} />
|
<ExpandableListItem label="Amount" value={parseInt(stamp.amount, 10).toLocaleString()} />
|
||||||
|
<ExpandableListItem
|
||||||
|
label="Expires in"
|
||||||
|
value={stamp.batchTTL === -1 ? 'does not expire' : `${secondsToTimeString(stamp.batchTTL)}`}
|
||||||
|
/>
|
||||||
|
<ExpandableListItem label="Label" value={stamp.label} />
|
||||||
|
<ExpandableListItem label="Usable" value={stamp.usable ? 'yes' : 'no'} />
|
||||||
|
<ExpandableListItem label="Exists" value={stamp.exists ? 'yes' : 'no'} />
|
||||||
|
<ExpandableListItem label="Purchase Block Number" value={stamp.blockNumber} />
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { PlusSquare } from 'react-feather'
|
|||||||
import { useNavigate } from 'react-router'
|
import { useNavigate } from 'react-router'
|
||||||
import { SwarmButton } from '../../components/SwarmButton'
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
|
import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
|
||||||
import { Context as BeeContext } from '../../providers/Bee'
|
import { CheckState, Context as BeeContext } 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 './StampsTable'
|
import StampsTable from './StampsTable'
|
||||||
@@ -41,7 +41,7 @@ export default function Stamp(): ReactElement {
|
|||||||
return () => stop()
|
return () => stop()
|
||||||
}, [status]) // eslint-disable-line react-hooks/exhaustive-deps
|
}, [status]) // eslint-disable-line react-hooks/exhaustive-deps
|
||||||
|
|
||||||
if (!status.all) return <TroubleshootConnectionCard />
|
if (status.all === CheckState.ERROR) return <TroubleshootConnectionCard />
|
||||||
|
|
||||||
function navigateToNewStamp() {
|
function navigateToNewStamp() {
|
||||||
navigate(ROUTES.STAMPS_NEW)
|
navigate(ROUTES.STAMPS_NEW)
|
||||||
|
|||||||
@@ -1,39 +1,59 @@
|
|||||||
import { useContext } from 'react'
|
import { useContext } from 'react'
|
||||||
import DepositModal from '../../../containers/DepositModal'
|
import DepositModal from '../../../containers/DepositModal'
|
||||||
import type { ReactElement } from 'react'
|
import type { ReactElement, ReactNode } from 'react'
|
||||||
import ExpandableList from '../../../components/ExpandableList'
|
import ExpandableList from '../../../components/ExpandableList'
|
||||||
import ExpandableListItemKey from '../../../components/ExpandableListItemKey'
|
import ExpandableListItemKey from '../../../components/ExpandableListItemKey'
|
||||||
import ExpandableListItemActions from '../../../components/ExpandableListItemActions'
|
import ExpandableListItemActions from '../../../components/ExpandableListItemActions'
|
||||||
import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
|
import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
|
||||||
import StatusIcon from '../../../components/StatusIcon'
|
import StatusIcon from '../../../components/StatusIcon'
|
||||||
import { Context } from '../../../providers/Bee'
|
import { CheckState, Context } from '../../../providers/Bee'
|
||||||
|
|
||||||
const ChequebookDeployFund = (): ReactElement | null => {
|
const ChequebookDeployFund = (): ReactElement | null => {
|
||||||
const { status, isLoading, chequebookAddress } = useContext(Context)
|
const { status, isLoading, chequebookAddress } = useContext(Context)
|
||||||
const isOk = status.chequebook
|
const { checkState, isEnabled } = status.chequebook
|
||||||
|
|
||||||
return (
|
if (!isEnabled) return null
|
||||||
<ExpandableList
|
|
||||||
label={
|
let text: ReactNode
|
||||||
|
|
||||||
|
switch (checkState) {
|
||||||
|
case CheckState.OK:
|
||||||
|
text = 'Your chequebook is deployed and funded'
|
||||||
|
break
|
||||||
|
case CheckState.WARNING:
|
||||||
|
text = (
|
||||||
<>
|
<>
|
||||||
<StatusIcon isOk={isOk} isLoading={isLoading} /> Chequebook Deployment & Funding
|
Your chequebook is not funded. Please deposit some xBZZ to your chequebook address. You may need to aquire BZZ
|
||||||
|
(e.g. <a href="https://bzz.exchange/">bzz.exchange</a>) and bridge it to the xDai network through the{' '}
|
||||||
|
<a href="https://omni.xdaichain.com/bridge">omni bridge</a>. To pay the transaction fees, you will also need
|
||||||
|
xDAI token. You can purchase DAI on the network and bridge it to xDai network through the{' '}
|
||||||
|
<a href="https://bridge.xdaichain.com/">xDai Bridge</a>. See the{' '}
|
||||||
|
<a href="https://www.xdaichain.com/#xdai-stable-chain">official xDai website</a> for more information.
|
||||||
</>
|
</>
|
||||||
}
|
)
|
||||||
>
|
break
|
||||||
<ExpandableListItemNote>
|
default:
|
||||||
{isOk ? (
|
text = (
|
||||||
'Your chequebook is deployed and funded'
|
|
||||||
) : (
|
|
||||||
<>
|
<>
|
||||||
Your chequebook is either not deployed or funded. To run the node you will need xDAI and xBZZ on the xDai
|
Your chequebook is either not deployed nor funded. To run the node you will need xDAI and xBZZ on the xDai
|
||||||
network. You may need to aquire BZZ (e.g. <a href="https://bzz.exchange/">bzz.exchange</a>) and bridge it to
|
network. You may need to aquire BZZ (e.g. <a href="https://bzz.exchange/">bzz.exchange</a>) and bridge it to
|
||||||
the xDai network through the <a href="https://omni.xdaichain.com/bridge">omni bridge</a>. To pay the
|
the xDai network through the <a href="https://omni.xdaichain.com/bridge">omni bridge</a>. To pay the
|
||||||
transaction fees, you will also need xDAI token. You can purchase DAI on the network and bridge it to xDai
|
transaction fees, you will also need xDAI token. You can purchase DAI on the network and bridge it to xDai
|
||||||
network through the <a href="https://bridge.xdaichain.com/">xDai Bridge</a>. See the{' '}
|
network through the <a href="https://bridge.xdaichain.com/">xDai Bridge</a>. See the{' '}
|
||||||
<a href="https://www.xdaichain.com/#xdai-stable-chain">official xDai website</a> for more information.
|
<a href="https://www.xdaichain.com/#xdai-stable-chain">official xDai website</a> for more information.
|
||||||
</>
|
</>
|
||||||
)}
|
)
|
||||||
</ExpandableListItemNote>
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ExpandableList
|
||||||
|
label={
|
||||||
|
<>
|
||||||
|
<StatusIcon checkState={checkState} isLoading={isLoading} /> Chequebook Deployment & Funding
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<ExpandableListItemNote>{text}</ExpandableListItemNote>
|
||||||
{chequebookAddress && (
|
{chequebookAddress && (
|
||||||
<>
|
<>
|
||||||
<ExpandableListItemKey label="Chequebook Address" value={chequebookAddress.chequebookAddress} />
|
<ExpandableListItemKey label="Chequebook Address" value={chequebookAddress.chequebookAddress} />
|
||||||
|
|||||||
@@ -6,30 +6,32 @@ import ExpandableListItem from '../../../components/ExpandableListItem'
|
|||||||
import ExpandableListItemInput from '../../../components/ExpandableListItemInput'
|
import ExpandableListItemInput from '../../../components/ExpandableListItemInput'
|
||||||
import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
|
import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
|
||||||
import StatusIcon from '../../../components/StatusIcon'
|
import StatusIcon from '../../../components/StatusIcon'
|
||||||
import { Context } from '../../../providers/Bee'
|
import { CheckState, Context } from '../../../providers/Bee'
|
||||||
import { Context as SettingsContext } from '../../../providers/Settings'
|
import { Context as SettingsContext } from '../../../providers/Settings'
|
||||||
|
|
||||||
export default function NodeConnectionCheck(): ReactElement | null {
|
export default function NodeConnectionCheck(): ReactElement | null {
|
||||||
const { status, isLoading } = useContext(Context)
|
const { status, isLoading } = useContext(Context)
|
||||||
const { setDebugApiUrl, apiDebugUrl } = useContext(SettingsContext)
|
const { setDebugApiUrl, apiDebugUrl } = useContext(SettingsContext)
|
||||||
const isOk = status.debugApiConnection
|
const { checkState, isEnabled } = status.debugApiConnection
|
||||||
|
|
||||||
|
if (!isEnabled) return null
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ExpandableList
|
<ExpandableList
|
||||||
label={
|
label={
|
||||||
<>
|
<>
|
||||||
<StatusIcon isOk={isOk} isLoading={isLoading} /> Connection to Bee Debug API
|
<StatusIcon checkState={checkState} isLoading={isLoading} /> Connection to Bee Debug API
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<ExpandableListItemNote>
|
<ExpandableListItemNote>
|
||||||
{isOk
|
{checkState === CheckState.OK
|
||||||
? 'The connection to the Bee nodes debug API has been successful'
|
? 'The connection to the Bee nodes debug API has been successful'
|
||||||
: 'We cannot connect to your nodes debug API. Please check the following to troubleshoot your issue.'}
|
: 'We cannot connect to your nodes debug API. Please check the following to troubleshoot your issue.'}
|
||||||
</ExpandableListItemNote>
|
</ExpandableListItemNote>
|
||||||
<ExpandableListItemInput label="Bee Debug API" value={apiDebugUrl} onConfirm={setDebugApiUrl} />
|
<ExpandableListItemInput label="Bee Debug API" value={apiDebugUrl} onConfirm={setDebugApiUrl} />
|
||||||
|
|
||||||
{!isOk && (
|
{checkState === CheckState.ERROR && (
|
||||||
<ExpandableList level={1} label="Troubleshoot">
|
<ExpandableList level={1} label="Troubleshoot">
|
||||||
<ExpandableListItem
|
<ExpandableListItem
|
||||||
label={
|
label={
|
||||||
|
|||||||
@@ -3,22 +3,24 @@ import ExpandableList from '../../../components/ExpandableList'
|
|||||||
import ExpandableListItemKey from '../../../components/ExpandableListItemKey'
|
import ExpandableListItemKey from '../../../components/ExpandableListItemKey'
|
||||||
import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
|
import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
|
||||||
import StatusIcon from '../../../components/StatusIcon'
|
import StatusIcon from '../../../components/StatusIcon'
|
||||||
import { Context } from '../../../providers/Bee'
|
import { CheckState, Context } from '../../../providers/Bee'
|
||||||
|
|
||||||
export default function EthereumConnectionCheck(): ReactElement | null {
|
export default function EthereumConnectionCheck(): ReactElement | null {
|
||||||
const { status, isLoading, nodeAddresses } = useContext(Context)
|
const { status, isLoading, nodeAddresses } = useContext(Context)
|
||||||
const isOk = status.blockchainConnection
|
const { checkState, isEnabled } = status.blockchainConnection
|
||||||
|
|
||||||
|
if (!isEnabled) return null
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ExpandableList
|
<ExpandableList
|
||||||
label={
|
label={
|
||||||
<>
|
<>
|
||||||
<StatusIcon isOk={isOk} isLoading={isLoading} /> Connection to Blockchain
|
<StatusIcon checkState={checkState} isLoading={isLoading} /> Connection to Blockchain
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<ExpandableListItemNote>
|
<ExpandableListItemNote>
|
||||||
{isOk ? (
|
{checkState === CheckState.OK ? (
|
||||||
'Your node is connected to the xDai blockchain'
|
'Your node is connected to the xDai blockchain'
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
|
|||||||
@@ -7,28 +7,30 @@ import ExpandableListItem from '../../../components/ExpandableListItem'
|
|||||||
import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
|
import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
|
||||||
import ExpandableListItemInput from '../../../components/ExpandableListItemInput'
|
import ExpandableListItemInput from '../../../components/ExpandableListItemInput'
|
||||||
import StatusIcon from '../../../components/StatusIcon'
|
import StatusIcon from '../../../components/StatusIcon'
|
||||||
import { Context } from '../../../providers/Bee'
|
import { CheckState, Context } from '../../../providers/Bee'
|
||||||
|
|
||||||
export default function NodeConnectionCheck(): ReactElement | null {
|
export default function NodeConnectionCheck(): ReactElement | null {
|
||||||
const { setApiUrl, apiUrl } = useContext(SettingsContext)
|
const { setApiUrl, apiUrl } = useContext(SettingsContext)
|
||||||
const { status, isLoading } = useContext(Context)
|
const { status, isLoading } = useContext(Context)
|
||||||
const isOk = status.apiConnection
|
const { isEnabled, checkState } = status.apiConnection
|
||||||
|
|
||||||
|
if (!isEnabled) return null
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ExpandableList
|
<ExpandableList
|
||||||
label={
|
label={
|
||||||
<>
|
<>
|
||||||
<StatusIcon isOk={isOk} isLoading={isLoading} /> Connection to Bee API
|
<StatusIcon checkState={checkState} isLoading={isLoading} /> Connection to Bee API
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<ExpandableListItemNote>
|
<ExpandableListItemNote>
|
||||||
{isOk
|
{checkState === CheckState.OK
|
||||||
? 'The connection to the Bee nodes API has been successful'
|
? 'The connection to the Bee nodes API has been successful'
|
||||||
: 'Could not connect to your Bee nodes API. Please check the troubleshoot below on how you may resolve it.'}
|
: 'Could not connect to your Bee nodes API. Please check the troubleshoot below on how you may resolve it.'}
|
||||||
</ExpandableListItemNote>
|
</ExpandableListItemNote>
|
||||||
<ExpandableListItemInput label="Bee API" value={apiUrl} onConfirm={setApiUrl} />
|
<ExpandableListItemInput label="Bee API" value={apiUrl} onConfirm={setApiUrl} />
|
||||||
{!isOk && (
|
{checkState === CheckState.ERROR && (
|
||||||
<ExpandableList level={1} label="Troubleshoot">
|
<ExpandableList level={1} label="Troubleshoot">
|
||||||
<ExpandableListItem
|
<ExpandableListItem
|
||||||
label={
|
label={
|
||||||
|
|||||||
@@ -1,27 +1,37 @@
|
|||||||
import { ReactElement, useContext } from 'react'
|
import { ReactElement, ReactNode, useContext } from 'react'
|
||||||
import ExpandableList from '../../../components/ExpandableList'
|
import ExpandableList from '../../../components/ExpandableList'
|
||||||
import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
|
import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
|
||||||
import TopologyStats from '../../../components/TopologyStats'
|
import TopologyStats from '../../../components/TopologyStats'
|
||||||
import StatusIcon from '../../../components/StatusIcon'
|
import StatusIcon from '../../../components/StatusIcon'
|
||||||
import { Context } from '../../../providers/Bee'
|
import { CheckState, Context } from '../../../providers/Bee'
|
||||||
|
|
||||||
export default function PeerConnection(): ReactElement | null {
|
export default function PeerConnection(): ReactElement | null {
|
||||||
const { status, isLoading, topology } = useContext(Context)
|
const { status, isLoading, topology } = useContext(Context)
|
||||||
const isOk = status.topology
|
const { isEnabled, checkState } = status.topology
|
||||||
|
|
||||||
|
if (!isEnabled) return null
|
||||||
|
|
||||||
|
let text: ReactNode
|
||||||
|
switch (checkState) {
|
||||||
|
case CheckState.OK:
|
||||||
|
text = 'You are connected to other Bee nodes'
|
||||||
|
break
|
||||||
|
|
||||||
|
// Both error state and warning state
|
||||||
|
default:
|
||||||
|
text =
|
||||||
|
'Your node is not connected to any peers. Please wait a bit if you just started the node, otherwise review your configuration file.'
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ExpandableList
|
<ExpandableList
|
||||||
label={
|
label={
|
||||||
<>
|
<>
|
||||||
<StatusIcon isOk={isOk} isLoading={isLoading} /> Connection to Peers
|
<StatusIcon checkState={checkState} isLoading={isLoading} /> Connection to Peers
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<ExpandableListItemNote>
|
<ExpandableListItemNote>{text}</ExpandableListItemNote>
|
||||||
{isOk
|
|
||||||
? 'You are connected to other Bee nodes'
|
|
||||||
: 'Your node is not connected to any peers. Please wait a bit if you just started the node, otherwise review your configuration file.'}
|
|
||||||
</ExpandableListItemNote>
|
|
||||||
|
|
||||||
<TopologyStats topology={topology} />
|
<TopologyStats topology={topology} />
|
||||||
</ExpandableList>
|
</ExpandableList>
|
||||||
|
|||||||
@@ -4,22 +4,24 @@ import ExpandableList from '../../../components/ExpandableList'
|
|||||||
import ExpandableListItem from '../../../components/ExpandableListItem'
|
import ExpandableListItem from '../../../components/ExpandableListItem'
|
||||||
import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
|
import ExpandableListItemNote from '../../../components/ExpandableListItemNote'
|
||||||
import StatusIcon from '../../../components/StatusIcon'
|
import StatusIcon from '../../../components/StatusIcon'
|
||||||
import { Context } from '../../../providers/Bee'
|
import { CheckState, Context } from '../../../providers/Bee'
|
||||||
|
|
||||||
export default function VersionCheck(): ReactElement | null {
|
export default function VersionCheck(): ReactElement | null {
|
||||||
const { status, isLoading, latestUserVersion, latestPublishedVersion, latestBeeVersionUrl } = useContext(Context)
|
const { status, isLoading, latestUserVersion, latestPublishedVersion, latestBeeVersionUrl } = useContext(Context)
|
||||||
const isOk = status.version
|
const { isEnabled, checkState } = status.version
|
||||||
|
|
||||||
|
if (!isEnabled) return null
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ExpandableList
|
<ExpandableList
|
||||||
label={
|
label={
|
||||||
<>
|
<>
|
||||||
<StatusIcon isOk={isOk} isLoading={isLoading} /> Bee Version
|
<StatusIcon checkState={checkState} isLoading={isLoading} /> Bee Version
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<ExpandableListItemNote>
|
<ExpandableListItemNote>
|
||||||
{isOk ? (
|
{checkState === CheckState.OK ? (
|
||||||
'You are running the latest version of Bee.'
|
'You are running the latest version of Bee.'
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
|
|||||||
+115
-37
@@ -1,10 +1,11 @@
|
|||||||
import type {
|
import {
|
||||||
|
BeeModes,
|
||||||
ChainState,
|
ChainState,
|
||||||
ChequebookAddressResponse,
|
ChequebookAddressResponse,
|
||||||
Health,
|
Health,
|
||||||
LastChequesResponse,
|
LastChequesResponse,
|
||||||
NodeAddresses,
|
NodeAddresses,
|
||||||
NodesInfo,
|
NodeInfo,
|
||||||
Peer,
|
Peer,
|
||||||
Topology,
|
Topology,
|
||||||
} from '@ethersphere/bee-js'
|
} from '@ethersphere/bee-js'
|
||||||
@@ -14,20 +15,38 @@ import { engines } from '../../package.json'
|
|||||||
import { useLatestBeeRelease } from '../hooks/apiHooks'
|
import { useLatestBeeRelease } from '../hooks/apiHooks'
|
||||||
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 { Rpc } from '../utils/rpc'
|
||||||
import { Context as SettingsContext } from './Settings'
|
import { Context as SettingsContext } from './Settings'
|
||||||
|
|
||||||
|
interface RpcBalance {
|
||||||
|
bzz: Token
|
||||||
|
xdai: Token
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum CheckState {
|
||||||
|
OK = 'OK',
|
||||||
|
WARNING = 'Warning',
|
||||||
|
ERROR = 'Error',
|
||||||
|
}
|
||||||
|
|
||||||
|
interface StatusItem {
|
||||||
|
isEnabled: boolean
|
||||||
|
checkState: CheckState
|
||||||
|
}
|
||||||
|
|
||||||
interface Status {
|
interface Status {
|
||||||
all: boolean
|
all: CheckState
|
||||||
version: boolean
|
version: StatusItem
|
||||||
blockchainConnection: boolean
|
blockchainConnection: StatusItem
|
||||||
debugApiConnection: boolean
|
debugApiConnection: StatusItem
|
||||||
apiConnection: boolean
|
apiConnection: StatusItem
|
||||||
topology: boolean
|
topology: StatusItem
|
||||||
chequebook: boolean
|
chequebook: StatusItem
|
||||||
}
|
}
|
||||||
|
|
||||||
interface ContextInterface {
|
interface ContextInterface {
|
||||||
status: Status
|
status: Status
|
||||||
|
balance: RpcBalance
|
||||||
latestPublishedVersion?: string
|
latestPublishedVersion?: string
|
||||||
latestUserVersion?: string
|
latestUserVersion?: string
|
||||||
latestUserVersionExact?: string
|
latestUserVersionExact?: string
|
||||||
@@ -37,7 +56,7 @@ interface ContextInterface {
|
|||||||
apiHealth: boolean
|
apiHealth: boolean
|
||||||
debugApiHealth: Health | null
|
debugApiHealth: Health | null
|
||||||
nodeAddresses: NodeAddresses | null
|
nodeAddresses: NodeAddresses | null
|
||||||
nodeInfo: NodesInfo | null
|
nodeInfo: NodeInfo | null
|
||||||
topology: Topology | null
|
topology: Topology | null
|
||||||
chequebookAddress: ChequebookAddressResponse | null
|
chequebookAddress: ChequebookAddressResponse | null
|
||||||
peers: Peer[] | null
|
peers: Peer[] | null
|
||||||
@@ -55,17 +74,19 @@ interface ContextInterface {
|
|||||||
refresh: () => Promise<void>
|
refresh: () => Promise<void>
|
||||||
}
|
}
|
||||||
|
|
||||||
const startedInDevMode = window.location.search.includes('devMode=1')
|
|
||||||
|
|
||||||
const initialValues: ContextInterface = {
|
const initialValues: ContextInterface = {
|
||||||
status: {
|
status: {
|
||||||
all: false,
|
all: CheckState.ERROR,
|
||||||
version: false,
|
version: { isEnabled: false, checkState: CheckState.ERROR },
|
||||||
blockchainConnection: false,
|
blockchainConnection: { isEnabled: false, checkState: CheckState.ERROR },
|
||||||
debugApiConnection: false,
|
debugApiConnection: { isEnabled: false, checkState: CheckState.ERROR },
|
||||||
apiConnection: false,
|
apiConnection: { isEnabled: false, checkState: CheckState.ERROR },
|
||||||
topology: false,
|
topology: { isEnabled: false, checkState: CheckState.ERROR },
|
||||||
chequebook: false,
|
chequebook: { isEnabled: false, checkState: CheckState.ERROR },
|
||||||
|
},
|
||||||
|
balance: {
|
||||||
|
bzz: new Token('0', 16),
|
||||||
|
xdai: new Token('0', 18),
|
||||||
},
|
},
|
||||||
latestPublishedVersion: undefined,
|
latestPublishedVersion: undefined,
|
||||||
latestUserVersion: undefined,
|
latestUserVersion: undefined,
|
||||||
@@ -104,34 +125,69 @@ interface Props {
|
|||||||
function getStatus(
|
function getStatus(
|
||||||
debugApiHealth: Health | null,
|
debugApiHealth: Health | null,
|
||||||
nodeAddresses: NodeAddresses | null,
|
nodeAddresses: NodeAddresses | null,
|
||||||
nodeInfo: NodesInfo | null,
|
nodeInfo: NodeInfo | null,
|
||||||
apiHealth: boolean,
|
apiHealth: boolean,
|
||||||
topology: Topology | null,
|
topology: Topology | null,
|
||||||
chequebookAddress: ChequebookAddressResponse | null,
|
chequebookAddress: ChequebookAddressResponse | null,
|
||||||
chequebookBalance: ChequebookBalance | null,
|
chequebookBalance: ChequebookBalance | null,
|
||||||
error: Error | null,
|
error: Error | null,
|
||||||
): Status {
|
): Status {
|
||||||
// FIXME: `devMode` is a temporary workaround to be able to develop with only one node
|
const status: Status = { ...initialValues.status }
|
||||||
const devMode = startedInDevMode || Boolean(process.env.REACT_APP_DEV_MODE) || nodeInfo?.beeMode === 'dev'
|
|
||||||
const status = {
|
// Version check
|
||||||
version: Boolean(
|
status.version.isEnabled = true
|
||||||
|
status.version.checkState =
|
||||||
debugApiHealth &&
|
debugApiHealth &&
|
||||||
semver.satisfies(debugApiHealth.version, engines.bee, {
|
semver.satisfies(debugApiHealth.version, engines.bee, {
|
||||||
includePrerelease: true,
|
includePrerelease: true,
|
||||||
}),
|
})
|
||||||
),
|
? CheckState.OK
|
||||||
blockchainConnection: Boolean(nodeAddresses?.ethereum),
|
: CheckState.ERROR
|
||||||
debugApiConnection: Boolean(debugApiHealth?.status === 'ok'),
|
|
||||||
apiConnection: apiHealth,
|
// Blockchain connection check
|
||||||
topology: Boolean(topology?.connected && topology?.connected > 0) || devMode,
|
status.blockchainConnection.isEnabled = true
|
||||||
chequebook:
|
status.blockchainConnection.checkState = Boolean(debugApiHealth?.status === 'ok') ? CheckState.OK : CheckState.ERROR
|
||||||
(Boolean(chequebookAddress?.chequebookAddress) &&
|
|
||||||
chequebookBalance !== null &&
|
// Debug API connection check
|
||||||
chequebookBalance?.totalBalance.toBigNumber.isGreaterThan(0)) ||
|
status.debugApiConnection.isEnabled = true
|
||||||
devMode,
|
status.debugApiConnection.checkState = Boolean(debugApiHealth?.status === 'ok') ? CheckState.OK : CheckState.ERROR
|
||||||
|
|
||||||
|
// API connection check
|
||||||
|
status.apiConnection.isEnabled = true
|
||||||
|
status.apiConnection.checkState = apiHealth ? CheckState.OK : CheckState.ERROR
|
||||||
|
|
||||||
|
// Topology check
|
||||||
|
if (nodeInfo && [BeeModes.FULL, BeeModes.LIGHT, BeeModes.ULTRA_LIGHT].includes(nodeInfo.beeMode)) {
|
||||||
|
status.topology.isEnabled = true
|
||||||
|
status.topology.checkState = topology?.connected && topology?.connected > 0 ? CheckState.OK : CheckState.WARNING
|
||||||
}
|
}
|
||||||
|
|
||||||
return { ...status, all: !error && Object.values(status).every(v => v) }
|
// Chequebook check
|
||||||
|
if (error || (nodeInfo && [BeeModes.FULL, BeeModes.LIGHT].includes(nodeInfo.beeMode))) {
|
||||||
|
status.chequebook.isEnabled = true
|
||||||
|
|
||||||
|
if (
|
||||||
|
chequebookAddress?.chequebookAddress &&
|
||||||
|
chequebookBalance !== null &&
|
||||||
|
chequebookBalance?.totalBalance.toBigNumber.isGreaterThan(0)
|
||||||
|
) {
|
||||||
|
status.chequebook.checkState = CheckState.OK
|
||||||
|
} else if (chequebookAddress?.chequebookAddress) status.chequebook.checkState = CheckState.WARNING
|
||||||
|
else status.chequebook.checkState = CheckState.OK
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine overall status
|
||||||
|
if (Object.values(status).some(({ isEnabled, checkState }) => isEnabled && checkState === CheckState.ERROR)) {
|
||||||
|
status.all = CheckState.ERROR
|
||||||
|
} else if (
|
||||||
|
Object.values(status).some(({ isEnabled, checkState }) => isEnabled && checkState === CheckState.WARNING)
|
||||||
|
) {
|
||||||
|
status.all = CheckState.WARNING
|
||||||
|
} else {
|
||||||
|
status.all = CheckState.OK
|
||||||
|
}
|
||||||
|
|
||||||
|
return status
|
||||||
}
|
}
|
||||||
|
|
||||||
export function Provider({ children }: Props): ReactElement {
|
export function Provider({ children }: Props): ReactElement {
|
||||||
@@ -139,7 +195,7 @@ export function Provider({ children }: Props): ReactElement {
|
|||||||
const [apiHealth, setApiHealth] = useState<boolean>(false)
|
const [apiHealth, setApiHealth] = useState<boolean>(false)
|
||||||
const [debugApiHealth, setDebugApiHealth] = useState<Health | null>(null)
|
const [debugApiHealth, setDebugApiHealth] = useState<Health | null>(null)
|
||||||
const [nodeAddresses, setNodeAddresses] = useState<NodeAddresses | null>(null)
|
const [nodeAddresses, setNodeAddresses] = useState<NodeAddresses | null>(null)
|
||||||
const [nodeInfo, setNodeInfo] = useState<NodesInfo | null>(null)
|
const [nodeInfo, setNodeInfo] = useState<NodeInfo | 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)
|
||||||
@@ -148,6 +204,8 @@ export function Provider({ children }: Props): ReactElement {
|
|||||||
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)
|
||||||
const [chainState, setChainState] = useState<ChainState | null>(null)
|
const [chainState, setChainState] = useState<ChainState | null>(null)
|
||||||
|
const [bzz, setBzz] = useState<Token>(initialValues.balance.bzz)
|
||||||
|
const [xdai, setXdai] = useState<Token>(initialValues.balance.xdai)
|
||||||
|
|
||||||
const { latestBeeRelease } = useLatestBeeRelease()
|
const { latestBeeRelease } = useLatestBeeRelease()
|
||||||
|
|
||||||
@@ -187,6 +245,22 @@ export function Provider({ children }: Props): ReactElement {
|
|||||||
refresh()
|
refresh()
|
||||||
}, [beeDebugApi]) // eslint-disable-line react-hooks/exhaustive-deps
|
}, [beeDebugApi]) // eslint-disable-line react-hooks/exhaustive-deps
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (nodeAddresses?.ethereum) {
|
||||||
|
// debounced calls
|
||||||
|
const xdai = Rpc.eth_getBalance(nodeAddresses.ethereum)
|
||||||
|
const bzz = Rpc.eth_getBalanceERC20(nodeAddresses.ethereum)
|
||||||
|
|
||||||
|
if (xdai?.then) {
|
||||||
|
xdai.then(balance => setXdai(new Token(balance, 18)))
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bzz?.then) {
|
||||||
|
bzz.then(balance => setBzz(new Token(balance, 16)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, [nodeAddresses])
|
||||||
|
|
||||||
const refresh = async () => {
|
const refresh = async () => {
|
||||||
// Don't want to refresh when already refreshing
|
// Don't want to refresh when already refreshing
|
||||||
if (isRefreshing) return
|
if (isRefreshing) return
|
||||||
@@ -343,6 +417,10 @@ export function Provider({ children }: Props): ReactElement {
|
|||||||
chequebookBalance,
|
chequebookBalance,
|
||||||
error,
|
error,
|
||||||
),
|
),
|
||||||
|
balance: {
|
||||||
|
xdai,
|
||||||
|
bzz,
|
||||||
|
},
|
||||||
latestUserVersion,
|
latestUserVersion,
|
||||||
latestUserVersionExact,
|
latestUserVersionExact,
|
||||||
latestPublishedVersion,
|
latestPublishedVersion,
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { Bee, BeeDebug } from '@ethersphere/bee-js'
|
import { Bee, BeeDebug } from '@ethersphere/bee-js'
|
||||||
import { createContext, ReactChild, ReactElement, useEffect, useState } from 'react'
|
import { createContext, ReactChild, ReactElement, useEffect, useState } from 'react'
|
||||||
import { config } from '../config'
|
import { config } from '../config'
|
||||||
|
import { BeeConfig, useGetBeeConfig } from '../hooks/apiHooks'
|
||||||
|
|
||||||
interface ContextInterface {
|
interface ContextInterface {
|
||||||
apiUrl: string
|
apiUrl: string
|
||||||
@@ -10,6 +11,10 @@ interface ContextInterface {
|
|||||||
setApiUrl: (url: string) => void
|
setApiUrl: (url: string) => void
|
||||||
setDebugApiUrl: (url: string) => void
|
setDebugApiUrl: (url: string) => void
|
||||||
lockedApiSettings: boolean
|
lockedApiSettings: boolean
|
||||||
|
desktopApiKey: string
|
||||||
|
config: BeeConfig | null
|
||||||
|
isLoading: boolean
|
||||||
|
error: Error | null
|
||||||
}
|
}
|
||||||
|
|
||||||
const initialValues: ContextInterface = {
|
const initialValues: ContextInterface = {
|
||||||
@@ -20,6 +25,10 @@ const initialValues: ContextInterface = {
|
|||||||
setApiUrl: () => {}, // eslint-disable-line
|
setApiUrl: () => {}, // eslint-disable-line
|
||||||
setDebugApiUrl: () => {}, // eslint-disable-line
|
setDebugApiUrl: () => {}, // eslint-disable-line
|
||||||
lockedApiSettings: false,
|
lockedApiSettings: false,
|
||||||
|
desktopApiKey: '',
|
||||||
|
config: null,
|
||||||
|
isLoading: true,
|
||||||
|
error: null,
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Context = createContext<ContextInterface>(initialValues)
|
export const Context = createContext<ContextInterface>(initialValues)
|
||||||
@@ -43,9 +52,22 @@ export function Provider({
|
|||||||
const [beeApi, setBeeApi] = useState<Bee | null>(null)
|
const [beeApi, setBeeApi] = useState<Bee | null>(null)
|
||||||
const [beeDebugApi, setBeeDebugApi] = useState<BeeDebug | null>(null)
|
const [beeDebugApi, setBeeDebugApi] = useState<BeeDebug | null>(null)
|
||||||
const [lockedApiSettings] = useState<boolean>(Boolean(extLockedApiSettings))
|
const [lockedApiSettings] = useState<boolean>(Boolean(extLockedApiSettings))
|
||||||
|
const [desktopApiKey, setDesktopApiKey] = useState<string>(initialValues.desktopApiKey)
|
||||||
|
const { config, isLoading, error } = useGetBeeConfig()
|
||||||
|
|
||||||
const url = beeApiUrl || apiUrl
|
const url = config?.['api-addr'] || beeApiUrl || apiUrl
|
||||||
const debugUrl = beeDebugApiUrl || apiDebugUrl
|
const debugUrl = config?.['debug-api-addr'] || beeDebugApiUrl || apiDebugUrl
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const urlSearchParams = new URLSearchParams(window.location.search)
|
||||||
|
const newApiKey = urlSearchParams.get('v')
|
||||||
|
|
||||||
|
if (newApiKey) {
|
||||||
|
localStorage.setItem('apiKey', newApiKey)
|
||||||
|
window.location.search = ''
|
||||||
|
setDesktopApiKey(newApiKey)
|
||||||
|
}
|
||||||
|
}, [])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
try {
|
try {
|
||||||
@@ -75,6 +97,10 @@ export function Provider({
|
|||||||
setApiUrl,
|
setApiUrl,
|
||||||
setDebugApiUrl,
|
setDebugApiUrl,
|
||||||
lockedApiSettings,
|
lockedApiSettings,
|
||||||
|
desktopApiKey,
|
||||||
|
config,
|
||||||
|
isLoading,
|
||||||
|
error,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
|
|||||||
Vendored
-17
@@ -5,23 +5,6 @@ interface LatestBeeRelease {
|
|||||||
html_url: string
|
html_url: string
|
||||||
}
|
}
|
||||||
|
|
||||||
interface StatusHookCommon {
|
|
||||||
isOk: boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
interface StatusNodeVersionHook extends StatusHookCommon {
|
|
||||||
userVersion?: string
|
|
||||||
latestVersion?: string
|
|
||||||
latestUrl: string
|
|
||||||
isLatestBeeVersion: boolean
|
|
||||||
}
|
|
||||||
interface StatusEthereumConnectionHook extends StatusHookCommon {
|
|
||||||
nodeAddresses: NodeAddresses | null
|
|
||||||
}
|
|
||||||
interface StatusTopologyHook extends StatusHookCommon {
|
|
||||||
topology: Topology | null
|
|
||||||
}
|
|
||||||
|
|
||||||
interface SwarmMetadata {
|
interface SwarmMetadata {
|
||||||
size: number
|
size: number
|
||||||
name: string
|
name: string
|
||||||
|
|||||||
@@ -1,4 +1,23 @@
|
|||||||
|
import type { NodeAddresses, Topology } from '@ethersphere/bee-js'
|
||||||
import type { Token } from './models/Token'
|
import type { Token } from './models/Token'
|
||||||
|
import { CheckState } from './providers/Bee'
|
||||||
|
|
||||||
|
export interface StatusHookCommon {
|
||||||
|
checkState: CheckState
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface StatusNodeVersionHook extends StatusHookCommon {
|
||||||
|
userVersion?: string
|
||||||
|
latestVersion?: string
|
||||||
|
latestUrl: string
|
||||||
|
isLatestBeeVersion: boolean
|
||||||
|
}
|
||||||
|
export interface StatusEthereumConnectionHook extends StatusHookCommon {
|
||||||
|
nodeAddresses: NodeAddresses | null
|
||||||
|
}
|
||||||
|
export interface StatusTopologyHook extends StatusHookCommon {
|
||||||
|
topology: Topology | null
|
||||||
|
}
|
||||||
|
|
||||||
export interface ChequebookBalance {
|
export interface ChequebookBalance {
|
||||||
totalBalance: Token
|
totalBalance: Token
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
import axios from 'axios'
|
||||||
|
|
||||||
|
export async function requestBzz(address: string): Promise<void> {
|
||||||
|
await axios.post(`https://xbzz-faucet.apyos.dev/xbzz/${address}`)
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
import axios from 'axios'
|
||||||
|
import { getJson, postJson } from './net'
|
||||||
|
|
||||||
|
interface DesktopStatus {
|
||||||
|
status: 0 | 1 | 2
|
||||||
|
address: string | null
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
config: Record<string, any>
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getDesktopStatus(): Promise<DesktopStatus> {
|
||||||
|
const response = await getJson(`http://${getDesktopHost()}/status`)
|
||||||
|
|
||||||
|
return response as DesktopStatus
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getGasFromFaucet(address: string): Promise<void> {
|
||||||
|
await axios.post(`http://getxdai.co/${address}/0.1`)
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function upgradeToLightNode(rpcProvider: string): Promise<void> {
|
||||||
|
await updateDesktopConfiguration({
|
||||||
|
'chain-enable': true,
|
||||||
|
'swap-enable': true,
|
||||||
|
'swap-endpoint': rpcProvider,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
async function updateDesktopConfiguration(values: Record<string, unknown>): Promise<void> {
|
||||||
|
await postJson(`http://${getDesktopHost()}/config`, values)
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function restartBeeNode(): Promise<void> {
|
||||||
|
await postJson(`http://${getDesktopHost()}/restart`)
|
||||||
|
}
|
||||||
|
|
||||||
|
function getDesktopHost(): string {
|
||||||
|
return window.location.host
|
||||||
|
}
|
||||||
+2
-2
@@ -87,8 +87,8 @@ export function getPath(file: FilePath): string {
|
|||||||
/**
|
/**
|
||||||
* Utility function that is needed to have correct directory structure as webkitRelativePath is read only
|
* Utility function that is needed to have correct directory structure as webkitRelativePath is read only
|
||||||
*/
|
*/
|
||||||
export function packageFile(file: FilePath): FilePath {
|
export function packageFile(file: FilePath, pathOverwrite?: string): FilePath {
|
||||||
const path = getPath(file)
|
const path = pathOverwrite || getPath(file)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
path: path,
|
path: path,
|
||||||
|
|||||||
@@ -0,0 +1,138 @@
|
|||||||
|
import { extractSwarmHash, extractSwarmCid, recognizeSwarmHash } from './index'
|
||||||
|
|
||||||
|
interface TestObject {
|
||||||
|
input: string
|
||||||
|
expectedOutput: string | undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
const correctHashes: TestObject[] = [
|
||||||
|
// non-encrypted
|
||||||
|
{
|
||||||
|
input: 'b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f',
|
||||||
|
expectedOutput: 'b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
input: 'http://gateway.org/bzz/b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f',
|
||||||
|
expectedOutput: 'b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
input: 'https://gateway.org/b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f',
|
||||||
|
expectedOutput: 'b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
input: 'http://gateway.org/bzz/b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f/',
|
||||||
|
expectedOutput: 'b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
input: 'https://gateway.org/b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f/',
|
||||||
|
expectedOutput: 'b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f',
|
||||||
|
},
|
||||||
|
// encrypted
|
||||||
|
{
|
||||||
|
input:
|
||||||
|
'b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3fb7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f',
|
||||||
|
expectedOutput:
|
||||||
|
'b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3fb7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
input:
|
||||||
|
'http://gateway.org/bzz/b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3fb7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f',
|
||||||
|
expectedOutput:
|
||||||
|
'b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3fb7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
input:
|
||||||
|
'https://gateway.org/b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3fb7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f',
|
||||||
|
expectedOutput:
|
||||||
|
'b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3fb7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
input:
|
||||||
|
'http://gateway.org/bzz/b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3fb7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f/',
|
||||||
|
expectedOutput:
|
||||||
|
'b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3fb7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
input:
|
||||||
|
'https://gateway.org/b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3fb7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f/',
|
||||||
|
expectedOutput:
|
||||||
|
'b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3fb7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3f',
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
const wrongHashes: string[] = [
|
||||||
|
// one character too long
|
||||||
|
'b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3fa',
|
||||||
|
'http://gateway.org/bzz/b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3fa',
|
||||||
|
'https://gateway.org/b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3fa',
|
||||||
|
'http://gateway.org/bzz/b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3fa/',
|
||||||
|
'https://gateway.org/b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d3fa/',
|
||||||
|
|
||||||
|
// a bit shorter
|
||||||
|
'b7e53783114e4555384d7fd7154eb8c2e3f7c749c176dcb8f4015b08161b3d',
|
||||||
|
]
|
||||||
|
|
||||||
|
describe('extractSwarmHash', () => {
|
||||||
|
test('should correctly extract hash', () => {
|
||||||
|
correctHashes.forEach(({ input, expectedOutput }) => {
|
||||||
|
const hash = extractSwarmHash(input)
|
||||||
|
expect(hash).toBe(expectedOutput)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
test('should not extract hash from incorrect inputs', () => {
|
||||||
|
wrongHashes.forEach(input => {
|
||||||
|
const hash = extractSwarmHash(input)
|
||||||
|
expect(hash).toBe(undefined)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
const correctCids: TestObject[] = [
|
||||||
|
{
|
||||||
|
input: 'https://bah5acgza5afd34lfvo7sowxfjahj4ujeduxgg2ge5u3zo4kcjlzjzi23fhka.bzz.link',
|
||||||
|
expectedOutput: 'e80a3df165abbf275ae5480e9e51241d2e6368c4ed379771424af29ca35b29d4',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
input: 'https://bah5acgza2lzgtqfztvn3xtnzhv7qvbmblljd7bi52l5jiueretcad55vookq.bzz.link',
|
||||||
|
expectedOutput: 'd2f269c0b99d5bbbcdb93d7f0a85815ad23f851dd2fa94509124c401f7b57395',
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const wrongCids: string[] = [
|
||||||
|
'https://bah5acgza5afd34lfvo7sowxfjahj4ujeduxgg2ge5u3zo4kcjlzjzi23fhka.another.domain',
|
||||||
|
'http://bah5acgza2lzgtqfztvn3xtnzhv7qvbmblljd7bi52l5jiueretcad55vookq.bzz.link',
|
||||||
|
'https://not_cid.bzz.link',
|
||||||
|
'https://bah5acgza5afd34lfvo7sowxfjahj4ujeduxgg2ge5u3zo4kcjlzjzi23fhka.subdomain.bzz.link',
|
||||||
|
'https://bah5acgza5afd34lfvo7sowxfjahj4ujeduxgg2ge5u3zo4kcjlzjzi23fhka.subdomain.bzz.link',
|
||||||
|
'https://bah5acgza2lzgtqfztvn3xtnzhv7qvbmblljd7bi52l5jiueretcad55vook.bzz.link',
|
||||||
|
'https://aah5acgza2lzgtqfztvn3xtnzhv7qvbmblljd7bi52l5jiueretcad55vookq.bzz.link',
|
||||||
|
]
|
||||||
|
|
||||||
|
describe('extractSwarmCid', () => {
|
||||||
|
test('should correctly extract hash', () => {
|
||||||
|
correctCids.forEach(({ input, expectedOutput }) => {
|
||||||
|
const hash = extractSwarmCid(input)
|
||||||
|
expect(hash).toBe(expectedOutput)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
test('should not extract cid from incorrect urls', () => {
|
||||||
|
wrongCids.forEach(url => {
|
||||||
|
const hash = extractSwarmCid(url)
|
||||||
|
expect(hash).toBe(undefined)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('recognizeSwarmHash', () => {
|
||||||
|
test('should correctly extract hash', () => {
|
||||||
|
;[...correctHashes, ...correctCids].forEach(({ input, expectedOutput }) => {
|
||||||
|
const hash = recognizeSwarmHash(input)
|
||||||
|
expect(hash).toBe(expectedOutput)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
test('should not extract hash from incorrect inputs but instead return them', () => {
|
||||||
|
;[...wrongHashes, ...wrongCids].forEach(url => {
|
||||||
|
const hash = recognizeSwarmHash(url)
|
||||||
|
expect(hash).toBe(url)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
+73
-30
@@ -1,5 +1,8 @@
|
|||||||
import { NumberString } from '@ethersphere/bee-js'
|
|
||||||
import { BigNumber } from 'bignumber.js'
|
import { BigNumber } from 'bignumber.js'
|
||||||
|
import { Token } from '../models/Token'
|
||||||
|
import { decodeCid } from '@ethersphere/swarm-cid'
|
||||||
|
import { BZZ_LINK_DOMAIN } from '../constants'
|
||||||
|
import { BatchId, BeeDebug, PostageBatch } from '@ethersphere/bee-js'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test if value is an integer
|
* Test if value is an integer
|
||||||
@@ -108,10 +111,41 @@ export function makeRetriablePromise<T>(fn: () => Promise<T>, maxRetries = 3, de
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export function extractSwarmHash(string: string): string | null {
|
// Matches exactly 64 or 128 caracters alphanumeric characters that are surrounded by non-alpha num characters
|
||||||
const matches = string.match(/[a-fA-F0-9]{64,128}/)
|
const regexpMatchHash = /(?:^|[^a-f0-9]+)([a-f0-9]{64}|[a-f0-9]{128})(?:$|[^a-f0-9]+)/i
|
||||||
|
|
||||||
return (matches && matches[0]) || null
|
export function extractSwarmHash(string: string): string | undefined {
|
||||||
|
const matches = string.match(regexpMatchHash)
|
||||||
|
|
||||||
|
return (matches && matches[1]) || undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
// Matches the CID from bzz-link subdomain
|
||||||
|
const regexpMatchCID = new RegExp(`https://(bah5acgza[a-z0-9]{52})\\.${BZZ_LINK_DOMAIN}`, 'i')
|
||||||
|
|
||||||
|
export function extractSwarmCid(s: string): string | undefined {
|
||||||
|
const matches = s.match(regexpMatchCID)
|
||||||
|
|
||||||
|
if (!matches || !matches[1]) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const cid = matches[1]
|
||||||
|
try {
|
||||||
|
const decodeResult = decodeCid(cid)
|
||||||
|
|
||||||
|
if (!decodeResult.type) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
return decodeResult.reference
|
||||||
|
} catch (e) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function recognizeSwarmHash(value: string): string {
|
||||||
|
return extractSwarmHash(value) || extractSwarmCid(value) || value
|
||||||
}
|
}
|
||||||
|
|
||||||
export function uuidV4(): string {
|
export function uuidV4(): string {
|
||||||
@@ -159,38 +193,21 @@ export function secondsToTimeString(seconds: number): string {
|
|||||||
return `${unit.toFixed(1)} years`
|
return `${unit.toFixed(1)} years`
|
||||||
}
|
}
|
||||||
|
|
||||||
export function formatBzz(amount: number): string {
|
|
||||||
const asString = amount.toFixed(16)
|
|
||||||
|
|
||||||
let indexOfSignificantDigit = -1
|
|
||||||
let reachedDecimalPoint = false
|
|
||||||
|
|
||||||
for (let i = 0; i < asString.length; i++) {
|
|
||||||
const char = asString[i]
|
|
||||||
|
|
||||||
if (char === '.') {
|
|
||||||
reachedDecimalPoint = true
|
|
||||||
} else if (reachedDecimalPoint && char !== '0') {
|
|
||||||
indexOfSignificantDigit = i
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return asString.slice(0, indexOfSignificantDigit + 4)
|
|
||||||
}
|
|
||||||
|
|
||||||
export function convertDepthToBytes(depth: number): number {
|
export function convertDepthToBytes(depth: number): number {
|
||||||
return 2 ** depth * 4096
|
return 2 ** depth * 4096
|
||||||
}
|
}
|
||||||
|
|
||||||
export function convertAmountToSeconds(amount: number): number {
|
export function convertAmountToSeconds(amount: number, pricePerBlock: number): number {
|
||||||
return amount / 10 / 1
|
// TODO: blocktime should come directly from the blockchain as it may differ between different networks
|
||||||
|
const blockTime = 5 // On mainnet there is 5 seconds between blocks
|
||||||
|
|
||||||
|
// See https://github.com/ethersphere/bee/blob/66f079930d739182c4c79eb6008784afeeba1096/pkg/debugapi/postage.go#L410-L413
|
||||||
|
return (amount * blockTime) / pricePerBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
export function calculateStampPrice(depth: number, amount: number, currentPrice: NumberString): number {
|
export function calculateStampPrice(depth: number, amount: bigint): Token {
|
||||||
const price = parseInt(currentPrice, 10)
|
// See https://github.com/ethersphere/bee/blob/66f079930d739182c4c79eb6008784afeeba1096/pkg/debugapi/postage.go#L410-L413
|
||||||
|
return new Token(amount * BigInt(2 ** depth)) // FIXME: the 2 ** depth should be performed on bigint already
|
||||||
return (amount * 2 ** (depth - 16) * price) / 1e16
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function shortenText(text: string, length = 20, separator = '[…]'): string {
|
export function shortenText(text: string, length = 20, separator = '[…]'): string {
|
||||||
@@ -200,3 +217,29 @@ export function shortenText(text: string, length = 20, separator = '[…]'): str
|
|||||||
|
|
||||||
return `${text.slice(0, length)}${separator}${text.slice(-length)}`
|
return `${text.slice(0, length)}${separator}${text.slice(-length)}`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const DEFAULT_POLLING_FREQUENCY = 1_000
|
||||||
|
const DEFAULT_STAMP_USABLE_TIMEOUT = 120_000
|
||||||
|
|
||||||
|
interface Options {
|
||||||
|
pollingFrequency?: number
|
||||||
|
timeout?: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function waitUntilStampUsable(
|
||||||
|
batchId: BatchId,
|
||||||
|
beeDebug: BeeDebug,
|
||||||
|
options?: Options,
|
||||||
|
): Promise<PostageBatch> {
|
||||||
|
const timeout = options?.timeout || DEFAULT_STAMP_USABLE_TIMEOUT
|
||||||
|
const pollingFrequency = options?.pollingFrequency || DEFAULT_POLLING_FREQUENCY
|
||||||
|
|
||||||
|
for (let i = 0; i < timeout; i += pollingFrequency) {
|
||||||
|
const stamp = await beeDebug.getPostageBatch(batchId)
|
||||||
|
|
||||||
|
if (stamp.usable) return stamp
|
||||||
|
await sleepMs(pollingFrequency)
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error('Wait until stamp usable timeout has been reached')
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||||
|
|
||||||
|
import axios from 'axios'
|
||||||
|
|
||||||
|
export function getJson<T extends Record<string, any>>(url: string): Promise<T> {
|
||||||
|
return sendRequest(url, 'GET') as Promise<T>
|
||||||
|
}
|
||||||
|
|
||||||
|
export function postJson(url: string, data?: Record<string, any>): Promise<Record<string, unknown>> {
|
||||||
|
return sendRequest(url, 'POST', data)
|
||||||
|
}
|
||||||
|
|
||||||
|
async function sendRequest(
|
||||||
|
url: string,
|
||||||
|
method: 'GET' | 'POST',
|
||||||
|
data?: Record<string, unknown>,
|
||||||
|
): Promise<Record<string, any>> {
|
||||||
|
const authorization = localStorage.getItem('apiKey')
|
||||||
|
|
||||||
|
if (!authorization) {
|
||||||
|
throw Error('API key not found in local storage')
|
||||||
|
}
|
||||||
|
const headers = {
|
||||||
|
authorization,
|
||||||
|
}
|
||||||
|
const response = await axios(url, {
|
||||||
|
method,
|
||||||
|
headers,
|
||||||
|
data,
|
||||||
|
})
|
||||||
|
|
||||||
|
return response.data
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
import { debounce } from '@material-ui/core'
|
||||||
|
import axios from 'axios'
|
||||||
|
import { Contract, providers } from 'ethers'
|
||||||
|
|
||||||
|
const PROVIDER = 'https://gno.getblock.io/mainnet/?api_key=d7b92d96-9784-49a8-a800-b3edd1647fc7'
|
||||||
|
|
||||||
|
async function eth_getBalance(address: string): Promise<string> {
|
||||||
|
if (!address.startsWith('0x')) {
|
||||||
|
address = `0x${address}`
|
||||||
|
}
|
||||||
|
const response = await axios(PROVIDER, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'content-type': 'application/json',
|
||||||
|
},
|
||||||
|
data: {
|
||||||
|
jsonrpc: '2.0',
|
||||||
|
method: 'eth_getBalance',
|
||||||
|
params: [address, 'latest'],
|
||||||
|
id: 1,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
return response.data.result
|
||||||
|
}
|
||||||
|
|
||||||
|
const partialERC20tokenABI = [
|
||||||
|
{
|
||||||
|
constant: true,
|
||||||
|
inputs: [
|
||||||
|
{
|
||||||
|
name: '_owner',
|
||||||
|
type: 'address',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
name: 'balanceOf',
|
||||||
|
outputs: [
|
||||||
|
{
|
||||||
|
name: 'balance',
|
||||||
|
type: 'uint256',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
payable: false,
|
||||||
|
type: 'function',
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
const provider = new providers.JsonRpcProvider(PROVIDER)
|
||||||
|
|
||||||
|
async function eth_getBalanceERC20(
|
||||||
|
address: string,
|
||||||
|
tokenAddress = '0xdbf3ea6f5bee45c02255b2c26a16f300502f68da',
|
||||||
|
): Promise<string> {
|
||||||
|
if (!address.startsWith('0x')) {
|
||||||
|
address = `0x${address}`
|
||||||
|
}
|
||||||
|
const contract = new Contract(tokenAddress, partialERC20tokenABI, provider)
|
||||||
|
const balance = await contract.balanceOf(address)
|
||||||
|
|
||||||
|
return balance.toString()
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Rpc = {
|
||||||
|
eth_getBalance: debounce(eth_getBalance, 1_000),
|
||||||
|
eth_getBalanceERC20: debounce(eth_getBalanceERC20, 1_000),
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
const OPTIMAL_CONNECTED_PEERS = 200
|
const OPTIMAL_CONNECTED_PEERS = 100
|
||||||
const OPTIMAL_POPULATION = 100000
|
const OPTIMAL_POPULATION = 1000
|
||||||
const OPTIMAL_DEPTH = 12
|
const OPTIMAL_DEPTH = 4
|
||||||
|
|
||||||
interface Threshold {
|
interface Threshold {
|
||||||
minimumValue: number
|
minimumValue: number
|
||||||
|
|||||||
Reference in New Issue
Block a user