test: test upcoming bee-js

.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

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'

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",

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'

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'

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'

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'

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'

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'
@@ -80,7 +80,7 @@
       const addressString = this.address || (await this.getAddressString())
       const reader = this.bee.makeFeedReader(topic, addressString)
       const { payload, feedIndex, feedIndexNext } = await reader.download()
       // TODO: verify this
       const reference = payload
       spinner.stop()
       this.console.verbose(createKeyValue('Chunk Reference', reference.toHex()))

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

src/command/pss/pss-command.ts

@@ -1,8 +1,8 @@
-import { Topic } from '@ethersphere/bee-js'
+import { Topic } from '@upcoming/bee-js'
 import { Option } from 'furious-commander'
 import { RootCommand } from '../root-command'
 
 // TODO: https://github.com/ethersphere/bee/issues/2041
 export class PssCommand extends RootCommand {
   public topic!: string
 

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'
 

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'

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 {

src/utils/chainsync.ts

@@ -1,4 +1,4 @@
-import { Bee } from '@ethersphere/bee-js'
+import { Bee } from '@upcoming/bee-js'
 
 const THRESHOLD = 10_000
 

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'

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'

test/http-mock/cheque-mock.ts

@@ -12,7 +12,7 @@
   NumberString,
   Topology,
   WalletBalance,
-} from '@ethersphere/bee-js'
+} from '@upcoming/bee-js'
 import { createServer, Server } from 'http'
 
 /**
@@ -172,7 +172,7 @@
 
 const nodeInfo: NodeInfo = { beeMode: BeeModes.LIGHT, chequebookEnabled: true, swapEnabled: true }
 
 function bytesToString(key: string, value: any): any {
   if (Array.isArray(value)) {
     return value.map(v => bytesToString(key, v))
   }
@@ -190,7 +190,7 @@
   }
 
   if (typeof value === 'object' && value !== null) {
     const newObj: any = {}
     for (const k in value) {
       if (value.hasOwnProperty(k)) {
         newObj[k] = bytesToString(k, value[k])

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'
 

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<BatchId> => {