improve state hash check

packages/contracts/source/contracts/snapshot.ts

@@ -10,6 +10,7 @@ export interface LegacyImporter {
 	validators: ImportedLegacyValidator[];
 	voters: ImportedLegacyVoter[];
 	snapshotHash: string;
+	result: LegacyImportResult | undefined;
 }
 
 export interface LegacyImportOptions {

packages/processor/source/block-processor.ts

@@ -51,6 +51,10 @@ export class BlockProcessor implements Contracts.Processor.BlockProcessor {
 	@optional()
 	private readonly apiSync?: Contracts.ApiSync.Service;
 
+	@inject(Identifiers.Snapshot.Legacy.Importer)
+	@optional()
+	private readonly snapshotImporter?: Contracts.Snapshot.LegacyImporter;
+
 	public async process(unit: Contracts.Processor.ProcessableUnit): Promise<Contracts.Processor.BlockProcessorResult> {
 		const processResult = { gasUsed: 0, receipts: new Map(), success: false };
 
@@ -176,12 +180,13 @@ export class BlockProcessor implements Contracts.Processor.BlockProcessor {
 		let previousStateHash;
 		if (block.header.height === 0) {
 			// Assume snapshot is present if the previous block points to a non-zero hash
-			// and skip state hash check since it will be performed during import.
 			if (block.header.previousBlock !== "0000000000000000000000000000000000000000000000000000000000000000") {
-				return;
+				Utils.assert.defined(this.snapshotImporter);
+				Utils.assert.defined(this.snapshotImporter.result);
+				previousStateHash = this.snapshotImporter.result.stateHash;
+			} else {
+				previousStateHash = "0000000000000000000000000000000000000000000000000000000000000000";
 			}
-
-			previousStateHash = "0000000000000000000000000000000000000000000000000000000000000000";
 		} else {
 			const previousBlock = this.stateStore.getLastBlock();
 			previousStateHash = previousBlock.header.stateHash;

packages/snapshot-legacy-importer/source/importer.ts

@@ -46,11 +46,13 @@ export class Importer implements Contracts.Snapshot.LegacyImporter {
 		voters: Contracts.Snapshot.ImportedLegacyVoter[];
 		validators: Contracts.Snapshot.ImportedLegacyValidator[];
 		snapshotHash: string;
+		result: Contracts.Snapshot.LegacyImportResult | undefined;
 	} = {
 		snapshotHash: "",
 		validators: [],
 		voters: [],
 		wallets: [],
+		result: undefined,
 	};
 
 	public get voters(): Contracts.Snapshot.ImportedLegacyVoter[] {
@@ -69,6 +71,10 @@ export class Importer implements Contracts.Snapshot.LegacyImporter {
 		return this.#data.snapshotHash;
 	}
 
+	public get result(): Contracts.Snapshot.LegacyImportResult | undefined {
+		return this.#data.result;
+	}
+
 	#nonce = 0n;
 
 	public async run(genesisBlock: Contracts.Crypto.Commit): Promise<Contracts.Snapshot.LegacyImportResult> {
@@ -105,6 +111,8 @@ export class Importer implements Contracts.Snapshot.LegacyImporter {
 			throw new Error("genesis block snapshot supply mismatch ");
 		}
 
+		this.#data.result = result;
+
 		return result;
 	}
 
@@ -203,6 +211,7 @@ export class Importer implements Contracts.Snapshot.LegacyImporter {
 			validators,
 			voters,
 			wallets,
+			result: undefined,
 		};
 	}