Merge pull request #14 from subquery/bug-fixes

Bug fixes

packages/common-starknet/src/codegen/codegen-controller.spec.ts

@@ -38,7 +38,7 @@ describe('Codegen spec', () => {
 
     await expect(
       generateAbis([ds], PROJECT_PATH, undefined as any, undefined as any, undefined as any)
-    ).rejects.toThrow(/Asset: "zkLend" not found in project/);
+    ).rejects.toThrow('Error: Asset zkLend, file ./abis/xxx.json does not exist');
   });
 
   it('render correct codegen from ejs', async () => {

packages/node/src/indexer/blockDispatcher/block-dispatcher.service.ts

@@ -15,12 +15,10 @@ import {
   IBlock,
   IStoreModelProvider,
 } from '@subql/node-core';
-import { StarknetBlock } from '@subql/types-starknet';
 import {
   StarknetProjectDs,
   SubqueryProject,
 } from '../../configure/SubqueryProject';
-import { isFullBlock } from '../../starknet/block.starknet';
 import { IndexerManager } from '../indexer.manager';
 import { BlockContent, getBlockSize } from '../types';
 

packages/node/src/indexer/dictionary/v1/starknetDictionaryV1.spec.ts

@@ -136,18 +136,16 @@ describe('buildDictionaryV1QueryEntries', () => {
       const result = buildDictionaryV1QueryEntries([ds]);
 
       expect(result).toEqual([
-        [
-          {
-            conditions: [
-              {
-                field: 'type',
-                matcher: 'equalTo',
-                value: 'L1_HANDLER',
-              },
-            ],
-            entity: 'calls',
-          },
-        ],
+        {
+          conditions: [
+            {
+              field: 'type',
+              matcher: 'equalTo',
+              value: 'L1_HANDLER',
+            },
+          ],
+          entity: 'calls',
+        },
       ]);
     });
 

packages/node/src/indexer/fetch.service.ts

@@ -15,7 +15,6 @@ import {
   IStoreModelProvider,
 } from '@subql/node-core';
 import { StarknetBlock, SubqlDatasource } from '@subql/types-starknet';
-import { SubqueryProject } from '../configure/SubqueryProject';
 import { StarknetApi } from '../starknet';
 import {
   calcInterval,
@@ -70,7 +69,7 @@ export class FetchService extends BaseFetchService<
   }
 
   protected async getBestHeight(): Promise<number> {
-    return (await this.getFinalizedHeader()).blockHeight;
+    return this.api.getBestBlockHeight();
   }
 
   // eslint-disable-next-line @typescript-eslint/require-await

packages/node/src/indexer/project.service.ts

@@ -75,7 +75,7 @@ export class ProjectService extends BaseProjectService<
   protected async getBlockTimestamp(height: number): Promise<Date> {
     const block = await this.apiService.unsafeApi.api.getBlock(height);
 
-    return new Date(block.timestamp * 1000); // TODO test and make sure its in MS not S
+    return new Date(block.timestamp * 1000);
   }
 
   protected onProjectChange(project: SubqueryProject): void | Promise<void> {

packages/node/src/indexer/types.ts

@@ -7,6 +7,9 @@ import { isFullBlock } from '../starknet/block.starknet';
 export type BlockContent = StarknetBlock | LightStarknetBlock;
 
 export function getBlockSize(block: BlockContent): number {
-  // TODO. not sure if this is the right way to determine the block size
-  return isFullBlock(block) ? (block as StarknetBlock).transactions.length : 0;
+  return isFullBlock(block)
+    ? block.transactions
+        .map((tx) => tx.receipt.execution_resources.steps)
+        .reduce((sum, steps) => sum + steps, 0)
+    : block.transactions.length;
 }

packages/node/src/indexer/unfinalizedBlocks.service.ts

@@ -19,9 +19,6 @@ import { BlockContent } from './types';
 
 @Injectable()
 export class UnfinalizedBlocksService extends BaseUnfinalizedBlocksService<BlockContent> {
-  private supportsFinalization?: boolean;
-  private startupCheck = true;
-
   constructor(
     private readonly apiService: ApiService,
     nodeConfig: NodeConfig,
@@ -38,6 +35,7 @@ export class UnfinalizedBlocksService extends BaseUnfinalizedBlocksService<Block
 
   protected async getHeaderForHash(hash: string): Promise<Header> {
     const block = await this.apiService.api.getBlockByHeightOrHash(hash);
+
     return starknetBlockToHeader(formatBlock(block));
   }
 

packages/node/src/starknet/api.service.starknet.test.ts

@@ -81,13 +81,6 @@ describe('ApiService', () => {
     ).resolves.toHaveLength(4);
   });
 
-  it('can fetch block events with height', async () => {
-    //https://starkscan.co/block/500000#events
-    await expect(apiService.api.fetchBlockLogs(500000)).resolves.toHaveLength(
-      637,
-    );
-  });
-
   it('can get the finalized height', async () => {
     const height = (await apiService.api.getFinalizedBlock()).block_number;
 

packages/node/src/starknet/api.starknet.test.ts

@@ -57,6 +57,16 @@ describe('Api.starknet', () => {
     blockData = await fetchBlock(979358);
   });
 
+  it('should get finalized block and best block', async () => {
+    const finalized = await strkApi.getFinalizedBlock();
+    const best = await strkApi.getBestBlockHeight();
+
+    expect(finalized).toBeDefined();
+    expect(best).toBeDefined();
+
+    expect(best).toBeGreaterThan(finalized.block_number);
+  });
+
   it('should get finalized block', async () => {
     const finalized = await strkApi.getFinalizedBlock();
     expect(finalized).toBeDefined();
@@ -71,18 +81,18 @@ describe('Api.starknet', () => {
     expect(blockData.logs[0].transaction.calldata.length).toBeGreaterThan(1);
   });
 
-  it('should have the ability to get receipts via transactions from all types', async () => {
-    expect(await blockData.transactions[0].receipt?.()).toBeDefined();
+  it('should have the ability to get receipts via transactions from all types', () => {
+    expect(blockData.transactions[0].receipt).toBeDefined();
 
-    expect(typeof blockData.transactions[0].receipt).toEqual('function');
-    expect(typeof blockData.logs[0].transaction.receipt).toEqual('function');
+    expect(typeof blockData.transactions[0].receipt).toEqual('object');
+    expect(typeof blockData.logs[0].transaction.receipt).toEqual('object');
     expect(typeof blockData.logs[0].transaction.from).toEqual('string');
     expect(typeof blockData.transactions[1].logs![0].transaction.from).toEqual(
       'string',
     );
     expect(
       typeof blockData.transactions[1].logs![0].transaction.receipt,
-    ).toEqual('function');
+    ).toEqual('object');
   });
 
   //https://starkscan.co/tx/0x0153a20567e66728f3c4ba60913a6011b9c73db9ea4d960e959923ed5afd8a24