From 89e23f7870e2e30a65026efca69372c35627769f Mon Sep 17 00:00:00 2001
From: stoffu <stoffu@protonmail.ch>
Date: Wed, 10 Apr 2019 17:56:29 +0900
Subject: [PATCH] coin supply: show projected value

---
 aeon-block-reward.html    |  3 ++-
 aeon-coin-supply.html     |  9 ++++++++-
 aeon-config.js            | 27 +++++++++++++++++++++++++++
 aeon.html                 |  7 ++-----
 js/block-reward.js        |  4 ++--
 js/coin-supply.js         | 35 ++++++++++++++++++++++++++++++-----
 js/diff.js                | 12 ++----------
 monero-block-reward.html  |  3 ++-
 monero-coin-supply.html   |  9 ++++++++-
 monero-config.js          | 14 ++++++++++++++
 monero.html               |  7 ++-----
 wownero-block-reward.html |  3 ++-
 wownero-coin-supply.html  |  9 ++++++++-
 wownero-config.js         | 14 ++++++++++++++
 wownero.html              |  6 ++----
 15 files changed, 125 insertions(+), 37 deletions(-)
 create mode 100644 aeon-config.js
 create mode 100644 monero-config.js
 create mode 100644 wownero-config.js

diff --git a/aeon-block-reward.html b/aeon-block-reward.html
index d57ff38..a689206 100644
--- a/aeon-block-reward.html
+++ b/aeon-block-reward.html
@@ -27,6 +27,7 @@
 <script src="data/aeon-data-9.js"></script>
 <script src="data/aeon-data-10.js"></script>
 <script src="js/block-reward.js"></script>
+<script src="aeon-config.js"></script>
 
 <!-- Chart code -->
 <script>
@@ -42,7 +43,7 @@ var chart = get_chart([].concat(
     chartData_8,
     chartData_9,
     chartData_10,
-    ), 12);
+    ), aeon_config);
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
diff --git a/aeon-coin-supply.html b/aeon-coin-supply.html
index 9a0519f..a4a1cf7 100644
--- a/aeon-coin-supply.html
+++ b/aeon-coin-supply.html
@@ -28,6 +28,7 @@
 <script src="data/aeon-data-9.js"></script>
 <script src="data/aeon-data-10.js"></script>
 <script src="js/coin-supply.js"></script>
+<script src="aeon-config.js"></script>
 
 <!-- Chart code -->
 <script>
@@ -43,7 +44,12 @@ var chart = get_chart([].concat(
     chartData_8,
     chartData_9,
     chartData_10,
-    ), 12);
+    ), aeon_config);
+
+function toggleProj() {
+  chart.graphs[1].hidden = !document.getElementById("proj").checked;
+  chart.validateNow();
+}
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
@@ -54,6 +60,7 @@ function togglePan() {
 <body>
 <h1>Aeon coin supply</h1>
 <div id="chartdiv"></div>
+<p><input type="checkbox" id="proj" onclick="toggleProj()">Show projected supply</p>
 <p><input type="checkbox" id="pan" onclick="togglePan()">Enable panning</p>
 <p><a href="./">Back to top</a></p>
 </body>
diff --git a/aeon-config.js b/aeon-config.js
new file mode 100644
index 0000000..3f479a6
--- /dev/null
+++ b/aeon-config.js
@@ -0,0 +1,27 @@
+function int_log2(x)
+{
+  var r = 0;
+  while (true)
+  {
+    x >>= 1;
+    if (x == 0)
+      break;
+    ++r;
+  }
+  return r;
+}
+
+var aeon_config = {
+    MONEY_SUPPLY: "18446744073709551615",     // (uint64_t)(-1)
+    EMISSION_SPEED_FACTOR_PER_MINUTE: 20,
+    FINAL_SUBSIDY_PER_MINUTE: 300000000000,         // 3 * pow(10, 11)
+    CRYPTONOTE_DISPLAY_DECIMAL_POINT: 12,
+    DIFFICULTY_TARGET_V2: 240,
+    DIFFICULTY_TARGET_V1: 60,
+    get_difficulty_target: function(height) {
+      return height < 592000 ? this.DIFFICULTY_TARGET_V1 : this.DIFFICULTY_TARGET_V2;
+    },
+    get_emission_speed_factor: function(target_minutes) {
+      return this.EMISSION_SPEED_FACTOR_PER_MINUTE - int_log2(target_minutes);
+    },
+};
diff --git a/aeon.html b/aeon.html
index f6c875c..985bdfb 100644
--- a/aeon.html
+++ b/aeon.html
@@ -27,13 +27,10 @@
 <script src="data/aeon-data-9.js"></script>
 <script src="data/aeon-data-10.js"></script>
 <script src="js/diff.js"></script>
+<script src="aeon-config.js"></script>
 
 <!-- Chart code -->
 <script>
-var diff_targets = [
-  { height: 0, value: 60},
-  { height: 592000, value: 240},
-];
 var chart = get_chart([].concat(
     chartData_0,
     chartData_1,
@@ -46,7 +43,7 @@ var chart = get_chart([].concat(
     chartData_8,
     chartData_9,
     chartData_10,
-), diff_targets);
+), aeon_config);
 
 function toggleLogScale() {
   chart.valueAxes[0].logarithmic = document.getElementById("log_scale").checked;
diff --git a/js/block-reward.js b/js/block-reward.js
index a3f3ba5..7d183f6 100644
--- a/js/block-reward.js
+++ b/js/block-reward.js
@@ -1,10 +1,10 @@
-function get_chart(chartData, decimal_point) {
+function get_chart(chartData, cryptonote_config) {
     chartData.shift();
 
     for (var i = 0; i < chartData.length; ++i) {
         chartData[i].date = new Date(1000 * chartData[i][0]);
         chartData[i].height = i + 1;
-        chartData[i].reward = print_money(chartData[i][3], decimal_point);
+        chartData[i].reward = print_money(chartData[i][3], cryptonote_config.CRYPTONOTE_DISPLAY_DECIMAL_POINT);
     }
 
     var chart = AmCharts.makeChart("chartdiv", {
diff --git a/js/coin-supply.js b/js/coin-supply.js
index 9e1a3ac..df69ae8 100644
--- a/js/coin-supply.js
+++ b/js/coin-supply.js
@@ -1,14 +1,27 @@
-function get_chart(chartData, decimal_point) {
+function get_chart(chartData, cryptonote_config) {
     for (var i = 0; i < chartData.length; ++i) {
         chartData[i].date = new Date(1000 * chartData[i][0]);
         chartData[i].height = i;
         chartData[i].coin_supply = bigInt(chartData[i][3]);
         for (var j = 0; j < chartData[i][5].length; ++j)
-            chartData[i].coin_supply = chartData[i].coin_supply.minus(chartData[i][5][j][4]);
+            chartData[i].coin_supply = chartData[i].coin_supply.minus(chartData[i][5][j][4]);   // subtract fees
         if (i > 0)
             chartData[i].coin_supply = chartData[i].coin_supply.plus(chartData[i - 1].coin_supply);
-        chartData[i].coin_supply_str = print_money(chartData[i].coin_supply, decimal_point);
-        chartData[i].coin_supply_real = chartData[i].coin_supply.toJSNumber() / Math.pow(10, decimal_point);
+        chartData[i].coin_supply_str = print_money(chartData[i].coin_supply, cryptonote_config.CRYPTONOTE_DISPLAY_DECIMAL_POINT);
+        chartData[i].coin_supply_real = chartData[i].coin_supply.toJSNumber() / Math.pow(10, cryptonote_config.CRYPTONOTE_DISPLAY_DECIMAL_POINT);
+        // projected supply
+        var target = cryptonote_config.get_difficulty_target(i);
+        var target_minutes = target / 60;
+        var emission_speed_factor = cryptonote_config.get_emission_speed_factor(target_minutes);
+        var already_generated_coins = i == 0 ? bigInt(0) : chartData[i - 1].coin_supply_proj;
+        var base_reward = bigInt(cryptonote_config.MONEY_SUPPLY).minus(already_generated_coins).shiftRight(emission_speed_factor);
+        if (base_reward.lesser(cryptonote_config.FINAL_SUBSIDY_PER_MINUTE * target_minutes))
+        {
+          base_reward = bigInt(cryptonote_config.FINAL_SUBSIDY_PER_MINUTE * target_minutes);
+        }
+        chartData[i].coin_supply_proj = base_reward.plus(already_generated_coins);
+        chartData[i].coin_supply_proj_str = print_money(chartData[i].coin_supply_proj, cryptonote_config.CRYPTONOTE_DISPLAY_DECIMAL_POINT);
+        chartData[i].coin_supply_proj_real = chartData[i].coin_supply_proj.toJSNumber() / Math.pow(10, cryptonote_config.CRYPTONOTE_DISPLAY_DECIMAL_POINT);
     }
 
     chartData.shift();
@@ -27,7 +40,7 @@ function get_chart(chartData, decimal_point) {
         "graphs": [{
             "id": "g1",
             "lineColor": "#cc9900",
-            "balloonText": "Supply: <b>[[coin_supply_str]]</b>\nHeight: <b>[[height]]</b>",
+            "balloonText": "Supply: <b>[[coin_supply_str]]</b>\n(Proj: [[coin_supply_proj_str]])\nHeight: <b>[[height]]</b>",
             "bullet": "round",
             "bulletBorderAlpha": 1,
             "bulletColor": "#FFFFFF",
@@ -38,6 +51,18 @@ function get_chart(chartData, decimal_point) {
             "balloon":{
                 "cornerRadius": 10,
             }
+        },{
+            "id": "g2",
+            "lineColor": "#447700",
+            "bullet": "round",
+            "bulletBorderAlpha": 1,
+            "bulletColor": "#FFFFFF",
+            "hideBulletsCount": 50,
+            "title": "projected coin supply",
+            "valueField": "coin_supply_proj_real",
+            "useLineColorForBulletBorder": true,
+            "showBalloon": false,
+            "hidden": true,
         }],
         "chartScrollbar": {
             "autoGridCount": true,
diff --git a/js/diff.js b/js/diff.js
index 08d6c32..49db250 100644
--- a/js/diff.js
+++ b/js/diff.js
@@ -1,19 +1,11 @@
-function get_diff_target(diff_targets, height) {
-    for (var i = diff_targets.length - 1; i >= 0; --i) {
-        if (diff_targets[i].height <= height)
-            return diff_targets[i].value;
-    }
-    return 0;
-}
-
-function get_chart(chartData, diff_targets) {
+function get_chart(chartData, cryptonote_config) {
     chartData.shift();
 
     for (var i = 0; i < chartData.length; ++i) {
         chartData[i].date = new Date(1000 * chartData[i][0]);
         chartData[i].height = i + 1;
         chartData[i].difficulty = chartData[i][2];
-        chartData[i].hashrate = formatHashrate(chartData[i].difficulty / get_diff_target(diff_targets, chartData[i].height), 2);
+        chartData[i].hashrate = formatHashrate(chartData[i].difficulty / cryptonote_config.get_difficulty_target(chartData[i].height), 2);
     }
 
     var chart = AmCharts.makeChart("chartdiv", {
diff --git a/monero-block-reward.html b/monero-block-reward.html
index 34f0a34..c96c0e9 100644
--- a/monero-block-reward.html
+++ b/monero-block-reward.html
@@ -35,6 +35,7 @@
 <script src="data/monero-data-17.js"></script>
 <script src="data/monero-data-18.js"></script>
 <script src="js/block-reward.js"></script>
+<script src="monero-config.js"></script>
 
 <!-- Chart code -->
 <script>
@@ -58,7 +59,7 @@ var chart = get_chart([].concat(
     chartData_16,
     chartData_17,
     chartData_18,
-    ), 12);
+    ), monero_config);
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
diff --git a/monero-coin-supply.html b/monero-coin-supply.html
index 89fdb55..bff0c2d 100644
--- a/monero-coin-supply.html
+++ b/monero-coin-supply.html
@@ -36,6 +36,7 @@
 <script src="data/monero-data-17.js"></script>
 <script src="data/monero-data-18.js"></script>
 <script src="js/coin-supply.js"></script>
+<script src="monero-config.js"></script>
 
 <!-- Chart code -->
 <script>
@@ -59,7 +60,12 @@ var chart = get_chart([].concat(
     chartData_16,
     chartData_17,
     chartData_18,
-    ), 12);
+    ), monero_config);
+
+function toggleProj() {
+  chart.graphs[1].hidden = !document.getElementById("proj").checked;
+  chart.validateNow();
+}
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
@@ -70,6 +76,7 @@ function togglePan() {
 <body>
 <h1>Monero coin supply</h1>
 <div id="chartdiv"></div>
+<p><input type="checkbox" id="proj" onclick="toggleProj()">Show projected supply</p>
 <p><input type="checkbox" id="pan" onclick="togglePan()">Enable panning</p>
 <p><a href="./">Back to top</a></p>
 </body>
diff --git a/monero-config.js b/monero-config.js
new file mode 100644
index 0000000..a62dead
--- /dev/null
+++ b/monero-config.js
@@ -0,0 +1,14 @@
+var monero_config = {
+    MONEY_SUPPLY: "18446744073709551615",     // (uint64_t)(-1)
+    EMISSION_SPEED_FACTOR_PER_MINUTE: 20,
+    FINAL_SUBSIDY_PER_MINUTE: 300000000000,         // 3 * pow(10, 11)
+    CRYPTONOTE_DISPLAY_DECIMAL_POINT: 12,
+    DIFFICULTY_TARGET_V2: 120,
+    DIFFICULTY_TARGET_V1: 60,
+    get_difficulty_target: function(height) {
+      return height < 1009827 ? this.DIFFICULTY_TARGET_V1 : this.DIFFICULTY_TARGET_V2;
+    },
+    get_emission_speed_factor: function(target_minutes) {
+      return this.EMISSION_SPEED_FACTOR_PER_MINUTE - (target_minutes - 1);
+    },
+};
diff --git a/monero.html b/monero.html
index fa42dc6..7f21c6f 100644
--- a/monero.html
+++ b/monero.html
@@ -35,13 +35,10 @@
 <script src="data/monero-data-17.js"></script>
 <script src="data/monero-data-18.js"></script>
 <script src="js/diff.js"></script>
+<script src="monero-config.js"></script>
 
 <!-- Chart code -->
 <script>
-var diff_targets = [
-  { height: 0, value: 60},
-  { height: 1009827, value: 120},
-];
 var chart = get_chart([].concat(
     chartData_0,
     chartData_1,
@@ -62,7 +59,7 @@ var chart = get_chart([].concat(
     chartData_16,
     chartData_17,
     chartData_18,
-), diff_targets);
+), monero_config);
 
 function toggleLogScale() {
   chart.valueAxes[0].logarithmic = document.getElementById("log_scale").checked;
diff --git a/wownero-block-reward.html b/wownero-block-reward.html
index b5b9af3..18c6c00 100644
--- a/wownero-block-reward.html
+++ b/wownero-block-reward.html
@@ -17,10 +17,11 @@
 <script src="js/util.js"></script>
 <script src="data/wownero-data-0.js"></script>
 <script src="js/block-reward.js"></script>
+<script src="wownero-config.js"></script>
 
 <!-- Chart code -->
 <script>
-var chart = get_chart(chartData_0, 11);
+var chart = get_chart(chartData_0, wownero_config);
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
diff --git a/wownero-coin-supply.html b/wownero-coin-supply.html
index 5758e6b..c08a822 100644
--- a/wownero-coin-supply.html
+++ b/wownero-coin-supply.html
@@ -18,10 +18,16 @@
 <script src="js/util.js"></script>
 <script src="data/wownero-data-0.js"></script>
 <script src="js/coin-supply.js"></script>
+<script src="wownero-config.js"></script>
 
 <!-- Chart code -->
 <script>
-var chart = get_chart(chartData_0, 11);
+var chart = get_chart(chartData_0, wownero_config);
+
+function toggleProj() {
+  chart.graphs[1].hidden = !document.getElementById("proj").checked;
+  chart.validateNow();
+}
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
@@ -32,6 +38,7 @@ function togglePan() {
 <body>
 <h1>Wownero coin supply</h1>
 <div id="chartdiv"></div>
+<p><input type="checkbox" id="proj" onclick="toggleProj()">Show projected supply</p>
 <p><input type="checkbox" id="pan" onclick="togglePan()">Enable panning</p>
 <p><a href="./">Back to top</a></p>
 </body>
diff --git a/wownero-config.js b/wownero-config.js
new file mode 100644
index 0000000..8cd28c8
--- /dev/null
+++ b/wownero-config.js
@@ -0,0 +1,14 @@
+var wownero_config = {
+    MONEY_SUPPLY: "18446744073709551615",     // (uint64_t)(-1)
+    EMISSION_SPEED_FACTOR_PER_MINUTE: 24,
+    FINAL_SUBSIDY_PER_MINUTE: 0,
+    CRYPTONOTE_DISPLAY_DECIMAL_POINT: 11,
+    DIFFICULTY_TARGET_V2: 300,
+    DIFFICULTY_TARGET_V1: 300,
+    get_difficulty_target: function(height) {
+      return this.DIFFICULTY_TARGET_V1;
+    },
+    get_emission_speed_factor: function(target_minutes) {
+      return this.EMISSION_SPEED_FACTOR_PER_MINUTE - (target_minutes - 1);
+    },
+};
diff --git a/wownero.html b/wownero.html
index adfaa41..5ecaf4d 100644
--- a/wownero.html
+++ b/wownero.html
@@ -17,13 +17,11 @@
 <script src="js/util.js"></script>
 <script src="data/wownero-data-0.js"></script>
 <script src="js/diff.js"></script>
+<script src="wownero-config.js"></script>
 
 <!-- Chart code -->
 <script>
-var diff_targets = [
-  { height: 0, value: 300},
-];
-var chart = get_chart(chartData_0, diff_targets);
+var chart = get_chart(chartData_0, wownero_config);
 
 function toggleLogScale() {
   chart.valueAxes[0].logarithmic = document.getElementById("log_scale").checked;