Feature/spot (paritytech#193)

support xdex/spot

Cargo.toml

@@ -46,12 +46,11 @@ members = [
     "xrml/xfee/manager",
     # xrml/assets
     "xrml/xassets/assets",
-    "xrml/xdex/spot/xpendingorders",
-    "xrml/xdex/spot/xmatchorder",
+    "xrml/xdex/spot",
     "xrml/xassets/records",
     "xrml/xassets/process",
     # xrml/mining
     "xrml/xmining/staking",
     "xrml/xmining/tokens",
     "xrml/xbridge/bitcoin",
-]
+]

cli/src/genesis_config.rs

@@ -9,14 +9,16 @@ extern crate substrate_primitives;
 
 use self::base58::FromBase58;
 use chainx_runtime::GrandpaConfig;
+use chainx_runtime::xassets;
+
 use chainx_runtime::{
     xassets::{Asset, Chain, ChainT},
     xbitcoin, Runtime,
 };
 use chainx_runtime::{
     BalancesConfig, ConsensusConfig, GenesisConfig, Params, Perbill, Permill, SessionConfig,
     TimestampConfig, XAccountsConfig, XAssetsConfig, XBridgeOfBTCConfig, XFeeManagerConfig,
-    XMatchOrderConfig, XPendingOrdersConfig, XStakingConfig, XSystemConfig,
+     XSpotConfig, XStakingConfig, XSystemConfig,
 };
 
 use ed25519;
@@ -73,7 +75,7 @@ pub fn testnet_genesis(genesis_spec: GenesisSpec) -> GenesisConfig {
         transfer_fee: 0,
         creation_fee: 0,
         reclaim_rebate: 0,
-        balances: vec![(Keyring::Alice.to_raw_public().into(), 1_000_000)],
+        balances: vec![(Keyring::Alice.to_raw_public().into(), 1_000_000_000),(Keyring::Bob.to_raw_public().into(), 1_000_000_000)],
     };
     //let balances_config_copy = BalancesConfigCopy::create_from_src(&balances_config).src();
 
@@ -129,7 +131,7 @@ pub fn testnet_genesis(genesis_spec: GenesisSpec) -> GenesisConfig {
             // asset, is_psedu_intention, init for account
             // Vec<(Asset, bool, Vec<(T::AccountId, u64)>)>;
             asset_list: vec![
-                (btc_asset, true, vec![])
+                (btc_asset, true, vec![(Keyring::Alice.to_raw_public().into(), 1_000_000_000),(Keyring::Bob.to_raw_public().into(), 1_000_000_000)])
             ],
         }),
         xstaking: Some(XStakingConfig {
@@ -148,18 +150,11 @@ pub fn testnet_genesis(genesis_spec: GenesisSpec) -> GenesisConfig {
                 .map(|i| i.0.into())
                 .collect(),
         }),
-        xpendingorders: Some(XPendingOrdersConfig {
-            order_fee: 10,
-            pair_list: vec![],
+        xspot: Some(XSpotConfig {
+            pair_list: vec![(<xassets::Module<Runtime> as ChainT>::TOKEN.to_vec(),<xbitcoin::Module<Runtime> as ChainT>::TOKEN.to_vec(),5,true)],
             // (OrderPair { first: Runtime::CHAINX_SYMBOL.to_vec(), second: BridgeOfBTC::SYMBOL.to_vec() }, 8)
-            max_command_id: 0,
-            average_price_len: 10000,
-        }),
-        xmatchorder: Some(XMatchOrderConfig {
-            match_fee: 10,
-            fee_precision: 100000,
-            maker_match_fee: 50,
-            taker_match_fee: 100,
+            price_volatility: 10,
+            _genesis_phantom_data: Default::default(),
         }),
         xbitcoin: Some(XBridgeOfBTCConfig {
             // start genesis block: (genesis, blocknumber)

runtime/Cargo.toml

@@ -55,8 +55,7 @@ xrml-mining-tokens = { path = "../xrml/xmining/tokens", default-features = false
 # bridge
 xrml-xbridge-bitcoin = {path = "../xrml/xbridge/bitcoin", default-features = false }
 # dex
-xrml-xdex-spot-xmatchorder = { path = "../xrml/xdex/spot/xmatchorder", default-features = false }
-xrml-xdex-spot-xpendingorders = { path = "../xrml/xdex/spot/xpendingorders", default-features = false }
+xrml-xdex-spot = { path = "../xrml/xdex/spot", default-features = false }
 
 [features]
 default = ["std"]
@@ -110,6 +109,5 @@ std = [
     # bridge
     "xrml-xbridge-bitcoin/std",
     # dex
-    "xrml-xdex-spot-xmatchorder/std",
-    "xrml-xdex-spot-xpendingorders/std",
+    "xrml-xdex-spot/std",
 ]

runtime/src/fee.rs

@@ -4,6 +4,7 @@ use xassets::Call as XAssetsCall;
 use xbitcoin::Call as XbitcoinCall;
 use xprocess::Call as XAssetsProcessCall;
 use xstaking::Call as XStakingCall;
+use xspot::Call as XSpotCall;
 
 use Acceleration;
 use Call;
@@ -48,6 +49,11 @@ impl CheckFee for Call {
                 XStakingCall::claim(_) => Some(3),
                 _ => None,
             },
+            Call::XSpot(call)=>match call{
+                XSpotCall::put_order(_,_,_,_,_) =>Some(8),
+                XSpotCall::cancel_order(_,_)=>Some(2),
+                 _ => None,
+            },
             _ => None,
         };
 

runtime/src/lib.rs

@@ -64,8 +64,7 @@ pub extern crate xrml_mining_staking as xstaking;
 pub extern crate xrml_mining_tokens as xtokens;
 
 // dex
-pub extern crate xrml_xdex_spot_xmatchorder as xmatchorder;
-pub extern crate xrml_xdex_spot_xpendingorders as xpendingorders;
+pub extern crate xrml_xdex_spot as xspot;
 
 mod fee;
 mod xexecutive;
@@ -271,15 +270,11 @@ impl xstaking::Trait for Runtime {
     type Event = Event;
 }
 
-impl xpendingorders::Trait for Runtime {
+impl xspot::Trait for Runtime {
     type Event = Event;
-    type Amount = u128;
-    type Price = u128;
+    type Price = Balance;
 }
 
-impl xmatchorder::Trait for Runtime {
-    type Event = Event;
-}
 
 construct_runtime!(
     pub enum Runtime with Log(InternalLog: DigestItem<Hash, SessionKey>) where
@@ -307,8 +302,7 @@ construct_runtime!(
         // mining
         XStaking: xstaking,
         // dex
-        XPendingOrders: xpendingorders,
-        XMatchOrder: xmatchorder,
+        XSpot: xspot,
         // bridge
         XBridgeOfBTC: xbitcoin::{Module, Call, Storage, Config<T>, Event<T>},
     }

xrml/xdex/spot/xpendingorders/Cargo.toml → xrml/xdex/spot/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "xrml-xdex-spot-xpendingorders"
+name = "xrml-xdex-spot"
 version = "0.4.0"
 authors = ["Chainpool <https://www.chainx.org>"]
 
@@ -16,14 +16,19 @@ sr-primitives = { git = "https://github.com/chainpool/substrate", default_featur
 srml-support = { git = "https://github.com/chainpool/substrate", default_features = false }
 srml-system = { git = "https://github.com/chainpool/substrate", default_features = false }
 srml-balances = { git = "https://github.com/chainpool/substrate", default_features = false }
+srml-consensus = { git = "https://github.com/chainpool/substrate", default_features = false }
+
+srml-timestamp = { git = "https://github.com/chainpool/substrate", default_features = false }
 
 log = "0.4"
 
 # cxrml module
-xrml-xsystem = { path = "../../../xsystem", default-features = false }
-xrml-xaccounts = { path = "../../../xaccounts", default-features = false }
-xrml-xsupport = { path = "../../../xsupport", default_features = false }
-xrml-xassets-assets = { path = "../../../xassets/assets", default_features = false }
+xrml-xsystem = { path = "../../xsystem", default-features = false }
+xrml-xaccounts = { path = "../../xaccounts", default-features = false }
+xrml-xsupport = { path = "../../xsupport", default_features = false }
+xrml-xassets-assets = { path = "../../xassets/assets", default_features = false }
+xrml-xbridge-bitcoin = {path = "../../xbridge/bitcoin", default-features = false }
+xrml-xassets-records = { path = "../../xassets/records", default-features = false }
 
 [features]
 default = ["std"]