From 5588f5bc68d243ff339e7ffce8ddb3a5ed65b348 Mon Sep 17 00:00:00 2001
From: Wei-Ning Huang <w@dexon.org>
Date: Sat, 12 Jan 2019 22:30:39 +0800
Subject: contracts: change blockReward to miningVelocity and add
 nextHalvingSupply/Amount

---
 contracts/Governance.sol | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

(limited to 'contracts/Governance.sol')

diff --git a/contracts/Governance.sol b/contracts/Governance.sol
index b612ff7..44406a7 100644
--- a/contracts/Governance.sol
+++ b/contracts/Governance.sol
@@ -81,43 +81,49 @@ contract Governance {
     // 17: lockupPeriod
     uint256 public lockupPeriod;
 
-    // 18: blockReward.
-    uint256 public blockReward;
+    // 18: miningVelocity.
+    uint256 public miningVelocity;  // stored as miningVelocity * 10^8
 
-    // 19: blockGasLimit.
+    // 19: nextHalvingSupply.
+    uint256 public nextHalvingSupply;
+
+    // 20: lastHalvedAmount.
+    uint256 public lastHalvedAmount;
+
+    // 21: blockGasLimit.
     uint256 public blockGasLimit;
 
-    // 20: Network related.
+    // 22: Network related.
     uint256 public numChains;
 
     // Lambda related.
-    // 21
+    // 23
     uint256 public lambdaBA;
-    // 22
+    // 24
     uint256 public lambdaDKG;
 
     // Total ordering related.
-    // 23
+    // 25
     uint256 public k;
-    // 24
-    uint256 public phiRatio;  // stored as PhiRatio * 10^6
+    // 26
+    uint256 public phiRatio;  // stored as PhiRatio * 10^8
 
     // Set related.
-    // 25
+    // 27
     uint256 public notarySetSize;
-    // 26
+    // 28
     uint256 public dkgSetSize;
 
     // Time related.
-    // 27
+    // 29
     uint256 public roundInterval;
-    // 28
+    // 30
     uint256 public minBlockInterval;
 
-    // 29: Fine value.
+    // 31: Fine value.
     uint256[] public fineValues;
 
-    // 30: Fined records.
+    // 32: Fined records.
     mapping(bytes32 => bool) public finedRecords;
 
     // ----------
@@ -150,7 +156,9 @@ contract Governance {
     function updateConfiguration(
         uint256 MinStake,
         uint256 LockupPeriod,
-        uint256 BlockReward,
+        uint256 MiningVelocity,
+        uint256 NextHalvingSupply,
+        uint256 LastHalvingAmount,
         uint256 BlockGasLimit,
         uint256 NumChains,
         uint256 LambdaBA,
-- 
cgit v1.2.3