github-wownero/diff-chart
1
0
Fork 0
mirror of https://github.com/wownero/diff-chart.git synced 2026-10-17 15:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

coin-supply: show accumulated fees

Browse Source
This commit is contained in:
stoffu
2019-10-03 11:07:36 +09:00
parent 1bbfa3f24a
commit f482ba731d
8 changed files with 51 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aeon-coin-supply-0.html
-6
View File
@@ -44,11 +44,6 @@ var chart = get_chart([].concat(
chartData_9,
), aeon_config);
function toggleProj() {
chart.graphs[1].hidden = !document.getElementById("proj").checked;
chart.validateNow();
}
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;
}
@@ -58,7 +53,6 @@ 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>
aeon-coin-supply-1.html
-6
View File
@@ -28,11 +28,6 @@ var chart = get_chart([].concat(
chartData_11,
), aeon_config, aeon_offset_1);
function toggleProj() {
chart.graphs[1].hidden = !document.getElementById("proj").checked;
chart.validateNow();
}
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;
}
@@ -42,7 +37,6 @@ 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>
aeon-config.js
+1
View File
@@ -33,5 +33,6 @@ var aeon_offset_1 = {
height: 1000000,
supply: "16230799273689217059",
supply_proj: "16234708945129113452",
accum_fee: "8090111859795393",
bc_size: 2745344988,
};
js/coin-supply.js
+47 -8
View File
@@ -3,14 +3,24 @@ function get_chart(chartData, cryptonote_config, offset) {
chartData[i].date = new Date(1000 * chartData[i][0]);
chartData[i].height = i + (offset === undefined ? 0 : offset.height);
chartData[i].coin_supply = bigInt(chartData[i][3]);
chartData[i].fee = bigInt(0);
for (var j = 0; j < chartData[i][6].length; ++j)
chartData[i].coin_supply = chartData[i].coin_supply.minus(chartData[i][6][j][4]); // subtract fees
if (i === 0 && offset !== undefined)
chartData[i].coin_supply = chartData[i].coin_supply.plus(offset.supply);
chartData[i].fee = chartData[i].fee.plus(chartData[i][6][j][4]);
chartData[i].coin_supply = chartData[i].coin_supply.minus(chartData[i].fee);
if (i > 0)
{
chartData[i].coin_supply = chartData[i].coin_supply.plus(chartData[i - 1].coin_supply);
chartData[i].fee = chartData[i].fee.plus(chartData[i - 1].fee);
}
else if (offset !== undefined)
{
chartData[i].coin_supply = chartData[i].coin_supply.plus(offset.supply);
chartData[i].fee = chartData[i].fee.plus(offset.accum_fee);
}
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);
chartData[i].fee_str = print_money(chartData[i].fee, cryptonote_config.CRYPTONOTE_DISPLAY_DECIMAL_POINT);
chartData[i].fee_real = chartData[i].fee.toJSNumber() / Math.pow(10, cryptonote_config.CRYPTONOTE_DISPLAY_DECIMAL_POINT);
// projected supply
var target = cryptonote_config.get_difficulty_target((offset === undefined ? 0 : offset.height) + i);
var target_minutes = target / 60;
@@ -19,7 +29,7 @@ function get_chart(chartData, cryptonote_config, offset) {
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);
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);
@@ -37,13 +47,28 @@ function get_chart(chartData, cryptonote_config, offset) {
"marginTop": 7,
"dataProvider": chartData,
"valueAxes": [{
"id":"va_supply",
"color": "DarkGoldenrod",
"axisColor": "DarkGoldenrod",
"axisThickness": 2,
"axisAlpha": 0,
"position": "left"
}, {
"id":"va_fee",
"color": "LightSeaGreen",
"axisColor": "LightSeaGreen",
"axisThickness": 2,
"axisAlpha": 0,
"gridAlpha": 0,
"position": "right"
}],
"mouseWheelZoomEnabled": true,
"graphs": [{
"id": "g1",
"lineColor": "#cc9900",
"balloonText": "Supply: <b>[[coin_supply_str]]</b>\n(Proj: [[coin_supply_proj_str]])\nHeight: <b>[[height]]</b>",
"valueAxis": "va_supply",
"lineColor": "DarkGoldenrod",
"lineThickness": 4,
"balloonText": "Supply: <b>[[coin_supply_str]]</b>\n(Proj: [[coin_supply_proj_str]])\n(Accum fee: [[fee_str]])\nHeight: <b>[[height]]</b>",
"bullet": "round",
"bulletBorderAlpha": 1,
"bulletColor": "#FFFFFF",
@@ -56,7 +81,9 @@ function get_chart(chartData, cryptonote_config, offset) {
}
},{
"id": "g2",
"lineColor": "#447700",
"valueAxis": "va_supply",
"lineColor": "DarkKhaki",
"lineThickness": 2,
"bullet": "round",
"bulletBorderAlpha": 1,
"bulletColor": "#FFFFFF",
@@ -65,7 +92,19 @@ function get_chart(chartData, cryptonote_config, offset) {
"valueField": "coin_supply_proj_real",
"useLineColorForBulletBorder": true,
"showBalloon": false,
"hidden": true,
},{
"id": "g3",
"valueAxis": "va_fee",
"lineColor": "LightSeaGreen",
"lineThickness": 1,
"bullet": "round",
"bulletBorderAlpha": 1,
"bulletColor": "#FFFFFF",
"hideBulletsCount": 50,
"title": "accumulated fee",
"valueField": "fee_real",
"useLineColorForBulletBorder": true,
"showBalloon": false,
}],
"chartScrollbar": {
"autoGridCount": true,
monero-coin-supply-0.html
-6
View File
@@ -44,11 +44,6 @@ var chart = get_chart([].concat(
chartData_9,
), monero_config);
function toggleProj() {
chart.graphs[1].hidden = !document.getElementById("proj").checked;
chart.validateNow();
}
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;
}
@@ -58,7 +53,6 @@ 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>
monero-coin-supply-1.html
-6
View File
@@ -44,11 +44,6 @@ var chart = get_chart([].concat(
chartData_19,
), monero_config, monero_offset_1);
function toggleProj() {
chart.graphs[1].hidden = !document.getElementById("proj").checked;
chart.validateNow();
}
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;
}
@@ -58,7 +53,6 @@ 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>
monero-config.js
+3 -2
View File
@@ -18,7 +18,8 @@ var monero_config = {
var monero_offset_1 = {
height: 1000000,
supply: bigInt("11319902360375037196"),
supply_proj: bigInt("11338799512357636715"),
supply: "11319902360375037196",
supply_proj: "11338799512357636715",
accum_fee: "28065472452232840",
bc_size: 2630363526,
};
wownero-coin-supply.html
-6
View File
@@ -28,11 +28,6 @@ var chart = get_chart([].concat(
chartData_1
), wownero_config);
function toggleProj() {
chart.graphs[1].hidden = !document.getElementById("proj").checked;
chart.validateNow();
}
function togglePan() {
chart.chartCursor.pan = document.getElementById("pan").checked;
}
@@ -42,7 +37,6 @@ 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>