Remove just solana

genzstaking · Oct 11, 2022 · a667238 · a667238
1 parent 9bfeffe
commit a667238
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 7 deletions.
diff --git a/_businesses/staking.html b/_businesses/staking.html
@@ -103,6 +103,7 @@ <h2>Calculator</h2>
 
 	"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 → _drafts/cardano.html b/_networks/cardano.html → _drafts/cardano.html
diff --git a/_networks/cosmos.html → _drafts/cosmos.html b/_networks/cosmos.html → _drafts/cosmos.html
diff --git a/_networks/csc.html → _drafts/csc.html b/_networks/csc.html → _drafts/csc.html
diff --git a/_networks/elrond.html → _drafts/elrond.html b/_networks/elrond.html → _drafts/elrond.html
diff --git a/_networks/kava.html → _drafts/kava.html b/_networks/kava.html → _drafts/kava.html
diff --git a/_networks/kusama.html → _drafts/kusama.html b/_networks/kusama.html → _drafts/kusama.html
diff --git a/_networks/marlin.html → _drafts/marlin.html b/_networks/marlin.html → _drafts/marlin.html
diff --git a/_networks/mina.html → _drafts/mina.html b/_networks/mina.html → _drafts/mina.html
diff --git a/_networks/moonbeam.html → _drafts/moonbeam.html b/_networks/moonbeam.html → _drafts/moonbeam.html
diff --git a/_networks/moonriver.html → _drafts/moonriver.html b/_networks/moonriver.html → _drafts/moonriver.html
diff --git a/_networks/oasis.html → _drafts/oasis.html b/_networks/oasis.html → _drafts/oasis.html
diff --git a/_networks/persistence.html → _drafts/persistence.html b/_networks/persistence.html → _drafts/persistence.html
diff --git a/_networks/pocket.html → _drafts/pocket.html b/_networks/pocket.html → _drafts/pocket.html
diff --git a/_networks/polkadot.html → _drafts/polkadot.html b/_networks/polkadot.html → _drafts/polkadot.html
diff --git a/_networks/regen.html → _drafts/regen.html b/_networks/regen.html → _drafts/regen.html
diff --git a/_networks/threshold.html → _drafts/threshold.html b/_networks/threshold.html → _drafts/threshold.html
diff --git a/_networks/tron.html → _drafts/tron.html b/_networks/tron.html → _drafts/tron.html
diff --git a/_networks/solana.html 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
@@ -183,7 +183,7 @@
 	const MaintainCost_TEMPLATE = xml /* xml */`
 	<section 
 		class="container-fluid">
-		<h2>Setup Cost</h2>
+		<h2>Maintain Cost</h2>
 		<div>$$ Cost_{Maintain} = \SUM_{i=1}^{n} C_{Host} + [{n}/{N_{SPO}}]* C_{SPO} + [n/N_{IT}*C_{IT}] + C_{CTO} + C_{CEO} $$</div>
 		<p> Where: </p>
 
@@ -266,8 +266,8 @@
 		<h2>Staking Revenue Stream</h2>
 		<div>$$ 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  $$</div>
 		<p> Where: </p>
 
@@ -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;