From ba0739c87c743d4e20c60872f46a3f8e7faddc73 Mon Sep 17 00:00:00 2001
From: stoffu <stoffu@protonmail.ch>
Date: Tue, 10 Sep 2019 18:43:07 +0900
Subject: [PATCH] further fixes with offsetting

---
 aeon-1.html                | 2 +-
 aeon-bc-size-1.html        | 3 ++-
 aeon-block-reward-1.html   | 2 +-
 aeon-block-size-1.html     | 3 ++-
 aeon-block-time-1.html     | 3 ++-
 aeon-coin-supply-1.html    | 7 +------
 aeon-config.js             | 7 +++++++
 aeon-nonce-1.html          | 3 ++-
 aeon-ring-size-1.html      | 3 ++-
 aeon-tx-per-day-1.html     | 3 ++-
 js/bc-size.js              | 9 ++++++---
 js/block-reward.js         | 7 ++++---
 js/block-size.js           | 7 ++++---
 js/block-time.js           | 5 +++--
 js/coin-supply.js          | 7 ++++---
 js/diff.js                 | 7 ++++---
 js/nonce.js                | 7 ++++---
 js/ring-size.js            | 5 +++--
 js/tx-per-day.js           | 5 +++--
 monero-1.html              | 2 +-
 monero-bc-size-1.html      | 3 ++-
 monero-block-reward-1.html | 2 +-
 monero-block-size-1.html   | 3 ++-
 monero-block-time-1.html   | 3 ++-
 monero-coin-supply-1.html  | 7 +------
 monero-config.js           | 7 +++++++
 monero-nonce-1.html        | 3 ++-
 monero-ring-size-1.html    | 3 ++-
 monero-tx-per-day-1.html   | 3 ++-
 29 files changed, 79 insertions(+), 52 deletions(-)

diff --git a/aeon-1.html b/aeon-1.html
index 28319ad..9286e67 100644
--- a/aeon-1.html
+++ b/aeon-1.html
@@ -25,7 +25,7 @@
 var chart = get_chart([].concat(
     chartData_10,
     chartData_11,
-), aeon_config);
+), aeon_config, aeon_offset_1);
 
 function toggleLogScale() {
   chart.valueAxes[0].logarithmic = document.getElementById("log_scale").checked;
diff --git a/aeon-bc-size-1.html b/aeon-bc-size-1.html
index f05dfb2..f2025dc 100644
--- a/aeon-bc-size-1.html
+++ b/aeon-bc-size-1.html
@@ -18,13 +18,14 @@
 <script src="data/aeon-data-10.js"></script>
 <script src="data/aeon-data-11.js"></script>
 <script src="js/bc-size.js"></script>
+<script src="aeon-config.js"></script>
 
 <!-- Chart code -->
 <script>
 var chart = get_chart([].concat(
     chartData_10,
     chartData_11,
-));
+), aeon_offset_1);
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
diff --git a/aeon-block-reward-1.html b/aeon-block-reward-1.html
index eda6c1d..50bb06f 100644
--- a/aeon-block-reward-1.html
+++ b/aeon-block-reward-1.html
@@ -25,7 +25,7 @@
 var chart = get_chart([].concat(
     chartData_10,
     chartData_11,
-    ), aeon_config);
+    ), aeon_config, aeon_offset_1);
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
diff --git a/aeon-block-size-1.html b/aeon-block-size-1.html
index e49627e..b7d2651 100644
--- a/aeon-block-size-1.html
+++ b/aeon-block-size-1.html
@@ -18,13 +18,14 @@
 <script src="data/aeon-data-10.js"></script>
 <script src="data/aeon-data-11.js"></script>
 <script src="js/block-size.js"></script>
+<script src="aeon-config.js"></script>
 
 <!-- Chart code -->
 <script>
 var chart = get_chart([].concat(
     chartData_10,
     chartData_11,
-));
+), aeon_offset_1);
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
diff --git a/aeon-block-time-1.html b/aeon-block-time-1.html
index 698cde8..852ef5c 100644
--- a/aeon-block-time-1.html
+++ b/aeon-block-time-1.html
@@ -18,13 +18,14 @@
 <script src="data/aeon-data-10.js"></script>
 <script src="data/aeon-data-11.js"></script>
 <script src="js/block-time.js"></script>
+<script src="aeon-config.js"></script>
 
 <!-- Chart code -->
 <script>
 var chart = get_chart([].concat(
     chartData_10,
     chartData_11,
-));
+), aeon_offset_1);
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
diff --git a/aeon-coin-supply-1.html b/aeon-coin-supply-1.html
index f71bf1b..1343624 100644
--- a/aeon-coin-supply-1.html
+++ b/aeon-coin-supply-1.html
@@ -23,15 +23,10 @@
 
 <!-- Chart code -->
 <script>
-var offset = {
-    height: 1000000,
-    supply: bigInt("16230799273689217059"),
-    supply_proj: bigInt("16234708945129113452")
-};
 var chart = get_chart([].concat(
     chartData_10,
     chartData_11,
-    ), aeon_config, offset);
+    ), aeon_config, aeon_offset_1);
 
 function toggleProj() {
   chart.graphs[1].hidden = !document.getElementById("proj").checked;
diff --git a/aeon-config.js b/aeon-config.js
index 3f479a6..4cbb0d6 100644
--- a/aeon-config.js
+++ b/aeon-config.js
@@ -25,3 +25,10 @@ var aeon_config = {
       return this.EMISSION_SPEED_FACTOR_PER_MINUTE - int_log2(target_minutes);
     },
 };
+
+var aeon_offset_1 = {
+    height: 1000000,
+    supply: "16230799273689217059",
+    supply_proj: "16234708945129113452",
+    bc_size: 2745344988,
+};
diff --git a/aeon-nonce-1.html b/aeon-nonce-1.html
index 0509ad9..8198a05 100644
--- a/aeon-nonce-1.html
+++ b/aeon-nonce-1.html
@@ -18,13 +18,14 @@
 <script src="data/aeon-data-10.js"></script>
 <script src="data/aeon-data-11.js"></script>
 <script src="js/nonce.js"></script>
+<script src="aeon-config.js"></script>
 
 <!-- Chart code -->
 <script>
 var chart = get_chart([].concat(
     chartData_10,
     chartData_11,
-));
+), aeon_offset_1);
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
diff --git a/aeon-ring-size-1.html b/aeon-ring-size-1.html
index 0bacbb2..31c7428 100644
--- a/aeon-ring-size-1.html
+++ b/aeon-ring-size-1.html
@@ -17,6 +17,7 @@
 <script src="data/aeon-data-10.js"></script>
 <script src="data/aeon-data-11.js"></script>
 <script src="js/ring-size.js"></script>
+<script src="aeon-config.js"></script>
 
 <!-- Chart code -->
 <script>
@@ -25,7 +26,7 @@ var chart = get_chart(
         chartData_10,
         chartData_11,
     ),
-    [1,2,3,4,5,6,7,8,9,10,15,20,50,100]
+    [1,2,3,4,5,6,7,8,9,10,15,20,50,100], aeon_offset_1
 );
 
 function togglePan() {
diff --git a/aeon-tx-per-day-1.html b/aeon-tx-per-day-1.html
index e353807..f2147a1 100644
--- a/aeon-tx-per-day-1.html
+++ b/aeon-tx-per-day-1.html
@@ -17,13 +17,14 @@
 <script src="data/aeon-data-10.js"></script>
 <script src="data/aeon-data-11.js"></script>
 <script src="js/tx-per-day.js"></script>
+<script src="aeon-config.js"></script>
 
 <!-- Chart code -->
 <script>
 var chart = get_chart([].concat(
     chartData_10,
     chartData_11,
-));
+), aeon_offset_1);
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
diff --git a/js/bc-size.js b/js/bc-size.js
index 5c6206f..af50455 100644
--- a/js/bc-size.js
+++ b/js/bc-size.js
@@ -1,10 +1,13 @@
-function get_chart(chartData) {
-    chartData.shift();
+function get_chart(chartData, offset) {
+    if (offset === undefined)
+        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].height = i + (offset === undefined ? 1 : offset.height);
         chartData[i].bc_size = chartData[i][4];
+        if (i === 0 && offset !== undefined)
+          chartData[i].bc_size += offset.bc_size;
         if (i > 0)
           chartData[i].bc_size += chartData[i - 1].bc_size;
         chartData[i].bc_size_str = formatBytes(chartData[i].bc_size, 3);
diff --git a/js/block-reward.js b/js/block-reward.js
index 7d183f6..1d703fa 100644
--- a/js/block-reward.js
+++ b/js/block-reward.js
@@ -1,9 +1,10 @@
-function get_chart(chartData, cryptonote_config) {
-    chartData.shift();
+function get_chart(chartData, cryptonote_config, offset) {
+    if (offset === undefined)
+        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].height = i + (offset === undefined ? 1 : offset.height);
         chartData[i].reward = print_money(chartData[i][3], cryptonote_config.CRYPTONOTE_DISPLAY_DECIMAL_POINT);
     }
 
diff --git a/js/block-size.js b/js/block-size.js
index d0af01d..4d7893a 100644
--- a/js/block-size.js
+++ b/js/block-size.js
@@ -1,9 +1,10 @@
-function get_chart(chartData) {
-    chartData.shift();
+function get_chart(chartData, offset) {
+    if (offset === undefined)
+        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].height = i + (offset === undefined ? 1 : offset.height);
         chartData[i].block_size = chartData[i][4];
         chartData[i].block_size_str = formatBytes(chartData[i].block_size, 3);
     }
diff --git a/js/block-time.js b/js/block-time.js
index 148ba6b..aae54d0 100644
--- a/js/block-time.js
+++ b/js/block-time.js
@@ -1,5 +1,6 @@
-function get_chart(chartData) {
-    chartData.shift();
+function get_chart(chartData, offset) {
+    if (offset === undefined)
+        chartData.shift();
     var chartData_bt = [];
     var block_date = null;
 
diff --git a/js/coin-supply.js b/js/coin-supply.js
index 2b9cfbb..1c80d8b 100644
--- a/js/coin-supply.js
+++ b/js/coin-supply.js
@@ -1,7 +1,7 @@
 function get_chart(chartData, cryptonote_config, offset) {
     for (var i = 0; i < chartData.length; ++i) {
         chartData[i].date = new Date(1000 * chartData[i][0]);
-        chartData[i].height = i;
+        chartData[i].height = i + (offset === undefined ? 0 : offset.height);
         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]);   // subtract fees
@@ -15,7 +15,7 @@ function get_chart(chartData, cryptonote_config, offset) {
         var target = cryptonote_config.get_difficulty_target((offset === undefined ? 0 : offset.height) + i);
         var target_minutes = target / 60;
         var emission_speed_factor = cryptonote_config.get_emission_speed_factor(target_minutes);
-        var already_generated_coins = i == 0 ? (offset === undefined ? bigInt(0) : offset.supply_proj) : chartData[i - 1].coin_supply_proj;
+        var already_generated_coins = i == 0 ? (offset === undefined ? bigInt(0) : bigInt(offset.supply_proj)) : 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))
         {
@@ -26,7 +26,8 @@ function get_chart(chartData, cryptonote_config, offset) {
         chartData[i].coin_supply_proj_real = chartData[i].coin_supply_proj.toJSNumber() / Math.pow(10, cryptonote_config.CRYPTONOTE_DISPLAY_DECIMAL_POINT);
     }
 
-    chartData.shift();
+    if (offset === undefined)
+        chartData.shift();
 
     var chart = AmCharts.makeChart("chartdiv", {
         "type": "serial",
diff --git a/js/diff.js b/js/diff.js
index 49db250..a704352 100644
--- a/js/diff.js
+++ b/js/diff.js
@@ -1,9 +1,10 @@
-function get_chart(chartData, cryptonote_config) {
-    chartData.shift();
+function get_chart(chartData, cryptonote_config, offset) {
+    if (offset === undefined)
+        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].height = i + (offset === undefined ? 1 : offset.height);
         chartData[i].difficulty = chartData[i][2];
         chartData[i].hashrate = formatHashrate(chartData[i].difficulty / cryptonote_config.get_difficulty_target(chartData[i].height), 2);
     }
diff --git a/js/nonce.js b/js/nonce.js
index e54a029..632acfe 100644
--- a/js/nonce.js
+++ b/js/nonce.js
@@ -1,11 +1,12 @@
 var max_num_bullets = 200000;
 
-function get_chart(chartData) {
-    chartData.shift();
+function get_chart(chartData, offset) {
+    if (offset === undefined)
+        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].height = i + (offset === undefined ? 1 : offset.height);
         chartData[i].nonce = chartData[i][1];
     }
 
diff --git a/js/ring-size.js b/js/ring-size.js
index 3912e39..8c37462 100644
--- a/js/ring-size.js
+++ b/js/ring-size.js
@@ -1,5 +1,6 @@
-function get_chart(chartData, levels) {
-    chartData.shift();
+function get_chart(chartData, levels, offset) {
+    if (offset === undefined)
+        chartData.shift();
     var chartData_rs = [];
     var block_date = null;
     var num_txes_per_day = {};
diff --git a/js/tx-per-day.js b/js/tx-per-day.js
index 5c2a774..e3798c0 100644
--- a/js/tx-per-day.js
+++ b/js/tx-per-day.js
@@ -1,5 +1,6 @@
-function get_chart(chartData) {
-    chartData.shift();
+function get_chart(chartData, offset) {
+    if (offset === undefined)
+        chartData.shift();
     var chartData_tpd = [];
     var block_date = null;
 
diff --git a/monero-1.html b/monero-1.html
index 8043499..dcd9d0d 100644
--- a/monero-1.html
+++ b/monero-1.html
@@ -41,7 +41,7 @@ var chart = get_chart([].concat(
     chartData_17,
     chartData_18,
     chartData_19,
-), monero_config);
+), monero_config, monero_offset_1);
 
 function toggleLogScale() {
   chart.valueAxes[0].logarithmic = document.getElementById("log_scale").checked;
diff --git a/monero-bc-size-1.html b/monero-bc-size-1.html
index 459b6dc..d6f0811 100644
--- a/monero-bc-size-1.html
+++ b/monero-bc-size-1.html
@@ -26,6 +26,7 @@
 <script src="data/monero-data-18.js"></script>
 <script src="data/monero-data-19.js"></script>
 <script src="js/bc-size.js"></script>
+<script src="monero-config.js"></script>
 
 <!-- Chart code -->
 <script>
@@ -40,7 +41,7 @@ var chart = get_chart([].concat(
     chartData_17,
     chartData_18,
     chartData_19,
-));
+), monero_offset_1);
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
diff --git a/monero-block-reward-1.html b/monero-block-reward-1.html
index e9f618c..e6edff7 100644
--- a/monero-block-reward-1.html
+++ b/monero-block-reward-1.html
@@ -41,7 +41,7 @@ var chart = get_chart([].concat(
     chartData_17,
     chartData_18,
     chartData_19,
-    ), monero_config);
+    ), monero_config, monero_offset_1);
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
diff --git a/monero-block-size-1.html b/monero-block-size-1.html
index 353fd0f..0077967 100644
--- a/monero-block-size-1.html
+++ b/monero-block-size-1.html
@@ -26,6 +26,7 @@
 <script src="data/monero-data-18.js"></script>
 <script src="data/monero-data-19.js"></script>
 <script src="js/block-size.js"></script>
+<script src="monero-config.js"></script>
 
 <!-- Chart code -->
 <script>
@@ -40,7 +41,7 @@ var chart = get_chart([].concat(
     chartData_17,
     chartData_18,
     chartData_19,
-));
+), monero_offset_1);
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
diff --git a/monero-block-time-1.html b/monero-block-time-1.html
index d3deae4..ac5b914 100644
--- a/monero-block-time-1.html
+++ b/monero-block-time-1.html
@@ -26,6 +26,7 @@
 <script src="data/monero-data-18.js"></script>
 <script src="data/monero-data-19.js"></script>
 <script src="js/block-time.js"></script>
+<script src="monero-config.js"></script>
 
 <!-- Chart code -->
 <script>
@@ -40,7 +41,7 @@ var chart = get_chart([].concat(
     chartData_17,
     chartData_18,
     chartData_19,
-));
+), monero_offset_1);
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
diff --git a/monero-coin-supply-1.html b/monero-coin-supply-1.html
index f812f6c..4dbe52d 100644
--- a/monero-coin-supply-1.html
+++ b/monero-coin-supply-1.html
@@ -31,11 +31,6 @@
 
 <!-- Chart code -->
 <script>
-var offset = {
-    height: 1000000,
-    supply: bigInt("11319902360375037196"),
-    supply_proj: bigInt("11338799512357636715")
-};
 var chart = get_chart([].concat(
     chartData_10,
     chartData_11,
@@ -47,7 +42,7 @@ var chart = get_chart([].concat(
     chartData_17,
     chartData_18,
     chartData_19,
-    ), monero_config, offset);
+    ), monero_config, monero_offset_1);
 
 function toggleProj() {
   chart.graphs[1].hidden = !document.getElementById("proj").checked;
diff --git a/monero-config.js b/monero-config.js
index a62dead..e5befe7 100644
--- a/monero-config.js
+++ b/monero-config.js
@@ -12,3 +12,10 @@ var monero_config = {
       return this.EMISSION_SPEED_FACTOR_PER_MINUTE - (target_minutes - 1);
     },
 };
+
+var monero_offset_1 = {
+    height: 1000000,
+    supply: bigInt("11319902360375037196"),
+    supply_proj: bigInt("11338799512357636715"),
+    bc_size: 2630363526,
+};
diff --git a/monero-nonce-1.html b/monero-nonce-1.html
index 31d36c4..2c3f8cb 100644
--- a/monero-nonce-1.html
+++ b/monero-nonce-1.html
@@ -26,6 +26,7 @@
 <script src="data/monero-data-18.js"></script>
 <script src="data/monero-data-19.js"></script>
 <script src="js/nonce.js"></script>
+<script src="monero-config.js"></script>
 
 <!-- Chart code -->
 <script>
@@ -40,7 +41,7 @@ var chart = get_chart([].concat(
     chartData_17,
     chartData_18,
     chartData_19,
-));
+), monero_offset_1);
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;
diff --git a/monero-ring-size-1.html b/monero-ring-size-1.html
index 416a777..1e79d6a 100644
--- a/monero-ring-size-1.html
+++ b/monero-ring-size-1.html
@@ -25,6 +25,7 @@
 <script src="data/monero-data-18.js"></script>
 <script src="data/monero-data-19.js"></script>
 <script src="js/ring-size.js"></script>
+<script src="monero-config.js"></script>
 
 <!-- Chart code -->
 <script>
@@ -41,7 +42,7 @@ var chart = get_chart(
         chartData_18,
         chartData_19,
     ),
-    [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,40,50,100]
+    [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,30,40,50,100], monero_offset_1
 );
 
 function togglePan() {
diff --git a/monero-tx-per-day-1.html b/monero-tx-per-day-1.html
index ec35214..548cbae 100644
--- a/monero-tx-per-day-1.html
+++ b/monero-tx-per-day-1.html
@@ -25,6 +25,7 @@
 <script src="data/monero-data-18.js"></script>
 <script src="data/monero-data-19.js"></script>
 <script src="js/tx-per-day.js"></script>
+<script src="monero-config.js"></script>
 
 <!-- Chart code -->
 <script>
@@ -39,7 +40,7 @@ var chart = get_chart([].concat(
     chartData_17,
     chartData_18,
     chartData_19,
-));
+), monero_offset_1);
 
 function togglePan() {
   chart.chartCursor.pan = document.getElementById("pan").checked;