Fixing blocktree storage

Author: catena2w

scorex-basics/src/main/scala/scorex/block/Block.scala

@@ -224,7 +224,7 @@ object Block extends ScorexLogging {
 
     override val versionField: ByteBlockField = ByteBlockField("version", 1)
     override val transactionDataField: BlockField[TDT] = transactionModule.genesisData
-    override val referenceField: BlockIdField = BlockIdField("reference", Array.fill(BlockIdLength)(0: Byte))
+    override val referenceField: BlockIdField = BlockIdField("reference", Array.fill(BlockIdLength)(-1: Byte))
     override val consensusDataField: BlockField[CDT] = consensusModule.genesisData
     override val uniqueId: BlockId = Array.fill(BlockIdLength)(0: Byte)
 

scorex-basics/src/main/scala/scorex/network/HistorySynchronizer.scala

@@ -89,7 +89,7 @@ class HistorySynchronizer(application: Application) extends ViewSynchronizer wit
       val localScore = history.score()
       if (networkScore > localScore) {
         log.info(s"networkScore=$networkScore > localScore=$localScore")
-        val lastIds = history.lastBlocks(100).map(_.uniqueId)
+        val lastIds = history.lastBlockIds(100)
         val msg = Message(GetSignaturesSpec, Right(lastIds), None)
         networkControllerRef ! NetworkController.SendToNetwork(msg, SendToChosen(witnesses))
         gotoGettingExtension(networkScore, witnesses)

scorex-transaction/src/main/scala/scorex/transaction/state/database/blockchain/StoredBlockTree.scala

@@ -166,15 +166,15 @@ class StoredBlockTree(dataFolderOpt: Option[String], MaxRollback: Int)
       case Success(v) =>
         Some(v)
       case Failure(e) =>
-        log.debug("Enable readBlock for key: " + Base58.encode(key))
+        log.debug("Unable readBlock for key: " + Base58.encode(key))
         None
     }
   }
 
   private val blockStorage: BlockTreePersistence = dataFolderOpt match {
     case Some(dataFolder) =>
       new File(dataFolder).mkdirs()
-      val file = new File(dataFolder + "blocktree.mapDB")
+      val file = new File(dataFolder + "/blocktree.mapDB")
       val db = DBMaker.appendFileDB(file).fileMmapEnableIfSupported().closeOnJvmShutdown().checksumEnable().make()
       new MapDBBlockTreePersistence(db)
     case _ => new MapDBBlockTreePersistence(DBMaker.memoryDB().make())
@@ -242,7 +242,7 @@ class StoredBlockTree(dataFolderOpt: Option[String], MaxRollback: Int)
         case _ => acc
       }
     }
-    loop(block, howMany)
+    loop(block, howMany, Seq(block))
   }
 
   override def lastBlocks(howMany: Int): Seq[Block] = {

src/test/resources/settings-local2.json

@@ -1,6 +1,5 @@
 {
   "p2p": {
-    "fuzzingDelay": 1000,
     "nodeName": "Node2",
     "localOnly": true,
     "bindAddress": "127.0.0.2",
@@ -23,6 +22,7 @@
   ],
   "maxRollback": 100,
   "offlineGeneration": false,
+  "history": "blocktree",
   "perma": {
     "treeDir": "/tmp/scorex/data2/tree/",
     "authDataStorage": "authDataStorage2.mapDB"