fix: 🐛 fix instruction from middleware with SQ v19+

PolymeshAssociation · Dec 10, 2024 · 5917116 · 5917116
1 parent 8260aac
commit 5917116
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/api/entities/Instruction/index.ts b/src/api/entities/Instruction/index.ts
@@ -355,7 +355,7 @@ export class Instruction extends Entity<UniqueIdentifiers, string> {
         },
       },
     } = await context.queryMiddleware<Ensured<Query, 'instructions'>>(
-      instructionsQuery(false, {
+      instructionsQuery(context.isSqIdPadded, {
         id: id.toString(),
       })
     );

diff --git a/src/middleware/queries/settlements.ts b/src/middleware/queries/settlements.ts
@@ -3,7 +3,7 @@ import BigNumber from 'bignumber.js';
 import gql from 'graphql-tag';
 
 import { Context } from '~/internal';
-import { createArgsAndFilters, getSizeAndOffset } from '~/middleware/queries/common';
+import { createArgsAndFilters, getSizeAndOffset, padSqId } from '~/middleware/queries/common';
 import {
   Instruction,
   InstructionAffirmation,
@@ -174,9 +174,14 @@ export function instructionsQuery(
     status: 'InstructionStatusEnum',
   });
 
-  const orderBy = paddedIds
-    ? `[${InstructionEventsOrderBy.IdDesc}]`
-    : `[${InstructionsOrderBy.CreatedAtDesc}, ${InstructionsOrderBy.IdDesc}]`;
+  let orderBy = `[${InstructionsOrderBy.CreatedAtDesc}, ${InstructionsOrderBy.IdDesc}]`;
+
+  if (paddedIds) {
+    orderBy = `[${InstructionEventsOrderBy.IdDesc}]`;
+    if (filters.id) {
+      filters.id = padSqId(filters.id);
+    }
+  }
 
   const query = gql`
     query InstructionsQuery