prepare minting cdot (#1211)

* prepare minting cdot

Signed-off-by: Cheng JIANG <[email protected]>

* cleanup

Signed-off-by: Cheng JIANG <[email protected]>

Author: 0x8f701

runtime/heiko/src/lib.rs

@@ -32,6 +32,7 @@ use frame_support::{
     },
     PalletId,
 };
+
 use orml_traits::{DataProvider, DataProviderExtended};
 use polkadot_runtime_common::SlowAdjustingFeeUpdate;
 use sp_api::impl_runtime_apis;
@@ -88,7 +89,9 @@ pub use impls::DealWithFees;
 
 pub use pallet_liquid_staking;
 // pub use pallet_liquidation;
+pub use pallet_amm;
 pub use pallet_bridge;
+// pub use pallet_liquidity_mining;
 pub use pallet_loans;
 pub use pallet_multisig;
 pub use pallet_nominee_election;
@@ -207,6 +210,7 @@ impl Contains<Call> for BaseCallFilter {
             Call::System(_) |
             Call::Timestamp(_) |
             Call::Balances(_) |
+            Call::Assets(pallet_assets::Call::mint { .. }) |
             // Governance
             Call::Sudo(_) |
             Call::Democracy(_) |
@@ -382,7 +386,7 @@ impl Convert<MultiAsset, Option<CurrencyId>> for CurrencyIdConvert {
     fn convert(a: MultiAsset) -> Option<CurrencyId> {
         if let MultiAsset {
             id: AssetId::Concrete(id),
-            fun: Fungibility::Fungible(_amount),
+            fun: _,
         } = a
         {
             Self::convert(id)
@@ -405,7 +409,8 @@ impl Convert<AccountId, MultiLocation> for AccountIdToMultiLocation {
 
 parameter_types! {
     pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::parachain_id().into())));
-    pub BaseXcmWeight: Weight = 150_000_000;
+    pub const BaseXcmWeight: Weight = 150_000_000;
+    pub const MaxInstructions: u32 = 100;
 }
 
 impl orml_xtokens::Config for Runtime {
@@ -776,10 +781,6 @@ pub type XcmRouter = (
     XcmpQueue,
 );
 
-parameter_types! {
-    pub const MaxInstructions: u32 = 100;
-}
-
 impl pallet_xcm::Config for Runtime {
     const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
 
@@ -841,7 +842,7 @@ parameter_types! {
     pub RelayCurrency: CurrencyId = KSM;
     pub HeikoNetwork: NetworkId = NetworkId::Named("heiko".into());
     pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();
-    pub Ancestry: MultiLocation =  MultiLocation::new(0, X1(Parachain(ParachainInfo::parachain_id().into())));
+    pub Ancestry: MultiLocation = MultiLocation::new(0, X1(Parachain(ParachainInfo::parachain_id().into())));
 }
 
 /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
@@ -918,6 +919,10 @@ pub type XcmOriginToTransactDispatchOrigin = (
     XcmPassthrough<Origin>,
 );
 
+parameter_types! {
+    pub KsmPerSecond: (AssetId, u128) = (AssetId::Concrete(MultiLocation::parent()), ksm_per_second());
+}
+
 match_type! {
     pub type ParentOrSiblings: impl Contains<MultiLocation> = {
         MultiLocation { parents: 1, interior: Here } |
@@ -947,10 +952,6 @@ impl TakeRevenue for ToTreasury {
     }
 }
 
-parameter_types! {
-    pub KsmPerSecond: (AssetId, u128) = (AssetId::Concrete(MultiLocation::parent()), ksm_per_second());
-}
-
 pub struct XcmConfig;
 impl Config for XcmConfig {
     type Call = Call;
@@ -1431,7 +1432,7 @@ impl pallet_currency_adapter::Config for Runtime {
 //     type Assets = CurrencyAdapter;
 //     type PalletId = LMPalletId;
 //     type MaxRewardTokens = MaxRewardTokens;
-//     type CreateOrigin = EnsureRoot<AccountId>;
+//     type CreateOrigin = EnsureRootOrMoreThanHalfGeneralCouncil;
 //     type WeightInfo = pallet_liquidity_mining::weights::SubstrateWeight<Runtime>;
 // }
 
@@ -1440,10 +1441,11 @@ impl Contains<Call> for WhiteListFilter {
     fn contains(call: &Call) -> bool {
         matches!(
             call,
-            // System
+            // System, Currencies
             Call::System(_) |
             Call::Timestamp(_) |
             Call::Balances(_) |
+            Call::Assets(pallet_assets::Call::mint { .. }) |
             // Governance
             Call::Sudo(_) |
             Call::Democracy(_) |
@@ -1820,6 +1822,7 @@ impl_runtime_apis! {
             let weight = Executive::try_runtime_upgrade().unwrap();
             (weight, RuntimeBlockWeights::get().max_block)
         }
+
         fn execute_block_no_check(block: Block) -> Weight {
             Executive::execute_block_no_check(block)
         }

runtime/parallel/src/lib.rs

@@ -58,7 +58,7 @@ use sp_version::RuntimeVersion;
 
 use frame_system::{
     limits::{BlockLength, BlockWeights},
-    EnsureOneOf, EnsureRoot, EnsureSigned,
+    EnsureOneOf, EnsureRoot,
 };
 use orml_xcm_support::{IsNativeConcrete, MultiNativeAsset};
 use polkadot_parachain::primitives::Sibling;
@@ -87,15 +87,16 @@ pub use impls::DealWithFees;
 
 pub use pallet_liquid_staking;
 // pub use pallet_liquidation;
-use currency::*;
-use fee::*;
 pub use pallet_amm;
 pub use pallet_bridge;
 // pub use pallet_liquidity_mining;
 pub use pallet_loans;
 pub use pallet_multisig;
 pub use pallet_nominee_election;
 pub use pallet_prices;
+
+use currency::*;
+use fee::*;
 use time::*;
 
 pub use frame_support::{
@@ -110,6 +111,7 @@ pub use frame_support::{
 use pallet_xcm::XcmPassthrough;
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
+
 /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know
 /// the specifics of the runtime. They can then be made to be agnostic over specific formats
 /// of data like extrinsics, allowing for them to continue syncing the network through upgrades
@@ -202,9 +204,10 @@ impl Contains<Call> for BaseCallFilter {
     fn contains(call: &Call) -> bool {
         matches!(
             call,
-            // System
+            // System, Currencies
             Call::System(_) |
             Call::Timestamp(_) |
+            Call::Assets(pallet_assets::Call::mint { .. }) |
             // Governance
             Call::Sudo(_) |
             Call::Democracy(_) |
@@ -221,6 +224,7 @@ impl Contains<Call> for BaseCallFilter {
             Call::Utility(_) |
             Call::Multisig(_) |
             Call::Proxy(_) |
+            Call::EmergencyShutdown(_) |
             // 3rd Party
             Call::Vesting(_) |
             // Membership
@@ -334,14 +338,14 @@ impl Convert<CurrencyId, Option<MultiLocation>> for CurrencyIdConvert {
             DOT => Some(MultiLocation::parent()),
             XDOT => Some(MultiLocation::new(
                 1,
-                Junctions::X2(
+                X2(
                     Parachain(ParachainInfo::parachain_id().into()),
                     GeneralKey(b"xDOT".to_vec()),
                 ),
             )),
             PARA => Some(MultiLocation::new(
                 1,
-                Junctions::X2(
+                X2(
                     Parachain(ParachainInfo::parachain_id().into()),
                     GeneralKey(b"PARA".to_vec()),
                 ),
@@ -472,11 +476,11 @@ impl pallet_liquid_staking::Config for Runtime {
     type WeightInfo = ();
     type SelfParaId = ParachainInfo;
     type Assets = Assets;
-    type StakingCurrency = StakingCurrency;
-    type LiquidCurrency = LiquidCurrency;
     type RelayOrigin = EnsureRootOrMoreThanHalfGeneralCouncil;
     type UpdateOrigin = EnsureRootOrMoreThanHalfGeneralCouncil;
     type DerivativeIndex = DerivativeIndex;
+    type StakingCurrency = StakingCurrency;
+    type LiquidCurrency = LiquidCurrency;
     type AccountIdToMultiLocation = AccountIdToMultiLocation;
     type UnstakeQueueCapacity = UnstakeQueueCapacity;
     type MinStakeAmount = MinStakeAmount;
@@ -776,6 +780,7 @@ pub type XcmRouter = (
 
 impl pallet_xcm::Config for Runtime {
     const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
+
     type Origin = Origin;
     type Call = Call;
     type Event = Event;
@@ -1299,7 +1304,7 @@ impl orml_vesting::Config for Runtime {
     type Event = Event;
     type Currency = Balances;
     type MinVestedTransfer = MinVestedTransfer;
-    type VestedTransferOrigin = EnsureSigned<AccountId>;
+    type VestedTransferOrigin = frame_system::EnsureSigned<AccountId>;
     type WeightInfo = ();
     type MaxVestingSchedules = MaxVestingSchedules;
     type BlockNumberProvider = frame_system::Pallet<Runtime>;
@@ -1318,8 +1323,8 @@ impl pallet_amm::Config for Runtime {
     type Assets = CurrencyAdapter;
     type PalletId = AMMPalletId;
     type LockAccountId = OneAccount;
-    type AMMWeightInfo = pallet_amm::weights::SubstrateWeight<Runtime>;
     type CreatePoolOrigin = EnsureRootOrMoreThanHalfGeneralCouncil;
+    type AMMWeightInfo = pallet_amm::weights::SubstrateWeight<Runtime>;
     type LpFee = DefaultLpFee;
     type ProtocolFee = DefaultProtocolFee;
     type MinimumLiquidity = MinimumLiquidity;
@@ -1424,18 +1429,19 @@ impl pallet_currency_adapter::Config for Runtime {
 //     type Assets = CurrencyAdapter;
 //     type PalletId = LMPalletId;
 //     type MaxRewardTokens = MaxRewardTokens;
-//     type CreateOrigin = EnsureRoot<AccountId>;
-// 	type WeightInfo = pallet_liquidity_mining::weights::SubstrateWeight<Runtime>;
+//     type CreateOrigin = EnsureRootOrMoreThanHalfGeneralCouncil;
+//     type WeightInfo = pallet_liquidity_mining::weights::SubstrateWeight<Runtime>;
 // }
 
 pub struct WhiteListFilter;
 impl Contains<Call> for WhiteListFilter {
     fn contains(call: &Call) -> bool {
         matches!(
             call,
-            // System
+            // System, Currencies
             Call::System(_) |
             Call::Timestamp(_) |
+            Call::Assets(pallet_assets::Call::mint { .. }) |
             // Governance
             Call::Sudo(_) |
             Call::Democracy(_) |
@@ -1452,6 +1458,7 @@ impl Contains<Call> for WhiteListFilter {
             Call::Utility(_) |
             Call::Multisig(_) |
             Call::Proxy(_) |
+            Call::EmergencyShutdown(_) |
             // 3rd Party
             Call::Vesting(_) |
             // Membership

runtime/vanilla/src/lib.rs

@@ -1458,7 +1458,7 @@ impl pallet_liquidity_mining::Config for Runtime {
     type Assets = CurrencyAdapter;
     type PalletId = LMPalletId;
     type MaxRewardTokens = MaxRewardTokens;
-    type CreateOrigin = EnsureRoot<AccountId>;
+    type CreateOrigin = EnsureRootOrMoreThanHalfGeneralCouncil;
     type WeightInfo = pallet_liquidity_mining::weights::SubstrateWeight<Runtime>;
 }