WIP

Author: mschead

.github/workflows/indexer.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: '18'
-          cache: 'yarn'
+          cache: 'none'
 
       - name: Install dependencies
         run: yarn install

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/application/transaction-repository.ts

@@ -8,6 +8,12 @@ export interface GetTransactionsByPublicKeyParams extends PaginationsParams {
   publicKey: string;
 }
 
+export interface GetSignersParams {
+  transactionId?: string;
+  requestKey?: string;
+  orderIndex?: string;
+}
+
 export interface GetTransactionsCountParams {
   blockHash?: string | null;
   accountName?: string | null;
@@ -48,5 +54,5 @@ export default interface TransactionRepository {
   }>;
   getTransactionsByPublicKeyCount(publicKey: string): Promise<number>;
   getTransactionsByEventIds(eventIds: string[]): Promise<TransactionOutput[]>;
-  getSigners(transactionId: string, orderIndex?: number): Promise<SignerOutput[]>;
+  getSigners(params: GetSignersParams): Promise<SignerOutput[]>;
 }

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/transaction-db-repository.ts

@@ -1,5 +1,6 @@
 import { rootPgPool } from '../../../../config/database';
 import TransactionRepository, {
+  GetSignersParams,
   GetTransactionsByPublicKeyParams,
   GetTransactionsByRequestKey,
   GetTransactionsCountParams,
@@ -626,8 +627,9 @@ export default class TransactionDbRepository implements TransactionRepository {
     return eventIds.map(eventId => transactionMap[eventId]) as TransactionOutput[];
   }
 
-  async getSigners(transactionId: string, orderIndex?: number) {
-    const queryParams: Array<string | number> = [transactionId];
+  async getSigners(params: GetSignersParams) {
+    const { transactionId, requestKey, orderIndex } = params;
+    const queryParams: Array<string | number> = [];
     let query = `
       SELECT s.pubkey as "publicKey",
         s.address as "address",
@@ -636,14 +638,24 @@ export default class TransactionDbRepository implements TransactionRepository {
         t.requestkey as "requestKey"
       FROM "Signers" s
       JOIN "Transactions" t on s."transactionId" = t.id
-      WHERE t.id = $1
     `;
 
+    if (transactionId) {
+      queryParams.push(transactionId);
+      query += `\nWHERE t.id = $1`;
+    }
+
+    if (requestKey) {
+      queryParams.push(requestKey);
+      query += `\nWHERE t.requestkey = $1`;
+    }
+
     if (orderIndex) {
-      query += `\nAND s."orderIndex" = $2`;
       queryParams.push(orderIndex);
+      query += `\nAND s."orderIndex" = $2`;
     }
 
+    console.log(query, queryParams);
     const { rows } = await rootPgPool.query(query, queryParams);
 
     const output = rows.map(row => signerMetaValidator.validate(row));

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",
@@ -199,6 +198,7 @@ export default class TransferDbRepository implements TransferRepository {
       `;
     }
 
+    console.log(query, queryParams);
     const { rows } = await rootPgPool.query(query, queryParams);
 
     const edges = rows.map(row => ({

indexer/src/kadena-server/resolvers/fields/transaction-command/signers-transaction-command-resolver.ts

@@ -8,6 +8,8 @@ export const signersTransactionCommandResolver: TransactionCommandResolvers<Reso
   async (parent, _args, context) => {
     const parentArgs = schema.parse(parent);
 
-    const output = await context.transactionRepository.getSigners(parentArgs.databaseTransactionId);
+    const output = await context.transactionRepository.getSigners({
+      transactionId: parentArgs.databaseTransactionId,
+    });
     return output;
   };

indexer/src/kadena-server/resolvers/node-utils.ts

@@ -76,7 +76,7 @@ export const getNode = async (context: ResolverContext, id: string) => {
 
   if (type === 'Signer') {
     const [requestKey, orderIndex] = JSON.parse(params);
-    const [output] = await context.transactionRepository.getSigners(requestKey, orderIndex);
+    const [output] = await context.transactionRepository.getSigners({ requestKey, orderIndex });
     return output;
   }
 

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