Merge pull request #38 from sander2/fix/slash-to-fee-pool

fix: slash issue griefing collateral to fee pool instead of vault
interlay · Mar 18, 2021 · 0bdee77 · 0bdee77
2 parents 2c5e6bb + 916de73
commit 0bdee77
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 135 deletions.
diff --git a/crates/issue/src/ext.rs b/crates/issue/src/ext.rs
@@ -158,6 +158,10 @@ pub(crate) mod fee {
     use crate::types::{PolkaBTC, DOT};
     use frame_support::dispatch::DispatchError;
 
+    pub fn increase_dot_rewards_for_epoch<T: fee::Config>(amount: DOT<T>) {
+        <fee::Module<T>>::increase_dot_rewards_for_epoch(amount)
+    }
+
     pub fn fee_pool_account_id<T: fee::Config>() -> T::AccountId {
         <fee::Module<T>>::fee_pool_account_id()
     }

diff --git a/crates/issue/src/lib.rs b/crates/issue/src/lib.rs
@@ -320,9 +320,10 @@ impl<T: Config> Module<T> {
                 .ok_or(Error::<T>::ArithmeticUnderflow)?;
             ext::vault_registry::slash_collateral::<T>(
                 CurrencySource::Griefing(issue.requester.clone()),
-                CurrencySource::Backing(issue.vault.clone()),
+                CurrencySource::FreeBalance(ext::fee::fee_pool_account_id::<T>()),
                 slashed_collateral,
             )?;
+            ext::fee::increase_dot_rewards_for_epoch::<T>(slashed_collateral);
 
             Self::update_issue_amount(&issue_id, &mut issue, amount_transferred)?;
         } else {
@@ -417,9 +418,10 @@ impl<T: Config> Module<T> {
         } else {
             ext::vault_registry::slash_collateral::<T>(
                 CurrencySource::Griefing(issue.requester.clone()),
-                CurrencySource::Backing(issue.vault.clone()),
+                CurrencySource::FreeBalance(ext::fee::fee_pool_account_id::<T>()),
                 issue.griefing_collateral,
             )?;
+            ext::fee::increase_dot_rewards_for_epoch::<T>(issue.griefing_collateral);
         }
         // Remove issue request from storage
         Self::remove_issue_request(issue_id, true);

diff --git a/parachain/runtime/tests/mock/issue_testing_utils.rs b/parachain/runtime/tests/mock/issue_testing_utils.rs
@@ -136,6 +136,15 @@ pub fn execute_issue(issue_id: H256) {
     ExecuteIssueBuilder::new(issue_id).assert_execute()
 }
 
+pub fn default_user_state() -> UserData {
+    UserData {
+        free_balance: DEFAULT_USER_FREE_BALANCE,
+        locked_balance: DEFAULT_USER_LOCKED_BALANCE,
+        locked_tokens: DEFAULT_USER_LOCKED_TOKENS,
+        free_tokens: DEFAULT_USER_FREE_TOKENS,
+    }
+}
+
 pub fn assert_issue_request_event() -> H256 {
     let events = SystemModule::events();
     let record = events.iter().rev().find(|record| match record.event {

diff --git a/parachain/runtime/tests/mock/mod.rs b/parachain/runtime/tests/mock/mod.rs
@@ -130,6 +130,21 @@ impl UserData {
     }
 }
 
+#[derive(Debug, PartialEq, Default)]
+pub struct FeePool {
+    pub balance: u128,
+    pub tokens: u128,
+}
+
+impl FeePool {
+    pub fn get() -> Self {
+        Self {
+            balance: FeeModule::epoch_rewards_dot(),
+            tokens: FeeModule::epoch_rewards_polka_btc(),
+        }
+    }
+}
+
 #[derive(Debug, PartialEq, Default)]
 pub struct CoreVaultData {
     pub to_be_issued: u128,