WIP

Author: mschead

Dockerfile

@@ -17,4 +17,4 @@ EXPOSE 3001
 
 ARG INDEXER_MODE_PARAM
 ENV INDEXER_MODE=${INDEXER_MODE_PARAM}
-CMD ["sh", "-c", "node -r module-alias/register dist/index.js --canonicalTip"]
+CMD ["sh", "-c", "node -r module-alias/register dist/index.js $INDEXER_MODE"]

indexer/package.json

@@ -75,12 +75,9 @@
     "create:database": "ts-node -r tsconfig-paths/register src/index.ts --database && yarn migrate:up",
     "dev:guards": "ts-node -r tsconfig-paths/register src/index.ts --guards",
     "dev:database": "ts-node -r tsconfig-paths/register src/index.ts --database",
-    "dev:canonical": "ts-node -r tsconfig-paths/register src/index.ts --canonical",
-    "dev:canonicalTip": "ts-node -r tsconfig-paths/register src/index.ts --canonicalTip",
     "dev:backfillPairs": "ts-node -r tsconfig-paths/register src/index.ts --backfillPairs",
     "dev:streaming": "ts-node -r tsconfig-paths/register src/index.ts --streaming",
     "dev:hot:streaming": "nodemon --exec ts-node -r tsconfig-paths/register src/index.ts --streaming",
-    "dev:missing": "ts-node -r tsconfig-paths/register src/index.ts --missing",
     "dev:graphql": "ts-node -r tsconfig-paths/register src/index.ts --graphql",
     "dev:hot:graphql": "nodemon --exec ts-node -r tsconfig-paths/register src/index.ts --graphql",
     "graphql:generate-types": "npx graphql-codegen",

indexer/src/index.ts

@@ -19,26 +19,20 @@ import { closeDatabase } from './config/database';
 import { initializeDatabase } from './config/init';
 import { startGraphqlServer } from './kadena-server/server';
 import { backfillBalances } from './services/balances';
-import { startMissingBlocks } from './services/missing';
 import { startStreaming } from './services/streaming';
 import { backfillPairEvents } from './services/pair';
 import { setupAssociations } from './models/setup-associations';
 import { PriceUpdaterService } from '@/services/price/price-updater.service';
-import { updateCanonicalInBatches } from '@/services/canonical';
-import defineCanonical, { defineCanonicalManually } from '@/services/define-canonical';
 
 /**
  * Command-line interface configuration using Commander.
  * Defines various operation modes for the indexer through command line flags.
  */
 program
   .option('-s, --streaming', 'Start streaming blockchain data')
-  .option('-c, --canonical', 'Update canonical status')
   .option('-t, --graphql', 'Start GraphQL server based on kadena schema')
   .option('-f, --guards', 'Backfill the guards')
-  .option('-m, --missing', 'Missing blocks')
   .option('-z, --database', 'Init the database')
-  .option('-o, --canonicalTip', 'Update canonical tip')
   .option('-p, --backfillPairs', 'Backfill the pairs');
 
 program.parse(process.argv);
@@ -62,7 +56,7 @@ const options = program.opts();
 async function main() {
   try {
     setupAssociations();
-    await PriceUpdaterService.getInstance();
+    PriceUpdaterService.getInstance();
 
     if (options.database) {
       await initializeDatabase();
@@ -76,44 +70,9 @@ async function main() {
       await backfillBalances();
       await closeDatabase();
       process.exit(0);
-    } else if (options.canonical) {
-      await updateCanonicalInBatches();
-      await closeDatabase();
-      process.exit(0);
-    } else if (options.canonicalTip) {
-      // for (const chainId of [
-      //   '0',
-      //   '1',
-      //   '2',
-      //   '3',
-      //   '4',
-      //   '5',
-      //   '6',
-      //   '7',
-      //   '8',
-      //   '9',
-      //   '10',
-      //   '11',
-      //   '12',
-      //   '13',
-      //   '14',
-      //   '15',
-      //   '16',
-      //   '17',
-      //   '18',
-      //   '19',
-      // ]) {
-      await defineCanonicalManually({ chainId: process.env.CHAIN_ID_CANONICAL ?? '0' });
-      // console.log(`[INFO] Canonical tip updated for chain ${chainId}`);
-      // }
-      process.exit(0);
-    } else if (options.missing) {
-      await startMissingBlocks();
-      process.exit(0);
     } else if (options.graphql) {
       await startGraphqlServer();
     } else if (options.backfillPairs) {
-      PriceUpdaterService.getInstance();
       await backfillPairEvents();
     } else {
       console.info('[INFO][BIZ][BIZ_FLOW] No specific task requested.');

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

@@ -42,8 +42,7 @@ export type FungibleChainAccountOutput = Omit<
 >;
 
 export default interface BlockRepository {
-  getBlockByHash(hash: string): Promise<BlockOutput>;
-  getBlockParent(hash: string): Promise<BlockOutput | null>;
+  getBlockByHash(hash: string): Promise<BlockOutput | null>;
   getBlocksFromDepth(params: GetBlocksFromDepthParams): Promise<{
     pageInfo: PageInfo;
     edges: ConnectionEdge<BlockOutput>[];
@@ -82,7 +81,6 @@ export default interface BlockRepository {
   ): Promise<BlockOutput[]>;
 
   getBlockNParent(depth: number, hash: string): Promise<string | undefined>;
-
   getBlocksWithSameHeight(height: number, chainId: string): Promise<BlockOutput[]>;
   getBlocksWithHeightHigherThan(height: number, chainId: string): Promise<BlockOutput[]>;
   updateCanonicalStatus(params: UpdateCanonicalStatusParams): Promise<void>;

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

@@ -14,9 +14,9 @@
  * - Optimized batch retrieval through DataLoader patterns
  */
 
-import { FindOptions, Op, QueryTypes, Transaction } from 'sequelize';
+import { Op, QueryTypes } from 'sequelize';
 import { rootPgPool, sequelize } from '../../../../config/database';
-import BlockModel, { BlockAttributes } from '../../../../models/block';
+import BlockModel from '../../../../models/block';
 import BlockRepository, {
   BlockOutput,
   GetBlocksBetweenHeightsParams,
@@ -54,7 +54,7 @@ export default class BlockDbRepository implements BlockRepository {
    * @returns Promise resolving to the block data if found
    * @throws Error if the block is not found
    */
-  async getBlockByHash(hash: string) {
+  async getBlockByHash(hash: string): Promise<BlockOutput | null> {
     const block = await BlockModel.findOne({
       where: { hash },
     });
@@ -66,24 +66,6 @@ export default class BlockDbRepository implements BlockRepository {
     return blockValidator.mapFromSequelize(block);
   }
 
-  /**
-   * Retrieves the parent block of a given block
-   *
-   * This method fetches the parent block of a given block by its hash.
-   *
-   * @param parentHash - The hash of the parent block to look up
-   * @returns Promise resolving to the parent block data if found, or null if not found
-   */
-  async getBlockParent(parentHash: string): Promise<BlockOutput | null> {
-    const block = await BlockModel.findOne({
-      where: { hash: parentHash },
-    });
-
-    if (!block) return null;
-
-    return blockValidator.mapFromSequelize(block);
-  }
-
   /**
    * Retrieves blocks that have reached a minimum confirmation depth
    *

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

@@ -125,7 +125,7 @@ const mapFromSequelize = (blockModel: BlockAttributes): BlockOutput => {
     payloadHash: blockModel.payloadHash,
     weight: blockModel.weight,
     target: blockModel.target,
-    canonical: blockModel.canonical ?? false, //blockModel.canonical === null ? true : (blockModel.canonical ?? false),
+    canonical: blockModel.canonical === null ? true : blockModel.canonical ?? false,
     neighbors: Object.entries(blockModel.adjacents).map(([chainId, hash]) => ({
       chainId,
       hash,

indexer/src/kadena-server/resolvers/fields/transfer/block-transfer-resolver.ts

@@ -32,5 +32,9 @@ export const blockTransferResolver: TransferResolvers<ResolverContext>['block']
   const { blockHash } = schema.parse(parent);
   const output = await context.blockRepository.getBlockByHash(blockHash);
 
+  if (!output) {
+    throw new Error('Block transfer not found.');
+  }
+
   return buildBlockOutput(output);
 };

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

@@ -59,6 +59,9 @@ export const getNode = async (context: ResolverContext, id: string) => {
   if (type === 'Block') {
     // Resolve Block node - only requires the block hash as a parameter
     const output = await context.blockRepository.getBlockByHash(params);
+    if (!output) {
+      throw new Error('Block not found.');
+    }
     return buildBlockOutput(output);
   }
 

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

@@ -33,5 +33,9 @@ export const blockQueryResolver: QueryResolvers<ResolverContext>['block'] = asyn
   const { hash } = args;
   const output = await context.blockRepository.getBlockByHash(hash);
 
+  if (!output) {
+    throw new Error('Block not found.');
+  }
+
   return buildBlockOutput(output);
 };