From bbc4cd4fc126f1b711e86f18de65d1a38273271c Mon Sep 17 00:00:00 2001
From: Alex Sharov <AskAlexSharov@gmail.com>
Date: Sun, 13 Feb 2022 16:03:10 +0700
Subject: [PATCH] snapshots: use blockReader in IH stage (#3506)

* use blockReader in IH stage

* use blockReader in IH stage
---
 eth/stagedsync/stage_interhashes.go | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/eth/stagedsync/stage_interhashes.go b/eth/stagedsync/stage_interhashes.go
index 6ea5cdbbde..45b1c7eb6b 100644
--- a/eth/stagedsync/stage_interhashes.go
+++ b/eth/stagedsync/stage_interhashes.go
@@ -15,7 +15,6 @@ import (
 	"github.com/ledgerwatch/erigon/common"
 	"github.com/ledgerwatch/erigon/common/changeset"
 	"github.com/ledgerwatch/erigon/common/dbutils"
-	"github.com/ledgerwatch/erigon/core/rawdb"
 	"github.com/ledgerwatch/erigon/core/types/accounts"
 	"github.com/ledgerwatch/erigon/eth/stagedsync/stages"
 	"github.com/ledgerwatch/erigon/turbo/trie"
@@ -66,12 +65,7 @@ func SpawnIntermediateHashesStage(s *StageState, u Unwinder, tx kv.RwTx, cfg Tri
 	var expectedRootHash common.Hash
 	var headerHash common.Hash
 	if cfg.checkRoot {
-		var hash common.Hash
-		hash, err = rawdb.ReadCanonicalHash(tx, to)
-		if err != nil {
-			return trie.EmptyRoot, err
-		}
-		syncHeadHeader, err := cfg.blockReader.Header(ctx, tx, hash, to)
+		syncHeadHeader, err := cfg.blockReader.HeaderByNumber(ctx, tx, to)
 		if err != nil {
 			return trie.EmptyRoot, err
 		}
-- 
GitLab