fix: endowment txfee amount for for locked balances (#561)

* split to mainnet/testnet

* fix: endowment txfee amount for inv and team

* Revert "split to mainnet/testnet"

This reverts commit a74c15f.

* add evm endowment

node/src/chainspec/mainnet.rs

@@ -22,19 +22,21 @@ use crate::{
 	},
 	mainnet_fixtures::{get_bootnodes, get_initial_authorities, get_root_key},
 };
-
 use hex_literal::hex;
 use pallet_airdrop_claims::MultiAddress;
 use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
+use parity_scale_codec::alloc::collections::BTreeMap;
 use sc_consensus_grandpa::AuthorityId as GrandpaId;
 use sc_service::ChainType;
 use sp_consensus_babe::AuthorityId as BabeId;
+use sp_core::H160;
 use sp_core::{sr25519, Pair, Public};
 use sp_runtime::{
 	traits::{AccountIdConversion, IdentifyAccount, Verify},
 	BoundedVec,
 };
 use tangle_primitives::types::{BlockNumber, Signature};
+use tangle_runtime::EVMConfig;
 use tangle_runtime::{
 	AccountId, BabeConfig, Balance, BalancesConfig, ClaimsConfig, CouncilConfig, EVMChainIdConfig,
 	ImOnlineConfig, MaxVestingSchedules, Perbill, RoleKeyId, RuntimeGenesisConfig, SessionConfig,
@@ -130,6 +132,7 @@ pub fn local_mainnet_config(chain_id: u64) -> Result<ChainSpec, String> {
 					mainnet::get_investor_balance_distribution(),
 					mainnet::get_team_direct_vesting_distribution(),
 				]),
+				Default::default(),
 			)
 		},
 		// Bootnodes
@@ -164,7 +167,7 @@ pub fn tangle_mainnet_config(chain_id: u64) -> Result<ChainSpec, String> {
 				// Initial validators
 				get_initial_authorities(),
 				// Endowed accounts
-				mainnet::get_initial_endowed_accounts(),
+				mainnet::get_initial_endowed_accounts().0,
 				// Sudo account
 				get_root_key(),
 				// EVM chain ID
@@ -182,6 +185,8 @@ pub fn tangle_mainnet_config(chain_id: u64) -> Result<ChainSpec, String> {
 					mainnet::get_investor_balance_distribution(),
 					mainnet::get_foundation_balance_distribution(),
 				]),
+				// endowed evm accounts
+				mainnet::get_initial_endowed_accounts().1,
 			)
 		},
 		// Bootnodes
@@ -209,6 +214,7 @@ fn mainnet_genesis(
 	chain_id: u64,
 	genesis_airdrop: DistributionResult,
 	genesis_non_airdrop: Vec<(MultiAddress, u128, u64, u64, u128)>,
+	genesis_evm_distribution: Vec<(H160, fp_evm::GenesisAccount)>,
 ) -> RuntimeGenesisConfig {
 	// stakers: all validators and nominators.
 	let stakers = initial_authorities
@@ -291,7 +297,16 @@ fn mainnet_genesis(
 		tx_pause: Default::default(),
 		// EVM compatibility
 		evm_chain_id: EVMChainIdConfig { chain_id, ..Default::default() },
-		evm: Default::default(),
+		evm: EVMConfig {
+			accounts: {
+				let mut map = BTreeMap::new();
+				for (address, account) in genesis_evm_distribution {
+					map.insert(address, account);
+				}
+				map
+			},
+			..Default::default()
+		},
 		ethereum: Default::default(),
 		dynamic_fee: Default::default(),
 		base_fee: Default::default(),

node/src/distributions/data/webb_team_distributions.json

@@ -9,5 +9,5 @@
     "5FEb3bjP4KsFpet1sf81MerFqmTjTx8db2H3WctwvmB75At8": 250000000000000000000000,
     "5F7UEB6Lo141pHYS1ySPf4UDTkuBEimSZmV9uehYJvXbc4CW": 150000000000000000000000,
     "5H4RzH7KC1UZYwwNGgxmUEuahzYK21UJibS5jNkupHbLToqw": 30000000000000000000000,
-    "5FH32Ro5cTpLE1FhP3skdi16UuVariyzoQfyK7vvjE2CHEtX": 28866849310000000021066368
+    "5FH32Ro5cTpLE1FhP3skdi16UuVariyzoQfyK7vvjE2CHEtX": 28861949310000000021066368
 }

node/src/distributions/mainnet.rs

@@ -22,6 +22,7 @@ use crate::mainnet_fixtures::{get_initial_authorities, get_root_key};
 use hex_literal::hex;
 use pallet_airdrop_claims::{EthereumAddress, MultiAddress, StatementKind};
 use sp_core::H160;
+use sp_core::U256;
 use sp_runtime::{traits::AccountIdConversion, AccountId32};
 use std::{collections::BTreeMap, str::FromStr};
 use tangle_primitives::types::BlockNumber;
@@ -259,8 +260,9 @@ pub fn get_substrate_balance_distribution() -> DistributionResult {
 pub fn get_investor_balance_distribution() -> Vec<(MultiAddress, u128, u64, u64, u128)> {
 	let investor_accounts: Vec<(MultiAddress, u128)> = get_investor_balance_distribution_list()
 		.into_iter()
-		.map(|(address, balance)| (address, balance as u128))
+		.map(|(address, balance)| (address, balance as u128 - 100 * UNIT)) // we reduce 100TNT from all investor balance since 100TNT has been paid out as endowment for txfees
 		.collect();
+
 	compute_balance_distribution_with_cliff_and_vesting_no_endowment(investor_accounts)
 }
 
@@ -276,13 +278,15 @@ pub fn get_team_direct_vesting_distribution() -> Vec<(MultiAddress, u128, u64, u
 pub fn get_team_balance_distribution() -> Vec<(MultiAddress, u128, u64, u64, u128)> {
 	let team_accounts: Vec<(MultiAddress, u128)> = get_team_vesting_accounts()
 		.into_iter()
-		.map(|(address, balance)| (MultiAddress::Native(address), balance as u128))
+		.map(|(address, balance)| (MultiAddress::Native(address), balance as u128 - 100 * UNIT)) // we reduce 100TNT from all team balance since 100TNT has been paid out as endowment for txfees
 		.collect();
 	compute_balance_distribution_with_cliff_and_vesting(team_accounts)
 }
 
-pub fn get_initial_endowed_accounts() -> Vec<(AccountId, u128)> {
+pub fn get_initial_endowed_accounts(
+) -> (Vec<(AccountId, u128)>, Vec<(H160, fp_evm::GenesisAccount)>) {
 	let mut endowed_accounts = vec![];
+	let mut endowed_evm_accounts = vec![];
 
 	let pallet_id = tangle_primitives::treasury::TREASURY_PALLET_ID;
 	let acc: AccountId = pallet_id.into_account_truncating();
@@ -296,7 +300,29 @@ pub fn get_initial_endowed_accounts() -> Vec<(AccountId, u128)> {
 		endowed_accounts.push((acco.clone(), 100 * UNIT));
 	}
 
-	endowed_accounts
+	// all team and investor accounts get 100 TNT
+	for (inv_account, _) in get_investor_balance_distribution_list() {
+		match inv_account {
+			MultiAddress::Native(account) => {
+				endowed_accounts.push((account, 100 * UNIT));
+			},
+			MultiAddress::EVM(account) => endowed_evm_accounts.push((
+				H160::from_slice(&account.0),
+				fp_evm::GenesisAccount {
+					nonce: U256::from(1),
+					balance: U256::from(100 * UNIT),
+					storage: Default::default(),
+					code: Default::default(),
+				},
+			)),
+		}
+	}
+
+	for (team_account, _) in get_team_vesting_accounts() {
+		endowed_accounts.push((team_account, 100 * UNIT));
+	}
+
+	(endowed_accounts, endowed_evm_accounts)
 }
 
 pub fn get_foundation_balance_distribution() -> Vec<(MultiAddress, u128, u64, u64, u128)> {
@@ -490,17 +516,22 @@ fn test_get_distribution_for() {
 #[test]
 fn test_distribution_shares() {
 	// ============== compute total investor amount and share of distribution ================= //
-	let investor_accounts: Vec<(MultiAddress, u128)> = get_investor_balance_distribution_list()
+
+	let investor_balance_account_distribution = get_investor_balance_distribution();
+	let total_investor_amount: u128 = investor_balance_account_distribution
+		.clone()
 		.into_iter()
-		.map(|(address, balance)| (address, balance as u128))
-		.collect();
+		.map(|(_, amount, _, _, _)| amount)
+		.sum();
 
-	let total_investor_amount =
-		investor_accounts.into_iter().map(|(_address, balance)| balance).sum();
+	let investor_endowed_balance: u128 = investor_balance_account_distribution
+		.into_iter()
+		.map(|(_, _, _, _, _)| 100 * UNIT)
+		.sum();
 
-	assert_eq!(total_investor_amount, 13639999999999999916113920); // 13639999 TNT
+	assert_eq!(total_investor_amount + investor_endowed_balance, 13639999999999999916113920); // 13639999 TNT
 	assert_eq!(
-		Perbill::from_rational(total_investor_amount, TOTAL_SUPPLY),
+		Perbill::from_rational(total_investor_amount + investor_endowed_balance, TOTAL_SUPPLY),
 		Perbill::from_float(0.136399999)
 	); // 13.6399999%
 
@@ -641,15 +672,19 @@ fn test_distribution_shares() {
 		.sum();
 
 	//println!("Remaining total team amount {:?}", 30000000000000000000000000 - total_team_claims_amount - total_direct_team_amount);
-	assert_eq!(total_team_claims_amount, 29861849309999998364024832); // 29861849 TNT
+	assert_eq!(total_team_claims_amount, 29855849309999998197301248); // 29861849 TNT
 	assert_eq!(
 		Perbill::from_rational(total_team_claims_amount, TOTAL_SUPPLY),
-		Perbill::from_float(0.298618493)
-	); // 29.8618493%
+		Perbill::from_float(0.298558493)
+	); // 29.8558493%
+
+	// ================= compute intial endowment at genesis ========================= //
+	let total_endowmwnent: u128 =
+		get_initial_endowed_accounts().0.into_iter().map(|(_, amount)| amount).sum();
+	assert_eq!(total_endowmwnent - total_treasury_amount, 8900000000000000000000); // 8900 TNT
 
 	let total_genesis_endowment = total_investor_amount
 		+ total_direct_team_amount
-		+ total_treasury_amount
 		+ foundation_total_amount
 		+ total_edgeware_claims_amount
 		+ total_edgeware_vesting_amount
@@ -659,9 +694,10 @@ fn test_distribution_shares() {
 		+ total_leaderboard_vesting_amount
 		+ total_polkadot_claims_amount
 		+ total_polkadot_vesting_amount
-		+ total_team_claims_amount;
+		+ total_team_claims_amount
+		+ total_endowmwnent;
 
-	assert_eq!(total_genesis_endowment, 100000000000000006126452714); // 100000000 TNT
+	assert_eq!(total_genesis_endowment, 100000000000000005959729130); // 100000000 TNT
 	assert_eq!(Perbill::from_rational(total_genesis_endowment, TOTAL_SUPPLY), Perbill::one());
 	// 100%
 }