Skip to content

Commit

Permalink
Merge pull request #5130 from mnaamani/luxor-preserve-dispatch-indice…
Browse files Browse the repository at this point in the history
…s-weights-cleanup

Luxor finishing touches
  • Loading branch information
mnaamani authored Apr 8, 2024
2 parents e0c7b89 + 92d6af4 commit 5974a9b
Show file tree
Hide file tree
Showing 45 changed files with 1,200 additions and 906 deletions.
2 changes: 1 addition & 1 deletion chain-metadata.json

Large diffs are not rendered by default.

51 changes: 6 additions & 45 deletions cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
15 changes: 8 additions & 7 deletions cli/package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -68,7 +69,7 @@
"@oclif/test": "^1.2.5",
"@types/chai": "^4.2.11",
"@types/mocha": "^5.2.7",
"@types/node": "^10.17.18",
"@types/node": "^18.6.0",
"chai": "^4.2.0",
"eslint": "^7.6.0",
"eslint-config-oclif": "^3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion devops/kubernetes/argus/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "eks-cluster",
"devDependencies": {
"@types/node": "^10.0.0"
"@types/node": "^18.6.0"
},
"dependencies": {
"@pulumi/aws": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion devops/kubernetes/node-network/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "joystream-node-network",
"devDependencies": {
"@types/node": "^10.0.0"
"@types/node": "^18.6.0"
},
"dependencies": {
"@pulumi/aws": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion devops/kubernetes/orion/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "eks-cluster",
"devDependencies": {
"@types/node": "^10.0.0"
"@types/node": "^18.6.0"
},
"dependencies": {
"@pulumi/awsx": "^0.30.0",
Expand Down
2 changes: 1 addition & 1 deletion devops/kubernetes/pulumi-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "pulumi-common",
"version": "1.0.0",
"devDependencies": {
"@types/node": "^10.0.0"
"@types/node": "^18.6.0"
},
"dependencies": {
"@pulumi/kubernetes": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion devops/kubernetes/query-node/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "query-node",
"devDependencies": {
"@types/node": "^10.0.0"
"@types/node": "^18.6.0"
},
"dependencies": {
"@pulumi/aws": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion devops/kubernetes/storage-node/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "eks-cluster",
"devDependencies": {
"@types/node": "^10.0.0"
"@types/node": "^18.6.0"
},
"dependencies": {
"@pulumi/aws": "^4.0.0",
Expand Down
12 changes: 12 additions & 0 deletions distributor-node/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
### 2.1.1

- Bump deps @polkadot/api v10.7.1

### 2.1.0

- Nara release.

### 2.0.0

- Replaced `Query-Node` API with `Storage-Squid` Graphql API. This is a breaking change and requires the `endpoints.queryNode` configuration option to be replaced with `endpoints.storageSquid`.

## 1.5.1

- Added parsing of Axios errors on logger level so that we never log the whole Axios client instance (which is a circular object and causes the node to crash)
Expand Down
6 changes: 3 additions & 3 deletions distributor-node/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@joystream/distributor-cli",
"description": "Joystream distributor node CLI",
"version": "2.0.0",
"version": "2.1.1",
"author": "Joystream contributors",
"bin": {
"joystream-distributor": "./bin/run"
Expand All @@ -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",
Expand Down Expand Up @@ -69,7 +69,7 @@
"@types/inquirer": "^8.1.1",
"@types/mime": "^3.0.1",
"@types/mocha": "^5",
"@types/node": "^14",
"@types/node": "^18.6.0",
"@types/node-cache": "^4.2.5",
"@types/node-cleanup": "^2.1.1",
"@types/send": "^0.17.0",
Expand Down
6 changes: 3 additions & 3 deletions joystreamjs/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
19 changes: 10 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,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",
Expand Down
4 changes: 4 additions & 0 deletions query-node/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion query-node/chain-metadata/2003.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions query-node/mappings/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion query-node/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Loading

0 comments on commit 5974a9b

Please sign in to comment.