Merge branch 'pr/216' of github.com:ScorexFoundation/Scorex into pr/216

Author: kushti

examples/src/main/scala/examples/hybrid/history/HistoryStorage.scala

@@ -72,7 +72,7 @@ class HistoryStorage(storage: LSMStore,
     storage.update(version, Seq(), Seq(validityKey(b) -> ByteArrayWrapper(Array(status.code))))
   }
 
-  def update(b: HybridBlock, difficulty: Option[(BigInt, Long)], isBest: Boolean) {
+  def update(b: HybridBlock, difficulty: Option[(BigInt, BigInt)], isBest: Boolean) {
     log.debug(s"Write new best=$isBest block ${b.encodedId}")
     val typeByte = b match {
       case _: PowBlock =>
@@ -86,7 +86,7 @@ class HistoryStorage(storage: LSMStore,
 
     val blockDiff: Iterable[(ByteArrayWrapper, ByteArrayWrapper)] = difficulty.map { d =>
       Seq(blockDiffKey(b.id, isPos = false) -> ByteArrayWrapper(d._1.toByteArray),
-        blockDiffKey(b.id, isPos = true) -> ByteArrayWrapper(Longs.toByteArray(d._2)))
+        blockDiffKey(b.id, isPos = true) -> ByteArrayWrapper(d._2.toByteArray))
     }.getOrElse(Seq())
 
     val bestBlockSeq: Iterable[(ByteArrayWrapper, ByteArrayWrapper)] = b match {
@@ -119,10 +119,10 @@ class HistoryStorage(storage: LSMStore,
     }
   }
 
-  def getPoSDifficulty(id: ModifierId): Long = if (id sameElements settings.GenesisParentId) {
+  def getPoSDifficulty(id: ModifierId): BigInt = if (id sameElements settings.GenesisParentId) {
     PosForger.InitialDifficuly
   } else {
-    Longs.fromByteArray(storage.get(blockDiffKey(id, isPos = true)).get.data)
+    BigInt(storage.get(blockDiffKey(id, isPos = true)).get.data)
   }
 
   def parentHeight(b: HybridBlock): Long = heightOf(parentId(b)).getOrElse(0L)

examples/src/main/scala/examples/hybrid/history/HybridHistory.scala

@@ -213,7 +213,7 @@ class HybridHistory(val storage: HistoryStorage,
     }
   }
 
-  private def calcDifficultiesForNewBlock(posBlock: PosBlock): (BigInt, Long) = {
+  private def calcDifficultiesForNewBlock(posBlock: PosBlock): (BigInt, BigInt) = {
     def bounded(newVal: BigInt, oldVal: BigInt): BigInt = if (newVal > oldVal * 2) oldVal * 2 else newVal
 
     val powHeight = storage.parentHeight(posBlock) / 2 + 1

examples/src/main/scala/examples/hybrid/mining/PosForger.scala

@@ -61,23 +61,23 @@ object PosForger extends ScorexLogging {
 
   import scorex.core.NodeViewHolder.ReceivableMessages.GetDataFromCurrentView
 
-  val InitialDifficuly = 15000000000L
+  val InitialDifficuly = 1500000000L
 
   object ReceivableMessages {
     case object StartForging
     case object StopForging
     case class PosForgingInfo(pairCompleted: Boolean,
                               bestPowBlock: PowBlock,
-                              diff: Long,
+                              diff: BigInt,
                               boxKeys: Seq[(PublicKey25519NoncedBox, PrivateKey25519)],
                               txsToInclude: Seq[SimpleBoxTransaction])
   }
 
   import ReceivableMessages.PosForgingInfo
 
-  def hit(pwb: PowBlock)(box: PublicKey25519NoncedBox): Long = {
+  def hit(pwb: PowBlock)(box: PublicKey25519NoncedBox): BigInt = {
     val h = Blake2b256(pwb.bytes ++ box.bytes)
-    Longs.fromByteArray((0: Byte) +: h.take(7))
+    BigInt(1, h)
   }
 
   def posIteration(powBlock: PowBlock,