diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs index b8a6f2a3d..489a5d693 100644 --- a/runtime/acala/src/lib.rs +++ b/runtime/acala/src/lib.rs @@ -98,9 +98,9 @@ pub use runtime_common::{ FinancialCouncilInstance, FinancialCouncilMembershipInstance, GasToWeight, GeneralCouncilInstance, GeneralCouncilMembershipInstance, HomaCouncilInstance, HomaCouncilMembershipInstance, MaxTipsOfPriority, OffchainSolutionWeightLimit, OperationalFeeMultiplier, OperatorMembershipInstanceAcala, Price, ProxyType, Rate, - Ratio, RelayChainBlockNumberProvider, RelayChainSubAccountId, RuntimeBlockLength, RuntimeBlockWeights, - SystemContractsFilter, TechnicalCommitteeInstance, TechnicalCommitteeMembershipInstance, TimeStampedPrice, - TipPerWeightStep, ACA, AUSD, DOT, LCDOT, LDOT, RENBTC, + Ratio, RelayChainBlockNumberProvider, RuntimeBlockLength, RuntimeBlockWeights, SystemContractsFilter, + TechnicalCommitteeInstance, TechnicalCommitteeMembershipInstance, TimeStampedPrice, TipPerWeightStep, ACA, AUSD, + DOT, LCDOT, LDOT, RENBTC, }; pub use xcm::latest::prelude::*; @@ -1452,7 +1452,9 @@ impl cumulus_pallet_aura_ext::Config for Runtime {} parameter_types! { pub DefaultExchangeRate: ExchangeRate = ExchangeRate::saturating_from_rational(1, 10); pub HomaTreasuryAccount: AccountId = HomaTreasuryPalletId::get().into_account(); - pub ActiveSubAccountsIndexList: Vec = vec![RelayChainSubAccountId::HomaLite as u16]; + pub ActiveSubAccountsIndexList: Vec = vec![ + 0, // 15sr8Dvq3AT3Z2Z1y8FnQ4VipekAHhmQnrkgzegUr1tNgbcn + ]; pub BondingDuration: EraIndex = 28; pub MintThreshold: Balance = 5 * dollar(DOT); pub RedeemThreshold: Balance = 50 * dollar(LDOT); diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 00e680c5b..749decbfe 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -344,11 +344,6 @@ impl Default for ProxyType { } } -#[repr(u16)] -pub enum RelayChainSubAccountId { - HomaLite = 0, -} - /// `DropAssets` implementation support asset amount lower thant ED handled by `TakeRevenue`. /// /// parameters type: diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs index f4f2f220d..8f4076ca5 100644 --- a/runtime/karura/src/lib.rs +++ b/runtime/karura/src/lib.rs @@ -98,9 +98,9 @@ pub use runtime_common::{ FinancialCouncilInstance, FinancialCouncilMembershipInstance, GasToWeight, GeneralCouncilInstance, GeneralCouncilMembershipInstance, HomaCouncilInstance, HomaCouncilMembershipInstance, MaxTipsOfPriority, OperationalFeeMultiplier, OperatorMembershipInstanceAcala, Price, ProxyType, Rate, Ratio, - RelayChainBlockNumberProvider, RelayChainSubAccountId, RuntimeBlockLength, RuntimeBlockWeights, - SystemContractsFilter, TechnicalCommitteeInstance, TechnicalCommitteeMembershipInstance, TimeStampedPrice, - TipPerWeightStep, BNC, KAR, KBTC, KINT, KSM, KUSD, LKSM, PHA, RENBTC, VSKSM, + RelayChainBlockNumberProvider, RuntimeBlockLength, RuntimeBlockWeights, SystemContractsFilter, + TechnicalCommitteeInstance, TechnicalCommitteeMembershipInstance, TimeStampedPrice, TipPerWeightStep, BNC, KAR, + KBTC, KINT, KSM, KUSD, LKSM, PHA, RENBTC, VSKSM, }; pub use xcm::latest::prelude::*; @@ -1466,7 +1466,11 @@ impl cumulus_pallet_aura_ext::Config for Runtime {} parameter_types! { pub DefaultExchangeRate: ExchangeRate = ExchangeRate::saturating_from_rational(1, 10); pub HomaTreasuryAccount: AccountId = HomaTreasuryPalletId::get().into_account(); - pub ActiveSubAccountsIndexList: Vec = vec![RelayChainSubAccountId::HomaLite as u16]; + pub ActiveSubAccountsIndexList: Vec = vec![ + 0, // HTAeD1dokCVs9MwnC1q9s2a7d2kQ52TAjrxE1y5mj5MFLLA + 1, // FDVu3RdH5WsE2yTdXN3QMq6v1XVDK8GKjhq5oFjXe8wZYpL + 2, // EMrKvFy7xLgzzdgruXT9oXERt553igEScqgSjoDm3GewPSA + ]; pub BondingDuration: EraIndex = 28; pub MintThreshold: Balance = dollar(KSM); pub RedeemThreshold: Balance = 10 * dollar(LKSM); diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs index 4415a94a7..43a98e7e4 100644 --- a/runtime/mandala/src/lib.rs +++ b/runtime/mandala/src/lib.rs @@ -106,9 +106,9 @@ pub use runtime_common::{ FinancialCouncilInstance, FinancialCouncilMembershipInstance, GasToWeight, GeneralCouncilInstance, GeneralCouncilMembershipInstance, HomaCouncilInstance, HomaCouncilMembershipInstance, MaxTipsOfPriority, OffchainSolutionWeightLimit, OperationalFeeMultiplier, OperatorMembershipInstanceAcala, Price, ProxyType, Rate, - Ratio, RelayChainBlockNumberProvider, RelayChainSubAccountId, RuntimeBlockLength, RuntimeBlockWeights, - SystemContractsFilter, TechnicalCommitteeInstance, TechnicalCommitteeMembershipInstance, TimeStampedPrice, - TipPerWeightStep, ACA, AUSD, DOT, KSM, LDOT, RENBTC, + Ratio, RelayChainBlockNumberProvider, RuntimeBlockLength, RuntimeBlockWeights, SystemContractsFilter, + TechnicalCommitteeInstance, TechnicalCommitteeMembershipInstance, TimeStampedPrice, TipPerWeightStep, ACA, AUSD, + DOT, KSM, LDOT, RENBTC, }; pub use xcm::latest::prelude::*; @@ -1307,7 +1307,9 @@ pub fn create_x2_parachain_multilocation(index: u16) -> MultiLocation { parameter_types! { pub HomaTreasuryAccount: AccountId = HomaTreasuryPalletId::get().into_account(); - pub ActiveSubAccountsIndexList: Vec = vec![RelayChainSubAccountId::HomaLite as u16]; + pub ActiveSubAccountsIndexList: Vec = vec![ + 0, // 15sr8Dvq3AT3Z2Z1y8FnQ4VipekAHhmQnrkgzegUr1tNgbcn + ]; pub RelayChainBondingDuration: EraIndex = 28; pub MintThreshold: Balance = dollar(DOT); pub RedeemThreshold: Balance = 10 * dollar(LDOT);