From 734d17ff67e303a972b016729c48c985afc0ed9f Mon Sep 17 00:00:00 2001
From: j75689 <j75689@gmail.com>
Date: Sat, 23 Apr 2022 06:01:23 +0800
Subject: [PATCH] fix gracefull shutdown issue

---
 core/remote_state_verifier.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/remote_state_verifier.go b/core/remote_state_verifier.go
index 8b6d05ce05..b9067db1e0 100644
--- a/core/remote_state_verifier.go
+++ b/core/remote_state_verifier.go
@@ -121,6 +121,10 @@ func (vm *remoteVerifyManager) mainLoop() {
 		case <-pruneTicker.C:
 			vm.taskLock.Lock()
 			for hash, task := range vm.tasks {
+				if vm.bc.insertStopped() {
+					close(task.terminalCh)
+					continue
+				}
 				if vm.bc.CurrentHeader().Number.Cmp(task.blockHeader.Number) == 1 &&
 					vm.bc.CurrentHeader().Number.Uint64()-task.blockHeader.Number.Uint64() > pruneHeightDiff {
 					delete(vm.tasks, hash)
@@ -136,7 +140,6 @@ func (vm *remoteVerifyManager) mainLoop() {
 				vt.messageCh <- message
 			}
 			vm.taskLock.RUnlock()
-
 		// System stopped
 		case <-vm.bc.quit:
 			vm.taskLock.RLock()