Merge pull request #447 from hack-a-chain-software/nft-transfers-new-field

refactor: added token id field in the transfers query for the case where isNft = true

Author: 0xneves

indexer/src/kadena-server/config/graphql-types.ts

@@ -1434,6 +1434,8 @@ export type Transfer = Node & {
   receiverAccount: Scalars['String']['output'];
   requestKey: Scalars['String']['output'];
   senderAccount: Scalars['String']['output'];
+  /** The token id if this is a poly-fungible transfer. */
+  tokenId?: Maybe<Scalars['String']['output']>;
   /** The transaction that initiated this transfer. */
   transaction?: Maybe<Transaction>;
 };
@@ -3701,6 +3703,7 @@ export type TransferResolvers<
   receiverAccount?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   requestKey?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   senderAccount?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  tokenId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   transaction?: Resolver<Maybe<ResolversTypes['Transaction']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };

indexer/src/kadena-server/config/schema.graphql

@@ -1056,6 +1056,11 @@ type Transfer implements Node {
   receiverAccount: String!
   requestKey: String!
   senderAccount: String!
+
+  """
+  The token id if this is a poly-fungible transfer.
+  """
+  tokenId: String
   """
   The transaction that initiated this transfer.
   """

indexer/src/kadena-server/repository/infra/repository/transfer-db-repository.ts

@@ -85,8 +85,8 @@ export default class TransferDbRepository implements TransferRepository {
 
     if (hasTokenId) {
       queryParams.push('marmalade-v2.ledger');
-      queryParams.push('marmalade.ledger');
       const op = operator(queryParams.length);
+      queryParams.push('marmalade.ledger');
       conditions += `\n${op} transfers.modulename IN ($${queryParams.length - 1}, $${queryParams.length})`;
     }
 
@@ -157,7 +157,8 @@ export default class TransferDbRepository implements TransferRepository {
         transfers.modulehash as "moduleHash",
         transfers.requestkey as "requestKey",
         transfers."orderIndex" as "orderIndex",
-        td.pactid as "pactId"
+        td.pactid as "pactId",
+        transfers."tokenId" as "tokenId"
         from filtered_block b
         join "Transactions" t on b.id = t."blockId"
         join "Transfers" transfers on transfers."transactionId" = t.id
@@ -192,7 +193,8 @@ export default class TransferDbRepository implements TransferRepository {
         transfers.modulehash as "moduleHash",
         transfers.requestkey as "requestKey",
         transfers."orderIndex" as "orderIndex",
-        td.pactid as "pactId"
+        td.pactid as "pactId",
+        transfers."tokenId" as "tokenId"
         from filtered_transaction t
         join "Blocks" b on b.id = t."blockId"
         join "Transfers" transfers on transfers."transactionId" = t.id
@@ -216,7 +218,8 @@ export default class TransferDbRepository implements TransferRepository {
         transfers.modulehash as "moduleHash",
         transfers.requestkey as "requestKey",
         transfers."orderIndex" as "orderIndex",
-        td.pactid as "pactId"
+        td.pactid as "pactId",
+        transfers."tokenId" as "tokenId"
         from "Transfers" transfers
         join "Transactions" t on t.id = transfers."transactionId"
         join "Blocks" b on b."id" = t."blockId"
@@ -430,7 +433,8 @@ export default class TransferDbRepository implements TransferRepository {
       transfers.modulehash as "moduleHash",
       transfers.requestkey as "requestKey",
       transfers."orderIndex" as "orderIndex",
-      td.pactid as "pactId"
+      td.pactid as "pactId",
+      transfers."tokenId" as "tokenId"
       from "Blocks" b
       join "Transactions" transactions on b.id = transactions."blockId"
       join "Transfers" transfers on transfers."transactionId" = transactions.id 

indexer/src/kadena-server/repository/infra/schema-validator/transfer-schema-validator.ts

@@ -36,6 +36,7 @@ const schema = zod.object({
   senderAccount: zod.string(),
   requestKey: zod.string(),
   pactId: zod.string().nullable(),
+  tokenId: zod.string().nullable().optional(),
 });
 
 /**
@@ -94,6 +95,7 @@ function validate(row: any): TransferOutput {
     senderAccount: res.senderAccount,
     transferId: res.id.toString(),
     pactId: res.pactId,
+    tokenId: res.tokenId,
   };
 }
 

indexer/tests/integration/builders/nft-transfers.builder.ts

@@ -0,0 +1,50 @@
+import { gql } from 'graphql-request';
+
+export const getNftTransfersQuery = (params: any): string => {
+  if (Object.keys(params).length === 0) {
+    throw new Error('No parameters provided to getNftTransfersQuery.');
+  }
+
+  const query = Object.entries(params)
+    .map(([key, value]) => `${key}: ${typeof value === 'string' ? `"${value}"` : value}`)
+    .join(', ');
+
+  const queryGql = gql`
+    query {
+      transfers(${query}) {
+        pageInfo {
+          endCursor
+          hasNextPage
+          hasPreviousPage
+          startCursor
+        }
+        edges {
+          cursor
+          node {
+            amount
+            block {
+              chainId
+            }
+            creationTime
+            crossChainTransfer {
+              id
+            }
+            id
+            tokenId
+            moduleHash
+            moduleName
+            orderIndex
+            receiverAccount
+            requestKey
+            senderAccount
+            transaction {
+              id
+            }
+          }
+        }
+      }
+    }
+  `;
+
+  return queryGql;
+};