From 72488fd5a33aaf07543523132d2eac2026dcf490 Mon Sep 17 00:00:00 2001 From: Vojtech Simetka Date: Mon, 1 Aug 2022 16:21:52 +0200 Subject: [PATCH] chore: update to use bee-js 5.0.0 and support bee 1.7.0 (#503) * chore: update to use bee-js 5.0.0 and support bee 1.7.0 * fix: store reference to feed manifest correctly * fix: set waitForUsable to false (#507) Co-authored-by: Cafe137 <77121044+Cafe137@users.noreply.github.com> --- README.md | 2 +- package-lock.json | 28 +++++++++++------------ package.json | 4 ++-- src/pages/stamps/PostageStampCreation.tsx | 3 ++- src/utils/identity.ts | 2 +- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 71bb8d7..b37cf57 100644 --- a/README.md +++ b/README.md @@ -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 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 1.6.0-6ceadd35**. +This project is intended to be used with **Bee version 1.7.0-bbf13011**. 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 [releases tab](https://github.com/ethersphere/bee-dashboard/releases). diff --git a/package-lock.json b/package-lock.json index c818ccd..d1ec15a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.18.2", "license": "BSD-3-Clause", "dependencies": { - "@ethersphere/bee-js": "^4.1.1", + "@ethersphere/bee-js": "^5.0.0", "@ethersphere/manifest-js": "1.2.1", "@ethersphere/swarm-cid": "^0.1.0", "@material-ui/core": "4.12.3", @@ -106,7 +106,7 @@ }, "engines": { "bee": ">=0.6.0", - "node": ">=12.0.0", + "node": ">=14.0.0", "npm": ">=6.9.0" }, "peerDependencies": { @@ -2440,9 +2440,9 @@ } }, "node_modules/@ethersphere/bee-js": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@ethersphere/bee-js/-/bee-js-4.1.1.tgz", - "integrity": "sha512-4hbgi7rHnku+2pv352z7txV6IhP+2iipCKaQS4sOFhjieui44LE0Lox8gy5tud9tY2wRN2wY6LTqvo2EaYrVRQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@ethersphere/bee-js/-/bee-js-5.0.0.tgz", + "integrity": "sha512-Dr5Xon0UZvi37fvbyGj46kw3/0D8fydwfDtVtFHKi2p7mNEizG0uok2mXvwLZrMvUMOS8uXkFhbQjTFBjB+pWA==", "dependencies": { "@ethersphere/swarm-cid": "^0.1.0", "@types/readable-stream": "^2.3.13", @@ -2457,13 +2457,13 @@ "tar-js": "^0.3.0", "utf-8-validate": "^5.0.9", "web-streams-polyfill": "^4.0.0-beta.1", - "ws": "^8.6.0" + "ws": "^8.7.0" }, "engines": { - "bee": "1.6.0-6ceadd35", - "beeApiVersion": "3.0.1", - "beeDebugApiVersion": "2.0.1", - "node": ">=12.0.0", + "bee": "1.7.0-bbf13011", + "beeApiVersion": "3.0.2", + "beeDebugApiVersion": "3.0.2", + "node": ">=14.0.0", "npm": ">=6.0.0" } }, @@ -22462,9 +22462,9 @@ } }, "@ethersphere/bee-js": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@ethersphere/bee-js/-/bee-js-4.1.1.tgz", - "integrity": "sha512-4hbgi7rHnku+2pv352z7txV6IhP+2iipCKaQS4sOFhjieui44LE0Lox8gy5tud9tY2wRN2wY6LTqvo2EaYrVRQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@ethersphere/bee-js/-/bee-js-5.0.0.tgz", + "integrity": "sha512-Dr5Xon0UZvi37fvbyGj46kw3/0D8fydwfDtVtFHKi2p7mNEizG0uok2mXvwLZrMvUMOS8uXkFhbQjTFBjB+pWA==", "requires": { "@ethersphere/swarm-cid": "^0.1.0", "@types/readable-stream": "^2.3.13", @@ -22479,7 +22479,7 @@ "tar-js": "^0.3.0", "utf-8-validate": "^5.0.9", "web-streams-polyfill": "^4.0.0-beta.1", - "ws": "^8.6.0" + "ws": "^8.7.0" }, "dependencies": { "web-streams-polyfill": { diff --git a/package.json b/package.json index 870819b..afbb021 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "url": "https://github.com/ethersphere/bee-dashboard.git" }, "dependencies": { - "@ethersphere/bee-js": "^4.1.1", + "@ethersphere/bee-js": "^5.0.0", "@ethersphere/manifest-js": "1.2.1", "@ethersphere/swarm-cid": "^0.1.0", "@material-ui/core": "4.12.3", @@ -156,7 +156,7 @@ ] }, "engines": { - "node": ">=12.0.0", + "node": ">=14.0.0", "npm": ">=6.9.0", "bee": ">=0.6.0" } diff --git a/src/pages/stamps/PostageStampCreation.tsx b/src/pages/stamps/PostageStampCreation.tsx index 177dfff..ce8e9d6 100644 --- a/src/pages/stamps/PostageStampCreation.tsx +++ b/src/pages/stamps/PostageStampCreation.tsx @@ -1,3 +1,4 @@ +import { PostageBatchOptions } from '@ethersphere/bee-js' import { Box, Grid, Typography } from '@material-ui/core' import BigNumber from 'bignumber.js' import { Form, Formik, FormikHelpers } from 'formik' @@ -102,7 +103,7 @@ export function PostageStampCreation({ onFinished }: Props): ReactElement { const amount = BigInt(values.amount) const depth = Number.parseInt(values.depth) - const options = values.label ? { label: values.label } : undefined + const options: PostageBatchOptions = { waitForUsable: false, label: values.label || undefined } const batchId = await beeDebugApi.createPostageBatch(amount.toString(), depth, options) await waitUntilStampExists(batchId, beeDebugApi) actions.resetForm() diff --git a/src/utils/identity.ts b/src/utils/identity.ts index ce026e5..ccfa403 100644 --- a/src/utils/identity.ts +++ b/src/utils/identity.ts @@ -88,7 +88,7 @@ export async function updateFeed( const wallet = await getWalletFromIdentity(identity, password) if (!identity.feedHash) { - identity.feedHash = await beeApi.createFeedManifest(stamp, 'sequence', '00'.repeat(32), wallet.address) + identity.feedHash = (await beeApi.createFeedManifest(stamp, 'sequence', '00'.repeat(32), wallet.address)).reference } const writer = beeApi.makeFeedWriter('sequence', '00'.repeat(32), wallet.privateKey)