Merge pull request #479 from hack-a-chain-software/issue-475

fix: added hasTokenId to all transfers fields and their counters

Author: 0xneves

indexer/src/kadena-server/repository/application/transfer-repository.ts

@@ -10,6 +10,7 @@ export type GetTransfersParams = GetTotalCountParams &
 
 export type GetTransfersByTransactionIdParams = {
   transactionId: string;
+  hasTokenId?: boolean | null;
 } & PaginationsParams;
 
 export interface GetTotalCountParams {

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

@@ -77,13 +77,6 @@ export default class TransferDbRepository implements TransferRepository {
     const queryParams: (string | number | boolean)[] = [limit];
     let conditions = '';
 
-    if (hasTokenId) {
-      queryParams.push('marmalade-v2.ledger');
-      const op = operator(queryParams.length);
-      queryParams.push('marmalade.ledger');
-      conditions += `\n${op} transfers.modulename IN ($${queryParams.length - 1}, $${queryParams.length})`;
-    }
-
     if (after) {
       const [creationTime, id] = after.split(':');
       queryParams.push(creationTime);
@@ -136,6 +129,10 @@ export default class TransferDbRepository implements TransferRepository {
       conditions += `\n${op} b.hash = $${queryParams.length}`;
     }
 
+    queryParams.push(hasTokenId ?? false);
+    const op = operator(queryParams.length);
+    conditions += `\n${op} transfers."hasTokenId" = $${queryParams.length}`;
+
     let query = '';
     if (accountName) {
       queryParams.push(accountName);
@@ -293,7 +290,7 @@ export default class TransferDbRepository implements TransferRepository {
 
     const { blockHash, accountName, chainId, transactionId, fungibleName, requestKey, hasTokenId } =
       params;
-    const queryParams: (string | number)[] = [];
+    const queryParams: (string | number | boolean)[] = [];
     let conditions = '';
 
     const localOperator = (length: number) => (length > 1 ? `\nAND` : 'WHERE');
@@ -328,19 +325,16 @@ export default class TransferDbRepository implements TransferRepository {
       conditions += `${op} trans.modulename = $${queryParams.length}`;
     }
 
-    if (hasTokenId) {
-      queryParams.push('marmalade-v2.ledger');
-      queryParams.push('marmalade.ledger');
-      const op = localOperator(queryParams.length);
-      conditions += `${op} trans.modulename IN ($${queryParams.length - 1}, $${queryParams.length})`;
-    }
-
     if (requestKey) {
       queryParams.push(requestKey);
       const op = localOperator(queryParams.length);
       conditions += `${op} t.requestkey = $${queryParams.length}`;
     }
 
+    queryParams.push(hasTokenId ?? false);
+    const op = localOperator(queryParams.length);
+    conditions += `${op} trans."hasTokenId" = $${queryParams.length}`;
+
     const totalCountQuery = `
       SELECT COUNT(*) as count
       FROM "Transfers" trans
@@ -366,7 +360,14 @@ export default class TransferDbRepository implements TransferRepository {
    * @returns Promise resolving to page info and transfer edges
    */
   async getTransfersByTransactionId(params: GetTransfersByTransactionIdParams) {
-    const { transactionId, after: afterEncoded, before: beforeEncoded, first, last } = params;
+    const {
+      transactionId,
+      after: afterEncoded,
+      before: beforeEncoded,
+      first,
+      last,
+      hasTokenId,
+    } = params;
 
     const { limit, order, after, before } = getPaginationParams({
       after: afterEncoded,
@@ -375,17 +376,17 @@ export default class TransferDbRepository implements TransferRepository {
       last,
     });
 
-    const queryParams: (string | number)[] = [limit, transactionId];
-    let conditions = '';
+    const queryParams: (string | number | boolean)[] = [limit, transactionId, hasTokenId ?? false];
+    let conditions = '\nAND transfers."hasTokenId" = $3';
 
     if (before) {
       queryParams.push(before);
-      conditions += `\nAND transfers.id > $3`;
+      conditions += `\nAND transfers.id > $4`;
     }
 
     if (after) {
       queryParams.push(after);
-      conditions += `\nAND transfers.id < $3`;
+      conditions += `\nAND transfers.id < $4`;
     }
 
     const query = `
@@ -402,12 +403,10 @@ export default class TransferDbRepository implements TransferRepository {
       transfers.modulehash as "moduleHash",
       transfers.requestkey as "requestKey",
       transfers."orderIndex" as "orderIndex",
-      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 
-      left join "TransactionDetails" td on transactions.id = td."transactionId"
       WHERE transactions.id = $2
       ${conditions}
       ORDER BY transfers.id ${order}

indexer/src/kadena-server/resolvers/fields/fungible-account/transfers-connection/total-count-fungible-account-transfers-connection-resolver.ts

@@ -13,6 +13,7 @@ import zod from 'zod';
 const schema = zod.object({
   accountName: zod.string(),
   fungibleName: zod.string(),
+  hasTokenId: zod.boolean(),
 });
 
 /**
@@ -26,11 +27,12 @@ const schema = zod.object({
  */
 export const totalCountFungibleAccountTransfersConnectionResolver: FungibleAccountTransfersConnectionResolvers<ResolverContext>['totalCount'] =
   async (parent, _args, context) => {
-    const { accountName, fungibleName } = schema.parse(parent);
+    const { accountName, fungibleName, hasTokenId } = schema.parse(parent);
 
     const output = await context.transferRepository.getTotalCountOfTransfers({
       accountName,
       fungibleName,
+      hasTokenId,
     });
     return output;
   };

indexer/src/kadena-server/resolvers/fields/fungible-account/transfers-fungible-account-resolver.ts

@@ -20,9 +20,11 @@ import { buildTransferOutput } from '../../output/build-transfer-output';
 export const transfersFungibleAccountResolver: FungibleAccountResolvers<ResolverContext>['transfers'] =
   async (parent, args, context) => {
     const { first, after, before, last } = args;
+    const hasTokenId = false;
     const output = await context.transferRepository.getTransfers({
       accountName: parent.accountName,
       fungibleName: parent.fungibleName,
+      hasTokenId,
       after,
       first,
       last,
@@ -41,6 +43,7 @@ export const transfersFungibleAccountResolver: FungibleAccountResolvers<Resolver
       // for resolvers
       accountName: parent.accountName,
       fungibleName: parent.fungibleName,
+      hasTokenId,
       totalCount: -1, // Placeholder value; actual count is resolved by a separate resolver
     };
   };

indexer/src/kadena-server/resolvers/fields/fungible-chain-account/transfers-connection/total-count-fungible-chain-account-transfers-connection-resolver.ts

@@ -14,6 +14,7 @@ const schema = zod.object({
   accountName: zod.string(),
   chainId: zod.string(),
   fungibleName: zod.string(),
+  hasTokenId: zod.boolean(),
 });
 
 /**
@@ -27,12 +28,13 @@ const schema = zod.object({
  */
 export const totalCountFungibleChainAccountTransfersConnectionResolver: FungibleChainAccountTransfersConnectionResolvers<ResolverContext>['totalCount'] =
   async (parent, _args, context) => {
-    const { accountName, chainId, fungibleName } = schema.parse(parent);
+    const { accountName, chainId, fungibleName, hasTokenId } = schema.parse(parent);
 
     const output = await context.transferRepository.getTotalCountOfTransfers({
       accountName,
       chainId,
       fungibleName,
+      hasTokenId,
     });
     return output;
   };

indexer/src/kadena-server/resolvers/fields/fungible-chain-account/transfers-fungible-chain-account-resolver.ts

@@ -17,10 +17,12 @@ import { buildTransferOutput } from '../../output/build-transfer-output';
 export const transfersFungibleChainAccountResolver: FungibleChainAccountResolvers<ResolverContext>['transfers'] =
   async (parent, args, context) => {
     const { first, after, last, before } = args;
+    const hasTokenId = false;
     const output = await context.transferRepository.getTransfers({
       accountName: parent.accountName,
       fungibleName: parent.fungibleName,
       chainId: parent.chainId,
+      hasTokenId,
       after,
       first,
       last,
@@ -37,6 +39,7 @@ export const transfersFungibleChainAccountResolver: FungibleChainAccountResolver
       pageInfo: output.pageInfo,
       // for resolvers
       totalCount: -1, // Placeholder value for separate resolver
+      hasTokenId,
       accountName: parent.accountName,
       chainId: parent.chainId,
       fungibleName: parent.fungibleName,

indexer/src/kadena-server/resolvers/fields/non-fungible-account/transfers-connection/total-count-non-fungible-account-transfers-connection-resolver.ts

@@ -12,6 +12,7 @@ import zod from 'zod';
  */
 const schema = zod.object({
   accountName: zod.string(),
+  hasTokenId: zod.boolean(),
 });
 
 /**
@@ -25,11 +26,11 @@ const schema = zod.object({
  */
 export const totalCountNonFungibleAccountTransfersConnectionResolver: NonFungibleAccountTransfersConnectionResolvers<ResolverContext>['totalCount'] =
   async (parent, _args, context) => {
-    const { accountName } = schema.parse(parent);
+    const { accountName, hasTokenId } = schema.parse(parent);
 
     const output = await context.transferRepository.getTotalCountOfTransfers({
       accountName,
-      hasTokenId: true,
+      hasTokenId,
     });
 
     return output;

indexer/src/kadena-server/resolvers/fields/non-fungible-account/transfers-non-fungible-account-resolver.ts

@@ -20,9 +20,10 @@ import { buildTransferOutput } from '../../output/build-transfer-output';
 export const transfersNonFungibleAccountResolver: NonFungibleAccountResolvers<ResolverContext>['transfers'] =
   async (parent, args, context) => {
     const { first, after, before, last } = args;
+    const hasTokenId = true;
     const output = await context.transferRepository.getTransfers({
       accountName: parent.accountName,
-      hasTokenId: true,
+      hasTokenId,
       after,
       first,
       last,
@@ -40,7 +41,7 @@ export const transfersNonFungibleAccountResolver: NonFungibleAccountResolvers<Re
 
       // for resolvers
       accountName: parent.accountName,
-      hasTokenId: true,
+      hasTokenId,
       totalCount: -1, // Placeholder value; actual count is resolved by a separate resolver
     };
   };

indexer/src/kadena-server/resolvers/fields/non-fungible-chain-account/transfers-connection/total-count-non-fungible-chain-account-transfers-connection-resolver.ts

@@ -13,6 +13,7 @@ import zod from 'zod';
 const schema = zod.object({
   accountName: zod.string(),
   chainId: zod.string(),
+  hasTokenId: zod.boolean(),
 });
 
 /**
@@ -26,12 +27,12 @@ const schema = zod.object({
  */
 export const totalCountNonFungibleChainAccountTransfersConnectionResolver: NonFungibleChainAccountTransfersConnectionResolvers<ResolverContext>['totalCount'] =
   async (parent, _args, context) => {
-    const { accountName, chainId } = schema.parse(parent);
+    const { accountName, chainId, hasTokenId } = schema.parse(parent);
 
     const output = await context.transferRepository.getTotalCountOfTransfers({
       accountName,
       chainId,
-      hasTokenId: true,
+      hasTokenId,
     });
 
     return output;

indexer/src/kadena-server/resolvers/fields/non-fungible-chain-account/transfers-non-fungible-chain-account-resolver.ts

@@ -20,10 +20,11 @@ import { buildTransferOutput } from '../../output/build-transfer-output';
 export const transfersNonFungibleChainAccountResolver: NonFungibleChainAccountResolvers<ResolverContext>['transfers'] =
   async (parent, args, context) => {
     const { first, after, before, last } = args;
+    const hasTokenId = true;
     const output = await context.transferRepository.getTransfers({
       accountName: parent.accountName,
       chainId: parent.chainId,
-      hasTokenId: true,
+      hasTokenId,
       after,
       first,
       last,
@@ -42,7 +43,7 @@ export const transfersNonFungibleChainAccountResolver: NonFungibleChainAccountRe
       // for resolvers
       accountName: parent.accountName,
       chainId: parent.chainId,
-      hasTokenId: true,
+      hasTokenId,
       totalCount: -1, // Placeholder value; actual count is resolved by a separate resolver
     };
   };