add xKSM & heiko-runtime

.github/workflows/ci.yml

@@ -73,7 +73,9 @@ jobs:
 
       - name: Check Build
         run: |
-          SKIP_WASM_BUILD= cargo check --all-targets --all-features
+          SKIP_WASM_BUILD= cargo check --bin parallel-dev --features runtime-benchmarks
+          SKIP_WASM_BUILD= cargo check --bin parallel --features runtime-benchmarks
+          SKIP_WASM_BUILD= cargo check --bin parallel --no-default-features --features runtime-parallel --features runtime-benchmarks
 
       # - name: Check Wasm
       #   run: |

.github/workflows/coverage.yml

@@ -42,7 +42,7 @@ jobs:
 
       - name: Generate code coverage
         run: |
-          cargo +nightly-2021-03-24 tarpaulin --verbose --all-features --workspace --exclude parallel --exclude parallel-dev --exclude parallel-runtime --exclude vanilla-runtime --timeout 120 --out Xml
+          cargo +nightly-2021-03-24 tarpaulin --verbose --workspace --exclude parallel --exclude parallel-dev --exclude parallel-runtime --exclude heiko-runtime --exclude vanilla-runtime --timeout 120 --out Xml
 
       - name: Upload To Codecov.io
         uses: codecov/codecov-action@v1

CHANGELOG.md

@@ -9,6 +9,10 @@
 
 -   Add RpcDataProviderId & AccountData to types.json (#136)
 
+## 2021.05.22
+
+-   Add xKSM, heiko-runtime and impl_currency_id macro (#134)
+
 ## 2021.05.21
 
 -   Add types.json update bot (#130)

Cargo.toml

@@ -2,4 +2,4 @@
 panic = 'unwind'
 
 [workspace]
-members = ['node/*', 'pallets/*', 'runtime/*']
+members = ['node/*', 'pallets/*']

node/parallel-dev/src/chain_spec.rs

@@ -25,8 +25,8 @@ use sp_runtime::{
 };
 use vanilla_runtime::currency::DOLLARS;
 use vanilla_runtime::{
-    AuraConfig, CouncilConfig, DemocracyConfig, ElectionsConfig, GrandpaConfig,
-    TechnicalCommitteeConfig, VanillaOracleConfig, WASM_BINARY,
+    AuraConfig, CouncilConfig, DemocracyConfig, ElectionsConfig, GrandpaConfig, OracleConfig,
+    TechnicalCommitteeConfig, WASM_BINARY,
 };
 
 pub type VanillaChainSpec = sc_service::GenericChainSpec<vanilla_runtime::GenesisConfig>;
@@ -177,7 +177,7 @@ fn testnet_genesis(
                 .collect(),
         },
         pallet_sudo: vanilla_runtime::SudoConfig { key: root_key },
-        orml_oracle_Instance1: VanillaOracleConfig {
+        orml_oracle_Instance1: OracleConfig {
             members: endowed_accounts.clone().into(),
             phantom: Default::default(),
         },
@@ -190,6 +190,7 @@ fn testnet_genesis(
                         (x.clone(), CurrencyId::KSM, 1_000 * TOKEN_DECIMAL),
                         (x.clone(), CurrencyId::USDT, 1_000 * TOKEN_DECIMAL),
                         (x.clone(), CurrencyId::xDOT, 1_000 * TOKEN_DECIMAL),
+                        (x.clone(), CurrencyId::xKSM, 1_000 * TOKEN_DECIMAL),
                     ]
                 })
                 .collect(),
@@ -200,6 +201,7 @@ fn testnet_genesis(
                 CurrencyId::KSM,
                 CurrencyId::USDT,
                 CurrencyId::xDOT,
+                CurrencyId::xKSM,
             ],
             borrow_index: Rate::one(),                             // 1
             exchange_rate: Rate::saturating_from_rational(2, 100), // 0.02
@@ -212,31 +214,36 @@ fn testnet_genesis(
                 (CurrencyId::KSM, Ratio::from_percent(50)),
                 (CurrencyId::USDT, Ratio::from_percent(50)),
                 (CurrencyId::xDOT, Ratio::from_percent(50)),
+                (CurrencyId::xKSM, Ratio::from_percent(50)),
             ],
             liquidation_incentive: vec![
                 (CurrencyId::DOT, Ratio::from_percent(90)),
                 (CurrencyId::KSM, Ratio::from_percent(90)),
                 (CurrencyId::USDT, Ratio::from_percent(90)),
                 (CurrencyId::xDOT, Ratio::from_percent(90)),
+                (CurrencyId::xKSM, Ratio::from_percent(90)),
             ],
             // TODO : please refer to https://github.com/parallel-finance/parallel/issues/46
             liquidation_threshold: vec![
                 (CurrencyId::DOT, Ratio::from_percent(90)),
                 (CurrencyId::KSM, Ratio::from_percent(90)),
                 (CurrencyId::USDT, Ratio::from_percent(90)),
                 (CurrencyId::xDOT, Ratio::from_percent(90)),
+                (CurrencyId::xKSM, Ratio::from_percent(90)),
             ],
             close_factor: vec![
                 (CurrencyId::DOT, Ratio::from_percent(50)),
                 (CurrencyId::KSM, Ratio::from_percent(50)),
                 (CurrencyId::USDT, Ratio::from_percent(50)),
                 (CurrencyId::xDOT, Ratio::from_percent(50)),
+                (CurrencyId::xKSM, Ratio::from_percent(50)),
             ],
             reserve_factor: vec![
                 (CurrencyId::DOT, Ratio::from_percent(15)),
                 (CurrencyId::KSM, Ratio::from_percent(15)),
                 (CurrencyId::USDT, Ratio::from_percent(15)),
                 (CurrencyId::xDOT, Ratio::from_percent(15)),
+                (CurrencyId::xKSM, Ratio::from_percent(15)),
             ],
         },
         pallet_staking: vanilla_runtime::StakingConfig {

node/parallel/Cargo.toml

@@ -23,8 +23,9 @@ log                    = '0.4.13'
 
 primitives = { package = 'parallel-primitives', path = '../../primitives' }
 
+heiko-runtime                  = { version = '0.0.1', path = '../../runtime/heiko', optional = true }
 pallet-transaction-payment-rpc = { version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.1' }
-parallel-runtime               = { version = '0.0.1', path = '../../runtime/parallel' }
+parallel-runtime               = { version = '0.0.1', path = '../../runtime/parallel', optional = true }
 
 sc-basic-authorship = { version = '0.9.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.1' }
 sc-chain-spec       = { version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.1' }
@@ -80,8 +81,11 @@ substrate-build-script-utils = { version = '3.0.0', git = 'https://github.com/pa
 name = 'parallel'
 
 [features]
-default            = []
+default            = ['runtime-parallel']
 runtime-benchmarks = [
+  'heiko-runtime/runtime-benchmarks',
   'parallel-runtime/runtime-benchmarks',
   'polkadot-service/runtime-benchmarks',
 ]
+runtime-heiko      = ['heiko-runtime']
+runtime-parallel   = ['parallel-runtime']