From c15f40c6dbfef906f2fbeee69d578c015e2eab8c Mon Sep 17 00:00:00 2001 From: herryho Date: Mon, 16 Aug 2021 12:01:00 +0800 Subject: [PATCH 1/6] change ausd to kusd --- docs/developer_setting.json | 13 +- node/primitives/src/currency.rs | 2 +- node/primitives/src/tests.rs | 24 ++-- node/service/src/chain_spec/asgard.rs | 8 +- node/service/src/chain_spec/dev.rs | 2 +- pallets/flexible-fee/src/lib.rs | 2 +- pallets/flexible-fee/src/tests.rs | 6 +- pallets/minter-reward/src/lib.rs | 2 +- pallets/minter-reward/src/mock.rs | 8 +- pallets/minter-reward/src/tests.rs | 2 +- pallets/proxy-validator/src/tests.rs | 179 ++++++++++++++++++++------ pallets/salp/src/mock.rs | 2 +- pallets/swap/src/tests.rs | 52 ++++---- pallets/vtoken-mint/src/mock.rs | 4 +- pallets/vtoken-mint/src/tests.rs | 4 +- runtime/asgard/src/lib.rs | 2 +- runtime/bifrost/src/lib.rs | 2 +- runtime/dev/src/lib.rs | 2 +- 18 files changed, 214 insertions(+), 102 deletions(-) diff --git a/docs/developer_setting.json b/docs/developer_setting.json index eff880d07..aa03a6e5e 100644 --- a/docs/developer_setting.json +++ b/docs/developer_setting.json @@ -9,7 +9,7 @@ "TokenSymbol": { "_enum": { "ASG": 0, - "aUSD": 2, + "KUSD": 2, "DOT": 3, "KSM": 4, "ETH": 5 @@ -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", @@ -63,7 +64,11 @@ "order_state": "OrderState" }, "OrderState": { - "_enum": ["InTrade", "Revoked", "Clinchd"] + "_enum": [ + "InTrade", + "Revoked", + "Clinchd" + ] }, "AssetId": { "chain_id": "u32", @@ -81,4 +86,4 @@ "reserve_1": "AssetBalance", "lp_asset_id": "AssetId" } -} +} \ No newline at end of file diff --git a/node/primitives/src/currency.rs b/node/primitives/src/currency.rs index 969ee1a6f..23baf6139 100644 --- a/node/primitives/src/currency.rs +++ b/node/primitives/src/currency.rs @@ -256,7 +256,7 @@ create_currency_id! { pub enum TokenSymbol { ASG("Asgard", 12) = 0, BNC("Bifrost", 12) = 1, - AUSD("Acala Dollar", 12) = 2, + KUSD("Acala Dollar", 12) = 2, DOT("Polkadot", 10) = 3, KSM("Kusama", 12) = 4, ETH("Ethereum", 18) = 5, diff --git a/node/primitives/src/tests.rs b/node/primitives/src/tests.rs index bad5185ae..3f253b7c3 100644 --- a/node/primitives/src/tests.rs +++ b/node/primitives/src/tests.rs @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); diff --git a/node/service/src/chain_spec/asgard.rs b/node/service/src/chain_spec/asgard.rs index 6f56ca694..5d7aeaad9 100644 --- a/node/service/src/chain_spec/asgard.rs +++ b/node/service/src/chain_spec/asgard.rs @@ -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), @@ -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(), @@ -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), diff --git a/node/service/src/chain_spec/dev.rs b/node/service/src/chain_spec/dev.rs index 8a7049fa4..42e49f7ef 100644 --- a/node/service/src/chain_spec/dev.rs +++ b/node/service/src/chain_spec/dev.rs @@ -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), diff --git a/pallets/flexible-fee/src/lib.rs b/pallets/flexible-fee/src/lib.rs index 84464ee7a..da363f0a9 100644 --- a/pallets/flexible-fee/src/lib.rs +++ b/pallets/flexible-fee/src/lib.rs @@ -123,7 +123,7 @@ pub mod pallet { pub fn DefaultFeeChargeOrder() -> Vec> { [ CurrencyId::Native(TokenSymbol::ASG), - CurrencyId::Stable(TokenSymbol::AUSD), + CurrencyId::Stable(TokenSymbol::KUSD), CurrencyId::Token(TokenSymbol::DOT), CurrencyId::VToken(TokenSymbol::DOT), CurrencyId::Token(TokenSymbol::KSM), diff --git a/pallets/flexible-fee/src/tests.rs b/pallets/flexible-fee/src/tests.rs index 2626c4698..708b42ee5 100644 --- a/pallets/flexible-fee/src/tests.rs +++ b/pallets/flexible-fee/src/tests.rs @@ -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); @@ -156,7 +156,7 @@ fn inner_get_user_fee_charge_order_list_should_work() { let mut default_order_list: Vec = 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)); @@ -189,7 +189,7 @@ fn ensure_can_charge_fee_should_work() { let mut default_order_list: Vec = 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)); diff --git a/pallets/minter-reward/src/lib.rs b/pallets/minter-reward/src/lib.rs index ec1c1d2c5..82e29c166 100644 --- a/pallets/minter-reward/src/lib.rs +++ b/pallets/minter-reward/src/lib.rs @@ -306,7 +306,7 @@ pub mod pallet { }; for (minter, currency_id, vtoken_amount) in Minter::::iter() { let weight = CurrencyWeights::::get(¤cy_id); - let total_vtoken_mint = TotalVtokenMinted::::get(currency_id); // AUSD + let total_vtoken_mint = TotalVtokenMinted::::get(currency_id); // KUSD let reward = bnc_reward.saturating_mul(weight.into().saturating_mul(vtoken_amount)) / (total_weight.saturating_mul(total_vtoken_mint)); diff --git a/pallets/minter-reward/src/mock.rs b/pallets/minter-reward/src/mock.rs index 8007161ce..74b84fbd3 100644 --- a/pallets/minter-reward/src/mock.rs +++ b/pallets/minter-reward/src/mock.rs @@ -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); @@ -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; @@ -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), diff --git a/pallets/minter-reward/src/tests.rs b/pallets/minter-reward/src/tests.rs index 92ec99b2d..73eb8acc7 100644 --- a/pallets/minter-reward/src/tests.rs +++ b/pallets/minter-reward/src/tests.rs @@ -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(); diff --git a/pallets/proxy-validator/src/tests.rs b/pallets/proxy-validator/src/tests.rs index 14eb49876..165843ec8 100644 --- a/pallets/proxy-validator/src/tests.rs +++ b/pallets/proxy-validator/src/tests.rs @@ -20,17 +20,21 @@ #![cfg(test)] -use crate::*; use crate::mock::*; -use frame_support::{assert_ok, assert_noop}; -use node_primitives::{ - Token, TokenSymbol, -}; +use crate::*; +use frame_support::{assert_noop, assert_ok}; +use node_primitives::{Token, TokenSymbol}; fn set_global_asset(token_symbol: TokenSymbol) { let redeem_duration = 100; let min_reward_per_block = 1; - ProxyValidator::set_global_asset(Origin::root(), token_symbol, redeem_duration, min_reward_per_block).unwrap(); + ProxyValidator::set_global_asset( + Origin::root(), + token_symbol, + redeem_duration, + min_reward_per_block, + ) + .unwrap(); } fn asset_issue(account_id: u64, symbol: Vec, token_symbol: TokenSymbol, amount: u64) { @@ -46,9 +50,12 @@ fn set_asset_should_work() { let min_reward_per_block = 1; let asset_config = AssetConfig::new(redeem_duration, min_reward_per_block); - assert_ok!( - ProxyValidator::set_global_asset(Origin::root(), token_symbol, redeem_duration, min_reward_per_block) - ); + assert_ok!(ProxyValidator::set_global_asset( + Origin::root(), + token_symbol, + redeem_duration, + min_reward_per_block + )); assert_eq!(ProxyValidator::asset_configs(token_symbol), asset_config); }); @@ -65,7 +72,13 @@ fn stake_should_ok() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin, token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin, + token_symbol, + need, + reward_per_block, + validator_address + )); let target = 1; let amount = 100; @@ -109,7 +122,13 @@ fn stake_amount_exceed_should_error() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin, token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin, + token_symbol, + need, + reward_per_block, + validator_address + )); let target = 1; let amount = 2000; @@ -131,7 +150,13 @@ fn unstake_should_ok() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin, token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin, + token_symbol, + need, + reward_per_block, + validator_address + )); let target = 1; let stake_amount = 500; @@ -172,7 +197,13 @@ fn unstake_insufficient_should_error() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin, token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin, + token_symbol, + need, + reward_per_block, + validator_address + )); let target = 1; let stake_amount = 500; @@ -198,9 +229,16 @@ fn register_should_work() { let need = 1000; let reward_per_block = 100; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - let validator = ProxyValidatorRegister::new(need, reward_per_block, validator_address.clone()); + let validator = + ProxyValidatorRegister::new(need, reward_per_block, validator_address.clone()); - assert_ok!(ProxyValidator::validator_register(origin, token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin, + token_symbol, + need, + reward_per_block, + validator_address + )); assert_eq!(ProxyValidator::validators(token_symbol, origin_id), validator); }); @@ -217,7 +255,13 @@ fn register_asset_not_set_should_error() { let validator_address = vec![0x12, 0x34, 0x56, 0x78]; assert_noop!( - ProxyValidator::validator_register(origin, token_symbol, need, reward_per_block, validator_address), + ProxyValidator::validator_register( + origin, + token_symbol, + need, + reward_per_block, + validator_address + ), ProxyValidatorError::AssetConfigNotSet ); }); @@ -234,12 +278,22 @@ fn register_twice_should_error() { let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!( - ProxyValidator::validator_register(origin.clone(), token_symbol, need, reward_per_block, validator_address.clone()) - ); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + token_symbol, + need, + reward_per_block, + validator_address.clone() + )); assert_noop!( - ProxyValidator::validator_register(origin, token_symbol, need, Zero::zero(), validator_address), + ProxyValidator::validator_register( + origin, + token_symbol, + need, + Zero::zero(), + validator_address + ), ProxyValidatorError::ProxyValidatorRegistered ); }); @@ -256,7 +310,13 @@ fn register_reward_too_low_should_error() { let validator_address = vec![0x12, 0x34, 0x56, 0x78]; assert_noop!( - ProxyValidator::validator_register(origin.clone(), token_symbol, need, 0, validator_address.clone()), + ProxyValidator::validator_register( + origin.clone(), + token_symbol, + need, + 0, + validator_address.clone() + ), ProxyValidatorError::RewardTooLow ); }); @@ -273,7 +333,13 @@ fn set_need_amount_should_work() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin.clone(), token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + token_symbol, + need, + reward_per_block, + validator_address + )); let new_need = 2000; assert_ok!(ProxyValidator::set_need_amount(origin, token_symbol, new_need)); @@ -308,7 +374,13 @@ fn set_reward_per_block_should_work() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin.clone(), token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + token_symbol, + need, + reward_per_block, + validator_address + )); let reward_per_block = 200000; assert_ok!(ProxyValidator::set_reward_per_block(origin, token_symbol, reward_per_block)); @@ -343,7 +415,13 @@ fn set_reward_per_block_reward_too_low_should_error() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin.clone(), token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + token_symbol, + need, + reward_per_block, + validator_address + )); let reward_per_block = 0; assert_noop!( @@ -353,7 +431,6 @@ fn set_reward_per_block_reward_too_low_should_error() { }); } - #[test] fn deposit_should_work() { new_test_ext().execute_with(|| { @@ -363,7 +440,7 @@ fn deposit_should_work() { let origin = Origin::signed(origin_id); let precision = 8; - assert_ok!(Assets::create(Origin::root(), b"AUSD".to_vec(), 18)); // let dot start from 1 + assert_ok!(Assets::create(Origin::root(), b"KUSD".to_vec(), 18)); // let dot start from 1 assert_ok!(Assets::create(Origin::root(), b"DOT".to_vec(), precision)); let dot_id = Assets::next_asset_id() - 1; @@ -374,7 +451,13 @@ fn deposit_should_work() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin.clone(), dot_type, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + dot_type, + need, + reward_per_block, + validator_address + )); let deposit_amount = 100; assert_ok!(ProxyValidator::deposit(origin.clone(), dot_type, deposit_amount)); @@ -399,7 +482,7 @@ fn deposit_not_enough_free_balance_should_error() { let origin = Origin::signed(origin_id); let precision = 8; - assert_ok!(Assets::create(Origin::root(), b"AUSD".to_vec(), 18)); // let dot start from 1 + assert_ok!(Assets::create(Origin::root(), b"KUSD".to_vec(), 18)); // let dot start from 1 assert_ok!(Assets::create(Origin::root(), b"DOT".to_vec(), precision)); let dot_id = Assets::next_asset_id() - 1; @@ -411,7 +494,13 @@ fn deposit_not_enough_free_balance_should_error() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin.clone(), dot_type, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + dot_type, + need, + reward_per_block, + validator_address + )); let deposit_amount = 20000; assert_noop!( @@ -445,7 +534,7 @@ fn withdraw_should_ok() { let origin = Origin::signed(origin_id); let precision = 8; - assert_ok!(Assets::create(Origin::root(), b"AUSD".to_vec(), 18)); // let dot start from 1 + assert_ok!(Assets::create(Origin::root(), b"KUSD".to_vec(), 18)); // let dot start from 1 assert_ok!(Assets::create(Origin::root(), b"DOT".to_vec(), precision)); let dot_id = Assets::next_asset_id() - 1; @@ -457,7 +546,13 @@ fn withdraw_should_ok() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin.clone(), dot_type, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + dot_type, + need, + reward_per_block, + validator_address + )); let deposit_amount = 500; assert_ok!(ProxyValidator::deposit(origin.clone(), dot_type, deposit_amount)); @@ -479,7 +574,7 @@ fn withdraw_not_enough_locked_balance_should_error() { let origin = Origin::signed(origin_id); let precision = 8; - assert_ok!(Assets::create(Origin::root(), b"AUSD".to_vec(), 18)); // let dot start from 1 + assert_ok!(Assets::create(Origin::root(), b"KUSD".to_vec(), 18)); // let dot start from 1 assert_ok!(Assets::create(Origin::root(), b"DOT".to_vec(), precision)); let dot_id = Assets::next_asset_id() - 1; @@ -491,7 +586,13 @@ fn withdraw_not_enough_locked_balance_should_error() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin.clone(), dot_type, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + dot_type, + need, + reward_per_block, + validator_address + )); let deposit_amount = 500; assert_ok!(ProxyValidator::deposit(origin.clone(), dot_type, deposit_amount)); @@ -522,7 +623,7 @@ fn withdraw_not_registered_should_error() { #[test] fn validator_deduct_should_ok() { new_test_ext().execute_with(|| { - let token_symbol = TokenSymbol::AUSD; + let token_symbol = TokenSymbol::KUSD; set_global_asset(token_symbol); let origin_id = 1; @@ -530,10 +631,16 @@ fn validator_deduct_should_ok() { let need = 1_000_000_000_000_000; let reward_per_block = 220; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin.clone(), token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + token_symbol, + need, + reward_per_block, + validator_address + )); let deposit_amount = 100_000_000_000_000; - asset_issue(origin_id, b"AUSD".to_vec(), token_symbol, deposit_amount); + asset_issue(origin_id, b"KUSD".to_vec(), token_symbol, deposit_amount); assert_ok!(ProxyValidator::deposit(origin.clone(), token_symbol, deposit_amount)); let target = 1; diff --git a/pallets/salp/src/mock.rs b/pallets/salp/src/mock.rs index 925d56f1c..f4a859247 100644 --- a/pallets/salp/src/mock.rs +++ b/pallets/salp/src/mock.rs @@ -60,7 +60,7 @@ construct_runtime!( parameter_types! { pub const NativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::ASG); pub const RelayCurrencyId: CurrencyId = CurrencyId::Token(TokenSymbol::KSM); - pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::AUSD); + pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::KUSD); } parameter_types! { diff --git a/pallets/swap/src/tests.rs b/pallets/swap/src/tests.rs index 8f3a8cc66..ee7d5e218 100644 --- a/pallets/swap/src/tests.rs +++ b/pallets/swap/src/tests.rs @@ -33,7 +33,7 @@ fn initialize_pool_for_dispatches() { // initialize some parameters used to dispatch the create_pool call. let alice = 1; let bob = 2; - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let dot_id = CurrencyId::Token(TokenSymbol::DOT); let ksm_id = CurrencyId::Token(TokenSymbol::KSM); @@ -124,7 +124,7 @@ fn create_pool_should_work() { new_test_ext().execute_with(|| { // initialize some parameters used to dispatch the create_pool call. let alice = 1; - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let dot_id = CurrencyId::Token(TokenSymbol::DOT); let ksm_id = CurrencyId::Token(TokenSymbol::KSM); @@ -165,12 +165,12 @@ fn create_pool_should_work() { assert_eq!(result.active, false); // Validate the initial value of pool state is inactive. // validate the value of storage TokenWeightsInPool. - assert_eq!(Swap::token_weights_in_pool(0, asud_id), 20_000); // the weight of AUSD token + assert_eq!(Swap::token_weights_in_pool(0, asud_id), 20_000); // the weight of KUSD token assert_eq!(Swap::token_weights_in_pool(0, dot_id), 40_000); // the weight of dot token assert_eq!(Swap::token_weights_in_pool(0, ksm_id), 40_000); // the weight of ksm token // validate the value of storage TokenBalancesInPool. - assert_eq!(Swap::token_balances_in_pool(0, asud_id), 500); // the balance of AUSD token + assert_eq!(Swap::token_balances_in_pool(0, asud_id), 500); // the balance of KUSD token assert_eq!(Swap::token_balances_in_pool(0, dot_id), 1_000); // the balance of dot token assert_eq!(Swap::token_balances_in_pool(0, ksm_id), 400); // the balance of ksm token @@ -319,7 +319,7 @@ fn add_liquidity_given_shares_in_should_work() { let pool_id = 0; let new_pool_token = 200; // Alice initial pool token amount is 1000. Bob want's to get 20% of that of Alice's. - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let dot_id = CurrencyId::Token(TokenSymbol::DOT); let ksm_id = CurrencyId::Token(TokenSymbol::KSM); @@ -337,7 +337,7 @@ fn add_liquidity_given_shares_in_should_work() { assert_eq!(Swap::token_balances_in_pool(pool_id, ksm_id), 480); // check wether bob's account has been deducted corresponding amount for different tokens. - assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 999_900); // get the user's balance for AUSD + assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 999_900); // get the user's balance for KUSD assert_eq!(::CurrenciesHandler::free_balance(dot_id, &bob), 999_800); // get the user's balance for dot assert_eq!(::CurrenciesHandler::free_balance(ksm_id, &bob), 999_920); // get the user's balance for ksm @@ -401,7 +401,7 @@ fn add_single_liquidity_given_amount_in_should_work() { let bob = 2; let creator = Origin::signed(bob); let pool_id = 0; - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let asset_id = asud_id; let token_amount_in = 5_000; @@ -421,8 +421,8 @@ fn add_single_liquidity_given_amount_in_should_work() { // check wether the token balances are right. assert_eq!(Swap::token_balances_in_pool(pool_id, asud_id), 5_500); - // check wether bob's account has been deducted corresponding amount for AUSD. - assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 995_000); // get the user's balance for AUSD + // check wether bob's account has been deducted corresponding amount for KUSD. + assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 995_000); // get the user's balance for KUSD // Below are the incorrect operations. @@ -509,7 +509,7 @@ fn add_single_liquidity_given_shares_in_should_work() { let pool_id = 0; let new_pool_token = 200; // Alice initial pool token amount is 1000. Bob want's to get 20% of that of Alice's. - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let dot_id = CurrencyId::Token(TokenSymbol::DOT); let ksm_id = CurrencyId::Token(TokenSymbol::KSM); @@ -533,7 +533,7 @@ fn add_single_liquidity_given_shares_in_should_work() { assert_eq!(Swap::token_balances_in_pool(pool_id, ksm_id), 400); // check wether bob's account has been deducted corresponding amount for different tokens. - assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 981_396); // get the user's balance for AUSD + assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 981_396); // get the user's balance for KUSD assert_eq!(::CurrenciesHandler::free_balance(dot_id, &bob), 1_000_000); // get the user's balance for dot assert_eq!(::CurrenciesHandler::free_balance(ksm_id, &bob), 1_000_000); // get the user's balance for ksm @@ -624,7 +624,7 @@ fn remove_single_asset_liquidity_given_shares_in_should_work() { let pool_id = 0; let pool_token_out = 200; // Alice initial pool token amount is 1000. Bob want's to get 20% of that of Alice's. - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let dot_id = CurrencyId::Token(TokenSymbol::DOT); let ksm_id = CurrencyId::Token(TokenSymbol::KSM); @@ -647,8 +647,8 @@ fn remove_single_asset_liquidity_given_shares_in_should_work() { assert_eq!(Swap::token_balances_in_pool(pool_id, dot_id), 1_000); assert_eq!(Swap::token_balances_in_pool(pool_id, ksm_id), 400); - // check wether Alice's account has been added by corresponding amount for AUSD. - assert_eq!(::CurrenciesHandler::free_balance(asud_id, &alice), 9_822); // get the user's balance for AUSD + // check wether Alice's account has been added by corresponding amount for KUSD. + assert_eq!(::CurrenciesHandler::free_balance(asud_id, &alice), 9_822); // get the user's balance for KUSD assert_eq!(::CurrenciesHandler::free_balance(dot_id, &alice), 29_000); // get the user's balance for dot assert_eq!(::CurrenciesHandler::free_balance(ksm_id, &alice), 29_600); // get the user's balance for ksm @@ -751,7 +751,7 @@ fn remove_single_asset_liquidity_given_amount_in_should_work() { let remover = Origin::signed(alice); let pool_id = 0; let token_amount = 400; // Alice initial pool token amount is 1000. - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let asset_id = asud_id; assert_ok!(Swap::remove_single_asset_liquidity_given_amount_in( remover, @@ -769,8 +769,8 @@ fn remove_single_asset_liquidity_given_amount_in_should_work() { // check wether the token balances are right. assert_eq!(Swap::token_balances_in_pool(pool_id, asud_id), 100); - // check wether bob's account has been deducted corresponding amount for AUSD. - assert_eq!(::CurrenciesHandler::free_balance(asud_id, &alice), 9_900); // get the user's balance for AUSD + // check wether bob's account has been deducted corresponding amount for KUSD. + assert_eq!(::CurrenciesHandler::free_balance(asud_id, &alice), 9_900); // get the user's balance for KUSD // Below are the incorrect operations. @@ -880,7 +880,7 @@ fn remove_assets_liquidity_given_shares_in_should_work() { let alice = 1; let remover = Origin::signed(alice); let pool_id = 0; - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let dot_id = CurrencyId::Token(TokenSymbol::DOT); let ksm_id = CurrencyId::Token(TokenSymbol::KSM); @@ -903,7 +903,7 @@ fn remove_assets_liquidity_given_shares_in_should_work() { assert_eq!(Swap::token_balances_in_pool(pool_id, ksm_id), 200); // check wether Alice's account has been added corresponding amount for different tokens. - assert_eq!(::CurrenciesHandler::free_balance(asud_id, &alice), 9_750); // get the user's balance for AUSD + assert_eq!(::CurrenciesHandler::free_balance(asud_id, &alice), 9_750); // get the user's balance for KUSD assert_eq!(::CurrenciesHandler::free_balance(dot_id, &alice), 29_500); // get the user's balance for dot assert_eq!(::CurrenciesHandler::free_balance(ksm_id, &alice), 29_800); // get the user's balance for ksm @@ -986,7 +986,7 @@ fn swap_exact_in_should_work() { let bob = 2; let swapper = Origin::signed(bob); let pool_id = 0; - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let dot_id = CurrencyId::Token(TokenSymbol::DOT); let ksm_id = CurrencyId::Token(TokenSymbol::KSM); @@ -1001,15 +1001,15 @@ fn swap_exact_in_should_work() { token_amount_in, min_token_amount_out, token_out_asset_id - )); // Bob to swap 100 AUSD for x amount of dot. + )); // Bob to swap 100 KUSD for x amount of dot. - // check whether the pool has added 100 AUSD. + // check whether the pool has added 100 KUSD. assert_eq!(Swap::token_balances_in_pool(pool_id, token_in_asset_id), 600); assert_eq!(Swap::token_balances_in_pool(pool_id, token_out_asset_id), 917); assert_eq!(Swap::token_balances_in_pool(pool_id, ksm_id), 400); // check whether bob's account has been added and deducted with corresponding amounts. - assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 999_900); // get the user's balance for AUSD + assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 999_900); // get the user's balance for KUSD assert_eq!(::CurrenciesHandler::free_balance(dot_id, &bob), 1_000_083); // get the user's balance for dot assert_eq!(::CurrenciesHandler::free_balance(ksm_id, &bob), 1_000_000); // get the user's balance for dot @@ -1123,7 +1123,7 @@ fn swap_exact_out_should_work() { let bob = 2; let swapper = Origin::signed(bob); let pool_id = 0; - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let dot_id = CurrencyId::Token(TokenSymbol::DOT); let ksm_id = CurrencyId::Token(TokenSymbol::KSM); @@ -1147,7 +1147,7 @@ fn swap_exact_out_should_work() { assert_eq!(Swap::token_balances_in_pool(pool_id, ksm_id), 400); // check whether bob's account has been added and deducted with corresponding amounts. - assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 999_938); // get the user's balance for AUSD + assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 999_938); // get the user's balance for KUSD assert_eq!(::CurrenciesHandler::free_balance(dot_id, &bob), 1_000_200); // get the user's balance for dot assert_eq!(::CurrenciesHandler::free_balance(ksm_id, &bob), 1_000_000); // get the user's balance for ksm @@ -1237,7 +1237,7 @@ fn swap_exact_out_should_work() { // swap more than the user has let max_token_amount_in = Some(2000); let token_amount_out = 400; - assert_ok!(::CurrenciesHandler::withdraw(token_in_asset_id, &bob, 999_800)); // destroy most of bob's AUSD + assert_ok!(::CurrenciesHandler::withdraw(token_in_asset_id, &bob, 999_800)); // destroy most of bob's KUSD assert_eq!( Swap::swap_exact_out( swapper.clone(), diff --git a/pallets/vtoken-mint/src/mock.rs b/pallets/vtoken-mint/src/mock.rs index 10c275c74..35a153715 100644 --- a/pallets/vtoken-mint/src/mock.rs +++ b/pallets/vtoken-mint/src/mock.rs @@ -45,7 +45,7 @@ use crate::{self as vtoken_mint}; 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); @@ -81,7 +81,7 @@ parameter_types! { pub BlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights::simple_max(1024); 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; diff --git a/pallets/vtoken-mint/src/tests.rs b/pallets/vtoken-mint/src/tests.rs index ce5ef3467..779984088 100644 --- a/pallets/vtoken-mint/src/tests.rs +++ b/pallets/vtoken-mint/src/tests.rs @@ -114,9 +114,9 @@ fn redeem_token_should_be_ok() { assert_eq!(VtokenMint::get_mint_pool(DOT), dot_pool - minted_dot); assert_eq!(VtokenMint::get_mint_pool(vDOT), vdot_pool - to_sell_vdot); - // Alice selling AUSD should not work. + // Alice selling KUSD should not work. assert_noop!( - VtokenMint::redeem(Origin::signed(ALICE), AUSD, to_sell_vdot), + VtokenMint::redeem(Origin::signed(ALICE), KUSD, to_sell_vdot), Error::::NotSupportTokenType ); diff --git a/runtime/asgard/src/lib.rs b/runtime/asgard/src/lib.rs index 08ecc1fa4..d61482e4d 100644 --- a/runtime/asgard/src/lib.rs +++ b/runtime/asgard/src/lib.rs @@ -169,7 +169,7 @@ parameter_types! { parameter_types! { pub const NativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::ASG); pub const RelayCurrencyId: CurrencyId = CurrencyId::Token(TokenSymbol::KSM); - pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::AUSD); + pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::KUSD); } impl frame_system::Config for Runtime { diff --git a/runtime/bifrost/src/lib.rs b/runtime/bifrost/src/lib.rs index 3781c6748..6f1c43250 100644 --- a/runtime/bifrost/src/lib.rs +++ b/runtime/bifrost/src/lib.rs @@ -164,7 +164,7 @@ impl Filter for CallFilter { parameter_types! { pub const NativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::ASG); pub const RelayCurrencyId: CurrencyId = CurrencyId::Token(TokenSymbol::KSM); - pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::AUSD); + pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::KUSD); } impl frame_system::Config for Runtime { diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index 7a46cbb88..8a7b7774c 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -173,7 +173,7 @@ parameter_types! { parameter_types! { pub const NativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::ASG); pub const RelayCurrencyId: CurrencyId = CurrencyId::Token(TokenSymbol::KSM); - pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::AUSD); + pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::KUSD); } impl frame_system::Config for Runtime { From f25ff2cdefb24f6b439dfcdf65e8e87d318d00b6 Mon Sep 17 00:00:00 2001 From: Yu Date: Mon, 16 Aug 2021 14:51:10 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20add=20Treasury=20and?= =?UTF-8?q?=20Bounties=20at=20bifrost=20runtime=20(#224)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 🎸 add Treasury and Bounties at bifrost runtime * style: 💄 modify Cargo.toml format --- Cargo.lock | 3 ++ node/service/src/chain_spec/bifrost.rs | 1 + runtime/bifrost/Cargo.toml | 43 ++++++++++++--------- runtime/bifrost/src/lib.rs | 52 ++++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 255068d85..1c374dafd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -754,6 +754,7 @@ dependencies = [ "pallet-aura", "pallet-authorship", "pallet-balances", + "pallet-bounties", "pallet-collator-selection", "pallet-collective", "pallet-democracy", @@ -765,12 +766,14 @@ dependencies = [ "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", + "pallet-treasury", "pallet-utility", "pallet-xcm", "parachain-info", "parity-scale-codec", "polkadot-parachain", "sp-api", + "sp-arithmetic", "sp-block-builder", "sp-consensus-aura", "sp-core", diff --git a/node/service/src/chain_spec/bifrost.rs b/node/service/src/chain_spec/bifrost.rs index 070c50c09..2e8612f9f 100644 --- a/node/service/src/chain_spec/bifrost.rs +++ b/node/service/src/chain_spec/bifrost.rs @@ -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 { diff --git a/runtime/bifrost/Cargo.toml b/runtime/bifrost/Cargo.toml index 8251134ad..8c160a24b 100644 --- a/runtime/bifrost/Cargo.toml +++ b/runtime/bifrost/Cargo.toml @@ -7,62 +7,68 @@ build = "build.rs" [dependencies] # third-party dependencies -codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive", "max-encoded-len"] } +codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [ + "derive", + "max-encoded-len", +] } log = { version = "0.4.14", default-features = false } # primitives node-primitives = { default-features = false, path = "../../node/primitives" } -sp-block-builder = { default-features = false, version = "3.0.0"} +sp-api = { version = "3.0.0", default-features = false } +sp-arithmetic = { version = "3.0.0", default-features = false } +sp-block-builder = { default-features = false, version = "3.0.0" } +sp-consensus-aura = { version = "0.9.0", default-features = false } +sp-core = { version = "3.0.0", default-features = false } sp-inherents = { version = "3.0.0", default-features = false } sp-offchain = { version = "3.0.0", default-features = false } -sp-core = { version = "3.0.0", default-features = false } -sp-std = { version = "3.0.0", default-features = false } -sp-api = { version = "3.0.0", default-features = false } sp-runtime = { version = "3.0.0", default-features = false } sp-session = { version = "3.0.0", default-features = false } +sp-std = { version = "3.0.0", default-features = false } sp-transaction-pool = { version = "3.0.0", default-features = false } sp-version = { version = "3.0.0", default-features = false } -sp-consensus-aura = { version = "0.9.0", default-features = false } # frame dependencies frame-benchmarking = { version = "3.0.0", default-features = false, optional = true } -frame-try-runtime = { version = "0.9.0", default-features = false, optional = true } frame-executive = { version = "3.0.0", default-features = false } frame-support = { version = "3.0.0", default-features = false } frame-system = { version = "3.0.0", default-features = false } frame-system-rpc-runtime-api = { version = "3.0.0", default-features = false } +frame-try-runtime = { version = "0.9.0", default-features = false, optional = true } +pallet-aura = { version = "3.0.0", default-features = false } pallet-authorship = { version = "3.0.0", default-features = false } pallet-balances = { version = "3.0.0", default-features = false } +pallet-bounties = { version = "3.0.0", default-features = false } pallet-collective = { version = "3.0.0", default-features = false } pallet-democracy = { version = "3.0.0", default-features = false } pallet-indices = { version = "3.0.0", default-features = false } pallet-randomness-collective-flip = { version = "3.0.0", default-features = false } +pallet-scheduler = { version = "3.0.0", default-features = false } pallet-session = { version = "3.0.0", default-features = false } pallet-sudo = { version = "3.0.0", default-features = false } pallet-timestamp = { version = "3.0.0", default-features = false } pallet-transaction-payment = { version = "3.0.0", default-features = false } pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", default-features = false } +pallet-treasury = { version = "3.0.0", default-features = false } pallet-utility = { version = "3.0.0", default-features = false } -pallet-scheduler = { version = "3.0.0", default-features = false } -pallet-aura = { version = "3.0.0", default-features = false } # Cumulus dependencies cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.8" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.8" } cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.8" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.8" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.8" } cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.8" } cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.8" } cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.8" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.8" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.8" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.8" } -parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.8" } pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.8" } +parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.8" } # Polkadot dependencies +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.8" } polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.8" } xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.8" } xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.8" } xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.8" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.8" } # Bifrost pallet-vesting = { package = "bifrost-vesting", path = "../../pallets/vesting", default-features = false } @@ -78,7 +84,6 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran [features] default = ["std"] -with-tracing = [ "frame-executive/with-tracing" ] std = [ "codec/std", "log/std", @@ -97,14 +102,15 @@ std = [ "pallet-timestamp/std", "pallet-transaction-payment-rpc-runtime-api/std", "pallet-transaction-payment/std", - "sp-consensus-aura/std", + "sp-api/std", + "sp-arithmetic/std", "sp-block-builder/std", + "sp-consensus-aura/std", "sp-inherents/std", "sp-offchain/std", "sp-core/std", - "sp-std/std", - "sp-api/std", "sp-runtime/std", + "sp-std/std", "sp-session/std", "sp-transaction-pool/std", "parachain-info/std", @@ -127,6 +133,7 @@ std = [ "orml-traits/std", "orml-tokens/std", ] +with-tracing = ["frame-executive/with-tracing"] runtime-benchmarks = [ "frame-benchmarking", diff --git a/runtime/bifrost/src/lib.rs b/runtime/bifrost/src/lib.rs index 3781c6748..758464358 100644 --- a/runtime/bifrost/src/lib.rs +++ b/runtime/bifrost/src/lib.rs @@ -40,6 +40,7 @@ use frame_system::limits::{BlockLength, BlockWeights}; pub use pallet_balances::Call as BalancesCall; pub use pallet_timestamp::Call as TimestampCall; use sp_api::impl_runtime_apis; +use sp_arithmetic::Percent; pub use sp_consensus_aura::sr25519::AuthorityId as AuraId; use sp_core::OpaqueMetadata; #[cfg(any(feature = "std", test))] @@ -548,6 +549,55 @@ impl orml_tokens::Config for Runtime { type WeightInfo = (); } +parameter_types! { + pub const ProposalBond: Permill = Permill::from_percent(5); + pub const ProposalBondMinimum: Balance = 50 * DOLLARS; + pub const SpendPeriod: BlockNumber = 6 * DAYS; + pub const Burn: Permill = Permill::from_perthousand(2); + pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry"); + + pub const TipCountdown: BlockNumber = 1 * DAYS; + pub const TipFindersFee: Percent = Percent::from_percent(20); + pub const TipReportDepositBase: Balance = 1 * DOLLARS; + pub const DataDepositPerByte: Balance = 10 * CENTS; + pub const BountyDepositBase: Balance = 1 * DOLLARS; + pub const BountyDepositPayoutDelay: BlockNumber = 4 * DAYS; + pub const BountyUpdatePeriod: BlockNumber = 90 * DAYS; + pub const MaximumReasonLength: u32 = 16384; + pub const BountyCuratorDeposit: Permill = Permill::from_percent(50); + pub const BountyValueMinimum: Balance = 10 * DOLLARS; + pub const MaxApprovals: u32 = 100; +} + +impl pallet_treasury::Config for Runtime { + type ApproveOrigin = EnsureRoot; + type Burn = Burn; + type BurnDestination = Treasury; + type Currency = Balances; + type Event = Event; + type MaxApprovals = MaxApprovals; + type OnSlash = Treasury; + type PalletId = TreasuryPalletId; + type ProposalBond = ProposalBond; + type ProposalBondMinimum = ProposalBondMinimum; + type RejectOrigin = EnsureRoot; + type SpendFunds = Bounties; + type SpendPeriod = SpendPeriod; + type WeightInfo = pallet_treasury::weights::SubstrateWeight; +} + +impl pallet_bounties::Config for Runtime { + type BountyCuratorDeposit = BountyCuratorDeposit; + type BountyDepositBase = BountyDepositBase; + type BountyDepositPayoutDelay = BountyDepositPayoutDelay; + type BountyUpdatePeriod = BountyUpdatePeriod; + type BountyValueMinimum = BountyValueMinimum; + type DataDepositPerByte = DataDepositPerByte; + type Event = Event; + type MaximumReasonLength = MaximumReasonLength; + type WeightInfo = pallet_bounties::weights::SubstrateWeight; +} + construct_runtime! { pub enum Runtime where Block = Block, @@ -578,6 +628,8 @@ construct_runtime! { // Democracy: pallet_democracy::{Pallet, Call, Storage, Config, Event} = 30, // Council: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 31, // TechnicalCommittee: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 32, + Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 36, + Bounties: pallet_bounties::{Pallet, Call, Storage, Event} = 37, // XCM helpers. XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event} = 40, From 4b957a215a003003484d1412d6012fae22126ea4 Mon Sep 17 00:00:00 2001 From: herryho Date: Mon, 16 Aug 2021 12:01:00 +0800 Subject: [PATCH 3/6] change ausd to kusd --- docs/developer_setting.json | 13 +- node/primitives/src/currency.rs | 2 +- node/primitives/src/tests.rs | 24 ++-- node/service/src/chain_spec/asgard.rs | 8 +- node/service/src/chain_spec/dev.rs | 2 +- pallets/flexible-fee/src/lib.rs | 2 +- pallets/flexible-fee/src/tests.rs | 6 +- pallets/minter-reward/src/lib.rs | 2 +- pallets/minter-reward/src/mock.rs | 8 +- pallets/minter-reward/src/tests.rs | 2 +- pallets/proxy-validator/src/tests.rs | 179 ++++++++++++++++++++------ pallets/salp/src/mock.rs | 2 +- pallets/swap/src/tests.rs | 52 ++++---- pallets/vtoken-mint/src/mock.rs | 4 +- pallets/vtoken-mint/src/tests.rs | 4 +- runtime/asgard/src/lib.rs | 14 +- runtime/bifrost/src/lib.rs | 2 +- runtime/dev/src/lib.rs | 2 +- 18 files changed, 220 insertions(+), 108 deletions(-) diff --git a/docs/developer_setting.json b/docs/developer_setting.json index eff880d07..aa03a6e5e 100644 --- a/docs/developer_setting.json +++ b/docs/developer_setting.json @@ -9,7 +9,7 @@ "TokenSymbol": { "_enum": { "ASG": 0, - "aUSD": 2, + "KUSD": 2, "DOT": 3, "KSM": 4, "ETH": 5 @@ -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", @@ -63,7 +64,11 @@ "order_state": "OrderState" }, "OrderState": { - "_enum": ["InTrade", "Revoked", "Clinchd"] + "_enum": [ + "InTrade", + "Revoked", + "Clinchd" + ] }, "AssetId": { "chain_id": "u32", @@ -81,4 +86,4 @@ "reserve_1": "AssetBalance", "lp_asset_id": "AssetId" } -} +} \ No newline at end of file diff --git a/node/primitives/src/currency.rs b/node/primitives/src/currency.rs index 969ee1a6f..23baf6139 100644 --- a/node/primitives/src/currency.rs +++ b/node/primitives/src/currency.rs @@ -256,7 +256,7 @@ create_currency_id! { pub enum TokenSymbol { ASG("Asgard", 12) = 0, BNC("Bifrost", 12) = 1, - AUSD("Acala Dollar", 12) = 2, + KUSD("Acala Dollar", 12) = 2, DOT("Polkadot", 10) = 3, KSM("Kusama", 12) = 4, ETH("Ethereum", 18) = 5, diff --git a/node/primitives/src/tests.rs b/node/primitives/src/tests.rs index bad5185ae..3f253b7c3 100644 --- a/node/primitives/src/tests.rs +++ b/node/primitives/src/tests.rs @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); diff --git a/node/service/src/chain_spec/asgard.rs b/node/service/src/chain_spec/asgard.rs index 6f56ca694..5d7aeaad9 100644 --- a/node/service/src/chain_spec/asgard.rs +++ b/node/service/src/chain_spec/asgard.rs @@ -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), @@ -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(), @@ -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), diff --git a/node/service/src/chain_spec/dev.rs b/node/service/src/chain_spec/dev.rs index 8a7049fa4..42e49f7ef 100644 --- a/node/service/src/chain_spec/dev.rs +++ b/node/service/src/chain_spec/dev.rs @@ -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), diff --git a/pallets/flexible-fee/src/lib.rs b/pallets/flexible-fee/src/lib.rs index 84464ee7a..da363f0a9 100644 --- a/pallets/flexible-fee/src/lib.rs +++ b/pallets/flexible-fee/src/lib.rs @@ -123,7 +123,7 @@ pub mod pallet { pub fn DefaultFeeChargeOrder() -> Vec> { [ CurrencyId::Native(TokenSymbol::ASG), - CurrencyId::Stable(TokenSymbol::AUSD), + CurrencyId::Stable(TokenSymbol::KUSD), CurrencyId::Token(TokenSymbol::DOT), CurrencyId::VToken(TokenSymbol::DOT), CurrencyId::Token(TokenSymbol::KSM), diff --git a/pallets/flexible-fee/src/tests.rs b/pallets/flexible-fee/src/tests.rs index 2626c4698..708b42ee5 100644 --- a/pallets/flexible-fee/src/tests.rs +++ b/pallets/flexible-fee/src/tests.rs @@ -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); @@ -156,7 +156,7 @@ fn inner_get_user_fee_charge_order_list_should_work() { let mut default_order_list: Vec = 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)); @@ -189,7 +189,7 @@ fn ensure_can_charge_fee_should_work() { let mut default_order_list: Vec = 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)); diff --git a/pallets/minter-reward/src/lib.rs b/pallets/minter-reward/src/lib.rs index ec1c1d2c5..82e29c166 100644 --- a/pallets/minter-reward/src/lib.rs +++ b/pallets/minter-reward/src/lib.rs @@ -306,7 +306,7 @@ pub mod pallet { }; for (minter, currency_id, vtoken_amount) in Minter::::iter() { let weight = CurrencyWeights::::get(¤cy_id); - let total_vtoken_mint = TotalVtokenMinted::::get(currency_id); // AUSD + let total_vtoken_mint = TotalVtokenMinted::::get(currency_id); // KUSD let reward = bnc_reward.saturating_mul(weight.into().saturating_mul(vtoken_amount)) / (total_weight.saturating_mul(total_vtoken_mint)); diff --git a/pallets/minter-reward/src/mock.rs b/pallets/minter-reward/src/mock.rs index 8007161ce..74b84fbd3 100644 --- a/pallets/minter-reward/src/mock.rs +++ b/pallets/minter-reward/src/mock.rs @@ -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); @@ -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; @@ -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), diff --git a/pallets/minter-reward/src/tests.rs b/pallets/minter-reward/src/tests.rs index 92ec99b2d..73eb8acc7 100644 --- a/pallets/minter-reward/src/tests.rs +++ b/pallets/minter-reward/src/tests.rs @@ -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(); diff --git a/pallets/proxy-validator/src/tests.rs b/pallets/proxy-validator/src/tests.rs index 14eb49876..165843ec8 100644 --- a/pallets/proxy-validator/src/tests.rs +++ b/pallets/proxy-validator/src/tests.rs @@ -20,17 +20,21 @@ #![cfg(test)] -use crate::*; use crate::mock::*; -use frame_support::{assert_ok, assert_noop}; -use node_primitives::{ - Token, TokenSymbol, -}; +use crate::*; +use frame_support::{assert_noop, assert_ok}; +use node_primitives::{Token, TokenSymbol}; fn set_global_asset(token_symbol: TokenSymbol) { let redeem_duration = 100; let min_reward_per_block = 1; - ProxyValidator::set_global_asset(Origin::root(), token_symbol, redeem_duration, min_reward_per_block).unwrap(); + ProxyValidator::set_global_asset( + Origin::root(), + token_symbol, + redeem_duration, + min_reward_per_block, + ) + .unwrap(); } fn asset_issue(account_id: u64, symbol: Vec, token_symbol: TokenSymbol, amount: u64) { @@ -46,9 +50,12 @@ fn set_asset_should_work() { let min_reward_per_block = 1; let asset_config = AssetConfig::new(redeem_duration, min_reward_per_block); - assert_ok!( - ProxyValidator::set_global_asset(Origin::root(), token_symbol, redeem_duration, min_reward_per_block) - ); + assert_ok!(ProxyValidator::set_global_asset( + Origin::root(), + token_symbol, + redeem_duration, + min_reward_per_block + )); assert_eq!(ProxyValidator::asset_configs(token_symbol), asset_config); }); @@ -65,7 +72,13 @@ fn stake_should_ok() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin, token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin, + token_symbol, + need, + reward_per_block, + validator_address + )); let target = 1; let amount = 100; @@ -109,7 +122,13 @@ fn stake_amount_exceed_should_error() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin, token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin, + token_symbol, + need, + reward_per_block, + validator_address + )); let target = 1; let amount = 2000; @@ -131,7 +150,13 @@ fn unstake_should_ok() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin, token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin, + token_symbol, + need, + reward_per_block, + validator_address + )); let target = 1; let stake_amount = 500; @@ -172,7 +197,13 @@ fn unstake_insufficient_should_error() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin, token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin, + token_symbol, + need, + reward_per_block, + validator_address + )); let target = 1; let stake_amount = 500; @@ -198,9 +229,16 @@ fn register_should_work() { let need = 1000; let reward_per_block = 100; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - let validator = ProxyValidatorRegister::new(need, reward_per_block, validator_address.clone()); + let validator = + ProxyValidatorRegister::new(need, reward_per_block, validator_address.clone()); - assert_ok!(ProxyValidator::validator_register(origin, token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin, + token_symbol, + need, + reward_per_block, + validator_address + )); assert_eq!(ProxyValidator::validators(token_symbol, origin_id), validator); }); @@ -217,7 +255,13 @@ fn register_asset_not_set_should_error() { let validator_address = vec![0x12, 0x34, 0x56, 0x78]; assert_noop!( - ProxyValidator::validator_register(origin, token_symbol, need, reward_per_block, validator_address), + ProxyValidator::validator_register( + origin, + token_symbol, + need, + reward_per_block, + validator_address + ), ProxyValidatorError::AssetConfigNotSet ); }); @@ -234,12 +278,22 @@ fn register_twice_should_error() { let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!( - ProxyValidator::validator_register(origin.clone(), token_symbol, need, reward_per_block, validator_address.clone()) - ); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + token_symbol, + need, + reward_per_block, + validator_address.clone() + )); assert_noop!( - ProxyValidator::validator_register(origin, token_symbol, need, Zero::zero(), validator_address), + ProxyValidator::validator_register( + origin, + token_symbol, + need, + Zero::zero(), + validator_address + ), ProxyValidatorError::ProxyValidatorRegistered ); }); @@ -256,7 +310,13 @@ fn register_reward_too_low_should_error() { let validator_address = vec![0x12, 0x34, 0x56, 0x78]; assert_noop!( - ProxyValidator::validator_register(origin.clone(), token_symbol, need, 0, validator_address.clone()), + ProxyValidator::validator_register( + origin.clone(), + token_symbol, + need, + 0, + validator_address.clone() + ), ProxyValidatorError::RewardTooLow ); }); @@ -273,7 +333,13 @@ fn set_need_amount_should_work() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin.clone(), token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + token_symbol, + need, + reward_per_block, + validator_address + )); let new_need = 2000; assert_ok!(ProxyValidator::set_need_amount(origin, token_symbol, new_need)); @@ -308,7 +374,13 @@ fn set_reward_per_block_should_work() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin.clone(), token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + token_symbol, + need, + reward_per_block, + validator_address + )); let reward_per_block = 200000; assert_ok!(ProxyValidator::set_reward_per_block(origin, token_symbol, reward_per_block)); @@ -343,7 +415,13 @@ fn set_reward_per_block_reward_too_low_should_error() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin.clone(), token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + token_symbol, + need, + reward_per_block, + validator_address + )); let reward_per_block = 0; assert_noop!( @@ -353,7 +431,6 @@ fn set_reward_per_block_reward_too_low_should_error() { }); } - #[test] fn deposit_should_work() { new_test_ext().execute_with(|| { @@ -363,7 +440,7 @@ fn deposit_should_work() { let origin = Origin::signed(origin_id); let precision = 8; - assert_ok!(Assets::create(Origin::root(), b"AUSD".to_vec(), 18)); // let dot start from 1 + assert_ok!(Assets::create(Origin::root(), b"KUSD".to_vec(), 18)); // let dot start from 1 assert_ok!(Assets::create(Origin::root(), b"DOT".to_vec(), precision)); let dot_id = Assets::next_asset_id() - 1; @@ -374,7 +451,13 @@ fn deposit_should_work() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin.clone(), dot_type, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + dot_type, + need, + reward_per_block, + validator_address + )); let deposit_amount = 100; assert_ok!(ProxyValidator::deposit(origin.clone(), dot_type, deposit_amount)); @@ -399,7 +482,7 @@ fn deposit_not_enough_free_balance_should_error() { let origin = Origin::signed(origin_id); let precision = 8; - assert_ok!(Assets::create(Origin::root(), b"AUSD".to_vec(), 18)); // let dot start from 1 + assert_ok!(Assets::create(Origin::root(), b"KUSD".to_vec(), 18)); // let dot start from 1 assert_ok!(Assets::create(Origin::root(), b"DOT".to_vec(), precision)); let dot_id = Assets::next_asset_id() - 1; @@ -411,7 +494,13 @@ fn deposit_not_enough_free_balance_should_error() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin.clone(), dot_type, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + dot_type, + need, + reward_per_block, + validator_address + )); let deposit_amount = 20000; assert_noop!( @@ -445,7 +534,7 @@ fn withdraw_should_ok() { let origin = Origin::signed(origin_id); let precision = 8; - assert_ok!(Assets::create(Origin::root(), b"AUSD".to_vec(), 18)); // let dot start from 1 + assert_ok!(Assets::create(Origin::root(), b"KUSD".to_vec(), 18)); // let dot start from 1 assert_ok!(Assets::create(Origin::root(), b"DOT".to_vec(), precision)); let dot_id = Assets::next_asset_id() - 1; @@ -457,7 +546,13 @@ fn withdraw_should_ok() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin.clone(), dot_type, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + dot_type, + need, + reward_per_block, + validator_address + )); let deposit_amount = 500; assert_ok!(ProxyValidator::deposit(origin.clone(), dot_type, deposit_amount)); @@ -479,7 +574,7 @@ fn withdraw_not_enough_locked_balance_should_error() { let origin = Origin::signed(origin_id); let precision = 8; - assert_ok!(Assets::create(Origin::root(), b"AUSD".to_vec(), 18)); // let dot start from 1 + assert_ok!(Assets::create(Origin::root(), b"KUSD".to_vec(), 18)); // let dot start from 1 assert_ok!(Assets::create(Origin::root(), b"DOT".to_vec(), precision)); let dot_id = Assets::next_asset_id() - 1; @@ -491,7 +586,13 @@ fn withdraw_not_enough_locked_balance_should_error() { let need = 1000; let reward_per_block = 10; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin.clone(), dot_type, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + dot_type, + need, + reward_per_block, + validator_address + )); let deposit_amount = 500; assert_ok!(ProxyValidator::deposit(origin.clone(), dot_type, deposit_amount)); @@ -522,7 +623,7 @@ fn withdraw_not_registered_should_error() { #[test] fn validator_deduct_should_ok() { new_test_ext().execute_with(|| { - let token_symbol = TokenSymbol::AUSD; + let token_symbol = TokenSymbol::KUSD; set_global_asset(token_symbol); let origin_id = 1; @@ -530,10 +631,16 @@ fn validator_deduct_should_ok() { let need = 1_000_000_000_000_000; let reward_per_block = 220; let validator_address = vec![0x12, 0x34, 0x56, 0x78]; - assert_ok!(ProxyValidator::validator_register(origin.clone(), token_symbol, need, reward_per_block, validator_address)); + assert_ok!(ProxyValidator::validator_register( + origin.clone(), + token_symbol, + need, + reward_per_block, + validator_address + )); let deposit_amount = 100_000_000_000_000; - asset_issue(origin_id, b"AUSD".to_vec(), token_symbol, deposit_amount); + asset_issue(origin_id, b"KUSD".to_vec(), token_symbol, deposit_amount); assert_ok!(ProxyValidator::deposit(origin.clone(), token_symbol, deposit_amount)); let target = 1; diff --git a/pallets/salp/src/mock.rs b/pallets/salp/src/mock.rs index 614a7472c..bf96e24ba 100644 --- a/pallets/salp/src/mock.rs +++ b/pallets/salp/src/mock.rs @@ -60,7 +60,7 @@ construct_runtime!( parameter_types! { pub const NativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::ASG); pub const RelayCurrencyId: CurrencyId = CurrencyId::Token(TokenSymbol::KSM); - pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::AUSD); + pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::KUSD); } parameter_types! { diff --git a/pallets/swap/src/tests.rs b/pallets/swap/src/tests.rs index 8f3a8cc66..ee7d5e218 100644 --- a/pallets/swap/src/tests.rs +++ b/pallets/swap/src/tests.rs @@ -33,7 +33,7 @@ fn initialize_pool_for_dispatches() { // initialize some parameters used to dispatch the create_pool call. let alice = 1; let bob = 2; - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let dot_id = CurrencyId::Token(TokenSymbol::DOT); let ksm_id = CurrencyId::Token(TokenSymbol::KSM); @@ -124,7 +124,7 @@ fn create_pool_should_work() { new_test_ext().execute_with(|| { // initialize some parameters used to dispatch the create_pool call. let alice = 1; - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let dot_id = CurrencyId::Token(TokenSymbol::DOT); let ksm_id = CurrencyId::Token(TokenSymbol::KSM); @@ -165,12 +165,12 @@ fn create_pool_should_work() { assert_eq!(result.active, false); // Validate the initial value of pool state is inactive. // validate the value of storage TokenWeightsInPool. - assert_eq!(Swap::token_weights_in_pool(0, asud_id), 20_000); // the weight of AUSD token + assert_eq!(Swap::token_weights_in_pool(0, asud_id), 20_000); // the weight of KUSD token assert_eq!(Swap::token_weights_in_pool(0, dot_id), 40_000); // the weight of dot token assert_eq!(Swap::token_weights_in_pool(0, ksm_id), 40_000); // the weight of ksm token // validate the value of storage TokenBalancesInPool. - assert_eq!(Swap::token_balances_in_pool(0, asud_id), 500); // the balance of AUSD token + assert_eq!(Swap::token_balances_in_pool(0, asud_id), 500); // the balance of KUSD token assert_eq!(Swap::token_balances_in_pool(0, dot_id), 1_000); // the balance of dot token assert_eq!(Swap::token_balances_in_pool(0, ksm_id), 400); // the balance of ksm token @@ -319,7 +319,7 @@ fn add_liquidity_given_shares_in_should_work() { let pool_id = 0; let new_pool_token = 200; // Alice initial pool token amount is 1000. Bob want's to get 20% of that of Alice's. - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let dot_id = CurrencyId::Token(TokenSymbol::DOT); let ksm_id = CurrencyId::Token(TokenSymbol::KSM); @@ -337,7 +337,7 @@ fn add_liquidity_given_shares_in_should_work() { assert_eq!(Swap::token_balances_in_pool(pool_id, ksm_id), 480); // check wether bob's account has been deducted corresponding amount for different tokens. - assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 999_900); // get the user's balance for AUSD + assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 999_900); // get the user's balance for KUSD assert_eq!(::CurrenciesHandler::free_balance(dot_id, &bob), 999_800); // get the user's balance for dot assert_eq!(::CurrenciesHandler::free_balance(ksm_id, &bob), 999_920); // get the user's balance for ksm @@ -401,7 +401,7 @@ fn add_single_liquidity_given_amount_in_should_work() { let bob = 2; let creator = Origin::signed(bob); let pool_id = 0; - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let asset_id = asud_id; let token_amount_in = 5_000; @@ -421,8 +421,8 @@ fn add_single_liquidity_given_amount_in_should_work() { // check wether the token balances are right. assert_eq!(Swap::token_balances_in_pool(pool_id, asud_id), 5_500); - // check wether bob's account has been deducted corresponding amount for AUSD. - assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 995_000); // get the user's balance for AUSD + // check wether bob's account has been deducted corresponding amount for KUSD. + assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 995_000); // get the user's balance for KUSD // Below are the incorrect operations. @@ -509,7 +509,7 @@ fn add_single_liquidity_given_shares_in_should_work() { let pool_id = 0; let new_pool_token = 200; // Alice initial pool token amount is 1000. Bob want's to get 20% of that of Alice's. - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let dot_id = CurrencyId::Token(TokenSymbol::DOT); let ksm_id = CurrencyId::Token(TokenSymbol::KSM); @@ -533,7 +533,7 @@ fn add_single_liquidity_given_shares_in_should_work() { assert_eq!(Swap::token_balances_in_pool(pool_id, ksm_id), 400); // check wether bob's account has been deducted corresponding amount for different tokens. - assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 981_396); // get the user's balance for AUSD + assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 981_396); // get the user's balance for KUSD assert_eq!(::CurrenciesHandler::free_balance(dot_id, &bob), 1_000_000); // get the user's balance for dot assert_eq!(::CurrenciesHandler::free_balance(ksm_id, &bob), 1_000_000); // get the user's balance for ksm @@ -624,7 +624,7 @@ fn remove_single_asset_liquidity_given_shares_in_should_work() { let pool_id = 0; let pool_token_out = 200; // Alice initial pool token amount is 1000. Bob want's to get 20% of that of Alice's. - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let dot_id = CurrencyId::Token(TokenSymbol::DOT); let ksm_id = CurrencyId::Token(TokenSymbol::KSM); @@ -647,8 +647,8 @@ fn remove_single_asset_liquidity_given_shares_in_should_work() { assert_eq!(Swap::token_balances_in_pool(pool_id, dot_id), 1_000); assert_eq!(Swap::token_balances_in_pool(pool_id, ksm_id), 400); - // check wether Alice's account has been added by corresponding amount for AUSD. - assert_eq!(::CurrenciesHandler::free_balance(asud_id, &alice), 9_822); // get the user's balance for AUSD + // check wether Alice's account has been added by corresponding amount for KUSD. + assert_eq!(::CurrenciesHandler::free_balance(asud_id, &alice), 9_822); // get the user's balance for KUSD assert_eq!(::CurrenciesHandler::free_balance(dot_id, &alice), 29_000); // get the user's balance for dot assert_eq!(::CurrenciesHandler::free_balance(ksm_id, &alice), 29_600); // get the user's balance for ksm @@ -751,7 +751,7 @@ fn remove_single_asset_liquidity_given_amount_in_should_work() { let remover = Origin::signed(alice); let pool_id = 0; let token_amount = 400; // Alice initial pool token amount is 1000. - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let asset_id = asud_id; assert_ok!(Swap::remove_single_asset_liquidity_given_amount_in( remover, @@ -769,8 +769,8 @@ fn remove_single_asset_liquidity_given_amount_in_should_work() { // check wether the token balances are right. assert_eq!(Swap::token_balances_in_pool(pool_id, asud_id), 100); - // check wether bob's account has been deducted corresponding amount for AUSD. - assert_eq!(::CurrenciesHandler::free_balance(asud_id, &alice), 9_900); // get the user's balance for AUSD + // check wether bob's account has been deducted corresponding amount for KUSD. + assert_eq!(::CurrenciesHandler::free_balance(asud_id, &alice), 9_900); // get the user's balance for KUSD // Below are the incorrect operations. @@ -880,7 +880,7 @@ fn remove_assets_liquidity_given_shares_in_should_work() { let alice = 1; let remover = Origin::signed(alice); let pool_id = 0; - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let dot_id = CurrencyId::Token(TokenSymbol::DOT); let ksm_id = CurrencyId::Token(TokenSymbol::KSM); @@ -903,7 +903,7 @@ fn remove_assets_liquidity_given_shares_in_should_work() { assert_eq!(Swap::token_balances_in_pool(pool_id, ksm_id), 200); // check wether Alice's account has been added corresponding amount for different tokens. - assert_eq!(::CurrenciesHandler::free_balance(asud_id, &alice), 9_750); // get the user's balance for AUSD + assert_eq!(::CurrenciesHandler::free_balance(asud_id, &alice), 9_750); // get the user's balance for KUSD assert_eq!(::CurrenciesHandler::free_balance(dot_id, &alice), 29_500); // get the user's balance for dot assert_eq!(::CurrenciesHandler::free_balance(ksm_id, &alice), 29_800); // get the user's balance for ksm @@ -986,7 +986,7 @@ fn swap_exact_in_should_work() { let bob = 2; let swapper = Origin::signed(bob); let pool_id = 0; - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let dot_id = CurrencyId::Token(TokenSymbol::DOT); let ksm_id = CurrencyId::Token(TokenSymbol::KSM); @@ -1001,15 +1001,15 @@ fn swap_exact_in_should_work() { token_amount_in, min_token_amount_out, token_out_asset_id - )); // Bob to swap 100 AUSD for x amount of dot. + )); // Bob to swap 100 KUSD for x amount of dot. - // check whether the pool has added 100 AUSD. + // check whether the pool has added 100 KUSD. assert_eq!(Swap::token_balances_in_pool(pool_id, token_in_asset_id), 600); assert_eq!(Swap::token_balances_in_pool(pool_id, token_out_asset_id), 917); assert_eq!(Swap::token_balances_in_pool(pool_id, ksm_id), 400); // check whether bob's account has been added and deducted with corresponding amounts. - assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 999_900); // get the user's balance for AUSD + assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 999_900); // get the user's balance for KUSD assert_eq!(::CurrenciesHandler::free_balance(dot_id, &bob), 1_000_083); // get the user's balance for dot assert_eq!(::CurrenciesHandler::free_balance(ksm_id, &bob), 1_000_000); // get the user's balance for dot @@ -1123,7 +1123,7 @@ fn swap_exact_out_should_work() { let bob = 2; let swapper = Origin::signed(bob); let pool_id = 0; - let asud_id = CurrencyId::Stable(TokenSymbol::AUSD); + let asud_id = CurrencyId::Stable(TokenSymbol::KUSD); let dot_id = CurrencyId::Token(TokenSymbol::DOT); let ksm_id = CurrencyId::Token(TokenSymbol::KSM); @@ -1147,7 +1147,7 @@ fn swap_exact_out_should_work() { assert_eq!(Swap::token_balances_in_pool(pool_id, ksm_id), 400); // check whether bob's account has been added and deducted with corresponding amounts. - assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 999_938); // get the user's balance for AUSD + assert_eq!(::CurrenciesHandler::free_balance(asud_id, &bob), 999_938); // get the user's balance for KUSD assert_eq!(::CurrenciesHandler::free_balance(dot_id, &bob), 1_000_200); // get the user's balance for dot assert_eq!(::CurrenciesHandler::free_balance(ksm_id, &bob), 1_000_000); // get the user's balance for ksm @@ -1237,7 +1237,7 @@ fn swap_exact_out_should_work() { // swap more than the user has let max_token_amount_in = Some(2000); let token_amount_out = 400; - assert_ok!(::CurrenciesHandler::withdraw(token_in_asset_id, &bob, 999_800)); // destroy most of bob's AUSD + assert_ok!(::CurrenciesHandler::withdraw(token_in_asset_id, &bob, 999_800)); // destroy most of bob's KUSD assert_eq!( Swap::swap_exact_out( swapper.clone(), diff --git a/pallets/vtoken-mint/src/mock.rs b/pallets/vtoken-mint/src/mock.rs index 10c275c74..35a153715 100644 --- a/pallets/vtoken-mint/src/mock.rs +++ b/pallets/vtoken-mint/src/mock.rs @@ -45,7 +45,7 @@ use crate::{self as vtoken_mint}; 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); @@ -81,7 +81,7 @@ parameter_types! { pub BlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights::simple_max(1024); 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; diff --git a/pallets/vtoken-mint/src/tests.rs b/pallets/vtoken-mint/src/tests.rs index ce5ef3467..779984088 100644 --- a/pallets/vtoken-mint/src/tests.rs +++ b/pallets/vtoken-mint/src/tests.rs @@ -114,9 +114,9 @@ fn redeem_token_should_be_ok() { assert_eq!(VtokenMint::get_mint_pool(DOT), dot_pool - minted_dot); assert_eq!(VtokenMint::get_mint_pool(vDOT), vdot_pool - to_sell_vdot); - // Alice selling AUSD should not work. + // Alice selling KUSD should not work. assert_noop!( - VtokenMint::redeem(Origin::signed(ALICE), AUSD, to_sell_vdot), + VtokenMint::redeem(Origin::signed(ALICE), KUSD, to_sell_vdot), Error::::NotSupportTokenType ); diff --git a/runtime/asgard/src/lib.rs b/runtime/asgard/src/lib.rs index 20651b9be..c74e139fb 100644 --- a/runtime/asgard/src/lib.rs +++ b/runtime/asgard/src/lib.rs @@ -169,7 +169,7 @@ parameter_types! { parameter_types! { pub const NativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::ASG); pub const RelayCurrencyId: CurrencyId = CurrencyId::Token(TokenSymbol::KSM); - pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::AUSD); + pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::KUSD); pub SelfParaId: u32 = ParachainInfo::parachain_id().into(); } @@ -317,15 +317,15 @@ impl InstanceFilter for ProxyType { ), ProxyType::Governance => matches!( c, - Call::Democracy(..) | - Call::Council(..) | Call::TechnicalCommittee(..) | - Call::Elections(..) | Call::Treasury(..) | - Call::Bounties(..) | Call::Tips(..) | - Call::Utility(..) + Call::Democracy(..) + | Call::Council(..) | Call::TechnicalCommittee(..) + | Call::Elections(..) + | Call::Treasury(..) | Call::Bounties(..) + | Call::Tips(..) | Call::Utility(..) ), ProxyType::CancelProxy => { matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement(..))) - }, + } } } diff --git a/runtime/bifrost/src/lib.rs b/runtime/bifrost/src/lib.rs index 758464358..040c42df6 100644 --- a/runtime/bifrost/src/lib.rs +++ b/runtime/bifrost/src/lib.rs @@ -165,7 +165,7 @@ impl Filter for CallFilter { parameter_types! { pub const NativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::ASG); pub const RelayCurrencyId: CurrencyId = CurrencyId::Token(TokenSymbol::KSM); - pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::AUSD); + pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::KUSD); } impl frame_system::Config for Runtime { diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index cfa88f751..41d7401d1 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -173,7 +173,7 @@ parameter_types! { parameter_types! { pub const NativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::ASG); pub const RelayCurrencyId: CurrencyId = CurrencyId::Token(TokenSymbol::KSM); - pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::AUSD); + pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::KUSD); } impl frame_system::Config for Runtime { From fecb35ea0ea9e48974f0d8cc352d4d04983daa4d Mon Sep 17 00:00:00 2001 From: herryho Date: Mon, 16 Aug 2021 15:15:23 +0800 Subject: [PATCH 4/6] resolve conflicts --- runtime/asgard/src/lib.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/runtime/asgard/src/lib.rs b/runtime/asgard/src/lib.rs index d5eb3a8af..c74e139fb 100644 --- a/runtime/asgard/src/lib.rs +++ b/runtime/asgard/src/lib.rs @@ -170,10 +170,7 @@ parameter_types! { pub const NativeCurrencyId: CurrencyId = CurrencyId::Native(TokenSymbol::ASG); pub const RelayCurrencyId: CurrencyId = CurrencyId::Token(TokenSymbol::KSM); pub const StableCurrencyId: CurrencyId = CurrencyId::Stable(TokenSymbol::KUSD); -<<<<<<< HEAD pub SelfParaId: u32 = ParachainInfo::parachain_id().into(); -======= ->>>>>>> c15f40c6dbfef906f2fbeee69d578c015e2eab8c } impl frame_system::Config for Runtime { From ce2f5abd2a0f295713602292b74a4fc65401486e Mon Sep 17 00:00:00 2001 From: herryho Date: Mon, 16 Aug 2021 15:17:09 +0800 Subject: [PATCH 5/6] cargo +nightly fmt --all --- runtime/asgard/src/lib.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/runtime/asgard/src/lib.rs b/runtime/asgard/src/lib.rs index c74e139fb..020971e68 100644 --- a/runtime/asgard/src/lib.rs +++ b/runtime/asgard/src/lib.rs @@ -317,15 +317,15 @@ impl InstanceFilter for ProxyType { ), ProxyType::Governance => matches!( c, - Call::Democracy(..) - | Call::Council(..) | Call::TechnicalCommittee(..) - | Call::Elections(..) - | Call::Treasury(..) | Call::Bounties(..) - | Call::Tips(..) | Call::Utility(..) + Call::Democracy(..) | + Call::Council(..) | Call::TechnicalCommittee(..) | + Call::Elections(..) | Call::Treasury(..) | + Call::Bounties(..) | Call::Tips(..) | + Call::Utility(..) ), ProxyType::CancelProxy => { matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement(..))) - } + }, } } From 7566f4a7490c79712fe59a8e2bd94476832a0cc0 Mon Sep 17 00:00:00 2001 From: herryho Date: Tue, 17 Aug 2021 10:35:23 +0800 Subject: [PATCH 6/6] TokenSymbol description change from Acala dollar to Karura dollar --- node/primitives/src/currency.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/primitives/src/currency.rs b/node/primitives/src/currency.rs index 23baf6139..41c097793 100644 --- a/node/primitives/src/currency.rs +++ b/node/primitives/src/currency.rs @@ -256,7 +256,7 @@ create_currency_id! { pub enum TokenSymbol { ASG("Asgard", 12) = 0, BNC("Bifrost", 12) = 1, - KUSD("Acala Dollar", 12) = 2, + KUSD("Karura Dollar", 12) = 2, DOT("Polkadot", 10) = 3, KSM("Kusama", 12) = 4, ETH("Ethereum", 18) = 5,