diff --git a/src/main/scala/encry/local/miner/Miner.scala b/src/main/scala/encry/local/miner/Miner.scala index 4a55657442..fcf0f5f10c 100644 --- a/src/main/scala/encry/local/miner/Miner.scala +++ b/src/main/scala/encry/local/miner/Miner.scala @@ -130,6 +130,8 @@ class Miner(dataHolder: ActorRef, influx: Option[ActorRef], settings: EncryAppSe def receiveSemanticallySuccessfulModifier: Receive = { case SemanticallySuccessfulModifier(mod: Block) if needNewCandidate(mod) => + transactionsPool = transactionsPool ++ mod.payload.txs.dropRight(1) + .diff(candidateOpt.map(_.transactions.dropRight(1)).getOrElse(IndexedSeq.empty)) logger.info(s"Got new block. Starting to produce candidate at height: ${mod.header.height + 1} " + s"at ${dateFormat.format(new Date(System.currentTimeMillis()))}") produceCandidate() @@ -179,7 +181,7 @@ class Miner(dataHolder: ActorRef, influx: Option[ActorRef], settings: EncryAppSe val difficulty: Difficulty = bestHeaderOpt.map(parent => view.history.requiredDifficultyAfter(parent) match { case Right(value) => value - case Left(value) => EncryApp.forceStopApplication(999, value.toString) + case Left(value) => EncryApp.forceStopApplication(999, value.toString) }) .getOrElse(TestNetConstants.InitialDifficulty)