Browse Source

storage-node-v2: Add ‘set storage bucket status’ command.

Shamil Gadelshin 3 years ago
parent
commit
8b86aa16d5

+ 28 - 7
storage-node-v2/README.md

@@ -38,13 +38,14 @@ USAGE
 * [`storage-node leader:delete-bucket`](#storage-node-leaderdelete-bucket)
 * [`storage-node leader:invite-operator`](#storage-node-leaderinvite-operator)
 * [`storage-node leader:remove-operator`](#storage-node-leaderremove-operator)
-* [`storage-node leader:set-uploading-block [FILE]`](#storage-node-leaderset-uploading-block-file)
+* [`storage-node leader:set-uploading-block`](#storage-node-leaderset-uploading-block)
 * [`storage-node leader:update-bag`](#storage-node-leaderupdate-bag)
 * [`storage-node leader:update-bag-limit`](#storage-node-leaderupdate-bag-limit)
 * [`storage-node leader:update-data-fee`](#storage-node-leaderupdate-data-fee)
 * [`storage-node leader:update-voucher-limits`](#storage-node-leaderupdate-voucher-limits)
 * [`storage-node operator:accept-invitation`](#storage-node-operatoraccept-invitation)
 * [`storage-node operator:set-metadata`](#storage-node-operatorset-metadata)
+* [`storage-node operator:update-bucket-status [FILE]`](#storage-node-operatorupdate-bucket-status-file)
 * [`storage-node server [FILE]`](#storage-node-server-file)
 
 ## `storage-node dev:init`
@@ -257,18 +258,22 @@ OPTIONS
 
 _See code: [src/commands/leader/remove-operator.ts](https://github.com/Joystream/joystream/blob/v0.1.0/src/commands/leader/remove-operator.ts)_
 
-## `storage-node leader:set-uploading-block [FILE]`
+## `storage-node leader:set-uploading-block`
 
-describe the command here
+Sets global uploading block. Requires storage working group leader permissions.
 
 ```
 USAGE
-  $ storage-node leader:set-uploading-block [FILE]
+  $ storage-node leader:set-uploading-block
 
 OPTIONS
-  -f, --force
-  -h, --help       show CLI help
-  -n, --name=name  name to print
+  -d, --disable            Disables global uploading block.
+  -e, --enable             Enables global uploading block (default).
+  -h, --help               show CLI help
+  -k, --keyfile=keyfile    Key file for the account. Mandatory in non-dev environment.
+  -m, --dev                Use development mode
+  -p, --password=password  Key file password (optional).
+  -u, --apiUrl=apiUrl      Runtime API URL. Mandatory in non-dev environment. Default is ws://localhost:9944
 ```
 
 _See code: [src/commands/leader/set-uploading-block.ts](https://github.com/Joystream/joystream/blob/v0.1.0/src/commands/leader/set-uploading-block.ts)_
@@ -419,6 +424,22 @@ OPTIONS
 
 _See code: [src/commands/operator/set-metadata.ts](https://github.com/Joystream/joystream/blob/v0.1.0/src/commands/operator/set-metadata.ts)_
 
+## `storage-node operator:update-bucket-status [FILE]`
+
+describe the command here
+
+```
+USAGE
+  $ storage-node operator:update-bucket-status [FILE]
+
+OPTIONS
+  -f, --force
+  -h, --help       show CLI help
+  -n, --name=name  name to print
+```
+
+_See code: [src/commands/operator/update-bucket-status.ts](https://github.com/Joystream/joystream/blob/v0.1.0/src/commands/operator/update-bucket-status.ts)_
+
 ## `storage-node server [FILE]`
 
 Starts the storage node server.

+ 1 - 1
storage-node-v2/scripts/init-dev-bucket.sh

@@ -8,5 +8,5 @@ yarn storage-node dev:init
 yarn storage-node leader:update-bag-limit -l 7 --dev
 yarn storage-node leader:update-voucher-limits -o 100 -s 10000000 --dev
 yarn storage-node leader:create-bucket -i=0 -a -n=100 -s=10000000  --dev 
-yarn storage-node operator:accept-invitation -w=0 -b=0 --dev
+yarn storage-node operator:accept-invitation -w=0 -i=0 --dev
 yarn storage-node leader:update-bag -b=0 -i static:council --dev 

+ 2 - 1
storage-node-v2/scripts/run-all-commands.sh

@@ -13,8 +13,9 @@ yarn storage-node leader:update-voucher-limits -o 100 -s 10000000 --dev
 yarn storage-node leader:update-data-fee -f 10000 --dev
 
 # Create and configure a bucket.
-yarn storage-node leader:create-bucket -i=0 -a -n=100 -s=10000000  --dev # bucketId = 0
+yarn storage-node leader:create-bucket -i=0 -n=100 -s=10000000  --dev # bucketId = 0
 yarn storage-node operator:accept-invitation -w=0 -i=0 --dev
+yarn storage-node operator:update-bucket-status -w=0 -i=0 --enable --dev
 yarn storage-node leader:update-bag -b=0 -i static:council --dev 
 yarn storage-node operator:set-metadata -w=0 -i=0 -m=http://google.com --dev
 

+ 1 - 1
storage-node-v2/src/commands/leader/cancel-invite.ts

@@ -4,7 +4,7 @@ import ApiCommandBase from '../../command-base/ApiCommandBase'
 import logger from '../../services/logger'
 
 export default class LeaderCancelInvite extends ApiCommandBase {
-  static description = `Cancels a storage bucket operator invite. Requires storage working group leader permissions.`
+  static description = `Cancel a storage bucket operator invite. Requires storage working group leader permissions.`
 
   static flags = {
     bucketId: flags.integer({

+ 1 - 1
storage-node-v2/src/commands/leader/delete-bucket.ts

@@ -4,7 +4,7 @@ import ApiCommandBase from '../../command-base/ApiCommandBase'
 import logger from '../../services/logger'
 
 export default class LeaderDeleteBucket extends ApiCommandBase {
-  static description = `Deletes a storage bucket. Requires storage working group leader permissions.`
+  static description = `Delete a storage bucket. Requires storage working group leader permissions.`
 
   static flags = {
     bucketId: flags.integer({

+ 1 - 1
storage-node-v2/src/commands/leader/invite-operator.ts

@@ -4,7 +4,7 @@ import ApiCommandBase from '../../command-base/ApiCommandBase'
 import logger from '../../services/logger'
 
 export default class LeaderInviteOperator extends ApiCommandBase {
-  static description = `Invites a storage bucket operator. Requires storage working group leader permissions.`
+  static description = `Invite a storage bucket operator. Requires storage working group leader permissions.`
 
   static flags = {
     bucketId: flags.integer({

+ 1 - 1
storage-node-v2/src/commands/leader/remove-operator.ts

@@ -4,7 +4,7 @@ import ApiCommandBase from '../../command-base/ApiCommandBase'
 import logger from '../../services/logger'
 
 export default class LeaderRemoveOperator extends ApiCommandBase {
-  static description = `Removes a storage bucket operator. Requires storage working group leader permissions.`
+  static description = `Remove a storage bucket operator. Requires storage working group leader permissions.`
 
   static flags = {
     bucketId: flags.integer({

+ 1 - 2
storage-node-v2/src/commands/leader/set-uploading-block.ts

@@ -4,7 +4,7 @@ import ApiCommandBase from '../../command-base/ApiCommandBase'
 import logger from '../../services/logger'
 
 export default class LeaderSetUploadingBlock extends ApiCommandBase {
-  static description = `Sets global uploading block. Requires storage working group leader permissions.`
+  static description = `Set global uploading block. Requires storage working group leader permissions.`
 
   static flags = {
     enable: flags.boolean({
@@ -22,7 +22,6 @@ export default class LeaderSetUploadingBlock extends ApiCommandBase {
     const { flags } = this.parse(LeaderSetUploadingBlock)
 
     const disable = flags.disable
-
     const newStatus = !disable
 
     logger.info('Setting global uploading block...')

+ 1 - 1
storage-node-v2/src/commands/leader/update-data-fee.ts

@@ -4,7 +4,7 @@ import ApiCommandBase from '../../command-base/ApiCommandBase'
 import logger from '../../services/logger'
 
 export default class LeaderUpdateDataFee extends ApiCommandBase {
-  static description = `Updates data size fee. Requires storage working group leader permissions.`
+  static description = `Update data size fee. Requires storage working group leader permissions.`
 
   static flags = {
     fee: flags.integer({

+ 57 - 0
storage-node-v2/src/commands/operator/update-bucket-status.ts

@@ -0,0 +1,57 @@
+import { flags } from '@oclif/command'
+import { updateStorageBucketStatus } from '../../services/runtime/extrinsics'
+import ApiCommandBase from '../../command-base/ApiCommandBase'
+import logger from '../../services/logger'
+
+export default class OperatorUpdateStorageBucketStatus extends ApiCommandBase {
+  static description = 'Update storage bucket status (accepting new bags).'
+
+  static flags = {
+    workerId: flags.integer({
+      char: 'w',
+      required: true,
+      description: 'Storage operator worker ID',
+    }),
+    bucketId: flags.integer({
+      char: 'i',
+      required: true,
+      description: 'Storage bucket ID',
+    }),
+    enable: flags.boolean({
+      char: 'e',
+      description: 'Enables accepting new bags (default).',
+    }),
+    disable: flags.boolean({
+      char: 'd',
+      description: 'Disables accepting new bags.',
+    }),
+    ...ApiCommandBase.flags,
+  }
+
+  async run(): Promise<void> {
+    const { flags } = this.parse(OperatorUpdateStorageBucketStatus)
+
+    const worker = flags.workerId ?? 0
+    const bucket = flags.bucketId ?? 0
+    const disable = flags.disable
+    const newStatus = !disable
+
+    logger.info('Updating the storage bucket status...')
+    if (flags.dev) {
+      await this.ensureDevelopmentChain()
+    }
+
+    const account = this.getAccount(flags)
+
+    const api = await this.getApi()
+    const success = await updateStorageBucketStatus(
+      api,
+      account,
+      worker,
+      bucket,
+      newStatus
+    )
+
+    this.exitAfterRuntimeCall(success)
+  }
+}

+ 18 - 0
storage-node-v2/src/services/runtime/extrinsics.ts

@@ -278,3 +278,21 @@ export async function updateUploadingBlockedStatus(
     )
   )
 }
+
+export async function updateStorageBucketStatus(
+  api: ApiPromise,
+  account: KeyringPair,
+  workerId: number,
+  storageBucketId: number,
+  newStatus: boolean
+): Promise<boolean> {
+  return await extrinsicWrapper(() =>
+    sendAndFollowNamedTx(
+      api,
+      account,
+      'storage',
+      'updateStorageBucketStatus',
+      [workerId, storageBucketId, newStatus]
+    )
+  )
+}