Skip to content
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

Jump to bottom

change ausd to kusd #225

Merged
merged 7 commits into from
Aug 17, 2021
Merged

change ausd to kusd #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c15f40c
change ausd to kusd
herryho Aug 16, 2021
f25ff2c
feat: 🎸 add Treasury and Bounties at bifrost runtime (#224)
yooml Aug 16, 2021
4b957a2
change ausd to kusd
herryho Aug 16, 2021
665c70c
resolve conflicts
herryho Aug 16, 2021
fecb35e
resolve conflicts
herryho Aug 16, 2021
ce2f5ab
cargo +nightly fmt --all
herryho Aug 16, 2021
7566f4a
TokenSymbol description change from Acala dollar to Karura dollar
herryho Aug 17, 2021
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: 3 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 9 additions & 4 deletions docs/developer_setting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"TokenSymbol": {
"_enum": {
"ASG": 0,
"aUSD": 2,
"KUSD": 2,
"DOT": 3,
"KSM": 4,
"ETH": 5
Expand All @@ -22,7 +22,8 @@
"Token": "TokenSymbol",
"Stable": "TokenSymbol",
"VSToken": "TokenSymbol",
"VSBond": "(TokenSymbol, ParaId, LeasePeriod, LeasePeriod)"
"VSBond": "(TokenSymbol, ParaId, LeasePeriod, LeasePeriod)",
"LPToken": "(TokenSymbol, u8, TokenSymbol, u8)"
}
},
"CurrencyIdOf": "CurrencyId",
Expand Down Expand Up @@ -63,7 +64,11 @@
"order_state": "OrderState"
},
"OrderState": {
"_enum": ["InTrade", "Revoked", "Clinchd"]
"_enum": [
"InTrade",
"Revoked",
"Clinchd"
]
},
"AssetId": {
"chain_id": "u32",
Expand All @@ -81,4 +86,4 @@
"reserve_1": "AssetBalance",
"lp_asset_id": "AssetId"
}
}
}
2 changes: 1 addition & 1 deletion node/primitives/src/currency.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ create_currency_id! {
pub enum TokenSymbol {
ASG("Asgard", 12) = 0,
BNC("Bifrost", 12) = 1,
AUSD("Acala Dollar", 12) = 2,
KUSD("Karura Dollar", 12) = 2,
DOT("Polkadot", 10) = 3,
KSM("Kusama", 12) = 4,
ETH("Ethereum", 18) = 5,
Expand Down
24 changes: 12 additions & 12 deletions node/primitives/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fn currency_id_from_string_should_work() {
fn currency_id_to_u64_should_work() {
let e00 = CurrencyId::Native(TokenSymbol::ASG);
let e01 = CurrencyId::Native(TokenSymbol::BNC);
let e02 = CurrencyId::Native(TokenSymbol::AUSD);
let e02 = CurrencyId::Native(TokenSymbol::KUSD);
let e03 = CurrencyId::Native(TokenSymbol::DOT);
let e04 = CurrencyId::Native(TokenSymbol::KSM);
let e05 = CurrencyId::Native(TokenSymbol::ETH);
Expand All @@ -46,7 +46,7 @@ fn currency_id_to_u64_should_work() {

let e10 = CurrencyId::VToken(TokenSymbol::ASG);
let e11 = CurrencyId::VToken(TokenSymbol::BNC);
let e12 = CurrencyId::VToken(TokenSymbol::AUSD);
let e12 = CurrencyId::VToken(TokenSymbol::KUSD);
let e13 = CurrencyId::VToken(TokenSymbol::DOT);
let e14 = CurrencyId::VToken(TokenSymbol::KSM);
let e15 = CurrencyId::VToken(TokenSymbol::ETH);
Expand All @@ -60,7 +60,7 @@ fn currency_id_to_u64_should_work() {

let e20 = CurrencyId::Token(TokenSymbol::ASG);
let e21 = CurrencyId::Token(TokenSymbol::BNC);
let e22 = CurrencyId::Token(TokenSymbol::AUSD);
let e22 = CurrencyId::Token(TokenSymbol::KUSD);
let e23 = CurrencyId::Token(TokenSymbol::DOT);
let e24 = CurrencyId::Token(TokenSymbol::KSM);
let e25 = CurrencyId::Token(TokenSymbol::ETH);
Expand All @@ -74,7 +74,7 @@ fn currency_id_to_u64_should_work() {

let e30 = CurrencyId::Stable(TokenSymbol::ASG);
let e31 = CurrencyId::Stable(TokenSymbol::BNC);
let e32 = CurrencyId::Stable(TokenSymbol::AUSD);
let e32 = CurrencyId::Stable(TokenSymbol::KUSD);
let e33 = CurrencyId::Stable(TokenSymbol::DOT);
let e34 = CurrencyId::Stable(TokenSymbol::KSM);
let e35 = CurrencyId::Stable(TokenSymbol::ETH);
Expand All @@ -88,7 +88,7 @@ fn currency_id_to_u64_should_work() {

let e40 = CurrencyId::VSToken(TokenSymbol::ASG);
let e41 = CurrencyId::VSToken(TokenSymbol::BNC);
let e42 = CurrencyId::VSToken(TokenSymbol::AUSD);
let e42 = CurrencyId::VSToken(TokenSymbol::KUSD);
let e43 = CurrencyId::VSToken(TokenSymbol::DOT);
let e44 = CurrencyId::VSToken(TokenSymbol::KSM);
let e45 = CurrencyId::VSToken(TokenSymbol::ETH);
Expand All @@ -102,7 +102,7 @@ fn currency_id_to_u64_should_work() {

let e50 = CurrencyId::VSBond(TokenSymbol::ASG, 0x07d0, 0x0000, 0x000f);
let e51 = CurrencyId::VSBond(TokenSymbol::BNC, 0x07d1, 0x000f, 0x001f);
let e52 = CurrencyId::VSBond(TokenSymbol::AUSD, 0x07d2, 0x001f, 0x002f);
let e52 = CurrencyId::VSBond(TokenSymbol::KUSD, 0x07d2, 0x001f, 0x002f);
let e53 = CurrencyId::VSBond(TokenSymbol::DOT, 0x07d3, 0x002f, 0x003f);
let e54 = CurrencyId::VSBond(TokenSymbol::KSM, 0x07d4, 0x003f, 0x004f);
let e55 = CurrencyId::VSBond(TokenSymbol::ETH, 0x07d5, 0x004f, 0x005f);
Expand All @@ -123,7 +123,7 @@ fn currency_id_to_u64_should_work() {
fn u64_to_currency_id_should_work() {
let e00 = CurrencyId::Native(TokenSymbol::ASG);
let e01 = CurrencyId::Native(TokenSymbol::BNC);
let e02 = CurrencyId::Native(TokenSymbol::AUSD);
let e02 = CurrencyId::Native(TokenSymbol::KUSD);
let e03 = CurrencyId::Native(TokenSymbol::DOT);
let e04 = CurrencyId::Native(TokenSymbol::KSM);
let e05 = CurrencyId::Native(TokenSymbol::ETH);
Expand All @@ -138,7 +138,7 @@ fn u64_to_currency_id_should_work() {

let e10 = CurrencyId::VToken(TokenSymbol::ASG);
let e11 = CurrencyId::VToken(TokenSymbol::BNC);
let e12 = CurrencyId::VToken(TokenSymbol::AUSD);
let e12 = CurrencyId::VToken(TokenSymbol::KUSD);
let e13 = CurrencyId::VToken(TokenSymbol::DOT);
let e14 = CurrencyId::VToken(TokenSymbol::KSM);
let e15 = CurrencyId::VToken(TokenSymbol::ETH);
Expand All @@ -152,7 +152,7 @@ fn u64_to_currency_id_should_work() {

let e20 = CurrencyId::Token(TokenSymbol::ASG);
let e21 = CurrencyId::Token(TokenSymbol::BNC);
let e22 = CurrencyId::Token(TokenSymbol::AUSD);
let e22 = CurrencyId::Token(TokenSymbol::KUSD);
let e23 = CurrencyId::Token(TokenSymbol::DOT);
let e24 = CurrencyId::Token(TokenSymbol::KSM);
let e25 = CurrencyId::Token(TokenSymbol::ETH);
Expand All @@ -166,7 +166,7 @@ fn u64_to_currency_id_should_work() {

let e30 = CurrencyId::Stable(TokenSymbol::ASG);
let e31 = CurrencyId::Stable(TokenSymbol::BNC);
let e32 = CurrencyId::Stable(TokenSymbol::AUSD);
let e32 = CurrencyId::Stable(TokenSymbol::KUSD);
let e33 = CurrencyId::Stable(TokenSymbol::DOT);
let e34 = CurrencyId::Stable(TokenSymbol::KSM);
let e35 = CurrencyId::Stable(TokenSymbol::ETH);
Expand All @@ -180,7 +180,7 @@ fn u64_to_currency_id_should_work() {

let e40 = CurrencyId::VSToken(TokenSymbol::ASG);
let e41 = CurrencyId::VSToken(TokenSymbol::BNC);
let e42 = CurrencyId::VSToken(TokenSymbol::AUSD);
let e42 = CurrencyId::VSToken(TokenSymbol::KUSD);
let e43 = CurrencyId::VSToken(TokenSymbol::DOT);
let e44 = CurrencyId::VSToken(TokenSymbol::KSM);
let e45 = CurrencyId::VSToken(TokenSymbol::ETH);
Expand All @@ -194,7 +194,7 @@ fn u64_to_currency_id_should_work() {

let e50 = CurrencyId::VSBond(TokenSymbol::ASG, 0x07d0, 0x0000, 0x000f);
let e51 = CurrencyId::VSBond(TokenSymbol::BNC, 0x07d1, 0x000f, 0x001f);
let e52 = CurrencyId::VSBond(TokenSymbol::AUSD, 0x07d2, 0x001f, 0x002f);
let e52 = CurrencyId::VSBond(TokenSymbol::KUSD, 0x07d2, 0x001f, 0x002f);
let e53 = CurrencyId::VSBond(TokenSymbol::DOT, 0x07d3, 0x002f, 0x003f);
let e54 = CurrencyId::VSBond(TokenSymbol::KSM, 0x07d4, 0x003f, 0x004f);
let e55 = CurrencyId::VSBond(TokenSymbol::ETH, 0x07d5, 0x004f, 0x005f);
Expand Down
8 changes: 4 additions & 4 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 @@ -147,7 +147,7 @@ fn development_config_genesis(id: ParaId) -> GenesisConfig {
.chain(faucet_accounts().iter())
.flat_map(|x| {
vec![
(x.clone(), CurrencyId::Stable(TokenSymbol::AUSD), ENDOWMENT * 10_000),
(x.clone(), CurrencyId::Stable(TokenSymbol::KUSD), ENDOWMENT * 10_000),
(x.clone(), CurrencyId::Token(TokenSymbol::DOT), ENDOWMENT * 4_000_000),
(x.clone(), CurrencyId::VSToken(TokenSymbol::DOT), ENDOWMENT * 4_000_000),
(x.clone(), CurrencyId::Token(TokenSymbol::ETH), ENDOWMENT),
Expand Down Expand Up @@ -217,14 +217,14 @@ fn local_config_genesis(id: ParaId) -> GenesisConfig {
.chain(faucet_accounts().iter())
.flat_map(|x| {
vec![
(x.clone(), CurrencyId::Stable(TokenSymbol::AUSD), ENDOWMENT * 10_000),
(x.clone(), CurrencyId::Stable(TokenSymbol::KUSD), ENDOWMENT * 10_000),
(x.clone(), CurrencyId::VSToken(TokenSymbol::DOT), ENDOWMENT * 4_000_000),
(x.clone(), CurrencyId::VToken(TokenSymbol::DOT), ENDOWMENT * 4_000_000),
(x.clone(), CurrencyId::Token(TokenSymbol::DOT), ENDOWMENT * 4_000_000),
(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::AUSD), 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(),
Expand Down Expand Up @@ -328,7 +328,7 @@ fn asgard_config_genesis(id: ParaId) -> GenesisConfig {
.chain(faucet_accounts().iter())
.flat_map(|x| {
vec![
(x.clone(), CurrencyId::Stable(TokenSymbol::AUSD), ENDOWMENT * 10_000),
(x.clone(), CurrencyId::Stable(TokenSymbol::KUSD), ENDOWMENT * 10_000),
(x.clone(), CurrencyId::Token(TokenSymbol::DOT), ENDOWMENT),
(x.clone(), CurrencyId::Token(TokenSymbol::ETH), ENDOWMENT),
(x.clone(), CurrencyId::Token(TokenSymbol::KSM), ENDOWMENT),
Expand Down
1 change: 1 addition & 0 deletions node/service/src/chain_spec/bifrost.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ pub fn bifrost_genesis(
},
balances: BalancesConfig { balances },
indices: IndicesConfig { indices: vec![] },
treasury: Default::default(),
sudo: SudoConfig { key: root_key.clone() },
parachain_info: ParachainInfoConfig { parachain_id: id },
collator_selection: CollatorSelectionConfig {
Expand Down
2 changes: 1 addition & 1 deletion node/service/src/chain_spec/dev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ fn development_config_genesis(id: ParaId) -> GenesisConfig {
.chain(faucet_accounts().iter())
.flat_map(|x| {
vec![
(x.clone(), CurrencyId::Stable(TokenSymbol::AUSD), ENDOWMENT * 10_000),
(x.clone(), CurrencyId::Stable(TokenSymbol::KUSD), ENDOWMENT * 10_000),
(x.clone(), CurrencyId::Token(TokenSymbol::DOT), ENDOWMENT),
(x.clone(), CurrencyId::Token(TokenSymbol::ETH), ENDOWMENT),
(x.clone(), CurrencyId::Token(TokenSymbol::KSM), ENDOWMENT),
Expand Down
2 changes: 1 addition & 1 deletion pallets/flexible-fee/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ pub mod pallet {
pub fn DefaultFeeChargeOrder<T: Config>() -> Vec<CurrencyIdOf<T>> {
[
CurrencyId::Native(TokenSymbol::ASG),
CurrencyId::Stable(TokenSymbol::AUSD),
CurrencyId::Stable(TokenSymbol::KUSD),
CurrencyId::Token(TokenSymbol::DOT),
CurrencyId::VToken(TokenSymbol::DOT),
CurrencyId::Token(TokenSymbol::KSM),
Expand Down
6 changes: 3 additions & 3 deletions pallets/flexible-fee/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub const BOB: AccountId32 = AccountId32::new([1u8; 32]);
pub const ALICE: AccountId32 = AccountId32::new([2u8; 32]);
pub const DICK: AccountId32 = AccountId32::new([3u8; 32]);
pub const CURRENCY_ID_0: CurrencyId = CurrencyId::Native(TokenSymbol::ASG);
pub const CURRENCY_ID_1: CurrencyId = CurrencyId::Stable(TokenSymbol::AUSD);
pub const CURRENCY_ID_1: CurrencyId = CurrencyId::Stable(TokenSymbol::KUSD);
pub const CURRENCY_ID_2: CurrencyId = CurrencyId::Token(TokenSymbol::DOT);
pub const CURRENCY_ID_3: CurrencyId = CurrencyId::VToken(TokenSymbol::DOT);
pub const CURRENCY_ID_4: CurrencyId = CurrencyId::Token(TokenSymbol::KSM);
Expand Down Expand Up @@ -156,7 +156,7 @@ fn inner_get_user_fee_charge_order_list_should_work() {

let mut default_order_list: Vec<CurrencyId> = Vec::new();
default_order_list.push(CurrencyId::Native(TokenSymbol::ASG));
default_order_list.push(CurrencyId::Stable(TokenSymbol::AUSD));
default_order_list.push(CurrencyId::Stable(TokenSymbol::KUSD));
default_order_list.push(CurrencyId::Token(TokenSymbol::DOT));
default_order_list.push(CurrencyId::VToken(TokenSymbol::DOT));
default_order_list.push(CurrencyId::Token(TokenSymbol::KSM));
Expand Down Expand Up @@ -189,7 +189,7 @@ fn ensure_can_charge_fee_should_work() {
let mut default_order_list: Vec<CurrencyId> = Vec::new();

default_order_list.push(CurrencyId::Native(TokenSymbol::ASG));
default_order_list.push(CurrencyId::Stable(TokenSymbol::AUSD));
default_order_list.push(CurrencyId::Stable(TokenSymbol::KUSD));
default_order_list.push(CurrencyId::Token(TokenSymbol::DOT));
default_order_list.push(CurrencyId::Token(TokenSymbol::KSM));
default_order_list.push(CurrencyId::Token(TokenSymbol::KSM));
Expand Down
2 changes: 1 addition & 1 deletion pallets/minter-reward/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ pub mod pallet {
};
for (minter, currency_id, vtoken_amount) in Minter::<T>::iter() {
let weight = CurrencyWeights::<T>::get(&currency_id);
let total_vtoken_mint = TotalVtokenMinted::<T>::get(currency_id); // AUSD
let total_vtoken_mint = TotalVtokenMinted::<T>::get(currency_id); // KUSD
let reward = bnc_reward.saturating_mul(weight.into().saturating_mul(vtoken_amount)) /
(total_weight.saturating_mul(total_vtoken_mint));

Expand Down
8 changes: 4 additions & 4 deletions pallets/minter-reward/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ use crate::{self as bifrost_minter_reward};

pub type AccountId = AccountId32;
pub const BNC: CurrencyId = CurrencyId::Native(TokenSymbol::ASG);
pub const AUSD: CurrencyId = CurrencyId::Stable(TokenSymbol::AUSD);
pub const KUSD: CurrencyId = CurrencyId::Stable(TokenSymbol::KUSD);
pub const DOT: CurrencyId = CurrencyId::Token(TokenSymbol::DOT);
pub const vDOT: CurrencyId = CurrencyId::VToken(TokenSymbol::DOT);
pub const KSM: CurrencyId = CurrencyId::Token(TokenSymbol::KSM);
Expand Down Expand Up @@ -79,7 +79,7 @@ frame_support::construct_runtime!(
parameter_types! {
pub const BlockHashCount: u64 = 250;
pub const NativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::BNC);
pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::AUSD);
pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::KUSD);
}
impl frame_system::Config for Runtime {
type AccountData = pallet_balances::AccountData<u64>;
Expand Down Expand Up @@ -277,13 +277,13 @@ impl ExtBuilder {
pub fn ten_thousand_for_alice_n_bob(self) -> Self {
self.balances(vec![
(ALICE, BNC, 100000),
(ALICE, AUSD, 10000),
(ALICE, KUSD, 10000),
(ALICE, vDOT, 10000),
(ALICE, vKSM, 10000),
(ALICE, DOT, 10000),
(ALICE, KSM, 10000),
(BOB, BNC, 100000),
(BOB, AUSD, 10000),
(BOB, KUSD, 10000),
(BOB, vDOT, 10000),
(BOB, vKSM, 10000),
(BOB, DOT, 10000),
Expand Down
2 changes: 1 addition & 1 deletion pallets/minter-reward/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ fn minter_reward_should_work() {

// create DEX pair
let ausd_asset_id: AssetId =
AssetId::try_from(CurrencyId::Stable(TokenSymbol::AUSD)).unwrap();
AssetId::try_from(CurrencyId::Stable(TokenSymbol::KUSD)).unwrap();
let dot_asset_id: AssetId = AssetId::try_from(CurrencyId::Token(TokenSymbol::DOT)).unwrap();
let vdot_asset_id: AssetId =
AssetId::try_from(CurrencyId::VToken(TokenSymbol::DOT)).unwrap();
Expand Down
Loading