Skip to content
Snippets Groups Projects
Commit 0b8a7a41 authored by Cédric Moreau's avatar Cédric Moreau
Browse files

Fix #714 Bug on proof-of-work: a protocol rule was no more respected, causing forks

parent 99c3479c
Branches
Tags
No related merge requests found
...@@ -957,7 +957,7 @@ function getTrialLevel (version, issuer, conf, dal) { ...@@ -957,7 +957,7 @@ function getTrialLevel (version, issuer, conf, dal) {
const nbPreviousIssuers = _(_(issuers).uniq()).without(issuer).length; const nbPreviousIssuers = _(_(issuers).uniq()).without(issuer).length;
const nbBlocksSince = current.number - last.number; const nbBlocksSince = current.number - last.number;
let personal_diff = Math.max(powMin, powMin * Math.floor(percentRot * (1 + nbPreviousIssuers) / (1 + nbBlocksSince))); let personal_diff = Math.max(powMin, powMin * Math.floor(percentRot * (1 + nbPreviousIssuers) / (1 + nbBlocksSince)));
if ((personal_diff + 1) % 16 == 0) { if (personal_diff + 1 % 16 == 0) {
personal_diff++; personal_diff++;
} }
return personal_diff; return personal_diff;
...@@ -986,7 +986,7 @@ function getTrialLevel (version, issuer, conf, dal) { ...@@ -986,7 +986,7 @@ function getTrialLevel (version, issuer, conf, dal) {
// Personal_handicap // Personal_handicap
personal_diff += Math.floor(Math.log(1 + personal_excess) / Math.log(1.189)); personal_diff += Math.floor(Math.log(1 + personal_excess) / Math.log(1.189));
} }
if ((personal_diff + 1) % 16 == 0) { if (personal_diff + 1 % 16 == 0) {
personal_diff++; personal_diff++;
} }
return personal_diff; return personal_diff;
...@@ -1026,7 +1026,7 @@ function getTrialLevel (version, issuer, conf, dal) { ...@@ -1026,7 +1026,7 @@ function getTrialLevel (version, issuer, conf, dal) {
// Personal_handicap // Personal_handicap
const handicap = Math.floor(Math.log(1 + personal_excess) / Math.log(1.189)); const handicap = Math.floor(Math.log(1 + personal_excess) / Math.log(1.189));
let personal_diff = powMin + handicap; let personal_diff = powMin + handicap;
if ((personal_diff + 1) % 16 == 0) { if (personal_diff + 1 % 16 == 0) {
personal_diff++; personal_diff++;
} }
return personal_diff; return personal_diff;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment