diff --git a/_businesses/staking.html b/_businesses/staking.html
index 115ae49..95926e0 100644
--- a/_businesses/staking.html
+++ b/_businesses/staking.html
@@ -103,6 +103,7 @@
Calculator
"stakingMin": {{ network.stake_min }},
"apr": {{ network.stake_apr }},
+ "inflation": {{network.network_inflation }},
"epoch": {{ network.network_epoch }},
"rewardConstant": {{ network.node_reward_constant}},
diff --git a/_networks/cardano.html b/_drafts/cardano.html
similarity index 100%
rename from _networks/cardano.html
rename to _drafts/cardano.html
diff --git a/_networks/cosmos.html b/_drafts/cosmos.html
similarity index 100%
rename from _networks/cosmos.html
rename to _drafts/cosmos.html
diff --git a/_networks/csc.html b/_drafts/csc.html
similarity index 100%
rename from _networks/csc.html
rename to _drafts/csc.html
diff --git a/_networks/elrond.html b/_drafts/elrond.html
similarity index 100%
rename from _networks/elrond.html
rename to _drafts/elrond.html
diff --git a/_networks/kava.html b/_drafts/kava.html
similarity index 100%
rename from _networks/kava.html
rename to _drafts/kava.html
diff --git a/_networks/kusama.html b/_drafts/kusama.html
similarity index 100%
rename from _networks/kusama.html
rename to _drafts/kusama.html
diff --git a/_networks/marlin.html b/_drafts/marlin.html
similarity index 100%
rename from _networks/marlin.html
rename to _drafts/marlin.html
diff --git a/_networks/mina.html b/_drafts/mina.html
similarity index 100%
rename from _networks/mina.html
rename to _drafts/mina.html
diff --git a/_networks/moonbeam.html b/_drafts/moonbeam.html
similarity index 100%
rename from _networks/moonbeam.html
rename to _drafts/moonbeam.html
diff --git a/_networks/moonriver.html b/_drafts/moonriver.html
similarity index 100%
rename from _networks/moonriver.html
rename to _drafts/moonriver.html
diff --git a/_networks/oasis.html b/_drafts/oasis.html
similarity index 100%
rename from _networks/oasis.html
rename to _drafts/oasis.html
diff --git a/_networks/persistence.html b/_drafts/persistence.html
similarity index 100%
rename from _networks/persistence.html
rename to _drafts/persistence.html
diff --git a/_networks/pocket.html b/_drafts/pocket.html
similarity index 100%
rename from _networks/pocket.html
rename to _drafts/pocket.html
diff --git a/_networks/polkadot.html b/_drafts/polkadot.html
similarity index 100%
rename from _networks/polkadot.html
rename to _drafts/polkadot.html
diff --git a/_networks/regen.html b/_drafts/regen.html
similarity index 100%
rename from _networks/regen.html
rename to _drafts/regen.html
diff --git a/_networks/threshold.html b/_drafts/threshold.html
similarity index 100%
rename from _networks/threshold.html
rename to _drafts/threshold.html
diff --git a/_networks/tron.html b/_drafts/tron.html
similarity index 100%
rename from _networks/tron.html
rename to _drafts/tron.html
diff --git a/_networks/solana.html b/_networks/solana.html
new file mode 100644
index 0000000..9a75ebc
--- /dev/null
+++ b/_networks/solana.html
@@ -0,0 +1,39 @@
+---
+title: "Solana"
+icon: "/assets/images/networks-logo/solana.svg"
+
+market_cap: 11476031214
+
+network_symbol: "SOL"
+network_title: "Solana"
+network_fee: 1.0
+network_epoch: 5.0
+network_inflation: 8.0
+
+site_main: "https://solana.com/"
+site_docs: "https://docs.solana.com/"
+site_git: "https://github.com/solana-labs"
+site_explorer: "https://explorer.solana.com/"
+
+token: "SOL"
+token_price: 32.12
+
+stake_min: 1
+stake_apr: 7.1
+stake_reward_frequency: '2-3 day'
+stake_effectiveness_rating: 0
+stake_unbonding_period: 21.0
+
+slashing_uptime: true
+slashing_duble_signe: true
+
+node_start_value: 0
+node_hardware: 8CPU_16GRAM_500GS
+node_reward_constant: 0
+node_reward_percentage: 7.0
+
+staked_value: 0.0
+
+p2p_staked_value: 4537698.0
+p2p_wallet: 'FKsC411dik9ktS6xPADxs4Fk2SCENvAiuccQHLAPndvk'
+---
diff --git a/assets/js/calculator-staking.js b/assets/js/calculator-staking.js
index cf97e0b..10f2fa1 100644
--- a/assets/js/calculator-staking.js
+++ b/assets/js/calculator-staking.js
@@ -183,7 +183,7 @@
const MaintainCost_TEMPLATE = xml /* xml */`
- Setup Cost
+ Maintain Cost
$$ Cost_{Maintain} = \SUM_{i=1}^{n} C_{Host} + [{n}/{N_{SPO}}]* C_{SPO} + [n/N_{IT}*C_{IT}] + C_{CTO} + C_{CEO} $$
Where:
@@ -266,8 +266,8 @@
Staking Revenue Stream
$$ Revenue_{Staking} = \SUM_{i=1}^{n} [
( 30 / EPOCH^i ) * R_{Constant}^i +
- (R_{Percentage}^i * Stake_{P2P}^i * APR^i)/12 +
- (Stake_{Min}^i * APR^i)/12
+ (R_{Percentage}^i * Stake_{P2P}^i * APR_{nominate}^i)/12 +
+ (Stake_{Min}^i * APR_{actual}^i)/12
] * Token_{price}^i $$
Where:
@@ -300,10 +300,11 @@
this.env.networksDb.forEach(network => {
if(network.id) {
// Constant revenue
- revenueStaking += (30 * network.rewardConstant / network.epoch) * network.tokenPrice;
- revenueStaking += network.p2pStaked * network.rewardPercentage * network.apr / 12.0;
- revenueStaking += network.nodeStartValue * network.apr / 12.0;
- revenueStaking = revenueStaking * network.tokenPrice;
+ var coinValue = 0;
+ coinValue += (30 * network.rewardConstant / network.epoch) * network.tokenPrice;
+ coinValue += (network.p2pStaked * network.apr * network.rewardPercentage) / (12.0*100*100);
+ coinValue += network.nodeStartValue * (network.apr - network.inflation) / 12.0;
+ revenueStaking = revenueStaking + coinValue * network.tokenPrice;
}
});
this.state.revenueStaking = revenueStaking;