Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 bee-worker
|
57dca48f3e | ||
 Cafe137
|
a768b4ea06 | ||
|
bee-worker
|
026783924f | ||
 Vojtech Simetka
|
5917a13317 | ||
|
Vojtech Simetka
|
b6f138b423 |
@@ -1,5 +1,14 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [0.16.0](https://github.com/ethersphere/bee-dashboard/compare/v0.15.0...v0.16.0) (2022-06-02)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add light node upgrade top up methods ([#372](https://github.com/ethersphere/bee-dashboard/issues/372)) ([a768b4e](https://github.com/ethersphere/bee-dashboard/commit/a768b4ea0675596f6fe49771ef9d0755af00db56))
|
||||||
|
* allow for the port to be configured ([#370](https://github.com/ethersphere/bee-dashboard/issues/370)) ([b6f138b](https://github.com/ethersphere/bee-dashboard/commit/b6f138b423cbe18b078fd38ea64b4c7a839d4e6e))
|
||||||
|
* recognize ens domains ([#351](https://github.com/ethersphere/bee-dashboard/issues/351)) ([5917a13](https://github.com/ethersphere/bee-dashboard/commit/5917a133172c9e2fc0a81fb2fa19ea29ff976d03))
|
||||||
|
|
||||||
## [0.15.0](https://github.com/ethersphere/bee-dashboard/compare/v0.14.0...v0.15.0) (2022-05-16)
|
## [0.15.0](https://github.com/ethersphere/bee-dashboard/compare/v0.14.0...v0.15.0) (2022-05-16)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -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.5.1-d0a77598<!-- SUPPORTED_BEE_END -->**.
|
This project is intended to be used with **Bee version <!-- SUPPORTED_BEE_START -->1.6.0-6ceadd35<!-- 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).
|
||||||
@@ -60,6 +60,15 @@ bee-dashboard
|
|||||||
|
|
||||||
This should open the webpage on [`http://localhost:8080`](http://localhost:8080)
|
This should open the webpage on [`http://localhost:8080`](http://localhost:8080)
|
||||||
|
|
||||||
|
You can also define your own port with the `PORT` environment variable. E.g.
|
||||||
|
|
||||||
|
```sh
|
||||||
|
export PORT=3005
|
||||||
|
bee-dashboard
|
||||||
|
```
|
||||||
|
|
||||||
|
Will start the bee-dashboard on [`http://localhost:3005`](http://localhost:3005)
|
||||||
|
|
||||||
### Docker
|
### Docker
|
||||||
|
|
||||||
To build Docker image and run it, execute the following from inside project directory:
|
To build Docker image and run it, execute the following from inside project directory:
|
||||||
|
|||||||
Generated
+128
-120
@@ -1,15 +1,15 @@
|
|||||||
{
|
{
|
||||||
"name": "@ethersphere/bee-dashboard",
|
"name": "@ethersphere/bee-dashboard",
|
||||||
"version": "0.15.0",
|
"version": "0.16.0",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "@ethersphere/bee-dashboard",
|
"name": "@ethersphere/bee-dashboard",
|
||||||
"version": "0.15.0",
|
"version": "0.16.0",
|
||||||
"license": "BSD-3-Clause",
|
"license": "BSD-3-Clause",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@ethersphere/bee-js": "^3.3.4",
|
"@ethersphere/bee-js": "^4.1.1",
|
||||||
"@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",
|
||||||
@@ -2219,10 +2219,11 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@ethersphere/bee-js": {
|
"node_modules/@ethersphere/bee-js": {
|
||||||
"version": "3.3.4",
|
"version": "4.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/@ethersphere/bee-js/-/bee-js-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@ethersphere/bee-js/-/bee-js-4.1.1.tgz",
|
||||||
"integrity": "sha512-uxH0kR31tE8IKVON7jyQHANZ/5edlU8OUCz/qyRft1YeS+L4HzEHAD3bN58iE842nt6Iz/fekrJ7yk1ONIcDBg==",
|
"integrity": "sha512-4hbgi7rHnku+2pv352z7txV6IhP+2iipCKaQS4sOFhjieui44LE0Lox8gy5tud9tY2wRN2wY6LTqvo2EaYrVRQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@ethersphere/swarm-cid": "^0.1.0",
|
||||||
"@types/readable-stream": "^2.3.13",
|
"@types/readable-stream": "^2.3.13",
|
||||||
"bufferutil": "^4.0.6",
|
"bufferutil": "^4.0.6",
|
||||||
"elliptic": "^6.5.4",
|
"elliptic": "^6.5.4",
|
||||||
@@ -2235,12 +2236,12 @@
|
|||||||
"tar-js": "^0.3.0",
|
"tar-js": "^0.3.0",
|
||||||
"utf-8-validate": "^5.0.9",
|
"utf-8-validate": "^5.0.9",
|
||||||
"web-streams-polyfill": "^4.0.0-beta.1",
|
"web-streams-polyfill": "^4.0.0-beta.1",
|
||||||
"ws": "^8.5.0"
|
"ws": "^8.6.0"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"bee": "1.5.1-d0a77598",
|
"bee": "1.6.0-6ceadd35",
|
||||||
"beeApiVersion": "3.0.0",
|
"beeApiVersion": "3.0.1",
|
||||||
"beeDebugApiVersion": "2.0.0",
|
"beeDebugApiVersion": "2.0.1",
|
||||||
"node": ">=12.0.0",
|
"node": ">=12.0.0",
|
||||||
"npm": ">=6.0.0"
|
"npm": ">=6.0.0"
|
||||||
}
|
}
|
||||||
@@ -2254,9 +2255,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@ethersphere/bee-js/node_modules/ws": {
|
"node_modules/@ethersphere/bee-js/node_modules/ws": {
|
||||||
"version": "8.5.0",
|
"version": "8.7.0",
|
||||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
|
"resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz",
|
||||||
"integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
|
"integrity": "sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=10.0.0"
|
"node": ">=10.0.0"
|
||||||
},
|
},
|
||||||
@@ -2685,62 +2686,6 @@
|
|||||||
"@ethersproject/logger": "^5.6.0"
|
"@ethersproject/logger": "^5.6.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@ethersproject/providers": {
|
|
||||||
"version": "5.6.4",
|
|
||||||
"resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.6.4.tgz",
|
|
||||||
"integrity": "sha512-WAdknnaZ52hpHV3qPiJmKx401BLpup47h36Axxgre9zT+doa/4GC/Ne48ICPxTm0BqndpToHjpLP1ZnaxyE+vw==",
|
|
||||||
"funding": [
|
|
||||||
{
|
|
||||||
"type": "individual",
|
|
||||||
"url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "individual",
|
|
||||||
"url": "https://www.buymeacoffee.com/ricmoo"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"dependencies": {
|
|
||||||
"@ethersproject/abstract-provider": "^5.6.0",
|
|
||||||
"@ethersproject/abstract-signer": "^5.6.0",
|
|
||||||
"@ethersproject/address": "^5.6.0",
|
|
||||||
"@ethersproject/basex": "^5.6.0",
|
|
||||||
"@ethersproject/bignumber": "^5.6.0",
|
|
||||||
"@ethersproject/bytes": "^5.6.0",
|
|
||||||
"@ethersproject/constants": "^5.6.0",
|
|
||||||
"@ethersproject/hash": "^5.6.0",
|
|
||||||
"@ethersproject/logger": "^5.6.0",
|
|
||||||
"@ethersproject/networks": "^5.6.0",
|
|
||||||
"@ethersproject/properties": "^5.6.0",
|
|
||||||
"@ethersproject/random": "^5.6.0",
|
|
||||||
"@ethersproject/rlp": "^5.6.0",
|
|
||||||
"@ethersproject/sha2": "^5.6.0",
|
|
||||||
"@ethersproject/strings": "^5.6.0",
|
|
||||||
"@ethersproject/transactions": "^5.6.0",
|
|
||||||
"@ethersproject/web": "^5.6.0",
|
|
||||||
"bech32": "1.1.4",
|
|
||||||
"ws": "7.4.6"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@ethersproject/providers/node_modules/ws": {
|
|
||||||
"version": "7.4.6",
|
|
||||||
"resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
|
|
||||||
"integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8.3.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"bufferutil": "^4.0.1",
|
|
||||||
"utf-8-validate": "^5.0.2"
|
|
||||||
},
|
|
||||||
"peerDependenciesMeta": {
|
|
||||||
"bufferutil": {
|
|
||||||
"optional": true
|
|
||||||
},
|
|
||||||
"utf-8-validate": {
|
|
||||||
"optional": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@ethersproject/random": {
|
"node_modules/@ethersproject/random": {
|
||||||
"version": "5.6.0",
|
"version": "5.6.0",
|
||||||
"resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.6.0.tgz",
|
"resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.6.0.tgz",
|
||||||
@@ -7461,14 +7406,20 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/caniuse-lite": {
|
"node_modules/caniuse-lite": {
|
||||||
"version": "1.0.30001278",
|
"version": "1.0.30001344",
|
||||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001278.tgz",
|
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001344.tgz",
|
||||||
"integrity": "sha512-mpF9KeH8u5cMoEmIic/cr7PNS+F5LWBk0t2ekGT60lFf0Wq+n9LspAj0g3P+o7DQhD3sUdlMln4YFAWhFYn9jg==",
|
"integrity": "sha512-0ZFjnlCaXNOAYcV7i+TtdKBp0L/3XEU2MF/x6Du1lrh+SRX4IfzIVL4HNJg5pB2PmFb8rszIGyOvsZnqqRoc2g==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"funding": {
|
"funding": [
|
||||||
"type": "opencollective",
|
{
|
||||||
"url": "https://opencollective.com/browserslist"
|
"type": "opencollective",
|
||||||
}
|
"url": "https://opencollective.com/browserslist"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "tidelift",
|
||||||
|
"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
|
||||||
|
}
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"node_modules/capture-exit": {
|
"node_modules/capture-exit": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
@@ -11031,6 +10982,62 @@
|
|||||||
"@ethersproject/wordlists": "5.6.0"
|
"@ethersproject/wordlists": "5.6.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/ethers/node_modules/@ethersproject/providers": {
|
||||||
|
"version": "5.6.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.6.4.tgz",
|
||||||
|
"integrity": "sha512-WAdknnaZ52hpHV3qPiJmKx401BLpup47h36Axxgre9zT+doa/4GC/Ne48ICPxTm0BqndpToHjpLP1ZnaxyE+vw==",
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"type": "individual",
|
||||||
|
"url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "individual",
|
||||||
|
"url": "https://www.buymeacoffee.com/ricmoo"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"dependencies": {
|
||||||
|
"@ethersproject/abstract-provider": "^5.6.0",
|
||||||
|
"@ethersproject/abstract-signer": "^5.6.0",
|
||||||
|
"@ethersproject/address": "^5.6.0",
|
||||||
|
"@ethersproject/basex": "^5.6.0",
|
||||||
|
"@ethersproject/bignumber": "^5.6.0",
|
||||||
|
"@ethersproject/bytes": "^5.6.0",
|
||||||
|
"@ethersproject/constants": "^5.6.0",
|
||||||
|
"@ethersproject/hash": "^5.6.0",
|
||||||
|
"@ethersproject/logger": "^5.6.0",
|
||||||
|
"@ethersproject/networks": "^5.6.0",
|
||||||
|
"@ethersproject/properties": "^5.6.0",
|
||||||
|
"@ethersproject/random": "^5.6.0",
|
||||||
|
"@ethersproject/rlp": "^5.6.0",
|
||||||
|
"@ethersproject/sha2": "^5.6.0",
|
||||||
|
"@ethersproject/strings": "^5.6.0",
|
||||||
|
"@ethersproject/transactions": "^5.6.0",
|
||||||
|
"@ethersproject/web": "^5.6.0",
|
||||||
|
"bech32": "1.1.4",
|
||||||
|
"ws": "7.4.6"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/ethers/node_modules/ws": {
|
||||||
|
"version": "7.4.6",
|
||||||
|
"resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
|
||||||
|
"integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=8.3.0"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"bufferutil": "^4.0.1",
|
||||||
|
"utf-8-validate": "^5.0.2"
|
||||||
|
},
|
||||||
|
"peerDependenciesMeta": {
|
||||||
|
"bufferutil": {
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
|
"utf-8-validate": {
|
||||||
|
"optional": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/event-target-shim": {
|
"node_modules/event-target-shim": {
|
||||||
"version": "5.0.1",
|
"version": "5.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
|
||||||
@@ -30872,10 +30879,11 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@ethersphere/bee-js": {
|
"@ethersphere/bee-js": {
|
||||||
"version": "3.3.4",
|
"version": "4.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/@ethersphere/bee-js/-/bee-js-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@ethersphere/bee-js/-/bee-js-4.1.1.tgz",
|
||||||
"integrity": "sha512-uxH0kR31tE8IKVON7jyQHANZ/5edlU8OUCz/qyRft1YeS+L4HzEHAD3bN58iE842nt6Iz/fekrJ7yk1ONIcDBg==",
|
"integrity": "sha512-4hbgi7rHnku+2pv352z7txV6IhP+2iipCKaQS4sOFhjieui44LE0Lox8gy5tud9tY2wRN2wY6LTqvo2EaYrVRQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
|
"@ethersphere/swarm-cid": "^0.1.0",
|
||||||
"@types/readable-stream": "^2.3.13",
|
"@types/readable-stream": "^2.3.13",
|
||||||
"bufferutil": "^4.0.6",
|
"bufferutil": "^4.0.6",
|
||||||
"elliptic": "^6.5.4",
|
"elliptic": "^6.5.4",
|
||||||
@@ -30888,7 +30896,7 @@
|
|||||||
"tar-js": "^0.3.0",
|
"tar-js": "^0.3.0",
|
||||||
"utf-8-validate": "^5.0.9",
|
"utf-8-validate": "^5.0.9",
|
||||||
"web-streams-polyfill": "^4.0.0-beta.1",
|
"web-streams-polyfill": "^4.0.0-beta.1",
|
||||||
"ws": "^8.5.0"
|
"ws": "^8.6.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"web-streams-polyfill": {
|
"web-streams-polyfill": {
|
||||||
@@ -30897,9 +30905,9 @@
|
|||||||
"integrity": "sha512-3ux37gEX670UUphBF9AMCq8XM6iQ8Ac6A+DSRRjDoRBm1ufCkaCDdNVbaqq60PsEkdNlLKrGtv/YBP4EJXqNtQ=="
|
"integrity": "sha512-3ux37gEX670UUphBF9AMCq8XM6iQ8Ac6A+DSRRjDoRBm1ufCkaCDdNVbaqq60PsEkdNlLKrGtv/YBP4EJXqNtQ=="
|
||||||
},
|
},
|
||||||
"ws": {
|
"ws": {
|
||||||
"version": "8.5.0",
|
"version": "8.7.0",
|
||||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
|
"resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz",
|
||||||
"integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
|
"integrity": "sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==",
|
||||||
"requires": {}
|
"requires": {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -31134,40 +31142,6 @@
|
|||||||
"@ethersproject/logger": "^5.6.0"
|
"@ethersproject/logger": "^5.6.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@ethersproject/providers": {
|
|
||||||
"version": "5.6.4",
|
|
||||||
"resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.6.4.tgz",
|
|
||||||
"integrity": "sha512-WAdknnaZ52hpHV3qPiJmKx401BLpup47h36Axxgre9zT+doa/4GC/Ne48ICPxTm0BqndpToHjpLP1ZnaxyE+vw==",
|
|
||||||
"requires": {
|
|
||||||
"@ethersproject/abstract-provider": "^5.6.0",
|
|
||||||
"@ethersproject/abstract-signer": "^5.6.0",
|
|
||||||
"@ethersproject/address": "^5.6.0",
|
|
||||||
"@ethersproject/basex": "^5.6.0",
|
|
||||||
"@ethersproject/bignumber": "^5.6.0",
|
|
||||||
"@ethersproject/bytes": "^5.6.0",
|
|
||||||
"@ethersproject/constants": "^5.6.0",
|
|
||||||
"@ethersproject/hash": "^5.6.0",
|
|
||||||
"@ethersproject/logger": "^5.6.0",
|
|
||||||
"@ethersproject/networks": "^5.6.0",
|
|
||||||
"@ethersproject/properties": "^5.6.0",
|
|
||||||
"@ethersproject/random": "^5.6.0",
|
|
||||||
"@ethersproject/rlp": "^5.6.0",
|
|
||||||
"@ethersproject/sha2": "^5.6.0",
|
|
||||||
"@ethersproject/strings": "^5.6.0",
|
|
||||||
"@ethersproject/transactions": "^5.6.0",
|
|
||||||
"@ethersproject/web": "^5.6.0",
|
|
||||||
"bech32": "1.1.4",
|
|
||||||
"ws": "7.4.6"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"ws": {
|
|
||||||
"version": "7.4.6",
|
|
||||||
"resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
|
|
||||||
"integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
|
|
||||||
"requires": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"@ethersproject/random": {
|
"@ethersproject/random": {
|
||||||
"version": "5.6.0",
|
"version": "5.6.0",
|
||||||
"resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.6.0.tgz",
|
"resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.6.0.tgz",
|
||||||
@@ -34893,9 +34867,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"caniuse-lite": {
|
"caniuse-lite": {
|
||||||
"version": "1.0.30001278",
|
"version": "1.0.30001344",
|
||||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001278.tgz",
|
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001344.tgz",
|
||||||
"integrity": "sha512-mpF9KeH8u5cMoEmIic/cr7PNS+F5LWBk0t2ekGT60lFf0Wq+n9LspAj0g3P+o7DQhD3sUdlMln4YFAWhFYn9jg==",
|
"integrity": "sha512-0ZFjnlCaXNOAYcV7i+TtdKBp0L/3XEU2MF/x6Du1lrh+SRX4IfzIVL4HNJg5pB2PmFb8rszIGyOvsZnqqRoc2g==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"capture-exit": {
|
"capture-exit": {
|
||||||
@@ -37673,6 +37647,40 @@
|
|||||||
"@ethersproject/wallet": "5.6.0",
|
"@ethersproject/wallet": "5.6.0",
|
||||||
"@ethersproject/web": "5.6.0",
|
"@ethersproject/web": "5.6.0",
|
||||||
"@ethersproject/wordlists": "5.6.0"
|
"@ethersproject/wordlists": "5.6.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@ethersproject/providers": {
|
||||||
|
"version": "5.6.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.6.4.tgz",
|
||||||
|
"integrity": "sha512-WAdknnaZ52hpHV3qPiJmKx401BLpup47h36Axxgre9zT+doa/4GC/Ne48ICPxTm0BqndpToHjpLP1ZnaxyE+vw==",
|
||||||
|
"requires": {
|
||||||
|
"@ethersproject/abstract-provider": "^5.6.0",
|
||||||
|
"@ethersproject/abstract-signer": "^5.6.0",
|
||||||
|
"@ethersproject/address": "^5.6.0",
|
||||||
|
"@ethersproject/basex": "^5.6.0",
|
||||||
|
"@ethersproject/bignumber": "^5.6.0",
|
||||||
|
"@ethersproject/bytes": "^5.6.0",
|
||||||
|
"@ethersproject/constants": "^5.6.0",
|
||||||
|
"@ethersproject/hash": "^5.6.0",
|
||||||
|
"@ethersproject/logger": "^5.6.0",
|
||||||
|
"@ethersproject/networks": "^5.6.0",
|
||||||
|
"@ethersproject/properties": "^5.6.0",
|
||||||
|
"@ethersproject/random": "^5.6.0",
|
||||||
|
"@ethersproject/rlp": "^5.6.0",
|
||||||
|
"@ethersproject/sha2": "^5.6.0",
|
||||||
|
"@ethersproject/strings": "^5.6.0",
|
||||||
|
"@ethersproject/transactions": "^5.6.0",
|
||||||
|
"@ethersproject/web": "^5.6.0",
|
||||||
|
"bech32": "1.1.4",
|
||||||
|
"ws": "7.4.6"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"ws": {
|
||||||
|
"version": "7.4.6",
|
||||||
|
"resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
|
||||||
|
"integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
|
||||||
|
"requires": {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"event-target-shim": {
|
"event-target-shim": {
|
||||||
|
|||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ethersphere/bee-dashboard",
|
"name": "@ethersphere/bee-dashboard",
|
||||||
"version": "0.15.0",
|
"version": "0.16.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.3.4",
|
"@ethersphere/bee-js": "^4.1.1",
|
||||||
"@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",
|
||||||
|
|||||||
@@ -1,34 +1,35 @@
|
|||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
|
|
||||||
const path = require('path')
|
const path = require('path')
|
||||||
const handler = require('serve-handler');
|
const handler = require('serve-handler')
|
||||||
const http = require('http');
|
const http = require('http')
|
||||||
const opener = require('opener')
|
const opener = require('opener')
|
||||||
|
|
||||||
|
const port = process.env.PORT || 8080
|
||||||
|
|
||||||
const serverConfig = {
|
const serverConfig = {
|
||||||
public: path.join(__dirname, 'build'),
|
public: path.join(__dirname, 'build'),
|
||||||
trailingSlash: false,
|
trailingSlash: false,
|
||||||
rewrites: [
|
rewrites: [{ source: '**', destination: '/index.html' }],
|
||||||
{ source: "**", destination: "/index.html" },
|
|
||||||
],
|
|
||||||
headers: [
|
headers: [
|
||||||
{
|
{
|
||||||
source: "*",
|
source: '*',
|
||||||
headers: [{
|
headers: [
|
||||||
key: "Cache-Control",
|
{
|
||||||
value: "max-age=3600"
|
key: 'Cache-Control',
|
||||||
}]
|
value: 'max-age=3600',
|
||||||
}
|
},
|
||||||
]
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
const server = http.createServer((request, response) => {
|
const server = http.createServer((request, response) => {
|
||||||
|
return handler(request, response, serverConfig)
|
||||||
return handler(request, response, serverConfig);
|
|
||||||
})
|
})
|
||||||
|
|
||||||
server.listen(8080, () => {
|
server.listen(port, () => {
|
||||||
console.log('Starting up Bee Dashboard on address http://localhost:8080')
|
console.log(`Starting up Bee Dashboard on address http://localhost:${port}`)
|
||||||
console.log('Hit CTRL-C to stop the server')
|
console.log('Hit CTRL-C to stop the server')
|
||||||
opener('http://localhost:8080')
|
opener(`http://localhost:${port}`)
|
||||||
})
|
})
|
||||||
|
|||||||
+13
-10
@@ -11,6 +11,7 @@ import { Provider as FileProvider } from './providers/File'
|
|||||||
import { Provider as PlatformProvider } from './providers/Platform'
|
import { Provider as PlatformProvider } from './providers/Platform'
|
||||||
import { Provider as SettingsProvider } from './providers/Settings'
|
import { Provider as SettingsProvider } from './providers/Settings'
|
||||||
import { Provider as StampsProvider } from './providers/Stamps'
|
import { Provider as StampsProvider } from './providers/Stamps'
|
||||||
|
import { Provider as TopUpProvider } from './providers/TopUp'
|
||||||
import BaseRouter from './routes'
|
import BaseRouter from './routes'
|
||||||
import { theme } from './theme'
|
import { theme } from './theme'
|
||||||
|
|
||||||
@@ -29,16 +30,18 @@ const App = ({ beeApiUrl, beeDebugApiUrl, lockedApiSettings }: Props): ReactElem
|
|||||||
<FileProvider>
|
<FileProvider>
|
||||||
<FeedsProvider>
|
<FeedsProvider>
|
||||||
<PlatformProvider>
|
<PlatformProvider>
|
||||||
<SnackbarProvider>
|
<TopUpProvider>
|
||||||
<Router>
|
<SnackbarProvider>
|
||||||
<>
|
<Router>
|
||||||
<CssBaseline />
|
<>
|
||||||
<Dashboard>
|
<CssBaseline />
|
||||||
<BaseRouter />
|
<Dashboard>
|
||||||
</Dashboard>
|
<BaseRouter />
|
||||||
</>
|
</Dashboard>
|
||||||
</Router>
|
</>
|
||||||
</SnackbarProvider>
|
</Router>
|
||||||
|
</SnackbarProvider>
|
||||||
|
</TopUpProvider>
|
||||||
</PlatformProvider>
|
</PlatformProvider>
|
||||||
</FeedsProvider>
|
</FeedsProvider>
|
||||||
</FileProvider>
|
</FileProvider>
|
||||||
|
|||||||
@@ -1,54 +0,0 @@
|
|||||||
import { ReactElement, useState, useContext } from 'react'
|
|
||||||
import { makeStyles, Theme, createStyles } from '@material-ui/core/styles'
|
|
||||||
import { Alert, AlertTitle } from '@material-ui/lab'
|
|
||||||
import Collapse from '@material-ui/core/Collapse'
|
|
||||||
import IconButton from '@material-ui/core/IconButton'
|
|
||||||
import CloseIcon from '@material-ui/icons/Close'
|
|
||||||
import { Context } from '../providers/Bee'
|
|
||||||
import { SUPPORTED_BEE_VERSION_EXACT } from '@ethersphere/bee-js'
|
|
||||||
|
|
||||||
const useStyles = makeStyles((theme: Theme) =>
|
|
||||||
createStyles({
|
|
||||||
root: {
|
|
||||||
width: '100%',
|
|
||||||
marginBottom: theme.spacing(2),
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
|
|
||||||
export default function VersionAlert(): ReactElement | null {
|
|
||||||
const classes = useStyles()
|
|
||||||
const { isLoading, latestUserVersionExact } = useContext(Context)
|
|
||||||
const [open, setOpen] = useState<boolean>(true)
|
|
||||||
|
|
||||||
const isExactlySupportedBeeVersion = SUPPORTED_BEE_VERSION_EXACT === latestUserVersionExact
|
|
||||||
|
|
||||||
if (isLoading || !latestUserVersionExact) return null
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Collapse in={!isExactlySupportedBeeVersion && open}>
|
|
||||||
<div className={classes.root}>
|
|
||||||
<Alert
|
|
||||||
severity="warning"
|
|
||||||
action={
|
|
||||||
<IconButton
|
|
||||||
aria-label="close"
|
|
||||||
color="inherit"
|
|
||||||
size="small"
|
|
||||||
onClick={() => {
|
|
||||||
setOpen(false)
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<CloseIcon fontSize="inherit" />
|
|
||||||
</IconButton>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<AlertTitle>Warning</AlertTitle>
|
|
||||||
Your Bee node version (<code>{latestUserVersionExact}</code>) does not exactly match the Bee version we tested
|
|
||||||
the Bee Dashboard against (<code>{SUPPORTED_BEE_VERSION_EXACT}</code>). Please note that some functionality
|
|
||||||
may not work properly.
|
|
||||||
</Alert>
|
|
||||||
</div>
|
|
||||||
</Collapse>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -6,7 +6,7 @@ import DialogContent from '@material-ui/core/DialogContent'
|
|||||||
import DialogContentText from '@material-ui/core/DialogContentText'
|
import DialogContentText from '@material-ui/core/DialogContentText'
|
||||||
import DialogTitle from '@material-ui/core/DialogTitle'
|
import DialogTitle from '@material-ui/core/DialogTitle'
|
||||||
import { useSnackbar } from 'notistack'
|
import { useSnackbar } from 'notistack'
|
||||||
import { ReactElement, useState, useContext } from 'react'
|
import { ReactElement, useContext, useState } from 'react'
|
||||||
import { Zap } from 'react-feather'
|
import { Zap } from 'react-feather'
|
||||||
import { Context as SettingsContext } from '../providers/Settings'
|
import { Context as SettingsContext } from '../providers/Settings'
|
||||||
import EthereumAddress from './EthereumAddress'
|
import EthereumAddress from './EthereumAddress'
|
||||||
@@ -61,7 +61,7 @@ export default function CheckoutModal({ peerId, uncashedAmount }: Props): ReactE
|
|||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<Button variant="contained" onClick={handleClickOpen} startIcon={<Zap size="1rem" />}>
|
<Button variant="contained" onClick={handleClickOpen} startIcon={<Zap size="1rem" />}>
|
||||||
Cash out peer {peerId.substr(0, 8)}[…]
|
Cash out peer {peerId.slice(0, 8)}[…]
|
||||||
</Button>
|
</Button>
|
||||||
<Dialog open={open} onClose={handleClose} aria-labelledby="form-dialog-title">
|
<Dialog open={open} onClose={handleClose} aria-labelledby="form-dialog-title">
|
||||||
<DialogTitle id="form-dialog-title">Cashout Cheque</DialogTitle>
|
<DialogTitle id="form-dialog-title">Cashout Cheque</DialogTitle>
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ const useStyles = makeStyles((theme: Theme) =>
|
|||||||
interface Props {
|
interface Props {
|
||||||
label: string
|
label: string
|
||||||
value: string
|
value: string
|
||||||
|
expanded?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
const lengthWithoutPrefix = (s: string) => s.replace(/^0x/i, '').length
|
const lengthWithoutPrefix = (s: string) => s.replace(/^0x/i, '').length
|
||||||
@@ -54,9 +55,9 @@ const split = (s: string): string[] => {
|
|||||||
return s.match(/(0x|.{1,8})/gi) || []
|
return s.match(/(0x|.{1,8})/gi) || []
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function ExpandableListItemKey({ label, value }: Props): ReactElement | null {
|
export default function ExpandableListItemKey({ label, value, expanded }: Props): ReactElement | null {
|
||||||
const classes = useStyles()
|
const classes = useStyles()
|
||||||
const [open, setOpen] = useState(false)
|
const [open, setOpen] = useState(expanded || false)
|
||||||
const [copied, setCopied] = useState(false)
|
const [copied, setCopied] = useState(false)
|
||||||
const toggleOpen = () => setOpen(!open)
|
const toggleOpen = () => setOpen(!open)
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { Divider, Drawer, Grid, Link as MUILink, List } from '@material-ui/core'
|
|||||||
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
||||||
import { OpenInNewSharp } from '@material-ui/icons'
|
import { OpenInNewSharp } from '@material-ui/icons'
|
||||||
import type { ReactElement } from 'react'
|
import type { ReactElement } from 'react'
|
||||||
import { Bookmark, BookOpen, DollarSign, FileText, Home, Layers, Settings } from 'react-feather'
|
import { Bookmark, BookOpen, Briefcase, DollarSign, FileText, Gift, Home, Layers, Settings } from 'react-feather'
|
||||||
import { Link } from 'react-router-dom'
|
import { Link } from 'react-router-dom'
|
||||||
import Logo from '../assets/logo.svg'
|
import Logo from '../assets/logo.svg'
|
||||||
import { config } from '../config'
|
import { config } from '../config'
|
||||||
@@ -41,6 +41,16 @@ const navBarItems = [
|
|||||||
path: ROUTES.SETTINGS,
|
path: ROUTES.SETTINGS,
|
||||||
icon: Settings,
|
icon: Settings,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: 'Account',
|
||||||
|
path: ROUTES.WALLET,
|
||||||
|
icon: Briefcase,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Gift Wallets',
|
||||||
|
path: ROUTES.GIFT_CODES,
|
||||||
|
icon: Gift,
|
||||||
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
const drawerWidth = 300
|
const drawerWidth = 300
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import { Box, Divider } from '@material-ui/core'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
my?: number
|
||||||
|
mt?: number
|
||||||
|
mb?: number
|
||||||
|
color?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SwarmDivider({ my, mt, mb, color = '#cbcbcb' }: Props): ReactElement {
|
||||||
|
return (
|
||||||
|
<Box my={my} mt={mt} mb={mb}>
|
||||||
|
<Divider style={{ borderColor: color }} />
|
||||||
|
</Box>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,12 +1,8 @@
|
|||||||
import { useContext, ReactElement } from 'react'
|
import { CircularProgress, Container } from '@material-ui/core'
|
||||||
|
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
|
||||||
|
import { ReactElement, useContext } from 'react'
|
||||||
import ErrorBoundary from '../components/ErrorBoundary'
|
import ErrorBoundary from '../components/ErrorBoundary'
|
||||||
import AlertVersion from '../components/AlertVersion'
|
|
||||||
import { Container, CircularProgress } from '@material-ui/core'
|
|
||||||
|
|
||||||
import { createStyles, Theme, makeStyles } from '@material-ui/core/styles'
|
|
||||||
|
|
||||||
import SideBar from '../components/SideBar'
|
import SideBar from '../components/SideBar'
|
||||||
|
|
||||||
import { Context } from '../providers/Bee'
|
import { Context } from '../providers/Bee'
|
||||||
|
|
||||||
const useStyles = makeStyles((theme: Theme) =>
|
const useStyles = makeStyles((theme: Theme) =>
|
||||||
@@ -33,7 +29,6 @@ const Dashboard = (props: Props): ReactElement => {
|
|||||||
<Container className={classes.content}>
|
<Container className={classes.content}>
|
||||||
<ErrorBoundary>
|
<ErrorBoundary>
|
||||||
<>
|
<>
|
||||||
<AlertVersion />
|
|
||||||
{isLoading ? (
|
{isLoading ? (
|
||||||
<div style={{ textAlign: 'center', width: '100%' }}>
|
<div style={{ textAlign: 'center', width: '100%' }}>
|
||||||
<CircularProgress />
|
<CircularProgress />
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
import { BigNumber } from 'bignumber.js'
|
||||||
|
import { Token } from './Token'
|
||||||
|
|
||||||
|
export class BzzToken extends Token {
|
||||||
|
constructor(amount: BigNumber | string | BigInt) {
|
||||||
|
super(amount, 16)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
import { BigNumber } from 'bignumber.js'
|
||||||
|
import { Token } from './Token'
|
||||||
|
|
||||||
|
export class DaiToken extends Token {
|
||||||
|
constructor(amount: BigNumber | string | BigInt) {
|
||||||
|
super(amount, 18)
|
||||||
|
}
|
||||||
|
}
|
||||||
+11
-2
@@ -13,7 +13,9 @@ export class Token {
|
|||||||
constructor(amount: BigNumber | string | BigInt, decimals: digits = BZZ_DECIMALS) {
|
constructor(amount: BigNumber | string | BigInt, decimals: digits = BZZ_DECIMALS) {
|
||||||
const a = makeBigNumber(amount)
|
const a = makeBigNumber(amount)
|
||||||
|
|
||||||
if (!isInteger(a) || !POSSIBLE_DECIMALS.includes(decimals)) throw new TypeError('Not a valid token values')
|
if (!isInteger(a) || !POSSIBLE_DECIMALS.includes(decimals)) {
|
||||||
|
throw new TypeError(`Not a valid token values: ${amount} ${decimals}`)
|
||||||
|
}
|
||||||
|
|
||||||
this.amount = a
|
this.amount = a
|
||||||
this.decimals = decimals
|
this.decimals = decimals
|
||||||
@@ -59,7 +61,7 @@ export class Token {
|
|||||||
}
|
}
|
||||||
|
|
||||||
toSignificantDigits(digits = 4): string {
|
toSignificantDigits(digits = 4): string {
|
||||||
const asString = this.toDecimal.toFixed(16)
|
const asString = this.toDecimal.toFixed(this.decimals)
|
||||||
|
|
||||||
let indexOfSignificantDigit = -1
|
let indexOfSignificantDigit = -1
|
||||||
let reachedDecimalPoint = false
|
let reachedDecimalPoint = false
|
||||||
@@ -78,4 +80,11 @@ export class Token {
|
|||||||
|
|
||||||
return asString.slice(0, indexOfSignificantDigit + digits)
|
return asString.slice(0, indexOfSignificantDigit + digits)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
minusBaseUnits(amount: string): Token {
|
||||||
|
return new Token(
|
||||||
|
this.toBigNumber.minus(new BigNumber(amount).multipliedBy(new BigNumber(10).pow(this.decimals))),
|
||||||
|
this.decimals,
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,9 @@
|
|||||||
import type { ReactElement } from 'react'
|
import type { ReactElement } from 'react'
|
||||||
|
import CashoutModal from '../../components/CashoutModal'
|
||||||
import ExpandableList from '../../components/ExpandableList'
|
import ExpandableList from '../../components/ExpandableList'
|
||||||
import ExpandableListItem from '../../components/ExpandableListItem'
|
import ExpandableListItem from '../../components/ExpandableListItem'
|
||||||
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
||||||
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
||||||
|
|
||||||
import CashoutModal from '../../components/CashoutModal'
|
|
||||||
import { Accounting } from '../../hooks/accounting'
|
import { Accounting } from '../../hooks/accounting'
|
||||||
import type { Token } from '../../models/Token'
|
import type { Token } from '../../models/Token'
|
||||||
|
|
||||||
@@ -25,7 +23,7 @@ export default function PeerBalances({ accounting, isLoadingUncashed, totalUncas
|
|||||||
{accounting?.map(({ peer, balance, received, sent, uncashedAmount, total }) => (
|
{accounting?.map(({ peer, balance, received, sent, uncashedAmount, total }) => (
|
||||||
<ExpandableList
|
<ExpandableList
|
||||||
key={peer}
|
key={peer}
|
||||||
label={`Peer ${peer.substr(0, 8)}[…]`}
|
label={`Peer ${peer.slice(0, 8)}[…]`}
|
||||||
level={1}
|
level={1}
|
||||||
info={`${uncashedAmount.toFixedDecimal()} BZZ (uncashed)`}
|
info={`${uncashedAmount.toFixedDecimal()} BZZ (uncashed)`}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -1,25 +1,32 @@
|
|||||||
import * as swarmCid from '@ethersphere/swarm-cid'
|
import * as swarmCid from '@ethersphere/swarm-cid'
|
||||||
import { Box } from '@material-ui/core'
|
import { Box } from '@material-ui/core'
|
||||||
import { ReactElement } from 'react'
|
import { ReactElement } from 'react'
|
||||||
|
import { Utils } from '@ethersphere/bee-js'
|
||||||
import { DocumentationText } from '../../components/DocumentationText'
|
import { DocumentationText } from '../../components/DocumentationText'
|
||||||
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
||||||
import ExpandableListItemLink from '../../components/ExpandableListItemLink'
|
import ExpandableListItemLink from '../../components/ExpandableListItemLink'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
isWebsite?: boolean
|
isWebsite?: boolean
|
||||||
hash: string
|
reference: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export function AssetSummary({ isWebsite, hash }: Props): ReactElement {
|
export function AssetSummary({ isWebsite, reference }: Props): ReactElement {
|
||||||
|
const isHash = Utils.isHexString(reference) && reference.length === 64
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Box mb={4}>
|
<Box mb={4}>
|
||||||
<ExpandableListItemKey label="Swarm hash" value={hash} />
|
{isHash && <ExpandableListItemKey label="Swarm hash" value={reference} />}
|
||||||
<ExpandableListItemLink label="Share on Swarm Gateway" value={`https://gateway.ethswarm.org/access/${hash}`} />
|
{!isHash && <ExpandableListItemLink label="ENS" value={reference} />}
|
||||||
{isWebsite && (
|
<ExpandableListItemLink
|
||||||
|
label="Share on Swarm Gateway"
|
||||||
|
value={`https://gateway.ethswarm.org/access/${reference}`}
|
||||||
|
/>
|
||||||
|
{isWebsite && isHash && (
|
||||||
<ExpandableListItemLink
|
<ExpandableListItemLink
|
||||||
label="BZZ Link"
|
label="BZZ Link"
|
||||||
value={`https://${swarmCid.encodeManifestReference(hash).toString()}.bzz.link`}
|
value={`https://${swarmCid.encodeManifestReference(reference).toString()}.bzz.link`}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -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 { recognizeSwarmHash } from '../../utils'
|
import { recognizeEnsOrSwarmHash, regexpEns } from '../../utils'
|
||||||
import { determineHistoryName, HISTORY_KEYS, putHistory } from '../../utils/local-storage'
|
import { determineHistoryName, HISTORY_KEYS, putHistory } from '../../utils/local-storage'
|
||||||
import { FileNavigation } from './FileNavigation'
|
import { FileNavigation } from './FileNavigation'
|
||||||
|
|
||||||
@@ -23,10 +23,17 @@ export function Download(): ReactElement {
|
|||||||
const navigate = useNavigate()
|
const navigate = useNavigate()
|
||||||
|
|
||||||
const validateChange = (value: string) => {
|
const validateChange = (value: string) => {
|
||||||
if (Utils.isHexString(value, 64) || Utils.isHexString(value, 128) || !value.trim().length) {
|
if (
|
||||||
|
Utils.isHexString(value, 64) ||
|
||||||
|
Utils.isHexString(value, 128) ||
|
||||||
|
!value.trim().length ||
|
||||||
|
regexpEns.test(value)
|
||||||
|
) {
|
||||||
setReferenceError(undefined)
|
setReferenceError(undefined)
|
||||||
} else {
|
} else {
|
||||||
setReferenceError('Incorrect format of swarm hash. Expected 64 or 128 hexstring characters.')
|
setReferenceError(
|
||||||
|
'Incorrect format of swarm hash. Expected 64 or 128 hexstring characters, bzz.link url or ENS domain.',
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,7 +90,7 @@ export function Download(): ReactElement {
|
|||||||
confirmLabelDisabled={Boolean(referenceError) || loading}
|
confirmLabelDisabled={Boolean(referenceError) || loading}
|
||||||
placeholder="e.g. 31fb0362b1a42536134c86bc58b97ac0244e5c6630beec3e27c2d1cecb38c605"
|
placeholder="e.g. 31fb0362b1a42536134c86bc58b97ac0244e5c6630beec3e27c2d1cecb38c605"
|
||||||
expandedOnly
|
expandedOnly
|
||||||
mapperFn={value => recognizeSwarmHash(value)}
|
mapperFn={value => recognizeEnsOrSwarmHash(value)}
|
||||||
loading={loading}
|
loading={loading}
|
||||||
/>
|
/>
|
||||||
<History title="Download History" localStorageKey={HISTORY_KEYS.DOWNLOAD_HISTORY} />
|
<History title="Download History" localStorageKey={HISTORY_KEYS.DOWNLOAD_HISTORY} />
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
|
import { Button, ListItemIcon, Menu, MenuItem, Typography } from '@material-ui/core'
|
||||||
import React, { ReactElement } from 'react'
|
import React, { ReactElement } from 'react'
|
||||||
import { Button, ListItemIcon, Typography, Menu, MenuItem } from '@material-ui/core'
|
|
||||||
import { EnrichedPostageBatch } from '../../providers/Stamps'
|
import { EnrichedPostageBatch } from '../../providers/Stamps'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
@@ -35,7 +35,7 @@ export default function SimpleMenu({ stamps, selectedStamp, setSelected }: Props
|
|||||||
selected={stamp.batchID === selectedStamp?.batchID}
|
selected={stamp.batchID === selectedStamp?.batchID}
|
||||||
>
|
>
|
||||||
<ListItemIcon>{stamp.usageText}</ListItemIcon>
|
<ListItemIcon>{stamp.usageText}</ListItemIcon>
|
||||||
<Typography variant="body2">{stamp.batchID.substr(0, 8)}[…]</Typography>
|
<Typography variant="body2">{stamp.batchID.slice(0, 8)}[…]</Typography>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
))}
|
))}
|
||||||
</Menu>
|
</Menu>
|
||||||
|
|||||||
@@ -151,7 +151,7 @@ export function Share(): ReactElement {
|
|||||||
<AssetPreview metadata={metadata} previewUri={preview} />
|
<AssetPreview metadata={metadata} previewUri={preview} />
|
||||||
</Box>
|
</Box>
|
||||||
<Box mb={4}>
|
<Box mb={4}>
|
||||||
<AssetSummary isWebsite={metadata?.isWebsite} hash={reference} />
|
<AssetSummary isWebsite={metadata?.isWebsite} reference={reference} />
|
||||||
</Box>
|
</Box>
|
||||||
<DownloadActionBar
|
<DownloadActionBar
|
||||||
onOpen={onOpen}
|
onOpen={onOpen}
|
||||||
|
|||||||
@@ -6,6 +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 { META_FILE_NAME, PREVIEW_FILE_NAME } from '../../constants'
|
||||||
import { CheckState, 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'
|
||||||
@@ -21,7 +22,6 @@ import { PostageStampSelector } from '../stamps/PostageStampSelector'
|
|||||||
import { AssetPreview } from './AssetPreview'
|
import { AssetPreview } from './AssetPreview'
|
||||||
import { StampPreview } from './StampPreview'
|
import { StampPreview } from './StampPreview'
|
||||||
import { UploadActionBar } from './UploadActionBar'
|
import { UploadActionBar } from './UploadActionBar'
|
||||||
import { META_FILE_NAME, PREVIEW_FILE_NAME } from '../../constants'
|
|
||||||
|
|
||||||
export function Upload(): ReactElement {
|
export function Upload(): ReactElement {
|
||||||
const [step, setStep] = useState(0)
|
const [step, setStep] = useState(0)
|
||||||
@@ -83,9 +83,9 @@ export function Upload(): ReactElement {
|
|||||||
// The website is in some directory, remove it
|
// The website is in some directory, remove it
|
||||||
if (idx.commonPrefix) {
|
if (idx.commonPrefix) {
|
||||||
const substrStart = idx.commonPrefix.length
|
const substrStart = idx.commonPrefix.length
|
||||||
indexDocument = idx.indexPath.substr(substrStart)
|
indexDocument = idx.indexPath.slice(substrStart)
|
||||||
fls = files.map(f => {
|
fls = files.map(f => {
|
||||||
const path = (f.path as string).substr(substrStart)
|
const path = (f.path as string).slice(substrStart)
|
||||||
|
|
||||||
return packageFile(f, path)
|
return packageFile(f, path)
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -0,0 +1,98 @@
|
|||||||
|
import { Box, Typography } from '@material-ui/core'
|
||||||
|
import { useSnackbar } from 'notistack'
|
||||||
|
import { ReactElement, useContext, useEffect, useState } from 'react'
|
||||||
|
import { Check, X } from 'react-feather'
|
||||||
|
import { useNavigate } from 'react-router'
|
||||||
|
import ExpandableListItem from '../../components/ExpandableListItem'
|
||||||
|
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
||||||
|
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
||||||
|
import { HistoryHeader } from '../../components/HistoryHeader'
|
||||||
|
import { Loading } from '../../components/Loading'
|
||||||
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
|
import { Context as BeeContext } from '../../providers/Bee'
|
||||||
|
import { Context as TopUpContext } from '../../providers/TopUp'
|
||||||
|
import { createGiftWallet } from '../../utils/desktop'
|
||||||
|
import { generateWallet } from '../../utils/identity'
|
||||||
|
import { ResolvedWallet } from '../../utils/wallet'
|
||||||
|
|
||||||
|
export default function Index(): ReactElement {
|
||||||
|
const { giftWallets, addGiftWallet } = useContext(TopUpContext)
|
||||||
|
const { balance } = useContext(BeeContext)
|
||||||
|
|
||||||
|
const [loading, setLoading] = useState(false)
|
||||||
|
const [balances, setBalances] = useState<ResolvedWallet[]>([])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
async function mapGiftWallets() {
|
||||||
|
const results = []
|
||||||
|
for (const giftWallet of giftWallets) {
|
||||||
|
results.push(await ResolvedWallet.make(giftWallet))
|
||||||
|
}
|
||||||
|
setBalances(results)
|
||||||
|
}
|
||||||
|
|
||||||
|
mapGiftWallets()
|
||||||
|
}, [giftWallets])
|
||||||
|
|
||||||
|
const { enqueueSnackbar } = useSnackbar()
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
async function onCreate() {
|
||||||
|
enqueueSnackbar('Sending funds to gift wallet...')
|
||||||
|
setLoading(true)
|
||||||
|
try {
|
||||||
|
const wallet = generateWallet()
|
||||||
|
addGiftWallet(wallet)
|
||||||
|
await createGiftWallet(wallet.getAddressString())
|
||||||
|
enqueueSnackbar('Succesfully funded gift wallet', { variant: 'success' })
|
||||||
|
} catch (error) {
|
||||||
|
enqueueSnackbar(`Failed to fund gift wallet: ${error}`, { variant: 'error' })
|
||||||
|
} finally {
|
||||||
|
setLoading(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onCancel() {
|
||||||
|
navigate(-1)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!balance) {
|
||||||
|
return <Loading />
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<HistoryHeader>Invite to Swarm...</HistoryHeader>
|
||||||
|
<Box mb={4}>
|
||||||
|
<Typography>
|
||||||
|
Generate and share a gift wallet that anyone can use to set-up their light node with Swarm Desktop. This will
|
||||||
|
use 1 XDAI and 5 BZZ from your node wallet.
|
||||||
|
</Typography>
|
||||||
|
</Box>
|
||||||
|
<Box mb={0.25}>
|
||||||
|
<ExpandableListItem label="XDAI balance" value={`${balance.dai.toSignificantDigits(4)} XDAI`} />
|
||||||
|
</Box>
|
||||||
|
<Box mb={2}>
|
||||||
|
<ExpandableListItem label="BZZ balance" value={`${balance.bzz.toSignificantDigits(4)} BZZ`} />
|
||||||
|
</Box>
|
||||||
|
<Box mb={4}>
|
||||||
|
{balances.map((x, i) => (
|
||||||
|
<Box mb={2} key={i}>
|
||||||
|
<ExpandableListItemKey label={`swarm${String(i).padStart(3, '0')}`} value={x.privateKey} />
|
||||||
|
<ExpandableListItemKey label="Address" value={x.address} />
|
||||||
|
<ExpandableListItem label="XDAI balance" value={`${x.dai.toSignificantDigits(4)} XDAI`} />
|
||||||
|
<ExpandableListItem label="BZZ balance" value={`${x.bzz.toSignificantDigits(4)} BZZ`} />
|
||||||
|
</Box>
|
||||||
|
))}
|
||||||
|
</Box>
|
||||||
|
<ExpandableListItemActions>
|
||||||
|
<SwarmButton onClick={onCreate} iconType={Check} loading={loading} disabled={loading}>
|
||||||
|
Generate gift wallet
|
||||||
|
</SwarmButton>
|
||||||
|
<SwarmButton onClick={onCancel} cancel iconType={X} disabled={loading}>
|
||||||
|
Cancel
|
||||||
|
</SwarmButton>
|
||||||
|
</ExpandableListItemActions>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import { BeeModes } from '@ethersphere/bee-js'
|
||||||
|
import { Box, Typography } from '@material-ui/core'
|
||||||
|
import { ReactElement, useContext, useEffect, useState } from 'react'
|
||||||
|
import { useNavigate } from 'react-router'
|
||||||
|
import { Loading } from '../../components/Loading'
|
||||||
|
import { Context } from '../../providers/Bee'
|
||||||
|
import { ROUTES } from '../../routes'
|
||||||
|
|
||||||
|
export default function Settings(): ReactElement {
|
||||||
|
const [startedAt] = useState(Date.now())
|
||||||
|
const { apiHealth, nodeInfo } = useContext(Context)
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (Date.now() - startedAt < 45_000) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (apiHealth && nodeInfo?.beeMode === BeeModes.LIGHT) {
|
||||||
|
navigate(ROUTES.INFO)
|
||||||
|
}
|
||||||
|
}, [startedAt, navigate, nodeInfo, apiHealth])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Box mb={4}>
|
||||||
|
<Loading />
|
||||||
|
</Box>
|
||||||
|
<Typography>Your node is being upgraded to light mode... postage syncing may take up to 10 minutes.</Typography>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
import { Box, Typography } from '@material-ui/core'
|
||||||
|
import { ReactElement, useContext, useEffect, useState } from 'react'
|
||||||
|
import { useNavigate } from 'react-router'
|
||||||
|
import { Loading } from '../../components/Loading'
|
||||||
|
import { Context } from '../../providers/Bee'
|
||||||
|
import { ROUTES } from '../../routes'
|
||||||
|
|
||||||
|
export default function Settings(): ReactElement {
|
||||||
|
const [waited, setWaited] = useState(false)
|
||||||
|
const { apiHealth } = useContext(Context)
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (waited) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const timeout = setTimeout(() => setWaited(true), 5_000)
|
||||||
|
|
||||||
|
return () => clearTimeout(timeout)
|
||||||
|
}, [waited])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!waited) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (apiHealth) {
|
||||||
|
navigate(ROUTES.INFO)
|
||||||
|
}
|
||||||
|
}, [navigate, waited, apiHealth])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Box mb={4}>
|
||||||
|
<Loading />
|
||||||
|
</Box>
|
||||||
|
<Typography>You will be redirected automatically once your node is up and running.</Typography>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
import { Box, createStyles, Grid, makeStyles, Typography } from '@material-ui/core'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
import { Battery, BatteryCharging, Check, Gift } from 'react-feather'
|
||||||
|
import { useNavigate } from 'react-router'
|
||||||
|
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
||||||
|
import { HistoryHeader } from '../../components/HistoryHeader'
|
||||||
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
|
import { ROUTES } from '../../routes'
|
||||||
|
|
||||||
|
const useStyles = makeStyles(() =>
|
||||||
|
createStyles({
|
||||||
|
checkWrapper: {
|
||||||
|
background: 'rgba(0, 230, 118, 0.25)',
|
||||||
|
borderRadius: 99999,
|
||||||
|
width: '180px',
|
||||||
|
height: '180px',
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
export default function Confirmation(): ReactElement {
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
const styles = useStyles()
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<HistoryHeader>Connect to the blockchain</HistoryHeader>
|
||||||
|
<Grid container direction="column" alignItems="center">
|
||||||
|
<Box mb={6}>
|
||||||
|
<div className={styles.checkWrapper}>
|
||||||
|
<Check size={100} color="#ededed" />
|
||||||
|
</div>
|
||||||
|
</Box>
|
||||||
|
<Box mb={1}>
|
||||||
|
<Typography style={{ fontWeight: 'bold' }}>Your node's RPC endpoint is set up correctly!</Typography>
|
||||||
|
</Box>
|
||||||
|
<Box mb={4}>
|
||||||
|
<Typography align="center">Lastly, you will need to top-up your node wallet.</Typography>
|
||||||
|
<Typography align="center">
|
||||||
|
If you're not familiar with cryptocurrencies, you can start with a bank card.
|
||||||
|
</Typography>
|
||||||
|
</Box>
|
||||||
|
<ExpandableListItemActions>
|
||||||
|
<SwarmButton iconType={Battery} onClick={() => navigate(ROUTES.TOP_UP_BANK_CARD)}>
|
||||||
|
Get started with bank card
|
||||||
|
</SwarmButton>
|
||||||
|
<SwarmButton iconType={BatteryCharging} onClick={() => navigate(ROUTES.TOP_UP_CRYPTO)}>
|
||||||
|
Use DAI
|
||||||
|
</SwarmButton>
|
||||||
|
<SwarmButton iconType={Gift} onClick={() => navigate(ROUTES.TOP_UP_GIFT_CODE)}>
|
||||||
|
Use a gift code
|
||||||
|
</SwarmButton>
|
||||||
|
</ExpandableListItemActions>
|
||||||
|
</Grid>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
import { Box, Typography } from '@material-ui/core'
|
||||||
|
import { useSnackbar } from 'notistack'
|
||||||
|
import { ReactElement, useContext, useState } from 'react'
|
||||||
|
import { Check } from 'react-feather'
|
||||||
|
import { useNavigate } from 'react-router'
|
||||||
|
import { HistoryHeader } from '../../components/HistoryHeader'
|
||||||
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
|
import { SwarmTextInput } from '../../components/SwarmTextInput'
|
||||||
|
import { Context } from '../../providers/TopUp'
|
||||||
|
import { ROUTES } from '../../routes'
|
||||||
|
import { Rpc } from '../../utils/rpc'
|
||||||
|
|
||||||
|
export default function Index(): ReactElement {
|
||||||
|
const { jsonRpcProvider, setJsonRpcProvider } = useContext(Context)
|
||||||
|
|
||||||
|
const [provider, setProvider] = useState(jsonRpcProvider)
|
||||||
|
|
||||||
|
const { enqueueSnackbar } = useSnackbar()
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
async function onSubmit() {
|
||||||
|
try {
|
||||||
|
await Rpc.eth_getBlockByNumber(provider)
|
||||||
|
enqueueSnackbar('Connected to RPC provider successfully.', { variant: 'success' })
|
||||||
|
setJsonRpcProvider(provider)
|
||||||
|
navigate(ROUTES.CONFIRMATION)
|
||||||
|
} catch (error) {
|
||||||
|
enqueueSnackbar('Could not connect to RPC provider.', { variant: 'error' })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<HistoryHeader>Connect to the blockchain</HistoryHeader>
|
||||||
|
<Box mb={1}>
|
||||||
|
<Typography style={{ fontWeight: 'bold' }}>Set up RPC endpoint</Typography>
|
||||||
|
</Box>
|
||||||
|
<Box mb={4}>
|
||||||
|
<Typography>
|
||||||
|
To connect to and retrieve data from the blockchain, you'll need to connect to a publicly-provided node
|
||||||
|
via the node's RPC endpoint. If you're not familiar with this, you may use{' '}
|
||||||
|
<a href="https://getblock.io/" target="_blank" rel="noreferrer">
|
||||||
|
https://getblock.io/
|
||||||
|
</a>
|
||||||
|
.
|
||||||
|
</Typography>
|
||||||
|
</Box>
|
||||||
|
<Box mb={2}>
|
||||||
|
<SwarmTextInput
|
||||||
|
name="rpc-endpoint"
|
||||||
|
label="RPC Endpoint"
|
||||||
|
onChange={event => setProvider(event.target.value)}
|
||||||
|
defaultValue={jsonRpcProvider}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
<SwarmButton iconType={Check} onClick={onSubmit}>
|
||||||
|
Connect
|
||||||
|
</SwarmButton>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
import { Typography } from '@material-ui/core'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
import Index from '.'
|
||||||
|
import { ROUTES } from '../../routes'
|
||||||
|
|
||||||
|
export function BankCardTopUpIndex(): ReactElement {
|
||||||
|
return (
|
||||||
|
<Index
|
||||||
|
header={'Top-up with bank card'}
|
||||||
|
title={'Use a bank card to buy xDAI to the funding wallet address below'}
|
||||||
|
p={
|
||||||
|
<Typography>
|
||||||
|
It's recommended to buy an amount equivalent to 5 to 10 EUR maximum. If you're not familiar with
|
||||||
|
cryptocurrencies, you may use{' '}
|
||||||
|
<a href="https://ramp.network/buy/" rel="noreferrer" target="_blank">
|
||||||
|
https://ramp.network/buy/
|
||||||
|
</a>
|
||||||
|
.
|
||||||
|
</Typography>
|
||||||
|
}
|
||||||
|
next={ROUTES.TOP_UP_BANK_CARD_SWAP}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { Typography } from '@material-ui/core'
|
||||||
|
import { ReactElement } from 'react'
|
||||||
|
import Index from '.'
|
||||||
|
import { ROUTES } from '../../routes'
|
||||||
|
|
||||||
|
export function CryptoTopUpIndex(): ReactElement {
|
||||||
|
return (
|
||||||
|
<Index
|
||||||
|
header={'Top-up with cryptocurrencies'}
|
||||||
|
title={'Send xDAI to the funding wallet below'}
|
||||||
|
p={
|
||||||
|
<Typography>
|
||||||
|
For security reasons it is recommended to send maximum 5 to 10 xDAI. To get xDAI from DAI you may use{' '}
|
||||||
|
<a href="https://bridge.xdaichain.com/" rel="noreferrer" target="_blank">
|
||||||
|
https://bridge.xdaichain.com/
|
||||||
|
</a>
|
||||||
|
.
|
||||||
|
</Typography>
|
||||||
|
}
|
||||||
|
next={ROUTES.TOP_UP_CRYPTO_SWAP}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
import { Box, Typography } from '@material-ui/core'
|
||||||
|
import { useSnackbar } from 'notistack'
|
||||||
|
import { ReactElement, useContext, useEffect, useState } from 'react'
|
||||||
|
import { ArrowDown, Check } from 'react-feather'
|
||||||
|
import { useNavigate, useParams } from 'react-router'
|
||||||
|
import ExpandableListItem from '../../components/ExpandableListItem'
|
||||||
|
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
||||||
|
import { HistoryHeader } from '../../components/HistoryHeader'
|
||||||
|
import { Loading } from '../../components/Loading'
|
||||||
|
import { ProgressIndicator } from '../../components/ProgressIndicator'
|
||||||
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
|
import { SwarmDivider } from '../../components/SwarmDivider'
|
||||||
|
import { Context as BeeContext } from '../../providers/Bee'
|
||||||
|
import { Context as TopUpContext } from '../../providers/TopUp'
|
||||||
|
import { ROUTES } from '../../routes'
|
||||||
|
import { sleepMs } from '../../utils'
|
||||||
|
import { restartBeeNode, upgradeToLightNode } from '../../utils/desktop'
|
||||||
|
import { ResolvedWallet } from '../../utils/wallet'
|
||||||
|
|
||||||
|
export function GiftCardFund(): ReactElement {
|
||||||
|
const { nodeAddresses, balance } = useContext(BeeContext)
|
||||||
|
const { jsonRpcProvider } = useContext(TopUpContext)
|
||||||
|
|
||||||
|
const [loading, setLoading] = useState(false)
|
||||||
|
const [wallet, setWallet] = useState<ResolvedWallet | null>(null)
|
||||||
|
|
||||||
|
const { privateKeyString } = useParams()
|
||||||
|
|
||||||
|
const { enqueueSnackbar } = useSnackbar()
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!privateKeyString) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ResolvedWallet.make(privateKeyString).then(setWallet)
|
||||||
|
}, [privateKeyString])
|
||||||
|
|
||||||
|
if (!wallet || !balance) {
|
||||||
|
return <Loading />
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onFund() {
|
||||||
|
if (!wallet || !nodeAddresses) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
setLoading(true)
|
||||||
|
|
||||||
|
try {
|
||||||
|
await wallet.transfer(nodeAddresses.ethereum)
|
||||||
|
enqueueSnackbar('Successfully funded node, restarting...', { variant: 'success' })
|
||||||
|
await sleepMs(5_000)
|
||||||
|
await upgradeToLightNode(jsonRpcProvider)
|
||||||
|
await restartBeeNode()
|
||||||
|
navigate(ROUTES.RESTART_LIGHT)
|
||||||
|
} catch (error) {
|
||||||
|
enqueueSnackbar(`Failed to fund/restart node: ${error}`, { variant: 'error' })
|
||||||
|
} finally {
|
||||||
|
setLoading(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<HistoryHeader>Top-up with gift code</HistoryHeader>
|
||||||
|
<Box mb={4}>
|
||||||
|
<ProgressIndicator index={1} steps={['Paste gift code', 'Fund your node']} />
|
||||||
|
</Box>
|
||||||
|
<Box mb={2}>
|
||||||
|
<Typography style={{ fontWeight: 'bold' }}>Send funds to your Bee node</Typography>
|
||||||
|
</Box>
|
||||||
|
<Box mb={4}>
|
||||||
|
<Typography>
|
||||||
|
Deposit all the funds from the gift wallet to your node wallet address. You can use the button below to
|
||||||
|
transfer all funds to your node.
|
||||||
|
</Typography>
|
||||||
|
</Box>
|
||||||
|
<SwarmDivider mb={4} />
|
||||||
|
<Box mb={0.25}>
|
||||||
|
<ExpandableListItemKey label="Gift wallet address" value={wallet.address || 'N/A'} />
|
||||||
|
</Box>
|
||||||
|
<Box mb={0.25}>
|
||||||
|
<ExpandableListItem label="XDAI balance" value={`${wallet.dai.toSignificantDigits(4)} XDAI`} />
|
||||||
|
</Box>
|
||||||
|
<Box mb={4}>
|
||||||
|
<ExpandableListItem label="BZZ balance" value={`${wallet.bzz.toSignificantDigits(4)} BZZ`} />
|
||||||
|
</Box>
|
||||||
|
<Box mb={4}>
|
||||||
|
<ArrowDown size={24} color="#aaaaaa" />
|
||||||
|
</Box>
|
||||||
|
<Box mb={0.25}>
|
||||||
|
<ExpandableListItemKey label="Node wallet address" value={nodeAddresses?.ethereum || 'N/A'} expanded />
|
||||||
|
</Box>
|
||||||
|
<Box mb={0.25}>
|
||||||
|
<ExpandableListItem label="XDAI balance" value={`${balance.dai.toSignificantDigits(4)} XDAI`} />
|
||||||
|
</Box>
|
||||||
|
<Box mb={2}>
|
||||||
|
<ExpandableListItem label="BZZ balance" value={`${balance.bzz.toSignificantDigits(4)} BZZ`} />
|
||||||
|
</Box>
|
||||||
|
<SwarmButton iconType={Check} onClick={onFund} disabled={loading} loading={loading}>
|
||||||
|
Send all funds to your node
|
||||||
|
</SwarmButton>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
import { Box, Typography } from '@material-ui/core'
|
||||||
|
import { useSnackbar } from 'notistack'
|
||||||
|
import { ReactElement, useState } from 'react'
|
||||||
|
import { ArrowRight } from 'react-feather'
|
||||||
|
import { useNavigate } from 'react-router'
|
||||||
|
import { HistoryHeader } from '../../components/HistoryHeader'
|
||||||
|
import { ProgressIndicator } from '../../components/ProgressIndicator'
|
||||||
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
|
import { SwarmDivider } from '../../components/SwarmDivider'
|
||||||
|
import { SwarmTextInput } from '../../components/SwarmTextInput'
|
||||||
|
import { BzzToken } from '../../models/BzzToken'
|
||||||
|
import { DaiToken } from '../../models/DaiToken'
|
||||||
|
import { ROUTES } from '../../routes'
|
||||||
|
import { getWalletFromPrivateKeyString } from '../../utils/identity'
|
||||||
|
import { Rpc } from '../../utils/rpc'
|
||||||
|
|
||||||
|
export function GiftCardTopUpIndex(): ReactElement {
|
||||||
|
const [loading, setLoading] = useState(false)
|
||||||
|
const [giftCode, setGiftCode] = useState('')
|
||||||
|
|
||||||
|
const { enqueueSnackbar } = useSnackbar()
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
async function onProceed() {
|
||||||
|
setLoading(true)
|
||||||
|
try {
|
||||||
|
const wallet = getWalletFromPrivateKeyString(giftCode)
|
||||||
|
const dai = new DaiToken(await Rpc._eth_getBalance(wallet.getAddressString()))
|
||||||
|
const bzz = new BzzToken(await Rpc._eth_getBalanceERC20(wallet.getAddressString()))
|
||||||
|
|
||||||
|
if (dai.toDecimal.lt(0.001) || bzz.toDecimal.lt(0.001)) {
|
||||||
|
throw Error('Gift wallet does not have enough funds')
|
||||||
|
}
|
||||||
|
enqueueSnackbar('Successfully verified gift wallet', { variant: 'success' })
|
||||||
|
navigate(ROUTES.TOP_UP_GIFT_CODE_FUND.replace(':privateKeyString', giftCode))
|
||||||
|
} catch (error) {
|
||||||
|
enqueueSnackbar(`Gift wallet could not be verified: ${error}`, { variant: 'error' })
|
||||||
|
} finally {
|
||||||
|
setLoading(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<HistoryHeader>Top-up with gift code</HistoryHeader>
|
||||||
|
<Box mb={4}>
|
||||||
|
<ProgressIndicator index={0} steps={['Paste gift code', 'Fund your node']} />
|
||||||
|
</Box>
|
||||||
|
<Box mb={2}>
|
||||||
|
<Typography style={{ fontWeight: 'bold' }}>Please paste your gift code below</Typography>
|
||||||
|
</Box>
|
||||||
|
<Box mb={4}>
|
||||||
|
A gift code is a unique key to a gift wallet that you can use to fund your node. Please don't share your
|
||||||
|
gift code as it can only be used once.
|
||||||
|
</Box>
|
||||||
|
<SwarmDivider mb={4} />
|
||||||
|
<Box mb={2}>
|
||||||
|
<SwarmTextInput
|
||||||
|
label="Gift code"
|
||||||
|
name="gift-code"
|
||||||
|
onChange={event => {
|
||||||
|
setGiftCode(event.target.value)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
<SwarmButton iconType={ArrowRight} loading={loading} disabled={loading} onClick={onProceed}>
|
||||||
|
Proceed
|
||||||
|
</SwarmButton>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,127 @@
|
|||||||
|
import { Box, Typography } from '@material-ui/core'
|
||||||
|
import { useSnackbar } from 'notistack'
|
||||||
|
import { ReactElement, useContext, useState } from 'react'
|
||||||
|
import { ArrowDown, Check } from 'react-feather'
|
||||||
|
import { useNavigate } from 'react-router'
|
||||||
|
import ExpandableListItem from '../../components/ExpandableListItem'
|
||||||
|
import ExpandableListItemActions from '../../components/ExpandableListItemActions'
|
||||||
|
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
||||||
|
import { HistoryHeader } from '../../components/HistoryHeader'
|
||||||
|
import { Loading } from '../../components/Loading'
|
||||||
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
|
import { SwarmDivider } from '../../components/SwarmDivider'
|
||||||
|
import { SwarmTextInput } from '../../components/SwarmTextInput'
|
||||||
|
import { BzzToken } from '../../models/BzzToken'
|
||||||
|
import { DaiToken } from '../../models/DaiToken'
|
||||||
|
import { Context as BeeContext } from '../../providers/Bee'
|
||||||
|
import { Context as TopUpContext } from '../../providers/TopUp'
|
||||||
|
import { ROUTES } from '../../routes'
|
||||||
|
import { sleepMs } from '../../utils'
|
||||||
|
import { performSwap, restartBeeNode, upgradeToLightNode } from '../../utils/desktop'
|
||||||
|
import { TopUpProgressIndicator } from './TopUpProgressIndicator'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
header: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export function Swap({ header }: Props): ReactElement {
|
||||||
|
const [loading, setLoading] = useState(false)
|
||||||
|
const [hasSwapped, setSwapped] = useState(false)
|
||||||
|
|
||||||
|
const { jsonRpcProvider } = useContext(TopUpContext)
|
||||||
|
const { balance } = useContext(BeeContext)
|
||||||
|
|
||||||
|
const navigate = useNavigate()
|
||||||
|
const { enqueueSnackbar } = useSnackbar()
|
||||||
|
|
||||||
|
if (!balance) {
|
||||||
|
return <Loading />
|
||||||
|
}
|
||||||
|
|
||||||
|
const daiToSwap = balance.dai.minusBaseUnits('1')
|
||||||
|
|
||||||
|
const daiAfterSwap = new DaiToken(balance.dai.toBigNumber.minus(daiToSwap.toBigNumber))
|
||||||
|
const bzzAfterSwap = new BzzToken(daiToSwap.toBigNumber.dividedToIntegerBy(200))
|
||||||
|
|
||||||
|
async function onSwap() {
|
||||||
|
if (hasSwapped) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
setLoading(true)
|
||||||
|
setSwapped(true)
|
||||||
|
try {
|
||||||
|
await performSwap(daiToSwap.toString)
|
||||||
|
enqueueSnackbar('Successfully swapped, restarting...', { variant: 'success' })
|
||||||
|
await sleepMs(5_000)
|
||||||
|
await upgradeToLightNode(jsonRpcProvider)
|
||||||
|
await restartBeeNode()
|
||||||
|
navigate(ROUTES.RESTART_LIGHT)
|
||||||
|
enqueueSnackbar('Upgraded to light node', { variant: 'success' })
|
||||||
|
} catch (error) {
|
||||||
|
enqueueSnackbar(`Failed to swap: ${error}`, { variant: 'error' })
|
||||||
|
} finally {
|
||||||
|
setLoading(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<HistoryHeader>{header}</HistoryHeader>
|
||||||
|
<Box mb={4}>
|
||||||
|
<TopUpProgressIndicator index={1} />
|
||||||
|
</Box>
|
||||||
|
<Box mb={2}>
|
||||||
|
<Typography style={{ fontWeight: 'bold' }}>Swap some xDAI to BZZ</Typography>
|
||||||
|
</Box>
|
||||||
|
<Box mb={4}>
|
||||||
|
<Typography>
|
||||||
|
You need to swap xDAI to BZZ in order to use Swarm. Make sure to keep at least 1 xDAI in order to pay for
|
||||||
|
transaction costs on the network.
|
||||||
|
</Typography>
|
||||||
|
</Box>
|
||||||
|
<SwarmDivider mb={4} />
|
||||||
|
<Box mb={4}>
|
||||||
|
<Typography>
|
||||||
|
Your current balance is {balance.dai.toSignificantDigits(4)} xDAI and {balance.bzz.toSignificantDigits(4)}{' '}
|
||||||
|
BZZ.
|
||||||
|
</Typography>
|
||||||
|
</Box>
|
||||||
|
<Box mb={4}>
|
||||||
|
<SwarmTextInput
|
||||||
|
label="Amount to swap"
|
||||||
|
defaultValue={`${daiToSwap.toSignificantDigits(4)} XDAI`}
|
||||||
|
name="x"
|
||||||
|
onChange={() => false}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
<Box mb={4}>
|
||||||
|
<ArrowDown size={24} color="#aaaaaa" />
|
||||||
|
</Box>
|
||||||
|
<Box mb={0.25}>
|
||||||
|
<ExpandableListItemKey label="Funding wallet address" value={balance.address} expanded />
|
||||||
|
</Box>
|
||||||
|
<Box mb={0.25}>
|
||||||
|
<ExpandableListItem
|
||||||
|
label="Resulting XDAI balance after swap"
|
||||||
|
value={`${daiAfterSwap.toSignificantDigits(4)} XDAI`}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
<Box mb={2}>
|
||||||
|
<ExpandableListItem
|
||||||
|
label="Resulting BZZ balance after swap"
|
||||||
|
value={`${bzzAfterSwap.toSignificantDigits(4)} BZZ`}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
<ExpandableListItemActions>
|
||||||
|
<SwarmButton
|
||||||
|
iconType={Check}
|
||||||
|
onClick={onSwap}
|
||||||
|
disabled={hasSwapped || loading || balance.dai.toDecimal.lte(1)}
|
||||||
|
loading={loading}
|
||||||
|
>
|
||||||
|
Swap Now
|
||||||
|
</SwarmButton>
|
||||||
|
</ExpandableListItemActions>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
import { ReactElement } from 'react'
|
||||||
|
import { ProgressIndicator } from '../../components/ProgressIndicator'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
index: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export function TopUpProgressIndicator({ index }: Props): ReactElement {
|
||||||
|
return <ProgressIndicator index={index} steps={['Buy xDAI', 'Swap BZZ']} />
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
import { Box, Grid, Typography } from '@material-ui/core'
|
||||||
|
import { ReactElement, useContext } from 'react'
|
||||||
|
import { Check } from 'react-feather'
|
||||||
|
import { useNavigate } from 'react-router'
|
||||||
|
import ExpandableListItem from '../../components/ExpandableListItem'
|
||||||
|
import ExpandableListItemKey from '../../components/ExpandableListItemKey'
|
||||||
|
import { HistoryHeader } from '../../components/HistoryHeader'
|
||||||
|
import { Loading } from '../../components/Loading'
|
||||||
|
import { SwarmButton } from '../../components/SwarmButton'
|
||||||
|
import { SwarmDivider } from '../../components/SwarmDivider'
|
||||||
|
import { Context } from '../../providers/Bee'
|
||||||
|
import { TopUpProgressIndicator } from './TopUpProgressIndicator'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
header: string
|
||||||
|
title: string
|
||||||
|
p: ReactElement
|
||||||
|
next: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function Index({ header, title, p, next }: Props): ReactElement {
|
||||||
|
const { nodeAddresses, balance } = useContext(Context)
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
if (!balance || !nodeAddresses) {
|
||||||
|
return <Loading />
|
||||||
|
}
|
||||||
|
|
||||||
|
const disabled = balance.dai.toDecimal.lte(1)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<HistoryHeader>{header}</HistoryHeader>
|
||||||
|
<Box mb={4}>
|
||||||
|
<TopUpProgressIndicator index={0} />
|
||||||
|
</Box>
|
||||||
|
<Box mb={2}>
|
||||||
|
<Typography style={{ fontWeight: 'bold' }}>{title}</Typography>
|
||||||
|
</Box>
|
||||||
|
<Box mb={4}>{p}</Box>
|
||||||
|
<SwarmDivider mb={4} />
|
||||||
|
<Box mb={0.25}>
|
||||||
|
<ExpandableListItemKey label="Funding wallet address" value={balance.address} expanded />
|
||||||
|
</Box>
|
||||||
|
<Box mb={4}>
|
||||||
|
<ExpandableListItem label="xDAI balance" value={balance.dai.toSignificantDigits(4)} />
|
||||||
|
</Box>
|
||||||
|
<Grid container direction="row" justifyContent="space-between">
|
||||||
|
<SwarmButton iconType={Check} onClick={() => navigate(next)} disabled={disabled}>
|
||||||
|
Proceed
|
||||||
|
</SwarmButton>
|
||||||
|
{disabled ? <Typography>Please deposit xDAI to the address above in order to proceed.</Typography> : null}
|
||||||
|
</Grid>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
+12
-28
@@ -15,14 +15,9 @@ 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 { WalletAddress } from '../utils/wallet'
|
||||||
import { Context as SettingsContext } from './Settings'
|
import { Context as SettingsContext } from './Settings'
|
||||||
|
|
||||||
interface RpcBalance {
|
|
||||||
bzz: Token
|
|
||||||
xdai: Token
|
|
||||||
}
|
|
||||||
|
|
||||||
export enum CheckState {
|
export enum CheckState {
|
||||||
OK = 'OK',
|
OK = 'OK',
|
||||||
WARNING = 'Warning',
|
WARNING = 'Warning',
|
||||||
@@ -46,7 +41,7 @@ interface Status {
|
|||||||
|
|
||||||
interface ContextInterface {
|
interface ContextInterface {
|
||||||
status: Status
|
status: Status
|
||||||
balance: RpcBalance
|
balance: WalletAddress | null
|
||||||
latestPublishedVersion?: string
|
latestPublishedVersion?: string
|
||||||
latestUserVersion?: string
|
latestUserVersion?: string
|
||||||
latestUserVersionExact?: string
|
latestUserVersionExact?: string
|
||||||
@@ -84,10 +79,7 @@ const initialValues: ContextInterface = {
|
|||||||
topology: { isEnabled: false, checkState: CheckState.ERROR },
|
topology: { isEnabled: false, checkState: CheckState.ERROR },
|
||||||
chequebook: { isEnabled: false, checkState: CheckState.ERROR },
|
chequebook: { isEnabled: false, checkState: CheckState.ERROR },
|
||||||
},
|
},
|
||||||
balance: {
|
balance: null,
|
||||||
bzz: new Token('0', 16),
|
|
||||||
xdai: new Token('0', 18),
|
|
||||||
},
|
|
||||||
latestPublishedVersion: undefined,
|
latestPublishedVersion: undefined,
|
||||||
latestUserVersion: undefined,
|
latestUserVersion: undefined,
|
||||||
latestUserVersionExact: undefined,
|
latestUserVersionExact: undefined,
|
||||||
@@ -204,8 +196,7 @@ 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 [walletAddress, setWalletAddress] = useState<WalletAddress | null>(initialValues.balance)
|
||||||
const [xdai, setXdai] = useState<Token>(initialValues.balance.xdai)
|
|
||||||
|
|
||||||
const { latestBeeRelease } = useLatestBeeRelease()
|
const { latestBeeRelease } = useLatestBeeRelease()
|
||||||
|
|
||||||
@@ -247,20 +238,16 @@ export function Provider({ children }: Props): ReactElement {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (nodeAddresses?.ethereum) {
|
if (nodeAddresses?.ethereum) {
|
||||||
// debounced calls
|
WalletAddress.make(nodeAddresses.ethereum).then(setWalletAddress)
|
||||||
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])
|
}, [nodeAddresses])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const interval = setInterval(() => walletAddress?.refresh().then(setWalletAddress), 30_000)
|
||||||
|
|
||||||
|
return () => clearInterval(interval)
|
||||||
|
}, [walletAddress])
|
||||||
|
|
||||||
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
|
||||||
@@ -417,10 +404,7 @@ export function Provider({ children }: Props): ReactElement {
|
|||||||
chequebookBalance,
|
chequebookBalance,
|
||||||
error,
|
error,
|
||||||
),
|
),
|
||||||
balance: {
|
balance: walletAddress,
|
||||||
xdai,
|
|
||||||
bzz,
|
|
||||||
},
|
|
||||||
latestUserVersion,
|
latestUserVersion,
|
||||||
latestUserVersionExact,
|
latestUserVersionExact,
|
||||||
latestPublishedVersion,
|
latestPublishedVersion,
|
||||||
|
|||||||
@@ -55,8 +55,16 @@ export function Provider({
|
|||||||
const [desktopApiKey, setDesktopApiKey] = useState<string>(initialValues.desktopApiKey)
|
const [desktopApiKey, setDesktopApiKey] = useState<string>(initialValues.desktopApiKey)
|
||||||
const { config, isLoading, error } = useGetBeeConfig()
|
const { config, isLoading, error } = useGetBeeConfig()
|
||||||
|
|
||||||
const url = config?.['api-addr'] || beeApiUrl || apiUrl
|
function makeHttpUrl(string: string): string {
|
||||||
const debugUrl = config?.['debug-api-addr'] || beeDebugApiUrl || apiDebugUrl
|
if (!string.startsWith('http')) {
|
||||||
|
return `http://${string}`
|
||||||
|
}
|
||||||
|
|
||||||
|
return string
|
||||||
|
}
|
||||||
|
|
||||||
|
const url = makeHttpUrl(config?.['api-addr'] || beeApiUrl || apiUrl)
|
||||||
|
const debugUrl = makeHttpUrl(config?.['debug-api-addr'] || beeDebugApiUrl || apiDebugUrl)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const urlSearchParams = new URLSearchParams(window.location.search)
|
const urlSearchParams = new URLSearchParams(window.location.search)
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
import Wallet from 'ethereumjs-wallet'
|
||||||
|
import { createContext, ReactElement, useEffect, useState } from 'react'
|
||||||
|
import { setJsonRpcInDesktop } from '../utils/desktop'
|
||||||
|
import { getWalletFromPrivateKeyString } from '../utils/identity'
|
||||||
|
|
||||||
|
const LocalStorageKeys = {
|
||||||
|
jsonRpcProvider: 'json-rpc-provider',
|
||||||
|
depositWallet: 'deposit-wallet',
|
||||||
|
giftWallets: 'gift-wallets',
|
||||||
|
invitation: 'invitation',
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ContextInterface {
|
||||||
|
jsonRpcProvider: string
|
||||||
|
giftWallets: Wallet[]
|
||||||
|
setJsonRpcProvider: (jsonRpcProvider: string) => void
|
||||||
|
addGiftWallet: (wallet: Wallet) => void
|
||||||
|
}
|
||||||
|
|
||||||
|
const initialValues: ContextInterface = {
|
||||||
|
jsonRpcProvider: '',
|
||||||
|
giftWallets: [],
|
||||||
|
setJsonRpcProvider: () => {}, // eslint-disable-line
|
||||||
|
addGiftWallet: () => {}, // eslint-disable-line
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Context = createContext<ContextInterface>(initialValues)
|
||||||
|
export const Consumer = Context.Consumer
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
children: ReactElement
|
||||||
|
}
|
||||||
|
|
||||||
|
export function Provider({ children }: Props): ReactElement {
|
||||||
|
const [jsonRpcProvider, setJsonRpcProvider] = useState(
|
||||||
|
localStorage.getItem('json-rpc-provider') || initialValues.jsonRpcProvider,
|
||||||
|
)
|
||||||
|
const [giftWallets, setGiftWallets] = useState(initialValues.giftWallets)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const existingGiftWallets = localStorage.getItem(LocalStorageKeys.giftWallets)
|
||||||
|
|
||||||
|
if (existingGiftWallets) {
|
||||||
|
setGiftWallets(JSON.parse(existingGiftWallets).map(getWalletFromPrivateKeyString))
|
||||||
|
}
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
function setAndPersistJsonRpcProvider(jsonRpcProvider: string) {
|
||||||
|
localStorage.setItem(LocalStorageKeys.jsonRpcProvider, jsonRpcProvider)
|
||||||
|
setJsonRpcProvider(jsonRpcProvider)
|
||||||
|
// eslint-disable-next-line no-console
|
||||||
|
setJsonRpcInDesktop(jsonRpcProvider).catch(console.error)
|
||||||
|
}
|
||||||
|
|
||||||
|
function addGiftWallet(wallet: Wallet) {
|
||||||
|
const newArray = [...giftWallets, wallet]
|
||||||
|
localStorage.setItem(LocalStorageKeys.giftWallets, JSON.stringify(newArray.map(x => x.getPrivateKeyString())))
|
||||||
|
setGiftWallets(newArray)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Context.Provider
|
||||||
|
value={{
|
||||||
|
jsonRpcProvider,
|
||||||
|
giftWallets,
|
||||||
|
setJsonRpcProvider: setAndPersistJsonRpcProvider,
|
||||||
|
addGiftWallet,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{children}
|
||||||
|
</Context.Provider>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -9,11 +9,21 @@ import { Download } from './pages/files/Download'
|
|||||||
import { Share } from './pages/files/Share'
|
import { Share } from './pages/files/Share'
|
||||||
import { Upload } from './pages/files/Upload'
|
import { Upload } from './pages/files/Upload'
|
||||||
import { UploadLander } from './pages/files/UploadLander'
|
import { UploadLander } from './pages/files/UploadLander'
|
||||||
|
import GiftCards from './pages/gift-code'
|
||||||
import Info from './pages/info'
|
import Info from './pages/info'
|
||||||
|
import LightModeRestart from './pages/restart/LightModeRestart'
|
||||||
|
import Restart from './pages/restart/Restart'
|
||||||
|
import Wallet from './pages/rpc'
|
||||||
|
import Confirmation from './pages/rpc/Confirmation'
|
||||||
import Settings from './pages/settings'
|
import Settings from './pages/settings'
|
||||||
import Stamps from './pages/stamps'
|
import Stamps from './pages/stamps'
|
||||||
import { CreatePostageStampPage } from './pages/stamps/CreatePostageStampPage'
|
import { CreatePostageStampPage } from './pages/stamps/CreatePostageStampPage'
|
||||||
import Status from './pages/status'
|
import Status from './pages/status'
|
||||||
|
import { BankCardTopUpIndex } from './pages/top-up/BankCardTopUpIndex'
|
||||||
|
import { CryptoTopUpIndex } from './pages/top-up/CryptoTopUpIndex'
|
||||||
|
import { GiftCardFund } from './pages/top-up/GiftCardFund'
|
||||||
|
import { GiftCardTopUpIndex } from './pages/top-up/GiftCardTopUpIndex'
|
||||||
|
import { Swap } from './pages/top-up/Swap'
|
||||||
|
|
||||||
export enum ROUTES {
|
export enum ROUTES {
|
||||||
INFO = '/',
|
INFO = '/',
|
||||||
@@ -31,6 +41,17 @@ export enum ROUTES {
|
|||||||
FEEDS_NEW = '/feeds/new',
|
FEEDS_NEW = '/feeds/new',
|
||||||
FEEDS_UPDATE = '/feeds/update/:hash',
|
FEEDS_UPDATE = '/feeds/update/:hash',
|
||||||
FEEDS_PAGE = '/feeds/:uuid',
|
FEEDS_PAGE = '/feeds/:uuid',
|
||||||
|
WALLET = '/wallet',
|
||||||
|
CONFIRMATION = '/wallet/confirmation',
|
||||||
|
TOP_UP_CRYPTO = '/top-up/crypto',
|
||||||
|
TOP_UP_CRYPTO_SWAP = '/top-up/crypto/swap',
|
||||||
|
TOP_UP_BANK_CARD = '/top-up/bank-card',
|
||||||
|
TOP_UP_BANK_CARD_SWAP = '/top-up/bank-card/swap',
|
||||||
|
TOP_UP_GIFT_CODE = '/top-up/gift-code',
|
||||||
|
TOP_UP_GIFT_CODE_FUND = '/top-up/gift-code/fund/:privateKeyString',
|
||||||
|
GIFT_CODES = '/gift-codes',
|
||||||
|
RESTART = '/restart',
|
||||||
|
RESTART_LIGHT = '/light-mode-restart',
|
||||||
}
|
}
|
||||||
|
|
||||||
const BaseRouter = (): ReactElement => (
|
const BaseRouter = (): ReactElement => (
|
||||||
@@ -49,6 +70,17 @@ const BaseRouter = (): ReactElement => (
|
|||||||
<Route path={ROUTES.FEEDS_UPDATE} element={<UpdateFeed />} />
|
<Route path={ROUTES.FEEDS_UPDATE} element={<UpdateFeed />} />
|
||||||
<Route path={ROUTES.FEEDS_PAGE} element={<FeedSubpage />} />
|
<Route path={ROUTES.FEEDS_PAGE} element={<FeedSubpage />} />
|
||||||
<Route path={ROUTES.INFO} element={<Info />} />
|
<Route path={ROUTES.INFO} element={<Info />} />
|
||||||
|
<Route path={ROUTES.WALLET} element={<Wallet />} />
|
||||||
|
<Route path={ROUTES.CONFIRMATION} element={<Confirmation />} />
|
||||||
|
<Route path={ROUTES.GIFT_CODES} element={<GiftCards />} />
|
||||||
|
<Route path={ROUTES.TOP_UP_CRYPTO} element={<CryptoTopUpIndex />} />
|
||||||
|
<Route path={ROUTES.TOP_UP_CRYPTO_SWAP} element={<Swap header="Top-up with cryptocurrencies" />} />
|
||||||
|
<Route path={ROUTES.TOP_UP_BANK_CARD} element={<BankCardTopUpIndex />} />
|
||||||
|
<Route path={ROUTES.TOP_UP_BANK_CARD_SWAP} element={<Swap header="Top-up with bank card" />} />
|
||||||
|
<Route path={ROUTES.TOP_UP_GIFT_CODE} element={<GiftCardTopUpIndex />} />
|
||||||
|
<Route path={ROUTES.TOP_UP_GIFT_CODE_FUND} element={<GiftCardFund />} />
|
||||||
|
<Route path={ROUTES.RESTART} element={<Restart />} />
|
||||||
|
<Route path={ROUTES.RESTART_LIGHT} element={<LightModeRestart />} />
|
||||||
</Routes>
|
</Routes>
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
export const bzzContractInterface = [
|
||||||
|
{
|
||||||
|
type: 'function',
|
||||||
|
stateMutability: 'nonpayable',
|
||||||
|
payable: false,
|
||||||
|
outputs: [
|
||||||
|
{
|
||||||
|
type: 'bool',
|
||||||
|
name: '',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
name: 'transfer',
|
||||||
|
inputs: [
|
||||||
|
{
|
||||||
|
type: 'address',
|
||||||
|
name: '_to',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'uint256',
|
||||||
|
name: '_value',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
constant: false,
|
||||||
|
},
|
||||||
|
]
|
||||||
@@ -26,6 +26,12 @@ export async function upgradeToLightNode(rpcProvider: string): Promise<void> {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function setJsonRpcInDesktop(value: string): Promise<void> {
|
||||||
|
await updateDesktopConfiguration({
|
||||||
|
'swap-endpoint': value,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
async function updateDesktopConfiguration(values: Record<string, unknown>): Promise<void> {
|
async function updateDesktopConfiguration(values: Record<string, unknown>): Promise<void> {
|
||||||
await postJson(`http://${getDesktopHost()}/config`, values)
|
await postJson(`http://${getDesktopHost()}/config`, values)
|
||||||
}
|
}
|
||||||
@@ -34,6 +40,14 @@ export async function restartBeeNode(): Promise<void> {
|
|||||||
await postJson(`http://${getDesktopHost()}/restart`)
|
await postJson(`http://${getDesktopHost()}/restart`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function createGiftWallet(address: string): Promise<void> {
|
||||||
|
await postJson(`http://${getDesktopHost()}/gift-wallet/${address}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function performSwap(daiAmount: string): Promise<void> {
|
||||||
|
await postJson(`http://${getDesktopHost()}/swap`, { dai: daiAmount })
|
||||||
|
}
|
||||||
|
|
||||||
function getDesktopHost(): string {
|
function getDesktopHost(): string {
|
||||||
return window.location.host
|
return window.location.host
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -79,9 +79,11 @@ function getWalletFromIdentity(identity: Identity, password?: string): Promise<W
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function getWallet(type: IdentityType, data: string, password?: string): Promise<Wallet> {
|
async function getWallet(type: IdentityType, data: string, password?: string): Promise<Wallet> {
|
||||||
return type === 'PRIVATE_KEY'
|
return type === 'PRIVATE_KEY' ? getWalletFromPrivateKeyString(data) : await Wallet.fromV3(data, password as string)
|
||||||
? Wallet.fromPrivateKey(Buffer.from(trimHexString(data), 'hex'))
|
}
|
||||||
: await Wallet.fromV3(data, password as string)
|
|
||||||
|
export function getWalletFromPrivateKeyString(privateKey: string): Wallet {
|
||||||
|
return Wallet.fromPrivateKey(Buffer.from(trimHexString(privateKey), 'hex'))
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function updateFeed(
|
export async function updateFeed(
|
||||||
|
|||||||
+56
-8
@@ -1,4 +1,4 @@
|
|||||||
import { extractSwarmHash, extractSwarmCid, recognizeSwarmHash } from './index'
|
import { extractSwarmHash, extractSwarmCid, extractEns, recognizeEnsOrSwarmHash } from './index'
|
||||||
|
|
||||||
interface TestObject {
|
interface TestObject {
|
||||||
input: string
|
input: string
|
||||||
@@ -122,16 +122,64 @@ describe('extractSwarmCid', () => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
describe('recognizeSwarmHash', () => {
|
const correctEns: TestObject[] = [
|
||||||
test('should correctly extract hash', () => {
|
{
|
||||||
;[...correctHashes, ...correctCids].forEach(({ input, expectedOutput }) => {
|
input: 'test.eth',
|
||||||
const hash = recognizeSwarmHash(input)
|
expectedOutput: 'test.eth',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
input: 't-est.eth',
|
||||||
|
expectedOutput: 't-est.eth',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
input: 'http://test.eth/whatever',
|
||||||
|
expectedOutput: 'test.eth',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
input: 'https://alice.test.eth?whatever',
|
||||||
|
expectedOutput: 'alice.test.eth',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
input: 'swarm.example.eth/?id=1&page=2',
|
||||||
|
expectedOutput: 'swarm.example.eth',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
input: 'http://swarm.example.eth#up',
|
||||||
|
expectedOutput: 'swarm.example.eth',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
input: 'http://site.eth:8008',
|
||||||
|
expectedOutput: 'site.eth',
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
const wrongEns: string[] = ['http://test.ethereum/whatever']
|
||||||
|
|
||||||
|
describe('extractEns', () => {
|
||||||
|
test('should correctly extract ens domain', () => {
|
||||||
|
correctEns.forEach(({ input, expectedOutput }) => {
|
||||||
|
const hash = extractEns(input)
|
||||||
expect(hash).toBe(expectedOutput)
|
expect(hash).toBe(expectedOutput)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
test('should not extract hash from incorrect inputs but instead return them', () => {
|
test('should not extract ens from incorrect inputs', () => {
|
||||||
;[...wrongHashes, ...wrongCids].forEach(url => {
|
wrongEns.forEach(url => {
|
||||||
const hash = recognizeSwarmHash(url)
|
const hash = extractEns(url)
|
||||||
|
expect(hash).toBe(undefined)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('recognizeEnsOrSwarmHash', () => {
|
||||||
|
test('should correctly extract hash or ens', () => {
|
||||||
|
;[...correctHashes, ...correctCids, ...correctEns].forEach(({ input, expectedOutput }) => {
|
||||||
|
const hash = recognizeEnsOrSwarmHash(input)
|
||||||
|
expect(hash).toBe(expectedOutput)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
test('should not extract hash or ens from incorrect inputs but instead return them', () => {
|
||||||
|
;[...wrongHashes, ...wrongCids, ...wrongEns].forEach(url => {
|
||||||
|
const hash = recognizeEnsOrSwarmHash(url)
|
||||||
expect(hash).toBe(url)
|
expect(hash).toBe(url)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
+12
-2
@@ -144,8 +144,18 @@ export function extractSwarmCid(s: string): string | undefined {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function recognizeSwarmHash(value: string): string {
|
// Matches any number of subdomain with .eth
|
||||||
return extractSwarmHash(value) || extractSwarmCid(value) || value
|
// e.g. this.is.just-a-test.eth
|
||||||
|
export const regexpEns = /((?:(?:[^-./?:\s][^./?:\s]{0,61}[^-./?:\s]|[^-./?:\s]{1,2})\.)+eth)(?:$|[/?:#].*)/i
|
||||||
|
|
||||||
|
export function extractEns(value: string): string | undefined {
|
||||||
|
const matches = value.match(regexpEns)
|
||||||
|
|
||||||
|
return (matches && matches[1]) || undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
export function recognizeEnsOrSwarmHash(value: string): string {
|
||||||
|
return extractEns(value) || extractSwarmHash(value) || extractSwarmCid(value) || value
|
||||||
}
|
}
|
||||||
|
|
||||||
export function uuidV4(): string {
|
export function uuidV4(): string {
|
||||||
|
|||||||
+69
-4
@@ -1,14 +1,15 @@
|
|||||||
import { debounce } from '@material-ui/core'
|
import { debounce } from '@material-ui/core'
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
import { Contract, providers } from 'ethers'
|
import { Contract, providers, Wallet } from 'ethers'
|
||||||
|
import { bzzContractInterface } from './bzz-contract-interface'
|
||||||
|
|
||||||
const PROVIDER = 'https://gno.getblock.io/mainnet/?api_key=d7b92d96-9784-49a8-a800-b3edd1647fc7'
|
export const JSON_RPC_PROVIDER = 'https://gno.getblock.io/mainnet/?api_key=d7b92d96-9784-49a8-a800-b3edd1647fc7'
|
||||||
|
|
||||||
async function eth_getBalance(address: string): Promise<string> {
|
async function eth_getBalance(address: string): Promise<string> {
|
||||||
if (!address.startsWith('0x')) {
|
if (!address.startsWith('0x')) {
|
||||||
address = `0x${address}`
|
address = `0x${address}`
|
||||||
}
|
}
|
||||||
const response = await axios(PROVIDER, {
|
const response = await axios(JSON_RPC_PROVIDER, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'content-type': 'application/json',
|
'content-type': 'application/json',
|
||||||
@@ -24,6 +25,23 @@ async function eth_getBalance(address: string): Promise<string> {
|
|||||||
return response.data.result
|
return response.data.result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function eth_getBlockByNumber(provider = JSON_RPC_PROVIDER): Promise<string> {
|
||||||
|
const response = await axios(provider, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'content-type': 'application/json',
|
||||||
|
},
|
||||||
|
data: {
|
||||||
|
jsonrpc: '2.0',
|
||||||
|
method: 'eth_getBlockByNumber',
|
||||||
|
params: ['latest', false],
|
||||||
|
id: 1,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
return response.data.result
|
||||||
|
}
|
||||||
|
|
||||||
const partialERC20tokenABI = [
|
const partialERC20tokenABI = [
|
||||||
{
|
{
|
||||||
constant: true,
|
constant: true,
|
||||||
@@ -45,7 +63,7 @@ const partialERC20tokenABI = [
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
const provider = new providers.JsonRpcProvider(PROVIDER)
|
const provider = new providers.JsonRpcProvider(JSON_RPC_PROVIDER)
|
||||||
|
|
||||||
async function eth_getBalanceERC20(
|
async function eth_getBalanceERC20(
|
||||||
address: string,
|
address: string,
|
||||||
@@ -60,7 +78,54 @@ async function eth_getBalanceERC20(
|
|||||||
return balance.toString()
|
return balance.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface TransferResponse {
|
||||||
|
transaction: providers.TransactionResponse
|
||||||
|
receipt: providers.TransactionReceipt
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function sendNativeTransaction(
|
||||||
|
privateKey: string,
|
||||||
|
to: string,
|
||||||
|
value: string,
|
||||||
|
jsonRpcProvider: string,
|
||||||
|
): Promise<TransferResponse> {
|
||||||
|
const signer = await makeReadySigner(privateKey, jsonRpcProvider)
|
||||||
|
const gasPrice = await signer.getGasPrice()
|
||||||
|
const transaction = await signer.sendTransaction({ to, value, gasPrice })
|
||||||
|
const receipt = await transaction.wait(1)
|
||||||
|
|
||||||
|
return { transaction, receipt }
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function sendBzzTransaction(
|
||||||
|
privateKey: string,
|
||||||
|
to: string,
|
||||||
|
value: string,
|
||||||
|
jsonRpcProvider: string,
|
||||||
|
): Promise<TransferResponse> {
|
||||||
|
const signer = await makeReadySigner(privateKey, jsonRpcProvider)
|
||||||
|
const gasPrice = await signer.getGasPrice()
|
||||||
|
const bzz = new Contract('0xdBF3Ea6F5beE45c02255B2c26a16F300502F68da', bzzContractInterface, signer)
|
||||||
|
const transaction = await bzz.transfer(to, value, { gasPrice })
|
||||||
|
const receipt = await transaction.wait(1)
|
||||||
|
|
||||||
|
return { transaction, receipt }
|
||||||
|
}
|
||||||
|
|
||||||
|
async function makeReadySigner(privateKey: string, jsonRpcProvider: string) {
|
||||||
|
const provider = new providers.JsonRpcProvider(jsonRpcProvider, 100)
|
||||||
|
await provider.ready
|
||||||
|
const signer = new Wallet(privateKey, provider)
|
||||||
|
|
||||||
|
return signer
|
||||||
|
}
|
||||||
|
|
||||||
export const Rpc = {
|
export const Rpc = {
|
||||||
|
sendNativeTransaction,
|
||||||
|
sendBzzTransaction,
|
||||||
|
_eth_getBalance: eth_getBalance,
|
||||||
|
_eth_getBalanceERC20: eth_getBalanceERC20,
|
||||||
eth_getBalance: debounce(eth_getBalance, 1_000),
|
eth_getBalance: debounce(eth_getBalance, 1_000),
|
||||||
eth_getBalanceERC20: debounce(eth_getBalanceERC20, 1_000),
|
eth_getBalanceERC20: debounce(eth_getBalanceERC20, 1_000),
|
||||||
|
eth_getBlockByNumber,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
import Wallet from 'ethereumjs-wallet'
|
||||||
|
import { sleepMs } from '.'
|
||||||
|
import { BzzToken } from '../models/BzzToken'
|
||||||
|
import { DaiToken } from '../models/DaiToken'
|
||||||
|
import { getWalletFromPrivateKeyString } from './identity'
|
||||||
|
import { Rpc } from './rpc'
|
||||||
|
|
||||||
|
export class WalletAddress {
|
||||||
|
private constructor(public address: string, public bzz: BzzToken, public dai: DaiToken) {}
|
||||||
|
|
||||||
|
static async make(address: string): Promise<WalletAddress> {
|
||||||
|
const bzz = new BzzToken(await Rpc._eth_getBalanceERC20(address))
|
||||||
|
const dai = new DaiToken(await Rpc._eth_getBalance(address))
|
||||||
|
|
||||||
|
return new WalletAddress(address, bzz, dai)
|
||||||
|
}
|
||||||
|
|
||||||
|
public async refresh(): Promise<WalletAddress> {
|
||||||
|
this.bzz = new BzzToken(await Rpc._eth_getBalanceERC20(this.address))
|
||||||
|
this.dai = new DaiToken(await Rpc._eth_getBalance(this.address))
|
||||||
|
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export class ResolvedWallet {
|
||||||
|
public address: string
|
||||||
|
public privateKey: string
|
||||||
|
|
||||||
|
private constructor(public wallet: Wallet, public bzz: BzzToken, public dai: DaiToken) {
|
||||||
|
this.address = wallet.getAddressString()
|
||||||
|
this.privateKey = wallet.getPrivateKeyString()
|
||||||
|
}
|
||||||
|
|
||||||
|
static async make(privateKeyOrWallet: string | Wallet): Promise<ResolvedWallet> {
|
||||||
|
const wallet =
|
||||||
|
typeof privateKeyOrWallet === 'string' ? getWalletFromPrivateKeyString(privateKeyOrWallet) : privateKeyOrWallet
|
||||||
|
const address = wallet.getAddressString()
|
||||||
|
const bzz = new BzzToken(await Rpc._eth_getBalanceERC20(address))
|
||||||
|
const dai = new DaiToken(await Rpc._eth_getBalance(address))
|
||||||
|
|
||||||
|
return new ResolvedWallet(wallet, bzz, dai)
|
||||||
|
}
|
||||||
|
|
||||||
|
public async refresh(): Promise<ResolvedWallet> {
|
||||||
|
this.bzz = new BzzToken(await Rpc._eth_getBalanceERC20(this.address))
|
||||||
|
this.dai = new DaiToken(await Rpc._eth_getBalance(this.address))
|
||||||
|
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
public async transfer(
|
||||||
|
destination: string,
|
||||||
|
jsonRpcProvider = 'https://gno.getblock.io/mainnet/?api_key=d7b92d96-9784-49a8-a800-b3edd1647fc7',
|
||||||
|
): Promise<void> {
|
||||||
|
const DUMMY_GAS_PRICE = '300000000000000'
|
||||||
|
|
||||||
|
if (this.bzz.toDecimal.gt(0.1)) {
|
||||||
|
await Rpc.sendBzzTransaction(this.privateKey, destination, this.bzz.toString, jsonRpcProvider)
|
||||||
|
await sleepMs(5_000)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.dai.toBigNumber.gt(DUMMY_GAS_PRICE)) {
|
||||||
|
await Rpc.sendNativeTransaction(
|
||||||
|
this.privateKey,
|
||||||
|
destination,
|
||||||
|
this.dai.toBigNumber.minus(DUMMY_GAS_PRICE).toString(),
|
||||||
|
jsonRpcProvider,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user