Skip to content

fix KUSD in develop branch #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ark930 merged 1 commit into from
Sep 11, 2021
Merged

fix KUSD in develop branch #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions node/service/src/chain_spec/asgard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,7 @@ fn local_config_genesis(id: ParaId) -> GenesisConfig {
(x.clone(), CurrencyId::Token(TokenSymbol::ETH), ENDOWMENT * 4_000_000),
(x.clone(), CurrencyId::Token(TokenSymbol::KSM), ENDOWMENT * 4_000_000),
(x.clone(), CurrencyId::Token(TokenSymbol::ASG), ENDOWMENT * 4_000_000),
(x.clone(), CurrencyId::Token(TokenSymbol::KUSD), ENDOWMENT * 4_000_000),
(x.clone(), CurrencyId::Token(TokenSymbol::BNC), ENDOWMENT * 4_000_000),
(x.clone(), CurrencyId::Stable(TokenSymbol::KUSD), ENDOWMENT * 4_000_000),
(
x.clone(),
CurrencyId::VSBond(TokenSymbol::KSM, 3000, 13, 20),
Expand Down
3 changes: 2 additions & 1 deletion node/service/src/chain_spec/bifrost.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ fn development_config_genesis(id: ParaId) -> GenesisConfig {
.flat_map(|x| {
vec![
(x.clone(), CurrencyId::Stable(TokenSymbol::KUSD), ENDOWMENT * 10_000),
(x.clone(), CurrencyId::Token(TokenSymbol::KAR), ENDOWMENT * 10_000),
(x.clone(), CurrencyId::Token(TokenSymbol::KSM), ENDOWMENT),
]
})
Expand Down Expand Up @@ -181,8 +182,8 @@ fn local_config_genesis(id: ParaId) -> GenesisConfig {
.flat_map(|x| {
vec![
(x.clone(), CurrencyId::Stable(TokenSymbol::KUSD), ENDOWMENT * 10_000),
(x.clone(), CurrencyId::Token(TokenSymbol::KAR), ENDOWMENT * 10_000),
(x.clone(), CurrencyId::Token(TokenSymbol::KSM), ENDOWMENT * 4_000_000),
(x.clone(), CurrencyId::Token(TokenSymbol::BNC), ENDOWMENT * 4_000_000),
(
x.clone(),
CurrencyId::VSBond(TokenSymbol::KSM, 3000, 13, 20),
Expand Down
8 changes: 4 additions & 4 deletions runtime/common/src/xcm_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ fn native_currency_location(id: CurrencyId, para_id: ParaId) -> MultiLocation {
pub struct BifrostCurrencyIdConvert<T>(sp_std::marker::PhantomData<T>);
impl<T: Get<ParaId>> Convert<CurrencyId, Option<MultiLocation>> for BifrostCurrencyIdConvert<T> {
fn convert(id: CurrencyId) -> Option<MultiLocation> {
use CurrencyId::{Native, Token};
use CurrencyId::{Native, Stable, Token};
match id {
Token(TokenSymbol::KSM) => Some(X1(Parent)),
Native(TokenSymbol::ASG) | Native(TokenSymbol::BNC) =>
Expand All @@ -131,7 +131,7 @@ impl<T: Get<ParaId>> Convert<CurrencyId, Option<MultiLocation>> for BifrostCurre
Parachain(parachains::karura::ID),
GeneralKey(parachains::karura::KAR_KEY.to_vec()),
)),
Token(TokenSymbol::KUSD) => Some(X3(
Stable(TokenSymbol::KUSD) => Some(X3(
Parent,
Parachain(parachains::karura::ID),
GeneralKey(parachains::karura::KUSD_KEY.to_vec()),
Expand All @@ -142,7 +142,7 @@ impl<T: Get<ParaId>> Convert<CurrencyId, Option<MultiLocation>> for BifrostCurre
}
impl<T: Get<ParaId>> Convert<MultiLocation, Option<CurrencyId>> for BifrostCurrencyIdConvert<T> {
fn convert(location: MultiLocation) -> Option<CurrencyId> {
use CurrencyId::{Native, Token};
use CurrencyId::{Native, Stable, Token};
use TokenSymbol::*;
match location {
X1(Parent) => Some(Token(KSM)),
Expand All @@ -164,7 +164,7 @@ impl<T: Get<ParaId>> Convert<MultiLocation, Option<CurrencyId>> for BifrostCurre
if key == parachains::karura::KAR_KEY.to_vec() {
Some(Token(TokenSymbol::KAR))
} else if key == parachains::karura::KUSD_KEY.to_vec() {
Some(Token(TokenSymbol::KUSD))
Some(Stable(TokenSymbol::KUSD))
} else {
None
}
Expand Down