feat!: add unit flag for cheque deposit and withraw

jest.config.ts

@@ -55,7 +55,7 @@ export default async (): Promise<Config.InitialOptions> => {
   }
 
   return {
-    collectCoverage: true,
+    collectCoverage: process.env.SKIP_COVERAGE !== 'true',
     coverageDirectory: 'coverage',
     coverageReporters: ['lcov', 'json-summary'],
     collectCoverageFrom: ['src/**/*.ts'],

src/command/cheque/deposit.ts

@@ -1,4 +1,6 @@
-import { Argument, LeafCommand } from 'furious-commander'
+import { Argument, LeafCommand, Option } from 'furious-commander'
+import { BZZ } from '@ethersphere/bee-js'
+import { Context } from 'madlad'
 import { createKeyValue } from '../../utils/text'
 import { ChequeCommand } from './cheque-command'
 
@@ -11,17 +13,48 @@ export class Deposit extends ChequeCommand implements LeafCommand {
 
   @Argument({
     key: 'amount',
-    type: 'bigint',
-    description: 'Amount of tokens to deposit in PLUR',
+    description: 'Amount of tokens to deposit',
+    type: 'decimal-string',
     required: true,
-    minimum: BigInt(1),
+    validate: (value: unknown, context: Context): string[] => {
+      if (context.options.unit === 'bzz') {
+        const amount = parseFloat(value as string)
+
+        if (isNaN(amount) || amount <= 0) {
+          return [`Invalid amount '${value}'. Amount must be a positive number.`]
+        }
+      } else {
+        try {
+          const amount = BigInt(value as string)
+
+          if (amount <= BigInt(0)) {
+            return [`Invalid amount '${value}'. Amount must be a positive integer.`]
+          }
+        } catch (e) {
+          return [`Invalid amount '${value}'. Amount must be a positive integer.`]
+        }
+      }
+
+      return []
+    },
   })
-  public amount!: bigint
+  public amount!: string
+
+  @Option({
+    key: 'unit',
+    type: 'enum',
+    description: 'Unit of the amount',
+    enum: ['bzz', 'plur'],
+    default: 'bzz',
+  })
+  public unit!: string
 
   public async run(): Promise<void> {
     super.init()
 
-    const response = await this.bee.depositTokens(this.amount.toString())
+    const amountBzz = this.unit === 'bzz' ? BZZ.fromDecimalString(this.amount) : BZZ.fromPLUR(this.amount)
+
+    const response = await this.bee.depositBZZToChequebook(amountBzz)
     this.console.log(createKeyValue('Tx', response.toHex()))
     this.console.quiet(response.toHex())
   }

src/command/cheque/withdraw.ts

@@ -1,4 +1,6 @@
-import { Argument, LeafCommand } from 'furious-commander'
+import { Argument, LeafCommand, Option } from 'furious-commander'
+import { BZZ } from '@ethersphere/bee-js'
+import { Context } from 'madlad'
 import { createKeyValue } from '../../utils/text'
 import { ChequeCommand } from './cheque-command'
 
@@ -11,17 +13,48 @@ export class Withdraw extends ChequeCommand implements LeafCommand {
 
   @Argument({
     key: 'amount',
-    type: 'bigint',
-    description: 'Amount of tokens to withdraw in PLUR',
+    type: 'string',
+    description: 'Amount of tokens to withdraw',
     required: true,
-    minimum: BigInt(1),
+    validate: (value: unknown, context: Context): string[] => {
+      if (context.options.unit === 'bzz') {
+        const amount = parseFloat(value as string)
+
+        if (isNaN(amount) || amount <= 0) {
+          return [`Invalid amount '${value}'. Amount must be a positive number.`]
+        }
+      } else {
+        try {
+          const amount = BigInt(value as string)
+
+          if (amount <= BigInt(0)) {
+            return [`Invalid amount '${value}'. Amount must be a positive integer.`]
+          }
+        } catch (e) {
+          return [`Invalid amount '${value}'. Amount must be a positive integer.`]
+        }
+      }
+
+      return []
+    },
   })
-  public amount!: bigint
+  public amount!: string
+
+  @Option({
+    key: 'unit',
+    type: 'enum',
+    description: 'Unit of the amount',
+    enum: ['bzz', 'plur'],
+    default: 'bzz',
+  })
+  public unit!: string
 
   public async run(): Promise<void> {
     super.init()
 
-    const response = await this.bee.withdrawTokens(this.amount.toString())
+    const amountBzz = this.unit === 'bzz' ? BZZ.fromDecimalString(this.amount) : BZZ.fromPLUR(this.amount)
+
+    const response = await this.bee.withdrawBZZFromChequebook(amountBzz)
     this.console.log(createKeyValue('Tx', response.toHex()))
     this.console.quiet(response.toHex())
   }

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

@@ -55,7 +55,7 @@ export class CommandConfig {
   }
 
   public getHistoryFilePath(): string {
-    return join(this.configFolderPath, 'upload-history.json')
+    return process.env.SWARM_CLI_HISTORY_FILE_PATH || join(this.configFolderPath, 'upload-history.json')
   }
 
   public setHistoryEnabled(enabled: boolean): void {

src/config.ts

@@ -102,7 +102,7 @@ export const dev: IOption<boolean> = {
   default: false,
 }
 
-export const optionParameters: IOption<unknown>[] = [
+export const optionParameters: IOption<any>[] = [
   beeApiUrl,
   configFolder,
   configFile,

src/utils/text.ts

@@ -17,6 +17,10 @@ export function warningText(string: string): string {
   return chalk.yellow(string)
 }
 
+export function errorText(string: string): string {
+  return chalk.red(string)
+}
+
 export function deletePreviousLine(): void {
   process.stdout.write('\r' + goUpOneRow() + deleteWholeRow())
 }