Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ec-723 #368

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

ec-723 #368

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0127a26
some addition
liorl00 Aug 29, 2019
fff329f
Merge branch 'master' into ec-723
liorl00 Aug 29, 2019
a301d99
code cleanup
liorl00 Aug 29, 2019
aa52616
Merge remote-tracking branch 'origin/ec-723' into ec-723
liorl00 Aug 29, 2019
f860834
logs added
liorl00 Aug 29, 2019
990d600
code cleanup
liorl00 Aug 30, 2019
1012e15
code cleanup
liorl00 Sep 2, 2019
cd9a27f
condition changed
liorl00 Sep 6, 2019
e750ef3
code cleanup
liorl00 Sep 9, 2019
9ad680a
code cleanup
liorl00 Sep 9, 2019
5c65433
Merge branch 'master' into ec-723
liorl00 Dec 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/scala/encry/local/miner/Miner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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)

Expand Down