Merge pull request #5102 from mnaamani/polkadot-api-bump

@polkadot/api bump to v10.7.1

cli/README.md

@@ -26,7 +26,7 @@ $ npm install -g @joystream/cli
 $ joystream-cli COMMAND
 running command...
 $ joystream-cli (-v|--version|version)
-@joystream/cli/1.4.0 darwin-arm64 node-v18.6.0
+@joystream/cli/1.5.1 darwin-arm64 node-v18.6.0
 $ joystream-cli --help [COMMAND]
 USAGE
   $ joystream-cli COMMAND
@@ -118,10 +118,8 @@ When using the CLI for the first time there are a few common steps you might wan
 - [`joystream-cli content:curatorGroup ID`](#joystream-cli-contentcuratorgroup-id)
 - [`joystream-cli content:curatorGroups`](#joystream-cli-contentcuratorgroups)
 - [`joystream-cli content:deleteChannel`](#joystream-cli-contentdeletechannel)
-- [`joystream-cli content:deleteChannelAsModerator`](#joystream-cli-contentdeletechannelasmoderator)
 - [`joystream-cli content:deleteChannelAssetsAsModerator`](#joystream-cli-contentdeletechannelassetsasmoderator)
 - [`joystream-cli content:deleteVideo`](#joystream-cli-contentdeletevideo)
-- [`joystream-cli content:deleteVideoAsModerator`](#joystream-cli-contentdeletevideoasmoderator)
 - [`joystream-cli content:deleteVideoAssetsAsModerator`](#joystream-cli-contentdeletevideoassetsasmoderator)
 - [`joystream-cli content:directChannelPayment`](#joystream-cli-contentdirectchannelpayment)
 - [`joystream-cli content:generateChannelPayoutsCommitment`](#joystream-cli-contentgeneratechannelpayoutscommitment)
@@ -725,10 +723,11 @@ ARGUMENTS
   CURATORID  ID of the curator
 
 OPTIONS
-  -p, --permissions=UpdateChannelMetadata|ManageNonVideoChannelAssets|ManageChannelCollaborators|UpdateVideoMetadata|Add
-  Video|ManageVideoAssets|DeleteChannel|DeleteVideo|ManageVideoNfts|AgentRemark|TransferChannel|ClaimChannelReward|Withd
-  rawFromChannelBalance|IssueCreatorToken|ClaimCreatorTokenPatronage|InitAndManageCreatorTokenSale|CreatorTokenIssuerTra
-  nsfer|MakeCreatorTokenPermissionless|ReduceCreatorTokenPatronageRate|ManageRevenueSplits|DeissueCreatorToken
+  -p,
+  --permissions=UpdateChannelMetadata|ManageNonVideoChannelAssets|ManageChannelCollaborators|UpdateVideoMetadata|AddVide
+  o|ManageVideoAssets|DeleteChannel|DeleteVideo|ManageVideoNfts|AgentRemark|TransferChannel|ClaimChannelReward|WithdrawF
+  romChannelBalance|IssueCreatorToken|ClaimCreatorTokenPatronage|InitAndManageCreatorTokenSale|CreatorTokenIssuerTransfe
+  r|MakeCreatorTokenPermissionless|ReduceCreatorTokenPatronageRate|ManageRevenueSplits|DeissueCreatorToken|AmmControl
       List of permissions to associate with the curator, e.g. -p ManageChannelCollaborators UpdateVideoMetadata
 
   --useMemberId=useMemberId
@@ -969,25 +968,6 @@ OPTIONS
 
 _See code: [src/commands/content/deleteChannel.ts](https://github.com/Joystream/joystream/blob/master/cli/src/commands/content/deleteChannel.ts)_
 
-## `joystream-cli content:deleteChannelAsModerator`
-
-Delete the channel and optionally all associated data objects.
-
-```
-USAGE
-  $ joystream-cli content:deleteChannelAsModerator
-
-OPTIONS
-  -c, --channelId=channelId  (required) ID of the Channel
-  -f, --force                Force-remove all associated channel data objects
-  -r, --rationale=rationale  (required) Reason of deleting the channel by moderator
-  --context=(Lead|Curator)   Actor context to execute the command in (Lead/Curator)
-  --useMemberId=useMemberId  Try using the specified member id as context whenever possible
-  --useWorkerId=useWorkerId  Try using the specified worker id as context whenever possible
-```
-
-_See code: [src/commands/content/deleteChannelAsModerator.ts](https://github.com/Joystream/joystream/blob/master/cli/src/commands/content/deleteChannelAsModerator.ts)_
-
 ## `joystream-cli content:deleteChannelAssetsAsModerator`
 
 Delete the channel assets.
@@ -1025,25 +1005,6 @@ OPTIONS
 
 _See code: [src/commands/content/deleteVideo.ts](https://github.com/Joystream/joystream/blob/master/cli/src/commands/content/deleteVideo.ts)_
 
-## `joystream-cli content:deleteVideoAsModerator`
-
-Delete the video and optionally all associated data objects.
-
-```
-USAGE
-  $ joystream-cli content:deleteVideoAsModerator
-
-OPTIONS
-  -f, --force                Force-remove all associated video data objects
-  -r, --rationale=rationale  (required) reason of deleting the video by moderator
-  -v, --videoId=videoId      (required) ID of the Video
-  --context=(Lead|Curator)   Actor context to execute the command in (Lead/Curator)
-  --useMemberId=useMemberId  Try using the specified member id as context whenever possible
-  --useWorkerId=useWorkerId  Try using the specified worker id as context whenever possible
-```
-
-_See code: [src/commands/content/deleteVideoAsModerator.ts](https://github.com/Joystream/joystream/blob/master/cli/src/commands/content/deleteVideoAsModerator.ts)_
-
 ## `joystream-cli content:deleteVideoAssetsAsModerator`
 
 Delete the video assets.

cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joystream/cli",
   "description": "Command Line Interface for Joystream community and governance activities",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "author": "Leszek Wiesner",
   "bin": {
     "joystream-cli": "./bin/run"
@@ -17,10 +17,11 @@
     "@oclif/plugin-help": "^3.2.2",
     "@oclif/plugin-not-found": "^1.2.4",
     "@oclif/plugin-warn-if-update-available": "^1.7.0",
-    "@polkadot/api": "10.1.4",
-    "@polkadot/keyring": "11.1.1",
-    "@polkadot/util": "11.1.1",
-    "@polkadot/util-crypto": "11.1.1",
+    "@polkadot/api": "10.7.1",
+    "@polkadot/types": "10.7.1",
+    "@polkadot/keyring": "12.6.2",
+    "@polkadot/util": "12.6.2",
+    "@polkadot/util-crypto": "12.6.2",
     "@substrate/txwrapper-core": "6.0.1",
     "@substrate/txwrapper-substrate": "6.0.1",
     "@substrate/txwrapper-polkadot": "6.0.1",
@@ -56,7 +57,7 @@
     "proper-lockfile": "^4.1.1",
     "slug": "^2.1.1",
     "tslib": "^1.11.1",
-    "@joystream/js": "^1.10.0"
+    "@joystream/js": "^1.11.0"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "^1.21.4",

distributor-node/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2.1.1
+
+- Bump deps @polkadot/api v10.7.1
+
 ### 2.1.0
 
 - Nara release.

distributor-node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joystream/distributor-cli",
   "description": "Joystream distributor node CLI",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "author": "Joystream contributors",
   "bin": {
     "joystream-distributor": "./bin/run"
@@ -13,7 +13,7 @@
     "@joystream/metadata-protobuf": "^2.15.0",
     "@joystream/opentelemetry": "1.0.0",
     "@joystream/storage-node-client": "^4.0.0",
-    "@joystream/types": "^4.0.0",
+    "@joystream/types": "^4.4.0",
     "@nerdwallet/apollo-cache-policies": "2.10.0",
     "@oclif/command": "^1",
     "@oclif/config": "^1",

joystreamjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joystream/js",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "license": "GPL-3.0-only",
   "description": "Joystream JS package provides  utilities required to work with Joystream network.",
   "main": "lib/index.js",
@@ -42,8 +42,8 @@
   },
   "dependencies": {
     "@joystream/metadata-protobuf": "^2.15.0",
-    "@joystream/types": "^4.0.0",
-    "@polkadot/util-crypto": "11.1.1",
+    "@joystream/types": "^4.4.0",
+    "@polkadot/util-crypto": "^12.6.2",
     "axios": "^1.2.1",
     "buffer": "^6.0.3",
     "lodash": "^4.17.21",

package.json

@@ -35,15 +35,16 @@
     "opentelemetry"
   ],
   "resolutions": {
-    "@polkadot/api": "10.1.4",
-    "@polkadot/keyring": "^11.1.1",
-    "@polkadot/types": "10.1.4",
-    "@polkadot/util": "^11.1.1",
-    "@polkadot/util-crypto": "^11.1.1",
-    "@polkadot/networks": "^11.1.1",
-    "@polkadot/x-fetch": "^11.1.1",
-    "@polkadot/x-global": "^11.1.1",
-    "@polkadot/x-ws": "^11.1.1",
+    "@polkadot/api": "10.7.1",
+    "@polkadot/typegen": "10.7.1",
+    "@polkadot/keyring": "12.6.2",
+    "@polkadot/types": "10.7.1",
+    "@polkadot/util": "12.6.2",
+    "@polkadot/util-crypto": "12.6.2",
+    "@polkadot/networks": "12.6.2",
+    "@polkadot/x-fetch": "12.6.2",
+    "@polkadot/x-global": "12.6.2",
+    "@polkadot/x-ws": "12.6.2",
     "bn.js": "^5.2.1",
     "rxjs": "^7.4.0",
     "typeorm": "https://github.com/Joystream/typeorm/releases/download/0.3.5/typeorm-v0.3.5.tgz",

query-node/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2.2.1
+
+- Bump deps @polkadot/api v10.7.1
+
 ### 2.1.0
 
 - Bump polkadot-js/api version bump, use newer hydra-typegen version

query-node/mappings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "query-node-mappings",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Mappings for hydra-processor",
   "main": "lib/src/index.js",
   "license": "MIT",
@@ -19,9 +19,9 @@
     "@apollo/client": "^3.2.5",
     "@joystream/hydra-common": "5.0.0-alpha.8",
     "@joystream/hydra-db-utils": "5.0.0-alpha.8",
-    "@joystream/js": "^1.8.0",
+    "@joystream/js": "^1.11.0",
     "@joystream/warthog": "^2.41.9",
-    "@polkadot/types": "10.1.4"
+    "@polkadot/types": "10.7.1"
   },
   "devDependencies": {
     "eslint-plugin-local-rules": "2.0.0",

query-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "query-node-root",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "GraphQL server and mappings. Generated with ♥ by Hydra-CLI",
   "scripts": {
     "build": "./build.sh",

storage-node/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 4.1.1
+
+- Bump deps @polkadot/api v10.7.1
+
 ### 4.1.0
 
 - Nara release.

storage-node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "storage-node",
   "description": "Joystream storage subsystem.",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "author": "Joystream contributors",
   "bin": {
     "storage-node": "./bin/run"
@@ -16,7 +16,7 @@
     "@oclif/command": "^1",
     "@oclif/config": "^1",
     "@oclif/plugin-help": "^3",
-    "@polkadot/api": "10.1.4",
+    "@polkadot/api": "10.7.1",
     "@types/base64url": "^2.0.0",
     "@types/express": "4.17.13",
     "@types/file-type": "^10.9.1",

tests/network-tests/package.json

@@ -19,8 +19,8 @@
     "@babel/helper-get-function-arity": "^7.16.7",
     "@joystream/distributor-node-client": "^2.0.0",
     "@joystream/js": "^1.6.0",
-    "@polkadot/api": "10.1.4",
-    "@polkadot/keyring": "11.1.1",
+    "@polkadot/api": "10.7.1",
+    "@polkadot/keyring": "^12.6.2",
     "@types/async-lock": "^1.1.3",
     "@types/bmp-js": "^0.1.0",
     "@types/bn.js": "^5.1.0",

types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joystream/types",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "Types for Joystream Substrate Runtime - Nara release",
   "main": "lib/cjs/index.js",
   "types": "lib/index.d.ts",
@@ -36,9 +36,9 @@
   "author": "Joystream contributors",
   "maintainers": [],
   "dependencies": {
-    "@polkadot/api": "10.1.4",
-    "@polkadot/keyring": "11.1.1",
-    "@polkadot/types": "10.1.4",
+    "@polkadot/api": "10.7.1",
+    "@polkadot/keyring": "^12.6.2",
+    "@polkadot/types": "10.7.1",
     "@types/lodash": "^4.14.157",
     "@types/vfile": "^4.0.0",
     "lodash": "^4.17.15",

types/src/augment/augment-api-rpc.ts

@@ -21,7 +21,7 @@ import type { CreatedBlock } from '@polkadot/types/interfaces/engine';
 import type { EthAccount, EthCallRequest, EthFeeHistory, EthFilter, EthFilterChanges, EthLog, EthReceipt, EthRichBlock, EthSubKind, EthSubParams, EthSyncStatus, EthTransaction, EthTransactionRequest, EthWork } from '@polkadot/types/interfaces/eth';
 import type { Extrinsic } from '@polkadot/types/interfaces/extrinsics';
 import type { EncodedFinalityProofs, JustificationNotification, ReportedRoundStates } from '@polkadot/types/interfaces/grandpa';
-import type { MmrLeafBatchProof, MmrLeafProof } from '@polkadot/types/interfaces/mmr';
+import type { MmrHash, MmrLeafBatchProof } from '@polkadot/types/interfaces/mmr';
 import type { StorageKind } from '@polkadot/types/interfaces/offchain';
 import type { FeeDetails, RuntimeDispatchInfoV1 } from '@polkadot/types/interfaces/payment';
 import type { RpcMethods } from '@polkadot/types/interfaces/rpc';
@@ -373,13 +373,21 @@ declare module '@polkadot/rpc-core/types/jsonrpc' {
     };
     mmr: {
       /**
-       * Generate MMR proof for the given leaf indices.
+       * Generate MMR proof for the given block numbers.
        **/
-      generateBatchProof: AugmentedRpc<(leafIndices: Vec<u64> | (u64 | AnyNumber | Uint8Array)[], at?: BlockHash | string | Uint8Array) => Observable<MmrLeafProof>>;
+      generateProof: AugmentedRpc<(blockNumbers: Vec<u64> | (u64 | AnyNumber | Uint8Array)[], bestKnownBlockNumber?: u64 | AnyNumber | Uint8Array, at?: BlockHash | string | Uint8Array) => Observable<MmrLeafBatchProof>>;
       /**
-       * Generate MMR proof for given leaf index.
+       * Get the MMR root hash for the current best block.
        **/
-      generateProof: AugmentedRpc<(leafIndex: u64 | AnyNumber | Uint8Array, at?: BlockHash | string | Uint8Array) => Observable<MmrLeafBatchProof>>;
+      root: AugmentedRpc<(at?: BlockHash | string | Uint8Array) => Observable<MmrHash>>;
+      /**
+       * Verify an MMR proof
+       **/
+      verifyProof: AugmentedRpc<(proof: MmrLeafBatchProof | { blockHash?: any; leaves?: any; proof?: any } | string | Uint8Array) => Observable<bool>>;
+      /**
+       * Verify an MMR proof statelessly given an mmr_root
+       **/
+      verifyProofStateless: AugmentedRpc<(root: MmrHash | string | Uint8Array, proof: MmrLeafBatchProof | { blockHash?: any; leaves?: any; proof?: any } | string | Uint8Array) => Observable<bool>>;
     };
     net: {
       /**