Kensetsu Phase 2 - configurable debt assets

common/src/mock.rs

@@ -75,6 +75,7 @@ pub enum ComicAssetId {
     MichaelJacksonCD,
     JesterMarotte,
     CrackedBrassBell,
+    PyriteStone,
 }
 
 impl crate::traits::IsRepresentation for ComicAssetId {
@@ -109,6 +110,7 @@ impl From<PredefinedAssetId> for ComicAssetId {
             PredefinedAssetId::KEN => JesterMarotte,
             PredefinedAssetId::TBCD => MichaelJacksonCD,
             PredefinedAssetId::KUSD => CrackedBrassBell,
+            PredefinedAssetId::KGOLD => PyriteStone,
         }
     }
 }
@@ -299,7 +301,7 @@ macro_rules! mock_frame_system_config {
             type SystemWeightInfo = ();
             type SS58Prefix = ConstU16<42>;
             type OnSetCode = ();
-            type MaxConsumers = frame_support::traits::ConstU32<16>;
+            type MaxConsumers = frame_support::traits::ConstU32<65536>;
         }
     };
 }

common/src/primitives.rs

@@ -185,6 +185,7 @@ mod _allowed_deprecated {
         TBCD = 10,
         KEN = 11,
         KUSD = 12,
+        KGOLD = 13,
     }
 }
 
@@ -199,6 +200,7 @@ pub const XST: AssetId32<PredefinedAssetId> = AssetId32::from_asset_id(Predefine
 pub const TBCD: AssetId32<PredefinedAssetId> = AssetId32::from_asset_id(PredefinedAssetId::TBCD);
 pub const KEN: AssetId32<PredefinedAssetId> = AssetId32::from_asset_id(PredefinedAssetId::KEN);
 pub const KUSD: AssetId32<PredefinedAssetId> = AssetId32::from_asset_id(PredefinedAssetId::KUSD);
+pub const KGOLD: AssetId32<PredefinedAssetId> = AssetId32::from_asset_id(PredefinedAssetId::KGOLD);
 pub const CERES_ASSET_ID: AssetId32<PredefinedAssetId> = AssetId32::from_bytes(hex!(
     "008bcfd2387d3fc453333557eecb0efe59fcba128769b2feefdd306e98e66440"
 ));
@@ -650,6 +652,11 @@ impl SymbolName {
     pub fn usd() -> Self {
         Self::from_str("USD").expect("`USD` is a valid symbol name")
     }
+
+    /// Troy ounce of gold
+    pub fn xau() -> Self {
+        Self::from_str("XAU").expect("`XAU` is a valid symbol name")
+    }
 }
 
 impl FromStr for SymbolName {

node/chain_spec/src/lib.rs

@@ -40,8 +40,8 @@
 use common::prelude::{Balance, DEXInfo, FixedWrapper};
 use common::{
     balance, fixed, hash, our_include, our_include_bytes, vec_push, BalancePrecision, DEXId, Fixed,
-    TechPurpose, APOLLO_ASSET_ID, DAI, DEFAULT_BALANCE_PRECISION, ETH, HERMES_ASSET_ID, KEN, KUSD,
-    PSWAP, TBCD, USDT, VAL, XOR, XST, XSTUSD,
+    TechPurpose, APOLLO_ASSET_ID, DAI, DEFAULT_BALANCE_PRECISION, ETH, HERMES_ASSET_ID, KEN, KGOLD,
+    KUSD, PSWAP, TBCD, USDT, VAL, XOR, XST, XSTUSD,
 };
 use frame_support::sp_runtime::Percent;
 use framenode_runtime::eth_bridge::{AssetConfig, BridgeAssetData, NetworkConfig};
@@ -1402,6 +1402,18 @@ fn testnet_genesis(
                     None,
                     None,
                 ),
+                #[cfg(feature = "ready-to-test")] // kensetsu
+                (
+                    KGOLD.into(),
+                    assets_and_permissions_account_id.clone(),
+                    AssetSymbol(b"KGOLD".to_vec()),
+                    AssetName(b"Kensetsu Gold".to_vec()),
+                    DEFAULT_BALANCE_PRECISION,
+                    Balance::zero(),
+                    true,
+                    None,
+                    None,
+                ),
                 (
                     common::AssetId32::from_bytes(hex!(
                         "008bcfd2387d3fc453333557eecb0efe59fcba128769b2feefdd306e98e66440"
@@ -2087,6 +2099,18 @@ fn mainnet_genesis(
             None,
             None,
         ),
+        #[cfg(feature = "ready-to-test")] // kensetsu
+        (
+            KGOLD.into(),
+            assets_and_permissions_account_id.clone(),
+            AssetSymbol(b"KGOLD".to_vec()),
+            AssetName(b"Kensetsu Gold".to_vec()),
+            DEFAULT_BALANCE_PRECISION,
+            Balance::zero(),
+            true,
+            None,
+            None,
+        ),
         (
             common::AssetId32::from_bytes(hex!(
                 "008bcfd2387d3fc453333557eecb0efe59fcba128769b2feefdd306e98e66440"

pallets/kensetsu/Cargo.toml

@@ -21,8 +21,8 @@ frame-support = { git = "https://github.com/sora-xor/substrate.git", branch = "p
 frame-system = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38", default-features = false }
 hex-literal = { version = "0.4", optional = true }
 pallet-timestamp = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38", default-features = false }
-scale-info = { version = "2", default-features = false, features = ["derive"] }
 permissions = { path = "../permissions", default-features = false }
+scale-info = { version = "2", default-features = false, features = ["derive"] }
 sp-arithmetic = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38", default-features = false }
 sp-core = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38", default-features = false }
 sp-io = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38", optional = true }
@@ -46,6 +46,7 @@ std = [
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
+	"permissions/std",
 	"sp-std/std",
 	"sp-core/std",
 	"sp-runtime/std",

pallets/kensetsu/benchmarking/src/lib.rs

@@ -40,7 +40,10 @@ use common::{
 use frame_benchmarking::benchmarks;
 use frame_system::RawOrigin;
 use hex_literal::hex;
-use kensetsu::{BorrowTax, CdpId, CollateralInfos, CollateralRiskParameters, Event};
+use kensetsu::{
+    BorrowTax, CdpId, CdpType, CollateralInfos, CollateralRiskParameters, Event, PegAsset,
+    StablecoinInfos, StablecoinParameters,
+};
 use price_tools::AVG_BLOCK_SPAN;
 use sp_arithmetic::{Perbill, Percent};
 use sp_core::Get;
@@ -63,10 +66,28 @@ fn caller<T: Config>() -> T::AccountId {
     T::AccountId::decode(&mut &bytes[..]).expect("Failed to decode account ID")
 }
 
+/// Configures Kensetsu Dollar stablecoin pegged to DAI.
+pub fn set_kensetsu_dollar_stablecoin<T: Config>() {
+    StablecoinInfos::<T>::set::<AssetIdOf<T>>(
+        KUSD.into(),
+        Some(kensetsu::StablecoinInfo {
+            bad_debt: 0,
+            stablecoin_parameters: StablecoinParameters {
+                hard_cap: Balance::MAX,
+                peg_asset: PegAsset::SoraAssetId(DAI.into()),
+                minimal_stability_fee_accrue: balance!(0),
+            },
+        }),
+    );
+}
+
 /// Sets XOR as collateral type with default risk parameters
 fn set_xor_as_collateral_type<T: Config>() {
-    CollateralInfos::<T>::set::<AssetIdOf<T>>(
+    set_kensetsu_dollar_stablecoin::<T>();
+
+    CollateralInfos::<T>::set::<AssetIdOf<T>, AssetIdOf<T>>(
         XOR.into(),
+        KUSD.into(),
         Some(kensetsu::CollateralInfo {
             risk_parameters: CollateralRiskParameters {
                 hard_cap: Balance::MAX,
@@ -76,7 +97,7 @@ fn set_xor_as_collateral_type<T: Config>() {
                 minimal_collateral_deposit: balance!(0),
             },
             total_collateral: balance!(0),
-            kusd_supply: balance!(0),
+            stablecoin_supply: balance!(0),
             last_fee_update_time: Default::default(),
             interest_coefficient: FixedU128::one(),
         }),
@@ -89,8 +110,10 @@ fn create_cdp_with_xor<T: Config>() -> CdpId {
         RawOrigin::Signed(caller::<T>()).into(),
         XOR.into(),
         balance!(0),
+        KUSD.into(),
         balance!(0),
         balance!(0),
+        CdpType::Type2,
     )
     .expect("Shall create CDP");
     kensetsu::NextCDPId::<T>::get()
@@ -115,17 +138,21 @@ fn deposit_xor_collateral<T: Config>(cdp_id: CdpId, amount: Balance) {
 
 /// Sets liquidation ratio too low, making CDPs unsafe
 fn make_cdps_unsafe<T: Config>() {
-    CollateralInfos::<T>::mutate::<AssetIdOf<T>, _, _>(XOR.into(), |info| {
-        if let Some(info) = info.as_mut() {
-            info.risk_parameters = CollateralRiskParameters {
-                hard_cap: Balance::MAX,
-                max_liquidation_lot: balance!(100),
-                liquidation_ratio: Perbill::from_percent(1),
-                stability_fee_rate: FixedU128::zero(),
-                minimal_collateral_deposit: balance!(0),
+    CollateralInfos::<T>::mutate::<AssetIdOf<T>, AssetIdOf<T>, _, _>(
+        XOR.into(),
+        KUSD.into(),
+        |info| {
+            if let Some(info) = info.as_mut() {
+                info.risk_parameters = CollateralRiskParameters {
+                    hard_cap: Balance::MAX,
+                    max_liquidation_lot: balance!(100),
+                    liquidation_ratio: Perbill::from_percent(1),
+                    stability_fee_rate: FixedU128::zero(),
+                    minimal_collateral_deposit: balance!(0),
+                }
             }
-        }
-    });
+        },
+    );
 }
 
 /// Initializes and adds liquidity to XYK pool XOR/asset_id.
@@ -214,10 +241,6 @@ benchmarks! {
     create_cdp {
         initialize_liquidity_sources::<T>();
         set_xor_as_collateral_type::<T>();
-        kensetsu::Pallet::<T>::update_hard_cap_total_supply(
-            RawOrigin::Root.into(),
-            Balance::MAX,
-        ).expect("Shall update hard cap");
         let collateral = balance!(10);
         let debt = balance!(1);
         assets::Pallet::<T>::update_balance(
@@ -232,8 +255,10 @@ benchmarks! {
             RawOrigin::Signed(caller::<T>()).into(),
             XOR.into(),
             collateral,
+            KUSD.into(),
             debt,
-            debt
+            debt,
+            CdpType::Type2,
         ).unwrap();
     }
 
@@ -265,10 +290,6 @@ benchmarks! {
     borrow {
         initialize_liquidity_sources::<T>();
         set_xor_as_collateral_type::<T>();
-        kensetsu::Pallet::<T>::update_hard_cap_total_supply(
-            RawOrigin::Root.into(),
-            Balance::MAX,
-        ).expect("Shall update hard cap");
         let cdp_id = create_cdp_with_xor::<T>();
         let amount = balance!(10);
         deposit_xor_collateral::<T>(cdp_id, amount);
@@ -289,10 +310,6 @@ benchmarks! {
         let amount = balance!(10);
         deposit_xor_collateral::<T>(cdp_id, amount);
         let debt = balance!(1);
-        kensetsu::Pallet::<T>::update_hard_cap_total_supply(
-            RawOrigin::Root.into(),
-            Balance::MAX,
-        ).expect("Shall update hard cap");
         kensetsu::Pallet::<T>::borrow(RawOrigin::Signed(caller::<T>()).into(), cdp_id, debt, debt)
             .expect("Shall borrow");
     }: {
@@ -310,10 +327,6 @@ benchmarks! {
         let amount = balance!(100);
         deposit_xor_collateral::<T>(cdp_id, amount);
         let debt = balance!(50);
-        kensetsu::Pallet::<T>::update_hard_cap_total_supply(
-            RawOrigin::Root.into(),
-            Balance::MAX,
-        ).expect("Shall update hard cap");
         kensetsu::Pallet::<T>::borrow(RawOrigin::Signed(caller::<T>()).into(), cdp_id, debt, debt)
             .expect("Shall borrow");
         make_cdps_unsafe::<T>();
@@ -328,10 +341,6 @@ benchmarks! {
         let amount = balance!(1000);
         deposit_xor_collateral::<T>(cdp_id, amount);
         let debt = balance!(100);
-        kensetsu::Pallet::<T>::update_hard_cap_total_supply(
-            RawOrigin::Root.into(),
-            Balance::MAX,
-        ).expect("Shall update hard cap");
         kensetsu::Pallet::<T>::borrow(
             RawOrigin::Signed(caller::<T>()).into(),
             cdp_id,
@@ -343,10 +352,13 @@ benchmarks! {
         kensetsu::Pallet::<T>::accrue(RawOrigin::Signed(caller::<T>()).into(), cdp_id).unwrap();
     }
 
-    update_collateral_risk_parameters {}: {
+    update_collateral_risk_parameters {
+        set_xor_as_collateral_type::<T>();
+    }: {
         kensetsu::Pallet::<T>::update_collateral_risk_parameters(
             RawOrigin::Root.into(),
             XOR.into(),
+            KUSD.into(),
             CollateralRiskParameters {
                 hard_cap: balance!(1000),
                 liquidation_ratio: Perbill::from_percent(50),
@@ -357,13 +369,6 @@ benchmarks! {
         ).unwrap();
     }
 
-    update_hard_cap_total_supply {}: {
-        kensetsu::Pallet::<T>::update_hard_cap_total_supply(
-            RawOrigin::Root.into(),
-            balance!(1000)
-        ).unwrap();
-    }
-
     update_borrow_tax {
         let new_borrow_tax = Percent::from_percent(1);
     }:{
@@ -393,6 +398,7 @@ benchmarks! {
     }
 
     withdraw_profit {
+        set_kensetsu_dollar_stablecoin::<T>();
         let technical_account_id = technical::Pallet::<T>::tech_account_id_to_account_id(
             &T::TreasuryTechAccount::get(),
         ).expect("Shall resolve tech account id");
@@ -408,11 +414,13 @@ benchmarks! {
         kensetsu::Pallet::<T>::withdraw_profit(
             RawOrigin::Root.into(),
             caller::<T>(),
+            KUSD.into(),
             amount
         ).unwrap();
     }
 
     donate {
+        set_xor_as_collateral_type::<T>();
         let amount = balance!(10);
         assets::Pallet::<T>::update_balance(
             RawOrigin::Root.into(),
@@ -421,8 +429,40 @@ benchmarks! {
             amount.try_into().unwrap(),
         )
         .expect("Shall mint KUSD");
-        kensetsu::BadDebt::<T>::set(balance!(5));
+        StablecoinInfos::<T>::mutate::<AssetIdOf<T>, _, _>(KUSD.into(), |stablecoin_info| {
+            stablecoin_info.as_mut().unwrap().bad_debt = balance!(5);
+        });
     }: {
-        kensetsu::Pallet::<T>::donate(RawOrigin::Signed(caller::<T>()).into(), amount).unwrap();
+        kensetsu::Pallet::<T>::donate(
+            RawOrigin::Signed(caller::<T>()).into(),
+            KUSD.into(),
+            amount
+        ).unwrap();
+    }
+
+    register_stablecoin {
+        let stablecoin_asset_id: AssetIdOf<T> = KUSD.into();
+        let stablecoin_parameters = StablecoinParameters::<AssetIdOf<T>> {
+            hard_cap: Balance::MAX,
+            peg_asset: PegAsset::SoraAssetId(DAI.into()),
+            minimal_stability_fee_accrue: balance!(0.01),
+        };
+    }: {
+        kensetsu::Pallet::<T>::register_stablecoin(
+            RawOrigin::Root.into(),
+            stablecoin_asset_id.clone(),
+            stablecoin_parameters.clone(),
+        )
+        .unwrap()
+    }
+    verify {
+        frame_system::Pallet::<T>::assert_has_event(
+            <T as kensetsu::Config>::RuntimeEvent::from(
+                Event::<T>::StablecoinRegistered {
+                    stablecoin_asset_id,
+                    new_stablecoin_parameters: stablecoin_parameters,
+                }
+            ).into()
+        );
     }
 }