Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the issue that may occur when using a dictionary to crawl blocks. #2648

Merged
merged 3 commits into from
Jan 25, 2025
Merged

Fix the issue that may occur when using a dictionary to crawl blocks. #2648

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58788c0
Fix the issue that may occur when using a dictionary to crawl blocks.
yoozo Jan 21, 2025
1288f9c
fix unit test
yoozo Jan 22, 2025
efc7a81
unit test
yoozo Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/node-core/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Fixed the inconsistency between the `monitor-file-size` flag and the expected behavior.(#2644)
- Improved block range validation in POI endpoint with custom class-validator decorator
- When setting a smaller batch size and the current processing height reaches latestFinalizedHeight, it causes the program to exit unexpectedly.

## [16.1.0] - 2024-12-11
### Changed
Expand Down
2 changes: 1 addition & 1 deletion packages/node-core/src/configure/NodeConfig.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ describe('NodeConfig', () => {
it('Monitor configs default value', () => {
const fileConfig = NodeConfig.fromFile(path.join(__dirname, '../../test/config.yml'));
expect(fileConfig.monitorFileSize).toEqual(0);
expect(fileConfig.monitorObjectMaxDepth).toEqual(0);
expect(fileConfig.monitorObjectMaxDepth).toEqual(5);

const config2 = NodeConfig.rebaseWithArgs(fileConfig, {
monitorObjectMaxDepth: 10,
Expand Down
2 changes: 1 addition & 1 deletion packages/node-core/src/indexer/dictionary/v1/dictionaryV1.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {BlockHeightMap} from '../../../utils/blockHeightMap';
import {dsMap, mockDS, TestDictionaryV1, HAPPY_PATH_CONDITIONS} from '../dictionary.fixtures';
import {getGqlType} from './utils';

const DICTIONARY_ENDPOINT = `https://gateway.subquery.network/query/QmUGBdhQKnzE8q6x6MPqP6LNZGa8gzXf5gkdmhzWjdFGfL`;
const DICTIONARY_ENDPOINT = `https://gateway.subquery.network/query/QmSxAgGGpaMrYzooWpydmwzutREwomL5nupLZqxURzuJTo`;
const DICTIONARY_CHAINID = `0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3`;

const nodeConfig = new NodeConfig({
Expand Down
11 changes: 8 additions & 3 deletions packages/node-core/src/indexer/fetch.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,15 +241,20 @@ export abstract class BaseFetchService<DS extends BaseDataSource, B extends IBlo
continue;
}
if (dictionary) {
const {batchBlocks} = dictionary;
const {batchBlocks, lastBufferedHeight} = dictionary;
// the last block returned from batch should have max height in this batch
const mergedBlocks = mergeNumAndBlocks(
this.getModuloBlocks(startBlockHeight, dictionary.lastBufferedHeight),
this.getModuloBlocks(startBlockHeight, lastBufferedHeight),
batchBlocks
);
if (mergedBlocks.length === 0) {
// There we're no blocks in this query range, we can set a new height we're up to
await this.enqueueBlocks([], dictionary.lastBufferedHeight);
if (startBlockHeight <= lastBufferedHeight) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please add a test for this so we don't have a regression.

await this.enqueueBlocks([], lastBufferedHeight);
} else {
// Exceeds the dictionary search height
await this.enqueueSequential(startBlockHeight, scaledBatchSize, latestHeight);
}
} else {
const maxBlockSize = Math.min(mergedBlocks.length, this.blockDispatcher.freeSize);
const enqueueBlocks = mergedBlocks.slice(0, maxBlockSize);
Expand Down
Loading