feat: set address prefixes (#398)

tangle-network · Jan 4, 2024 · a2acee0 · a2acee0
1 parent a89445d
commit a2acee0
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 32 deletions.
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tangle"
 build = "build.rs"
-description = "Tangle Standalone chain node"
+description = "Tangle chain node"
 version = { workspace = true }
 authors = { workspace = true }
 edition = { workspace = true }

diff --git a/node/src/chainspec/mainnet.rs b/node/src/chainspec/mainnet.rs
@@ -92,7 +92,7 @@ pub fn local_mainnet_config(chain_id: u64) -> Result<ChainSpec, String> {
 	let mut properties = sc_chain_spec::Properties::new();
 	properties.insert("tokenSymbol".into(), "TNT".into());
 	properties.insert("tokenDecimals".into(), 18u32.into());
-	properties.insert("ss58Format".into(), 4006.into());
+	properties.insert("ss58Format".into(), tangle_primitives::MAINNET_SS58_PREFIX.into());
 
 	Ok(ChainSpec::from_genesis(
 		"Local Tangle Mainnet",
@@ -112,6 +112,9 @@ pub fn local_mainnet_config(chain_id: u64) -> Result<ChainSpec, String> {
 					get_account_id_from_seed::<sr25519::Public>("Alice"),
 					get_account_id_from_seed::<sr25519::Public>("Bob"),
 					get_account_id_from_seed::<sr25519::Public>("Charlie"),
+					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+					get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
 				],
 				// Sudo account
 				get_account_id_from_seed::<sr25519::Public>("Alice"),
@@ -151,7 +154,7 @@ pub fn tangle_mainnet_config(chain_id: u64) -> Result<ChainSpec, String> {
 	let mut properties = sc_chain_spec::Properties::new();
 	properties.insert("tokenSymbol".into(), "TNT".into());
 	properties.insert("tokenDecimals".into(), 18u32.into());
-	properties.insert("ss58Format".into(), 4006.into());
+	properties.insert("ss58Format".into(), tangle_primitives::MAINNET_SS58_PREFIX.into());
 
 	Ok(ChainSpec::from_genesis(
 		"Tangle Mainnet",

diff --git a/node/src/chainspec/testnet.rs b/node/src/chainspec/testnet.rs
@@ -36,9 +36,9 @@ use tangle_crypto_primitives::crypto::AuthorityId as RoleKeyId;
 use tangle_primitives::types::BlockNumber;
 use tangle_testnet_runtime::{
 	AccountId, BabeConfig, Balance, BalancesConfig, ClaimsConfig, EVMChainIdConfig, EVMConfig,
-	ElectionsConfig, Eth2ClientConfig, ImOnlineConfig, MaxNominations, MaxVestingSchedules,
-	Perbill, RuntimeGenesisConfig, SessionConfig, Signature, StakerStatus, StakingConfig,
-	SudoConfig, SystemConfig, TreasuryPalletId, UNIT, WASM_BINARY,
+	ElectionsConfig, Eth2ClientConfig, ImOnlineConfig, MaxVestingSchedules, Perbill,
+	RuntimeGenesisConfig, SessionConfig, Signature, StakerStatus, StakingConfig, SudoConfig,
+	SystemConfig, TreasuryPalletId, UNIT, WASM_BINARY,
 };
 use webb_consensus_types::network_config::{Network, NetworkConfig};
 
@@ -93,7 +93,7 @@ pub fn local_testnet_config(chain_id: u64) -> Result<ChainSpec, String> {
 	let mut properties = sc_chain_spec::Properties::new();
 	properties.insert("tokenSymbol".into(), "tTNT".into());
 	properties.insert("tokenDecimals".into(), 18u32.into());
-	properties.insert("ss58Format".into(), 42.into());
+	properties.insert("ss58Format".into(), tangle_primitives::TESTNET_SS58_PREFIX.into());
 
 	Ok(ChainSpec::from_genesis(
 		// Name
@@ -124,11 +124,8 @@ pub fn local_testnet_config(chain_id: u64) -> Result<ChainSpec, String> {
 					get_account_id_from_seed::<sr25519::Public>("Eve"),
 				],
 				chain_id,
-				combine_distributions(vec![
-					develop::get_evm_balance_distribution(),
-					testnet::get_evm_balance_distribution(),
-				]),
-				testnet::get_substrate_balance_distribution(),
+				vec![],
+				vec![],
 				true,
 			)
 		},
@@ -153,12 +150,12 @@ pub fn tangle_testnet_config(chain_id: u64) -> Result<ChainSpec, String> {
 	let mut properties = sc_chain_spec::Properties::new();
 	properties.insert("tokenSymbol".into(), "tTNT".into());
 	properties.insert("tokenDecimals".into(), 18u32.into());
-	properties.insert("ss58Format".into(), 42.into());
+	properties.insert("ss58Format".into(), tangle_primitives::TESTNET_SS58_PREFIX.into());
 
 	Ok(ChainSpec::from_genesis(
-		"Tangle Standalone Testnet",
+		"Tangle Testnet",
 		"tangle-testnet",
-		ChainType::Development,
+		ChainType::Live,
 		move || {
 			testnet_genesis(
 				wasm_binary,
@@ -225,7 +222,7 @@ pub fn tangle_testnet_config(chain_id: u64) -> Result<ChainSpec, String> {
 fn testnet_genesis(
 	wasm_binary: &[u8],
 	initial_authorities: Vec<(AccountId, BabeId, GrandpaId, ImOnlineId, RoleKeyId)>,
-	initial_nominators: Vec<AccountId>,
+	_initial_nominators: Vec<AccountId>,
 	root_key: AccountId,
 	endowed_accounts: Vec<AccountId>,
 	chain_id: u64,
@@ -237,22 +234,12 @@ fn testnet_genesis(
 	const STASH: Balance = ENDOWMENT / 100;
 
 	// stakers: all validators and nominators.
-	let mut rng = rand::thread_rng();
+	let _rng = rand::thread_rng();
+	// stakers: all validators and nominators.
 	let stakers = initial_authorities
 		.iter()
-		.map(|x| (x.0.clone(), x.0.clone(), STASH, StakerStatus::Validator))
-		.chain(initial_nominators.iter().map(|x| {
-			use rand::{seq::SliceRandom, Rng};
-			let limit = (MaxNominations::get() as usize).min(initial_authorities.len());
-			let count = rng.gen::<usize>() % limit;
-			let nominations = initial_authorities
-				.as_slice()
-				.choose_multiple(&mut rng, count)
-				.map(|choice| choice.0.clone())
-				.collect::<Vec<_>>();
-			(x.clone(), x.clone(), STASH, StakerStatus::Nominator(nominations))
-		}))
-		.collect::<Vec<_>>();
+		.map(|x| (x.0.clone(), x.0.clone(), UNIT, StakerStatus::Validator))
+		.collect();
 
 	let num_endowed_accounts = endowed_accounts.len();
 	let claims: Vec<(MultiAddress, Balance, Option<StatementKind>)> = endowed_accounts

diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs
@@ -288,3 +288,11 @@ pub const MAXIMUM_BLOCK_WEIGHT: Weight =
 	Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND, MAX_POV_SIZE as u64);
 
 pub use sp_consensus_babe::AuthorityId as BabeId;
+
+// 5845 this would give us addresses with tg prefix for mainnet like
+// tgGmBRR5yM53bvq8tTzgsUirpPtfCXngYYU7uiihmWFJhmYGM
+pub const MAINNET_SS58_PREFIX: u16 = 5845;
+
+// 3799 this would give us addresses with  tt prefix for testnet like
+// ttFELSU4MTyzpfsgZ9tFinrmox7pV7nF1BLbfYjsu4rfDYM74
+pub const TESTNET_SS58_PREFIX: u16 = 3799;
diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs
@@ -165,7 +165,7 @@ parameter_types! {
 		::with_sensible_defaults(MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO);
 	pub BlockLength: frame_system::limits::BlockLength = frame_system::limits::BlockLength
 		::max_with_normal_ratio(MAXIMUM_BLOCK_LENGTH, NORMAL_DISPATCH_RATIO);
-	pub const SS58Prefix: u8 = 42;
+	pub const SS58Prefix: u16 = tangle_primitives::MAINNET_SS58_PREFIX;
 }
 
 /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know

diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs
@@ -177,7 +177,7 @@ parameter_types! {
 		::with_sensible_defaults(MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO);
 	pub BlockLength: frame_system::limits::BlockLength = frame_system::limits::BlockLength
 		::max_with_normal_ratio(MAXIMUM_BLOCK_LENGTH, NORMAL_DISPATCH_RATIO);
-	pub const SS58Prefix: u8 = 42;
+	pub const SS58Prefix: u16 = tangle_primitives::TESTNET_SS58_PREFIX;
 }
 
 /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know