Crt release

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

@@ -60,7 +60,6 @@ import {
 import {
   convertChannelOwnerToMemberOrCuratorGroup,
   convertContentActor,
-  mapAgentPermission,
   processAppActionMetadata,
   processChannelMetadata,
   u8aToBytes,
@@ -71,13 +70,15 @@ import { generateAppActionCommitment } from '@joystream/js/utils'
 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_V2002 as ChannelCreatedEvent_V2002,
   Content_ChannelDeletedByModeratorEvent_V1001 as ChannelDeletedByModeratorEvent_V1001,
   Content_ChannelDeletedEvent_V1001 as ChannelDeletedEvent_V1001,
   Content_ChannelFundsWithdrawnEvent_V1001 as ChannelFundsWithdrawnEvent_V1001,
@@ -86,14 +87,17 @@ import {
   Content_ChannelRewardClaimedAndWithdrawnEvent_V1001 as ChannelRewardClaimedAndWithdrawnEvent_V1001,
   Content_ChannelRewardUpdatedEvent_V2001 as ChannelRewardUpdatedEvent_V2001,
   Content_ChannelUpdatedEvent_V1001 as ChannelUpdatedEvent_V1001,
+  Content_ChannelUpdatedEvent_V2002 as ChannelUpdatedEvent_V2002,
   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
+    specVersion < 2002 ? new ChannelCreatedEvent_V1001(event).params : new ChannelCreatedEvent_V2002(event).params
 
   // prepare channel owner (handles fields `ownerMember` and `ownerCuratorGroup`)
   const channelOwner = await convertChannelOwnerToMemberOrCuratorGroup(store, owner)
@@ -160,9 +164,12 @@ export async function content_ChannelCreated(ctx: EventContext & StoreContext):
 }
 
 export async function content_ChannelUpdated(ctx: EventContext & StoreContext): Promise<void> {
-  const { store, event } = ctx
+  const { store, event, block } = ctx
+  const { specVersion } = block.runtimeVersion
+
   // read event data
-  const [, channelId, channelUpdateParameters, newDataObjects] = new ChannelUpdatedEvent_V1001(event).params
+  const [, channelId, channelUpdateParameters, newDataObjects] =
+    specVersion < 2002 ? new ChannelUpdatedEvent_V1001(event).params : new ChannelUpdatedEvent_V2002(event).params
 
   // load channel
   const channel = await store.get(Channel, {
@@ -385,7 +392,12 @@ export async function content_ChannelAgentRemarked(ctx: EventContext & StoreCont
 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 +414,9 @@ async function updateChannelAgentsPermissions(
     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

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

query-node/schemas/content.graphql

@@ -80,7 +80,7 @@ type Channel @entity {
 
   "List of all claimed rewards"
   claimedRewards: [ChannelRewardClaimedEvent!] @derivedFrom(field: "channel")
-  
+
   "Number of videos ever created in this channel"
   totalVideosCreated: Int!
 }

runtime-modules/content/src/benchmarks/benchmarking.rs

@@ -1481,7 +1481,8 @@ benchmarks! {
                 accounts_number: a as u64,
                 revenue_split_rate: params.revenue_split_rate,
                 revenue_split: RevenueSplitStateOf::<T>::Inactive,
-                next_revenue_split_id: 0
+                next_revenue_split_id: 0,
+                amm_curve: None,
             });
             assert_last_event::<T>(
                 <T as Config>::Event::from(

runtime-modules/content/src/errors.rs

@@ -409,5 +409,8 @@ decl_error! {
 
         /// Channel Transfers are blocked during token sales
         ChannelTransfersBlockedDuringTokenSales,
+
+        /// Channel Transfers are blocked during active AMM
+        ChannelTransfersBlockedDuringActiveAmm
     }
 }

runtime-modules/content/src/lib.rs

@@ -35,7 +35,7 @@ pub mod weights;
 use core::marker::PhantomData;
 use project_token::traits::PalletToken;
 use project_token::types::{
-    JoyBalanceOf, TokenIssuanceParametersOf, TokenSaleParamsOf, TransfersWithVestingOf,
+    AmmParams, JoyBalanceOf, TokenIssuanceParametersOf, TokenSaleParamsOf, TransfersWithVestingOf,
     UploadContextOf, YearlyRate,
 };
 use sp_std::vec;
@@ -185,6 +185,7 @@ pub trait Config:
         TokenSaleParamsOf<Self>,
         UploadContextOf<Self>,
         TransfersWithVestingOf<Self>,
+        AmmParams,
     >;
 
     /// Minimum cashout allowed limit
@@ -3076,6 +3077,11 @@ decl_module! {
                     T::ProjectToken::is_sale_unscheduled(token_id),
                     Error::<T>::ChannelTransfersBlockedDuringTokenSales,
                 );
+
+                ensure!(
+                    !T::ProjectToken::is_amm_active(token_id),
+                    Error::<T>::ChannelTransfersBlockedDuringActiveAmm
+                );
             }
 
             //
@@ -3757,6 +3763,70 @@ decl_module! {
                 channel.creator_token_id = None;
             });
         }
+
+        /// Activate Amm functionality for token
+        #[weight = 100_000_000] // TODO: Adjust weight
+        pub fn activate_amm(
+            origin,
+            actor: ContentActor<T::CuratorGroupId, T::CuratorId, T::MemberId>,
+            channel_id: T::ChannelId,
+            params: AmmParams,
+        ) {
+            let channel = Self::ensure_channel_exists(&channel_id)?;
+
+            channel.ensure_has_no_active_transfer::<T>()?;
+
+            // Ensure token was issued
+            let token_id = channel.ensure_creator_token_issued::<T>()?;
+
+            // Permissions check
+            ensure_actor_authorized_to_activate_amm::<T>(
+                origin,
+                &actor,
+                &channel
+            )?;
+
+            // Retrieve member_id based on actor
+            let member_id = get_member_id_of_actor::<T>(&actor)?;
+
+            // Call to ProjectToken
+            T::ProjectToken::activate_amm(
+                token_id,
+                member_id,
+                params,
+            )?;
+
+        }
+
+        /// Deactivate Amm functionality for token
+        #[weight = 100_000_000] // TODO: Adjust weight
+        pub fn deactivate_amm(
+            origin,
+            actor: ContentActor<T::CuratorGroupId, T::CuratorId, T::MemberId>,
+            channel_id: T::ChannelId,
+        ) {
+            let channel = Self::ensure_channel_exists(&channel_id)?;
+
+            // Ensure token was issued
+            let token_id = channel.ensure_creator_token_issued::<T>()?;
+
+            // Permissions check
+            ensure_actor_authorized_to_deactivate_amm::<T>(
+                origin,
+                &actor,
+                &channel
+            )?;
+
+            // Retrieve member_id based on actor
+            let member_id = get_member_id_of_actor::<T>(&actor)?;
+
+            // Call to ProjectToken
+            T::ProjectToken::deactivate_amm(
+                token_id,
+                member_id,
+            )?;
+
+        }
     }
 }
 

runtime-modules/content/src/permissions/mod.rs

@@ -713,3 +713,25 @@ pub fn ensure_actor_authorized_to_deissue_creator_token<T: Config>(
     ensure_actor_has_channel_permissions::<T>(&sender, actor, channel, &required_permissions)?;
     Ok(sender)
 }
+
+pub fn ensure_actor_authorized_to_activate_amm<T: Config>(
+    origin: T::Origin,
+    actor: &ContentActor<T::CuratorGroupId, T::CuratorId, T::MemberId>,
+    channel: &Channel<T>,
+) -> Result<T::AccountId, DispatchError> {
+    let sender = ensure_signed(origin)?;
+    let required_permissions = vec![ChannelActionPermission::AmmControl];
+    ensure_actor_has_channel_permissions::<T>(&sender, actor, channel, &required_permissions)?;
+    Ok(sender)
+}
+
+pub fn ensure_actor_authorized_to_deactivate_amm<T: Config>(
+    origin: T::Origin,
+    actor: &ContentActor<T::CuratorGroupId, T::CuratorId, T::MemberId>,
+    channel: &Channel<T>,
+) -> Result<T::AccountId, DispatchError> {
+    let sender = ensure_signed(origin)?;
+    let required_permissions = vec![ChannelActionPermission::AmmControl];
+    ensure_actor_has_channel_permissions::<T>(&sender, actor, channel, &required_permissions)?;
+    Ok(sender)
+}

runtime-modules/content/src/tests/creator_tokens.rs

@@ -1,4 +1,6 @@
+mod activate_amm;
 mod claim_patronage_credit;
+mod deactivate_amm;
 mod deissue;
 mod finalize_creator_token_sale;
 mod finalize_revenue_split;