feat: merge api (#503)

.github/workflows/ci.yaml

@@ -11,8 +11,6 @@ on:
 env:
   BEE_API_URL: 'http://localhost:1633'
   BEE_PEER_API_URL: 'http://localhost:11633'
-  BEE_DEBUG_API_URL: 'http://localhost:1635'
-  BEE_PEER_DEBUG_API_URL: 'http://localhost:11635'
 
 jobs:
   node-tests:

jest.config.ts

@@ -15,7 +15,7 @@ export default async (): Promise<Config.InitialOptions> => {
    * only consists a single queen node as well
    */
   if (!process.env.SKIP_WORKER) {
-    process.env.WORKER_PSS_ADDRESS = await getPssAddress('http://localhost:11635')
+    process.env.WORKER_PSS_ADDRESS = await getPssAddress('http://localhost:11633')
   }
 
   if (!process.env.STAMP) {

package.json

@@ -63,7 +63,7 @@
     "typescript": "^4.8.4"
   },
   "dependencies": {
-    "@ethersphere/bee-js": "^6.9.0",
+    "@ethersphere/bee-js": "^7.0.0",
     "@fairdatasociety/bmt-js": "^2.1.0",
     "bignumber.js": "^9.1.0",
     "chalk": "^2.4.2",

src/command/addresses.ts

@@ -16,8 +16,8 @@ export class Addresses extends RootCommand implements LeafCommand {
   public async run(): Promise<void> {
     await super.init()
 
-    this.nodeAddresses = await this.beeDebug.getNodeAddresses()
-    this.chequebookAddress = (await this.beeDebug.getChequebookAddress()).chequebookAddress
+    this.nodeAddresses = await this.bee.getNodeAddresses()
+    this.chequebookAddress = (await this.bee.getChequebookAddress()).chequebookAddress
 
     const longest = 'PSS Public Key'.length
     this.console.log(chalk.bold('Node Addresses'))

src/command/cheque/cashout.ts

@@ -73,7 +73,7 @@ export class Cashout extends ChequeCommand implements LeafCommand {
     try {
       this.console.log(chalk.green('Cashing out:'))
       this.printCheque({ address, amount })
-      const transaction = await this.beeDebug.cashoutLastCheque(address, {
+      const transaction = await this.bee.cashoutLastCheque(address, {
         gasLimit: this.gasLimit?.toString(),
         gasPrice: this.gasPrice?.toString(),
       })

src/command/cheque/cheque-command.ts

@@ -15,7 +15,7 @@ export class ChequeCommand extends RootCommand {
   }
 
   protected async getCashableCheques(): Promise<Cashable[]> {
-    const { lastcheques } = await this.beeDebug.getLastCheques()
+    const { lastcheques } = await this.bee.getLastCheques()
 
     const results: Cashable[] = []
     for (const cheque of lastcheques) {
@@ -41,7 +41,7 @@ export class ChequeCommand extends RootCommand {
 
   protected async getUncashedAmount(address: string): Promise<bigint> {
     try {
-      const lastCashout = await this.beeDebug.getLastCashoutAction(address)
+      const lastCashout = await this.bee.getLastCashoutAction(address)
 
       return BigInt(lastCashout.uncashedAmount)
     } catch (error) {

src/command/cheque/deposit.ts

@@ -21,7 +21,7 @@ export class Deposit extends ChequeCommand implements LeafCommand {
   public async run(): Promise<void> {
     await super.init()
 
-    const response = await this.beeDebug.depositTokens(this.amount.toString())
+    const response = await this.bee.depositTokens(this.amount.toString())
     this.console.log(createKeyValue('Tx', response))
     this.console.quiet(response)
   }

src/command/cheque/withdraw.ts

@@ -21,7 +21,7 @@ export class Withdraw extends ChequeCommand implements LeafCommand {
   public async run(): Promise<void> {
     await super.init()
 
-    const response = await this.beeDebug.withdrawTokens(this.amount.toString())
+    const response = await this.bee.withdrawTokens(this.amount.toString())
     this.console.log(createKeyValue('Tx', response))
     this.console.quiet(response)
   }

src/command/feed/feed-command.ts

@@ -51,8 +51,8 @@ export class FeedCommand extends RootCommand {
 
     this.console.quiet(manifest)
 
-    if (!this.quiet && this.debugApiIsUsable()) {
-      printStamp(await this.beeDebug.getPostageBatch(this.stamp), this.console, { shortenBatchId: true })
+    if (!this.quiet) {
+      printStamp(await this.bee.getPostageBatch(this.stamp), this.console, { shortenBatchId: true })
     }
 
     return manifest

src/command/feed/print.ts

@@ -37,7 +37,7 @@ export class Print extends FeedCommand implements LeafCommand {
 
       if (!this.stamp) {
         spinner.stop()
-        this.stamp = await pickStamp(this.beeDebug, this.console)
+        this.stamp = await pickStamp(this.bee, this.console)
         spinner.start()
       }
 

src/command/feed/update.ts

@@ -14,7 +14,7 @@ export class Update extends FeedCommand implements LeafCommand {
     await super.init()
 
     if (!this.stamp) {
-      this.stamp = await pickStamp(this.beeDebug, this.console)
+      this.stamp = await pickStamp(this.bee, this.console)
     }
 
     await this.updateFeedAndPrint(this.reference)

src/command/feed/upload.ts

@@ -17,7 +17,7 @@ export class Upload extends FeedCommand implements LeafCommand {
     await super.init()
 
     if (!this.stamp) {
-      const stamp = await pickStamp(this.beeDebug, this.console)
+      const stamp = await pickStamp(this.bee, this.console)
       this.stamp = stamp
       this.fileUpload.stamp = stamp
     }

src/command/manifest/add.ts

@@ -29,7 +29,7 @@ export class Add extends ManifestCommand implements LeafCommand {
     await super.init()
 
     if (!this.stamp) {
-      this.stamp = await pickStamp(this.beeDebug, this.console)
+      this.stamp = await pickStamp(this.bee, this.console)
     }
     const address = new BzzAddress(this.bzzUrl)
     const { node } = await this.initializeNode(address.hash)

src/command/manifest/create.ts

@@ -15,7 +15,7 @@ export class Create extends ManifestCommand implements LeafCommand {
     await super.init()
 
     if (!this.stamp) {
-      this.stamp = await pickStamp(this.beeDebug, this.console)
+      this.stamp = await pickStamp(this.bee, this.console)
     }
     const node = new MantarayNode()
     await this.saveAndPrintNode(node, this.stamp)

src/command/manifest/merge.ts

@@ -20,7 +20,7 @@ export class Merge extends ManifestCommand implements LeafCommand {
     await super.init()
 
     if (!this.stamp) {
-      this.stamp = await pickStamp(this.beeDebug, this.console)
+      this.stamp = await pickStamp(this.bee, this.console)
     }
     const destinationNode = (await this.initializeNode(this.destination)).node
     const sourceNode = (await this.initializeNode(this.source)).node

src/command/manifest/remove.ts

@@ -18,7 +18,7 @@ export class Remove extends ManifestCommand implements LeafCommand {
     await super.init()
 
     if (!this.stamp) {
-      this.stamp = await pickStamp(this.beeDebug, this.console)
+      this.stamp = await pickStamp(this.bee, this.console)
     }
 
     const address = new BzzAddress(this.bzzUrl)

src/command/manifest/sync.ts

@@ -35,7 +35,7 @@ export class Sync extends ManifestCommand implements LeafCommand {
     await super.init()
 
     if (!this.stamp) {
-      this.stamp = await pickStamp(this.beeDebug, this.console)
+      this.stamp = await pickStamp(this.bee, this.console)
     }
     const address = new BzzAddress(this.bzzUrl)
     const { node } = await this.initializeNode(address.hash)

src/command/pss/send.ts

@@ -69,7 +69,7 @@ export class Send extends PssCommand implements LeafCommand {
     }
 
     if (!this.stamp) {
-      this.stamp = await pickStamp(this.beeDebug, this.console)
+      this.stamp = await pickStamp(this.bee, this.console)
     }
 
     this.console.log('Sending PSS message on topic ' + this.topic)

src/command/root-command/command-config.ts

@@ -2,7 +2,7 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs'
 import { homedir, platform } from 'os'
 import { join } from 'path'
 import { exit } from 'process'
-import { beeApiUrl, beeDebugApiUrl } from '../../config'
+import { beeApiUrl } from '../../config'
 import { Identity } from '../../service/identity/types'
 import { ConfigOption } from '../../utils/types/config-option'
 import { CommandLog } from './command-log'
@@ -14,16 +14,11 @@ import { CommandLog } from './command-log'
  * `optionKey` is the kebab-case variant of the argument used in the parser, a.k.a. the key,
  * `propertyKey` is the camelCase variant used in TypeScript command classes, a.k.a. the property.
  */
-export const CONFIG_OPTIONS: ConfigOption[] = [
-  { optionKey: 'bee-api-url', propertyKey: 'beeApiUrl' },
-  { optionKey: 'bee-debug-api-url', propertyKey: 'beeDebugApiUrl' },
-]
+export const CONFIG_OPTIONS: ConfigOption[] = [{ optionKey: 'bee-api-url', propertyKey: 'beeApiUrl' }]
 
 export interface Config {
   beeApiUrl: string
 
-  beeDebugApiUrl: string
-
   identities: { [name: string]: Identity }
 }
 
@@ -40,7 +35,6 @@ export class CommandConfig {
     this.console = console
     this.config = {
       beeApiUrl: beeApiUrl.default || '',
-      beeDebugApiUrl: beeDebugApiUrl.default || '',
       identities: {},
     }
     this.configFolderPath = this.getConfigFolderPath(appName, configFolder)