fix: 🐛 support SQ v19 createdEvent

add support for the latest updated in SQ v19
PolymeshAssociation · Dec 11, 2024 · c8aa1e0 · c8aa1e0
1 parent 5fb75a9
commit c8aa1e0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 23 deletions.
diff --git a/src/middleware/queries/authorizations.ts b/src/middleware/queries/authorizations.ts
@@ -59,9 +59,8 @@ export function authorizationsQuery(
 ): QueryOptions<PaginatedQueryArgs<QueryArgs<Authorization, AuthorizationArgs>>> {
   const { args, filter } = createAuthorizationFilters(filters);
 
-  const idField = paddedIds ? 'id' : 'authId: id';
   const orderBy = paddedIds
-    ? `${AuthorizationsOrderBy.CreatedBlockIdAsc}`
+    ? `${AuthorizationsOrderBy.CreatedEventIdAsc}`
     : `${AuthorizationsOrderBy.CreatedAtAsc}, ${AuthorizationsOrderBy.CreatedBlockIdAsc}`;
 
   const query = gql`
@@ -76,7 +75,7 @@ export function authorizationsQuery(
       ) {
         totalCount
         nodes {
-          ${idField}
+          id
           type
           fromId
           toId

diff --git a/src/middleware/queries/common.ts b/src/middleware/queries/common.ts
@@ -163,12 +163,3 @@ export function removeUndefinedValues(
 ): Record<string | number | symbol, unknown> {
   return Object.fromEntries(Object.entries(variables).filter(([, value]) => value !== undefined));
 }
-
-/**
- * Pad ID for subquery
- *
- * @hidden
- */
-export function padSqId(id: string): string {
-  return id.padStart(10, '0');
-}
diff --git a/src/middleware/queries/settlements.ts b/src/middleware/queries/settlements.ts
@@ -40,8 +40,8 @@ const legAttributes = `
             }
 `;
 
-const instructionAttributes = (paddedIds: boolean): string => `
-          ${paddedIds ? 'id' : 'instructionId: id'}
+const instructionAttributes = `
+          id
           venueId
           status
           type
@@ -112,7 +112,7 @@ export function instructionEventsQuery(
   let orderBy = `[${InstructionEventsOrderBy.CreatedAtDesc}, ${InstructionEventsOrderBy.CreatedBlockIdDesc}]`;
 
   if (paddedIds) {
-    orderBy = `[${InstructionEventsOrderBy.CreatedBlockIdDesc}]`;
+    orderBy = `[${InstructionEventsOrderBy.CreatedEventIdDesc}]`;
   }
 
   const query = gql`
@@ -174,9 +174,11 @@ export function instructionsQuery(
     status: 'InstructionStatusEnum',
   });
 
-  const orderBy = paddedIds
-    ? `[${InstructionEventsOrderBy.IdDesc}]`
-    : `[${InstructionsOrderBy.CreatedAtDesc}, ${InstructionsOrderBy.IdDesc}]`;
+  let orderBy = `[${InstructionsOrderBy.CreatedAtDesc}, ${InstructionsOrderBy.IdDesc}]`;
+
+  if (paddedIds) {
+    orderBy = `[${InstructionsOrderBy.CreatedEventIdDesc}]`;
+  }
 
   const query = gql`
     query InstructionsQuery
@@ -190,7 +192,7 @@ export function instructionsQuery(
       ) {
         totalCount
         nodes {
-          ${instructionAttributes(paddedIds)}
+          ${instructionAttributes}
         }
       }
     }
@@ -422,7 +424,7 @@ export async function instructionPartiesQuery(
   const paddedIds = context.isSqIdPadded;
 
   const orderBy = paddedIds
-    ? `[${LegsOrderBy.InstructionIdAsc}]`
+    ? `[${LegsOrderBy.CreatedBlockIdAsc}]`
     : `[${LegsOrderBy.CreatedAtAsc}, ${LegsOrderBy.InstructionIdAsc}]`;
 
   const query = gql`
@@ -437,7 +439,7 @@ export async function instructionPartiesQuery(
       ) {
         nodes {
           instruction {
-            ${instructionAttributes(paddedIds)}
+            ${instructionAttributes}
           }
         }
         totalCount
@@ -516,7 +518,7 @@ function createLegFilters(
  */
 function buildSettlementsQuery(paddedIds: boolean, args: string, filter: string): DocumentNode {
   const orderBy = paddedIds
-    ? `[${LegsOrderBy.InstructionIdAsc}]`
+    ? `[${LegsOrderBy.CreatedBlockIdAsc}]`
     : `[${LegsOrderBy.CreatedAtAsc}, ${LegsOrderBy.InstructionIdAsc}]`;
 
   return gql`
@@ -529,7 +531,7 @@ function buildSettlementsQuery(paddedIds: boolean, args: string, filter: string)
     ) {
       nodes {
         instruction {
-          ${instructionAttributes(paddedIds)}
+          ${instructionAttributes}
         }
       }
     }

diff --git a/src/middleware/types.ts b/src/middleware/types.ts
@@ -13222,6 +13222,8 @@ export enum AuthorizationsOrderBy {
   CreatedAtDesc = 'CREATED_AT_DESC',
   CreatedBlockIdAsc = 'CREATED_BLOCK_ID_ASC',
   CreatedBlockIdDesc = 'CREATED_BLOCK_ID_DESC',
+  CreatedEventIdAsc = 'CREATED_EVENT_ID_ASC',
+  CreatedEventIdDesc = 'CREATED_EVENT_ID_DESC',
   DataAsc = 'DATA_ASC',
   DataDesc = 'DATA_DESC',
   ExpiryAsc = 'EXPIRY_ASC',
@@ -97680,6 +97682,8 @@ export enum InstructionEventsOrderBy {
   CreatedAtDesc = 'CREATED_AT_DESC',
   CreatedBlockIdAsc = 'CREATED_BLOCK_ID_ASC',
   CreatedBlockIdDesc = 'CREATED_BLOCK_ID_DESC',
+  CreatedEventIdAsc = 'CREATED_EVENT_ID_ASC',
+  CreatedEventIdDesc = 'CREATED_EVENT_ID_DESC',
   EventAsc = 'EVENT_ASC',
   EventDesc = 'EVENT_DESC',
   EventIdxAsc = 'EVENT_IDX_ASC',
@@ -99724,6 +99728,8 @@ export enum InstructionsOrderBy {
   CreatedAtDesc = 'CREATED_AT_DESC',
   CreatedBlockIdAsc = 'CREATED_BLOCK_ID_ASC',
   CreatedBlockIdDesc = 'CREATED_BLOCK_ID_DESC',
+  CreatedEventIdAsc = 'CREATED_EVENT_ID_ASC',
+  CreatedEventIdDesc = 'CREATED_EVENT_ID_DESC',
   EndAfterBlockAsc = 'END_AFTER_BLOCK_ASC',
   EndAfterBlockDesc = 'END_AFTER_BLOCK_DESC',
   EndBlockAsc = 'END_BLOCK_ASC',