refactor(consenus): improve CommitProcessor (#758)

* Process block in consensus

* Skip lock

packages/consensus/source/consensus.ts

@@ -185,6 +185,8 @@ export class Consensus implements Contracts.Consensus.Service {
 				return;
 			}
 
+			await this.#processBlock(commitState);
+
 			await this.onMajorityPrecommit(commitState);
 		});
 	}
@@ -587,4 +589,14 @@ export class Consensus implements Contracts.Consensus.Service {
 			}
 		}
 	}
+
+	async #processBlock(commitState: Contracts.Processor.ProcessableUnit): Promise<void> {
+		if (!commitState.hasProcessorResult()) {
+			try {
+				commitState.setProcessorResult(await this.processor.process(commitState));
+			} catch {
+				commitState.setProcessorResult({ gasUsed: 0, receipts: new Map(), success: false });
+			}
+		}
+	}
 }

packages/consensus/source/processors/commit-processor.ts

@@ -9,9 +9,6 @@ export class CommitProcessor extends AbstractProcessor implements Contracts.Cons
 	@inject(Identifiers.Cryptography.Configuration)
 	private readonly configuration!: Contracts.Crypto.Configuration;
 
-	@inject(Identifiers.Processor.BlockProcessor)
-	private readonly processor!: Contracts.Processor.BlockProcessor;
-
 	@inject(Identifiers.ValidatorSet.Service)
 	private readonly validatorSet!: Contracts.ValidatorSet.Service;
 
@@ -25,32 +22,17 @@ export class CommitProcessor extends AbstractProcessor implements Contracts.Cons
 	private readonly commitStateFactory!: Contracts.Consensus.CommitStateFactory;
 
 	async process(commit: Contracts.Crypto.Commit): Promise<Contracts.Consensus.ProcessorResult> {
-		let promise: Promise<void> | undefined;
-
-		const result = await this.commitLock.runNonExclusive(async (): Promise<Contracts.Consensus.ProcessorResult> => {
-			if (!this.#hasValidHeight(commit)) {
-				return Contracts.Consensus.ProcessorResult.Skipped;
-			}
-
-			const commitState = this.commitStateFactory(commit);
-
-			const result = await this.processor.process(commitState);
-
-			if (!result.success) {
-				return Contracts.Consensus.ProcessorResult.Invalid;
-			}
-
-			commitState.setProcessorResult(result);
+		if (!this.#hasValidHeight(commit)) {
+			return Contracts.Consensus.ProcessorResult.Skipped;
+		}
 
-			promise = this.getConsensus().handleCommitState(commitState);
+		const commitState = this.commitStateFactory(commit);
 
-			return Contracts.Consensus.ProcessorResult.Accepted;
-		});
+		await this.getConsensus().handleCommitState(commitState);
 
-		// Execute outside the lock, to avoid deadlocks.
-		// We want to make sure that the block is handled before we return the result to block downloader. This is different from the other processors.
-		await promise;
-		return result;
+		return commitState.getProcessorResult().success
+			? Contracts.Consensus.ProcessorResult.Accepted
+			: Contracts.Consensus.ProcessorResult.Invalid;
 	}
 
 	async hasValidSignature(commit: Contracts.Crypto.Commit): Promise<boolean> {