Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 12 additions & 3 deletions src/core/indexer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export class StarknetIndexer {

private progressStats: ProgressStats;
private progressUiShutdown?: () => void;
private hasExistingState: boolean = false;

constructor(private config: IndexerConfig) {
this.logger = config.logger || new ConsoleLogger(config.logLevel);
Expand Down Expand Up @@ -268,6 +269,7 @@ export class StarknetIndexer {
const result = await this.dbHandler.getIndexerState(this.config.cursorKey);

if (!result) {
this.hasExistingState = false;
let startingBlock: number;
if (this.config.startingBlockNumber === 'latest') {
if (!this.provider) throw new Error('Provider not initialized');
Expand All @@ -280,6 +282,7 @@ export class StarknetIndexer {
await this.dbHandler.initializeIndexerState(startingBlock, this.config.cursorKey);
return startingBlock;
} else {
this.hasExistingState = true;
this.cursor = {
blockNumber: result.last_block_number,
blockHash: result.last_block_hash,
Expand Down Expand Up @@ -377,10 +380,16 @@ export class StarknetIndexer {
currentBlock = await this.provider.getBlockNumber();
}
let targetBlock: number;
if (this.config.startingBlockNumber === 'latest') {
targetBlock = currentBlock;
if (this.hasExistingState && this.cursor) {
// Resume from the block after the last processed block
targetBlock = this.cursor.blockNumber;
} else {
targetBlock = this.config.startingBlockNumber;
// Fresh start: honor configured starting block (or latest)
if (this.config.startingBlockNumber === 'latest') {
targetBlock = currentBlock;
} else {
targetBlock = this.config.startingBlockNumber;
}
}

try {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/db/mysql-db-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export class MysqlDbHandler extends BaseDbHandler {
}

return {
last_block_number: results[0].last_block_number,
last_block_number: Number(results[0].last_block_number),
last_block_hash: results[0].last_block_hash,
cursor_key: cursorKey,
};
Expand Down
2 changes: 1 addition & 1 deletion src/utils/db/postgres-db-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export class PostgresDbHandler extends BaseDbHandler {
}

return {
last_block_number: result.rows[0].last_block_number,
last_block_number: Number(result.rows[0].last_block_number),
last_block_hash: result.rows[0].last_block_hash,
cursor_key: cursorKey,
};
Expand Down