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

Jump to bottom

Fix sync status update in historical and events processing #489

Merged
merged 1 commit into from
Nov 24, 2023
Merged

Fix sync status update in historical and events processing #489

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
95 changes: 74 additions & 21 deletions packages/util/src/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,31 +139,50 @@ export class Database {
}

async updateSyncStatusIndexedBlock (repo: Repository<SyncStatusInterface>, blockHash: string, blockNumber: number, force = false): Promise<SyncStatusInterface> {
const entity = await repo.findOne();
let entity = await repo.findOne();
assert(entity);

if (force || blockNumber >= entity.latestIndexedBlockNumber) {
entity.latestIndexedBlockHash = blockHash;
entity.latestIndexedBlockNumber = blockNumber;
const updateData = {
latestIndexedBlockHash: blockHash,
latestIndexedBlockNumber: blockNumber
};

await repo.update(entity.id, updateData);

entity = {
...entity,
...updateData
};
}

return await repo.save(entity);
return entity;
}

async updateSyncStatusCanonicalBlock (repo: Repository<SyncStatusInterface>, blockHash: string, blockNumber: number, force = false): Promise<SyncStatusInterface> {
const entity = await repo.findOne();
let entity = await repo.findOne();
assert(entity);

if (force || blockNumber >= entity.latestCanonicalBlockNumber) {
entity.latestCanonicalBlockHash = blockHash;
entity.latestCanonicalBlockNumber = blockNumber;
const updateData = {
latestCanonicalBlockHash: blockHash,
latestCanonicalBlockNumber: blockNumber
};

await repo.update(entity.id, updateData);

entity = {
...entity,
...updateData
};
}

return await repo.save(entity);
return entity;
}

async updateSyncStatusChainHead (repo: Repository<SyncStatusInterface>, blockHash: string, blockNumber: number, force = false): Promise<SyncStatusInterface> {
let entity = await repo.findOne();

if (!entity) {
entity = repo.create({
chainHeadBlockHash: blockHash,
Expand All @@ -177,47 +196,81 @@ export class Database {
initialIndexedBlockHash: blockHash,
initialIndexedBlockNumber: blockNumber
});

return repo.save(entity);
}

if (force || blockNumber >= entity.chainHeadBlockNumber) {
entity.chainHeadBlockHash = blockHash;
entity.chainHeadBlockNumber = blockNumber;
const updateData = {
chainHeadBlockHash: blockHash,
chainHeadBlockNumber: blockNumber
};

await repo.update(entity.id, updateData);

entity = {
...entity,
...updateData
};
}

return await repo.save(entity);
return entity;
}

async updateSyncStatusProcessedBlock (repo: Repository<SyncStatusInterface>, blockHash: string, blockNumber: number, force = false): Promise<SyncStatusInterface> {
const entity = await repo.findOne();
let entity = await repo.findOne();
assert(entity);

if (force || blockNumber >= entity.latestProcessedBlockNumber) {
entity.latestProcessedBlockHash = blockHash;
entity.latestProcessedBlockNumber = blockNumber;
const updateData = {
latestProcessedBlockHash: blockHash,
latestProcessedBlockNumber: blockNumber
};

await repo.update(entity.id, updateData);

entity = {
...entity,
...updateData
};
}

return await repo.save(entity);
return entity;
}

async updateSyncStatusIndexingError (repo: Repository<SyncStatusInterface>, hasIndexingError: boolean): Promise<SyncStatusInterface | undefined> {
const entity = await repo.findOne();
let entity = await repo.findOne();

if (!entity) {
return;
}

entity.hasIndexingError = hasIndexingError;
const updateData = {
hasIndexingError: hasIndexingError
};

return repo.save(entity);
await repo.update(entity.id, updateData);

entity = {
...entity,
...updateData
};

return entity;
}

async updateSyncStatus (repo: Repository<SyncStatusInterface>, syncStatus: DeepPartial<SyncStatusInterface>): Promise<SyncStatusInterface> {
const entity = await repo.findOne();
let entity = await repo.findOne();
assert(entity);

return await repo.save({
await repo.update(entity.id, syncStatus);

entity = {
...entity,
...syncStatus
});
};

return entity;
}

async getBlockProgress (repo: Repository<BlockProgressInterface>, blockHash: string): Promise<BlockProgressInterface | undefined> {
Expand Down
Loading