diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 48a6ec2f..a7abbfb1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -35,7 +35,7 @@ jobs: run: npm ci && npm install -g @fairdatasociety/fdp-play - name: Run bee-dev - run: npx bee-dev & + run: npx bee-dev --port 16337 & - name: Start fdp-play environment run: npm run bee diff --git a/jest.config.ts b/jest.config.ts index cc2d56a8..a719a27f 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -2,8 +2,8 @@ * For a detailed explanation regarding each configuration property and type check, visit: * https://jestjs.io/docs/en/configuration.html */ -import { Bee } from '@ethersphere/bee-js' import type { Config } from '@jest/types' +import { Bee } from '@upcoming/bee-js' import { Dates, System } from 'cafe-utility' import { getPssAddress } from './test/utility/address' import { getOrBuyStamp } from './test/utility/stamp' diff --git a/package-lock.json b/package-lock.json index 96990239..da42fa1f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,11 +6,11 @@ "packages": { "": { "name": "@ethersphere/swarm-cli", - "version": "2.30.0", + "version": "2.31.0", "license": "BSD-3-Clause", "dependencies": { "@ethereumjs/wallet": "^2.0.4", - "@ethersphere/bee-js": "^9.4.0", + "@upcoming/bee-js": "^9.4.2", "cafe-utility": "^27.14.0", "chalk": "^2.4.2", "cli-progress": "^3.11.2", @@ -1128,29 +1128,6 @@ "node": ">=18" } }, - "node_modules/@ethersphere/bee-js": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/@ethersphere/bee-js/-/bee-js-9.4.0.tgz", - "integrity": "sha512-mczUpjTM9hbmGw6V2o8mcWs6S6+e9qpFU99lhNh7SkI33FWC605hx4lnSqTPlsdMVau9jepJE4ItQqk9okEZrg==", - "license": "BSD-3-Clause", - "dependencies": { - "axios": "^0.30.0", - "cafe-utility": "^28.1.0", - "isomorphic-ws": "^4.0.1", - "semver": "^7.3.5", - "ws": "^8.7.0" - }, - "engines": { - "bee": "2.4.0-390a402e", - "beeApiVersion": "7.2.0" - } - }, - "node_modules/@ethersphere/bee-js/node_modules/cafe-utility": { - "version": "28.2.0", - "resolved": "https://registry.npmjs.org/cafe-utility/-/cafe-utility-28.2.0.tgz", - "integrity": "sha512-EppX+Asq5R/3Ozn8eyPpDKVVb9q5hky3dK1gBIwIoR/LNPZJc16KoZQ9zqWNigwTLpfpg5Eyo09iq8M59moR3w==", - "license": "MIT" - }, "node_modules/@ethersproject/abi": { "version": "5.7.0", "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.7.0.tgz", @@ -3249,6 +3226,29 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/@upcoming/bee-js": { + "version": "9.4.2", + "resolved": "https://registry.npmjs.org/@upcoming/bee-js/-/bee-js-9.4.2.tgz", + "integrity": "sha512-v9arv35RcNNDPCIhcyZT4rDkMoiEdlSsYvIvhKnsTmDuTeRKIsYZ4ULTEH8MZYOoBhFDKcIhOLn37jOisvqe1Q==", + "license": "BSD-3-Clause", + "dependencies": { + "axios": "^0.30.0", + "cafe-utility": "^28.1.0", + "isomorphic-ws": "^4.0.1", + "semver": "^7.3.5", + "ws": "^8.7.0" + }, + "engines": { + "bee": "2.4.0-390a402e", + "beeApiVersion": "7.2.0" + } + }, + "node_modules/@upcoming/bee-js/node_modules/cafe-utility": { + "version": "28.2.0", + "resolved": "https://registry.npmjs.org/cafe-utility/-/cafe-utility-28.2.0.tgz", + "integrity": "sha512-EppX+Asq5R/3Ozn8eyPpDKVVb9q5hky3dK1gBIwIoR/LNPZJc16KoZQ9zqWNigwTLpfpg5Eyo09iq8M59moR3w==", + "license": "MIT" + }, "node_modules/acorn": { "version": "8.8.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", diff --git a/package.json b/package.json index 86e3b050..8cacf2fc 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ }, "dependencies": { "@ethereumjs/wallet": "^2.0.4", - "@ethersphere/bee-js": "^9.4.0", + "@upcoming/bee-js": "^9.4.2", "cafe-utility": "^27.14.0", "chalk": "^2.4.2", "cli-progress": "^3.11.2", diff --git a/src/command/addresses.ts b/src/command/addresses.ts index 636bd2d9..da0d3011 100644 --- a/src/command/addresses.ts +++ b/src/command/addresses.ts @@ -1,4 +1,4 @@ -import { ChequebookAddressResponse, NodeAddresses } from '@ethersphere/bee-js' +import { ChequebookAddressResponse, NodeAddresses } from '@upcoming/bee-js' import { Optional } from 'cafe-utility' import chalk from 'chalk' import { LeafCommand } from 'furious-commander' diff --git a/src/command/cheque/cashout.ts b/src/command/cheque/cashout.ts index 12f704c9..7b73ac12 100644 --- a/src/command/cheque/cashout.ts +++ b/src/command/cheque/cashout.ts @@ -1,4 +1,4 @@ -import { BZZ } from '@ethersphere/bee-js' +import { BZZ } from '@upcoming/bee-js' import chalk from 'chalk' import { LeafCommand, Option } from 'furious-commander' import { createKeyValue } from '../../utils/text' diff --git a/src/command/cheque/cheque-command.ts b/src/command/cheque/cheque-command.ts index 33856028..fb415d6c 100644 --- a/src/command/cheque/cheque-command.ts +++ b/src/command/cheque/cheque-command.ts @@ -1,4 +1,4 @@ -import { BZZ } from '@ethersphere/bee-js' +import { BZZ } from '@upcoming/bee-js' import { getFieldOrNull } from '../../utils' import { createKeyValue } from '../../utils/text' import { RootCommand } from '../root-command' diff --git a/src/command/download.ts b/src/command/download.ts index f3fc63e2..d725ba1e 100644 --- a/src/command/download.ts +++ b/src/command/download.ts @@ -1,7 +1,6 @@ -import { MantarayNode } from '@ethersphere/bee-js' +import { Bytes, MantarayNode } from '@upcoming/bee-js' import fs from 'fs' import { Aggregation, LeafCommand } from 'furious-commander' -import { Bytes } from '@ethersphere/bee-js' import { BzzAddress, makeBzzAddress } from '../utils/bzz-address' import { Download as ManifestDownload } from './manifest/download' import { RootCommand } from './root-command' diff --git a/src/command/feed/feed-command.ts b/src/command/feed/feed-command.ts index 2846d407..fd870cb6 100644 --- a/src/command/feed/feed-command.ts +++ b/src/command/feed/feed-command.ts @@ -1,5 +1,5 @@ import { Wallet } from '@ethereumjs/wallet' -import { Reference, Topic } from '@ethersphere/bee-js' +import { Reference, Topic } from '@upcoming/bee-js' import { Option } from 'furious-commander' import { exit } from 'process' import { getWalletFromIdentity, pickIdentity } from '../../service/identity' diff --git a/src/command/feed/print.ts b/src/command/feed/print.ts index b584713d..038b58ba 100644 --- a/src/command/feed/print.ts +++ b/src/command/feed/print.ts @@ -1,5 +1,5 @@ import { Wallet } from '@ethereumjs/wallet' -import { MerkleTree, Topic } from '@ethersphere/bee-js' +import { MerkleTree, Topic } from '@upcoming/bee-js' import { Binary } from 'cafe-utility' import { LeafCommand, Option } from 'furious-commander' import { exit } from 'process' diff --git a/src/command/feed/update.ts b/src/command/feed/update.ts index e6b18279..0b420aa6 100644 --- a/src/command/feed/update.ts +++ b/src/command/feed/update.ts @@ -1,4 +1,4 @@ -import { Reference } from '@ethersphere/bee-js' +import { Reference } from '@upcoming/bee-js' import { LeafCommand, Option } from 'furious-commander' import { pickStamp } from '../../service/stamp' import { stampProperties } from '../../utils/option' diff --git a/src/command/feed/upload.ts b/src/command/feed/upload.ts index 54c4657f..0b338e4b 100644 --- a/src/command/feed/upload.ts +++ b/src/command/feed/upload.ts @@ -1,4 +1,4 @@ -import { Reference } from '@ethersphere/bee-js' +import { Reference } from '@upcoming/bee-js' import { Aggregation, LeafCommand, Option } from 'furious-commander' import { pickStamp } from '../../service/stamp' import { stampProperties } from '../../utils/option' diff --git a/src/command/hash.ts b/src/command/hash.ts index f7bb039d..c0fa589a 100644 --- a/src/command/hash.ts +++ b/src/command/hash.ts @@ -1,4 +1,4 @@ -import { MerkleTree, Reference } from '@ethersphere/bee-js' +import { MerkleTree, Reference } from '@upcoming/bee-js' import { readFileSync } from 'fs' import { Argument, LeafCommand } from 'furious-commander' import { RootCommand } from './root-command' diff --git a/src/command/manifest/add.ts b/src/command/manifest/add.ts index 52513bab..2d1f5144 100644 --- a/src/command/manifest/add.ts +++ b/src/command/manifest/add.ts @@ -1,4 +1,4 @@ -import { MantarayNode } from '@ethersphere/bee-js' +import { MantarayNode } from '@upcoming/bee-js' import { Optional } from 'cafe-utility' import chalk from 'chalk' import { readFileSync, statSync } from 'fs' diff --git a/src/command/manifest/create.ts b/src/command/manifest/create.ts index c977f91c..b88c1671 100644 --- a/src/command/manifest/create.ts +++ b/src/command/manifest/create.ts @@ -1,4 +1,4 @@ -import { MantarayNode } from '@ethersphere/bee-js' +import { MantarayNode } from '@upcoming/bee-js' import { Optional } from 'cafe-utility' import { LeafCommand, Option } from 'furious-commander' import { pickStamp } from '../../service/stamp' diff --git a/src/command/manifest/download.ts b/src/command/manifest/download.ts index 31f4478a..16de28e5 100644 --- a/src/command/manifest/download.ts +++ b/src/command/manifest/download.ts @@ -1,4 +1,4 @@ -import { MantarayNode } from '@ethersphere/bee-js' +import { MantarayNode } from '@upcoming/bee-js' import chalk from 'chalk' import fs from 'fs' import { Argument, LeafCommand, Option } from 'furious-commander' diff --git a/src/command/manifest/list.ts b/src/command/manifest/list.ts index e2e4823f..87670be1 100644 --- a/src/command/manifest/list.ts +++ b/src/command/manifest/list.ts @@ -1,4 +1,4 @@ -import { MantarayNode, Reference } from '@ethersphere/bee-js' +import { MantarayNode, Reference } from '@upcoming/bee-js' import chalk from 'chalk' import { Argument, LeafCommand, Option } from 'furious-commander' import { exit } from 'process' diff --git a/src/command/manifest/merge.ts b/src/command/manifest/merge.ts index af904dd0..d1cc4e89 100644 --- a/src/command/manifest/merge.ts +++ b/src/command/manifest/merge.ts @@ -1,4 +1,4 @@ -import { MantarayNode } from '@ethersphere/bee-js' +import { MantarayNode } from '@upcoming/bee-js' import { Optional } from 'cafe-utility' import { Argument, LeafCommand, Option } from 'furious-commander' import { pickStamp } from '../../service/stamp' diff --git a/src/command/manifest/remove.ts b/src/command/manifest/remove.ts index 0d4ffd99..e2bd0737 100644 --- a/src/command/manifest/remove.ts +++ b/src/command/manifest/remove.ts @@ -1,4 +1,4 @@ -import { MantarayNode } from '@ethersphere/bee-js' +import { MantarayNode } from '@upcoming/bee-js' import { Optional } from 'cafe-utility' import { Argument, LeafCommand, Option } from 'furious-commander' import { pickStamp } from '../../service/stamp' diff --git a/src/command/manifest/sync.ts b/src/command/manifest/sync.ts index f66dc518..cb7bc8b3 100644 --- a/src/command/manifest/sync.ts +++ b/src/command/manifest/sync.ts @@ -1,4 +1,4 @@ -import { MantarayNode, MerkleTree } from '@ethersphere/bee-js' +import { MantarayNode, MerkleTree } from '@upcoming/bee-js' import { Binary, Optional } from 'cafe-utility' import chalk from 'chalk' import { readFileSync } from 'fs' diff --git a/src/command/pss/pss-command.ts b/src/command/pss/pss-command.ts index 34b49a52..65fc3231 100644 --- a/src/command/pss/pss-command.ts +++ b/src/command/pss/pss-command.ts @@ -1,4 +1,4 @@ -import { Topic } from '@ethersphere/bee-js' +import { Topic } from '@upcoming/bee-js' import { Option } from 'furious-commander' import { RootCommand } from '../root-command' diff --git a/src/command/pss/receive.ts b/src/command/pss/receive.ts index 87eebb70..705275c6 100644 --- a/src/command/pss/receive.ts +++ b/src/command/pss/receive.ts @@ -1,4 +1,4 @@ -import { Topic } from '@ethersphere/bee-js' +import { Topic } from '@upcoming/bee-js' import { createWriteStream } from 'fs' import { LeafCommand, Option } from 'furious-commander' import { getFieldOrNull } from '../../utils' diff --git a/src/command/pss/send.ts b/src/command/pss/send.ts index e2e5787c..84053e53 100644 --- a/src/command/pss/send.ts +++ b/src/command/pss/send.ts @@ -1,4 +1,4 @@ -import { Topic } from '@ethersphere/bee-js' +import { Topic } from '@upcoming/bee-js' import { readFileSync } from 'fs' import { LeafCommand, Option } from 'furious-commander' import { exit } from 'process' diff --git a/src/command/pss/subscribe.ts b/src/command/pss/subscribe.ts index 3aa13e94..401cddd1 100644 --- a/src/command/pss/subscribe.ts +++ b/src/command/pss/subscribe.ts @@ -1,4 +1,4 @@ -import { BeeError, Topic } from '@ethersphere/bee-js' +import { BeeError, Topic } from '@upcoming/bee-js' import { createWriteStream } from 'fs' import { LeafCommand, Option } from 'furious-commander' import { PssCommand } from './pss-command' diff --git a/src/command/root-command/index.ts b/src/command/root-command/index.ts index 11f62adf..c9a5b813 100644 --- a/src/command/root-command/index.ts +++ b/src/command/root-command/index.ts @@ -1,4 +1,4 @@ -import { Bee, BeeDev, BeeOptions, Reference } from '@ethersphere/bee-js' +import { Bee, BeeDev, BeeOptions, Reference } from '@upcoming/bee-js' import { Optional } from 'cafe-utility' import { ExternalOption, Sourcemap, Utils } from 'furious-commander' import { printCurlCommand } from '../../curl' diff --git a/src/command/stake.ts b/src/command/stake.ts index c50f6cba..edd60e84 100644 --- a/src/command/stake.ts +++ b/src/command/stake.ts @@ -1,4 +1,4 @@ -import { BZZ } from '@ethersphere/bee-js' +import { BZZ } from '@upcoming/bee-js' import { LeafCommand, Option } from 'furious-commander' import { createSpinner } from '../utils/spinner' import { createKeyValue } from '../utils/text' diff --git a/src/command/stamp/buy.ts b/src/command/stamp/buy.ts index b00bba5f..e0147029 100644 --- a/src/command/stamp/buy.ts +++ b/src/command/stamp/buy.ts @@ -1,4 +1,4 @@ -import { BatchId, Utils } from '@ethersphere/bee-js' +import { BatchId, Utils } from '@upcoming/bee-js' import { Dates, Numbers } from 'cafe-utility' import { BigNumber } from 'ethers' import { LeafCommand, Option } from 'furious-commander' diff --git a/src/command/stamp/create.ts b/src/command/stamp/create.ts index 77492108..53ee0c44 100644 --- a/src/command/stamp/create.ts +++ b/src/command/stamp/create.ts @@ -1,4 +1,4 @@ -import { BatchId, Duration, Size } from '@ethersphere/bee-js' +import { BatchId, Duration, Size } from '@upcoming/bee-js' import { Dates, Numbers } from 'cafe-utility' import { LeafCommand, Option } from 'furious-commander' import { isChainStateReady } from '../../utils/chainsync' diff --git a/src/command/stamp/extend.ts b/src/command/stamp/extend.ts index ef23a6d1..7a8298cf 100644 --- a/src/command/stamp/extend.ts +++ b/src/command/stamp/extend.ts @@ -1,4 +1,4 @@ -import { Duration, Size } from '@ethersphere/bee-js' +import { Duration, Size } from '@upcoming/bee-js' import { Dates, Numbers } from 'cafe-utility' import { LeafCommand } from 'furious-commander' import { exit } from 'process' diff --git a/src/command/stamp/list.ts b/src/command/stamp/list.ts index 0fcbfb2b..f884b2f6 100644 --- a/src/command/stamp/list.ts +++ b/src/command/stamp/list.ts @@ -1,4 +1,4 @@ -import { PostageBatch } from '@ethersphere/bee-js' +import { PostageBatch } from '@upcoming/bee-js' import { LeafCommand, Option } from 'furious-commander' import { exit } from 'process' import { printStamp } from '../../service/stamp' diff --git a/src/command/status.ts b/src/command/status.ts index 453b42dc..26917c60 100644 --- a/src/command/status.ts +++ b/src/command/status.ts @@ -1,4 +1,4 @@ -import { BeeModes } from '@ethersphere/bee-js' +import { BeeModes } from '@upcoming/bee-js' import chalk from 'chalk' import { LeafCommand } from 'furious-commander' import { exit } from 'process' diff --git a/src/command/upload.ts b/src/command/upload.ts index 47a3b1c6..89e50ed8 100644 --- a/src/command/upload.ts +++ b/src/command/upload.ts @@ -1,4 +1,4 @@ -import { RedundancyLevel, Reference, Tag, Utils } from '@ethersphere/bee-js' +import { RedundancyLevel, Reference, Tag, Utils } from '@upcoming/bee-js' import { Numbers, Optional, System } from 'cafe-utility' import { Presets, SingleBar } from 'cli-progress' import * as FS from 'fs' diff --git a/src/command/utility/cid.ts b/src/command/utility/cid.ts index 1056ce15..9595cfb4 100644 --- a/src/command/utility/cid.ts +++ b/src/command/utility/cid.ts @@ -1,4 +1,4 @@ -import { Reference } from '@ethersphere/bee-js' +import { Reference } from '@upcoming/bee-js' import { Argument, LeafCommand } from 'furious-commander' import { createKeyValue } from '../../utils/text' import { RootCommand } from '../root-command' diff --git a/src/command/utility/create-batch.ts b/src/command/utility/create-batch.ts index 9c2bd603..d25d14dc 100644 --- a/src/command/utility/create-batch.ts +++ b/src/command/utility/create-batch.ts @@ -1,4 +1,4 @@ -import { Utils } from '@ethersphere/bee-js' +import { Utils } from '@upcoming/bee-js' import { Numbers, Strings } from 'cafe-utility' import { Contract, Event, Wallet } from 'ethers' import { LeafCommand, Option } from 'furious-commander' diff --git a/src/curl.ts b/src/curl.ts index 986a9a62..1effdc62 100644 --- a/src/curl.ts +++ b/src/curl.ts @@ -1,4 +1,4 @@ -import { BeeRequest } from '@ethersphere/bee-js' +import { BeeRequest } from '@upcoming/bee-js' import chalk from 'chalk' import { printer } from './printer' diff --git a/src/service/stamp/index.ts b/src/service/stamp/index.ts index 1598176c..ea059eef 100644 --- a/src/service/stamp/index.ts +++ b/src/service/stamp/index.ts @@ -1,4 +1,4 @@ -import { Bee, PostageBatch } from '@ethersphere/bee-js' +import { Bee, PostageBatch } from '@upcoming/bee-js' import { Dates } from 'cafe-utility' import { exit } from 'process' import { CommandLog } from '../../command/root-command/command-log' diff --git a/src/utils/bzz-address.ts b/src/utils/bzz-address.ts index 5648d1ba..0a19f08b 100644 --- a/src/utils/bzz-address.ts +++ b/src/utils/bzz-address.ts @@ -1,4 +1,4 @@ -import { Bee, MantarayNode } from '@ethersphere/bee-js' +import { Bee, MantarayNode } from '@upcoming/bee-js' import { CommandLineError } from './error' export class BzzAddress { diff --git a/src/utils/chainsync.ts b/src/utils/chainsync.ts index 05e3cbd5..31024c33 100644 --- a/src/utils/chainsync.ts +++ b/src/utils/chainsync.ts @@ -1,4 +1,4 @@ -import { Bee } from '@ethersphere/bee-js' +import { Bee } from '@upcoming/bee-js' const THRESHOLD = 10_000 diff --git a/test/command/manifest.spec.ts b/test/command/manifest.spec.ts index e7546c9b..1daab302 100644 --- a/test/command/manifest.spec.ts +++ b/test/command/manifest.spec.ts @@ -1,4 +1,4 @@ -import { Reference } from '@ethersphere/bee-js' +import { Reference } from '@upcoming/bee-js' import { readFileSync, statSync, writeFileSync } from 'fs' import { Upload as FeedUpload } from '../../src/command/feed/upload' import { RootCommand } from '../../src/command/root-command' diff --git a/test/command/pinning.spec.ts b/test/command/pinning.spec.ts index f51369ea..3438d46a 100644 --- a/test/command/pinning.spec.ts +++ b/test/command/pinning.spec.ts @@ -1,4 +1,4 @@ -import { Reference } from '@ethersphere/bee-js' +import { Reference } from '@upcoming/bee-js' import { FORMATTED_ERROR } from '../../src/command/root-command/printer' import { Upload } from '../../src/command/upload' import { describeCommand, invokeTestCli } from '../utility' diff --git a/test/http-mock/cheque-mock.ts b/test/http-mock/cheque-mock.ts index ee6267b5..b267a244 100644 --- a/test/http-mock/cheque-mock.ts +++ b/test/http-mock/cheque-mock.ts @@ -12,7 +12,7 @@ import { NumberString, Topology, WalletBalance, -} from '@ethersphere/bee-js' +} from '@upcoming/bee-js' import { createServer, Server } from 'http' /** diff --git a/test/utility/address.ts b/test/utility/address.ts index d219884c..ce2306a7 100644 --- a/test/utility/address.ts +++ b/test/utility/address.ts @@ -1,4 +1,4 @@ -import { PublicKey } from '@ethersphere/bee-js' +import { PublicKey } from '@upcoming/bee-js' import { invokeTestCli } from '.' import { Addresses } from '../../src/command/addresses' diff --git a/test/utility/stamp.ts b/test/utility/stamp.ts index 6ff8740c..08ae1e01 100644 --- a/test/utility/stamp.ts +++ b/test/utility/stamp.ts @@ -1,5 +1,5 @@ /* eslint-disable no-console */ -import { BatchId, Bee } from '@ethersphere/bee-js' +import { BatchId, Bee } from '@upcoming/bee-js' import { Numbers } from 'cafe-utility' export const getOrBuyStamp = async (): Promise => {