[cherry-pick] les: fix GetProofsV2 bug (#1267)

Cherry pick a PR from upstream (upstream PR 21896) which fixes a possible panic in the LES server
celo-org · Dec 15, 2020 · 81e1229 · 81e1229
1 parent a4cd9bb
commit 81e1229
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/les/server_handler.go b/les/server_handler.go
@@ -586,6 +586,7 @@ func (h *serverHandler) handleMsg(p *peer, wg *sync.WaitGroup) error {
 		var (
 			lastBHash common.Hash
 			root      common.Hash
+			header    *types.Header
 		)
 		reqCnt := len(req.Reqs)
 		if accept(req.ReqID, uint64(reqCnt), MaxProofsFetch) {
@@ -600,10 +601,6 @@ func (h *serverHandler) handleMsg(p *peer, wg *sync.WaitGroup) error {
 						return
 					}
 					// Look up the root hash belonging to the request
-					var (
-						header *types.Header
-						trie   state.Trie
-					)
 					if request.BHash != lastBHash {
 						root, lastBHash = common.Hash{}, request.BHash
 
@@ -630,6 +627,7 @@ func (h *serverHandler) handleMsg(p *peer, wg *sync.WaitGroup) error {
 					// Open the account or storage trie for the request
 					statedb := h.blockchain.StateCache()
 
+					var trie state.Trie
 					switch len(request.AccKey) {
 					case 0:
 						// No account key specified, open an account trie