Some additions + new logging

Author: Bromel777

src/main/scala/mvp2/actors/Planner.scala

@@ -119,6 +119,7 @@ class Planner(settings: Settings) extends CommonActor {
         s"${schedule.map(EncodingUtils.encode2Base16).mkString(",")}")
       publisher ! RequestForNewBlock(epoch.full, schedule)
       epoch = epoch.dropNextPublisherPublicKey
+      nextPeriod = Period(nextPeriod, settings)
     }
     logger.info(s"${epoch.full} && ${lastBlock.height}")
     logger.info(s"Epoch after checkMyTurn is: $epoch")

src/main/scala/mvp2/data/Block.scala

@@ -49,29 +49,33 @@ object KeyBlock {
     new KeyBlock(height, timestamp, previousKeyBlockHash, currentBlockHash, transactions, data, signature, scheduler, publicKey)
   }
 
-  def toProtobuf(block: KeyBlock): KeyBlockProtobuf = KeyBlockProtobuf()
-    .withCurrentBlockHash(pByteString.copyFrom(block.currentBlockHash.toByteBuffer))
-    .withHeight(block.height)
-    .withTimestamp(block.timestamp)
-    .withTransactions(block.transactions.map(Transaction.toProtobuf))
-    .withData(pByteString.copyFrom(block.data.toByteBuffer))
-    .withSignature(pByteString.copyFrom(block.signature.toByteBuffer))
-    .withScheduler(block.scheduler.map(publicKey => pByteString.copyFrom(publicKey.toByteBuffer)))
-    .withPreviousKeyBlockHash(pByteString.copyFrom(block.previousKeyBlockHash.toByteBuffer))
-    .withPublicKey(pByteString.copyFrom(block.publicKey.toByteBuffer))
+  def toProtobuf(block: KeyBlock): KeyBlockProtobuf = {
+    KeyBlockProtobuf()
+      .withCurrentBlockHash(pByteString.copyFrom(block.currentBlockHash.toByteBuffer))
+      .withHeight(block.height)
+      .withTimestamp(block.timestamp)
+      .withTransactions(block.transactions.map(Transaction.toProtobuf))
+      .withData(pByteString.copyFrom(block.data.toByteBuffer))
+      .withSignature(pByteString.copyFrom(block.signature.toByteBuffer))
+      .withScheduler(block.scheduler.map(publicKey => pByteString.copyFrom(publicKey.toByteBuffer)))
+      .withPreviousKeyBlockHash(pByteString.copyFrom(block.previousKeyBlockHash.toByteBuffer))
+      .withPublicKey(pByteString.copyFrom(block.publicKey.toByteBuffer))
+  }
 
 
-  def fromProtobuf(blockProtobuf: KeyBlockProtobuf): KeyBlock = KeyBlock(
-    blockProtobuf.height,
-    blockProtobuf.timestamp,
-    ByteString(blockProtobuf.previousKeyBlockHash.toByteArray),
-    ByteString(blockProtobuf.currentBlockHash.toByteArray),
-    blockProtobuf.transactions.map(Transaction.fromProtobuf).toList,
-    ByteString(blockProtobuf.data.toByteArray),
-    ByteString(blockProtobuf.signature.toByteArray),
-    blockProtobuf.scheduler.map(protKey => ByteString(protKey.toByteArray)).toList,
-    ByteString(blockProtobuf.publicKey.toByteArray)
-  )
+  def fromProtobuf(blockProtobuf: KeyBlockProtobuf): KeyBlock = {
+    KeyBlock(
+      blockProtobuf.height,
+      blockProtobuf.timestamp,
+      ByteString(blockProtobuf.previousKeyBlockHash.toByteArray),
+      ByteString(blockProtobuf.currentBlockHash.toByteArray),
+      blockProtobuf.transactions.map(Transaction.fromProtobuf).toList,
+      ByteString(blockProtobuf.data.toByteArray),
+      ByteString(blockProtobuf.signature.toByteArray),
+      blockProtobuf.scheduler.map(protKey => ByteString(protKey.toByteArray)).toList,
+      ByteString(blockProtobuf.publicKey.toByteArray)
+    )
+  }
 }
 
 final case class MicroBlock(height: Long,