Crt release v1

distributor-node/package.json

@@ -13,7 +13,7 @@
     "@joystream/metadata-protobuf": "^2.8.0",
     "@joystream/opentelemetry": "1.0.0",
     "@joystream/storage-node-client": "^3.0.0",
-    "@joystream/types": "^3.0.0",
+    "@joystream/types": "^4.0.0",
     "@oclif/command": "^1",
     "@oclif/config": "^1",
     "@oclif/plugin-help": "^3",

joystreamjs/package.json

@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@joystream/metadata-protobuf": "^2.8.1",
-    "@joystream/types": "^3.0.0",
+    "@joystream/types": "^4.0.0",
     "@polkadot/util-crypto": "9.5.1",
     "axios": "^1.2.1",
     "buffer": "^6.0.3",

metadata-protobuf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joystream/metadata-protobuf",
-  "version": "2.8.1",
+  "version": "2.9.0",
   "description": "Joystream Metadata Protobuf Library",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -13,9 +13,15 @@
   },
   "typesVersions": {
     "*": {
-      "lib/index.d.ts": ["lib/index.d.ts"],
-      "json": [ "lib/json/index.d.ts" ],
-      "*": [ "lib/*" ]
+      "lib/index.d.ts": [
+        "lib/index.d.ts"
+      ],
+      "json": [
+        "lib/json/index.d.ts"
+      ],
+      "*": [
+        "lib/*"
+      ]
     }
   },
   "repository": "https://github.com/joystream/joystream",

metadata-protobuf/proto/Token.proto

@@ -0,0 +1,35 @@
+syntax = "proto2";
+message CreatorTokenIssuerRemarked {
+    oneof creator_token_issuer_remarked {
+        UpdateTokenMetadata update_token_metadata = 1;
+    }
+}
+
+message UpdateTokenMetadata {
+    optional TokenMetadata new_metadata = 1;
+}
+
+message TokenMetadata {
+  optional string name = 1; // Title
+  optional string symbol = 2; // Symbol
+  optional string description = 3; // token description
+  oneof avatar {
+    uint32 avatar_object = 4; // avatar for token - index into external [assets array](#.Assets)
+    string avatar_uri = 5; // Url to member's avatar
+  }
+  repeated Benefit benefits = 6; // benefits for tokne
+  optional string whitelist_application_note = 7; // note for applicant
+  optional string whitelist_application_apply_link = 8; // link to application process
+  optional uint64 trailer_video_id = 9; // runtime id for video trailer
+}
+
+message Benefit {
+  optional string title = 1;
+  optional string description = 2;
+  optional string emoji = 3;
+  optional uint32 display_order = 4;
+}
+
+message SaleMetadata {
+  optional string terms_and_conditions = 1;
+}

query-node/mappings/src/content/channel.ts

@@ -60,7 +60,6 @@
 import {
   convertChannelOwnerToMemberOrCuratorGroup,
   convertContentActor,
-  mapAgentPermission,
   processAppActionMetadata,
   processChannelMetadata,
   u8aToBytes,
@@ -71,29 +70,32 @@
 import { DecodedMetadataObject } from '@joystream/metadata-protobuf/types'
 import { BaseModel } from '@joystream/warthog'
 import { AccountId32, Balance } from '@polkadot/types/interfaces'
-import { PalletContentIterableEnumsChannelActionPermission } from '@polkadot/types/lookup'
+import { PalletContentIterableEnumsChannelActionPermission as PalletContentIterableEnumsChannelActionPermission_V1001 } from '../../generated/types/1001/types-lookup'
+import { PalletContentIterableEnumsChannelActionPermission as PalletContentIterableEnumsChannelActionPermission_V2002 } from '../../generated/types/2002/types-lookup'
 import BN from 'bn.js'
 import {
   Content_ChannelAgentRemarkedEvent_V1001 as ChannelAgentRemarkedEvent_V1001,
   Content_ChannelAssetsDeletedByModeratorEvent_V1001 as ChannelAssetsDeletedByModeratorEvent_V1001,
   Content_ChannelAssetsRemovedEvent_V1001 as ChannelAssetsRemovedEvent_V1001,
-  Content_ChannelCreatedEvent_V1001 as ChannelCreatedEvent_V1001,
+  Content_ChannelCreatedEvent_V1001 as ChannelCreatedEvent,
   Content_ChannelDeletedByModeratorEvent_V1001 as ChannelDeletedByModeratorEvent_V1001,
   Content_ChannelDeletedEvent_V1001 as ChannelDeletedEvent_V1001,
   Content_ChannelFundsWithdrawnEvent_V1001 as ChannelFundsWithdrawnEvent_V1001,
   Content_ChannelOwnerRemarkedEvent_V1001 as ChannelOwnerRemarkedEvent_V1001,
   Content_ChannelPayoutsUpdatedEvent_V2001 as ChannelPayoutsUpdatedEvent_V2001,
   Content_ChannelRewardClaimedAndWithdrawnEvent_V1001 as ChannelRewardClaimedAndWithdrawnEvent_V1001,
   Content_ChannelRewardUpdatedEvent_V2001 as ChannelRewardUpdatedEvent_V2001,
-  Content_ChannelUpdatedEvent_V1001 as ChannelUpdatedEvent_V1001,
+  Content_ChannelUpdatedEvent_V1001 as ChannelUpdatedEvent,
   Content_ChannelVisibilitySetByModeratorEvent_V1001 as ChannelVisibilitySetByModeratorEvent_V1001,
 } from '../../generated/types'
 
 export async function content_ChannelCreated(ctx: EventContext & StoreContext): Promise<void> {
-  const { store, event } = ctx
+  const { store, event, block } = ctx
+  const { specVersion } = block.runtimeVersion
+
   // read event data
   const [channelId, { owner, dataObjects, channelStateBloatBond }, channelCreationParameters, rewardAccount] =
-    new ChannelCreatedEvent_V1001(event).params
+    new ChannelCreatedEvent(event).params
 
   // prepare channel owner (handles fields `ownerMember` and `ownerCuratorGroup`)
   const channelOwner = await convertChannelOwnerToMemberOrCuratorGroup(store, owner)
@@ -160,9 +162,10 @@
 }
 
 export async function content_ChannelUpdated(ctx: EventContext & StoreContext): Promise<void> {
-  const { store, event } = ctx
+  const { store, event, block } = ctx
+
   // read event data
-  const [, channelId, channelUpdateParameters, newDataObjects] = new ChannelUpdatedEvent_V1001(event).params
+  const [, channelId, channelUpdateParameters, newDataObjects] = new ChannelUpdatedEvent(event).params
 
   // load channel
   const channel = await store.get(Channel, {
@@ -385,7 +388,12 @@
 async function updateChannelAgentsPermissions(
   store: DatabaseManager,
   channel: Channel,
-  collaboratorsPermissions: BTreeMap<u64, BTreeSet<PalletContentIterableEnumsChannelActionPermission>>
+  collaboratorsPermissions: BTreeMap<
+    u64,
+    BTreeSet<
+      PalletContentIterableEnumsChannelActionPermission_V1001 | PalletContentIterableEnumsChannelActionPermission_V2002
+    >
+  >
 ) {
   // safest way to update permission is to delete existing and creating new ones
 
@@ -402,7 +410,9 @@
     const collaborator = new Collaborator({
       channel: new Channel({ id: channel.id.toString() }),
       member: new Membership({ id: memberId.toString() }),
-      permissions: Array.from(permissions).map(mapAgentPermission),
+      permissions: Array.from(permissions).map((permissions) => {
+        return permissions.toString()
+      }),
     })
 
     await store.save(collaborator)

query-node/mappings/src/content/curatorGroup.ts

@@ -4,11 +4,12 @@ eslint-disable @typescript-eslint/naming-convention
 import { DatabaseManager, EventContext, StoreContext } from '@joystream/hydra-common'
 import { Curator, CuratorGroup, CuratorAgentPermissions } from 'query-node/dist/model'
 import { inconsistentState, logger } from '../common'
-import { mapAgentPermission } from './utils'
 import { BTreeSet } from '@polkadot/types'
 // Joystream types
-import { PalletContentIterableEnumsChannelActionPermission } from '@polkadot/types/lookup'
+import { PalletContentIterableEnumsChannelActionPermission as PalletContentIterableEnumsChannelActionPermission_V1001 } from '../../generated/types/1001/types-lookup'
+import { PalletContentIterableEnumsChannelActionPermission as PalletContentIterableEnumsChannelActionPermission_V2002 } from '../../generated/types/2002/types-lookup'
 import {
+  Content_CuratorAddedEvent_V2002 as CuratorAddedEvent_V2002,
   Content_CuratorAddedEvent_V1001 as CuratorAddedEvent_V1001,
   Content_CuratorGroupCreatedEvent_V1001 as CuratorGroupCreatedEvent_V1001,
   Content_CuratorGroupStatusSetEvent_V1001 as CuratorGroupStatusSetEvent_V1001,
@@ -82,9 +83,12 @@ export async function content_CuratorGroupStatusSet({ store, event }: EventConte
   logger.info('Curator group status has been set', { id: curatorGroupId, isActive })
 }
 
-export async function content_CuratorAdded({ store, event }: EventContext & StoreContext): Promise<void> {
+export async function content_CuratorAdded({ store, event, block }: EventContext & StoreContext): Promise<void> {
   // read event data
-  const [curatorGroupId, curatorId, permissions] = new CuratorAddedEvent_V1001(event).params
+  const { specVersion } = block.runtimeVersion
+
+  const [curatorGroupId, curatorId, permissions] =
+    specVersion < 2002 ? new CuratorAddedEvent_V1001(event).params : new CuratorAddedEvent_V2002(event).params
 
   // load curator group
   const curatorGroup = await store.get(CuratorGroup, {
@@ -139,7 +143,9 @@ async function updateCuratorAgentPermissions(
   store: DatabaseManager,
   curatorGroup: CuratorGroup,
   curator: Curator,
-  permissions?: BTreeSet<PalletContentIterableEnumsChannelActionPermission>
+  permissions?: BTreeSet<
+    PalletContentIterableEnumsChannelActionPermission_V1001 | PalletContentIterableEnumsChannelActionPermission_V2002
+  >
 ) {
   // safest way to update permission is to delete existing and creating new ones
 
@@ -160,7 +166,9 @@ async function updateCuratorAgentPermissions(
   const curatorAgentPermissions = new CuratorAgentPermissions({
     curatorGroup: new CuratorGroup({ id: curatorGroup.id.toString() }),
     curator: new Curator({ id: curator.id.toString() }),
-    permissions: permissionsArray.map(mapAgentPermission),
+    permissions: permissionsArray.map((permissions) => {
+      return permissions.toString()
+    }),
   })
 
   await store.save(curatorAgentPermissions)

query-node/mappings/src/membership.ts

@@ -607,7 +607,7 @@ export async function members_MemberRemarked(ctx: EventContext & StoreContext):
   const { event, store, block } = ctx
   const { specVersion } = block.runtimeVersion
   const [memberId, metadataBytes, payment] =
-    specVersion === 1001 ? new MemberRemarkedEvent_V1001(event).params : new MemberRemarkedEvent_V2001(event).params
+    specVersion >= 2001 ? new MemberRemarkedEvent_V2001(event).params : new MemberRemarkedEvent_V1001(event).params
 
   try {
     const metadata = deserializeMetadata(MemberRemarked, metadataBytes)

query-node/mappings/src/proposals.ts

@@ -2,7 +2,8 @@
 eslint-disable @typescript-eslint/naming-convention
 */
 import { SubstrateEvent, DatabaseManager, EventContext, StoreContext } from '@joystream/hydra-common'
-import { PalletProposalsCodexProposalDetails as RuntimeProposalDetails } from '@polkadot/types/lookup'
+import { PalletProposalsCodexProposalDetails as RuntimeProposalDetails_V1001 } from '../generated/types/1001/types-lookup'
+import { PalletProposalsCodexProposalDetails as RuntimeProposalDetails_V2002 } from '../generated/types/2002/types-lookup'
 import BN from 'bn.js'
 import {
   Proposal,
@@ -70,6 +71,7 @@ import {
 } from './common'
 import {
   ProposalsCodex_ProposalCreatedEvent_V1001 as ProposalCreatedEvent_V1001,
+  ProposalsCodex_ProposalCreatedEvent_V2002 as ProposalCreatedEvent_V2002,
   ProposalsEngine_ProposalCancelledEvent_V1001 as ProposalCancelledEvent_V1001,
   ProposalsEngine_ProposalDecisionMadeEvent_V1001 as ProposalDecisionMadeEvent_V1001,
   ProposalsEngine_ProposalExecutedEvent_V1001 as ProposalExecutedEvent_V1001,
@@ -80,6 +82,8 @@ import { createWorkingGroupOpeningMetadata } from './workingGroups'
 import { blake2AsHex } from '@polkadot/util-crypto'
 import { Bytes } from '@polkadot/types'
 
+type RuntimeProposalDetails = RuntimeProposalDetails_V1001 | RuntimeProposalDetails_V2002
+
 async function getProposal(store: DatabaseManager, id: string) {
   const proposal = await store.get(Proposal, { where: { id } })
   if (!proposal) {
@@ -333,9 +337,15 @@ async function handleRuntimeUpgradeProposalExecution(event: SubstrateEvent, stor
   )
 }
 
-export async function proposalsCodex_ProposalCreated({ store, event }: EventContext & StoreContext): Promise<void> {
+export async function proposalsCodex_ProposalCreated({
+  store,
+  event,
+  block,
+}: EventContext & StoreContext): Promise<void> {
+  const specVersion = block.runtimeVersion.specVersion
   const [proposalId, generalProposalParameters, runtimeProposalDetails, proposalThreadId] =
-    new ProposalCreatedEvent_V1001(event).params
+    specVersion >= 2002 ? new ProposalCreatedEvent_V2002(event).params : new ProposalCreatedEvent_V1001(event).params
+
   const eventTime = new Date(event.blockTimestamp)
   const proposalDetails = await parseProposalDetails(event, store, runtimeProposalDetails)
 

runtime-modules/common/src/lib.rs

@@ -6,7 +6,6 @@
     deny(clippy::panic_in_result_fn),
     deny(clippy::unwrap_used),
     deny(clippy::expect_used),
-    deny(clippy::indexing_slicing),
     deny(clippy::integer_arithmetic),
     deny(clippy::match_on_vec_items),
     deny(clippy::unreachable)
@@ -20,6 +19,7 @@ pub mod locks;
 pub mod membership;
 pub mod merkle_tree;
 pub mod no_panic;
+pub mod numerical;
 pub mod storage;
 pub mod working_group;