diff --git a/ZelFront/src/components/Admin.vue b/ZelFront/src/components/Admin.vue
index 757d09ebb..b8a9216d3 100644
--- a/ZelFront/src/components/Admin.vue
+++ b/ZelFront/src/components/Admin.vue
@@ -754,7 +754,7 @@ export default {
.then((daemonResponse) => {
console.log(daemonResponse);
const daemonVersion = daemonResponse.data.data.version;
- axios.get('https://zelcore.io/flux/daemoninfo.php')
+ axios.get('https://raw.githubusercontent.com/zelcash/zelflux/master/helpers/daemoninfo.json')
.then((response) => {
console.log(response);
if (response.data.version !== daemonVersion) {
@@ -939,7 +939,7 @@ export default {
.then((benchmarkResponse) => {
console.log(benchmarkResponse);
const benchmarkVersion = benchmarkResponse.data.data.version;
- axios.get('https://zelcore.io/flux/benchmarkinfo.php')
+ axios.get('https://raw.githubusercontent.com/zelcash/zelflux/master/helpers/benchmarkinfo.json')
.then((response) => {
console.log(response);
if (response.data.version !== benchmarkVersion) {
@@ -1182,7 +1182,7 @@ export default {
.then((daemonResponse) => {
console.log(daemonResponse);
const daemonVersion = daemonResponse.data.data.version;
- axios.get('https://zelcore.io/flux/daemoninfo.php')
+ axios.get('https://raw.githubusercontent.com/zelcash/zelflux/master/helpers/daemoninfo.json')
.then((response) => {
console.log(response);
if (response.data.version !== daemonVersion) {
@@ -1206,7 +1206,7 @@ export default {
.then((benchmarkResponse) => {
console.log(benchmarkResponse);
const benchmarkVersion = benchmarkResponse.data.data.version;
- axios.get('https://zelcore.io/flux/benchmarkinfo.php')
+ axios.get('https://raw.githubusercontent.com/zelcash/zelflux/master/helpers/benchmarkinfo.json')
.then((response) => {
console.log(response);
if (response.data.version !== benchmarkVersion) {
diff --git a/ZelFront/src/components/Benchmark.vue b/ZelFront/src/components/Benchmark.vue
index 75053b80d..ed611133b 100644
--- a/ZelFront/src/components/Benchmark.vue
+++ b/ZelFront/src/components/Benchmark.vue
@@ -159,7 +159,7 @@
Benchmarking: {{ callResponse.data.benchmarking }}
- Flux: {{ callResponse.data.zelback }}
+ Flux: {{ callResponse.data.zelback || callResponse.data.flux }}
diff --git a/ZelFront/src/components/Dashboard.vue b/ZelFront/src/components/Dashboard.vue
index 8f1b0279d..1975ef8a0 100644
--- a/ZelFront/src/components/Dashboard.vue
+++ b/ZelFront/src/components/Dashboard.vue
@@ -140,6 +140,8 @@
>
+ Rewards After April 10th(Miners 50%/50% Flux Nodes)
+
Cumulus Rewards
@@ -159,8 +161,8 @@
{{ beautifyValue(basicUSDRewardWeek * 4.34812141) }} USD
No KDA available
- Profitability per month - Node Cost 6 USD
- Node only: {{ beautifyValue(superUSDRewardWeek * 4.34812141 - 6) }} USD
+ Profitability per month - Node Cost 4.70 USD
+ Node only: {{ beautifyValue(basicUSDRewardWeek * 4.34812141 - 4.70) }} USD
No KDA available
@@ -211,6 +213,80 @@
+
+ Rewards Until April 10th (Miners 75%/25% Flux Nodes)
+
+
+
+
Cumulus Rewards
+
+ per day
+ {{ beautifyValue(beforeForkbasicWeek / 7 ) }} FLUX
+ {{ beautifyValue(beforeForkbasicUSDRewardWeek / 7) }} USD
+ No KDA available
+
+ per week
+ {{ beautifyValue(beforeForkbasicWeek) }} FLUX
+ {{ beautifyValue(beforeForkbasicUSDRewardWeek) }} USD
+ No KDA available
+
+ per month
+ {{ beautifyValue(beforeForkbasicWeek * 4.34812141) }} FLUX
+ {{ beautifyValue(beforeForkbasicUSDRewardWeek * 4.34812141) }} USD
+ No KDA available
+
+ Profitability per month - Node Cost 4.70 USD
+ Node only: {{ beautifyValue(beforeForkbasicUSDRewardWeek * 4.34812141 - 4.70) }} USD
+ No KDA available
+
+
+
+
Nimbus Rewards
+
+ per day
+ {{ beautifyValue(beforeForksuperWeek / 7) }} FLUX ~ {{ beautifyValue(beforeForksuperUSDRewardWeek / 7) }} USD
+ {{ beautifyValue(kdaNimbusWeek / 7) }} KDA ~ {{ beautifyValue(superUSDKDARewardWeek / 7) }} USD
+ {{ beautifyValue((beforeForksuperUSDRewardWeek / 7) + (superUSDKDARewardWeek / 7)) }} USD
+
+ per week
+ {{ beautifyValue(beforeForksuperWeek) }} FLUX ~ {{ beautifyValue(beforeForksuperUSDRewardWeek) }} USD
+ {{ beautifyValue(kdaNimbusWeek) }} KDA ~ {{ beautifyValue(superUSDKDARewardWeek) }} USD
+ {{ beautifyValue((beforeForksuperUSDRewardWeek) + (superUSDKDARewardWeek)) }} USD
+
+ per month
+ {{ beautifyValue(beforeForksuperWeek * 4.34812141) }} FLUX ~ {{ beautifyValue(beforeForksuperUSDRewardWeek * 4.34812141) }} USD
+ {{ beautifyValue(kdaNimbusWeek * 4.34812141) }} KDA ~ {{ beautifyValue(superUSDKDARewardWeek * 4.34812141) }} USD
+ {{ beautifyValue((beforeForksuperUSDRewardWeek * 4.34812141) + (superUSDKDARewardWeek * 4.34812141)) }} USD
+
+ Profitability per month - Node Cost 6 USD
+ Node only: {{ beautifyValue(beforeForksuperUSDRewardWeek * 4.34812141 - 6) }} USD
+ With KDA: {{ beautifyValue((beforeForksuperUSDRewardWeek * 4.34812141) + (superUSDKDARewardWeek * 4.34812141) - 6) }} USD
+
+
+
+
Stratus Rewards
+
+ per day
+ {{ beautifyValue(beforeForkbamfWeek / 7 ) }} FLUX ~ {{ beautifyValue(beforeForkbamfUSDRewardWeek / 7) }} USD
+ {{ beautifyValue(kdaStratusWeek / 7 ) }} KDA ~ {{ beautifyValue(bamfUSDKDARewardWeek / 7) }} USD
+ {{ beautifyValue((beforeForkbamfUSDRewardWeek / 7) + (bamfUSDKDARewardWeek / 7)) }} USD
+
+ per week
+ {{ beautifyValue(beforeForkbamfWeek) }} FLUX ~ {{ beautifyValue(beforeForkbamfUSDRewardWeek) }} USD
+ {{ beautifyValue(kdaStratusWeek ) }} KDA ~ {{ beautifyValue(bamfUSDKDARewardWeek) }} USD
+ {{ beautifyValue((beforeForkbamfUSDRewardWeek) + (bamfUSDKDARewardWeek)) }} USD
+
+ per month
+ {{ beautifyValue(beforeForkbamfWeek * 4.34812141) }} FLUX ~ {{ beautifyValue(beforeForkbamfUSDRewardWeek * 4.34812141) }} USD
+ {{ beautifyValue(kdaStratusWeek * 4.34812141) }} KDA ~ {{ beautifyValue(bamfUSDKDARewardWeek * 4.34812141) }} USD
+ {{ beautifyValue((beforeForkbamfUSDRewardWeek * 4.34812141) + (bamfUSDKDARewardWeek * 4.34812141)) }} USD
+
+ Profitability per month - Node Cost 32 USD
+ Node only: {{ beautifyValue(beforeForkbamfUSDRewardWeek * 4.34812141 - 32) }} USD
+ With KDA: {{ beautifyValue((beforeForkbamfUSDRewardWeek * 4.34812141) + (bamfUSDKDARewardWeek * 4.34812141) - 18.1) }} USD
+
+
+
(result.tier === 'SUPER' || result.tier === 'NIMBUS'));
@@ -486,9 +570,9 @@ export default {
const overallTotal = totalNimbuss + (4 * totalStratuss);
const perNimbusWeek = Number((kdaCoins / overallTotal).toFixed(4)); // KDA
const perStratusWeek = Number(((kdaCoins / overallTotal) * 4).toFixed(4)); // KDA
- const perCumulusNode = 2.8125;
- const perNimbusNode = 4.6875;
- const perStratusNode = 11.25;
+ const perCumulusNode = 5.625;
+ const perNimbusNode = 9.375;
+ const perStratusNode = 22.5;
// eslint-disable-next-line no-mixed-operators
const basicWeek = perCumulusNode * 720 * 7 / basics;
// eslint-disable-next-line no-mixed-operators
@@ -518,6 +602,32 @@ export default {
this.kdaNimbusWeek = perNimbusWeek;
this.kdaStratusWeek = perStratusWeek;
+ const beforeForkperCumulusNode = 2.8125;
+ const beforeForkperNimbusNode = 4.6875;
+ const beforeForkperStratusNode = 11.25;
+ // eslint-disable-next-line no-mixed-operators
+ const beforeForkbasicWeek = beforeForkperCumulusNode * 720 * 7 / basics;
+ // eslint-disable-next-line no-mixed-operators
+ const beforeForksuperWeek = beforeForkperNimbusNode * 720 * 7 / supers;
+ // eslint-disable-next-line no-mixed-operators
+ const beforeForkbamfWeek = beforeForkperStratusNode * 720 * 7 / bamfs;
+ const beforeForkbasicUSDReward = this.getFiatRate('ZEL') * beforeForkperCumulusNode; // per one go
+ const beforeForksuperUSDReward = this.getFiatRate('ZEL') * beforeForkperNimbusNode; // per one go
+ const beforeForkbamfUSDReward = this.getFiatRate('ZEL') * beforeForkperStratusNode; // per one go
+ // 720 blocks per day.
+ // eslint-disable-next-line no-mixed-operators
+ const beforeForkbasicUSDRewardWeek = 7 * 720 * beforeForkbasicUSDReward / basics;
+ // eslint-disable-next-line no-mixed-operators
+ const beforeForksuperUSDRewardWeek = 7 * 720 * beforeForksuperUSDReward / supers;
+ // eslint-disable-next-line no-mixed-operators
+ const beforeForkbamfUSDRewardWeek = 7 * 720 * beforeForkbamfUSDReward / bamfs;
+ this.beforeForkbasicWeek = beforeForkbasicWeek;
+ this.beforeForksuperWeek = beforeForksuperWeek;
+ this.beforeForkbamfWeek = beforeForkbamfWeek;
+ this.beforeForkbasicUSDRewardWeek = beforeForkbasicUSDRewardWeek;
+ this.beforeForksuperUSDRewardWeek = beforeForksuperUSDRewardWeek;
+ this.beforeForkbamfUSDRewardWeek = beforeForkbamfUSDRewardWeek;
+
const self = this;
axios.get('https://api.coingecko.com/api/v3/coins/zelcash/market_chart?vs_currency=USD&days=30').then((res2) => {
self.historicalPrices = res2.data.prices.filter((a) => a[0] > 1483232400000); // min date from January 1, 2017 1:00:00 AM
@@ -530,7 +640,7 @@ export default {
async getFluxList() {
try {
this.fluxListLoading = true;
- const resLoc = await axios.get('https://api.flux.zel.network/fluxlocations');
+ const resLoc = await axios.get('https://stats.runonflux.io/fluxlocations');
const locations = resLoc.data.data;
const resList = await DashboardService.listZelNodes();
const fluxList = resList.data.data;
diff --git a/ZelFront/src/components/Node.vue b/ZelFront/src/components/Node.vue
index 838846cca..af4edf396 100644
--- a/ZelFront/src/components/Node.vue
+++ b/ZelFront/src/components/Node.vue
@@ -27,7 +27,7 @@
Added Height: {{ getNodeStatusResponse.data.added_height }}
@@ -35,7 +35,7 @@
Confirmed Height: {{ getNodeStatusResponse.data.confirmed_height }}
@@ -43,7 +43,7 @@
Last Confirmed Height: {{ getNodeStatusResponse.data.last_confirmed_height }}
@@ -51,7 +51,7 @@
Last Paid Height: {{ getNodeStatusResponse.data.last_paid_height }}
@@ -59,7 +59,7 @@
Show Locked transaction
diff --git a/helpers/benchmarkinfo.json b/helpers/benchmarkinfo.json
new file mode 100644
index 000000000..c7fcb15c2
--- /dev/null
+++ b/helpers/benchmarkinfo.json
@@ -0,0 +1,4 @@
+{
+ "version": "2.0.0",
+ "rpcport": 16224
+}
diff --git a/helpers/benchmarkinfo.php b/helpers/benchmarkinfo.php
deleted file mode 100644
index ee2127216..000000000
--- a/helpers/benchmarkinfo.php
+++ /dev/null
@@ -1,5 +0,0 @@
-
-{
- "version": "1.4.0",
- "rpcport": 16224
-}
diff --git a/helpers/daemoninfo.json b/helpers/daemoninfo.json
new file mode 100644
index 000000000..228082f2b
--- /dev/null
+++ b/helpers/daemoninfo.json
@@ -0,0 +1,6 @@
+{
+ "version": 5000050,
+ "protocolversion": 170017,
+ "walletversion": 60000
+}
+
diff --git a/helpers/daemoninfo.php b/helpers/daemoninfo.php
deleted file mode 100644
index 0649562e9..000000000
--- a/helpers/daemoninfo.php
+++ /dev/null
@@ -1,6 +0,0 @@
-
-{
- "version": 4000150,
- "protocolversion": 170016,
- "walletversion": 60000
-}
diff --git a/package.json b/package.json
index 03cd24e0e..f2c0587ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "flux",
- "version": "1.13.2",
+ "version": "1.13.3",
"description": "Flux, Your Gateway to a Decentralized World",
"repository": {
"type": "git",
diff --git a/sampleDaemonConfig.conf b/sampleDaemonConfig.conf
index d78bf7759..de62fbfec 100644
--- a/sampleDaemonConfig.conf
+++ b/sampleDaemonConfig.conf
@@ -13,6 +13,6 @@ logtimestamps=1
maxconnections=512
externalip=127.0.0.1
bind=127.0.0.1
-addnode=explorer.zel.network
+addnode=explorer.runonflux.io
addnode=explorer.flux.zelcore.io
addnode=explorer.zelcash.online