From d1144fd53f6a059677d12a5daaf60a4595245a91 Mon Sep 17 00:00:00 2001 From: Muhammad-Jibril Date: Fri, 20 Aug 2021 05:35:26 +0800 Subject: [PATCH 1/2] update submodules --- lib-openrml | 2 +- predeploy-contracts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib-openrml b/lib-openrml index fa64469d8..650ef607d 160000 --- a/lib-openrml +++ b/lib-openrml @@ -1 +1 @@ -Subproject commit fa64469d84133f7285cea3a5ed1c201926bc364e +Subproject commit 650ef607d023e4537d3f2932baa5e50bc3a349cb diff --git a/predeploy-contracts b/predeploy-contracts index 1353f32bd..eee4a8f30 160000 --- a/predeploy-contracts +++ b/predeploy-contracts @@ -1 +1 @@ -Subproject commit 1353f32bdd7741c225c58af749b3f0a3f15b07a0 +Subproject commit eee4a8f305485d9affd32fd161676486b8b79e15 From 34eace7086360616c78851a9f237412fb493fb3e Mon Sep 17 00:00:00 2001 From: Muhammad-Jibril Date: Fri, 20 Aug 2021 06:40:27 +0800 Subject: [PATCH 2/2] Complete token symbol renamings and add DNAR paired LPs and SETUSD paired LPs --- README.md | 15 +- lib-serml/dex/dex/src/mock.rs | 16 +- lib-serml/dex/dex/src/tests.rs | 444 +++++++++--------- lib-serml/evm/evm-manager/src/tests.rs | 28 +- lib-serml/serp/serp-prices/src/lib.rs | 35 +- lib-serml/serp/serp-prices/src/mock.rs | 38 +- lib-serml/serp/serp-prices/src/tests.rs | 32 +- lib-serml/serp/serp-treasury/src/lib.rs | 2 +- lib-serml/serp/serp-treasury/src/mock.rs | 127 ++--- lib-serml/serp/serp-treasury/src/tests.rs | 28 +- .../settmint/settmint-engine/src/mock.rs | 132 ++---- .../settmint/settmint-engine/src/tests.rs | 24 +- .../settmint/settmint-gateway/src/mock.rs | 124 ++--- .../settmint/settmint-gateway/src/tests.rs | 42 +- .../settmint/settmint-manager/src/mock.rs | 142 +++--- .../settmint/settmint-manager/src/tests.rs | 104 ++-- lib-serml/support/src/lib.rs | 4 +- lib-serml/tokens/currencies/src/mock.rs | 117 ++--- node/service/src/chain_spec/newrome.rs | 49 +- node/service/src/chain_spec/setheum.rs | 4 +- primitives/src/currency.rs | 103 ++-- primitives/src/tests.rs | 8 +- runtime/common/src/lib.rs | 4 +- runtime/common/src/precompile/input.rs | 2 +- runtime/common/src/precompile/mock.rs | 44 +- runtime/common/src/precompile/tests.rs | 52 +- .../src/benchmarking/setheum_chainbridge.rs | 10 +- .../src/benchmarking/settmint_manager.rs | 10 +- runtime/newrome/src/benchmarking/tokens.rs | 14 +- .../src/benchmarking/transaction_payment.rs | 2 +- runtime/newrome/src/benchmarking/utils.rs | 2 +- runtime/newrome/src/lib.rs | 82 ++-- runtime/setheum/src/lib.rs | 76 ++- 33 files changed, 837 insertions(+), 1079 deletions(-) diff --git a/README.md b/README.md index d421a9197..af88a80ab 100644 --- a/README.md +++ b/README.md @@ -41,16 +41,11 @@ DRAM("Setheum Dirham", 12) = 1, // Staking Reward and Governance Token - System #### The SettCurrencies - SERP Stablecoins ``` - USDJ("Setheum US Dollar", 12) = 3, - EURJ("Setheum Euro", 12) = 4, - JPYJ("Setheum Japanese Yen", 12) = 5, - GBPJ("Setheum Pound Sterling", 12) = 6, - AUDJ("Setheum Australian Dollar", 12) = 7, - CADJ("Setheum Canadian Dollar", 12) = 8, - CHFJ("Setheum Swiss Franc", 12) = 9, - SEKJ("Setheum Swedish Krona", 12) = 10, - SGDJ("Setheum Singapore Dollar", 12) = 11, - SARJ("Setheum Saudi Riyal", 12) = 12, + SETUSD("SetDollar", 12) = 3, + SETEUR("SetEuro", 12) = 4, + SETGBP("SetPound", 12) = 5, + SETCHF("SetFranc", 12) = 6, + SETSAR("SetRiyal", 12) = 7, ``` 1. The Setter - The Setter is a basket currency pegged to the Top 10 Strongest and most valuable currencies. It serves as the medium of Exchange and the Defacto stablecoin of the Setheum Ecosystem. All other Setheum system stablecoins orbit around the Setter (SETR) and the SettMint for minting Setheum Currencies (system stablecoins) accepts only the Setter as the Minting Reserve Asset. Only with the Setter (SETR) can a user participate in the DNAR Auctions to stabilize the price of the Setter, while the Setter is Auctioned to stabilize the price of all the other SettCurrencies (system stablecoins). It's the star that brightens many planets - 10 to be exact diff --git a/lib-serml/dex/dex/src/mock.rs b/lib-serml/dex/dex/src/mock.rs index 8ce2b727d..980b336e9 100644 --- a/lib-serml/dex/dex/src/mock.rs +++ b/lib-serml/dex/dex/src/mock.rs @@ -33,14 +33,14 @@ pub type AccountId = u128; pub const ALICE: AccountId = 1; pub const BOB: AccountId = 2; -pub const USDJ: CurrencyId = CurrencyId::Token(TokenSymbol::USDJ); +pub const SETUSD: CurrencyId = CurrencyId::Token(TokenSymbol::SETUSD); pub const BTC: CurrencyId = CurrencyId::Token(TokenSymbol::RENBTC); pub const DRAM: CurrencyId = CurrencyId::Token(TokenSymbol::DRAM); pub const DNAR: CurrencyId = CurrencyId::Token(TokenSymbol::DNAR); parameter_types! { - pub static USDJBTCPair: TradingPair = TradingPair::from_currency_ids(USDJ, BTC).unwrap(); - pub static USDJDRAMPair: TradingPair = TradingPair::from_currency_ids(USDJ, DRAM).unwrap(); + pub static SETUSDBTCPair: TradingPair = TradingPair::from_currency_ids(SETUSD, BTC).unwrap(); + pub static SETUSDDRAMPair: TradingPair = TradingPair::from_currency_ids(SETUSD, DRAM).unwrap(); pub static DRAMBTCPair: TradingPair = TradingPair::from_currency_ids(DRAM, BTC).unwrap(); } @@ -142,8 +142,8 @@ impl Default for ExtBuilder { fn default() -> Self { Self { balances: vec![ - (ALICE, USDJ, 1_000_000_000_000_000_000u128), - (BOB, USDJ, 1_000_000_000_000_000_000u128), + (ALICE, SETUSD, 1_000_000_000_000_000_000u128), + (BOB, SETUSD, 1_000_000_000_000_000_000u128), (ALICE, BTC, 1_000_000_000_000_000_000u128), (BOB, BTC, 1_000_000_000_000_000_000u128), (ALICE, DRAM, 1_000_000_000_000_000_000u128), @@ -158,7 +158,7 @@ impl Default for ExtBuilder { impl ExtBuilder { pub fn initialize_enabled_trading_pairs(mut self) -> Self { - self.initial_enabled_trading_pairs = vec![USDJDRAMPair::get(), USDJBTCPair::get(), DRAMBTCPair::get()]; + self.initial_enabled_trading_pairs = vec![SETUSDDRAMPair::get(), SETUSDBTCPair::get(), DRAMBTCPair::get()]; self } @@ -166,8 +166,8 @@ impl ExtBuilder { self.initial_added_liquidity_pools = vec![( who, vec![ - (USDJDRAMPair::get(), (1_000_000u128, 2_000_000u128)), - (USDJBTCPair::get(), (1_000_000u128, 2_000_000u128)), + (SETUSDDRAMPair::get(), (1_000_000u128, 2_000_000u128)), + (SETUSDBTCPair::get(), (1_000_000u128, 2_000_000u128)), (DRAMBTCPair::get(), (1_000_000u128, 2_000_000u128)), ], )]; diff --git a/lib-serml/dex/dex/src/tests.rs b/lib-serml/dex/dex/src/tests.rs index a38b6a915..0f3bf85c6 100644 --- a/lib-serml/dex/dex/src/tests.rs +++ b/lib-serml/dex/dex/src/tests.rs @@ -23,8 +23,8 @@ use super::*; use frame_support::{assert_noop, assert_ok}; use mock::{ - USDJBTCPair, USDJDRAMPair, DexModule, Event, ExtBuilder, ListingOrigin, Origin, Runtime, System, Tokens, DNAR, ALICE, - USDJ, BOB, BTC, DRAM, + SETUSDBTCPair, SETUSDDRAMPair, DexModule, Event, ExtBuilder, ListingOrigin, Origin, Runtime, System, Tokens, DNAR, ALICE, + SETUSD, BOB, BTC, DRAM, }; use orml_traits::MultiReservableCurrency; use sp_runtime::traits::BadOrigin; @@ -37,7 +37,7 @@ fn list_provisioning_work() { assert_noop!( DexModule::list_provisioning( Origin::signed(ALICE), - USDJ, + SETUSD, DRAM, 1_000_000_000_000u128, 1_000_000_000_000u128, @@ -49,12 +49,12 @@ fn list_provisioning_work() { ); assert_eq!( - DexModule::trading_pair_statuses(USDJDRAMPair::get()), + DexModule::trading_pair_statuses(SETUSDDRAMPair::get()), TradingPairStatus::<_, _>::Disabled ); assert_ok!(DexModule::list_provisioning( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, DRAM, 1_000_000_000_000u128, 1_000_000_000_000u128, @@ -63,7 +63,7 @@ fn list_provisioning_work() { 10, )); assert_eq!( - DexModule::trading_pair_statuses(USDJDRAMPair::get()), + DexModule::trading_pair_statuses(SETUSDDRAMPair::get()), TradingPairStatus::<_, _>::Provisioning(ProvisioningParameters { min_contribution: (1_000_000_000_000u128, 1_000_000_000_000u128), target_provision: (5_000_000_000_000u128, 2_000_000_000_000u128), @@ -71,13 +71,13 @@ fn list_provisioning_work() { not_before: 10, }) ); - System::assert_last_event(Event::DexModule(crate::Event::ListProvisioning(USDJDRAMPair::get()))); + System::assert_last_event(Event::DexModule(crate::Event::ListProvisioning(SETUSDDRAMPair::get()))); assert_noop!( DexModule::list_provisioning( Origin::signed(ListingOrigin::get()), - USDJ, - USDJ, + SETUSD, + SETUSD, 1_000_000_000_000u128, 1_000_000_000_000u128, 5_000_000_000_000u128, @@ -90,7 +90,7 @@ fn list_provisioning_work() { assert_noop!( DexModule::list_provisioning( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, DRAM, 1_000_000_000_000u128, 1_000_000_000_000u128, @@ -111,7 +111,7 @@ fn update_provisioning_parameters_work() { assert_noop!( DexModule::update_provisioning_parameters( Origin::signed(ALICE), - USDJ, + SETUSD, DRAM, 1_000_000_000_000u128, 1_000_000_000_000u128, @@ -125,7 +125,7 @@ fn update_provisioning_parameters_work() { assert_noop!( DexModule::update_provisioning_parameters( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, DRAM, 1_000_000_000_000u128, 1_000_000_000_000u128, @@ -138,7 +138,7 @@ fn update_provisioning_parameters_work() { assert_ok!(DexModule::list_provisioning( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, DRAM, 1_000_000_000_000u128, 1_000_000_000_000u128, @@ -147,7 +147,7 @@ fn update_provisioning_parameters_work() { 10, )); assert_eq!( - DexModule::trading_pair_statuses(USDJDRAMPair::get()), + DexModule::trading_pair_statuses(SETUSDDRAMPair::get()), TradingPairStatus::<_, _>::Provisioning(ProvisioningParameters { min_contribution: (1_000_000_000_000u128, 1_000_000_000_000u128), target_provision: (5_000_000_000_000u128, 2_000_000_000_000u128), @@ -158,7 +158,7 @@ fn update_provisioning_parameters_work() { assert_ok!(DexModule::update_provisioning_parameters( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, DRAM, 2_000_000_000_000u128, 0, @@ -167,7 +167,7 @@ fn update_provisioning_parameters_work() { 50, )); assert_eq!( - DexModule::trading_pair_statuses(USDJDRAMPair::get()), + DexModule::trading_pair_statuses(SETUSDDRAMPair::get()), TradingPairStatus::<_, _>::Provisioning(ProvisioningParameters { min_contribution: (2_000_000_000_000u128, 0), target_provision: (3_000_000_000_000u128, 2_000_000_000_000u128), @@ -184,27 +184,27 @@ fn enable_diabled_trading_pair_work() { System::set_block_number(1); assert_noop!( - DexModule::enable_trading_pair(Origin::signed(ALICE), USDJ, DRAM), + DexModule::enable_trading_pair(Origin::signed(ALICE), SETUSD, DRAM), BadOrigin ); assert_eq!( - DexModule::trading_pair_statuses(USDJDRAMPair::get()), + DexModule::trading_pair_statuses(SETUSDDRAMPair::get()), TradingPairStatus::<_, _>::Disabled ); assert_ok!(DexModule::enable_trading_pair( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, DRAM )); assert_eq!( - DexModule::trading_pair_statuses(USDJDRAMPair::get()), + DexModule::trading_pair_statuses(SETUSDDRAMPair::get()), TradingPairStatus::<_, _>::Enabled ); - System::assert_last_event(Event::DexModule(crate::Event::EnableTradingPair(USDJDRAMPair::get()))); + System::assert_last_event(Event::DexModule(crate::Event::EnableTradingPair(SETUSDDRAMPair::get()))); assert_noop!( - DexModule::enable_trading_pair(Origin::signed(ListingOrigin::get()), DRAM, USDJ), + DexModule::enable_trading_pair(Origin::signed(ListingOrigin::get()), DRAM, SETUSD), Error::::AlreadyEnabled ); }); @@ -217,7 +217,7 @@ fn enable_provisioning_without_provision_work() { assert_ok!(DexModule::list_provisioning( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, DRAM, 1_000_000_000_000u128, 1_000_000_000_000u128, @@ -227,7 +227,7 @@ fn enable_provisioning_without_provision_work() { )); assert_ok!(DexModule::list_provisioning( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, BTC, 1_000_000_000_000u128, 1_000_000_000_000u128, @@ -237,14 +237,14 @@ fn enable_provisioning_without_provision_work() { )); assert_ok!(DexModule::add_provision( Origin::signed(ALICE), - USDJ, + SETUSD, BTC, 1_000_000_000_000u128, 1_000_000_000_000u128 )); assert_eq!( - DexModule::trading_pair_statuses(USDJDRAMPair::get()), + DexModule::trading_pair_statuses(SETUSDDRAMPair::get()), TradingPairStatus::<_, _>::Provisioning(ProvisioningParameters { min_contribution: (1_000_000_000_000u128, 1_000_000_000_000u128), target_provision: (5_000_000_000_000u128, 2_000_000_000_000u128), @@ -254,17 +254,17 @@ fn enable_provisioning_without_provision_work() { ); assert_ok!(DexModule::enable_trading_pair( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, DRAM )); assert_eq!( - DexModule::trading_pair_statuses(USDJDRAMPair::get()), + DexModule::trading_pair_statuses(SETUSDDRAMPair::get()), TradingPairStatus::<_, _>::Enabled ); - System::assert_last_event(Event::DexModule(crate::Event::EnableTradingPair(USDJDRAMPair::get()))); + System::assert_last_event(Event::DexModule(crate::Event::EnableTradingPair(SETUSDDRAMPair::get()))); assert_noop!( - DexModule::enable_trading_pair(Origin::signed(ListingOrigin::get()), USDJ, BTC), + DexModule::enable_trading_pair(Origin::signed(ListingOrigin::get()), SETUSD, BTC), Error::::StillProvisioning ); }); @@ -277,7 +277,7 @@ fn end_provisioning_trading_work() { assert_ok!(DexModule::list_provisioning( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, DRAM, 1_000_000_000_000u128, 1_000_000_000_000u128, @@ -286,7 +286,7 @@ fn end_provisioning_trading_work() { 10, )); assert_eq!( - DexModule::trading_pair_statuses(USDJDRAMPair::get()), + DexModule::trading_pair_statuses(SETUSDDRAMPair::get()), TradingPairStatus::<_, _>::Provisioning(ProvisioningParameters { min_contribution: (1_000_000_000_000u128, 1_000_000_000_000u128), target_provision: (5_000_000_000_000u128, 2_000_000_000_000u128), @@ -297,7 +297,7 @@ fn end_provisioning_trading_work() { assert_ok!(DexModule::list_provisioning( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, BTC, 1_000_000_000_000u128, 1_000_000_000_000u128, @@ -307,20 +307,20 @@ fn end_provisioning_trading_work() { )); assert_ok!(DexModule::add_provision( Origin::signed(ALICE), - USDJ, + SETUSD, BTC, 1_000_000_000_000u128, 2_000_000_000_000u128 )); assert_noop!( - DexModule::end_provisioning(Origin::signed(ListingOrigin::get()), USDJ, BTC), + DexModule::end_provisioning(Origin::signed(ListingOrigin::get()), SETUSD, BTC), Error::::UnqualifiedProvision ); System::set_block_number(10); assert_eq!( - DexModule::trading_pair_statuses(USDJBTCPair::get()), + DexModule::trading_pair_statuses(SETUSDBTCPair::get()), TradingPairStatus::<_, _>::Provisioning(ProvisioningParameters { min_contribution: (1_000_000_000_000u128, 1_000_000_000_000u128), target_provision: (5_000_000_000_000u128, 2_000_000_000_000u128), @@ -329,45 +329,45 @@ fn end_provisioning_trading_work() { }) ); assert_eq!( - DexModule::initial_share_exchange_rates(USDJBTCPair::get()), + DexModule::initial_share_exchange_rates(SETUSDBTCPair::get()), Default::default() ); - assert_eq!(DexModule::liquidity_pool(USDJBTCPair::get()), (0, 0)); - assert_eq!(Tokens::total_issuance(USDJBTCPair::get().dex_share_currency_id()), 0); + assert_eq!(DexModule::liquidity_pool(SETUSDBTCPair::get()), (0, 0)); + assert_eq!(Tokens::total_issuance(SETUSDBTCPair::get().dex_share_currency_id()), 0); assert_eq!( - Tokens::free_balance(USDJBTCPair::get().dex_share_currency_id(), &DexModule::account_id()), + Tokens::free_balance(SETUSDBTCPair::get().dex_share_currency_id(), &DexModule::account_id()), 0 ); assert_ok!(DexModule::end_provisioning( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, BTC )); System::assert_last_event(Event::DexModule(crate::Event::ProvisioningToEnabled( - USDJBTCPair::get(), + SETUSDBTCPair::get(), 1_000_000_000_000u128, 2_000_000_000_000u128, 2_000_000_000_000u128, ))); assert_eq!( - DexModule::trading_pair_statuses(USDJBTCPair::get()), + DexModule::trading_pair_statuses(SETUSDBTCPair::get()), TradingPairStatus::<_, _>::Enabled ); assert_eq!( - DexModule::initial_share_exchange_rates(USDJBTCPair::get()), + DexModule::initial_share_exchange_rates(SETUSDBTCPair::get()), (ExchangeRate::one(), ExchangeRate::checked_from_rational(1, 2).unwrap()) ); assert_eq!( - DexModule::liquidity_pool(USDJBTCPair::get()), + DexModule::liquidity_pool(SETUSDBTCPair::get()), (1_000_000_000_000u128, 2_000_000_000_000u128) ); assert_eq!( - Tokens::total_issuance(USDJBTCPair::get().dex_share_currency_id()), + Tokens::total_issuance(SETUSDBTCPair::get().dex_share_currency_id()), 2_000_000_000_000u128 ); assert_eq!( - Tokens::free_balance(USDJBTCPair::get().dex_share_currency_id(), &DexModule::account_id()), + Tokens::free_balance(SETUSDBTCPair::get().dex_share_currency_id(), &DexModule::account_id()), 2_000_000_000_000u128 ); }); @@ -380,38 +380,38 @@ fn disable_trading_pair_work() { assert_ok!(DexModule::enable_trading_pair( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, DRAM )); assert_eq!( - DexModule::trading_pair_statuses(USDJDRAMPair::get()), + DexModule::trading_pair_statuses(SETUSDDRAMPair::get()), TradingPairStatus::<_, _>::Enabled ); assert_noop!( - DexModule::disable_trading_pair(Origin::signed(ALICE), USDJ, DRAM), + DexModule::disable_trading_pair(Origin::signed(ALICE), SETUSD, DRAM), BadOrigin ); assert_ok!(DexModule::disable_trading_pair( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, DRAM )); assert_eq!( - DexModule::trading_pair_statuses(USDJDRAMPair::get()), + DexModule::trading_pair_statuses(SETUSDDRAMPair::get()), TradingPairStatus::<_, _>::Disabled ); - System::assert_last_event(Event::DexModule(crate::Event::DisableTradingPair(USDJDRAMPair::get()))); + System::assert_last_event(Event::DexModule(crate::Event::DisableTradingPair(SETUSDDRAMPair::get()))); assert_noop!( - DexModule::disable_trading_pair(Origin::signed(ListingOrigin::get()), USDJ, DRAM), + DexModule::disable_trading_pair(Origin::signed(ListingOrigin::get()), SETUSD, DRAM), Error::::MustBeEnabled ); assert_ok!(DexModule::list_provisioning( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, BTC, 1_000_000_000_000u128, 1_000_000_000_000u128, @@ -420,7 +420,7 @@ fn disable_trading_pair_work() { 10, )); assert_noop!( - DexModule::disable_trading_pair(Origin::signed(ListingOrigin::get()), USDJ, BTC), + DexModule::disable_trading_pair(Origin::signed(ListingOrigin::get()), SETUSD, BTC), Error::::MustBeEnabled ); }); @@ -434,7 +434,7 @@ fn add_provision_work() { assert_noop!( DexModule::add_provision( Origin::signed(ALICE), - USDJ, + SETUSD, DRAM, 5_000_000_000_000u128, 1_000_000_000_000u128, @@ -444,7 +444,7 @@ fn add_provision_work() { assert_ok!(DexModule::list_provisioning( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, DRAM, 5_000_000_000_000u128, 1_000_000_000_000u128, @@ -456,7 +456,7 @@ fn add_provision_work() { assert_noop!( DexModule::add_provision( Origin::signed(ALICE), - USDJ, + SETUSD, DRAM, 4_999_999_999_999u128, 999_999_999_999u128, @@ -465,7 +465,7 @@ fn add_provision_work() { ); assert_eq!( - DexModule::trading_pair_statuses(USDJDRAMPair::get()), + DexModule::trading_pair_statuses(SETUSDDRAMPair::get()), TradingPairStatus::<_, _>::Provisioning(ProvisioningParameters { min_contribution: (5_000_000_000_000u128, 1_000_000_000_000u128), target_provision: (5_000_000_000_000_000u128, 1_000_000_000_000_000u128), @@ -473,22 +473,22 @@ fn add_provision_work() { not_before: 10, }) ); - assert_eq!(DexModule::provisioning_pool(USDJDRAMPair::get(), ALICE), (0, 0)); - assert_eq!(Tokens::free_balance(USDJ, &ALICE), 1_000_000_000_000_000_000u128); + assert_eq!(DexModule::provisioning_pool(SETUSDDRAMPair::get(), ALICE), (0, 0)); + assert_eq!(Tokens::free_balance(SETUSD, &ALICE), 1_000_000_000_000_000_000u128); assert_eq!(Tokens::free_balance(DRAM, &ALICE), 1_000_000_000_000_000_000u128); - assert_eq!(Tokens::free_balance(USDJ, &DexModule::account_id()), 0); + assert_eq!(Tokens::free_balance(SETUSD, &DexModule::account_id()), 0); assert_eq!(Tokens::free_balance(DRAM, &DexModule::account_id()), 0); let alice_ref_count_0 = System::consumers(&ALICE); assert_ok!(DexModule::add_provision( Origin::signed(ALICE), - USDJ, + SETUSD, DRAM, 5_000_000_000_000u128, 0, )); assert_eq!( - DexModule::trading_pair_statuses(USDJDRAMPair::get()), + DexModule::trading_pair_statuses(SETUSDDRAMPair::get()), TradingPairStatus::<_, _>::Provisioning(ProvisioningParameters { min_contribution: (5_000_000_000_000u128, 1_000_000_000_000u128), target_provision: (5_000_000_000_000_000u128, 1_000_000_000_000_000u128), @@ -497,13 +497,13 @@ fn add_provision_work() { }) ); assert_eq!( - DexModule::provisioning_pool(USDJDRAMPair::get(), ALICE), + DexModule::provisioning_pool(SETUSDDRAMPair::get(), ALICE), (5_000_000_000_000u128, 0) ); - assert_eq!(Tokens::free_balance(USDJ, &ALICE), 999_995_000_000_000_000u128); + assert_eq!(Tokens::free_balance(SETUSD, &ALICE), 999_995_000_000_000_000u128); assert_eq!(Tokens::free_balance(DRAM, &ALICE), 1_000_000_000_000_000_000u128); assert_eq!( - Tokens::free_balance(USDJ, &DexModule::account_id()), + Tokens::free_balance(SETUSD, &DexModule::account_id()), 5_000_000_000_000u128 ); assert_eq!(Tokens::free_balance(DRAM, &DexModule::account_id()), 0); @@ -511,7 +511,7 @@ fn add_provision_work() { assert_eq!(alice_ref_count_1, alice_ref_count_0 + 1); System::assert_last_event(Event::DexModule(crate::Event::AddProvision( ALICE, - USDJ, + SETUSD, 5_000_000_000_000u128, DRAM, 0, @@ -526,7 +526,7 @@ fn claim_dex_share_work() { assert_ok!(DexModule::list_provisioning( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, DRAM, 5_000_000_000_000u128, 1_000_000_000_000u128, @@ -537,38 +537,38 @@ fn claim_dex_share_work() { assert_ok!(DexModule::add_provision( Origin::signed(ALICE), - USDJ, + SETUSD, DRAM, 1_000_000_000_000_000u128, 200_000_000_000_000u128, )); assert_ok!(DexModule::add_provision( Origin::signed(BOB), - USDJ, + SETUSD, DRAM, 4_000_000_000_000_000u128, 800_000_000_000_000u128, )); assert_noop!( - DexModule::claim_dex_share(Origin::signed(ALICE), ALICE, USDJ, DRAM), + DexModule::claim_dex_share(Origin::signed(ALICE), ALICE, SETUSD, DRAM), Error::::StillProvisioning ); assert_ok!(DexModule::end_provisioning( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, DRAM )); - let lp_currency_id = USDJDRAMPair::get().dex_share_currency_id(); + let lp_currency_id = SETUSDDRAMPair::get().dex_share_currency_id(); assert_eq!( - InitialShareExchangeRates::::contains_key(USDJDRAMPair::get()), + InitialShareExchangeRates::::contains_key(SETUSDDRAMPair::get()), true ); assert_eq!( - DexModule::initial_share_exchange_rates(USDJDRAMPair::get()), + DexModule::initial_share_exchange_rates(SETUSDDRAMPair::get()), (ExchangeRate::one(), ExchangeRate::saturating_from_rational(5, 1)) ); assert_eq!( @@ -576,11 +576,11 @@ fn claim_dex_share_work() { 10_000_000_000_000_000u128 ); assert_eq!( - DexModule::provisioning_pool(USDJDRAMPair::get(), ALICE), + DexModule::provisioning_pool(SETUSDDRAMPair::get(), ALICE), (1_000_000_000_000_000u128, 200_000_000_000_000u128) ); assert_eq!( - DexModule::provisioning_pool(USDJDRAMPair::get(), BOB), + DexModule::provisioning_pool(SETUSDDRAMPair::get(), BOB), (4_000_000_000_000_000u128, 800_000_000_000_000u128) ); assert_eq!(Tokens::free_balance(lp_currency_id, &ALICE), 0); @@ -589,31 +589,31 @@ fn claim_dex_share_work() { let alice_ref_count_0 = System::consumers(&ALICE); let bob_ref_count_0 = System::consumers(&BOB); - assert_ok!(DexModule::claim_dex_share(Origin::signed(ALICE), ALICE, USDJ, DRAM)); + assert_ok!(DexModule::claim_dex_share(Origin::signed(ALICE), ALICE, SETUSD, DRAM)); assert_eq!( Tokens::free_balance(lp_currency_id, &DexModule::account_id()), 8_000_000_000_000_000u128 ); - assert_eq!(DexModule::provisioning_pool(USDJDRAMPair::get(), ALICE), (0, 0)); + assert_eq!(DexModule::provisioning_pool(SETUSDDRAMPair::get(), ALICE), (0, 0)); assert_eq!(Tokens::free_balance(lp_currency_id, &ALICE), 2_000_000_000_000_000u128); assert_eq!(System::consumers(&ALICE), alice_ref_count_0 - 1); assert_eq!( - InitialShareExchangeRates::::contains_key(USDJDRAMPair::get()), + InitialShareExchangeRates::::contains_key(SETUSDDRAMPair::get()), true ); assert_ok!(DexModule::disable_trading_pair( Origin::signed(ListingOrigin::get()), - USDJ, + SETUSD, DRAM )); - assert_ok!(DexModule::claim_dex_share(Origin::signed(BOB), BOB, USDJ, DRAM)); + assert_ok!(DexModule::claim_dex_share(Origin::signed(BOB), BOB, SETUSD, DRAM)); assert_eq!(Tokens::free_balance(lp_currency_id, &DexModule::account_id()), 0); - assert_eq!(DexModule::provisioning_pool(USDJDRAMPair::get(), BOB), (0, 0)); + assert_eq!(DexModule::provisioning_pool(SETUSDDRAMPair::get(), BOB), (0, 0)); assert_eq!(Tokens::free_balance(lp_currency_id, &BOB), 8_000_000_000_000_000u128); assert_eq!(System::consumers(&BOB), bob_ref_count_0 - 1); assert_eq!( - InitialShareExchangeRates::::contains_key(USDJDRAMPair::get()), + InitialShareExchangeRates::::contains_key(SETUSDDRAMPair::get()), false ); }); @@ -622,10 +622,10 @@ fn claim_dex_share_work() { #[test] fn get_liquidity_work() { ExtBuilder::default().build().execute_with(|| { - LiquidityPool::::insert(USDJDRAMPair::get(), (1000, 20)); - assert_eq!(DexModule::liquidity_pool(USDJDRAMPair::get()), (1000, 20)); - assert_eq!(DexModule::get_liquidity(USDJ, DRAM), (1000, 20)); - assert_eq!(DexModule::get_liquidity(DRAM, USDJ), (20, 1000)); + LiquidityPool::::insert(SETUSDDRAMPair::get(), (1000, 20)); + assert_eq!(DexModule::liquidity_pool(SETUSDDRAMPair::get()), (1000, 20)); + assert_eq!(DexModule::get_liquidity(SETUSD, DRAM), (1000, 20)); + assert_eq!(DexModule::get_liquidity(DRAM, SETUSD), (20, 1000)); }); } @@ -661,38 +661,38 @@ fn get_target_amounts_work() { .initialize_enabled_trading_pairs() .build() .execute_with(|| { - LiquidityPool::::insert(USDJDRAMPair::get(), (50000, 10000)); - LiquidityPool::::insert(USDJBTCPair::get(), (100000, 10)); + LiquidityPool::::insert(SETUSDDRAMPair::get(), (50000, 10000)); + LiquidityPool::::insert(SETUSDBTCPair::get(), (100000, 10)); assert_noop!( DexModule::get_target_amounts(&vec![DRAM], 10000, None), Error::::InvalidTradingPathLength, ); assert_noop!( - DexModule::get_target_amounts(&vec![DRAM, USDJ, BTC, DRAM], 10000, None), + DexModule::get_target_amounts(&vec![DRAM, SETUSD, BTC, DRAM], 10000, None), Error::::InvalidTradingPathLength, ); assert_noop!( - DexModule::get_target_amounts(&vec![DRAM, USDJ, DNAR], 10000, None), + DexModule::get_target_amounts(&vec![DRAM, SETUSD, DNAR], 10000, None), Error::::MustBeEnabled, ); assert_eq!( - DexModule::get_target_amounts(&vec![DRAM, USDJ], 10000, None), + DexModule::get_target_amounts(&vec![DRAM, SETUSD], 10000, None), Ok(vec![10000, 24874]) ); assert_eq!( - DexModule::get_target_amounts(&vec![DRAM, USDJ], 10000, Ratio::checked_from_rational(50, 100)), + DexModule::get_target_amounts(&vec![DRAM, SETUSD], 10000, Ratio::checked_from_rational(50, 100)), Ok(vec![10000, 24874]) ); assert_noop!( - DexModule::get_target_amounts(&vec![DRAM, USDJ], 10000, Ratio::checked_from_rational(49, 100)), + DexModule::get_target_amounts(&vec![DRAM, SETUSD], 10000, Ratio::checked_from_rational(49, 100)), Error::::ExceedPriceImpactLimit, ); assert_eq!( - DexModule::get_target_amounts(&vec![DRAM, USDJ, BTC], 10000, None), + DexModule::get_target_amounts(&vec![DRAM, SETUSD, BTC], 10000, None), Ok(vec![10000, 24874, 1]) ); assert_noop!( - DexModule::get_target_amounts(&vec![DRAM, USDJ, BTC], 100, None), + DexModule::get_target_amounts(&vec![DRAM, SETUSD, BTC], 100, None), Error::::ZeroTargetAmount, ); assert_noop!( @@ -706,7 +706,7 @@ fn get_target_amounts_work() { fn calculate_amount_for_big_number_work() { ExtBuilder::default().build().execute_with(|| { LiquidityPool::::insert( - USDJDRAMPair::get(), + SETUSDDRAMPair::get(), (171_000_000_000_000_000_000_000, 56_000_000_000_000_000_000_000), ); assert_eq!( @@ -734,34 +734,34 @@ fn get_supply_amounts_work() { .initialize_enabled_trading_pairs() .build() .execute_with(|| { - LiquidityPool::::insert(USDJDRAMPair::get(), (50000, 10000)); - LiquidityPool::::insert(USDJBTCPair::get(), (100000, 10)); + LiquidityPool::::insert(SETUSDDRAMPair::get(), (50000, 10000)); + LiquidityPool::::insert(SETUSDBTCPair::get(), (100000, 10)); assert_noop!( DexModule::get_supply_amounts(&vec![DRAM], 10000, None), Error::::InvalidTradingPathLength, ); assert_noop!( - DexModule::get_supply_amounts(&vec![DRAM, USDJ, BTC, DRAM], 10000, None), + DexModule::get_supply_amounts(&vec![DRAM, SETUSD, BTC, DRAM], 10000, None), Error::::InvalidTradingPathLength, ); assert_noop!( - DexModule::get_supply_amounts(&vec![DRAM, USDJ, DNAR], 10000, None), + DexModule::get_supply_amounts(&vec![DRAM, SETUSD, DNAR], 10000, None), Error::::MustBeEnabled, ); assert_eq!( - DexModule::get_supply_amounts(&vec![DRAM, USDJ], 24874, None), + DexModule::get_supply_amounts(&vec![DRAM, SETUSD], 24874, None), Ok(vec![10000, 24874]) ); assert_eq!( - DexModule::get_supply_amounts(&vec![DRAM, USDJ], 25000, Ratio::checked_from_rational(50, 100)), + DexModule::get_supply_amounts(&vec![DRAM, SETUSD], 25000, Ratio::checked_from_rational(50, 100)), Ok(vec![10102, 25000]) ); assert_noop!( - DexModule::get_supply_amounts(&vec![DRAM, USDJ], 25000, Ratio::checked_from_rational(49, 100)), + DexModule::get_supply_amounts(&vec![DRAM, SETUSD], 25000, Ratio::checked_from_rational(49, 100)), Error::::ExceedPriceImpactLimit, ); assert_noop!( - DexModule::get_supply_amounts(&vec![DRAM, USDJ, BTC], 10000, None), + DexModule::get_supply_amounts(&vec![DRAM, SETUSD, BTC], 10000, None), Error::::ZeroSupplyAmount, ); assert_noop!( @@ -777,17 +777,17 @@ fn _swap_work() { .initialize_enabled_trading_pairs() .build() .execute_with(|| { - LiquidityPool::::insert(USDJDRAMPair::get(), (50000, 10000)); + LiquidityPool::::insert(SETUSDDRAMPair::get(), (50000, 10000)); - assert_eq!(DexModule::get_liquidity(USDJ, DRAM), (50000, 10000)); + assert_eq!(DexModule::get_liquidity(SETUSD, DRAM), (50000, 10000)); assert_noop!( - DexModule::_swap(USDJ, DRAM, 50000, 5001), + DexModule::_swap(SETUSD, DRAM, 50000, 5001), Error::::InvariantCheckFailed ); - assert_ok!(DexModule::_swap(USDJ, DRAM, 50000, 5000)); - assert_eq!(DexModule::get_liquidity(USDJ, DRAM), (100000, 5000)); - assert_ok!(DexModule::_swap(DRAM, USDJ, 100, 800)); - assert_eq!(DexModule::get_liquidity(USDJ, DRAM), (99200, 5100)); + assert_ok!(DexModule::_swap(SETUSD, DRAM, 50000, 5000)); + assert_eq!(DexModule::get_liquidity(SETUSD, DRAM), (100000, 5000)); + assert_ok!(DexModule::_swap(DRAM, SETUSD, 100, 800)); + assert_eq!(DexModule::get_liquidity(SETUSD, DRAM), (99200, 5100)); }); } @@ -797,16 +797,16 @@ fn _swap_by_path_work() { .initialize_enabled_trading_pairs() .build() .execute_with(|| { - LiquidityPool::::insert(USDJDRAMPair::get(), (50000, 10000)); - LiquidityPool::::insert(USDJBTCPair::get(), (100000, 10)); - - assert_eq!(DexModule::get_liquidity(USDJ, DRAM), (50000, 10000)); - assert_eq!(DexModule::get_liquidity(USDJ, BTC), (100000, 10)); - assert_ok!(DexModule::_swap_by_path(&vec![DRAM, USDJ], &vec![10000, 25000])); - assert_eq!(DexModule::get_liquidity(USDJ, DRAM), (25000, 20000)); - assert_ok!(DexModule::_swap_by_path(&vec![DRAM, USDJ, BTC], &vec![100000, 20000, 1])); - assert_eq!(DexModule::get_liquidity(USDJ, DRAM), (5000, 120000)); - assert_eq!(DexModule::get_liquidity(USDJ, BTC), (120000, 9)); + LiquidityPool::::insert(SETUSDDRAMPair::get(), (50000, 10000)); + LiquidityPool::::insert(SETUSDBTCPair::get(), (100000, 10)); + + assert_eq!(DexModule::get_liquidity(SETUSD, DRAM), (50000, 10000)); + assert_eq!(DexModule::get_liquidity(SETUSD, BTC), (100000, 10)); + assert_ok!(DexModule::_swap_by_path(&vec![DRAM, SETUSD], &vec![10000, 25000])); + assert_eq!(DexModule::get_liquidity(SETUSD, DRAM), (25000, 20000)); + assert_ok!(DexModule::_swap_by_path(&vec![DRAM, SETUSD, BTC], &vec![100000, 20000, 1])); + assert_eq!(DexModule::get_liquidity(SETUSD, DRAM), (5000, 120000)); + assert_eq!(DexModule::get_liquidity(SETUSD, BTC), (120000, 9)); }); } @@ -819,31 +819,31 @@ fn add_liquidity_work() { System::set_block_number(1); assert_noop!( - DexModule::add_liquidity(Origin::signed(ALICE), DNAR, USDJ, 100_000_000, 100_000_000, 0), + DexModule::add_liquidity(Origin::signed(ALICE), DNAR, SETUSD, 100_000_000, 100_000_000, 0), Error::::MustBeEnabled ); assert_noop!( - DexModule::add_liquidity(Origin::signed(ALICE), USDJ, DRAM, 0, 100_000_000, 0), + DexModule::add_liquidity(Origin::signed(ALICE), SETUSD, DRAM, 0, 100_000_000, 0), Error::::InvalidLiquidityIncrement ); - assert_eq!(DexModule::get_liquidity(USDJ, DRAM), (0, 0)); - assert_eq!(Tokens::free_balance(USDJ, &DexModule::account_id()), 0); + assert_eq!(DexModule::get_liquidity(SETUSD, DRAM), (0, 0)); + assert_eq!(Tokens::free_balance(SETUSD, &DexModule::account_id()), 0); assert_eq!(Tokens::free_balance(DRAM, &DexModule::account_id()), 0); assert_eq!( - Tokens::free_balance(USDJDRAMPair::get().dex_share_currency_id(), &ALICE), + Tokens::free_balance(SETUSDDRAMPair::get().dex_share_currency_id(), &ALICE), 0 ); assert_eq!( - Tokens::reserved_balance(USDJDRAMPair::get().dex_share_currency_id(), &ALICE), + Tokens::reserved_balance(SETUSDDRAMPair::get().dex_share_currency_id(), &ALICE), 0 ); - assert_eq!(Tokens::free_balance(USDJ, &ALICE), 1_000_000_000_000_000_000); + assert_eq!(Tokens::free_balance(SETUSD, &ALICE), 1_000_000_000_000_000_000); assert_eq!(Tokens::free_balance(DRAM, &ALICE), 1_000_000_000_000_000_000); assert_ok!(DexModule::add_liquidity( Origin::signed(ALICE), - USDJ, + SETUSD, DRAM, 5_000_000_000_000, 1_000_000_000_000, @@ -851,48 +851,48 @@ fn add_liquidity_work() { )); System::assert_last_event(Event::DexModule(crate::Event::AddLiquidity( ALICE, - USDJ, + SETUSD, 5_000_000_000_000, DRAM, 1_000_000_000_000, 10_000_000_000_000, ))); assert_eq!( - DexModule::get_liquidity(USDJ, DRAM), + DexModule::get_liquidity(SETUSD, DRAM), (5_000_000_000_000, 1_000_000_000_000) ); - assert_eq!(Tokens::free_balance(USDJ, &DexModule::account_id()), 5_000_000_000_000); + assert_eq!(Tokens::free_balance(SETUSD, &DexModule::account_id()), 5_000_000_000_000); assert_eq!(Tokens::free_balance(DRAM, &DexModule::account_id()), 1_000_000_000_000); assert_eq!( - Tokens::free_balance(USDJDRAMPair::get().dex_share_currency_id(), &ALICE), + Tokens::free_balance(SETUSDDRAMPair::get().dex_share_currency_id(), &ALICE), 10_000_000_000_000 ); assert_eq!( - Tokens::reserved_balance(USDJDRAMPair::get().dex_share_currency_id(), &ALICE), + Tokens::reserved_balance(SETUSDDRAMPair::get().dex_share_currency_id(), &ALICE), 0 ); - assert_eq!(Tokens::free_balance(USDJ, &ALICE), 999_995_000_000_000_000); + assert_eq!(Tokens::free_balance(SETUSD, &ALICE), 999_995_000_000_000_000); assert_eq!(Tokens::free_balance(DRAM, &ALICE), 999_999_000_000_000_000); assert_eq!( - Tokens::free_balance(USDJDRAMPair::get().dex_share_currency_id(), &BOB), + Tokens::free_balance(SETUSDDRAMPair::get().dex_share_currency_id(), &BOB), 0 ); assert_eq!( - Tokens::reserved_balance(USDJDRAMPair::get().dex_share_currency_id(), &BOB), + Tokens::reserved_balance(SETUSDDRAMPair::get().dex_share_currency_id(), &BOB), 0 ); - assert_eq!(Tokens::free_balance(USDJ, &BOB), 1_000_000_000_000_000_000); + assert_eq!(Tokens::free_balance(SETUSD, &BOB), 1_000_000_000_000_000_000); assert_eq!(Tokens::free_balance(DRAM, &BOB), 1_000_000_000_000_000_000); assert_noop!( - DexModule::add_liquidity(Origin::signed(BOB), USDJ, DRAM, 4, 1, 0,), + DexModule::add_liquidity(Origin::signed(BOB), SETUSD, DRAM, 4, 1, 0,), Error::::InvalidLiquidityIncrement, ); assert_noop!( DexModule::add_liquidity( Origin::signed(BOB), - USDJ, + SETUSD, DRAM, 50_000_000_000_000, 8_000_000_000_000, @@ -903,7 +903,7 @@ fn add_liquidity_work() { assert_ok!(DexModule::add_liquidity( Origin::signed(BOB), - USDJ, + SETUSD, DRAM, 50_000_000_000_000, 8_000_000_000_000, @@ -911,27 +911,27 @@ fn add_liquidity_work() { )); System::assert_last_event(Event::DexModule(crate::Event::AddLiquidity( BOB, - USDJ, + SETUSD, 40_000_000_000_000, DRAM, 8_000_000_000_000, 80_000_000_000_000, ))); assert_eq!( - DexModule::get_liquidity(USDJ, DRAM), + DexModule::get_liquidity(SETUSD, DRAM), (45_000_000_000_000, 9_000_000_000_000) ); - assert_eq!(Tokens::free_balance(USDJ, &DexModule::account_id()), 45_000_000_000_000); + assert_eq!(Tokens::free_balance(SETUSD, &DexModule::account_id()), 45_000_000_000_000); assert_eq!(Tokens::free_balance(DRAM, &DexModule::account_id()), 9_000_000_000_000); assert_eq!( - Tokens::free_balance(USDJDRAMPair::get().dex_share_currency_id(), &BOB), + Tokens::free_balance(SETUSDDRAMPair::get().dex_share_currency_id(), &BOB), 0 ); assert_eq!( - Tokens::reserved_balance(USDJDRAMPair::get().dex_share_currency_id(), &BOB), + Tokens::reserved_balance(SETUSDDRAMPair::get().dex_share_currency_id(), &BOB), 80_000_000_000_000 ); - assert_eq!(Tokens::free_balance(USDJ, &BOB), 999_960_000_000_000_000); + assert_eq!(Tokens::free_balance(SETUSD, &BOB), 999_960_000_000_000_000); assert_eq!(Tokens::free_balance(DRAM, &BOB), 999_992_000_000_000_000); }); } @@ -946,7 +946,7 @@ fn remove_liquidity_work() { assert_ok!(DexModule::add_liquidity( Origin::signed(ALICE), - USDJ, + SETUSD, DRAM, 5_000_000_000_000, 1_000_000_000_000, @@ -955,7 +955,7 @@ fn remove_liquidity_work() { assert_noop!( DexModule::remove_liquidity( Origin::signed(ALICE), - USDJDRAMPair::get().dex_share_currency_id(), + SETUSDDRAMPair::get().dex_share_currency_id(), DRAM, 100_000_000, 0, @@ -965,22 +965,22 @@ fn remove_liquidity_work() { ); assert_eq!( - DexModule::get_liquidity(USDJ, DRAM), + DexModule::get_liquidity(SETUSD, DRAM), (5_000_000_000_000, 1_000_000_000_000) ); - assert_eq!(Tokens::free_balance(USDJ, &DexModule::account_id()), 5_000_000_000_000); + assert_eq!(Tokens::free_balance(SETUSD, &DexModule::account_id()), 5_000_000_000_000); assert_eq!(Tokens::free_balance(DRAM, &DexModule::account_id()), 1_000_000_000_000); assert_eq!( - Tokens::free_balance(USDJDRAMPair::get().dex_share_currency_id(), &ALICE), + Tokens::free_balance(SETUSDDRAMPair::get().dex_share_currency_id(), &ALICE), 10_000_000_000_000 ); - assert_eq!(Tokens::free_balance(USDJ, &ALICE), 999_995_000_000_000_000); + assert_eq!(Tokens::free_balance(SETUSD, &ALICE), 999_995_000_000_000_000); assert_eq!(Tokens::free_balance(DRAM, &ALICE), 999_999_000_000_000_000); assert_noop!( DexModule::remove_liquidity( Origin::signed(ALICE), - USDJ, + SETUSD, DRAM, 8_000_000_000_000, 4_000_000_000_001, @@ -991,7 +991,7 @@ fn remove_liquidity_work() { assert_noop!( DexModule::remove_liquidity( Origin::signed(ALICE), - USDJ, + SETUSD, DRAM, 8_000_000_000_000, 4_000_000_000_000, @@ -1001,7 +1001,7 @@ fn remove_liquidity_work() { ); assert_ok!(DexModule::remove_liquidity( Origin::signed(ALICE), - USDJ, + SETUSD, DRAM, 8_000_000_000_000, 4_000_000_000_000, @@ -1009,28 +1009,28 @@ fn remove_liquidity_work() { )); System::assert_last_event(Event::DexModule(crate::Event::RemoveLiquidity( ALICE, - USDJ, + SETUSD, 4_000_000_000_000, DRAM, 800_000_000_000, 8_000_000_000_000, ))); assert_eq!( - DexModule::get_liquidity(USDJ, DRAM), + DexModule::get_liquidity(SETUSD, DRAM), (1_000_000_000_000, 200_000_000_000) ); - assert_eq!(Tokens::free_balance(USDJ, &DexModule::account_id()), 1_000_000_000_000); + assert_eq!(Tokens::free_balance(SETUSD, &DexModule::account_id()), 1_000_000_000_000); assert_eq!(Tokens::free_balance(DRAM, &DexModule::account_id()), 200_000_000_000); assert_eq!( - Tokens::free_balance(USDJDRAMPair::get().dex_share_currency_id(), &ALICE), + Tokens::free_balance(SETUSDDRAMPair::get().dex_share_currency_id(), &ALICE), 2_000_000_000_000 ); - assert_eq!(Tokens::free_balance(USDJ, &ALICE), 999_999_000_000_000_000); + assert_eq!(Tokens::free_balance(SETUSD, &ALICE), 999_999_000_000_000_000); assert_eq!(Tokens::free_balance(DRAM, &ALICE), 999_999_800_000_000_000); assert_ok!(DexModule::remove_liquidity( Origin::signed(ALICE), - USDJ, + SETUSD, DRAM, 2_000_000_000_000, 0, @@ -1038,52 +1038,52 @@ fn remove_liquidity_work() { )); System::assert_last_event(Event::DexModule(crate::Event::RemoveLiquidity( ALICE, - USDJ, + SETUSD, 1_000_000_000_000, DRAM, 200_000_000_000, 2_000_000_000_000, ))); - assert_eq!(DexModule::get_liquidity(USDJ, DRAM), (0, 0)); - assert_eq!(Tokens::free_balance(USDJ, &DexModule::account_id()), 0); + assert_eq!(DexModule::get_liquidity(SETUSD, DRAM), (0, 0)); + assert_eq!(Tokens::free_balance(SETUSD, &DexModule::account_id()), 0); assert_eq!(Tokens::free_balance(DRAM, &DexModule::account_id()), 0); assert_eq!( - Tokens::free_balance(USDJDRAMPair::get().dex_share_currency_id(), &ALICE), + Tokens::free_balance(SETUSDDRAMPair::get().dex_share_currency_id(), &ALICE), 0 ); - assert_eq!(Tokens::free_balance(USDJ, &ALICE), 1_000_000_000_000_000_000); + assert_eq!(Tokens::free_balance(SETUSD, &ALICE), 1_000_000_000_000_000_000); assert_eq!(Tokens::free_balance(DRAM, &ALICE), 1_000_000_000_000_000_000); assert_ok!(DexModule::add_liquidity( Origin::signed(BOB), - USDJ, + SETUSD, DRAM, 5_000_000_000_000, 1_000_000_000_000, 0 )); assert_eq!( - Tokens::free_balance(USDJDRAMPair::get().dex_share_currency_id(), &BOB), + Tokens::free_balance(SETUSDDRAMPair::get().dex_share_currency_id(), &BOB), 0 ); assert_eq!( - Tokens::reserved_balance(USDJDRAMPair::get().dex_share_currency_id(), &BOB), + Tokens::reserved_balance(SETUSDDRAMPair::get().dex_share_currency_id(), &BOB), 10_000_000_000_000 ); assert_ok!(DexModule::remove_liquidity( Origin::signed(BOB), - USDJ, + SETUSD, DRAM, 2_000_000_000_000, 0, 0, )); assert_eq!( - Tokens::free_balance(USDJDRAMPair::get().dex_share_currency_id(), &BOB), + Tokens::free_balance(SETUSDDRAMPair::get().dex_share_currency_id(), &BOB), 0 ); assert_eq!( - Tokens::reserved_balance(USDJDRAMPair::get().dex_share_currency_id(), &BOB), + Tokens::reserved_balance(SETUSDDRAMPair::get().dex_share_currency_id(), &BOB), 8_000_000_000_000 ); }); @@ -1099,7 +1099,7 @@ fn do_swap_with_exact_supply_work() { assert_ok!(DexModule::add_liquidity( Origin::signed(ALICE), - USDJ, + SETUSD, DRAM, 500_000_000_000_000, 100_000_000_000_000, @@ -1107,7 +1107,7 @@ fn do_swap_with_exact_supply_work() { )); assert_ok!(DexModule::add_liquidity( Origin::signed(ALICE), - USDJ, + SETUSD, BTC, 100_000_000_000_000, 10_000_000_000, @@ -1115,27 +1115,27 @@ fn do_swap_with_exact_supply_work() { )); assert_eq!( - DexModule::get_liquidity(USDJ, DRAM), + DexModule::get_liquidity(SETUSD, DRAM), (500_000_000_000_000, 100_000_000_000_000) ); assert_eq!( - DexModule::get_liquidity(USDJ, BTC), + DexModule::get_liquidity(SETUSD, BTC), (100_000_000_000_000, 10_000_000_000) ); assert_eq!( - Tokens::free_balance(USDJ, &DexModule::account_id()), + Tokens::free_balance(SETUSD, &DexModule::account_id()), 600_000_000_000_000 ); assert_eq!(Tokens::free_balance(DRAM, &DexModule::account_id()), 100_000_000_000_000); assert_eq!(Tokens::free_balance(BTC, &DexModule::account_id()), 10_000_000_000); - assert_eq!(Tokens::free_balance(USDJ, &BOB), 1_000_000_000_000_000_000); + assert_eq!(Tokens::free_balance(SETUSD, &BOB), 1_000_000_000_000_000_000); assert_eq!(Tokens::free_balance(DRAM, &BOB), 1_000_000_000_000_000_000); assert_eq!(Tokens::free_balance(BTC, &BOB), 1_000_000_000_000_000_000); assert_noop!( DexModule::do_swap_with_exact_supply( &BOB, - &[DRAM, USDJ], + &[DRAM, SETUSD], 100_000_000_000_000, 250_000_000_000_000, None @@ -1145,7 +1145,7 @@ fn do_swap_with_exact_supply_work() { assert_noop!( DexModule::do_swap_with_exact_supply( &BOB, - &[DRAM, USDJ], + &[DRAM, SETUSD], 100_000_000_000_000, 0, Ratio::checked_from_rational(10, 100) @@ -1153,7 +1153,7 @@ fn do_swap_with_exact_supply_work() { Error::::ExceedPriceImpactLimit, ); assert_noop!( - DexModule::do_swap_with_exact_supply(&BOB, &[DRAM, USDJ, BTC, DRAM], 100_000_000_000_000, 0, None), + DexModule::do_swap_with_exact_supply(&BOB, &[DRAM, SETUSD, BTC, DRAM], 100_000_000_000_000, 0, None), Error::::InvalidTradingPathLength, ); assert_noop!( @@ -1163,63 +1163,63 @@ fn do_swap_with_exact_supply_work() { assert_ok!(DexModule::do_swap_with_exact_supply( &BOB, - &[DRAM, USDJ], + &[DRAM, SETUSD], 100_000_000_000_000, 200_000_000_000_000, None )); System::assert_last_event(Event::DexModule(crate::Event::Swap( BOB, - vec![DRAM, USDJ], + vec![DRAM, SETUSD], 100_000_000_000_000, 248_743_718_592_964, ))); assert_eq!( - DexModule::get_liquidity(USDJ, DRAM), + DexModule::get_liquidity(SETUSD, DRAM), (251_256_281_407_036, 200_000_000_000_000) ); assert_eq!( - DexModule::get_liquidity(USDJ, BTC), + DexModule::get_liquidity(SETUSD, BTC), (100_000_000_000_000, 10_000_000_000) ); assert_eq!( - Tokens::free_balance(USDJ, &DexModule::account_id()), + Tokens::free_balance(SETUSD, &DexModule::account_id()), 351_256_281_407_036 ); assert_eq!(Tokens::free_balance(DRAM, &DexModule::account_id()), 200_000_000_000_000); assert_eq!(Tokens::free_balance(BTC, &DexModule::account_id()), 10_000_000_000); - assert_eq!(Tokens::free_balance(USDJ, &BOB), 1_000_248_743_718_592_964); + assert_eq!(Tokens::free_balance(SETUSD, &BOB), 1_000_248_743_718_592_964); assert_eq!(Tokens::free_balance(DRAM, &BOB), 999_900_000_000_000_000); assert_eq!(Tokens::free_balance(BTC, &BOB), 1_000_000_000_000_000_000); assert_ok!(DexModule::do_swap_with_exact_supply( &BOB, - &[DRAM, USDJ, BTC], + &[DRAM, SETUSD, BTC], 200_000_000_000_000, 1, None )); System::assert_last_event(Event::DexModule(crate::Event::Swap( BOB, - vec![DRAM, USDJ, BTC], + vec![DRAM, SETUSD, BTC], 200_000_000_000_000, 5_530_663_837, ))); assert_eq!( - DexModule::get_liquidity(USDJ, DRAM), + DexModule::get_liquidity(SETUSD, DRAM), (126_259_437_892_983, 400_000_000_000_000) ); assert_eq!( - DexModule::get_liquidity(USDJ, BTC), + DexModule::get_liquidity(SETUSD, BTC), (224_996_843_514_053, 4_469_336_163) ); assert_eq!( - Tokens::free_balance(USDJ, &DexModule::account_id()), + Tokens::free_balance(SETUSD, &DexModule::account_id()), 351_256_281_407_036 ); assert_eq!(Tokens::free_balance(DRAM, &DexModule::account_id()), 400_000_000_000_000); assert_eq!(Tokens::free_balance(BTC, &DexModule::account_id()), 4_469_336_163); - assert_eq!(Tokens::free_balance(USDJ, &BOB), 1_000_248_743_718_592_964); + assert_eq!(Tokens::free_balance(SETUSD, &BOB), 1_000_248_743_718_592_964); assert_eq!(Tokens::free_balance(DRAM, &BOB), 999_700_000_000_000_000); assert_eq!(Tokens::free_balance(BTC, &BOB), 1_000_000_005_530_663_837); }); @@ -1235,7 +1235,7 @@ fn do_swap_with_exact_target_work() { assert_ok!(DexModule::add_liquidity( Origin::signed(ALICE), - USDJ, + SETUSD, DRAM, 500_000_000_000_000, 100_000_000_000_000, @@ -1243,7 +1243,7 @@ fn do_swap_with_exact_target_work() { )); assert_ok!(DexModule::add_liquidity( Origin::signed(ALICE), - USDJ, + SETUSD, BTC, 100_000_000_000_000, 10_000_000_000, @@ -1251,27 +1251,27 @@ fn do_swap_with_exact_target_work() { )); assert_eq!( - DexModule::get_liquidity(USDJ, DRAM), + DexModule::get_liquidity(SETUSD, DRAM), (500_000_000_000_000, 100_000_000_000_000) ); assert_eq!( - DexModule::get_liquidity(USDJ, BTC), + DexModule::get_liquidity(SETUSD, BTC), (100_000_000_000_000, 10_000_000_000) ); assert_eq!( - Tokens::free_balance(USDJ, &DexModule::account_id()), + Tokens::free_balance(SETUSD, &DexModule::account_id()), 600_000_000_000_000 ); assert_eq!(Tokens::free_balance(DRAM, &DexModule::account_id()), 100_000_000_000_000); assert_eq!(Tokens::free_balance(BTC, &DexModule::account_id()), 10_000_000_000); - assert_eq!(Tokens::free_balance(USDJ, &BOB), 1_000_000_000_000_000_000); + assert_eq!(Tokens::free_balance(SETUSD, &BOB), 1_000_000_000_000_000_000); assert_eq!(Tokens::free_balance(DRAM, &BOB), 1_000_000_000_000_000_000); assert_eq!(Tokens::free_balance(BTC, &BOB), 1_000_000_000_000_000_000); assert_noop!( DexModule::do_swap_with_exact_target( &BOB, - &[DRAM, USDJ], + &[DRAM, SETUSD], 250_000_000_000_000, 100_000_000_000_000, None @@ -1281,7 +1281,7 @@ fn do_swap_with_exact_target_work() { assert_noop!( DexModule::do_swap_with_exact_target( &BOB, - &[DRAM, USDJ], + &[DRAM, SETUSD], 250_000_000_000_000, 200_000_000_000_000, Ratio::checked_from_rational(10, 100) @@ -1291,7 +1291,7 @@ fn do_swap_with_exact_target_work() { assert_noop!( DexModule::do_swap_with_exact_target( &BOB, - &[DRAM, USDJ, BTC, DRAM], + &[DRAM, SETUSD, BTC, DRAM], 250_000_000_000_000, 200_000_000_000_000, None @@ -1305,63 +1305,63 @@ fn do_swap_with_exact_target_work() { assert_ok!(DexModule::do_swap_with_exact_target( &BOB, - &[DRAM, USDJ], + &[DRAM, SETUSD], 250_000_000_000_000, 200_000_000_000_000, None )); System::assert_last_event(Event::DexModule(crate::Event::Swap( BOB, - vec![DRAM, USDJ], + vec![DRAM, SETUSD], 101_010_101_010_102, 250_000_000_000_000, ))); assert_eq!( - DexModule::get_liquidity(USDJ, DRAM), + DexModule::get_liquidity(SETUSD, DRAM), (250_000_000_000_000, 201_010_101_010_102) ); assert_eq!( - DexModule::get_liquidity(USDJ, BTC), + DexModule::get_liquidity(SETUSD, BTC), (100_000_000_000_000, 10_000_000_000) ); assert_eq!( - Tokens::free_balance(USDJ, &DexModule::account_id()), + Tokens::free_balance(SETUSD, &DexModule::account_id()), 350_000_000_000_000 ); assert_eq!(Tokens::free_balance(DRAM, &DexModule::account_id()), 201_010_101_010_102); assert_eq!(Tokens::free_balance(BTC, &DexModule::account_id()), 10_000_000_000); - assert_eq!(Tokens::free_balance(USDJ, &BOB), 1_000_250_000_000_000_000); + assert_eq!(Tokens::free_balance(SETUSD, &BOB), 1_000_250_000_000_000_000); assert_eq!(Tokens::free_balance(DRAM, &BOB), 999_898_989_898_989_898); assert_eq!(Tokens::free_balance(BTC, &BOB), 1_000_000_000_000_000_000); assert_ok!(DexModule::do_swap_with_exact_target( &BOB, - &[DRAM, USDJ, BTC], + &[DRAM, SETUSD, BTC], 5_000_000_000, 2_000_000_000_000_000, None )); System::assert_last_event(Event::DexModule(crate::Event::Swap( BOB, - vec![DRAM, USDJ, BTC], + vec![DRAM, SETUSD, BTC], 137_654_580_386_993, 5_000_000_000, ))); assert_eq!( - DexModule::get_liquidity(USDJ, DRAM), + DexModule::get_liquidity(SETUSD, DRAM), (148_989_898_989_898, 338_664_681_397_095) ); assert_eq!( - DexModule::get_liquidity(USDJ, BTC), + DexModule::get_liquidity(SETUSD, BTC), (201_010_101_010_102, 5_000_000_000) ); assert_eq!( - Tokens::free_balance(USDJ, &DexModule::account_id()), + Tokens::free_balance(SETUSD, &DexModule::account_id()), 350_000_000_000_000 ); assert_eq!(Tokens::free_balance(DRAM, &DexModule::account_id()), 338_664_681_397_095); assert_eq!(Tokens::free_balance(BTC, &DexModule::account_id()), 5_000_000_000); - assert_eq!(Tokens::free_balance(USDJ, &BOB), 1_000_250_000_000_000_000); + assert_eq!(Tokens::free_balance(SETUSD, &BOB), 1_000_250_000_000_000_000); assert_eq!(Tokens::free_balance(DRAM, &BOB), 999_761_335_318_602_905); assert_eq!(Tokens::free_balance(BTC, &BOB), 1_000_000_005_000_000_000); }); @@ -1376,11 +1376,11 @@ fn initialize_added_liquidity_pools_genesis_work() { .execute_with(|| { System::set_block_number(1); - assert_eq!(DexModule::get_liquidity(USDJ, DRAM), (1000000, 2000000)); - assert_eq!(Tokens::free_balance(USDJ, &DexModule::account_id()), 2000000); + assert_eq!(DexModule::get_liquidity(SETUSD, DRAM), (1000000, 2000000)); + assert_eq!(Tokens::free_balance(SETUSD, &DexModule::account_id()), 2000000); assert_eq!(Tokens::free_balance(DRAM, &DexModule::account_id()), 3000000); assert_eq!( - Tokens::free_balance(USDJDRAMPair::get().dex_share_currency_id(), &ALICE), + Tokens::free_balance(SETUSDDRAMPair::get().dex_share_currency_id(), &ALICE), 2000000 ); }); diff --git a/lib-serml/evm/evm-manager/src/tests.rs b/lib-serml/evm/evm-manager/src/tests.rs index 44cea89a3..c1eb8bfb7 100644 --- a/lib-serml/evm/evm-manager/src/tests.rs +++ b/lib-serml/evm/evm-manager/src/tests.rs @@ -119,7 +119,7 @@ fn name_works() { ); assert_eq!( - EvmCurrencyIdMapping::::name(CurrencyId::DexShare(DexShare::Erc20(erc20_address()), DexShare::Token(TokenSymbol::USDJ))), + EvmCurrencyIdMapping::::name(CurrencyId::DexShare(DexShare::Erc20(erc20_address()), DexShare::Token(TokenSymbol::SETUSD))), Some(b"LP long string name, long string name, long string name, long string name, long string name - Setheum US Dollar"[..32].to_vec()) ); @@ -167,17 +167,17 @@ fn symbol_works() { assert_eq!( EvmCurrencyIdMapping::::symbol(CurrencyId::DexShare( DexShare::Token(TokenSymbol::DNAR), - DexShare::Token(TokenSymbol::USDJ) + DexShare::Token(TokenSymbol::SETUSD) )), - Some(b"LP_DNAR_USDJ".to_vec()) + Some(b"LP_DNAR_SETUSD".to_vec()) ); assert_eq!( EvmCurrencyIdMapping::::symbol(CurrencyId::DexShare( DexShare::Erc20(erc20_address()), - DexShare::Token(TokenSymbol::USDJ) + DexShare::Token(TokenSymbol::SETUSD) )), - Some(b"LP_TestToken_USDJ".to_vec()) + Some(b"LP_TestToken_SETUSD".to_vec()) ); assert_eq!( @@ -233,7 +233,7 @@ fn decimals_works() { assert_eq!( EvmCurrencyIdMapping::::decimals(CurrencyId::DexShare( DexShare::Token(TokenSymbol::DNAR), - DexShare::Token(TokenSymbol::USDJ) + DexShare::Token(TokenSymbol::SETUSD) )), Some(12) ); @@ -241,7 +241,7 @@ fn decimals_works() { assert_eq!( EvmCurrencyIdMapping::::decimals(CurrencyId::DexShare( DexShare::Erc20(erc20_address()), - DexShare::Token(TokenSymbol::USDJ) + DexShare::Token(TokenSymbol::SETUSD) )), Some(17) ); @@ -291,7 +291,7 @@ fn encode_evm_address_works() { assert_eq!( EvmCurrencyIdMapping::::encode_evm_address(CurrencyId::DexShare( DexShare::Token(TokenSymbol::DNAR), - DexShare::Token(TokenSymbol::USDJ) + DexShare::Token(TokenSymbol::SETUSD) )), H160::from_str("0x0000000000000000000000010000000000000003").ok() ); @@ -299,14 +299,14 @@ fn encode_evm_address_works() { assert_eq!( EvmCurrencyIdMapping::::encode_evm_address(CurrencyId::DexShare( DexShare::Erc20(erc20_address()), - DexShare::Token(TokenSymbol::USDJ) + DexShare::Token(TokenSymbol::SETUSD) )), H160::from_str("0x0000000000000000000000010200000000000003").ok() ); assert_eq!( EvmCurrencyIdMapping::::encode_evm_address(CurrencyId::DexShare( - DexShare::Token(TokenSymbol::USDJ), + DexShare::Token(TokenSymbol::SETUSD), DexShare::Erc20(erc20_address()) )), H160::from_str("0x0000000000000000000000010000000302000000").ok() @@ -373,13 +373,13 @@ fn decode_evm_address_works() { EvmCurrencyIdMapping::::decode_evm_address( EvmCurrencyIdMapping::::encode_evm_address(CurrencyId::DexShare( DexShare::Token(TokenSymbol::DNAR), - DexShare::Token(TokenSymbol::USDJ) + DexShare::Token(TokenSymbol::SETUSD) )) .unwrap(), ), Some(CurrencyId::DexShare( DexShare::Token(TokenSymbol::DNAR), - DexShare::Token(TokenSymbol::USDJ) + DexShare::Token(TokenSymbol::SETUSD) )) ); @@ -387,13 +387,13 @@ fn decode_evm_address_works() { EvmCurrencyIdMapping::::decode_evm_address( EvmCurrencyIdMapping::::encode_evm_address(CurrencyId::DexShare( DexShare::Erc20(erc20_address()), - DexShare::Token(TokenSymbol::USDJ) + DexShare::Token(TokenSymbol::SETUSD) )) .unwrap() ), Some(CurrencyId::DexShare( DexShare::Erc20(erc20_address()), - DexShare::Token(TokenSymbol::USDJ) + DexShare::Token(TokenSymbol::SETUSD) )) ); diff --git a/lib-serml/serp/serp-prices/src/lib.rs b/lib-serml/serp/serp-prices/src/lib.rs index cfc73b28d..19e532e2a 100644 --- a/lib-serml/serp/serp-prices/src/lib.rs +++ b/lib-serml/serp/serp-prices/src/lib.rs @@ -72,7 +72,7 @@ pub mod module { type SetterCurrencyId: Get; #[pallet::constant] - /// The SettUSD currency id, it should be USDJ in Setheum. + /// The SettUSD currency id, it should be SETUSD in Setheum. type GetSettUSDCurrencyId: Get; #[pallet::constant] @@ -122,15 +122,15 @@ pub mod module { type FiatUsdFixedPrice: Get; #[pallet::constant] - /// The Setter Peg One currency id, it should be USDJ in Setheum. + /// The Setter Peg One currency id, it should be SETUSD in Setheum. type GetSetterPegOneCurrencyId: Get; #[pallet::constant] - /// The Setter Peg Two currency id, it should be GBPJ in Setheum. + /// The Setter Peg Two currency id, it should be SETGBP in Setheum. type GetSetterPegTwoCurrencyId: Get; #[pallet::constant] - /// The Setter Peg Three currency id, it should be EURJ in Setheum. + /// The Setter Peg Three currency id, it should be SETEUR in Setheum. type GetSetterPegThreeCurrencyId: Get; #[pallet::constant] @@ -154,7 +154,7 @@ pub mod module { type GetSetterPegEightCurrencyId: Get; #[pallet::constant] - /// The Setter Peg Nine currency id, it should be CHFJ in Setheum. + /// The Setter Peg Nine currency id, it should be SETCHF in Setheum. type GetSetterPegNineCurrencyId: Get; #[pallet::constant] @@ -294,34 +294,19 @@ impl PriceProvider for Pallet { fn get_peg_price(currency_id: CurrencyId) -> Option { let maybe_feed_price = if currency_id == T::SetterCurrencyId::get() { Self::get_setter_price() - } else if let CurrencyId::Token(TokenSymbol::USDJ) = currency_id { + } else if let CurrencyId::Token(TokenSymbol::SETUSD) = currency_id { // if locked price exists, return it, otherwise return latest price from oracle. Self::locked_price(T::GetFiatUSDCurrencyId::get()).or_else(|| T::Source::get(&T::GetFiatUSDCurrencyId::get())) - } else if let CurrencyId::Token(TokenSymbol::USDJ) = currency_id { + } else if let CurrencyId::Token(TokenSymbol::SETEUR) = currency_id { // if locked price exists, return it, otherwise return latest price from oracle. Self::locked_price(T::GetFiatUSDCurrencyId::get()).or_else(|| T::Source::get(&T::GetFiatUSDCurrencyId::get())) - } else if let CurrencyId::Token(TokenSymbol::EURJ) = currency_id { + } else if let CurrencyId::Token(TokenSymbol::SETGBP) = currency_id { // if locked price exists, return it, otherwise return latest price from oracle. Self::locked_price(T::GetFiatUSDCurrencyId::get()).or_else(|| T::Source::get(&T::GetFiatUSDCurrencyId::get())) - } else if let CurrencyId::Token(TokenSymbol::JPYJ) = currency_id { + } else if let CurrencyId::Token(TokenSymbol::SETCHF) = currency_id { // if locked price exists, return it, otherwise return latest price from oracle. Self::locked_price(T::GetFiatUSDCurrencyId::get()).or_else(|| T::Source::get(&T::GetFiatUSDCurrencyId::get())) - } else if let CurrencyId::Token(TokenSymbol::GBPJ) = currency_id { - // if locked price exists, return it, otherwise return latest price from oracle. - Self::locked_price(T::GetFiatUSDCurrencyId::get()).or_else(|| T::Source::get(&T::GetFiatUSDCurrencyId::get())) - } else if let CurrencyId::Token(TokenSymbol::AUDJ) = currency_id { - // if locked price exists, return it, otherwise return latest price from oracle. - Self::locked_price(T::GetFiatUSDCurrencyId::get()).or_else(|| T::Source::get(&T::GetFiatUSDCurrencyId::get())) - } else if let CurrencyId::Token(TokenSymbol::CADJ) = currency_id { - // if locked price exists, return it, otherwise return latest price from oracle. - Self::locked_price(T::GetFiatUSDCurrencyId::get()).or_else(|| T::Source::get(&T::GetFiatUSDCurrencyId::get())) - } else if let CurrencyId::Token(TokenSymbol::CHFJ) = currency_id { - // if locked price exists, return it, otherwise return latest price from oracle. - Self::locked_price(T::GetFiatUSDCurrencyId::get()).or_else(|| T::Source::get(&T::GetFiatUSDCurrencyId::get())) - } else if let CurrencyId::Token(TokenSymbol::SEKJ) = currency_id { - // if locked price exists, return it, otherwise return latest price from oracle. - Self::locked_price(T::GetFiatUSDCurrencyId::get()).or_else(|| T::Source::get(&T::GetFiatUSDCurrencyId::get())) - } else if let CurrencyId::Token(TokenSymbol::SGDJ) = currency_id { + } else if let CurrencyId::Token(TokenSymbol::SETSAR) = currency_id { // if locked price exists, return it, otherwise return latest price from oracle. Self::locked_price(T::GetFiatUSDCurrencyId::get()).or_else(|| T::Source::get(&T::GetFiatUSDCurrencyId::get())) } else { diff --git a/lib-serml/serp/serp-prices/src/mock.rs b/lib-serml/serp/serp-prices/src/mock.rs index dc4e1b4f0..c036eee1f 100644 --- a/lib-serml/serp/serp-prices/src/mock.rs +++ b/lib-serml/serp/serp-prices/src/mock.rs @@ -44,23 +44,19 @@ mod serp_prices { pub const DNAR: CurrencyId = CurrencyId::Token(TokenSymbol::DNAR); pub const DRAM: CurrencyId = CurrencyId::Token(TokenSymbol::DRAM); pub const SETR: CurrencyId = CurrencyId::Token(TokenSymbol::SETR); -pub const AUDJ: CurrencyId = CurrencyId::Token(TokenSymbol::AUDJ); -pub const CADJ: CurrencyId = CurrencyId::Token(TokenSymbol::CADJ); -pub const EURJ: CurrencyId = CurrencyId::Token(TokenSymbol::EURJ); -pub const GBPJ: CurrencyId = CurrencyId::Token(TokenSymbol::GBPJ); -pub const JPYJ: CurrencyId = CurrencyId::Token(TokenSymbol::JPYJ); -pub const SARJ: CurrencyId = CurrencyId::Token(TokenSymbol::SARJ); -pub const SEKJ: CurrencyId = CurrencyId::Token(TokenSymbol::SEKJ); -pub const SGDJ: CurrencyId = CurrencyId::Token(TokenSymbol::SGDJ); -pub const USDJ: CurrencyId = CurrencyId::Token(TokenSymbol::USDJ); +pub const SETUSD: CurrencyId = CurrencyId::Token(TokenSymbol::SETUSD); +pub const SETEUR: CurrencyId = CurrencyId::Token(TokenSymbol::SETEUR); +pub const SETGBP: CurrencyId = CurrencyId::Token(TokenSymbol::SETGBP); +pub const SETCHF: CurrencyId = CurrencyId::Token(TokenSymbol::SETCHF); +pub const SETSAR: CurrencyId = CurrencyId::Token(TokenSymbol::SETSAR); pub const BTC: CurrencyId = CurrencyId::Token(TokenSymbol::RENBTC); // LP tokens constants - CurrencyId/TokenSymbol : Dex Shares -pub const LP_BTC_USDJ: CurrencyId = -CurrencyId::DexShare(DexShare::Token(TokenSymbol::RENBTC), DexShare::Token(TokenSymbol::USDJ)); -pub const LP_USDJ_DRAM: CurrencyId = -CurrencyId::DexShare(DexShare::Token(TokenSymbol::USDJ), DexShare::Token(TokenSymbol::DRAM)); +pub const LP_BTC_SETUSD: CurrencyId = +CurrencyId::DexShare(DexShare::Token(TokenSymbol::RENBTC), DexShare::Token(TokenSymbol::SETUSD)); +pub const LP_SETUSD_DRAM: CurrencyId = +CurrencyId::DexShare(DexShare::Token(TokenSymbol::SETUSD), DexShare::Token(TokenSymbol::DRAM)); // Currencies constants - FiatCurrencyIds (CurrencyId/TokenSymbol) pub const AUD: CurrencyId = CurrencyId::Token(TokenSymbol::AUD); @@ -114,7 +110,7 @@ pub struct MockDataProvider; impl DataProvider for MockDataProvider { fn get(currency_id: &CurrencyId) -> Option { match *currency_id { - USDJ => Some(Price::saturating_from_rational(99, 100)), + SETUSD => Some(Price::saturating_from_rational(99, 100)), BTC => Some(Price::saturating_from_integer(50000)), DNAR => Some(Price::saturating_from_integer(100)), DRAM => Some(Price::zero()), @@ -133,7 +129,7 @@ pub struct MockDEX; impl DEXManager for MockDEX { fn get_liquidity_pool(currency_id_a: CurrencyId, currency_id_b: CurrencyId) -> (Balance, Balance) { match (currency_id_a, currency_id_b) { - (USDJ, DNAR) => (10000, 200), + (SETUSD, DNAR) => (10000, 200), _ => (0, 0), } } @@ -224,7 +220,7 @@ ord_parameter_types! { parameter_types! { pub const SetterCurrencyId: CurrencyId = SETR; // Setter currency ticker is SETR. - pub const GetSettUSDCurrencyId: CurrencyId = USDJ; // SettUSD currency ticker is USDJ. + pub const GetSettUSDCurrencyId: CurrencyId = SETUSD; // SettUSD currency ticker is SETUSD. pub const GetFiatAUDCurrencyId: CurrencyId = AUD; // The AUD Fiat currency denomination. pub const GetFiatCADCurrencyId: CurrencyId = CAD; // The CAD Fiat currency denomination. pub const GetFiatCHFCurrencyId: CurrencyId = CHF; // The CHF Fiat currency denomination. @@ -249,14 +245,8 @@ parameter_types! { pub const GetSetterPegTenCurrencyId: CurrencyId = USD; // Fiat pegs of the Setter (SETR). - pub StableCurrencyIds: Vec = vec![ - SETR, AUDJ, CADJ, BTC, EURJ, GBPJ, - JPYJ, SARJ, SEKJ, SGDJ, USDJ, - ]; - pub FiatCurrencyIds: Vec = vec![ - AUD, CAD, CHF, EUR, GBP, JPY, SAR, SEK, - SGD, USD, JOD, BHD, KYD, OMR, GIP - ]; + pub StableCurrencyIds: Vec = vec![SETR, SETCHF, SETEUR, SETGBP, SETSAR, SETUSD]; + pub FiatCurrencyIds: Vec = vec![CHF, EUR, GBP, SAR, USD, JOD, BHD, KYD, OMR, GIP]; } impl Config for Runtime { diff --git a/lib-serml/serp/serp-prices/src/tests.rs b/lib-serml/serp/serp-prices/src/tests.rs index 25778e80f..b4983fc9a 100644 --- a/lib-serml/serp/serp-prices/src/tests.rs +++ b/lib-serml/serp/serp-prices/src/tests.rs @@ -120,11 +120,11 @@ fn lp_token_fair_price_works() { fn get_peg_price_works() { ExtBuilder::default().build().execute_with(|| { assert_eq!( - SerpPrices::get_peg_price(USDJ), + SerpPrices::get_peg_price(SETUSD), Price::saturating_from_integer(1000000u128) ); // 1 USD, right shift the decimal point (18-12) places assert_eq!( - SerpPrices::get_peg_price(EURJ), + SerpPrices::get_peg_price(SETEUR), Price::saturating_from_integer(1000000u128) ); }); @@ -148,7 +148,7 @@ fn get_price_from_oracle() { fn get_price_of_stable_currency_id() { ExtBuilder::default().build().execute_with(|| { assert_eq!( - SerpPrices::get_price(USDJ), + SerpPrices::get_price(SETUSD), Some(Price::saturating_from_integer(990000u128)) ); // 1 USD, right shift the decimal point (18-12) places }); @@ -157,27 +157,27 @@ fn get_price_of_stable_currency_id() { #[test] fn get_price_of_lp_token_currency_id() { ExtBuilder::default().build().execute_with(|| { - assert_eq!(MockDEX::get_liquidity_pool(USDJ, DRAM), (10000, 200)); - assert_eq!(SerpPrices::get_price(LP_USDJ_DRAM), None); - assert_ok!(Tokens::deposit(LP_USDJ_DRAM, &1, 100)); - assert_eq!(Tokens::total_issuance(LP_USDJ_DRAM), 100); + assert_eq!(MockDEX::get_liquidity_pool(SETUSD, DRAM), (10000, 200)); + assert_eq!(SerpPrices::get_price(LP_SETUSD_DRAM), None); + assert_ok!(Tokens::deposit(LP_SETUSD_DRAM, &1, 100)); + assert_eq!(Tokens::total_issuance(LP_SETUSD_DRAM), 100); assert_eq!( - SerpPrices::get_price(USDJ), + SerpPrices::get_price(SETUSD), Some(Price::saturating_from_rational(1000000u128, 1)) ); assert_eq!( - SerpPrices::get_price(LP_USDJ_DRAM), + SerpPrices::get_price(LP_SETUSD_DRAM), lp_token_fair_price( - Tokens::total_issuance(LP_USDJ_DRAM), - MockDEX::get_liquidity_pool(USDJ, DRAM).0, - MockDEX::get_liquidity_pool(USDJ, DRAM).1, - SerpPrices::get_price(USDJ).unwrap(), + Tokens::total_issuance(LP_SETUSD_DRAM), + MockDEX::get_liquidity_pool(SETUSD, DRAM).0, + MockDEX::get_liquidity_pool(SETUSD, DRAM).1, + SerpPrices::get_price(SETUSD).unwrap(), SerpPrices::get_price(DRAM).unwrap() ) ); - assert_eq!(MockDEX::get_liquidity_pool(BTC, USDJ), (0, 0)); - assert_eq!(SerpPrices::get_price(LP_BTC_USDJ), None); + assert_eq!(MockDEX::get_liquidity_pool(BTC, SETUSD), (0, 0)); + assert_eq!(SerpPrices::get_price(LP_BTC_SETUSD), None); }); } @@ -186,7 +186,7 @@ fn get_relative_price_works() { ExtBuilder::default().build().execute_with(|| { assert_eq!( SerpPrices::get_relative_price(BTC, DNAR), - Some(Price::saturating_from_rational(5000000, 1)) /* 1DNAR = 100USDJ, right shift the decimal point (12-10) + Some(Price::saturating_from_rational(5000000, 1)) /* 1DNAR = 100SETUSD, right shift the decimal point (12-10) * places */ ); }); diff --git a/lib-serml/serp/serp-treasury/src/lib.rs b/lib-serml/serp/serp-treasury/src/lib.rs index b747d171c..39e8fd9b5 100644 --- a/lib-serml/serp/serp-treasury/src/lib.rs +++ b/lib-serml/serp/serp-treasury/src/lib.rs @@ -74,7 +74,7 @@ pub mod module { type SetterCurrencyId: Get; #[pallet::constant] - /// The SettUSD currency id, it should be USDJ in Setheum. + /// The SettUSD currency id, it should be SETUSD in Setheum. type GetSettUSDCurrencyId: Get; #[pallet::constant] diff --git a/lib-serml/serp/serp-treasury/src/mock.rs b/lib-serml/serp/serp-treasury/src/mock.rs index ad90f9987..4050c1aab 100644 --- a/lib-serml/serp/serp-treasury/src/mock.rs +++ b/lib-serml/serp/serp-treasury/src/mock.rs @@ -46,16 +46,12 @@ pub const VAULT: AccountId = 10; pub const DNAR: CurrencyId = CurrencyId::Token(TokenSymbol::DNAR); pub const DRAM: CurrencyId = CurrencyId::Token(TokenSymbol::DRAM); pub const SETR: CurrencyId = CurrencyId::Token(TokenSymbol::SETR); -pub const AUDJ: CurrencyId = CurrencyId::Token(TokenSymbol::AUDJ); -pub const CADJ: CurrencyId = CurrencyId::Token(TokenSymbol::CADJ); -pub const CHFJ: CurrencyId = CurrencyId::Token(TokenSymbol::CHFJ); -pub const EURJ: CurrencyId = CurrencyId::Token(TokenSymbol::EURJ); -pub const GBPJ: CurrencyId = CurrencyId::Token(TokenSymbol::GBPJ); -pub const JPYJ: CurrencyId = CurrencyId::Token(TokenSymbol::JPYJ); -pub const SARJ: CurrencyId = CurrencyId::Token(TokenSymbol::SARJ); -pub const SEKJ: CurrencyId = CurrencyId::Token(TokenSymbol::SEKJ); -pub const SGDJ: CurrencyId = CurrencyId::Token(TokenSymbol::SGDJ); -pub const USDJ: CurrencyId = CurrencyId::Token(TokenSymbol::USDJ); +pub const SETUSD: CurrencyId = CurrencyId::Token(TokenSymbol::SETUSD); +pub const SETEUR: CurrencyId = CurrencyId::Token(TokenSymbol::SETEUR); +pub const SETGBP: CurrencyId = CurrencyId::Token(TokenSymbol::SETGBP); +pub const SETCHF: CurrencyId = CurrencyId::Token(TokenSymbol::SETCHF); +pub const SETSAR: CurrencyId = CurrencyId::Token(TokenSymbol::SETSAR); +pub const BTC: CurrencyId = CurrencyId::Token(TokenSymbol::RENBTC); mod serp_treasury { @@ -145,26 +141,16 @@ parameter_types! { pub const TradingPathLimit: u32 = 3; pub EnabledTradingPairs: Vec = vec![ TradingPair::from_currency_ids(DNAR, SETR).unwrap(), - TradingPair::from_currency_ids(AUDJ, SETR).unwrap(), - TradingPair::from_currency_ids(CADJ, SETR).unwrap(), - TradingPair::from_currency_ids(CHFJ, SETR).unwrap(), - TradingPair::from_currency_ids(EURJ, SETR).unwrap(), - TradingPair::from_currency_ids(GBPJ, SETR).unwrap(), - TradingPair::from_currency_ids(JPYJ, SETR).unwrap(), - TradingPair::from_currency_ids(SARJ, SETR).unwrap(), - TradingPair::from_currency_ids(SEKJ, SETR).unwrap(), - TradingPair::from_currency_ids(SGDJ, SETR).unwrap(), - TradingPair::from_currency_ids(USDJ, SETR).unwrap(), - TradingPair::from_currency_ids(AUDJ, DNAR).unwrap(), - TradingPair::from_currency_ids(CADJ, DNAR).unwrap(), - TradingPair::from_currency_ids(CHFJ, DNAR).unwrap(), - TradingPair::from_currency_ids(EURJ, DNAR).unwrap(), - TradingPair::from_currency_ids(GBPJ, DNAR).unwrap(), - TradingPair::from_currency_ids(JPYJ, DNAR).unwrap(), - TradingPair::from_currency_ids(SARJ, DNAR).unwrap(), - TradingPair::from_currency_ids(SEKJ, DNAR).unwrap(), - TradingPair::from_currency_ids(SGDJ, DNAR).unwrap(), - TradingPair::from_currency_ids(USDJ, DNAR).unwrap(), + TradingPair::from_currency_ids(SETCHF, SETR).unwrap(), + TradingPair::from_currency_ids(SETEUR, SETR).unwrap(), + TradingPair::from_currency_ids(SETGBP, SETR).unwrap(), + TradingPair::from_currency_ids(SETSAR, SETR).unwrap(), + TradingPair::from_currency_ids(SETUSD, SETR).unwrap(), + TradingPair::from_currency_ids(SETCHF, DNAR).unwrap(), + TradingPair::from_currency_ids(SETEUR, DNAR).unwrap(), + TradingPair::from_currency_ids(SETGBP, DNAR).unwrap(), + TradingPair::from_currency_ids(SETSAR, DNAR).unwrap(), + TradingPair::from_currency_ids(SETUSD, DNAR).unwrap(), ]; } @@ -223,19 +209,14 @@ ord_parameter_types! { parameter_types! { pub StableCurrencyIds: Vec = vec![ SETR, - AUDJ, - CADJ, - CHFJ, - EURJ, - GBPJ, - JPYJ, - SARJ, - SEKJ, - SGDJ, - USDJ, + SETCHF, + SETEUR, + SETGBP, + SETSAR, + SETUSD, ]; pub const SetterCurrencyId: CurrencyId = SETR; // Setter currency ticker is SETR/ - pub const GetSettUSDCurrencyId: CurrencyId = USDJ; // Setter currency ticker is USDJ/ + pub const GetSettUSDCurrencyId: CurrencyId = SETUSD; // Setter currency ticker is SETUSD/ pub const DirhamCurrencyId: CurrencyId = DRAM; // SettinDEX currency ticker is DRAM/ pub const SerpTreasuryPalletId: PalletId = PalletId(*b"set/serp"); @@ -251,42 +232,33 @@ parameter_types! { DNAR, DRAM, SETR, - AUDJ, - CADJ, - CHFJ, - EURJ, - GBPJ, - JPYJ, - SARJ, - SEKJ, - SGDJ, - USDJ, + SETCHF, + SETEUR, + SETGBP, + SETSAR, + SETUSD, ]; pub NonStableDropCurrencyIds: Vec = vec![DNAR, DRAM]; pub SetCurrencyDropCurrencyIds: Vec = vec![ - AUDJ, - CADJ, - CHFJ, - EURJ, - GBPJ, - JPYJ, - SARJ, - SEKJ, - SGDJ, - USDJ, + SETCHF, + SETEUR, + SETGBP, + SETSAR, + SETUSD, ]; } parameter_type_with_key! { pub MinimumClaimableTransferAmounts: |currency_id: CurrencyId| -> Balance { match currency_id { + &DNAR => 2, + &DRAM => 2, &SETR => 2, - &AUDJ => 2, - &CHFJ => 2, - &EURJ => 2, - &GBPJ => 2, - &JPYJ => 2, - &USDJ => 2, + &SETCHF => 2, + &SETEUR => 2, + &SETGBP => 2, + &SETUSD => 2, + &SETSAR => 2, _ => 0, } }; @@ -296,12 +268,11 @@ parameter_type_with_key! { pub GetStableCurrencyMinimumSupply: |currency_id: CurrencyId| -> Balance { match currency_id { &SETR => 10_000, - &AUDJ => 10_000, - &CHFJ => 10_000, - &EURJ => 10_000, - &GBPJ => 10_000, - &JPYJ => 10_000, - &USDJ => 10_000, + &SETCHF => 10_000, + &SETEUR => 10_000, + &SETGBP => 10_000, + &SETUSD => 10_000, + &SETSAR => 10_000, _ => 0, } }; @@ -358,21 +329,21 @@ impl Default for ExtBuilder { fn default() -> Self { Self { balances: vec![ - (ALICE, USDJ, 1000), + (ALICE, SETUSD, 1000), (ALICE, SETR, 1000), (ALICE, DNAR, 1000), (ALICE, DRAM, 1000), - (BOB, USDJ, 1000), + (BOB, SETUSD, 1000), (BOB, SETR, 1000), (BOB, DNAR, 1000), (BOB, DRAM, 1000), - (CHARITY_FUND, USDJ, 1000), + (CHARITY_FUND, SETUSD, 1000), (CHARITY_FUND, SETR, 1000), (CHARITY_FUND, DNAR, 1000), (CHARITY_FUND, DRAM, 1000), - (SETRPAY, USDJ, 1000), + (SETRPAY, SETUSD, 1000), (SETRPAY, SETR, 1000), - (VAULT, USDJ, 1000), + (VAULT, SETUSD, 1000), (VAULT, SETR, 1000), ], } diff --git a/lib-serml/serp/serp-treasury/src/tests.rs b/lib-serml/serp/serp-treasury/src/tests.rs index 687013a5c..a7256eb7c 100644 --- a/lib-serml/serp/serp-treasury/src/tests.rs +++ b/lib-serml/serp/serp-treasury/src/tests.rs @@ -27,22 +27,22 @@ use mock::*; #[test] fn issue_standard_works() { ExtBuilder::default().build().execute_with(|| { - assert_eq!(Currencies::free_balance(USDJ, &ALICE), 1000); + assert_eq!(Currencies::free_balance(SETUSD, &ALICE), 1000); - assert_ok!(SerpTreasuryModule::issue_standard(USDJ, &ALICE, 1000)); - assert_eq!(Currencies::free_balance(USDJ, &ALICE), 2000); + assert_ok!(SerpTreasuryModule::issue_standard(SETUSD, &ALICE, 1000)); + assert_eq!(Currencies::free_balance(SETUSD, &ALICE), 2000); - assert_ok!(SerpTreasuryModule::issue_standard(USDJ, &ALICE, 1000)); - assert_eq!(Currencies::free_balance(USDJ, &ALICE), 3000); + assert_ok!(SerpTreasuryModule::issue_standard(SETUSD, &ALICE, 1000)); + assert_eq!(Currencies::free_balance(SETUSD, &ALICE), 3000); }); } #[test] fn burn_standard_works() { ExtBuilder::default().build().execute_with(|| { - assert_eq!(Currencies::free_balance(USDJ, &ALICE), 1000); - assert_ok!(SerpTreasuryModule::burn_standard(USDJ, &ALICE, 300)); - assert_eq!(Currencies::free_balance(USDJ, &ALICE), 700); + assert_eq!(Currencies::free_balance(SETUSD, &ALICE), 1000); + assert_ok!(SerpTreasuryModule::burn_standard(SETUSD, &ALICE, 300)); + assert_eq!(Currencies::free_balance(SETUSD, &ALICE), 700); }); } @@ -125,24 +125,24 @@ fn swap_exact_setter_to_dinar_work() { #[test] fn swap_exact_setcurrency_to_dinar_work() { ExtBuilder::default().build().execute_with(|| { - assert_ok!(Currencies::deposit(USDJ, &BOB, 10000)); + assert_ok!(Currencies::deposit(SETUSD, &BOB, 10000)); assert_ok!(Currencies::deposit(DNAR, &BOB, 10000)); assert_ok!(SetheumDEX::add_liquidity( Origin::signed(BOB), - USDJ, + SETUSD, DNAR, 1000, 1000, 0, )); - assert_ok!(Currencies::deposit(USDJ, &SerpTreasuryModule::account_id(), 10000)); + assert_ok!(Currencies::deposit(SETUSD, &SerpTreasuryModule::account_id(), 10000)); assert_ok!(SerpTreasuryModule::swap_exact_setcurrency_to_dinar( - USDJ, 100, None + SETUSD, 100, None )); - assert_eq!(Currencies::free_balance(USDJ, &SerpTreasuryModule::account_id()), 100); + assert_eq!(Currencies::free_balance(SETUSD, &SerpTreasuryModule::account_id()), 100); assert_noop!( - SerpTreasuryModule::swap_exact_setcurrency_to_dinar(USDJ, 100, Some(&vec![USDJ, DNAR])), + SerpTreasuryModule::swap_exact_setcurrency_to_dinar(SETUSD, 100, Some(&vec![SETUSD, DNAR])), Error::::InvalidSwapPath ); }); diff --git a/lib-serml/settmint/settmint-engine/src/mock.rs b/lib-serml/settmint/settmint-engine/src/mock.rs index c01669a79..b338a8e76 100644 --- a/lib-serml/settmint/settmint-engine/src/mock.rs +++ b/lib-serml/settmint/settmint-engine/src/mock.rs @@ -45,16 +45,12 @@ pub const CHARITY_FUND: AccountId = 4; pub const DNAR: CurrencyId = CurrencyId::Token(TokenSymbol::DNAR); pub const DRAM: CurrencyId = CurrencyId::Token(TokenSymbol::DRAM); pub const SETR: CurrencyId = CurrencyId::Token(TokenSymbol::SETR); -pub const AUDJ: CurrencyId = CurrencyId::Token(TokenSymbol::AUDJ); -pub const CADJ: CurrencyId = CurrencyId::Token(TokenSymbol::CADJ); -pub const CHFJ: CurrencyId = CurrencyId::Token(TokenSymbol::CHFJ); -pub const EURJ: CurrencyId = CurrencyId::Token(TokenSymbol::EURJ); -pub const GBPJ: CurrencyId = CurrencyId::Token(TokenSymbol::GBPJ); -pub const JPYJ: CurrencyId = CurrencyId::Token(TokenSymbol::JPYJ); -pub const SARJ: CurrencyId = CurrencyId::Token(TokenSymbol::SARJ); -pub const SEKJ: CurrencyId = CurrencyId::Token(TokenSymbol::SEKJ); -pub const SGDJ: CurrencyId = CurrencyId::Token(TokenSymbol::SGDJ); -pub const USDJ: CurrencyId = CurrencyId::Token(TokenSymbol::USDJ); +pub const SETUSD: CurrencyId = CurrencyId::Token(TokenSymbol::SETUSD); +pub const SETEUR: CurrencyId = CurrencyId::Token(TokenSymbol::SETEUR); +pub const SETGBP: CurrencyId = CurrencyId::Token(TokenSymbol::SETGBP); +pub const SETCHF: CurrencyId = CurrencyId::Token(TokenSymbol::SETCHF); +pub const SETSAR: CurrencyId = CurrencyId::Token(TokenSymbol::SETSAR); +pub const BTC: CurrencyId = CurrencyId::Token(TokenSymbol::RENBTC); mod settmint_engine { @@ -165,9 +161,9 @@ impl MockPriceSource { impl PriceProvider for MockPriceSource { fn get_relative_price(base: CurrencyId, quote: CurrencyId) -> Option { match (base, quote) { - (USDJ, SETR) => RELATIVE_PRICE.with(|v| *v.borrow_mut()), - (SETR, USDJ) => RELATIVE_PRICE.with(|v| *v.borrow_mut()), - (SETR, EURJ) => RELATIVE_PRICE.with(|v| *v.borrow_mut()), + (SETUSD, SETR) => RELATIVE_PRICE.with(|v| *v.borrow_mut()), + (SETR, SETUSD) => RELATIVE_PRICE.with(|v| *v.borrow_mut()), + (SETR, SETEUR) => RELATIVE_PRICE.with(|v| *v.borrow_mut()), _ => None, } } @@ -195,12 +191,9 @@ impl PriceProvider for MockPriceSource { parameter_types! { - pub StableCurrencyIds: Vec = vec![ - SETR, AUDJ, CADJ, CHFJ, EURJ, GBPJ, - JPYJ, SARJ, SEKJ, SGDJ, USDJ, - ]; + pub StableCurrencyIds: Vec = vec![SETR, SETCHF, SETEUR, SETGBP, SETSAR, SETUSD]; pub const SetterCurrencyId: CurrencyId = SETR; // Setter currency ticker is SETR/ - pub const GetSettUSDCurrencyId: CurrencyId = USDJ; // Setter currency ticker is USDJ/ + pub const GetSettUSDCurrencyId: CurrencyId = SETUSD; // Setter currency ticker is SETUSD/ pub const DirhamCurrencyId: CurrencyId = DRAM; // SettinDEX currency ticker is DRAM/ pub const SerpTreasuryPalletId: PalletId = PalletId(*b"set/serp"); @@ -216,29 +209,19 @@ parameter_types! { DNAR, DRAM, SETR, - AUDJ, - CADJ, - CHFJ, - EURJ, - GBPJ, - JPYJ, - SARJ, - SEKJ, - SGDJ, - USDJ, + SETCHF, + SETEUR, + SETGBP, + SETSAR, + SETUSD, ]; pub NonStableDropCurrencyIds: Vec = vec![DNAR, DRAM]; pub SetCurrencyDropCurrencyIds: Vec = vec![ - AUDJ, - CADJ, - CHFJ, - EURJ, - GBPJ, - JPYJ, - SARJ, - SEKJ, - SGDJ, - USDJ, + SETCHF, + SETEUR, + SETGBP, + SETSAR, + SETUSD, ]; } @@ -246,12 +229,11 @@ parameter_type_with_key! { pub MinimumClaimableTransferAmounts: |currency_id: CurrencyId| -> Balance { match currency_id { &SETR => 2, - &AUDJ => 2, - &CHFJ => 2, - &EURJ => 2, - &GBPJ => 2, - &JPYJ => 2, - &USDJ => 2, + &SETCHF => 2, + &SETEUR => 2, + &SETGBP => 2, + &SETUSD => 2, + &SETSAR => 2, _ => 0, } }; @@ -261,12 +243,11 @@ parameter_type_with_key! { pub GetStableCurrencyMinimumSupply: |currency_id: CurrencyId| -> Balance { match currency_id { &SETR => 10_000, - &AUDJ => 10_000, - &CHFJ => 10_000, - &EURJ => 10_000, - &GBPJ => 10_000, - &JPYJ => 10_000, - &USDJ => 10_000, + &SETCHF => 10_000, + &SETEUR => 10_000, + &SETGBP => 10_000, + &SETUSD => 10_000, + &SETSAR => 10_000, _ => 0, } }; @@ -302,26 +283,16 @@ parameter_types! { pub const TradingPathLimit: u32 = 3; pub EnabledTradingPairs: Vec = vec![ TradingPair::from_currency_ids(DNAR, SETR).unwrap(), - TradingPair::from_currency_ids(AUDJ, SETR).unwrap(), - TradingPair::from_currency_ids(CADJ, SETR).unwrap(), - TradingPair::from_currency_ids(CHFJ, SETR).unwrap(), - TradingPair::from_currency_ids(EURJ, SETR).unwrap(), - TradingPair::from_currency_ids(GBPJ, SETR).unwrap(), - TradingPair::from_currency_ids(JPYJ, SETR).unwrap(), - TradingPair::from_currency_ids(SARJ, SETR).unwrap(), - TradingPair::from_currency_ids(SEKJ, SETR).unwrap(), - TradingPair::from_currency_ids(SGDJ, SETR).unwrap(), - TradingPair::from_currency_ids(USDJ, SETR).unwrap(), - TradingPair::from_currency_ids(AUDJ, DNAR).unwrap(), - TradingPair::from_currency_ids(CADJ, DNAR).unwrap(), - TradingPair::from_currency_ids(CHFJ, DNAR).unwrap(), - TradingPair::from_currency_ids(EURJ, DNAR).unwrap(), - TradingPair::from_currency_ids(GBPJ, DNAR).unwrap(), - TradingPair::from_currency_ids(JPYJ, DNAR).unwrap(), - TradingPair::from_currency_ids(SARJ, DNAR).unwrap(), - TradingPair::from_currency_ids(SEKJ, DNAR).unwrap(), - TradingPair::from_currency_ids(SGDJ, DNAR).unwrap(), - TradingPair::from_currency_ids(USDJ, DNAR).unwrap(), + TradingPair::from_currency_ids(SETCHF, SETR).unwrap(), + TradingPair::from_currency_ids(SETEUR, SETR).unwrap(), + TradingPair::from_currency_ids(SETGBP, SETR).unwrap(), + TradingPair::from_currency_ids(SETSAR, SETR).unwrap(), + TradingPair::from_currency_ids(SETUSD, SETR).unwrap(), + TradingPair::from_currency_ids(SETCHF, DNAR).unwrap(), + TradingPair::from_currency_ids(SETEUR, DNAR).unwrap(), + TradingPair::from_currency_ids(SETGBP, DNAR).unwrap(), + TradingPair::from_currency_ids(SETSAR, DNAR).unwrap(), + TradingPair::from_currency_ids(SETUSD, DNAR).unwrap(), ]; } @@ -342,16 +313,11 @@ ord_parameter_types! { parameter_types! { pub StandardCurrencyIds: Vec = vec![ - AUDJ, - CADJ, - CHFJ, - EURJ, - GBPJ, - JPYJ, - SARJ, - SEKJ, - SGDJ, - USDJ, + SETCHF, + SETEUR, + SETGBP, + SETSAR, + SETUSD, ]; pub const GetReserveCurrencyId: CurrencyId = SETR; pub DefaultStandardExchangeRate: ExchangeRate = ExchangeRate::one(); @@ -408,9 +374,9 @@ impl Default for ExtBuilder { (ALICE, SETR, 1000), (BOB, SETR, 1000), (CAROL, SETR, 100), - (ALICE, EURJ, 1000), - (BOB, EURJ, 1000), - (CAROL, USDJ, 1000), + (ALICE, SETEUR, 1000), + (BOB, SETEUR, 1000), + (CAROL, SETUSD, 1000), ], } } diff --git a/lib-serml/settmint/settmint-engine/src/tests.rs b/lib-serml/settmint/settmint-engine/src/tests.rs index 1f01112d5..57047d30e 100644 --- a/lib-serml/settmint/settmint-engine/src/tests.rs +++ b/lib-serml/settmint/settmint-engine/src/tests.rs @@ -49,19 +49,19 @@ fn calculate_reserve_ratio_work() { fn adjust_position_work() { ExtBuilder::default().build().execute_with(|| { assert_eq!(Currencies::free_balance(SETR, &ALICE), 1000); - assert_eq!(Currencies::free_balance(USDJ, &ALICE), 0); - assert_eq!(SettmintManagerModule::positions(USDJ, ALICE).standard, 0); - assert_eq!(SettmintManagerModule::positions(USDJ, ALICE).reserve, 0); - assert_ok!(SettmintEngineModule::adjust_position(&ALICE, USDJ, 100, 50)); + assert_eq!(Currencies::free_balance(SETUSD, &ALICE), 0); + assert_eq!(SettmintManagerModule::positions(SETUSD, ALICE).standard, 0); + assert_eq!(SettmintManagerModule::positions(SETUSD, ALICE).reserve, 0); + assert_ok!(SettmintEngineModule::adjust_position(&ALICE, SETUSD, 100, 50)); assert_eq!(Currencies::free_balance(SETR, &ALICE), 900); - assert_eq!(Currencies::free_balance(USDJ, &ALICE), 50); - assert_eq!(SettmintManagerModule::positions(USDJ, ALICE).standard, 50); - assert_eq!(SettmintManagerModule::positions(USDJ, ALICE).reserve, 100); - assert_eq!(SettmintEngineModule::adjust_position(&ALICE, USDJ, 0, 20).is_ok(), true); - assert_ok!(SettmintEngineModule::adjust_position(&ALICE, USDJ, 0, -20)); + assert_eq!(Currencies::free_balance(SETUSD, &ALICE), 50); + assert_eq!(SettmintManagerModule::positions(SETUSD, ALICE).standard, 50); + assert_eq!(SettmintManagerModule::positions(SETUSD, ALICE).reserve, 100); + assert_eq!(SettmintEngineModule::adjust_position(&ALICE, SETUSD, 0, 20).is_ok(), true); + assert_ok!(SettmintEngineModule::adjust_position(&ALICE, SETUSD, 0, -20)); assert_eq!(Currencies::free_balance(SETR, &ALICE), 900); - assert_eq!(Currencies::free_balance(USDJ, &ALICE), 50); - assert_eq!(SettmintManagerModule::positions(USDJ, ALICE).standard, 50); - assert_eq!(SettmintManagerModule::positions(USDJ, ALICE).reserve, 100); + assert_eq!(Currencies::free_balance(SETUSD, &ALICE), 50); + assert_eq!(SettmintManagerModule::positions(SETUSD, ALICE).standard, 50); + assert_eq!(SettmintManagerModule::positions(SETUSD, ALICE).reserve, 100); }); } diff --git a/lib-serml/settmint/settmint-gateway/src/mock.rs b/lib-serml/settmint/settmint-gateway/src/mock.rs index 587eb7c13..e6fff0e49 100644 --- a/lib-serml/settmint/settmint-gateway/src/mock.rs +++ b/lib-serml/settmint/settmint-gateway/src/mock.rs @@ -48,16 +48,12 @@ pub const CHARITY_FUND: AccountId = 4; pub const DNAR: CurrencyId = CurrencyId::Token(TokenSymbol::DNAR); pub const DRAM: CurrencyId = CurrencyId::Token(TokenSymbol::DRAM); pub const SETR: CurrencyId = CurrencyId::Token(TokenSymbol::SETR); -pub const AUDJ: CurrencyId = CurrencyId::Token(TokenSymbol::AUDJ); -pub const CADJ: CurrencyId = CurrencyId::Token(TokenSymbol::CADJ); -pub const CHFJ: CurrencyId = CurrencyId::Token(TokenSymbol::CHFJ); -pub const EURJ: CurrencyId = CurrencyId::Token(TokenSymbol::EURJ); -pub const GBPJ: CurrencyId = CurrencyId::Token(TokenSymbol::GBPJ); -pub const JPYJ: CurrencyId = CurrencyId::Token(TokenSymbol::JPYJ); -pub const SARJ: CurrencyId = CurrencyId::Token(TokenSymbol::SARJ); -pub const SEKJ: CurrencyId = CurrencyId::Token(TokenSymbol::SEKJ); -pub const SGDJ: CurrencyId = CurrencyId::Token(TokenSymbol::SGDJ); -pub const USDJ: CurrencyId = CurrencyId::Token(TokenSymbol::USDJ); +pub const SETUSD: CurrencyId = CurrencyId::Token(TokenSymbol::SETUSD); +pub const SETEUR: CurrencyId = CurrencyId::Token(TokenSymbol::SETEUR); +pub const SETGBP: CurrencyId = CurrencyId::Token(TokenSymbol::SETGBP); +pub const SETCHF: CurrencyId = CurrencyId::Token(TokenSymbol::SETCHF); +pub const SETSAR: CurrencyId = CurrencyId::Token(TokenSymbol::SETSAR); +pub const BTC: CurrencyId = CurrencyId::Token(TokenSymbol::RENBTC); parameter_types! { @@ -169,12 +165,9 @@ ord_parameter_types! { } parameter_types! { - pub StableCurrencyIds: Vec = vec![ - SETR, AUDJ, CADJ, CHFJ, EURJ, GBPJ, - JPYJ, SARJ, SEKJ, SGDJ, USDJ, - ]; + pub StableCurrencyIds: Vec = vec![SETR, SETCHF, SETEUR, SETGBP, SETSAR, SEKJ, SGDJ, SETUSD]; pub const SetterCurrencyId: CurrencyId = SETR; // Setter currency ticker is SETR/ - pub const GetSettUSDCurrencyId: CurrencyId = USDJ; // Setter currency ticker is USDJ/ + pub const GetSettUSDCurrencyId: CurrencyId = SETUSD; // Setter currency ticker is SETUSD/ pub const DirhamCurrencyId: CurrencyId = DRAM; // SettinDEX currency ticker is DRAM/ pub const SerpTreasuryPalletId: PalletId = PalletId(*b"set/serp"); @@ -190,29 +183,19 @@ parameter_types! { DNAR, DRAM, SETR, - AUDJ, - CADJ, - CHFJ, - EURJ, - GBPJ, - JPYJ, - SARJ, - SEKJ, - SGDJ, - USDJ, + SETCHF, + SETEUR, + SETGBP, + SETSAR, + SETUSD, ]; pub NonStableDropCurrencyIds: Vec = vec![DNAR, DRAM]; pub SetCurrencyDropCurrencyIds: Vec = vec![ - AUDJ, - CADJ, - CHFJ, - EURJ, - GBPJ, - JPYJ, - SARJ, - SEKJ, - SGDJ, - USDJ, + SETCHF, + SETEUR, + SETGBP, + SETSAR, + SETUSD, ]; } @@ -220,12 +203,11 @@ parameter_type_with_key! { pub MinimumClaimableTransferAmounts: |currency_id: CurrencyId| -> Balance { match currency_id { &SETR => 2, - &AUDJ => 2, - &CHFJ => 2, - &EURJ => 2, - &GBPJ => 2, - &JPYJ => 2, - &USDJ => 2, + &SETCHF => 2, + &SETEUR => 2, + &SETGBP => 2, + &SETUSD => 2, + &SETSAR => 2, _ => 0, } }; @@ -235,12 +217,11 @@ parameter_type_with_key! { pub GetStableCurrencyMinimumSupply: |currency_id: CurrencyId| -> Balance { match currency_id { &SETR => 10_000, - &AUDJ => 10_000, - &CHFJ => 10_000, - &EURJ => 10_000, - &GBPJ => 10_000, - &JPYJ => 10_000, - &USDJ => 10_000, + &SETCHF => 10_000, + &SETEUR => 10_000, + &SETGBP => 10_000, + &SETUSD => 10_000, + &SETSAR => 10_000, _ => 0, } }; @@ -277,26 +258,16 @@ parameter_types! { pub const TradingPathLimit: u32 = 3; pub EnabledTradingPairs: Vec = vec![ TradingPair::from_currency_ids(DNAR, SETR).unwrap(), - TradingPair::from_currency_ids(AUDJ, SETR).unwrap(), - TradingPair::from_currency_ids(CADJ, SETR).unwrap(), - TradingPair::from_currency_ids(CHFJ, SETR).unwrap(), - TradingPair::from_currency_ids(EURJ, SETR).unwrap(), - TradingPair::from_currency_ids(GBPJ, SETR).unwrap(), - TradingPair::from_currency_ids(JPYJ, SETR).unwrap(), - TradingPair::from_currency_ids(SARJ, SETR).unwrap(), - TradingPair::from_currency_ids(SEKJ, SETR).unwrap(), - TradingPair::from_currency_ids(SGDJ, SETR).unwrap(), - TradingPair::from_currency_ids(USDJ, SETR).unwrap(), - TradingPair::from_currency_ids(AUDJ, DNAR).unwrap(), - TradingPair::from_currency_ids(CADJ, DNAR).unwrap(), - TradingPair::from_currency_ids(CHFJ, DNAR).unwrap(), - TradingPair::from_currency_ids(EURJ, DNAR).unwrap(), - TradingPair::from_currency_ids(GBPJ, DNAR).unwrap(), - TradingPair::from_currency_ids(JPYJ, DNAR).unwrap(), - TradingPair::from_currency_ids(SARJ, DNAR).unwrap(), - TradingPair::from_currency_ids(SEKJ, DNAR).unwrap(), - TradingPair::from_currency_ids(SGDJ, DNAR).unwrap(), - TradingPair::from_currency_ids(USDJ, DNAR).unwrap(), + TradingPair::from_currency_ids(SETCHF, SETR).unwrap(), + TradingPair::from_currency_ids(SETEUR, SETR).unwrap(), + TradingPair::from_currency_ids(SETGBP, SETR).unwrap(), + TradingPair::from_currency_ids(SETSAR, SETR).unwrap(), + TradingPair::from_currency_ids(SETUSD, SETR).unwrap(), + TradingPair::from_currency_ids(SETCHF, DNAR).unwrap(), + TradingPair::from_currency_ids(SETEUR, DNAR).unwrap(), + TradingPair::from_currency_ids(SETGBP, DNAR).unwrap(), + TradingPair::from_currency_ids(SETSAR, DNAR).unwrap(), + TradingPair::from_currency_ids(SETUSD, DNAR).unwrap(), ]; } @@ -317,16 +288,11 @@ parameter_types! { parameter_types! { pub StandardCurrencyIds: Vec = vec![ - AUDJ, - CADJ, - CHFJ, - EURJ, - GBPJ, - JPYJ, - SARJ, - SEKJ, - SGDJ, - USDJ, + SETCHF, + SETEUR, + SETGBP, + SETSAR, + SETUSD, ]; pub const GetReserveCurrencyId: CurrencyId = SETR; pub DefaultStandardExchangeRate: ExchangeRate = ExchangeRate::one(); @@ -414,8 +380,8 @@ impl Default for ExtBuilder { (BOB, DRAM, 1000), (ALICE, SETR, 1000), (BOB, SETR, 1000), - (ALICE, USDJ, 1000), - (BOB, USDJ, 1000), + (ALICE, SETUSD, 1000), + (BOB, SETUSD, 1000), ], } } diff --git a/lib-serml/settmint/settmint-gateway/src/tests.rs b/lib-serml/settmint/settmint-gateway/src/tests.rs index f6fa2d98a..87bd69182 100644 --- a/lib-serml/settmint/settmint-gateway/src/tests.rs +++ b/lib-serml/settmint/settmint-gateway/src/tests.rs @@ -28,11 +28,11 @@ use mock::{Event, *}; fn authorize_should_work() { ExtBuilder::default().build().execute_with(|| { System::set_block_number(1); - assert_ok!(SettmintGateway::authorize(Origin::signed(ALICE), USDJ, BOB)); + assert_ok!(SettmintGateway::authorize(Origin::signed(ALICE), SETUSD, BOB)); - System::assert_last_event(Event::SettmintGateway(crate::Event::Authorization(ALICE, BOB, USDJ))); + System::assert_last_event(Event::SettmintGateway(crate::Event::Authorization(ALICE, BOB, SETUSD))); - assert_ok!(SettmintGateway::check_authorization(&ALICE, &BOB, USDJ)); + assert_ok!(SettmintGateway::check_authorization(&ALICE, &BOB, SETUSD)); }); } @@ -40,14 +40,14 @@ fn authorize_should_work() { fn unauthorize_should_work() { ExtBuilder::default().build().execute_with(|| { System::set_block_number(1); - assert_ok!(SettmintGateway::authorize(Origin::signed(ALICE), USDJ, BOB)); - assert_ok!(SettmintGateway::check_authorization(&ALICE, &BOB, USDJ)); - assert_ok!(SettmintGateway::unauthorize(Origin::signed(ALICE), USDJ, BOB)); + assert_ok!(SettmintGateway::authorize(Origin::signed(ALICE), SETUSD, BOB)); + assert_ok!(SettmintGateway::check_authorization(&ALICE, &BOB, SETUSD)); + assert_ok!(SettmintGateway::unauthorize(Origin::signed(ALICE), SETUSD, BOB)); - System::assert_last_event(Event::SettmintGateway(crate::Event::UnAuthorization(ALICE, BOB, USDJ))); + System::assert_last_event(Event::SettmintGateway(crate::Event::UnAuthorization(ALICE, BOB, SETUSD))); assert_noop!( - SettmintGateway::check_authorization(&ALICE, &BOB, USDJ), + SettmintGateway::check_authorization(&ALICE, &BOB, SETUSD), Error::::NoPermission ); }); @@ -57,18 +57,18 @@ fn unauthorize_should_work() { fn unauthorize_all_should_work() { ExtBuilder::default().build().execute_with(|| { System::set_block_number(1); - assert_ok!(SettmintGateway::authorize(Origin::signed(ALICE), USDJ, BOB)); - assert_ok!(SettmintGateway::authorize(Origin::signed(ALICE), USDJ, CAROL)); + assert_ok!(SettmintGateway::authorize(Origin::signed(ALICE), SETUSD, BOB)); + assert_ok!(SettmintGateway::authorize(Origin::signed(ALICE), SETUSD, CAROL)); assert_ok!(SettmintGateway::unauthorize_all(Origin::signed(ALICE))); System::assert_last_event(Event::SettmintGateway(crate::Event::UnAuthorizationAll(ALICE))); assert_noop!( - SettmintGateway::check_authorization(&ALICE, &BOB, USDJ), + SettmintGateway::check_authorization(&ALICE, &BOB, SETUSD), Error::::NoPermission ); assert_noop!( - SettmintGateway::check_authorization(&ALICE, &BOB, USDJ), + SettmintGateway::check_authorization(&ALICE, &BOB, SETUSD), Error::::NoPermission ); }); @@ -77,11 +77,11 @@ fn unauthorize_all_should_work() { #[test] fn transfer_position_from_should_work() { ExtBuilder::default().build().execute_with(|| { - assert_ok!(SettmintGateway::adjust_position(Origin::signed(ALICE), USDJ, 100, 50)); - assert_ok!(SettmintGateway::authorize(Origin::signed(ALICE), USDJ, BOB)); - assert_ok!(SettmintGateway::transfer_position_from(Origin::signed(BOB), USDJ, ALICE)); - assert_eq!(SettmintManagerModule::positions(USDJ, BOB).reserve, 100); - assert_eq!(SettmintManagerModule::positions(USDJ, BOB).standard, 50); + assert_ok!(SettmintGateway::adjust_position(Origin::signed(ALICE), SETUSD, 100, 50)); + assert_ok!(SettmintGateway::authorize(Origin::signed(ALICE), SETUSD, BOB)); + assert_ok!(SettmintGateway::transfer_position_from(Origin::signed(BOB), SETUSD, ALICE)); + assert_eq!(SettmintManagerModule::positions(SETUSD, BOB).reserve, 100); + assert_eq!(SettmintManagerModule::positions(SETUSD, BOB).standard, 50); }); } @@ -89,7 +89,7 @@ fn transfer_position_from_should_work() { fn transfer_unauthorization_setters_should_not_work() { ExtBuilder::default().build().execute_with(|| { assert_noop!( - SettmintGateway::transfer_position_from(Origin::signed(ALICE), USDJ, BOB), + SettmintGateway::transfer_position_from(Origin::signed(ALICE), SETUSD, BOB), Error::::NoPermission, ); }); @@ -98,8 +98,8 @@ fn transfer_unauthorization_setters_should_not_work() { #[test] fn adjust_position_should_work() { ExtBuilder::default().build().execute_with(|| { - assert_ok!(SettmintGateway::adjust_position(Origin::signed(ALICE), USDJ, 100, 50)); - assert_eq!(SettmintManagerModule::positions(USDJ, ALICE).reserve, 100); - assert_eq!(SettmintManagerModule::positions(USDJ, ALICE).standard, 50); + assert_ok!(SettmintGateway::adjust_position(Origin::signed(ALICE), SETUSD, 100, 50)); + assert_eq!(SettmintManagerModule::positions(SETUSD, ALICE).reserve, 100); + assert_eq!(SettmintManagerModule::positions(SETUSD, ALICE).standard, 50); }); } diff --git a/lib-serml/settmint/settmint-manager/src/mock.rs b/lib-serml/settmint/settmint-manager/src/mock.rs index 5d2b1009a..37cb47fda 100644 --- a/lib-serml/settmint/settmint-manager/src/mock.rs +++ b/lib-serml/settmint/settmint-manager/src/mock.rs @@ -44,16 +44,12 @@ pub const CHARITY_FUND: AccountId = 3; pub const DNAR: CurrencyId = CurrencyId::Token(TokenSymbol::DNAR); pub const DRAM: CurrencyId = CurrencyId::Token(TokenSymbol::DRAM); pub const SETR: CurrencyId = CurrencyId::Token(TokenSymbol::SETR); -pub const AUDJ: CurrencyId = CurrencyId::Token(TokenSymbol::AUDJ); -pub const CADJ: CurrencyId = CurrencyId::Token(TokenSymbol::CADJ); -pub const CHFJ: CurrencyId = CurrencyId::Token(TokenSymbol::CHFJ); -pub const EURJ: CurrencyId = CurrencyId::Token(TokenSymbol::EURJ); -pub const GBPJ: CurrencyId = CurrencyId::Token(TokenSymbol::GBPJ); -pub const JPYJ: CurrencyId = CurrencyId::Token(TokenSymbol::JPYJ); -pub const SARJ: CurrencyId = CurrencyId::Token(TokenSymbol::SARJ); -pub const SEKJ: CurrencyId = CurrencyId::Token(TokenSymbol::SEKJ); -pub const SGDJ: CurrencyId = CurrencyId::Token(TokenSymbol::SGDJ); -pub const USDJ: CurrencyId = CurrencyId::Token(TokenSymbol::USDJ); +pub const SETUSD: CurrencyId = CurrencyId::Token(TokenSymbol::SETUSD); +pub const SETEUR: CurrencyId = CurrencyId::Token(TokenSymbol::SETEUR); +pub const SETGBP: CurrencyId = CurrencyId::Token(TokenSymbol::SETGBP); +pub const SETCHF: CurrencyId = CurrencyId::Token(TokenSymbol::SETCHF); +pub const SETSAR: CurrencyId = CurrencyId::Token(TokenSymbol::SETSAR); +pub const BTC: CurrencyId = CurrencyId::Token(TokenSymbol::RENBTC); mod settmint_manager { @@ -143,26 +139,16 @@ parameter_types! { pub const TradingPathLimit: u32 = 3; pub EnabledTradingPairs: Vec = vec![ TradingPair::from_currency_ids(DNAR, SETR).unwrap(), - TradingPair::from_currency_ids(AUDJ, SETR).unwrap(), - TradingPair::from_currency_ids(CADJ, SETR).unwrap(), - TradingPair::from_currency_ids(CHFJ, SETR).unwrap(), - TradingPair::from_currency_ids(EURJ, SETR).unwrap(), - TradingPair::from_currency_ids(GBPJ, SETR).unwrap(), - TradingPair::from_currency_ids(JPYJ, SETR).unwrap(), - TradingPair::from_currency_ids(SARJ, SETR).unwrap(), - TradingPair::from_currency_ids(SEKJ, SETR).unwrap(), - TradingPair::from_currency_ids(SGDJ, SETR).unwrap(), - TradingPair::from_currency_ids(USDJ, SETR).unwrap(), - TradingPair::from_currency_ids(AUDJ, DNAR).unwrap(), - TradingPair::from_currency_ids(CADJ, DNAR).unwrap(), - TradingPair::from_currency_ids(CHFJ, DNAR).unwrap(), - TradingPair::from_currency_ids(EURJ, DNAR).unwrap(), - TradingPair::from_currency_ids(GBPJ, DNAR).unwrap(), - TradingPair::from_currency_ids(JPYJ, DNAR).unwrap(), - TradingPair::from_currency_ids(SARJ, DNAR).unwrap(), - TradingPair::from_currency_ids(SEKJ, DNAR).unwrap(), - TradingPair::from_currency_ids(SGDJ, DNAR).unwrap(), - TradingPair::from_currency_ids(USDJ, DNAR).unwrap(), + TradingPair::from_currency_ids(SETCHF, SETR).unwrap(), + TradingPair::from_currency_ids(SETEUR, SETR).unwrap(), + TradingPair::from_currency_ids(SETGBP, SETR).unwrap(), + TradingPair::from_currency_ids(SETSAR, SETR).unwrap(), + TradingPair::from_currency_ids(SETUSD, SETR).unwrap(), + TradingPair::from_currency_ids(SETCHF, DNAR).unwrap(), + TradingPair::from_currency_ids(SETEUR, DNAR).unwrap(), + TradingPair::from_currency_ids(SETGBP, DNAR).unwrap(), + TradingPair::from_currency_ids(SETSAR, DNAR).unwrap(), + TradingPair::from_currency_ids(SETUSD, DNAR).unwrap(), ]; } @@ -221,19 +207,14 @@ ord_parameter_types! { parameter_types! { pub StableCurrencyIds: Vec = vec![ SETR, - AUDJ, - CADJ, - CHFJ, - EURJ, - GBPJ, - JPYJ, - SARJ, - SEKJ, - SGDJ, - USDJ, + SETCHF, + SETEUR, + SETGBP, + SETSAR, + SETUSD, ]; pub const SetterCurrencyId: CurrencyId = SETR; // Setter currency ticker is SETR/ - pub const GetSettUSDCurrencyId: CurrencyId = USDJ; // Setter currency ticker is USDJ/ + pub const GetSettUSDCurrencyId: CurrencyId = SETUSD; // Setter currency ticker is SETUSD/ pub const DirhamCurrencyId: CurrencyId = DRAM; // SettinDEX currency ticker is DRAM/ pub const SerpTreasuryPalletId: PalletId = PalletId(*b"set/serp"); @@ -249,29 +230,19 @@ parameter_types! { DNAR, DRAM, SETR, - AUDJ, - CADJ, - CHFJ, - EURJ, - GBPJ, - JPYJ, - SARJ, - SEKJ, - SGDJ, - USDJ, + SETCHF, + SETEUR, + SETGBP, + SETSAR, + SETUSD, ]; pub NonStableDropCurrencyIds: Vec = vec![DNAR, DRAM]; pub SetCurrencyDropCurrencyIds: Vec = vec![ - AUDJ, - CADJ, - CHFJ, - EURJ, - GBPJ, - JPYJ, - SARJ, - SEKJ, - SGDJ, - USDJ, + SETCHF, + SETEUR, + SETGBP, + SETSAR, + SETUSD, ]; } @@ -279,12 +250,11 @@ parameter_type_with_key! { pub MinimumClaimableTransferAmounts: |currency_id: CurrencyId| -> Balance { match currency_id { &SETR => 2, - &AUDJ => 2, - &CHFJ => 2, - &EURJ => 2, - &GBPJ => 2, - &JPYJ => 2, - &USDJ => 2, + &SETCHF => 2, + &SETEUR => 2, + &SETGBP => 2, + &SETUSD => 2, + &SETSAR => 2, _ => 0, } }; @@ -294,12 +264,11 @@ parameter_type_with_key! { pub GetStableCurrencyMinimumSupply: |currency_id: CurrencyId| -> Balance { match currency_id { &SETR => 10_000, - &AUDJ => 10_000, - &CHFJ => 10_000, - &EURJ => 10_000, - &GBPJ => 10_000, - &JPYJ => 10_000, - &USDJ => 10_000, + &SETCHF => 10_000, + &SETEUR => 10_000, + &SETGBP => 10_000, + &SETUSD => 10_000, + &SETSAR => 10_000, _ => 0, } }; @@ -340,16 +309,11 @@ impl Convert<(CurrencyId, Balance), Balance> for MockConvert { parameter_types! { pub StandardCurrencyIds: Vec = vec![ - AUDJ, - CADJ, - CHFJ, - EURJ, - GBPJ, - JPYJ, - SARJ, - SEKJ, - SGDJ, - USDJ, + SETCHF, + SETEUR, + SETGBP, + SETSAR, + SETUSD, ]; pub const GetReserveCurrencyId: CurrencyId = SETR; pub const SettmintManagerPalletId: PalletId = PalletId(*b"set/mint"); @@ -394,13 +358,13 @@ impl Default for ExtBuilder { Self { balances: vec![ (ALICE, SETR, 1000), - (ALICE, USDJ, 1000), - (ALICE, EURJ, 1000), - (ALICE, CHFJ, 1000), + (ALICE, SETUSD, 1000), + (ALICE, SETEUR, 1000), + (ALICE, SETCHF, 1000), (BOB, SETR, 1000), - (BOB, USDJ, 1000), - (BOB, EURJ, 1000), - (BOB, CHFJ, 1000), + (BOB, SETUSD, 1000), + (BOB, SETEUR, 1000), + (BOB, SETCHF, 1000), ], } } diff --git a/lib-serml/settmint/settmint-manager/src/tests.rs b/lib-serml/settmint/settmint-manager/src/tests.rs index d7c129e1b..4acbc835d 100644 --- a/lib-serml/settmint/settmint-manager/src/tests.rs +++ b/lib-serml/settmint/settmint-manager/src/tests.rs @@ -27,12 +27,12 @@ use mock::{Event, *}; #[test] fn standards_key() { ExtBuilder::default().build().execute_with(|| { - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).standard, 0); - assert_ok!(SettmintManagerModule::adjust_position(&ALICE, EURJ, 200, 200)); - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).standard, 200); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).standard, 0); + assert_ok!(SettmintManagerModule::adjust_position(&ALICE, SETEUR, 200, 200)); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).standard, 200); assert_eq!(Currencies::free_balance(SETR, &SettmintManagerModule::account_id()), 100); - assert_ok!(SettmintManagerModule::adjust_position(&ALICE, EURJ, -100, -100)); - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).standard, 100); + assert_ok!(SettmintManagerModule::adjust_position(&ALICE, SETEUR, -100, -100)); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).standard, 100); }); } @@ -41,13 +41,13 @@ fn check_update_position_underflow_work() { ExtBuilder::default().build().execute_with(|| { // reserve underflow assert_noop!( - SettmintManagerModule::update_position(&ALICE, EURJ, -100, 0), + SettmintManagerModule::update_position(&ALICE, SETEUR, -100, 0), ArithmeticError::Underflow, ); // standard underflow assert_noop!( - SettmintManagerModule::update_position(&ALICE, EURJ, 0, -100), + SettmintManagerModule::update_position(&ALICE, SETEUR, 0, -100), ArithmeticError::Underflow, ); }); @@ -60,30 +60,30 @@ fn adjust_position_should_work() { assert_eq!(Currencies::free_balance(SETR, &ALICE), 1000); assert_eq!(Currencies::free_balance(SETR, &ALICE), 1000); - assert_eq!(Currencies::free_balance(EURJ, &SettmintManagerModule::account_id()), 0); - assert_eq!(SettmintManagerModule::total_positions(EURJ).standard, 0); - assert_eq!(SettmintManagerModule::total_positions(EURJ).reserve, 0); - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).standard, 0); - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).reserve, 0); - assert_eq!(Currencies::free_balance(EURJ, &ALICE), 1000); + assert_eq!(Currencies::free_balance(SETEUR, &SettmintManagerModule::account_id()), 0); + assert_eq!(SettmintManagerModule::total_positions(SETEUR).standard, 0); + assert_eq!(SettmintManagerModule::total_positions(SETEUR).reserve, 0); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).standard, 0); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).reserve, 0); + assert_eq!(Currencies::free_balance(SETEUR, &ALICE), 1000); // success - assert_ok!(SettmintManagerModule::adjust_position(&ALICE, EURJ, 500, 300)); + assert_ok!(SettmintManagerModule::adjust_position(&ALICE, SETEUR, 500, 300)); assert_eq!(Currencies::free_balance(SETR, &ALICE), 750); assert_eq!(Currencies::free_balance(SETR, &SettmintManagerModule::account_id()), 250); - assert_eq!(SettmintManagerModule::total_positions(EURJ).standard, 300); - assert_eq!(SettmintManagerModule::total_positions(EURJ).reserve, 500); - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).standard, 300); - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).reserve, 500); - assert_eq!(Currencies::free_balance(EURJ, &ALICE), 1150); - System::assert_last_event(Event::SettmintManagerModule(crate::Event::PositionUpdated(ALICE, EURJ, 500, 300))); + assert_eq!(SettmintManagerModule::total_positions(SETEUR).standard, 300); + assert_eq!(SettmintManagerModule::total_positions(SETEUR).reserve, 500); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).standard, 300); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).reserve, 500); + assert_eq!(Currencies::free_balance(SETEUR, &ALICE), 1150); + System::assert_last_event(Event::SettmintManagerModule(crate::Event::PositionUpdated(ALICE, SETEUR, 500, 300))); // reserve_adjustment is negatives // remove module account. - assert_eq!(Currencies::total_balance(EURJ, &SettmintManagerModule::account_id()), 0); + assert_eq!(Currencies::total_balance(SETEUR, &SettmintManagerModule::account_id()), 0); assert_eq!(System::account_exists(&SettmintManagerModule::account_id()), true); - assert_ok!(SettmintManagerModule::adjust_position(&ALICE, EURJ, -500, 0)); - assert_eq!(Currencies::free_balance(EURJ, &SettmintManagerModule::account_id()), 0); + assert_ok!(SettmintManagerModule::adjust_position(&ALICE, SETEUR, -500, 0)); + assert_eq!(Currencies::free_balance(SETEUR, &SettmintManagerModule::account_id()), 0); assert_eq!(System::account_exists(&SettmintManagerModule::account_id()), false); }); } @@ -92,20 +92,20 @@ fn adjust_position_should_work() { fn transfer_position_should_work() { ExtBuilder::default().build().execute_with(|| { System::set_block_number(1); - assert_ok!(SettmintManagerModule::update_position(&ALICE, EURJ, 400, 500)); - assert_ok!(SettmintManagerModule::update_position(&BOB, EURJ, 100, 600)); - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).standard, 500); - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).reserve, 400); - assert_eq!(SettmintManagerModule::positions(EURJ, &BOB).standard, 600); - assert_eq!(SettmintManagerModule::positions(EURJ, &BOB).reserve, 100); - - assert_ok!(SettmintManagerModule::transfer_position(&ALICE, &BOB, EURJ)); - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).standard, 0); - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).reserve, 0); - assert_eq!(SettmintManagerModule::positions(EURJ, &BOB).standard, 1100); - assert_eq!(SettmintManagerModule::positions(EURJ, &BOB).reserve, 500); - - System::assert_last_event(Event::SettmintManagerModule(crate::Event::TransferPosition(ALICE, BOB, EURJ))); + assert_ok!(SettmintManagerModule::update_position(&ALICE, SETEUR, 400, 500)); + assert_ok!(SettmintManagerModule::update_position(&BOB, SETEUR, 100, 600)); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).standard, 500); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).reserve, 400); + assert_eq!(SettmintManagerModule::positions(SETEUR, &BOB).standard, 600); + assert_eq!(SettmintManagerModule::positions(SETEUR, &BOB).reserve, 100); + + assert_ok!(SettmintManagerModule::transfer_position(&ALICE, &BOB, SETEUR)); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).standard, 0); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).reserve, 0); + assert_eq!(SettmintManagerModule::positions(SETEUR, &BOB).standard, 1100); + assert_eq!(SettmintManagerModule::positions(SETEUR, &BOB).reserve, 500); + + System::assert_last_event(Event::SettmintManagerModule(crate::Event::TransferPosition(ALICE, BOB, SETEUR))); }); } @@ -114,21 +114,21 @@ fn update_position_should_work() { ExtBuilder::default().build().execute_with(|| { assert_eq!(Currencies::free_balance(SETR, &SettmintManagerModule::account_id()), 0); assert_eq!(Currencies::free_balance(SETR, &ALICE), 1000); - assert_eq!(SettmintManagerModule::total_positions(EURJ).standard, 0); - assert_eq!(SettmintManagerModule::total_positions(EURJ).reserve, 0); - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).standard, 0); - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).reserve, 0); - assert_eq!(>::contains_key(EURJ, &ALICE), false); + assert_eq!(SettmintManagerModule::total_positions(SETEUR).standard, 0); + assert_eq!(SettmintManagerModule::total_positions(SETEUR).reserve, 0); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).standard, 0); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).reserve, 0); + assert_eq!(>::contains_key(SETEUR, &ALICE), false); let alice_ref_count_0 = System::consumers(&ALICE); - assert_ok!(SettmintManagerModule::update_position(&ALICE, EURJ, 3000, 2000)); + assert_ok!(SettmintManagerModule::update_position(&ALICE, SETEUR, 3000, 2000)); // just update records - assert_eq!(SettmintManagerModule::total_positions(EURJ).standard, 2000); - assert_eq!(SettmintManagerModule::total_positions(EURJ).reserve, 3000); - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).standard, 2000); - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).reserve, 3000); + assert_eq!(SettmintManagerModule::total_positions(SETEUR).standard, 2000); + assert_eq!(SettmintManagerModule::total_positions(SETEUR).reserve, 3000); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).standard, 2000); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).reserve, 3000); // increase ref count when open new position let alice_ref_count_1 = System::consumers(&ALICE); @@ -139,11 +139,11 @@ fn update_position_should_work() { assert_eq!(Currencies::free_balance(SETR, &ALICE), 1000); // should remove position storage if zero - assert_eq!(>::contains_key(EURJ, &ALICE), true); - assert_ok!(SettmintManagerModule::update_position(&ALICE, EURJ, -3000, -2000)); - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).standard, 0); - assert_eq!(SettmintManagerModule::positions(EURJ, &ALICE).reserve, 0); - assert_eq!(>::contains_key(EURJ, &ALICE), false); + assert_eq!(>::contains_key(SETEUR, &ALICE), true); + assert_ok!(SettmintManagerModule::update_position(&ALICE, SETEUR, -3000, -2000)); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).standard, 0); + assert_eq!(SettmintManagerModule::positions(SETEUR, &ALICE).reserve, 0); + assert_eq!(>::contains_key(SETEUR, &ALICE), false); // decrease ref count after remove position let alice_ref_count_2 = System::consumers(&ALICE); diff --git a/lib-serml/support/src/lib.rs b/lib-serml/support/src/lib.rs index 061e4d5ac..44f9f5843 100644 --- a/lib-serml/support/src/lib.rs +++ b/lib-serml/support/src/lib.rs @@ -210,13 +210,13 @@ pub trait SerpTreasury { /// Reward SETR cashdrop to vault fn setter_cashdrop_to_vault() -> DispatchResult; - /// Reward USDJ cashdrop to vault + /// Reward SETUSD cashdrop to vault fn usdj_cashdrop_to_vault() -> DispatchResult; /// Trigger SERP-TES when required for Setter (SETR) to serp_down or serp_up. fn setter_on_tes() -> DispatchResult; - /// Trigger SERP-TES when required for USDJ to serp_down or serp_up. + /// Trigger SERP-TES when required for SETUSD to serp_down or serp_up. fn usdj_on_tes() -> DispatchResult; /// issue serpup surplus(stable currencies) to their destinations according to the serpup_ratio. diff --git a/lib-serml/tokens/currencies/src/mock.rs b/lib-serml/tokens/currencies/src/mock.rs index c840ad088..0ef2e783c 100644 --- a/lib-serml/tokens/currencies/src/mock.rs +++ b/lib-serml/tokens/currencies/src/mock.rs @@ -45,16 +45,12 @@ pub type BlockNumber = u64; pub const DNAR: CurrencyId = CurrencyId::Token(TokenSymbol::DNAR); pub const DRAM: CurrencyId = CurrencyId::Token(TokenSymbol::DRAM); pub const SETR: CurrencyId = CurrencyId::Token(TokenSymbol::SETR); -pub const AUDJ: CurrencyId = CurrencyId::Token(TokenSymbol::AUDJ); -pub const CADJ: CurrencyId = CurrencyId::Token(TokenSymbol::CADJ); -pub const CHFJ: CurrencyId = CurrencyId::Token(TokenSymbol::CHFJ); -pub const EURJ: CurrencyId = CurrencyId::Token(TokenSymbol::EURJ); -pub const GBPJ: CurrencyId = CurrencyId::Token(TokenSymbol::GBPJ); -pub const JPYJ: CurrencyId = CurrencyId::Token(TokenSymbol::JPYJ); -pub const SARJ: CurrencyId = CurrencyId::Token(TokenSymbol::SARJ); -pub const SEKJ: CurrencyId = CurrencyId::Token(TokenSymbol::SEKJ); -pub const SGDJ: CurrencyId = CurrencyId::Token(TokenSymbol::SGDJ); -pub const USDJ: CurrencyId = CurrencyId::Token(TokenSymbol::USDJ); +pub const SETUSD: CurrencyId = CurrencyId::Token(TokenSymbol::SETUSD); +pub const SETEUR: CurrencyId = CurrencyId::Token(TokenSymbol::SETEUR); +pub const SETGBP: CurrencyId = CurrencyId::Token(TokenSymbol::SETGBP); +pub const SETCHF: CurrencyId = CurrencyId::Token(TokenSymbol::SETCHF); +pub const SETSAR: CurrencyId = CurrencyId::Token(TokenSymbol::SETSAR); +pub const BTC: CurrencyId = CurrencyId::Token(TokenSymbol::RENBTC); parameter_types! { @@ -116,7 +112,7 @@ impl tokens::Config for Runtime { } pub const NATIVE_CURRENCY_ID: CurrencyId = CurrencyId::Token(TokenSymbol::DNAR); -pub const X_TOKEN_ID: CurrencyId = CurrencyId::Token(TokenSymbol::USDJ); +pub const X_TOKEN_ID: CurrencyId = CurrencyId::Token(TokenSymbol::SETUSD); parameter_types! { pub const GetNativeCurrencyId: CurrencyId = NATIVE_CURRENCY_ID; @@ -212,26 +208,16 @@ parameter_types! { pub const TradingPathLimit: u32 = 3; pub EnabledTradingPairs: Vec = vec![ TradingPair::from_currency_ids(DNAR, SETR).unwrap(), - TradingPair::from_currency_ids(AUDJ, SETR).unwrap(), - TradingPair::from_currency_ids(CADJ, SETR).unwrap(), - TradingPair::from_currency_ids(CHFJ, SETR).unwrap(), - TradingPair::from_currency_ids(EURJ, SETR).unwrap(), - TradingPair::from_currency_ids(GBPJ, SETR).unwrap(), - TradingPair::from_currency_ids(JPYJ, SETR).unwrap(), - TradingPair::from_currency_ids(SARJ, SETR).unwrap(), - TradingPair::from_currency_ids(SEKJ, SETR).unwrap(), - TradingPair::from_currency_ids(SGDJ, SETR).unwrap(), - TradingPair::from_currency_ids(USDJ, SETR).unwrap(), - TradingPair::from_currency_ids(AUDJ, DNAR).unwrap(), - TradingPair::from_currency_ids(CADJ, DNAR).unwrap(), - TradingPair::from_currency_ids(CHFJ, DNAR).unwrap(), - TradingPair::from_currency_ids(EURJ, DNAR).unwrap(), - TradingPair::from_currency_ids(GBPJ, DNAR).unwrap(), - TradingPair::from_currency_ids(JPYJ, DNAR).unwrap(), - TradingPair::from_currency_ids(SARJ, DNAR).unwrap(), - TradingPair::from_currency_ids(SEKJ, DNAR).unwrap(), - TradingPair::from_currency_ids(SGDJ, DNAR).unwrap(), - TradingPair::from_currency_ids(USDJ, DNAR).unwrap(), + TradingPair::from_currency_ids(SETCHF, SETR).unwrap(), + TradingPair::from_currency_ids(SETEUR, SETR).unwrap(), + TradingPair::from_currency_ids(SETGBP, SETR).unwrap(), + TradingPair::from_currency_ids(SETSAR, SETR).unwrap(), + TradingPair::from_currency_ids(SETUSD, SETR).unwrap(), + TradingPair::from_currency_ids(SETCHF, DNAR).unwrap(), + TradingPair::from_currency_ids(SETEUR, DNAR).unwrap(), + TradingPair::from_currency_ids(SETGBP, DNAR).unwrap(), + TradingPair::from_currency_ids(SETSAR, DNAR).unwrap(), + TradingPair::from_currency_ids(SETUSD, DNAR).unwrap(), ]; } @@ -290,19 +276,14 @@ ord_parameter_types! { parameter_types! { pub StableCurrencyIds: Vec = vec![ SETR, - AUDJ, - CADJ, - CHFJ, - EURJ, - GBPJ, - JPYJ, - SARJ, - SEKJ, - SGDJ, - USDJ, + SETCHF, + SETEUR, + SETGBP, + SETSAR, + SETUSD, ]; pub const SetterCurrencyId: CurrencyId = SETR; // Setter currency ticker is SETR/ - pub const GetSettUSDCurrencyId: CurrencyId = USDJ; // Setter currency ticker is USDJ/ + pub const GetSettUSDCurrencyId: CurrencyId = SETUSD; // Setter currency ticker is SETUSD/ pub const DirhamCurrencyId: CurrencyId = DRAM; // SettinDEX currency ticker is DRAM/ pub const SerpTreasuryPalletId: PalletId = PalletId(*b"set/serp"); @@ -315,29 +296,19 @@ parameter_types! { DNAR, DRAM, SETR, - AUDJ, - CADJ, - CHFJ, - EURJ, - GBPJ, - JPYJ, - SARJ, - SEKJ, - SGDJ, - USDJ, + SETCHF, + SETEUR, + SETGBP, + SETSAR, + SETUSD, ]; pub NonStableDropCurrencyIds: Vec = vec![DNAR, DRAM]; pub SetCurrencyDropCurrencyIds: Vec = vec![ - AUDJ, - CADJ, - CHFJ, - EURJ, - GBPJ, - JPYJ, - SARJ, - SEKJ, - SGDJ, - USDJ, + SETCHF, + SETEUR, + SETGBP, + SETSAR, + SETUSD, ]; } @@ -345,12 +316,11 @@ parameter_type_with_key! { pub MinimumClaimableTransferAmounts: |currency_id: CurrencyId| -> Balance { match currency_id { &SETR => 2, - &AUDJ => 2, - &CHFJ => 2, - &EURJ => 2, - &GBPJ => 2, - &JPYJ => 2, - &USDJ => 2, + &SETCHF => 2, + &SETEUR => 2, + &SETGBP => 2, + &SETUSD => 2, + &SETSAR => 2, _ => 0, } }; @@ -361,12 +331,11 @@ parameter_type_with_key! { pub GetStableCurrencyMinimumSupply: |currency_id: CurrencyId| -> Balance { match currency_id { &SETR => 10_000, - &AUDJ => 10_000, - &CHFJ => 10_000, - &EURJ => 10_000, - &GBPJ => 10_000, - &JPYJ => 10_000, - &USDJ => 10_000, + &SETCHF => 10_000, + &SETEUR => 10_000, + &SETGBP => 10_000, + &SETUSD => 10_000, + &SETSAR => 10_000, _ => 0, } }; diff --git a/node/service/src/chain_spec/newrome.rs b/node/service/src/chain_spec/newrome.rs index c78dfa7a8..d2603ae20 100644 --- a/node/service/src/chain_spec/newrome.rs +++ b/node/service/src/chain_spec/newrome.rs @@ -237,7 +237,7 @@ fn testnet_genesis( NativeTokenExistentialDeposit, OperatorMembershipSetheumConfig, OrmlNFTConfig, RenVmBridgeConfig, SessionConfig, StakerStatus, StakingConfig, SudoConfig, SystemConfig, TechnicalCommitteeMembershipConfig, TokensConfig, VestingConfig, - DNAR, DRAM, SETR, USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ RENBTC, + DNAR, DRAM, SETR, SETUSD, SETEUR, SETGBP, SETCHF, SETSAR RENBTC, }; #[cfg(feature = "std")] use sp_std::collections::btree_map::BTreeMap; @@ -337,16 +337,11 @@ fn testnet_genesis( .iter() .flat_map(|x| vec![ (x.clone(), SETR, initial_balance), - (x.clone(), USDJ, initial_balance), - (x.clone(), EURJ, initial_balance), - (x.clone(), JPYJ, initial_balance), - (x.clone(), GBPJ, initial_balance), - (x.clone(), AUDJ, initial_balance), - (x.clone(), CADJ, initial_balance), - (x.clone(), CHFJ, initial_balance), - (x.clone(), SEKJ, initial_balance), - (x.clone(), SGDJ, initial_balance), - (x.clone(), SARJ, initial_balance) + (x.clone(), SETUSD, initial_balance), + (x.clone(), SETEUR, initial_balance), + (x.clone(), SETGBP, initial_balance), + (x.clone(), SETCHF, initial_balance), + (x.clone(), SETSAR, initial_balance) ]) .collect(), }), @@ -363,16 +358,11 @@ fn testnet_genesis( vec![ (TradingPair::new(SETR, DNAR), (1_000_000u128, 2_000_000u128)), (TradingPair::new(SETR, MENA), (1_000_000u128, 2_000_000u128)), - (TradingPair::new(SETR, USDJ), (1_000_000u128, 1_606_750u128)), - (TradingPair::new(SETR, EURJ), (1_000_000u128, 1_365_737u128)), - (TradingPair::new(SETR, JPYJ), (1_000_000u128, 1_767_103u128)), - (TradingPair::new(SETR, GBPJ), (1_000_000u128, 1_156_860u128)), - (TradingPair::new(SETR, AUDJ), (1_000_000u128, 2_153_045u128)), - (TradingPair::new(SETR, CADJ), (1_000_000u128, 2_008_437u128)), - (TradingPair::new(SETR, CHFJ), (1_000_000u128, 1_462_142u128)), - (TradingPair::new(SETR, SEKJ), (1_000_000u128, 13_850_185u128)), - (TradingPair::new(SETR, SGDJ), (1_000_000u128, 2_169_112u128)), - (TradingPair::new(SETR, SARJ), (1_000_000u128, 6_025_312u128)), + (TradingPair::new(SETR, SETUSD), (1_000_000u128, 1_606_750u128)), + (TradingPair::new(SETR, SETEUR), (1_000_000u128, 1_365_737u128)), + (TradingPair::new(SETR, SETGBP), (1_000_000u128, 1_156_860u128)), + (TradingPair::new(SETR, SETCHF), (1_000_000u128, 1_462_142u128)), + (TradingPair::new(SETR, SETSAR), (1_000_000u128, 6_025_312u128)), ], )], }, @@ -404,7 +394,7 @@ fn newrome_genesis( IndicesConfig, NativeTokenExistentialDeposit, OperatorMembershipSetheumConfig, OrmlNFTConfig, SessionConfig, StakerStatus, StakingConfig, SudoConfig, SystemConfig, TechnicalCommitteeMembershipConfig, TokensConfig, VestingConfig, - DNAR, DRAM, SETR, USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ RENBTC, + DNAR, DRAM, SETR, SETUSD, SETEUR, SETGBP, SETCHF, SETSAR, RENBTC, }; #[cfg(feature = "std")] use sp_std::collections::btree_map::BTreeMap; @@ -502,16 +492,11 @@ fn newrome_genesis( orml_tokens: Some(TokensConfig { endowed_accounts: vec![ (root_key.clone(), SETR, initial_balance), - (root_key.clone(), USDJ, initial_balance), - (root_key.clone(), EURJ, initial_balance), - (root_key.clone(), JPYJ, initial_balance), - (root_key.clone(), GBPJ, initial_balance), - (root_key.clone(), AUDJ, initial_balance), - (root_key.clone(), CADJ, initial_balance), - (root_key.clone(), CHFJ, initial_balance), - (root_key.clone(), SEKJ, initial_balance), - (root_key.clone(), SGDJ, initial_balance), - (root_key.clone(), SARJ, initial_balance) + (root_key.clone(), SETUSD, initial_balance), + (root_key.clone(), SETEUR, initial_balance), + (root_key.clone(), SETGBP, initial_balance), + (root_key.clone(), SETCHF, initial_balance), + (root_key.clone(), SETSAR, initial_balance) ], }), orml_vesting: Some(VestingConfig { vesting: vec![] }), diff --git a/node/service/src/chain_spec/setheum.rs b/node/service/src/chain_spec/setheum.rs index c9b04e099..5576ee458 100644 --- a/node/service/src/chain_spec/setheum.rs +++ b/node/service/src/chain_spec/setheum.rs @@ -37,7 +37,7 @@ use setheum_runtime::{ NativeTokenExistentialDeposit, OperatorMembershipSetheumConfig, OrmlNFTConfig, RenVmBridgeConfig, SessionConfig, StakerStatus, StakingConfig, SudoConfig, SystemConfig, TechnicalCommitteeMembershipConfig, TokensConfig, VestingConfig, - DNAR, DRAM, SETR, USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ RENBTC, + DNAR, DRAM, SETR, SETUSD, SETEUR, SETGBP, SETCHF, SETSAR, RENBTC, }; use runtime_common::TokenInfo; @@ -62,7 +62,7 @@ fn setheum_properties() -> Properties { let mut token_symbol: Vec = vec![]; let mut token_decimals: Vec = vec![]; [ - DNAR, DRAM, SETR, USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ RENBTC, + DNAR, DRAM, SETR, SETUSD, SETEUR, SETGBP, SETCHF, SETSAR, RENBTC, ].iter().for_each(|token| { token_symbol.push(token.symbol().unwrap().to_string()); token_decimals.push(token.decimals().unwrap() as u32); diff --git a/primitives/src/currency.rs b/primitives/src/currency.rs index b1c8ecaad..e746c8cfd 100644 --- a/primitives/src/currency.rs +++ b/primitives/src/currency.rs @@ -128,6 +128,36 @@ macro_rules! create_currency_id { ]; let mut lp_tokens = vec![ + // DNAR paired LPs + Token { + symbol: "LP_DRAM_DNAR".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(DRAM), DexShare::Token(DNAR))).unwrap(), + }, + Token { + symbol: "LP_SETUSD_DNAR".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SETUSD), DexShare::Token(DNAR))).unwrap(), + }, + Token { + symbol: "LP_SETEUR_DNAR".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SETEUR), DexShare::Token(DNAR))).unwrap(), + }, + Token { + symbol: "LP_SETGBP_DNAR".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SETGBP), DexShare::Token(DNAR))).unwrap(), + }, + Token { + symbol: "LP_SETCHF_DNAR".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SETCHF), DexShare::Token(DNAR))).unwrap(), + }, + Token { + symbol: "LP_SETSAR_DNAR".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SETSAR), DexShare::Token(DNAR))).unwrap(), + }, + Token { + symbol: "LP_RENBTC_DNAR".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(RENBTC), DexShare::Token(DNAR))).unwrap(), + }, + // SETR paired LPs Token { symbol: "LP_DNAR_SETR".to_string(), address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(DNAR), DexShare::Token(SETR))).unwrap(), @@ -137,48 +167,53 @@ macro_rules! create_currency_id { address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(DRAM), DexShare::Token(SETR))).unwrap(), }, Token { - symbol: "LP_USDJ_SETR".to_string(), - address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(USDJ), DexShare::Token(SETR))).unwrap(), + symbol: "LP_SETUSD_SETR".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SETUSD), DexShare::Token(SETR))).unwrap(), + }, + Token { + symbol: "LP_SETEUR_SETR".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SETEUR), DexShare::Token(SETR))).unwrap(), }, Token { - symbol: "LP_EURJ_SETR".to_string(), - address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(EURJ), DexShare::Token(SETR))).unwrap(), + symbol: "LP_SETGBP_SETR".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SETGBP), DexShare::Token(SETR))).unwrap(), }, Token { - symbol: "LP_JPYJ_SETR".to_string(), - address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(JPYJ), DexShare::Token(SETR))).unwrap(), + symbol: "LP_SETCHF_SETR".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SETCHF), DexShare::Token(SETR))).unwrap(), }, Token { - symbol: "LP_GBPJ_SETR".to_string(), - address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(GBPJ), DexShare::Token(SETR))).unwrap(), + symbol: "LP_SETSAR_SETR".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SETSAR), DexShare::Token(SETR))).unwrap(), }, Token { - symbol: "LP_AUDJ_SETR".to_string(), - address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(AUDJ), DexShare::Token(SETR))).unwrap(), + symbol: "LP_RENBTC_SETR".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(RENBTC), DexShare::Token(SETR))).unwrap(), }, + // SETUSD paired LPs Token { - symbol: "LP_CADJ_SETR".to_string(), - address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(CADJ), DexShare::Token(SETR))).unwrap(), + symbol: "LP_DRAM_SETUSD".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(DRAM), DexShare::Token(SETUSD))).unwrap(), }, Token { - symbol: "LP_CHFJ_SETR".to_string(), - address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(CHFJ), DexShare::Token(SETR))).unwrap(), + symbol: "LP_SETEUR_SETUSD".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SETEUR), DexShare::Token(SETUSD))).unwrap(), }, Token { - symbol: "LP_SEKJ_SETR".to_string(), - address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SEKJ), DexShare::Token(SETR))).unwrap(), + symbol: "LP_SETGBP_SETUSD".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SETGBP), DexShare::Token(SETUSD))).unwrap(), }, Token { - symbol: "LP_SGDJ_SETR".to_string(), - address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SGDJ), DexShare::Token(SETR))).unwrap(), + symbol: "LP_SETCHF_SETUSD".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SETCHF), DexShare::Token(SETUSD))).unwrap(), }, Token { - symbol: "LP_SARJ_SETR".to_string(), - address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SARJ), DexShare::Token(SETR))).unwrap(), + symbol: "LP_SETSAR_SETUSD".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(SETSAR), DexShare::Token(SETUSD))).unwrap(), }, Token { - symbol: "LP_RENBTC_SETR".to_string(), - address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(RENBTC), DexShare::Token(SETR))).unwrap(), + symbol: "LP_RENBTC_SETUSD".to_string(), + address: EvmAddress::try_from(CurrencyId::DexShare(DexShare::Token(RENBTC), DexShare::Token(SETUSD))).unwrap(), }, ]; tokens.append(&mut lp_tokens); @@ -202,28 +237,20 @@ create_currency_id! { DRAM("Setheum Dirham", 12) = 1, SETR("Setter", 12) = 2, // SettCurrencies - USDJ("Setheum US Dollar", 12) = 3, - EURJ("Setheum Euro", 12) = 4, - JPYJ("Setheum Japanese Yen", 12) = 5, - GBPJ("Setheum Pound Sterling", 12) = 6, - AUDJ("Setheum Australian Dollar", 12) = 7, - CADJ("Setheum Canadian Dollar", 12) = 8, - CHFJ("Setheum Swiss Franc", 12) = 9, - SEKJ("Setheum Swedish Krona", 12) = 10, - SGDJ("Setheum Singapore Dollar", 12) = 11, - SARJ("Setheum Saudi Riyal", 12) = 12, + SETUSD("SetDollar", 12) = 3, + SETEUR("SetEuro", 12) = 4, + SETGBP("SetPound", 12) = 5, + SETCHF("SetFranc", 12) = 6, + SETSAR("SetRiyal", 12) = 7, // Foreign Currencies - RENBTC("Ren Bitcoin", 8) = 141, + RENBTC("Ren Bitcoin", 8) = 8, + + // TODO: Remove these fiat references once the `serp-ocw` module has been implemented /// Fiat Currencies as Pegs - only for price feed USD("Fiat US Dollar", 12) = 181, EUR("Fiat Euro", 12) =182, - JPY("Fiat Japanese Yen", 12) = 183, GBP("Fiat Pound Sterling", 12) = 184, - AUD("Fiat Australian Dollar", 12) = 185, - CAD("Fiat Canadian Dollar", 12) = 186, CHF("Fiat Swiss Franc", 12) = 187, - SEK("Fiat Swedish Krona", 12) = 188, - SGD("Fiat Singapore Dollar", 12) = 189, SAR("Fiat Saudi Riyal", 12) = 190, KWD("Fiat Kuwaiti Dinar", 12) = 191, JOD("Fiat Jordanian Dinar", 12) = 192, diff --git a/primitives/src/tests.rs b/primitives/src/tests.rs index 5441401b7..f529600c9 100644 --- a/primitives/src/tests.rs +++ b/primitives/src/tests.rs @@ -27,9 +27,9 @@ use std::{ #[test] fn trading_pair_works() { let dnar = CurrencyId::Token(TokenSymbol::DNAR); - let usdj = CurrencyId::Token(TokenSymbol::USDJ); + let usdj = CurrencyId::Token(TokenSymbol::SETUSD); let erc20 = CurrencyId::Erc20(EvmAddress::from_str("0x0000000000000000000000000000000000000000").unwrap()); - let dnar_usdj_lp = CurrencyId::DexShare(DexShare::Token(TokenSymbol::DNAR), DexShare::Token(TokenSymbol::USDJ)); + let dnar_usdj_lp = CurrencyId::DexShare(DexShare::Token(TokenSymbol::DNAR), DexShare::Token(TokenSymbol::SETUSD)); let erc20_dnar_lp = CurrencyId::DexShare( DexShare::Token(TokenSymbol::DNAR), DexShare::Erc20(EvmAddress::from_str("0x0000000000000000000000000000000000000000").unwrap()), @@ -76,7 +76,7 @@ fn currency_id_into_u32_works() { let currency_id = DexShare::Token(TokenSymbol::DNAR); assert_eq!(Into::::into(currency_id), 0x00); - let currency_id = DexShare::Token(TokenSymbol::USDJ); + let currency_id = DexShare::Token(TokenSymbol::SETUSD); assert_eq!(Into::::into(currency_id), 0x01); let currency_id = DexShare::Erc20(EvmAddress::from_str("0x2000000000000000000000000000000000000000").unwrap()); @@ -102,7 +102,7 @@ fn currency_id_try_into_evm_address_works() { assert_eq!( EvmAddress::try_from(CurrencyId::DexShare( DexShare::Token(TokenSymbol::DNAR), - DexShare::Token(TokenSymbol::USDJ), + DexShare::Token(TokenSymbol::SETUSD), )), Ok(EvmAddress::from_str("0x0000000000000000000000010000000000000001").unwrap()) ); diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index b7b506657..749339a15 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -49,8 +49,8 @@ pub use precompile::{ }; pub use primitives::currency::{ TokenInfo, - DNAR, DRAM, SETR, USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ, RENBTC, - USD, EUR, JPY, GBP, AUD, CAD, CHF, SEK, SGD, SAR, KWD, JOD, BHD, KYD, OMR, GIP, + DNAR, DRAM, SETR, SETUSD, SETEUR, SETGBP, SETCHF, SEKJ, SGDJ, SETSAR, RENBTC, + USD, EUR, GBP, CHF, SAR, KWD, JOD, BHD, KYD, OMR, GIP, }; pub type TimeStampedPrice = orml_oracle::TimestampedValue; diff --git a/runtime/common/src/precompile/input.rs b/runtime/common/src/precompile/input.rs index 1360847ef..d85bfc25d 100644 --- a/runtime/common/src/precompile/input.rs +++ b/runtime/common/src/precompile/input.rs @@ -274,7 +274,7 @@ mod tests { raw_input[67] = 1; let input = TestInput::new(&raw_input[..]); - assert_ok!(input.currency_id_at(1), CurrencyId::Token(TokenSymbol::USDJ)); + assert_ok!(input.currency_id_at(1), CurrencyId::Token(TokenSymbol::SETUSD)); } #[test] diff --git a/runtime/common/src/precompile/mock.rs b/runtime/common/src/precompile/mock.rs index 268550f64..0c96abc08 100644 --- a/runtime/common/src/precompile/mock.rs +++ b/runtime/common/src/precompile/mock.rs @@ -151,32 +151,22 @@ impl pallet_balances::Config for Test { pub const DNAR: CurrencyId = CurrencyId::Token(TokenSymbol::DNAR); pub const DRAM: CurrencyId = CurrencyId::Token(TokenSymbol::DRAM); pub const SETR: CurrencyId = CurrencyId::Token(TokenSymbol::SETR); -pub const AUDJ: CurrencyId = CurrencyId::Token(TokenSymbol::AUDJ); -pub const CADJ: CurrencyId = CurrencyId::Token(TokenSymbol::CADJ); -pub const CHFJ: CurrencyId = CurrencyId::Token(TokenSymbol::CHFJ); -pub const EURJ: CurrencyId = CurrencyId::Token(TokenSymbol::EURJ); -pub const GBPJ: CurrencyId = CurrencyId::Token(TokenSymbol::GBPJ); -pub const JPYJ: CurrencyId = CurrencyId::Token(TokenSymbol::JPYJ); -pub const SARJ: CurrencyId = CurrencyId::Token(TokenSymbol::SARJ); -pub const SEKJ: CurrencyId = CurrencyId::Token(TokenSymbol::SEKJ); -pub const SGDJ: CurrencyId = CurrencyId::Token(TokenSymbol::SGDJ); -pub const USDJ: CurrencyId = CurrencyId::Token(TokenSymbol::USDJ); +pub const SETUSD: CurrencyId = CurrencyId::Token(TokenSymbol::SETUSD); +pub const SETEUR: CurrencyId = CurrencyId::Token(TokenSymbol::SETEUR); +pub const SETGBP: CurrencyId = CurrencyId::Token(TokenSymbol::SETGBP); +pub const SETCHF: CurrencyId = CurrencyId::Token(TokenSymbol::SETCHF); +pub const SETSAR: CurrencyId = CurrencyId::Token(TokenSymbol::SETSAR); +pub const BTC: CurrencyId = CurrencyId::Token(TokenSymbol::RENBTC); pub const RENBTC: CurrencyId = CurrencyId::Token(TokenSymbol::RENBTC); -pub const LP_DNAR_USDJ: CurrencyId = - CurrencyId::DexShare(DexShare::Token(TokenSymbol::DNAR), DexShare::Token(TokenSymbol::USDJ)); +pub const LP_DNAR_SETUSD: CurrencyId = + CurrencyId::DexShare(DexShare::Token(TokenSymbol::DNAR), DexShare::Token(TokenSymbol::SETUSD)); // Currencies constants - FiatCurrencyIds (CurrencyId/TokenSymbol) -pub const BRL: CurrencyId = CurrencyId::Token(TokenSymbol::BRL); -pub const CAD: CurrencyId = CurrencyId::Token(TokenSymbol::CAD); pub const CHF: CurrencyId = CurrencyId::Token(TokenSymbol::CHF); pub const EUR: CurrencyId = CurrencyId::Token(TokenSymbol::EUR); pub const GBP: CurrencyId = CurrencyId::Token(TokenSymbol::GBP); -pub const JPY: CurrencyId = CurrencyId::Token(TokenSymbol::JPY); -pub const QAR: CurrencyId = CurrencyId::Token(TokenSymbol::QAR); pub const SAR: CurrencyId = CurrencyId::Token(TokenSymbol::SAR); -pub const SEK: CurrencyId = CurrencyId::Token(TokenSymbol::SEK); -pub const SGD: CurrencyId = CurrencyId::Token(TokenSymbol::SGD); pub const USD: CurrencyId = CurrencyId::Token(TokenSymbol::USD); pub const KWD: CurrencyId = CurrencyId::Token(TokenSymbol::KWD); pub const JOD: CurrencyId = CurrencyId::Token(TokenSymbol::JOD); @@ -437,7 +427,7 @@ impl ExchangeRateProvider for MockLiquidStakingExchangeProvider { parameter_types! { pub const SetterCurrencyId: CurrencyId = SETR; // Setter currency ticker is SETR. - pub const GetSettUSDCurrencyId: CurrencyId = USDJ; // SettUSD currency ticker is USDJ. + pub const GetSettUSDCurrencyId: CurrencyId = SETUSD; // SettUSD currency ticker is SETUSD. pub const GetFiatAUDCurrencyId: CurrencyId = AUD; // The AUD Fiat currency denomination. pub const GetFiatCADCurrencyId: CurrencyId = CAD; // The CAD Fiat currency denomination. pub const GetFiatCHFCurrencyId: CurrencyId = CHF; // The CHF Fiat currency denomination. @@ -461,14 +451,8 @@ parameter_types! { pub const GetSetterPegNineCurrencyId: CurrencyId = GIP; // Fiat pegs of the Setter (SETR). pub const GetSetterPegTenCurrencyId: CurrencyId = USD; // Fiat pegs of the Setter (SETR). - pub StableCurrencyIds: Vec = vec![ - SETR, AUDJ, CADJ, CHFJ, EURJ, GBPJ, - JPYJ, SARJ, SEKJ, SGDJ, USDJ, - ]; - pub FiatCurrencyIds: Vec = vec![ - AUD, CAD, CHF, EUR, GBP, JPY, QAR, SAR, - SEK, SGD, USD, JOD, BHD, KYD, OMR, GIP - ]; + pub StableCurrencyIds: Vec = vec![SETR, SETCHF, SETEUR, SETGBP, SETSAR, SETUSD]; + pub FiatCurrencyIds: Vec = vec![CHF, EUR, GBP, JPY, QAR, SAR, USD, JOD, BHD, KYD, OMR, GIP]; } ord_parameter_types! { @@ -534,7 +518,7 @@ pub fn dnar_evm_address() -> EvmAddress { } pub fn usdj_evm_address() -> EvmAddress { - EvmAddress::try_from(USDJ).unwrap() + EvmAddress::try_from(SETUSD).unwrap() } pub fn renbtc_evm_address() -> EvmAddress { @@ -542,7 +526,7 @@ pub fn renbtc_evm_address() -> EvmAddress { } pub fn lp_dnar_usdj_evm_address() -> EvmAddress { - EvmAddress::try_from(LP_DNAR_USDJ).unwrap() + EvmAddress::try_from(LP_DNAR_SETUSD).unwrap() } pub fn erc20_address_not_exists() -> EvmAddress { @@ -628,7 +612,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities { RENBTC, 1_000_000_000_000 )); - assert_ok!(Currencies::update_balance(Origin::root(), ALICE, USDJ, 1_000_000_000)); + assert_ok!(Currencies::update_balance(Origin::root(), ALICE, SETUSD, 1_000_000_000)); assert_ok!(Currencies::update_balance( Origin::root(), diff --git a/runtime/common/src/precompile/tests.rs b/runtime/common/src/precompile/tests.rs index 33b36c017..82ff393a8 100644 --- a/runtime/common/src/precompile/tests.rs +++ b/runtime/common/src/precompile/tests.rs @@ -23,7 +23,7 @@ use crate::precompile::{ dnar_evm_address, alice, alice_evm_addr, usdj_evm_address, bob, bob_evm_addr, erc20_address_not_exists, get_task_id, lp_dnar_usdj_evm_address, new_test_ext, renbtc_evm_address, run_to_block, Balances, DexModule, DexPrecompile, Event as TestEvent, MultiCurrencyPrecompile, Oracle, OraclePrecompile, Origin, Price, - ScheduleCallPrecompile, System, Test, ALICE, USDJ, SETR, INITIAL_BALANCE, RENBTC, + ScheduleCallPrecompile, System, Test, ALICE, SETUSD, SETR, INITIAL_BALANCE, RENBTC, }, schedule_call::TaskInfo, }; @@ -172,7 +172,7 @@ fn multicurrency_precompile_should_work() { let (reason, output, used_gas) = MultiCurrencyPrecompile::execute(&input, None, &context).unwrap(); assert_eq!(reason, ExitSucceed::Returned); let mut expected_output = [0u8; 32]; - expected_output[21..32].copy_from_slice(&b"LP_DNAR_USDJ"[..]); + expected_output[21..32].copy_from_slice(&b"LP_DNAR_SETUSD"[..]); assert_eq!(output, expected_output); assert_eq!(used_gas, 0); @@ -592,13 +592,13 @@ fn schedule_call_precompile_should_handle_invalid_input() { #[test] fn dex_precompile_get_liquidity_should_work() { new_test_ext().execute_with(|| { - // enable RENBTC/USDJ - assert_ok!(DexModule::enable_trading_pair(Origin::signed(ALICE), RENBTC, USDJ,)); + // enable RENBTC/SETUSD + assert_ok!(DexModule::enable_trading_pair(Origin::signed(ALICE), RENBTC, SETUSD,)); assert_ok!(DexModule::add_liquidity( Origin::signed(ALICE), RENBTC, - USDJ, + SETUSD, 1_000, 1_000_000, 0, @@ -619,7 +619,7 @@ fn dex_precompile_get_liquidity_should_work() { input[1 * 32..4 + 1 * 32].copy_from_slice(&Into::::into(dex::Action::GetLiquidityPool).to_be_bytes()); // RENBTC U256::from_big_endian(&renbtc_evm_address().as_bytes()).to_big_endian(&mut input[4 + 1 * 32..4 + 2 * 32]); - // USDJ + // SETUSD U256::from_big_endian(&usdj_evm_address().as_bytes()).to_big_endian(&mut input[4 + 2 * 32..4 + 3 * 32]); let mut expected_output = [0u8; 64]; @@ -636,13 +636,13 @@ fn dex_precompile_get_liquidity_should_work() { #[test] fn dex_precompile_get_liquidity_token_address_should_work() { new_test_ext().execute_with(|| { - // enable RENBTC/USDJ - assert_ok!(DexModule::enable_trading_pair(Origin::signed(ALICE), RENBTC, USDJ,)); + // enable RENBTC/SETUSD + assert_ok!(DexModule::enable_trading_pair(Origin::signed(ALICE), RENBTC, SETUSD,)); assert_ok!(DexModule::add_liquidity( Origin::signed(ALICE), RENBTC, - USDJ, + SETUSD, 1_000, 1_000_000, 0, @@ -664,7 +664,7 @@ fn dex_precompile_get_liquidity_token_address_should_work() { .copy_from_slice(&Into::::into(dex::Action::GetLiquidityTokenAddress).to_be_bytes()); // RENBTC U256::from_big_endian(&renbtc_evm_address().as_bytes()).to_big_endian(&mut input[4 + 1 * 32..4 + 2 * 32]); - // USDJ + // SETUSD U256::from_big_endian(&usdj_evm_address().as_bytes()).to_big_endian(&mut input[4 + 2 * 32..4 + 3 * 32]); let mut expected_output = [0u8; 32]; @@ -690,13 +690,13 @@ fn dex_precompile_get_liquidity_token_address_should_work() { #[test] fn dex_precompile_get_swap_target_amount_should_work() { new_test_ext().execute_with(|| { - // enable RENBTC/USDJ - assert_ok!(DexModule::enable_trading_pair(Origin::signed(ALICE), RENBTC, USDJ,)); + // enable RENBTC/SETUSD + assert_ok!(DexModule::enable_trading_pair(Origin::signed(ALICE), RENBTC, SETUSD,)); assert_ok!(DexModule::add_liquidity( Origin::signed(ALICE), RENBTC, - USDJ, + SETUSD, 1_000, 1_000_000, 0, @@ -723,7 +723,7 @@ fn dex_precompile_get_swap_target_amount_should_work() { U256::from(2).to_big_endian(&mut input[4 + 3 * 32..4 + 4 * 32]); // RENBTC U256::from_big_endian(&renbtc_evm_address().as_bytes()).to_big_endian(&mut input[4 + 4 * 32..4 + 5 * 32]); - // USDJ + // SETUSD U256::from_big_endian(&usdj_evm_address().as_bytes()).to_big_endian(&mut input[4 + 5 * 32..4 + 6 * 32]); let mut expected_output = [0u8; 32]; @@ -739,13 +739,13 @@ fn dex_precompile_get_swap_target_amount_should_work() { #[test] fn dex_precompile_get_swap_supply_amount_should_work() { new_test_ext().execute_with(|| { - // enable RENBTC/USDJ - assert_ok!(DexModule::enable_trading_pair(Origin::signed(ALICE), RENBTC, USDJ,)); + // enable RENBTC/SETUSD + assert_ok!(DexModule::enable_trading_pair(Origin::signed(ALICE), RENBTC, SETUSD,)); assert_ok!(DexModule::add_liquidity( Origin::signed(ALICE), RENBTC, - USDJ, + SETUSD, 1_000, 1_000_000, 0, @@ -772,7 +772,7 @@ fn dex_precompile_get_swap_supply_amount_should_work() { U256::from(2).to_big_endian(&mut input[4 + 3 * 32..4 + 4 * 32]); // RENBTC U256::from_big_endian(&renbtc_evm_address().as_bytes()).to_big_endian(&mut input[4 + 4 * 32..4 + 5 * 32]); - // USDJ + // SETUSD U256::from_big_endian(&usdj_evm_address().as_bytes()).to_big_endian(&mut input[4 + 5 * 32..4 + 6 * 32]); let mut expected_output = [0u8; 32]; @@ -788,13 +788,13 @@ fn dex_precompile_get_swap_supply_amount_should_work() { #[test] fn dex_precompile_swap_with_exact_supply_should_work() { new_test_ext().execute_with(|| { - // enable RENBTC/USDJ - assert_ok!(DexModule::enable_trading_pair(Origin::signed(ALICE), RENBTC, USDJ,)); + // enable RENBTC/SETUSD + assert_ok!(DexModule::enable_trading_pair(Origin::signed(ALICE), RENBTC, SETUSD,)); assert_ok!(DexModule::add_liquidity( Origin::signed(ALICE), RENBTC, - USDJ, + SETUSD, 1_000, 1_000_000, 0, @@ -825,7 +825,7 @@ fn dex_precompile_swap_with_exact_supply_should_work() { U256::from(2).to_big_endian(&mut input[4 + 5 * 32..4 + 6 * 32]); // RENBTC U256::from_big_endian(&renbtc_evm_address().as_bytes()).to_big_endian(&mut input[4 + 6 * 32..4 + 7 * 32]); - // USDJ + // SETUSD U256::from_big_endian(&usdj_evm_address().as_bytes()).to_big_endian(&mut input[4 + 7 * 32..4 + 8 * 32]); let mut expected_output = [0u8; 32]; @@ -841,13 +841,13 @@ fn dex_precompile_swap_with_exact_supply_should_work() { #[test] fn dex_precompile_swap_with_exact_target_should_work() { new_test_ext().execute_with(|| { - // enable RENBTC/USDJ - assert_ok!(DexModule::enable_trading_pair(Origin::signed(ALICE), RENBTC, USDJ,)); + // enable RENBTC/SETUSD + assert_ok!(DexModule::enable_trading_pair(Origin::signed(ALICE), RENBTC, SETUSD,)); assert_ok!(DexModule::add_liquidity( Origin::signed(ALICE), RENBTC, - USDJ, + SETUSD, 1_000, 1_000_000, 0, @@ -878,7 +878,7 @@ fn dex_precompile_swap_with_exact_target_should_work() { U256::from(2).to_big_endian(&mut input[4 + 5 * 32..4 + 6 * 32]); // RENBTC U256::from_big_endian(&renbtc_evm_address().as_bytes()).to_big_endian(&mut input[4 + 6 * 32..4 + 7 * 32]); - // USDJ + // SETUSD U256::from_big_endian(&usdj_evm_address().as_bytes()).to_big_endian(&mut input[4 + 7 * 32..4 + 8 * 32]); let mut expected_output = [0u8; 32]; diff --git a/runtime/newrome/src/benchmarking/setheum_chainbridge.rs b/runtime/newrome/src/benchmarking/setheum_chainbridge.rs index a0b458a60..e302750f6 100644 --- a/runtime/newrome/src/benchmarking/setheum_chainbridge.rs +++ b/runtime/newrome/src/benchmarking/setheum_chainbridge.rs @@ -18,7 +18,7 @@ use crate::{ dollar, AccountId, ChainBridge, SetheumChainBridge, CurrencyId, GetNativeCurrencyId, LocalChainId, Runtime, DNAR, - USDJ, + SETUSD, }; use super::utils::set_balance; @@ -47,8 +47,8 @@ runtime_benchmarks! { transfer_origin_chain_token_to_bridge { let sender: AccountId = account("sender", 0, SEED); - let currency_id: CurrencyId = USDJ; - let resource_id: chainbridge::ResourceId = chainbridge::derive_resource_id(LocalChainId::get(), b"USDJ"); + let currency_id: CurrencyId = SETUSD; + let resource_id: chainbridge::ResourceId = chainbridge::derive_resource_id(LocalChainId::get(), b"SETUSD"); let dest_chain_id: chainbridge::ChainId = 0; ChainBridge::whitelist_chain(RawOrigin::Root.into(), dest_chain_id)?; @@ -81,8 +81,8 @@ runtime_benchmarks! { transfer_origin_chain_token_from_bridge { let sender: AccountId = account("sender", 0, SEED); let receiver: AccountId = account("receiver", 0, SEED); - let currency_id: CurrencyId = USDJ; - let resource_id: chainbridge::ResourceId = chainbridge::derive_resource_id(LocalChainId::get(), b"USDJ"); + let currency_id: CurrencyId = SETUSD; + let resource_id: chainbridge::ResourceId = chainbridge::derive_resource_id(LocalChainId::get(), b"SETUSD"); let dest_chain_id: chainbridge::ChainId = 0; ChainBridge::whitelist_chain(RawOrigin::Root.into(), dest_chain_id)?; diff --git a/runtime/newrome/src/benchmarking/settmint_manager.rs b/runtime/newrome/src/benchmarking/settmint_manager.rs index 58e662a3a..1b1d55667 100644 --- a/runtime/newrome/src/benchmarking/settmint_manager.rs +++ b/runtime/newrome/src/benchmarking/settmint_manager.rs @@ -18,7 +18,7 @@ use crate::{ dollar, SetheumOracle, AccountId, Amount, SettmintEngine, StandardCurrencyIds, CurrencyId, SettmintGateway, Indices, Price, Rate, - Ratio, Runtime, USDJ, SETR, + Ratio, Runtime, SETUSD, SETR, }; use super::utils::set_balance; @@ -80,12 +80,12 @@ runtime_benchmarks! { let caller: AccountId = account("caller", 0, SEED); let currency_id: CurrencyId = StandardCurrencyIds::get()[0]; let reserve_price = Price::one(); // 1 USD - let standard_value = 100 * dollar(USDJ); + let standard_value = 100 * dollar(SETUSD); let standard_exchange_rate = SettmintEngine::get_standard_exchange_rate(currency_id); let standard_amount = standard_exchange_rate.reciprocal().unwrap().saturating_mul_int(standard_value); let standard_amount: Amount = standard_amount.unique_saturated_into(); let reserve_value = 10 * standard_value; - let reserve_amount = Price::saturating_from_rational(dollar(currency_id), dollar(USDJ)).saturating_mul_int(reserve_value); + let reserve_amount = Price::saturating_from_rational(dollar(currency_id), dollar(SETUSD)).saturating_mul_int(reserve_value); // set balance set_balance(currency_id, &caller, reserve_amount); @@ -102,12 +102,12 @@ runtime_benchmarks! { let receiver_lookup = Indices::unlookup(receiver.clone()); - let standard_value = 100 * dollar(USDJ); + let standard_value = 100 * dollar(SETUSD); let standard_exchange_rate = SettmintEngine::get_standard_exchange_rate(currency_id); let standard_amount = standard_exchange_rate.reciprocal().unwrap().saturating_mul_int(standard_value); let standard_amount: Amount = standard_amount.unique_saturated_into(); let reserve_value = 10 * standard_value; - let reserve_amount = Price::saturating_from_rational(dollar(currency_id), dollar(USDJ)).saturating_mul_int(reserve_value); + let reserve_amount = Price::saturating_from_rational(dollar(currency_id), dollar(SETUSD)).saturating_mul_int(reserve_value); // set balance set_balance(currency_id, &sender, reserve_amount); diff --git a/runtime/newrome/src/benchmarking/tokens.rs b/runtime/newrome/src/benchmarking/tokens.rs index 5b242f3e8..e8d8a50b4 100644 --- a/runtime/newrome/src/benchmarking/tokens.rs +++ b/runtime/newrome/src/benchmarking/tokens.rs @@ -17,7 +17,7 @@ // along with this program. If not, see . use super::utils::{lookup_of_account, set_usdj_balance}; -use crate::{dollar, AccountId, Balance, Runtime, Tokens, USDJ}; +use crate::{dollar, AccountId, Balance, Runtime, Tokens, SETUSD}; use sp_std::prelude::*; @@ -37,29 +37,29 @@ runtime_benchmarks! { } transfer { - let amount: Balance = d * dollar(USDJ); + let amount: Balance = d * dollar(SETUSD); let from = account("from", 0, SEED); set_usdj_balance(&from, amount); let to: AccountId = account("to", 0, SEED); let to_lookup = lookup_of_account(to.clone()); - }: _(RawOrigin::Signed(from), to_lookup, USDJ, amount) + }: _(RawOrigin::Signed(from), to_lookup, SETUSD, amount) verify { - assert_eq!(>::total_balance(USDJ, &to), amount); + assert_eq!(>::total_balance(SETUSD, &to), amount); } transfer_all { - let amount: Balance = d * dollar(USDJ); + let amount: Balance = d * dollar(SETUSD); let from = account("from", 0, SEED); set_usdj_balance(&from, amount); let to: AccountId = account("to", 0, SEED); let to_lookup = lookup_of_account(to); - }: _(RawOrigin::Signed(from.clone()), to_lookup, USDJ) + }: _(RawOrigin::Signed(from.clone()), to_lookup, SETUSD) verify { - assert_eq!(>::total_balance(USDJ, &from), 0); + assert_eq!(>::total_balance(SETUSD, &from), 0); } } diff --git a/runtime/newrome/src/benchmarking/transaction_payment.rs b/runtime/newrome/src/benchmarking/transaction_payment.rs index a6f9a9484..204b21110 100644 --- a/runtime/newrome/src/benchmarking/transaction_payment.rs +++ b/runtime/newrome/src/benchmarking/transaction_payment.rs @@ -32,7 +32,7 @@ runtime_benchmarks! { set_default_fee_token { let caller: AccountId = account("caller", 0, SEED); - let currency_id = CurrencyId::Token(TokenSymbol::USDJ); + let currency_id = CurrencyId::Token(TokenSymbol::SETUSD); }: _(RawOrigin::Signed(caller.clone()), Some(currency_id)) verify { assert_eq!(TransactionPayment::default_fee_currency_id(&caller), Some(currency_id)); diff --git a/runtime/newrome/src/benchmarking/utils.rs b/runtime/newrome/src/benchmarking/utils.rs index 2f2c3c869..beb6933e9 100644 --- a/runtime/newrome/src/benchmarking/utils.rs +++ b/runtime/newrome/src/benchmarking/utils.rs @@ -34,7 +34,7 @@ pub fn set_balance(currency_id: CurrencyId, who: &AccountId, balance: Balance) { } pub fn set_usdj_balance(who: &AccountId, balance: Balance) { - set_balance(CurrencyId::Token(TokenSymbol::USDJ), who, balance) + set_balance(CurrencyId::Token(TokenSymbol::SETUSD), who, balance) } pub fn set_dnar_balance(who: &AccountId, balance: Balance) { diff --git a/runtime/newrome/src/lib.rs b/runtime/newrome/src/lib.rs index b0982986d..5979f061e 100644 --- a/runtime/newrome/src/lib.rs +++ b/runtime/newrome/src/lib.rs @@ -108,8 +108,8 @@ pub use runtime_common::{ cent, deposit, dollar, microcent, millicent, BlockLength, BlockWeights, ExchangeRate, GasToWeight, OffchainSolutionWeightLimit, Price, Rate, Ratio, RuntimeBlockLength, RuntimeBlockWeights,SystemContractsFilter, TimeStampedPrice, - DNAR, DRAM, SETR, USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ RENBTC, - USD, EUR, JPY, GBP, AUD, CAD, CHF, SEK, SGD, SAR, KWD, JOD, BHD, KYD, OMR, GIP + DNAR, DRAM, SETR, SETUSD, SETEUR, SETGBP, SETCHF, SETSAR, RENBTC, + USD, EUR, GBP, CHF, SAR, KWD, JOD, BHD, KYD, OMR, GIP }; mod authority; mod benchmarking; @@ -965,7 +965,7 @@ parameter_types! { pub const GetNativeCurrencyId: CurrencyId = DNAR; pub const SetterCurrencyId: CurrencyId = SETR; pub const DirhamCurrencyId: CurrencyId = DRAM; - pub const GetSettUSDCurrencyId: CurrencyId = USDJ; + pub const GetSettUSDCurrencyId: CurrencyId = SETUSD; pub const GetFiatAUDCurrencyId: CurrencyId = AUD; pub const GetFiatCADCurrencyId: CurrencyId = CAD; pub const GetFiatCHFCurrencyId: CurrencyId = CHF; @@ -1081,16 +1081,11 @@ parameter_type_with_key! { TokenSymbol::DRAM => Balance::max_value(*currency_id), // unsupported TokenSymbol::SETR => cent(*currency_id), - TokenSymbol::USDJ => cent(*currency_id), - TokenSymbol::EURJ => cent(*currency_id), - TokenSymbol::JPYJ => cent(*currency_id), - TokenSymbol::GBPJ => cent(*currency_id), - TokenSymbol::AUDJ => cent(*currency_id), - TokenSymbol::CADJ => cent(*currency_id), - TokenSymbol::CHFJ => cent(*currency_id), - TokenSymbol::SEKJ => cent(*currency_id), - TokenSymbol::SGDJ => cent(*currency_id), - TokenSymbol::SARJ => cent(*currency_id) + TokenSymbol::SETUSD => cent(*currency_id), + TokenSymbol::SETEUR => cent(*currency_id), + TokenSymbol::SETGBP => cent(*currency_id), + TokenSymbol::SETCHF => cent(*currency_id), + TokenSymbol::SETSAR => cent(*currency_id) TokenSymbol::RENBTC | }, @@ -1138,12 +1133,8 @@ parameter_types! { pub const GetSetterPegNineCurrencyId: CurrencyId = GIP; // Fiat pegs of the Setter (SETR). pub const GetSetterPegTenCurrencyId: CurrencyId = USD; // Fiat pegs of the Setter (SETR). - pub StableCurrencyIds: Vec = vec![ - SETR, USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ - ]; - pub FiatCurrencyIds: Vec = vec![ - USD, EUR, JPY, GBP, AUD, CAD, CHF, SEK, SGD, SAR, KWD, JOD, BHD, KYD, OMR, GIP - ]; + pub StableCurrencyIds: Vec = vec![SETR, SETUSD, SETEUR, SETGBP, SETCHF, SETSAR]; + pub FiatCurrencyIds: Vec = vec![USD, EUR, GBP, CHF, SAR, KWD, JOD, BHD, KYD, OMR, GIP]; } impl serp_prices::Config for Runtime { @@ -1253,7 +1244,7 @@ impl pallet_scheduler::Config for Runtime { parameter_types! { pub StandardCurrencyIds: Vec = vec![ - USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ + SETUSD, SETEUR, SETGBP, SETCHF, SETSAR ]; pub const GetReserveCurrencyId: CurrencyId = SETR; } @@ -1359,16 +1350,11 @@ parameter_types! { TradingPair::new(SETR, DNAR), TradingPair::new(SETR, DRAM), - TradingPair::new(SETR, USDJ), - TradingPair::new(SETR, EURJ), - TradingPair::new(SETR, JPYJ), - TradingPair::new(SETR, GBPJ), - TradingPair::new(SETR, AUDJ), - TradingPair::new(SETR, CADJ), - TradingPair::new(SETR, CHFJ), - TradingPair::new(SETR, SGDJ), - TradingPair::new(SETR, SEKJ), - TradingPair::new(SETR, SARJ), + TradingPair::new(SETR, SETUSD), + TradingPair::new(SETR, SETEUR), + TradingPair::new(SETR, SETGBP), + TradingPair::new(SETR, SETCHF), + TradingPair::new(SETR, SETSAR), TradingPair::new(SETR, RENBTC), ]; @@ -1398,27 +1384,22 @@ parameter_type_with_key! { pub GetStableCurrencyMinimumSupply: |currency_id: CurrencyId| -> Balance { match currency_id { &SETR => 10_000, - &USDJ => 10_000, - &EURJ => 10_000, - &JPYJ => 10_000, - &GBPJ => 10_000, - &AUDJ => 10_000, - &CADJ => 10_000, - &CHFJ => 10_000, - &SEKJ => 10_000, - &SGDJ => 10_000, - &SARJ => 10_000, + &SETUSD => 10_000, + &SETEUR => 10_000, + &SETGBP => 10_000, + &SETCHF => 10_000, + &SETSAR => 10_000, _ => 0, } }; } pub RewardableCurrencyIds: Vec = vec![ - DNAR, DRAM, SETR, USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ + DNAR, DRAM, SETR, SETUSD, SETEUR, SETGBP, SETCHF, SETSAR ]; pub NonStableDropCurrencyIds: Vec = vec![DNAR, DRAM]; pub SetCurrencyDropCurrencyIds: Vec = vec![ - USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ + SETUSD, SETEUR, SETGBP, SETCHF, SETSAR ]; parameter_type_with_key! { @@ -1427,16 +1408,11 @@ parameter_type_with_key! { &DNAR => 1, &DRAM => 1, &SETR => 1, - &USDJ => 1, - &EURJ => 1, - &JPYJ => 100, - &GBPJ => 1, - &AUDJ => 1, - &CADJ => 1, - &CHFJ => 1, - &SEKJ => 1, - &SGDJ => 1, - &SARJ => 1, + &SETUSD => 1, + &SETEUR => 1, + &SETGBP => 1, + &SETCHF => 1, + &SETSAR => 1, _ => 0, } }; @@ -1470,7 +1446,7 @@ impl serp_treasury::Config for Runtime { parameter_types! { // All currency types except for native currency, Sort by fee charge order pub AllNonNativeCurrencyIds: Vec = vec![ - DRAM, SETR, USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ, RENBTC + DRAM, SETR, SETUSD, SETEUR, SETGBP, SETCHF, SETSAR, RENBTC ]; } diff --git a/runtime/setheum/src/lib.rs b/runtime/setheum/src/lib.rs index aaaad967f..a6d37006b 100644 --- a/runtime/setheum/src/lib.rs +++ b/runtime/setheum/src/lib.rs @@ -108,8 +108,8 @@ pub use runtime_common::{ cent, deposit, dollar, microcent, millicent, BlockLength, BlockWeights, ExchangeRate, GasToWeight, OffchainSolutionWeightLimit, Price, Rate, Ratio, RuntimeBlockLength, RuntimeBlockWeights,SystemContractsFilter, TimeStampedPrice, - DNAR, DRAM, SETR, USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ RENBTC, - USD, EUR, JPY, GBP, AUD, CAD, CHF, SEK, SGD, SAR, KWD, JOD, BHD, KYD, OMR, GIP + DNAR, DRAM, SETR, SETUSD, SETEUR, SETGBP, SETCHF, SETSAR RENBTC, + USD, EUR, GBP, CHF, SAR, KWD, JOD, BHD, KYD, OMR, GIP }; mod authority; mod benchmarking; @@ -964,7 +964,7 @@ parameter_types! { pub const GetNativeCurrencyId: CurrencyId = DNAR; pub const SetterCurrencyId: CurrencyId = SETR; pub const DirhamCurrencyId: CurrencyId = DRAM; - pub const GetSettUSDCurrencyId: CurrencyId = USDJ; + pub const GetSettUSDCurrencyId: CurrencyId = SETUSD; pub const GetFiatAUDCurrencyId: CurrencyId = AUD; pub const GetFiatCADCurrencyId: CurrencyId = CAD; pub const GetFiatCHFCurrencyId: CurrencyId = CHF; @@ -1078,16 +1078,11 @@ parameter_type_with_key! { TokenSymbol::DRAM => Balance::max_value(*currency_id), // unsupported TokenSymbol::SETR => cent(*currency_id), - TokenSymbol::USDJ => cent(*currency_id), - TokenSymbol::EURJ => cent(*currency_id), - TokenSymbol::JPYJ => cent(*currency_id), - TokenSymbol::GBPJ => cent(*currency_id), - TokenSymbol::AUDJ => cent(*currency_id), - TokenSymbol::CADJ => cent(*currency_id), - TokenSymbol::CHFJ => cent(*currency_id), - TokenSymbol::SGDJ => cent(*currency_id), - TokenSymbol::SEKJ => cent(*currency_id), - TokenSymbol::SARJ => cent(*currency_id) + TokenSymbol::SETUSD => cent(*currency_id), + TokenSymbol::SETEUR => cent(*currency_id), + TokenSymbol::SETGBP => cent(*currency_id), + TokenSymbol::SETCHF => cent(*currency_id), + TokenSymbol::SETSAR => cent(*currency_id) TokenSymbol::RENBTC | }, @@ -1136,7 +1131,7 @@ parameter_types! { pub const GetSetterPegTenCurrencyId: CurrencyId = USD; // Fiat pegs of the Setter (SETR). pub StableCurrencyIds: Vec = vec![ - SETR, USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ + SETR, SETUSD, SETEUR, SETGBP, SETCHF, SETSAR ]; pub FiatCurrencyIds: Vec = vec![ USD, EUR, JPY, GBP, AUD, CAD, CHF, SEK, SGD, SAR, KWD, JOD, BHD, KYD, OMR, GIP @@ -1250,7 +1245,7 @@ impl pallet_scheduler::Config for Runtime { parameter_types! { pub StandardCurrencyIds: Vec = vec![ - USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ + SETUSD, SETEUR, SETGBP, SETCHF, SETSAR ]; pub const GetReserveCurrencyId: CurrencyId = SETR; } @@ -1355,16 +1350,11 @@ parameter_types! { TradingPair::new(SETR, DNAR), TradingPair::new(SETR, DRAM), - TradingPair::new(SETR, USDJ), - TradingPair::new(SETR, EURJ), - TradingPair::new(SETR, JPYJ), - TradingPair::new(SETR, GBPJ), - TradingPair::new(SETR, AUDJ), - TradingPair::new(SETR, CADJ), - TradingPair::new(SETR, CHFJ), - TradingPair::new(SETR, SEKJ), - TradingPair::new(SETR, SGDJ), - TradingPair::new(SETR, SARJ), + TradingPair::new(SETR, SETUSD), + TradingPair::new(SETR, SETEUR), + TradingPair::new(SETR, SETGBP), + TradingPair::new(SETR, SETCHF), + TradingPair::new(SETR, SETSAR), TradingPair::new(SETR, RENBTC), ]; @@ -1394,27 +1384,22 @@ parameter_type_with_key! { pub GetStableCurrencyMinimumSupply: |currency_id: CurrencyId| -> Balance { match currency_id { &SETR => 10_000, - &USDJ => 10_000, - &EURJ => 10_000, - &JPYJ => 10_000, - &GBPJ => 10_000, - &AUDJ => 10_000, - &CADJ => 10_000, - &CHFJ => 10_000, - &SEKJ => 10_000, - &SGDJ => 10_000, - &SARJ => 10_000, + &SETUSD => 10_000, + &SETEUR => 10_000, + &SETGBP => 10_000, + &SETCHF => 10_000, + &SETSAR => 10_000, _ => 0, } }; } pub RewardableCurrencyIds: Vec = vec![ - DNAR, DRAM, SETR, USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ + DNAR, DRAM, SETR, SETUSD, SETEUR, SETGBP, SETCHF, SETSAR ]; pub NonStableDropCurrencyIds: Vec = vec![DNAR, DRAM]; pub SetCurrencyDropCurrencyIds: Vec = vec![ - USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ + SETUSD, SETEUR, SETGBP, SETCHF, SETSAR ]; parameter_type_with_key! { @@ -1423,16 +1408,11 @@ parameter_type_with_key! { &DNAR => 1, &DRAM => 1, &SETR => 1, - &USDJ => 1, - &EURJ => 1, - &JPYJ => 100, - &GBPJ => 1, - &AUDJ => 1, - &CADJ => 1, - &CHFJ => 1, - &SEKJ => 1, - &SGDJ => 1, - &SARJ => 1, + &SETUSD => 1, + &SETEUR => 1, + &SETGBP => 1, + &SETCHF => 1, + &SETSAR => 1, _ => 0, } }; @@ -1466,7 +1446,7 @@ impl serp_treasury::Config for Runtime { parameter_types! { // All currency types except for native currency, Sort by fee charge order pub AllNonNativeCurrencyIds: Vec = vec![ - DRAM, SETR, USDJ, EURJ, JPYJ, GBPJ, AUDJ, CADJ, CHFJ, SEKJ, SGDJ, SARJ, RENBTC + DRAM, SETR, SETUSD, SETEUR, SETGBP, SETCHF, SETSAR, RENBTC ]; }