feat: Rewards tokens for locking after cooldown period. Remove separate execution module.

.github/workflows/test.yml

@@ -93,8 +93,7 @@ jobs:
           cargo +nightly-2020-10-06 test -p mining-eligibility-hardware &&
           cargo +nightly-2020-10-06 test -p mining-claims-token &&
           cargo +nightly-2020-10-06 test -p mining-claims-hardware &&
-          cargo +nightly-2020-10-06 test -p mining-execution-token && 
-          cargo +nightly-2020-10-06 test -p exchange-rate 
+          cargo +nightly-2020-10-06 test -p exchange-rate
 
   lints:
     name: Lints

EXAMPLES.md

@@ -46,7 +46,8 @@ rm -rf /tmp/polkadot-chains/alice /tmp/polkadot-chains/bob /tmp/polkadot-chains/
   --base-path /tmp/polkadot-chains/alice \
   --name "Data Highway Development Chain" \
   --dev \
-  --telemetry-url "wss://telemetry.polkadot.io/submit/ 0"
+  --telemetry-url "wss://telemetry.polkadot.io/submit/ 0" \
+  -lruntime=debug
 ```
 
 ## Example "local" PoS testnet (with multiple nodes) <a id="chapter-f21efd"></a>

custom_types.json

@@ -124,8 +124,8 @@
   "MiningConfigTokenConfig": {
     "token_type": "Text",
     "token_lock_amount": "u64",
-    "token_lock_start_block": "Moment",
-    "token_lock_interval_blocks": "Moment"
+    "token_lock_start_block": "u64",
+    "token_lock_interval_blocks": "u64"
   },
   "MiningConfigTokenRequirementsConfig": {
     "token_type": "Text",
@@ -146,6 +146,12 @@
     "hardware_lock_start_block": "Moment",
     "hardware_lock_interval_blocks": "Moment"
   },
+  "MiningConfigTokenExecutorAccountID": "u64",
+  "MiningConfigTokenExecutionResult": {
+    "token_execution_executor_account_id": "u64",
+    "token_execution_started_block": "u64",
+    "token_execution_interval_blocks": "u64"
+  },
   "MiningSamplingToken": "[u8; 16]",
   "MiningSamplingTokenIndex": "u64",
   "MiningSamplingTokenSampleLockedAmount": "u64",
@@ -196,14 +202,6 @@
     "hardware_claim_amount": "u64",
     "hardware_claim_block_redeemed": "u64"
   },
-  "MiningExecutionToken": "[u8; 16]",
-  "MiningExecutionTokenIndex": "u64",
-  "MiningExecutionTokenExecutorAccountID": "u64",
-  "MiningExecutionTokenExecutionResult": {
-    "token_execution_exector_account_id": "u64",
-    "token_execution_started_block": "Moment",
-    "token_execution_ended_block": "Moment"
-  },
   "ExchangeRateIndex": "u64",
   "ExchangeRateConfig": {
     "hbtc": "u64",

pallets/exchange-rate/src/lib.rs

@@ -269,7 +269,7 @@ impl<T: Trait> Module<T> {
 
     fn random_value(sender: &T::AccountId) -> [u8; 16] {
         let payload = (
-            T::Randomness::random(&[0]),
+            <T as roaming_operators::Trait>::Randomness::random(&[0]),
             sender,
             <frame_system::Module<T>>::extrinsic_index(),
             <frame_system::Module<T>>::block_number(),

pallets/mining/claims/hardware/src/lib.rs

@@ -374,7 +374,7 @@ impl<T: Trait> Module<T> {
 
     fn random_value(sender: &T::AccountId) -> [u8; 16] {
         let payload = (
-            T::Randomness::random(&[0]),
+            <T as roaming_operators::Trait>::Randomness::random(&[0]),
             sender,
             <frame_system::Module<T>>::extrinsic_index(),
             <frame_system::Module<T>>::block_number(),

pallets/mining/claims/token/src/lib.rs

@@ -184,7 +184,7 @@ decl_module! {
             // FIXME
             // let current_block = <frame_system::Module<T>>::block_number();
             // // Get the config associated with the given configuration_token
-            // if let Some(configuration_token_config) = <mining_config_token::Module<T>>::mining_config_token_token_configs(mining_config_token_id) {
+            // if let Some(configuration_token_config) = <mining_config_token::Module<T>>::mining_config_token_configs(mining_config_token_id) {
             //   if let _token_lock_interval_blocks = configuration_token_config.token_lock_interval_blocks {
             //     ensure!(current_block > _token_lock_interval_blocks, "Claim may not be made until after the end of the lock interval");
             // } else {
@@ -475,7 +475,7 @@ impl<T: Trait> Module<T> {
 
     fn random_value(sender: &T::AccountId) -> [u8; 16] {
         let payload = (
-            T::Randomness::random(&[0]),
+            <T as roaming_operators::Trait>::Randomness::random(&[0]),
             sender,
             <frame_system::Module<T>>::extrinsic_index(),
             <frame_system::Module<T>>::block_number(),

pallets/mining/config/hardware/src/lib.rs

@@ -315,7 +315,7 @@ impl<T: Trait> Module<T> {
 
     fn random_value(sender: &T::AccountId) -> [u8; 16] {
         let payload = (
-            T::Randomness::random(&[0]),
+            <T as roaming_operators::Trait>::Randomness::random(&[0]),
             sender,
             <frame_system::Module<T>>::extrinsic_index(),
             <frame_system::Module<T>>::block_number(),

pallets/mining/config/token/Cargo.toml

@@ -14,12 +14,14 @@ std = [
     'pallet-balances/std',
     'pallet-randomness-collective-flip/std',
     'pallet-transaction-payment/std',
+    'pallet-treasury/std',
     'sp-core/std',
     'sp-io/std',
     'sp-runtime/std',
     'sp-std/std',
 
     'roaming-operators/std',
+    'mining-rates-token/std',
 ]
 
 [dependencies]
@@ -30,11 +32,13 @@ frame-system = { version = '2.0.0', default_features = false }
 pallet-balances = { version = '2.0.0', default_features = false }
 pallet-randomness-collective-flip = { version = '2.0.0', default_features = false }
 pallet-transaction-payment = { version = '2.0.0', default_features = false }
+pallet-treasury = { version = '2.0.0', default-features = false }
 sp-core = { version = '2.0.0', default_features = false }
 sp-io = { version = '2.0.0', default_features = false }
 sp-runtime = { version = '2.0.0', default_features = false }
 sp-std = { version = '2.0.0', default_features = false }
 
 roaming-operators = { default_features = false, package = 'roaming-operators', path = '../../../roaming/roaming-operators' }
+mining-rates-token = { default_features = false, package = 'mining-rates-token', path = '../../../mining/rates/token' }
 
 [dev-dependencies]