Merge pull request #5189 from mnaamani/qn-hotfix-channel-remarks

QueryNode: handle invalid protobuf message decoding
Joystream · Sep 18, 2024 · e4f3204 · e4f3204
2 parents dabaa45 + e54fe01
commit e4f3204
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/query-node/mappings/package.json b/query-node/mappings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "query-node-mappings",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Mappings for hydra-processor",
   "main": "lib/src/index.js",
   "license": "MIT",

diff --git a/query-node/mappings/src/content/channel.ts b/query-node/mappings/src/content/channel.ts
@@ -7,6 +7,8 @@ import {
   ChannelMetadata,
   ChannelModeratorRemarked,
   ChannelOwnerRemarked,
+  IChannelModeratorRemarked,
+  IChannelOwnerRemarked,
   IMakeChannelPayment,
 } from '@joystream/metadata-protobuf'
 import { DataObjectId } from '@joystream/types/primitives'
@@ -312,9 +314,9 @@ export async function content_ChannelOwnerRemarked(ctx: EventContext & StoreCont
     return unimplementedError('Unsupported content actor type')
   }
 
-  const metadata = ChannelOwnerRemarked.decode(message.toU8a(true))
+  const metadata = deserializeMetadata(ChannelOwnerRemarked, message)
   const contentActor = getContentActor(channel.ownerMember, channel.ownerCuratorGroup)
-  const metaprotocolTxResult = await processOwnerRemark(store, event, channel, contentActor, metadata)
+  const metaprotocolTxResult = await processOwnerRemark(store, event, channel, contentActor, metadata ?? {})
 
   if (metaprotocolTxResult instanceof MetaprotocolTransactionSuccessful) {
     await saveMetaprotocolTransactionSuccessful(store, event, metaprotocolTxResult)
@@ -331,9 +333,9 @@ export async function content_ChannelAgentRemarked(ctx: EventContext & StoreCont
   // load channel
   const channel = await getChannelOrFail(store, channelId.toString())
 
-  const metadata = ChannelModeratorRemarked.decode(message.toU8a(true))
+  const metadata = deserializeMetadata(ChannelModeratorRemarked, message)
   const contentActor = await convertContentActor(store, moderator)
-  const metaprotocolTxResult = await processModeratorRemark(store, event, channel, contentActor, metadata)
+  const metaprotocolTxResult = await processModeratorRemark(store, event, channel, contentActor, metadata ?? {})
 
   if (metaprotocolTxResult instanceof MetaprotocolTransactionSuccessful) {
     await saveMetaprotocolTransactionSuccessful(store, event, metaprotocolTxResult)
@@ -382,7 +384,7 @@ async function processOwnerRemark(
   event: SubstrateEvent,
   channel: Channel,
   contentActor: typeof ContentActor,
-  decodedMessage: ChannelOwnerRemarked
+  decodedMessage: DecodedMetadataObject<IChannelOwnerRemarked>
 ): Promise<MetaprotocolTransactionSuccessful | MetaprotocolTxError> {
   const metaprotocolTransactionSuccessful = new MetaprotocolTransactionSuccessful()
   if (decodedMessage.pinOrUnpinComment) {
@@ -450,8 +452,11 @@ async function processModeratorRemark(
   event: SubstrateEvent,
   channel: Channel,
   contentActor: typeof ContentActor,
-  decodedMessage: ChannelModeratorRemarked
+  decodedMessage: DecodedMetadataObject<IChannelModeratorRemarked>
 ): Promise<MetaprotocolTransactionSuccessful | MetaprotocolTxError> {
+  // if (!decodedMessage) {
+  //   return MetaprotocolTxError.InvalidMetadata
+  // }
   const metaprotocolTransactionSuccessful = new MetaprotocolTransactionSuccessful()
   if (decodedMessage.moderateComment) {
     const commentOrError = await processModerateCommentMessage(

diff --git a/query-node/mappings/src/content/commentAndReaction.ts b/query-node/mappings/src/content/commentAndReaction.ts
@@ -545,7 +545,7 @@ export async function processModerateCommentMessage(
   event: SubstrateEvent,
   channelOwnerOrCurator: typeof ContentActor,
   channel: Channel,
-  message: IModerateComment
+  message: DecodedMetadataObject<IModerateComment>
 ): Promise<Comment | MetaprotocolTxError> {
   const { commentId, rationale } = message
 
@@ -606,7 +606,7 @@ export async function processPinOrUnpinCommentMessage(
   store: DatabaseManager,
   event: SubstrateEvent,
   channel: Channel,
-  message: IPinOrUnpinComment
+  message: DecodedMetadataObject<IPinOrUnpinComment>
 ): Promise<Comment | MetaprotocolTxError> {
   const { commentId, option } = message
 
@@ -647,7 +647,7 @@ export async function processBanOrUnbanMemberFromChannelMessage(
   store: DatabaseManager,
   event: SubstrateEvent,
   channel: Channel,
-  message: IBanOrUnbanMemberFromChannel
+  message: DecodedMetadataObject<IBanOrUnbanMemberFromChannel>
 ): Promise<Membership | MetaprotocolTxError> {
   const { memberId, option } = message
 
@@ -689,7 +689,7 @@ export async function processVideoReactionsPreferenceMessage(
   store: DatabaseManager,
   event: SubstrateEvent,
   channel: Channel,
-  message: IVideoReactionsPreference
+  message: DecodedMetadataObject<IVideoReactionsPreference>
 ): Promise<Channel | MetaprotocolTxError> {
   const { videoId, option } = message
 

diff --git a/query-node/package.json b/query-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "query-node-root",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "GraphQL server and mappings. Generated with ♥ by Hydra-CLI",
   "scripts": {
     "build": "./build.sh",