@@ -1269,6 +1269,15 @@ func doIntegrity(cliCtx *cli.Context) error {
12691269 blockReader , _ := blockRetire .IO ()
12701270 heimdallStore , _ := blockRetire .BorStore ()
12711271
1272+ var commitmentHistoryEnabled bool
1273+ if err := chainDB .View (ctx , func (tx kv.Tx ) error {
1274+ var err error
1275+ commitmentHistoryEnabled , _ , err = rawdb .ReadDBCommitmentHistoryEnabled (tx )
1276+ return err
1277+ }); err != nil {
1278+ return fmt .Errorf ("failed to read CommitmentHistory config: %w" , err )
1279+ }
1280+
12721281 runCheck := func (ctx context.Context , chk integrity.Check ) error {
12731282 switch chk {
12741283 case integrity .BlocksTxnID :
@@ -1317,10 +1326,18 @@ func doIntegrity(cliCtx *cli.Context) error {
13171326 case integrity .CommitmentKvDeref :
13181327 return integrity .CheckCommitmentKvDeref (ctx , db , cache , failFast , logger )
13191328 case integrity .CommitmentHistVal :
1329+ if ! commitmentHistoryEnabled {
1330+ logger .Info ("[integrity] CommitmentHistVal skipped because commitment history is not enabled on this datadir" )
1331+ return nil
1332+ }
13201333 scCopy := sc
13211334 scCopy .SampleRatio /= 100 // it's very slow check
13221335 return integrity .CheckCommitmentHistVal (ctx , scCopy , db , blockReader , failFast , logger )
13231336 case integrity .StateRootVerifyByHistory :
1337+ if ! commitmentHistoryEnabled {
1338+ logger .Info ("[integrity] StateRootVerifyByHistory skipped because commitment history is not enabled on this datadir" )
1339+ return nil
1340+ }
13241341 to , err := stateProgress (ctx , db , blockReader .TxnumReader ())
13251342 if err != nil {
13261343 return err
0 commit comments