Release v1.3.0 (#974)

1xstj · web-flow · commit 6dc96b0bc1ad · 2025-04-01T20:27:02.000+03:00
diff --git a/node/src/chainspec/mainnet.rs b/node/src/chainspec/mainnet.rs
@@ -92,7 +92,16 @@ pub fn local_mainnet_config(chain_id: u64) -> Result<ChainSpec, String> {
 	properties.insert("tokenDecimals".into(), 18u32.into());
 	properties.insert("ss58Format".into(), tangle_primitives::MAINNET_SS58_PREFIX.into());
 
-	let endowment: Balance = 10_000_000 * UNIT;
+	let endowment: Balance = 10_000 * UNIT;
+
+	let mut endowed_accounts = mainnet::get_initial_endowed_accounts().0;
+	endowed_accounts.extend(vec![
+		(get_account_id_from_seed::<sr25519::Public>("Alice"), endowment),
+		(get_account_id_from_seed::<sr25519::Public>("Bob"), endowment),
+		(get_account_id_from_seed::<sr25519::Public>("Alice//stash"), endowment),
+		(get_account_id_from_seed::<sr25519::Public>("Bob//stash"), endowment),
+	]);
+
 	Ok(ChainSpec::builder(WASM_BINARY.expect("WASM not available"), Default::default())
 		.with_name("Local Tangle Mainnet")
 		.with_id("local-tangle-mainnet")
@@ -102,14 +111,7 @@ pub fn local_mainnet_config(chain_id: u64) -> Result<ChainSpec, String> {
 			// Initial validators
 			vec![authority_keys_from_seed("Alice"), authority_keys_from_seed("Bob")],
 			// Endowed accounts
-			vec![
-				(get_account_id_from_seed::<sr25519::Public>("Alice"), endowment),
-				(get_account_id_from_seed::<sr25519::Public>("Bob"), endowment),
-				(get_account_id_from_seed::<sr25519::Public>("Charlie"), endowment),
-				(get_account_id_from_seed::<sr25519::Public>("Alice//stash"), endowment),
-				(get_account_id_from_seed::<sr25519::Public>("Bob//stash"), endowment),
-				(get_account_id_from_seed::<sr25519::Public>("Charlie//stash"), endowment),
-			],
+			endowed_accounts,
 			// Sudo account
 			get_account_id_from_seed::<sr25519::Public>("Alice"),
 			// EVM chain ID
@@ -119,12 +121,14 @@ pub fn local_mainnet_config(chain_id: u64) -> Result<ChainSpec, String> {
 				mainnet::get_edgeware_genesis_balance_distribution(),
 				mainnet::get_leaderboard_balance_distribution(),
 				mainnet::get_edgeware_snapshot_distribution(),
+				mainnet::get_polkadot_validator_distribution(),
 			]),
 			// Genesis investor / team distribution (pallet-balances + pallet-vesting)
 			combine_distributions(vec![
 				mainnet::get_team_balance_distribution(),
-				mainnet::get_investor_balance_distribution(),
 				mainnet::get_team_direct_vesting_distribution(),
+				mainnet::get_investor_balance_distribution(),
+				mainnet::get_foundation_balance_distribution(),
 			]),
 			Default::default(),
 		))
diff --git a/pallets/multi-asset-delegation/src/lib.rs b/pallets/multi-asset-delegation/src/lib.rs
@@ -159,10 +159,6 @@ pub mod pallet {
 		#[pallet::constant]
 		type MinDelegateAmount: Get<BalanceOf<Self>>;
 
-		/// The duration for which the stake is locked.
-		#[pallet::constant]
-		type BondDuration: Get<RoundIndex>;
-
 		/// The service manager that manages active services.
 		type ServiceManager: ServiceManager<Self::AccountId, BalanceOf<Self>>;
 
diff --git a/pallets/multi-asset-delegation/src/mock.rs b/pallets/multi-asset-delegation/src/mock.rs
@@ -311,7 +311,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub const MaxLocks: u32 = 50;
 	pub const MinOperatorBondAmount: u64 = 10_000;
-	pub const BondDuration: u32 = 10;
+
 	pub PID: PalletId = PalletId(*b"PotStake");
 
 	pub const SlashRecipient: AccountId = AccountId32::new([1u8; 32]);
@@ -405,7 +405,7 @@ impl pallet_multi_asset_delegation::Config for Runtime {
 	type Currency = Balances;
 	type MinOperatorBondAmount = MinOperatorBondAmount;
 	type SlashRecipient = SlashRecipient;
-	type BondDuration = BondDuration;
+
 	type CurrencyToVote = U128CurrencyToVote;
 	type StakingInterface = Staking;
 	type ServiceManager = MockServiceManager;
diff --git a/pallets/rewards/src/mock.rs b/pallets/rewards/src/mock.rs
@@ -324,7 +324,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub const MaxLocks: u32 = 50;
 	pub const MinOperatorBondAmount: u64 = 10_000;
-	pub const BondDuration: u32 = 10;
+
 	pub PID: PalletId = PalletId(*b"PotStake");
 
 	#[derive(PartialEq, Eq, Clone, Copy, Debug, Encode, Decode, MaxEncodedLen, TypeInfo)]
diff --git a/pallets/services/src/mock.rs b/pallets/services/src/mock.rs
@@ -484,10 +484,6 @@ parameter_types! {
 	#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 	pub const MinOperatorBondAmount: Balance = 1_000;
 
-	#[derive(Default, Copy, Clone, Eq, PartialEq, RuntimeDebug, Encode, Decode, MaxEncodedLen, TypeInfo)]
-	#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
-	pub const BondDuration: u32 = 28;
-
 	#[derive(Default, Copy, Clone, Eq, PartialEq, RuntimeDebug, Encode, Decode, MaxEncodedLen, TypeInfo)]
 	#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 	pub const MaxDelegatorBlueprints: u32 = 10;
@@ -515,7 +511,6 @@ impl pallet_multi_asset_delegation::Config for Runtime {
 	type Currency = Balances;
 	type SlashRecipient = SlashRecipient;
 	type MinOperatorBondAmount = MinOperatorBondAmount;
-	type BondDuration = BondDuration;
 	type CurrencyToVote = U128CurrencyToVote;
 	type StakingInterface = Staking;
 	type ServiceManager = Services;
diff --git a/precompiles/multi-asset-delegation/src/mock.rs b/precompiles/multi-asset-delegation/src/mock.rs
@@ -318,7 +318,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub const MaxLocks: u32 = 50;
 	pub const MinOperatorBondAmount: u64 = 10_000;
-	pub const BondDuration: u32 = 10;
+
 	pub PID: PalletId = PalletId(*b"PotStake");
 
 	#[derive(PartialEq, Eq, Clone, Copy, Debug, Encode, Decode, MaxEncodedLen, TypeInfo)]
@@ -384,7 +384,7 @@ impl pallet_multi_asset_delegation::Config for Runtime {
 	type Currency = Balances;
 	type MinOperatorBondAmount = MinOperatorBondAmount;
 	type SlashRecipient = SlashRecipient;
-	type BondDuration = BondDuration;
+
 	type CurrencyToVote = ();
 	type StakingInterface = Staking;
 	type ServiceManager = MockServiceManager;
diff --git a/precompiles/rewards/src/mock.rs b/precompiles/rewards/src/mock.rs
@@ -294,7 +294,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub const MaxLocks: u32 = 50;
 	pub const MinOperatorBondAmount: u64 = 10_000;
-	pub const BondDuration: u32 = 10;
+
 	pub PID: PalletId = PalletId(*b"PotStake");
 
 	#[derive(PartialEq, Eq, Clone, Copy, Debug, Encode, Decode, MaxEncodedLen, TypeInfo)]
@@ -317,7 +317,7 @@ impl pallet_multi_asset_delegation::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type MinOperatorBondAmount = MinOperatorBondAmount;
-	type BondDuration = BondDuration;
+
 	type ServiceManager = MockServiceManager;
 	type LeaveOperatorsDelay = ConstU32<10>;
 	type EvmRunner = MockedEvmRunner;
diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs
@@ -1039,8 +1039,8 @@ impl pallet_tx_pause::Config for Runtime {
 }
 
 parameter_types! {
-	pub const BasicDeposit: Balance = deposit(0, 100);
-	pub const ByteDeposit: Balance = deposit(0, 100);
+	pub const BasicDeposit: Balance = deposit(0, 10);
+	pub const ByteDeposit: Balance = deposit(0, 10);
 	pub const SubAccountDeposit: Balance = deposit(1, 1);
 	pub const MaxSubAccounts: u32 = 100;
 	#[derive(Serialize, Deserialize)]
@@ -1200,9 +1200,9 @@ impl pallet_proxy::Config for Runtime {
 }
 
 parameter_types! {
-	pub const AssetDeposit: Balance = 10 * UNIT;
-	pub const AssetAccountDeposit: Balance = DOLLAR;
-	pub const ApprovalDeposit: Balance = ExistentialDeposit::get();
+	pub const AssetDeposit: Balance = 0;
+	pub const AssetAccountDeposit: Balance = 0;
+	pub const ApprovalDeposit: Balance = 0;
 	pub const AssetsStringLimit: u32 = 50;
 	// set to zero since only the LST pallet is allowed to create assets
 	pub const MetadataDepositBase: Balance = 0;
@@ -1215,12 +1215,6 @@ pub type AssetId = u128;
 #[cfg(feature = "runtime-benchmarks")]
 pub type AssetId = u32;
 
-// impl tangle_primitives::traits::NextAssetId<AssetId> for Runtime {
-// 	fn next_asset_id() -> Option<AssetId> {
-// 		pallet_assets::NextAssetId::<Runtime, GeneralAssetsInstance>::get()
-// 	}
-// }
-
 ord_parameter_types! {
 	pub const LstPalletOrigin: sp_runtime::AccountId32 =
 		AccountIdConversion::<sp_runtime::AccountId32>::into_account_truncating(&LstPalletId::get());
@@ -1237,7 +1231,7 @@ impl pallet_assets::Config<LstPoolAssetsInstance> for Runtime {
 	// only lst pallet can create pool tokens
 	type CreateOrigin =
 		AsEnsureOriginWithArg<EnsureSignedBy<LstPalletOrigin, sp_runtime::AccountId32>>;
-	type ForceOrigin = frame_system::EnsureRoot<Self::AccountId>;
+	type ForceOrigin = EnsureRootOrHalfCouncil;
 	type AssetDeposit = AssetDeposit;
 	type AssetAccountDeposit = AssetAccountDeposit;
 	type MetadataDepositBase = MetadataDepositBase;
@@ -1254,39 +1248,58 @@ impl pallet_assets::Config<LstPoolAssetsInstance> for Runtime {
 }
 
 parameter_types! {
-	pub const MinOperatorBondAmount: Balance = 10_000;
-	pub const BondDuration: u32 = 10;
-	pub const MinDelegateAmount : Balance = 1000;
+	// Min operator bond amount to `join_operators`
+	pub const MinOperatorBondAmount: Balance = 10 * UNIT;
+	// Min delegate amount to `delegate`
+	pub const MinDelegateAmount : Balance = 10 * UNIT;
+	// Time delay for leaving operators, time between `schedule_leave_operators` and `execute_leave_operators`
+	pub const LeaveOperatorsDelay: u32 = 14;
+	// Time delay for reducing operator bond
+	pub const OperatorBondLessDelay: u32 = 14;
+	// Time delay for leaving delegators, time between `schedule_withdraw` and `execute_withdraw`
+	pub const LeaveDelegatorsDelay: u32 = 7;
+	// Time delay for reducing delegation bond, time between `schedule_delegator_unstake` and `execute_delegator_unstake`
+	pub const DelegationBondLessDelay: u32 = 7;
+
 	pub PID: PalletId = PalletId(*b"PotStake");
+
+	// Max number of blueprints a delegator can have in Fixed mode per operator
 	#[derive(PartialEq, Eq, Clone, Copy, Debug, Encode, Decode, MaxEncodedLen, TypeInfo)]
-	pub const MaxDelegatorBlueprints : u32 = 50;
+	pub const MaxDelegatorBlueprints : u32 = 16;
+
+	// Max number of blueprints an operator can support
 	#[derive(PartialEq, Eq, Clone, Copy, Debug, Encode, Decode, MaxEncodedLen, TypeInfo)]
-	pub const MaxOperatorBlueprints : u32 = 50;
+	pub const MaxOperatorBlueprints : u32 = 16;
+
+	// Max number of withdraw requests a delegator can have
 	#[derive(PartialEq, Eq, Clone, Copy, Debug, Encode, Decode, MaxEncodedLen, TypeInfo)]
-	pub const MaxWithdrawRequests: u32 = 5;
+	pub const MaxWithdrawRequests: u32 = 8;
+
+	// Max number of unstake requests a delegator can have
 	#[derive(PartialEq, Eq, Clone, Copy, Debug, Encode, Decode, MaxEncodedLen, TypeInfo)]
-	pub const MaxUnstakeRequests: u32 = 5;
+	pub const MaxUnstakeRequests: u32 = 8;
+
+	// Max number of delegations a delegator can have
 	#[derive(PartialEq, Eq, Clone, Copy, Debug, Encode, Decode, MaxEncodedLen, TypeInfo)]
-	pub const MaxDelegations: u32 = 50;
+	pub const MaxDelegations: u32 = 64;
 }
 
 impl pallet_multi_asset_delegation::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type SlashRecipient = TreasuryAccount;
 	type MinOperatorBondAmount = MinOperatorBondAmount;
-	type BondDuration = BondDuration;
 	type CurrencyToVote = U128CurrencyToVote;
 	type StakingInterface = Staking;
 	type ServiceManager = Services;
-	type LeaveOperatorsDelay = ConstU32<10>;
-	type OperatorBondLessDelay = ConstU32<1>;
-	type LeaveDelegatorsDelay = ConstU32<1>;
-	type DelegationBondLessDelay = ConstU32<5>;
+	type LeaveOperatorsDelay = LeaveOperatorsDelay;
+	type OperatorBondLessDelay = OperatorBondLessDelay;
+	type LeaveDelegatorsDelay = LeaveDelegatorsDelay;
+	type DelegationBondLessDelay = DelegationBondLessDelay;
 	type MinDelegateAmount = MinDelegateAmount;
 	type Fungibles = Assets;
 	type AssetId = AssetId;
-	type ForceOrigin = frame_system::EnsureRoot<Self::AccountId>;
+	type ForceOrigin = EnsureRootOrHalfCouncil;
 	type PalletId = PID;
 	type MaxDelegatorBlueprints = MaxDelegatorBlueprints;
 	type MaxOperatorBlueprints = MaxOperatorBlueprints;
@@ -1301,8 +1314,9 @@ impl pallet_multi_asset_delegation::Config for Runtime {
 }
 
 parameter_types! {
+	// `PostUnbondingPoolsWindow` taken from polkadot runtime
 	pub const PostUnbondingPoolsWindow: u32 = 2;
-	pub const MaxMetadataLen: u32 = 2;
+	pub const MaxMetadataLen: u32 = 256;
 	pub const CheckLevel: u8 = 255;
 	pub const LstPalletId: PalletId = PalletId(*b"py/tnlst");
 }
@@ -1326,15 +1340,15 @@ impl pallet_tangle_lst::Config for Runtime {
 	type Fungibles = Assets;
 	type AssetId = AssetId;
 	type PoolId = AssetId;
-	type ForceOrigin = frame_system::EnsureRoot<AccountId>;
+	type ForceOrigin = EnsureRootOrHalfCouncil;
 	type MaxPointsToBalance = frame_support::traits::ConstU8<10>;
 }
 
 parameter_types! {
 	pub const RewardsPID: PalletId = PalletId(*b"py/tnrew");
 	pub const MaxDepositCap: u128 = UNIT * 100_000_000;
 	pub const MaxIncentiveCap: u128 = UNIT * 100_000_000;
-	pub const MaxApy: Perbill = Perbill::from_percent(20);
+	pub const MaxApy: Perbill = Perbill::from_percent(2);
 	pub const MinDepositCap: u128 = 0;
 	pub const MinIncentiveCap: u128 = 0;
 }
@@ -1346,7 +1360,7 @@ impl pallet_rewards::Config for Runtime {
 	type PalletId = RewardsPID;
 	type VaultId = u32;
 	type DelegationManager = MultiAssetDelegation;
-	type ForceOrigin = frame_system::EnsureRoot<AccountId>;
+	type ForceOrigin = EnsureRootOrHalfCouncil;
 	type MaxApy = MaxApy;
 	type MaxDepositCap = MaxDepositCap;
 	type MaxIncentiveCap = MaxIncentiveCap;
diff --git a/runtime/mainnet/src/migrations/investor_team_vesting_migration_11302024.rs b/runtime/mainnet/src/migrations/investor_team_vesting_migration_11302024.rs
diff --git a/runtime/mainnet/src/migrations/staking_team_reduction_03062025.rs b/runtime/mainnet/src/migrations/staking_team_reduction_03062025.rs
diff --git a/runtime/mainnet/src/tangle_services.rs b/runtime/mainnet/src/tangle_services.rs
diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs
