Merge branch 'dan/compute-griefing-collateral' into 'master'

Dan/compute griefing collateral See merge request interlay/polkabtc-clients!169
interlay · Jan 15, 2021 · aabc878 · aabc878
2 parents 4645e89 + 3b33c11
commit aabc878
Show file tree

Hide file tree

Showing 9 changed files with 314 additions and 224 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -15,9 +15,10 @@ use pallets::*;
 pub use rpc::{
     historic_event_types, AccountId, BtcRelayPallet, BtcTxFeesPerByte, DotBalancesPallet,
     ExchangeRateOraclePallet, FeePallet, IssuePallet, PolkaBtcHeader, PolkaBtcIssueRequest,
-    PolkaBtcProvider, PolkaBtcRedeemRequest, PolkaBtcReplaceRequest, PolkaBtcRequestIssueEvent,
-    PolkaBtcStatusUpdate, PolkaBtcVault, RedeemPallet, ReplacePallet, SecurityPallet,
-    StakedRelayerPallet, TimestampPallet, UtilFuncs, VaultRegistryPallet,
+    PolkaBtcProvider, PolkaBtcRedeemRequest, PolkaBtcReplaceRequest,
+    PolkaBtcRequestIssueEvent, PolkaBtcStatusUpdate, PolkaBtcVault, RedeemPallet,
+    ReplacePallet, SecurityPallet, StakedRelayerPallet, TimestampPallet, UtilFuncs,
+    VaultRegistryPallet,
 };
 pub use security::{ErrorCode, StatusCode};
 pub use sp_arithmetic::{traits as FixedPointTraits, FixedI128, FixedPointNumber, FixedU128};

diff --git a/runtime/src/pallets/fee.rs b/runtime/src/pallets/fee.rs
@@ -7,9 +7,14 @@ use substrate_subxt_proc_macro::{module, Store};
 #[module]
 pub trait Fee: Core {}
 
-/// Current BTC/DOT exchange rate
 #[derive(Clone, Debug, Eq, PartialEq, Store, Encode)]
 pub struct IssueGriefingCollateralStore<T: Fee> {
     #[store(returns = T::UnsignedFixedPoint)]
     pub _runtime: PhantomData<T>,
 }
+
+#[derive(Clone, Debug, Eq, PartialEq, Store, Encode)]
+pub struct ReplaceGriefingCollateralStore<T: Fee> {
+    #[store(returns = T::UnsignedFixedPoint)]
+    pub _runtime: PhantomData<T>,
+}
diff --git a/runtime/src/rpc.rs b/runtime/src/rpc.rs
@@ -1406,11 +1406,17 @@ impl VaultRegistryPallet for PolkaBtcProvider {
 #[async_trait]
 pub trait FeePallet {
     async fn get_issue_griefing_collateral(&self) -> Result<FixedU128, Error>;
+
+    async fn get_replace_griefing_collateral(&self) -> Result<FixedU128, Error>;
 }
 
 #[async_trait]
 impl FeePallet for PolkaBtcProvider {
     async fn get_issue_griefing_collateral(&self) -> Result<FixedU128, Error> {
         Ok(self.ext_client.issue_griefing_collateral(None).await?)
     }
+
+    async fn get_replace_griefing_collateral(&self) -> Result<FixedU128, Error> {
+        Ok(self.ext_client.replace_griefing_collateral(None).await?)
+    }
 }
diff --git a/staked-relayer/src/oracle.rs b/staked-relayer/src/oracle.rs
@@ -55,8 +55,10 @@ mod tests {
     use super::*;
     use async_trait::async_trait;
     use runtime::PolkaBtcStatusUpdate;
-    use runtime::{AccountId, BtcTxFeesPerByte, Error, ErrorCode, H256Le, StatusCode};
-
+    use runtime::{
+        AccountId, BtcTxFeesPerByte, Error, ErrorCode, FixedPointNumber, FixedU128, H256Le,
+        StatusCode,
+    };
     use std::collections::BTreeSet;
     use std::iter::FromIterator;
 

diff --git a/vault/Cargo.toml b/vault/Cargo.toml
@@ -12,14 +12,15 @@ thiserror = "1.0"
 clap = "3.0.0-beta.2"
 sp-keyring = "2.0.0"
 sp-core = "2.0.0"
+sp-arithmetic = "2.0.0"
 runtime = { path = "../runtime" }
 bitcoin = { path = "../bitcoin", features = ["cli"] }
 backoff = { version = "0.2.1", features = ["tokio"] }
 serde = "1.0.116"
 serde_json = { version = "1.0.57", features = ["raw_value"] }
 hex = "0.4.2"
 parity-scale-codec = "1.3.1"
-jsonrpc-http-server = "15.1.0"
+jsonrpc-http-server = "16.0.0"
 futures = "0.3.5"
 async-trait = "0.1.40"