Add SwitchStore (paritytech#282)

Author: gguoss

Cargo.lock

@@ -191,7 +191,6 @@ pub fn testnet_genesis(genesis_spec: GenesisSpec) -> GenesisConfig {
             banned_account: auth1.into(),
         }),
         fee_manager: Some(XFeeManagerConfig {
-            switch: false,
             producer_fee_proportion: (1, 10),
             _genesis_phantom_data: Default::default(),
         }),

cli/src/genesis_config.rs

@@ -776,7 +776,7 @@ where
         let call_params = if let Ok(hex_call) = hex::decode(&call_params[2..]) {
             hex_call
         } else {
-            return Err(HexDecodeErr.into())
+            return Err(HexDecodeErr.into());
         };
         let call: Call = if let Some(call) = Decode::decode(&mut call_params.as_slice()) {
             call

rpc/src/chainx/impl_rpc.rs

@@ -2,6 +2,7 @@
 
 //use balances::Call as BalancesCall;
 use bitcoin::Call as BitcoinCall;
+use fee_manager::SwitchStore;
 use sdot::Call as SdotCall;
 use sudo::Call as SudoCall;
 use xassets::Call as XAssetsCall;
@@ -13,15 +14,18 @@ use xtokens::Call as XTokensCall;
 use Call;
 
 pub trait CheckFee {
-    fn check_fee(&self) -> Option<u64>;
+    fn check_fee(&self, switch: SwitchStore) -> Option<u64>;
 }
 
 impl CheckFee for Call {
     /// Return fee_power, which is part of the total_fee.
     /// total_fee = base_fee * fee_power + byte_fee * bytes
     ///
     /// fee_power = power_per_call
-    fn check_fee(&self) -> Option<u64> {
+    fn check_fee(&self, switch: SwitchStore) -> Option<u64> {
+        if switch.global {
+            return None;
+        };
         let base_power = match self {
             // xassets
             Call::XAssets(call) => match call {
@@ -37,13 +41,20 @@ impl CheckFee for Call {
                 _ => None,
             },
             // xbridge
-            Call::XBridgeOfBTC(call) => match call {
-                BitcoinCall::push_header(_) => Some(20),
-                BitcoinCall::push_transaction(_) => Some(10),
-                BitcoinCall::create_withdraw_tx(_, _) => Some(50),
-                BitcoinCall::sign_withdraw_tx(_, _) => Some(50),
-                _ => None,
-            },
+            Call::XBridgeOfBTC(call) => {
+                let power = if switch.xbtc {
+                    None
+                } else {
+                    match call {
+                        BitcoinCall::push_header(_) => Some(20),
+                        BitcoinCall::push_transaction(_) => Some(10),
+                        BitcoinCall::create_withdraw_tx(_, _) => Some(50),
+                        BitcoinCall::sign_withdraw_tx(_, _) => Some(50),
+                        _ => None,
+                    }
+                };
+                power
+            }
             // xmining
             Call::XStaking(call) => match call {
                 XStakingCall::register(_) => Some(100),
@@ -59,20 +70,34 @@ impl CheckFee for Call {
                 XTokensCall::claim(_) => Some(3),
                 _ => None,
             },
-            Call::XSpot(call) => match call {
-                XSpotCall::put_order(_, _, _, _, _) => Some(8),
-                XSpotCall::cancel_order(_, _) => Some(2),
-                _ => None,
-            },
+            Call::XSpot(call) => {
+                let power = if switch.spot {
+                    None
+                } else {
+                    match call {
+                        XSpotCall::put_order(_, _, _, _, _) => Some(8),
+                        XSpotCall::cancel_order(_, _) => Some(2),
+                        _ => None,
+                    }
+                };
+                power
+            }
             Call::Sudo(call) => match call {
                 SudoCall::sudo(_) => Some(1),
                 SudoCall::set_key(_) => Some(1),
                 _ => None,
             },
-            Call::XBridgeOfSDOT(call) => match call {
-                SdotCall::claim(_, _, _) => Some(1),
-                _ => None,
-            },
+            Call::XBridgeOfSDOT(call) => {
+                let power = if switch.sdot {
+                    None
+                } else {
+                    match call {
+                        SdotCall::claim(_, _, _) => Some(10),
+                        _ => None,
+                    }
+                };
+                power
+            }
             _ => None,
         };
         base_power

runtime/src/fee.rs

@@ -485,7 +485,8 @@ impl_runtime_apis! {
                 return None;
             };
 
-            call.check_fee().map(|power|
+            let switch = fee_manager::SwitchStore::default();
+            call.check_fee(switch).map(|power|
                 XFeeManager::transaction_fee(power, encoded_len)
             )
         }

runtime/src/lib.rs

@@ -55,7 +55,7 @@ pub struct Executive<System, Block, Context, Payment, Finalisation>(
 
 impl<
     Context: Default,
-    System: system::Trait,
+    System: system::Trait + fee_manager::Trait,
     Block: traits::Block<Header=System::Header, Hash=System::Hash>,
     Payment: MakePayment<System::AccountId>,
     Finalisation: OnFinalise<System::BlockNumber>,
@@ -167,7 +167,8 @@ impl<
         if signed_extrinsic {
             // Acceleration definitely exists for a signed extrinsic.
             let acc = acc.unwrap();
-            if let Some(fee_power) = f.check_fee() {
+            let switch = <fee_manager::Module<System>>::switch();
+            if let Some(fee_power) = f.check_fee(switch) {
                 Payment::make_payment(&s.clone().unwrap(), encoded_len, fee_power, acc.as_() as u32).map_err(|_| internal::ApplyError::CantPay)?;
 
                 // AUDIT: Under no circumstances may this function panic from here onwards.
@@ -275,7 +276,8 @@ impl<
 
         let acc = xt.acceleration().unwrap();
         let (f, s) = xt.deconstruct();
-        if let Some(fee_power) = f.check_fee() {
+        let switch = <fee_manager::Module<System>>::switch();
+        if let Some(fee_power) = f.check_fee(switch) {
             if Payment::check_payment(&s.clone().unwrap(), encoded_len, fee_power, acc.as_() as u32).is_err() {
                 return TransactionValidity::Invalid(ApplyError::CantPay as i8);
             } else {

runtime/src/xexecutive.rs

@@ -6,6 +6,7 @@ authors = ["Chainpol <http://www.chainx.org>"]
 [dependencies]
 serde = { version = "1.0", default-features = false }
 parity-codec = { version = "3.0", default-features = false }
+parity-codec-derive = { version = "3.0", default-features = false }
 substrate-primitives = { git = "https://github.com/chainpool/substrate", default_features = false }
 sr-std = { git = "https://github.com/chainpool/substrate", default-features = false }
 sr-io = { git = "https://github.com/chainpool/substrate", default-features = false }
@@ -26,6 +27,7 @@ default = ["std"]
 std = [
     "serde/std",
     "parity-codec/std",
+    "parity-codec-derive/std",
     "substrate-primitives/std",
     "sr-std/std",
     "sr-io/std",

runtime/wasm/Cargo.lock

@@ -4,6 +4,8 @@
 
 extern crate sr_std as rstd;
 
+#[macro_use]
+extern crate parity_codec_derive;
 extern crate parity_codec as codec;
 extern crate sr_primitives;
 
@@ -51,9 +53,17 @@ decl_module! {
     }
 }
 
+#[derive(PartialEq, Eq, Clone, Encode, Decode, Default)]
+pub struct SwitchStore {
+    pub global: bool,
+    pub spot: bool,
+    pub xbtc: bool,
+    pub sdot: bool,
+}
+
 decl_storage! {
     trait Store for Module<T: Trait> as XFeeManager {
-        pub Switch get(switch) config(): bool; // Emergency control
+        pub Switch get(switch): SwitchStore; // Emergency control
         pub ProducerFeeProportion get(producer_fee_proportion) config(): (u32, u32);
     }
     add_extra_genesis {
@@ -88,6 +98,10 @@ impl<T: Trait> MakePayment<T::AccountId> for Module<T> {
 }
 
 impl<T: Trait> Module<T> {
+    pub fn set_switch(store: SwitchStore) {
+        Switch::<T>::put(store);
+    }
+
     pub fn transaction_fee(power: u64, encoded_len: u64) -> T::Balance {
         <balances::Module<T>>::transaction_base_fee() * <T::Balance as As<u64>>::sa(power)
             + <balances::Module<T>>::transaction_byte_fee()