Merge pull request #434 from hack-a-chain-software/orphan-transactions

fix: adjusted orphaned transactions field to use the canonical flag

Author: mschead

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

@@ -23,9 +23,12 @@ export interface GetNodeInfo {
 
 type AllInfo = NetworkStatistics & HashRateAndTotalDifficulty & GetNodeInfo;
 
+export type CurrentChainHeights = Record<string, number>;
+
 export default interface NetworkRepository {
   getNetworkStatistics(): Promise<NetworkStatistics>;
   getHashRateAndTotalDifficulty(chainIds: number[]): Promise<HashRateAndTotalDifficulty>;
   getNodeInfo(): Promise<GetNodeInfo>;
   getAllInfo(): Promise<AllInfo>;
+  getCurrentChainHeights(): Promise<CurrentChainHeights>;
 }

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

@@ -84,6 +84,8 @@ export interface GetTransactionsCountParams {
 export interface GetTransactionsByRequestKey {
   /** The request key to search for */
   requestKey: string;
+  /** Current heights of each chain */
+  currentChainHeights: Record<string, number>;
   /** Optional block hash to narrow the search */
   blockHash?: string | null;
   /** Optional minimum confirmation depth requirement */

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

@@ -10,6 +10,7 @@
 import { Op } from 'sequelize';
 import BlockModel from '../../../../models/block';
 import NetworkRepository, {
+  CurrentChainHeights,
   GetNodeInfo,
   HashRateAndTotalDifficulty,
   NetworkStatistics,
@@ -216,6 +217,21 @@ export default class NetworkDbRepository implements NetworkRepository {
     return output;
   }
 
+  async getCurrentChainHeights(): Promise<CurrentChainHeights> {
+    const heightsQuery = `
+      SELECT "chainId", "canonicalBlocks" FROM "Counters" ORDER BY "canonicalBlocks"
+    `;
+
+    const { rows } = await rootPgPool.query(heightsQuery);
+
+    const output = rows.reduce((acc, row) => {
+      acc[row.chainId] = row.canonicalBlocks;
+      return acc;
+    }, {} as CurrentChainHeights);
+
+    return output;
+  }
+
   /**
    * Retrieves all network information from cache
    *

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

@@ -358,7 +358,7 @@ export default class TransactionDbRepository implements TransactionRepository {
    * @returns Promise resolving to matching transactions
    */
   async getTransactionsByRequestKey(params: GetTransactionsByRequestKey) {
-    const { requestKey, blockHash, minimumDepth } = params;
+    const { requestKey, blockHash, minimumDepth, currentChainHeights } = params;
     const queryParams: (string | number)[] = [requestKey];
     let conditions = '';
 
@@ -381,6 +381,7 @@ export default class TransactionDbRepository implements TransactionRepository {
       b.height as "height",
       b."hash" as "blockHash",
       b."chainId" as "chainId",
+      b.canonical as canonical,
       t.result as "result",
       td.gas as "gas",
       td.step as step,
@@ -397,17 +398,14 @@ export default class TransactionDbRepository implements TransactionRepository {
 
     const { rows } = await rootPgPool.query(query, queryParams);
 
-    let transactions: TransactionOutput[] = [...rows];
+    const canonicalTxs = rows.filter(r => r.canonical === true);
+    const orphanedTxs = rows.filter(r => r.canonical === false);
+    let transactions: TransactionOutput[] = [...canonicalTxs, ...orphanedTxs];
 
     if (minimumDepth) {
-      const blockRepository = new BlockDbRepository();
-      const blockHashToDepth = await blockRepository.createBlockDepthMap(
-        rows.map(row => ({ hash: row.blockHash })),
-        'hash',
-        minimumDepth,
+      const filteredTxs = rows.filter(
+        row => currentChainHeights[row.chainId] - row.height >= minimumDepth,
       );
-
-      const filteredTxs = rows.filter(event => blockHashToDepth[event.blockHash] >= minimumDepth);
       transactions = [...filteredTxs];
     }
 

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

@@ -97,9 +97,11 @@ export const getNode = async (context: ResolverContext, id: string) => {
   if (type === 'Transaction') {
     // Resolve Transaction node - requires blockHash and requestKey
     const [blockHash, requestKey] = JSON.parse(params);
+    const currentChainHeights = await context.networkRepository.getCurrentChainHeights();
     const output = await context.transactionRepository.getTransactionsByRequestKey({
       requestKey,
       blockHash,
+      currentChainHeights,
     });
 
     const outputs = output.map(t => buildTransactionOutput(t));

indexer/src/kadena-server/resolvers/query/transaction-query-resolver.ts

@@ -42,19 +42,20 @@ export const transactionQueryResolver: QueryResolvers<ResolverContext>['transact
     throw new Error('Minimum depth must not be higher than 100.');
   }
 
+  const currentChainHeights = await context.networkRepository.getCurrentChainHeights();
   const transactions = await context.transactionRepository.getTransactionsByRequestKey({
     requestKey,
     blockHash,
     minimumDepth,
+    currentChainHeights,
   });
 
   if (transactions.length === 0) return null;
 
-  const [first, ...rest] =
-    await context.blockRepository.getTransactionsOrderedByBlockDepth(transactions);
+  const [canonical, ...orphanedTransactions] = transactions;
 
   return {
-    ...buildTransactionOutput(first),
-    orphanedTransactions: rest.map(r => buildTransactionOutput(r)),
+    ...buildTransactionOutput(canonical),
+    orphanedTransactions: orphanedTransactions.map(tx => buildTransactionOutput(tx)),
   };
 };