Feature/orml currency (paritytech#193)

* add multicurrency impl * fix tests and runtime, add comments * add orml currencies module * add test for muticurrency and fix bug in repatriate_reserved
chainx-org · Aug 16, 2020 · bb841e4 · bb841e4
1 parent 3bbaf22
commit bb841e4
Show file tree

Hide file tree

Showing 21 changed files with 959 additions and 55 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/src/chain_spec.rs b/cli/src/chain_spec.rs
@@ -209,7 +209,7 @@ fn pcx() -> (AssetId, AssetInfo, AssetRestrictions) {
         AssetRestriction::Deposit
             | AssetRestriction::Withdraw
             | AssetRestriction::DestroyWithdrawal
-            | AssetRestriction::DestroyFree,
+            | AssetRestriction::DestroyUsable,
     )
 }
 
@@ -224,7 +224,7 @@ fn xbtc() -> (AssetId, AssetInfo, AssetRestrictions) {
             b"ChainX's Cross-chain Bitcoin".to_vec(),
         )
         .unwrap(),
-        AssetRestriction::DestroyFree.into(),
+        AssetRestriction::DestroyUsable.into(),
     )
 }
 

diff --git a/primitives/mining/staking/src/lib.rs b/primitives/mining/staking/src/lib.rs
@@ -39,14 +39,3 @@ impl<Balance> AssetMining<Balance> for () {
 
     fn reward(_: AssetId, _: Balance) {}
 }
-
-/// This trait provides a simple way to get the treasury account.
-pub trait TreasuryAccount<AccountId> {
-    fn treasury_account() -> AccountId;
-}
-
-impl<AccountId: Default> TreasuryAccount<AccountId> for () {
-    fn treasury_account() -> AccountId {
-        Default::default()
-    }
-}
diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs
@@ -50,6 +50,8 @@ pub type Block = generic::Block<Header, OpaqueExtrinsic>;
 pub type BlockId = generic::BlockId<Block>;
 
 // Runtime type
+/// Signed version of Balance
+pub type Amount = i128;
 /// String for Runtime
 pub type Text = Vec<u8>;
 pub type Desc = Vec<u8>;

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -58,6 +58,10 @@ pallet-balances = { path = "../frame/balances", default-features = false }
 pallet-transaction-payment = { path = "../frame/transaction-payment", default-features = false }
 pallet-transaction-payment-rpc-runtime-api = { path = "../frame/transaction-payment/rpc/runtime-api", default-features = false }
 
+# orml
+orml-traits = { version = "0.1.3-dev", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", rev = "d3630e35ce737aef3f9c7857e9b4bd540f37530c", default-features = false }
+orml-currencies = { version = "0.1.3-dev", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", rev = "d3630e35ce737aef3f9c7857e9b4bd540f37530c", default-features = false }
+
 # ChainX primitives
 chainx-primitives = { path = "../primitives", default-features = false }
 xp-runtime = { path = "../primitives/runtime", default-features = false }
@@ -138,6 +142,9 @@ std = [
     "pallet-transaction-payment/std",
     "pallet-transaction-payment-rpc-runtime-api/std",
 
+    "orml-traits/std",
+    "orml-currencies/std",
+
     "chainx-primitives/std",
     "xp-runtime/std",
     "xp-mining-staking/std",

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -70,8 +70,8 @@ pub use pallet_timestamp::Call as TimestampCall;
 pub use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
 
 pub use chainx_primitives::{
-    AccountId, AccountIndex, AddrStr, AssetId, Balance, BlockNumber, ChainAddress, Hash, Index,
-    Moment, Name, ReferralId, Signature, Token,
+    AccountId, AccountIndex, AddrStr, Amount, AssetId, Balance, BlockNumber, ChainAddress, Hash,
+    Index, Moment, Name, ReferralId, Signature, Token,
 };
 pub use xp_runtime::Memo;
 
@@ -143,6 +143,10 @@ pub fn native_version() -> NativeVersion {
 pub struct BaseFilter;
 impl Filter<Call> for BaseFilter {
     fn filter(call: &Call) -> bool {
+        match call {
+            Call::Currencies(_) => return false, // forbidden Currencies call now
+            _ => {}
+        }
         use frame_support::dispatch::GetCallMetadata;
         let metadata = call.get_call_metadata();
         !XSystem::is_paused(metadata)
@@ -778,6 +782,22 @@ impl pallet_society::Trait for Runtime {
     type ChallengePeriod = ChallengePeriod;
 }
 
+///////////////////////////////////////////
+// orml
+///////////////////////////////////////////
+use orml_currencies::BasicCurrencyAdapter;
+// parameter_types! {
+//     pub const GetNativeCurrencyId: CurrencyId = CurrencyId::Native;
+//     pub const GetStableCurrencyId: CurrencyId = CurrencyId::USDT;
+// }
+
+impl orml_currencies::Trait for Runtime {
+    type Event = Event;
+    type MultiCurrency = XAssets;
+    type NativeCurrency = BasicCurrencyAdapter<Balances, Balance, Balance, Amount, BlockNumber>;
+    type GetNativeCurrencyId = ChainXAssetId;
+}
+
 ///////////////////////////////////////////
 // Chainx pallets
 ///////////////////////////////////////////
@@ -796,8 +816,10 @@ impl xpallet_assets_registrar::Trait for Runtime {
 }
 
 impl xpallet_assets::Trait for Runtime {
-    type Currency = Balances;
     type Event = Event;
+    type Currency = Balances;
+    type Amount = Amount;
+    type TreasuryAccount = SimpleTreasuryAccount;
     type OnCreatedAccount = frame_system::CallOnCreatedAccount<Runtime>;
     type OnAssetChanged = XMiningAsset;
 }
@@ -841,7 +863,7 @@ impl xpallet_contracts::Trait for Runtime {
 }
 
 pub struct SimpleTreasuryAccount;
-impl xp_mining_staking::TreasuryAccount<AccountId> for SimpleTreasuryAccount {
+impl xpallet_support::traits::TreasuryAccount<AccountId> for SimpleTreasuryAccount {
     fn treasury_account() -> AccountId {
         TreasuryModuleId::get().into_account()
     }
@@ -917,6 +939,11 @@ construct_runtime!(
         Multisig: pallet_multisig::{Module, Call, Storage, Event<T>},
         Sudo: pallet_sudo::{Module, Call, Config<T>, Storage, Event<T>},
 
+        // orml
+        // we retain Currencies Call for this call may be used in future, but we do not need this now,
+        // so that we filter it in BaseFilter.
+        Currencies: orml_currencies::{Module, Call, Event<T>},
+
         // ChainX basics.
         XSystem: xpallet_system::{Module, Call, Storage, Event<T>, Config},
         XAssetsRegistrar: xpallet_assets_registrar::{Module, Call, Storage, Event<T>, Config},

diff --git a/scripts/chainx-js/chainx_types_manual.json b/scripts/chainx-js/chainx_types_manual.json
@@ -1,4 +1,7 @@
 {
+    "Amount": "i128",
+    "CurrencyIdOf": "AssetId",
+    "CurrencyId": "AssetId",
     "AssetInfoForRpc": {
         "token": "String",
         "token_name": "String",

diff --git a/scripts/chainx-js/res/chainx_types.json b/scripts/chainx-js/res/chainx_types.json
@@ -214,6 +214,9 @@
         ]
     },
     "OrderInfo": "Order",
+    "Amount": "i128",
+    "CurrencyIdOf": "AssetId",
+    "CurrencyId": "AssetId",
     "AssetInfoForRpc": {
         "token": "String",
         "tokenName": "String",

diff --git a/xpallets/assets/Cargo.toml b/xpallets/assets/Cargo.toml
@@ -17,6 +17,9 @@ sp-runtime = { version = "2.0.0-rc5", default-features = false }
 frame-support = { version = "2.0.0-rc5", default-features = false }
 frame-system = { version = "2.0.0-rc5", default-features = false }
 
+# orml
+orml-traits = { version = "0.1.3-dev", git = "https://github.com/open-web3-stack/open-runtime-module-library.git", rev = "d3630e35ce737aef3f9c7857e9b4bd540f37530c", default-features = false }
+
 # ChainX primitives
 chainx-primitives = { path = "../../primitives", default-features = false }
 xp-runtime = { path = "../../primitives/runtime", default-features = false }
@@ -53,4 +56,6 @@ std = [
     "xpallet-assets-registrar/std",
     "xpallet-protocol/std",
     "xpallet-support/std",
+
+    "orml-traits/std",
 ]