Merge pull request #261 from hack-a-chain-software/fixes

Bugfixes from Tests

Author: 0xneves

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

@@ -211,7 +211,7 @@ export default interface BalanceRepository {
   getAccountInfo_NODE(
     accountName: string,
     fungibleName?: string | null,
-  ): Promise<FungibleAccountOutput>;
+  ): Promise<FungibleAccountOutput | null>;
 
   /**
    * Retrieves fungible token information for an account across specified chains from blockchain nodes.

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

@@ -69,7 +69,7 @@ export default class BalanceDbRepository implements BalanceRepository {
       throw new Error('Account not found.');
     }
 
-    const accountInfo = fungibleAccountValidator.mapFromSequelize(account);
+    const accountInfo = fungibleAccountValidator.validate(account);
     const totalBalance = fungibleAccountValidator.validateTotalBalance(rows[0]);
     return { ...accountInfo, totalBalance };
   }
@@ -352,7 +352,7 @@ export default class BalanceDbRepository implements BalanceRepository {
   ): Promise<INonFungibleTokenBalance | null> {
     const queryParams = [accountName, tokenId, chainId];
     let query = `
-      SELECT b.id, b."chainId", b.balance, b."tokenId", b.account, b."hasTokenId"
+      SELECT b.id, b."chainId", b.balance, b."tokenId", b.account, b.module, b."hasTokenId"
       FROM "Balances" b
       WHERE b.account = $1
       AND b."tokenId" = $2
@@ -382,7 +382,7 @@ export default class BalanceDbRepository implements BalanceRepository {
   async getAccountInfo_NODE(
     accountName: string,
     fungibleName = 'coin',
-  ): Promise<FungibleAccountOutput> {
+  ): Promise<FungibleAccountOutput | null> {
     const query = `
       SELECT DISTINCT b."chainId"
       FROM "Balances" b
@@ -391,6 +391,8 @@ export default class BalanceDbRepository implements BalanceRepository {
     `;
     const { rows } = await rootPgPool.query(query, [accountName, fungibleName]);
 
+    if (rows.length === 0) return null;
+
     const chainIds = rows.map(r => Number(r.chainId));
 
     // Query each chain directly using Pact code
@@ -406,13 +408,12 @@ export default class BalanceDbRepository implements BalanceRepository {
     const balancesNumber = balances.map(b => formatBalance_NODE(b));
     const totalBalance = balancesNumber.reduce((acc, cur) => acc + cur, 0);
 
-    const accountInfo = fungibleAccountValidator.mapFromSequelize({
+    const accountInfo = fungibleAccountValidator.validate({
+      id: -1,
       account: accountName,
       module: fungibleName,
-      chainId: -1,
-      balance: BigInt(-1),
-      hasTokenId: false,
     });
+
     return { ...accountInfo, totalBalance };
   }
 
@@ -502,86 +503,27 @@ export default class BalanceDbRepository implements BalanceRepository {
       // If no guard rows found, try with k: prefix for direct account lookup
       const params = [`k:${publicKey}`, fungibleName];
       const query = `
-        SELECT b.account, b."chainId"
+        SELECT b.id, b.account, b."chainId"
         FROM "Balances" b
         WHERE b.account = $1
         AND b.module = $2
       `;
       const { rows } = await rootPgPool.query(query, params);
 
       if (!rows.length) return [];
-
-      // Query each chain directly using Pact code
-      const balancePromises = rows.map(r => {
-        const query = {
-          chainId: r.chainId.toString(),
-          code: `(${fungibleName}.details \"${r.account}\")`,
-        };
-        return handleSingleQuery(query);
-      });
-
-      const balances = (await Promise.all(balancePromises)).filter(b => b.status === 'success');
-      const balancesNumber = balances.map(q => formatBalance_NODE(q));
-      const totalBalance = balancesNumber.reduce((acc, cur) => acc + cur, 0);
-
-      const accountInfo = fungibleAccountValidator.mapFromSequelize({
-        account: `k:${publicKey}`,
-        module: fungibleName,
-        chainId: -1,
-        balance: BigInt(-1),
-        hasTokenId: false,
-      });
-      return [{ ...accountInfo, totalBalance }];
+      return this.processAccounts(rows, fungibleName);
     } else {
       // Handle accounts associated with public key via guards
       const params = [publicKey, fungibleName];
       const query = `
-        SELECT b.account, b."chainId"
+        SELECT b.id, b.account, b."chainId"
         FROM "Balances" b
         JOIN "Guards" g ON b.id = g."balanceId"
         WHERE g."publicKey" = $1
         AND b.module = $2
       `;
       const { rows } = await rootPgPool.query(query, params);
-
-      // Group chains by account for efficient querying
-      const groupedByAccount: Record<string, string[]> = rows.reduce(
-        (acc, cur) => {
-          if (!acc[cur.account]) {
-            acc[cur.account] = [];
-          }
-          acc[cur.account].push(cur.chainId);
-          return acc;
-        },
-        {} as Record<string, string[]>,
-      );
-
-      // Process each account and get balances from node
-      const accountsPromises = Object.entries(groupedByAccount).map(
-        async ([account, chainIds], index) => {
-          const balances = chainIds.map(async c => {
-            const query = {
-              chainId: c.toString(),
-              code: `(${fungibleName}.details \"${account}\")`,
-            };
-            const result = await handleSingleQuery(query);
-            return formatBalance_NODE(result);
-          });
-
-          const balancesNumber = await Promise.all(balances);
-          const totalBalance: Number = balancesNumber.reduce((acc, cur) => acc + cur, 0);
-
-          return {
-            id: index.toString(),
-            accountName: account,
-            totalBalance,
-            fungibleName,
-          };
-        },
-      );
-
-      const accounts = await Promise.all(accountsPromises);
-      return accounts;
+      return this.processAccounts(rows, fungibleName);
     }
   }
 
@@ -729,4 +671,48 @@ export default class BalanceDbRepository implements BalanceRepository {
     const pageInfo = getPageInfo({ edges, order, limit, after, before });
     return pageInfo;
   }
+
+  private async processAccounts(
+    rows: { id: string; account: string; chainId: string }[],
+    fungibleName: string,
+  ): Promise<FungibleAccountOutput[]> {
+    const groupedByAccount: Record<string, string[]> = rows.reduce(
+      (acc, cur) => {
+        if (!acc[cur.account]) {
+          acc[cur.account] = [];
+        }
+        acc[cur.account].push(cur.chainId);
+        return acc;
+      },
+      {} as Record<string, string[]>,
+    );
+
+    const accountsPromises = Object.entries(groupedByAccount).map(
+      async ([account, chainIds], index) => {
+        const balances = chainIds.map(async c => {
+          const query = {
+            chainId: c.toString(),
+            code: `(${fungibleName}.details \"${account}\")`,
+          };
+          const result = await handleSingleQuery(query);
+          return formatBalance_NODE(result);
+        });
+
+        const balancesNumber = await Promise.all(balances);
+        const totalBalance: Number = balancesNumber.reduce((acc, cur) => acc + cur, 0);
+
+        const accountInfo = fungibleAccountValidator.validate({
+          id: index,
+          account,
+          module: fungibleName,
+        });
+        return {
+          ...accountInfo,
+          totalBalance,
+        };
+      },
+    );
+
+    return Promise.all(accountsPromises);
+  }
 }

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

@@ -160,7 +160,7 @@ export default class BlockDbRepository implements BlockRepository {
       conditions += `\nAND b."chainId" = ANY($${queryParams.length})`;
     }
 
-    if (endHeight && endHeight - startHeight < 20) {
+    if (endHeight) {
       queryParams.push(endHeight);
       conditions += `\nAND b."height" <= $${queryParams.length}`;
     }
@@ -182,7 +182,7 @@ export default class BlockDbRepository implements BlockRepository {
       FROM "Blocks" b
       WHERE b.height >= $2
       ${conditions}
-      ORDER BY b.height ${order}
+      ORDER BY b.height, b.id ${order}
       LIMIT $1;
     `;
 

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

@@ -227,12 +227,6 @@ export default class EventDbRepository implements EventRepository {
       eventConditions += `\nAND e.id < $${queryParams.length}`;
     }
 
-    if (requestKey) {
-      blockQueryParams.push(requestKey);
-      const op = localOperator(blockQueryParams.length);
-      conditions += `${op} t."requestkey" = $${blockQueryParams.length + queryParams.length}`;
-    }
-
     if (blockHash) {
       blockQueryParams.push(blockHash);
       const op = localOperator(blockQueryParams.length);
@@ -272,8 +266,10 @@ export default class EventDbRepository implements EventRepository {
       conditions += `${op} b."height" <= $${blockQueryParams.length + queryParams.length}`;
     }
 
+    const isHeightChainOrBlockHash = fromHeight || toHeight || blockHash || chainId;
+
     let query = '';
-    if (fromHeight || toHeight || blockHash || chainId) {
+    if (isHeightChainOrBlockHash) {
       query = `
         WITH block_filtered AS (
           select *
@@ -296,6 +292,35 @@ export default class EventDbRepository implements EventRepository {
         WHERE e.module = $2
         AND e.name = $3
         ${eventConditions}
+        ORDER BY b.height ${order}
+        LIMIT $1
+      `;
+    } else if (requestKey) {
+      queryParams.push(requestKey);
+      query = `
+        WITH event_transaction_filtered AS (
+          SELECT e.*, t."blockId"
+          FROM "Transactions" t
+          JOIN "Events" e ON t.id = e."transactionId"
+          WHERE e.module = $2
+          AND e.name = $3
+          AND t.requestkey = $${blockQueryParams.length + queryParams.length}
+          ${eventConditions}
+          ORDER BY e.id ${order}
+        )
+        SELECT
+          et.id as id,
+          et.requestkey as "requestKey",
+          et."chainId" as "chainId",
+          b.height as height,
+          et."orderIndex" as "orderIndex",
+          et.module as "moduleName",
+          et.name as name,
+          et.params as parameters,
+          b.hash as "blockHash"
+        FROM event_transaction_filtered et
+        JOIN "Blocks" b ON b.id = et."blockId"
+        ${conditions}
         LIMIT $1
       `;
     } else {
@@ -306,7 +331,7 @@ export default class EventDbRepository implements EventRepository {
           WHERE e.module = $2
           AND e.name = $3
           ${eventConditions}
-          ORDER BY e.module, e.name ${order}
+          ORDER BY e.id ${order}
         )
         SELECT
           e.id as id,
@@ -329,7 +354,7 @@ export default class EventDbRepository implements EventRepository {
     const { rows } = await rootPgPool.query(query, [...queryParams, ...blockQueryParams]);
 
     const edges = rows.map(row => ({
-      cursor: row.id.toString(),
+      cursor: isHeightChainOrBlockHash ? row.height.toString() : row.id.toString(),
       node: eventValidator.validate(row),
     }));
 

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

@@ -122,12 +122,11 @@ export default class TransferDbRepository implements TransferRepository {
 
     if (blockHash) {
       queryParams.push(blockHash);
-      const op = operator(queryParams.length);
       query = `
         WITH filtered_block AS (
           SELECT id, height, hash
           FROM "Blocks" b
-          ${op} b.hash = $${queryParams.length}
+          WHERE b.hash = $${queryParams.length}
         )
         select transfers.id as id,
         transfers.amount as "transferAmount",

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

@@ -91,32 +91,11 @@ const validateTotalBalance = (row: any): string => {
   return res.totalBalance;
 };
 
-/**
- * Transforms a Sequelize balance model instance into the standardized output format
- *
- * This function works specifically with Sequelize ORM model instances,
- * converting them to the standardized partial FungibleAccountOutput format.
- * Like validate(), it doesn't include the total balance in its output.
- *
- * @param balanceModel - A Sequelize Balance model instance
- * @returns A transformed partial FungibleAccountOutput object
- */
-const mapFromSequelize = (
-  balanceModel: BalanceAttributes,
-): Omit<FungibleAccountOutput, 'totalBalance'> => {
-  return {
-    id: getBase64ID(balanceModel.module, balanceModel.account),
-    accountName: balanceModel.account,
-    fungibleName: balanceModel.module,
-  };
-};
-
 /**
  * Exported validator object providing validation and transformation functionality
  * This pattern allows for easy mocking in tests and consistent usage across the codebase
  */
 export const fungibleAccountValidator = {
   validate,
   validateTotalBalance,
-  mapFromSequelize,
 };

indexer/src/kadena-server/resolvers/output/build-fungible-account-output.ts

@@ -29,7 +29,8 @@ import { FungibleAccountOutput } from '../../repository/application/balance-repo
  * @param account - The fungible account entity from the database repository
  * @returns A GraphQL-compatible fungible account object with placeholders for related entities
  */
-export const buildFungibleAccount = (account: FungibleAccountOutput) => {
+export const buildFungibleAccount = (account: FungibleAccountOutput | null) => {
+  if (!account) return null;
   return {
     ...account,
     // resolvers

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

@@ -34,5 +34,6 @@ export const fungibleAccountQueryResolver: QueryResolvers<ResolverContext>['fung
       args.accountName,
       args.fungibleName,
     );
+
     return buildFungibleAccount(account);
   };

indexer/src/kadena-server/resolvers/query/fungible-accounts-by-public-key-query-resolver.ts

@@ -10,7 +10,9 @@ export const fungibleAccountsByPublicKeyQueryResolver: QueryResolvers<ResolverCo
       fungibleName,
     );
 
-    const output = accounts.map(acc => buildFungibleAccount(acc));
+    const output = accounts
+      .map(acc => buildFungibleAccount(acc))
+      .filter((acc): acc is NonNullable<typeof acc> => acc !== null);
 
     return output;
   };

indexer/tests/integration/builders/events.builder.ts

@@ -12,6 +12,12 @@ export const getEventsQuery = (params: any): string => {
   const queryGql = gql`
     query {
       events(${query}) {
+        pageInfo {
+          hasNextPage
+          hasPreviousPage
+          startCursor
+          endCursor
+        }
         edges {
           cursor
           node {