From 09a80c3e9e9c589fbeafdace753b2e92fa4bc050 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Fri, 10 Mar 2017 19:14:18 +0100
Subject: [PATCH] Fix blockchain parameters, for Duniter v1.0
---
.../model/bma/BlockchainParameters.java | 55 ++++++++++++++-----
1 file changed, 42 insertions(+), 13 deletions(-)
diff --git a/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/BlockchainParameters.java b/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/BlockchainParameters.java
index e36c6a5e..d022ca0a 100644
--- a/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/BlockchainParameters.java
+++ b/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/BlockchainParameters.java
@@ -52,6 +52,21 @@ public class BlockchainParameters implements Serializable{
*/
private Long ud0;
+ /**
+ * Time for UD(0)
+ */
+ private Long udTime0;
+
+ /**
+ * First time for reveal UD
+ */
+ private Long udReevalTime0;
+
+ /**
+ * Time between two reveal UD
+ */
+ private Long dtReeval;
+
/**
* Minimum delay between 2 certifications of a same issuer, in seconds. Must be positive or zero.
*/
@@ -117,10 +132,6 @@ public class BlockchainParameters implements Serializable{
*/
private Integer dtDiffEval;
- /**
- * The number of previous blocks to check for personalized difficulty
- */
- private Integer blocksRot;
/**
* The percent of previous issuers to reach for personalized difficulty
@@ -151,6 +162,14 @@ public class BlockchainParameters implements Serializable{
this.dt = dt;
}
+ public Long getUdTime0() {
+ return udTime0;
+ }
+
+ public void setUdTime0(Long udTime0) {
+ this.udTime0 = udTime0;
+ }
+
public Long getUd0() {
return ud0;
}
@@ -159,6 +178,22 @@ public class BlockchainParameters implements Serializable{
this.ud0 = ud0;
}
+ public Long getUdReevalTime0() {
+ return udReevalTime0;
+ }
+
+ public void setUdReevalTime0(Long udReevalTime0) {
+ this.udReevalTime0 = udReevalTime0;
+ }
+
+ public Long getDtReeval() {
+ return dtReeval;
+ }
+
+ public void setDtReeval(Long dtReeval) {
+ this.dtReeval = dtReeval;
+ }
+
public Integer getSigValidity() {
return sigValidity;
}
@@ -216,14 +251,6 @@ public class BlockchainParameters implements Serializable{
this.dtDiffEval = dtDiffEval;
}
- public Integer getBlocksRot() {
- return blocksRot;
- }
-
- public void setBlocksRot(Integer blocksRot) {
- this.blocksRot = blocksRot;
- }
-
public Double getPercentRot() {
return percentRot;
}
@@ -300,7 +327,9 @@ public class BlockchainParameters implements Serializable{
.append("\nmedianTimeBlocks=").append(medianTimeBlocks)
.append("\navgGenTime=").append(avgGenTime)
.append("\ndtDiffEval=").append(dtDiffEval)
- .append("\nblocksRot=").append(blocksRot)
+ .append("\nudTime0=").append(udTime0)
+ .append("\nudReevalTime0=").append(udReevalTime0)
+ .append("\ndtReeval=").append(dtReeval)
.append("\npercentRot=").append(percentRot)
.toString();
}
--
GitLab