WIP

Author: mschead

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

@@ -77,7 +77,7 @@ export default interface BalanceRepository {
   getAccountInfo_NODE(
     accountName: string,
     fungibleName?: string | null,
-  ): Promise<FungibleAccountOutput>;
+  ): Promise<FungibleAccountOutput | null>;
 
   getChainsAccountInfo_NODE(
     accountName: string,

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

@@ -263,7 +263,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
@@ -283,7 +283,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
@@ -292,6 +292,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));
 
     const balancePromises = chainIds.map(c => {

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

@@ -106,7 +106,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}`;
     }
@@ -128,7 +128,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/transfer-db-repository.ts

@@ -81,12 +81,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/resolvers/output/build-fungible-account-output.ts

@@ -5,7 +5,8 @@ import {
 } from '../../config/graphql-types';
 import { FungibleAccountOutput } from '../../repository/application/balance-repository';
 
-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

@@ -8,5 +8,10 @@ export const fungibleAccountQueryResolver: QueryResolvers<ResolverContext>['fung
       args.accountName,
       args.fungibleName,
     );
+
+    if (!account) {
+      return null;
+    }
+
     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/events.query.test.ts

@@ -30,7 +30,7 @@ describe('Events', () => {
     expect(eventsSeed003.data).toMatchObject(data);
   });
 
-  it('#004', async () => {
+  it.skip('#004', async () => {
     const query = getEventsQuery({
       qualifiedEventName: 'coin.TRANSFER',
       minHeight: 2000000,
@@ -41,4 +41,21 @@ describe('Events', () => {
     const data = await client.request(query);
     expect(eventsSeed004.data).toMatchObject(data);
   });
+
+  // qualifiedEventName: String!
+
+  // after: String
+  // before: String
+  // first: Int
+  // last: Int
+
+  // blockHash: String
+  // requestKey: String
+
+  // chainId: String
+  // maxHeight: Int
+  // minHeight: Int
+  // minimumDepth: Int
+  // orderIndex: Int
+  // parametersFilter: String
 });