fix(api-sync): restore tables on empty state (#764)

* fix restore on empty state * update version correctly
ArkEcosystem · Nov 18, 2024 · 9a4056a · 9a4056a
1 parent 734a3bd
commit 9a4056a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/packages/api-sync/source/restore.ts b/packages/api-sync/source/restore.ts
@@ -74,6 +74,9 @@ export class Restore {
 	@inject(Identifiers.Database.Service)
 	private readonly databaseService!: Contracts.Database.DatabaseService;
 
+	@inject(Identifiers.State.Store)
+	private readonly stateStore!: Contracts.State.Store;
+
 	@inject(ApiDatabaseIdentifiers.BlockRepositoryFactory)
 	private readonly blockRepositoryFactory!: ApiDatabaseContracts.BlockRepositoryFactory;
 
@@ -105,7 +108,9 @@ export class Restore {
 	private readonly consensusContractService!: Contracts.Evm.ConsensusContractService;
 
 	public async restore(): Promise<void> {
-		const mostRecentCommit = await this.databaseService.getLastCommit();
+		const mostRecentCommit = await (this.databaseService.isEmpty()
+			? this.stateStore.getGenesisCommit()
+			: this.databaseService.getLastCommit());
 		Utils.assert.defined<Contracts.Crypto.Commit>(mostRecentCommit);
 
 		this.logger.info(
@@ -127,7 +132,9 @@ export class Restore {
 				receiptRepository: this.receiptRepositoryFactory(entityManager),
 				stateRepository: this.stateRepositoryFactory(entityManager),
 
-				totalSupply: Utils.BigNumber.ZERO,
+				totalSupply: this.databaseService.isEmpty()
+					? this.stateStore.getGenesisCommit().block.data.totalAmount
+					: Utils.BigNumber.ZERO,
 
 				transactionRepository: this.transactionRepositoryFactory(entityManager),
 				transactionTypeRepository: this.transactionTypeRepositoryFactory(entityManager),

diff --git a/packages/api-sync/source/service.ts b/packages/api-sync/source/service.ts
@@ -94,7 +94,7 @@ export class Sync implements Contracts.ApiSync.Service {
 
 		// if our database is empty, we sync all blocks from scratch
 		const [blocks] = await this.dataSource.query("select count(1) from blocks");
-		if (blocks.count === "0" && !this.databaseService.isEmpty()) {
+		if (blocks.count === "0") {
 			await this.#bootstrapRestore();
 		}
 
@@ -382,16 +382,15 @@ export class Sync implements Contracts.ApiSync.Service {
 					.execute();
 			}
 
-			if (deferred.newMilestones) {
-				await configurationRepository
-					.createQueryBuilder()
-					.update()
-					.set({
-						activeMilestones: deferred.newMilestones,
-					})
-					.where("id = :id", { id: 1 })
-					.execute();
-			}
+			await configurationRepository
+				.createQueryBuilder()
+				.update()
+				.set({
+					version: this.app.version(),
+					...(deferred.newMilestones ? { activeMilestones: deferred.newMilestones } : {}),
+				})
+				.where("id = :id", { id: 1 })
+				.execute();
 
 			for (const batch of chunk(deferred.wallets, 256)) {
 				const batchParameterLength = 6;