Mempool Update

blockchain/message_pool/Cargo.toml

@@ -26,8 +26,11 @@ libsecp256k1 = "0.3.4"
 blake2b_simd = "0.5.10"
 log = "0.4.8"
 async-std = "1.6.0"
-async-trait = "0.1"
+statrs = "0.13.0"
 state_manager = { path = "../state_manager" }
+async-trait = "0.1"
+interpreter = { path = "../../vm/interpreter/" }
+types = { package = "fil_types", path = "../../types" }
 
 [dev-dependencies]
 interpreter = { path = "../../vm/interpreter/" }

blockchain/message_pool/src/config.rs

@@ -0,0 +1,78 @@
+use address::Address;
+use db::Store;
+use encoding::{from_slice, to_vec};
+use serde::{Deserialize, Serialize};
+use std::error::Error as StdError;
+use std::time::Duration;
+
+const MPOOL_CONFIG_KEY: &[u8] = b"/mpool/config";
+const SIZE_LIMIT_LOW: i64 = 20000;
+const SIZE_LIMIT_HIGH: i64 = 30000;
+const PRUNE_COOLDOWN: Duration = Duration::from_secs(60); // 1 minute
+const REPLACE_BY_FEE_RATIO: f64 = 1.25;
+const GAS_LIMIT_OVERESTIMATION: f64 = 1.25;
+
+#[derive(Clone, Serialize, Deserialize)]
+pub struct MpoolConfig {
+    priority_addrs: Vec<Address>,
+    size_limit_high: i64,
+    size_limit_low: i64,
+    replace_by_fee_ratio: f64,
+    prune_cooldown: Duration,
+    gas_limit_overestimation: f64,
+}
+
+impl Default for MpoolConfig {
+    fn default() -> Self {
+        Self {
+            priority_addrs: vec![],
+            size_limit_high: SIZE_LIMIT_HIGH,
+            size_limit_low: SIZE_LIMIT_LOW,
+            replace_by_fee_ratio: REPLACE_BY_FEE_RATIO,
+            prune_cooldown: PRUNE_COOLDOWN,
+            gas_limit_overestimation: GAS_LIMIT_OVERESTIMATION,
+        }
+    }
+}
+
+impl MpoolConfig {
+    pub fn new(
+        priority_addrs: Vec<Address>,
+        size_limit_high: i64,
+        size_limit_low: i64,
+        replace_by_fee_ratio: f64,
+        prune_cooldown: Duration,
+        gas_limit_overestimation: f64,
+    ) -> Result<Self, String> {
+        // Validate if parameters are valid
+        if replace_by_fee_ratio < REPLACE_BY_FEE_RATIO {
+            return Err(format!(
+                "replace_by_fee_ratio:{} is less than required: {}",
+                replace_by_fee_ratio, REPLACE_BY_FEE_RATIO
+            ));
+        }
+        if gas_limit_overestimation < 1.0 {
+            return Err(format!(
+                "gas_limit_overestimation of: {} is less than required: {}",
+                gas_limit_overestimation, 1
+            ));
+        }
+        Ok(Self {
+            priority_addrs,
+            size_limit_high,
+            size_limit_low,
+            replace_by_fee_ratio,
+            prune_cooldown,
+            gas_limit_overestimation,
+        })
+    }
+    pub fn save_config<DB: Store>(&self, store: &DB) -> Result<(), Box<dyn StdError>> {
+        Ok(store.write(MPOOL_CONFIG_KEY, to_vec(&self)?)?)
+    }
+    pub fn load_config<DB: Store>(store: &DB) -> Result<Self, Box<dyn StdError>> {
+        match store.read(MPOOL_CONFIG_KEY)? {
+            Some(v) => Ok(from_slice(&v)?),
+            None => Ok(Default::default()),
+        }
+    }
+}

blockchain/message_pool/src/errors.rs

@@ -25,6 +25,10 @@ pub enum Error {
     InvalidFromAddr,
     #[error("Message with sequence already in mempool")]
     DuplicateSequence,
+    #[error("State inconsistency with message. Try again")]
+    TryAgain,
+    #[error("Validation Error: {0}")]
+    SoftValidationFailure(String),
     #[error("{0}")]
     Other(String),
 }

blockchain/message_pool/src/lib.rs

@@ -3,6 +3,8 @@
 
 mod errors;
 mod msgpool;
-
+// mod block_prob;
+mod config;
+pub use self::config::*;
 pub use self::errors::*;
 pub use self::msgpool::*;