Merge pull request #562 from lochjin/main

BUG:legacychain database upgrade
Qitmeer · Oct 19, 2023 · 9247d9b · 9247d9b
2 parents bde9231 + cc3cfd2
commit 9247d9b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/database/legacychaindb/legacychaindb_upgrade.go b/database/legacychaindb/legacychaindb_upgrade.go
@@ -67,8 +67,12 @@ func (cdb *LegacyChainDB) TryUpgrade(di *common.DatabaseInfo, interrupt <-chan s
 		if system.InterruptRequested(interrupt) {
 			return fmt.Errorf("interrupt upgrade database")
 		}
+		blockid, err = cdb.GetBlockIdByOrder(uint(i))
+		if err != nil {
+			return err
+		}
 		err = cdb.db.View(func(dbTx legacydb.Tx) error {
-			blockhash, err = dbFetchBlockHashByIID(dbTx, i)
+			blockhash, err = dbFetchBlockHashByIID(dbTx, uint32(blockid))
 			return err
 		})
 		if err != nil {
@@ -78,10 +82,6 @@ func (cdb *LegacyChainDB) TryUpgrade(di *common.DatabaseInfo, interrupt <-chan s
 		if err != nil {
 			return err
 		}
-		blockid, err = cdb.GetDAGBlockIdByHash(blockhash)
-		if err != nil {
-			return err
-		}
 		dblock := &meerdag.Block{}
 		dblock.SetID(blockid)
 		ib := &meerdag.PhantomBlock{Block: dblock}