GH-638: Proper gas price management for both payable modes

automap/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "automap"
-version = "0.8.2"
+version = "0.9.0"
 authors = ["Dan Wiebe <[email protected]>", "MASQ"]
 license = "GPL-3.0-only"
 description = "Library full of code to make routers map ports through firewalls"

dns_utility/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dns_utility"
-version = "0.8.2"
+version = "0.9.0"
 license = "GPL-3.0-only"
 authors = ["Dan Wiebe <[email protected]>", "MASQ"]
 copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved."

masq/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "masq"
-version = "0.8.2"
+version = "0.9.0"
 authors = ["Dan Wiebe <[email protected]>", "MASQ"]
 license = "GPL-3.0-only"
 description = "Reference implementation of user interface for MASQ Node"

masq_lib/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "masq_lib"
-version = "0.8.2"
+version = "0.9.0"
 authors = ["Dan Wiebe <[email protected]>", "MASQ"]
 license = "GPL-3.0-only"
 description = "Code common to Node and masq; also, temporarily, to dns_utility"

masq_lib/src/blockchains/blockchain_records.rs

@@ -12,53 +12,68 @@ use crate::constants::{
 };
 use ethereum_types::{Address, H160};
 
+// TODO these should probably be a static, and dynamic initialization should then also be allowed
 pub const CHAINS: [BlockchainRecord; 7] = [
     BlockchainRecord {
         self_id: Chain::PolyMainnet,
         num_chain_id: 137,
         literal_identifier: POLYGON_MAINNET_FULL_IDENTIFIER,
+        gas_price_default_margin_percents: 30,
+        gas_price_safe_ceiling_minor: 200_000_000_000,
         contract: POLYGON_MAINNET_CONTRACT_ADDRESS,
         contract_creation_block: POLYGON_MAINNET_CONTRACT_CREATION_BLOCK,
     },
     BlockchainRecord {
         self_id: Chain::EthMainnet,
         num_chain_id: 1,
         literal_identifier: ETH_MAINNET_FULL_IDENTIFIER,
+        gas_price_default_margin_percents: 30,
+        gas_price_safe_ceiling_minor: 100_000_000_000,
         contract: ETH_MAINNET_CONTRACT_ADDRESS,
         contract_creation_block: ETH_MAINNET_CONTRACT_CREATION_BLOCK,
     },
     BlockchainRecord {
         self_id: Chain::BaseMainnet,
         num_chain_id: 8453,
         literal_identifier: BASE_MAINNET_FULL_IDENTIFIER,
+        gas_price_default_margin_percents: 30,
+        gas_price_safe_ceiling_minor: 50_000_000_000,
         contract: BASE_MAINNET_CONTRACT_ADDRESS,
         contract_creation_block: BASE_MAINNET_CONTRACT_CREATION_BLOCK,
     },
     BlockchainRecord {
         self_id: Chain::BaseSepolia,
         num_chain_id: 84532,
         literal_identifier: BASE_SEPOLIA_FULL_IDENTIFIER,
+        gas_price_default_margin_percents: 30,
+        gas_price_safe_ceiling_minor: 50_000_000_000,
         contract: BASE_SEPOLIA_TESTNET_CONTRACT_ADDRESS,
         contract_creation_block: BASE_SEPOLIA_CONTRACT_CREATION_BLOCK,
     },
     BlockchainRecord {
         self_id: Chain::PolyAmoy,
         num_chain_id: 80002,
         literal_identifier: POLYGON_AMOY_FULL_IDENTIFIER,
+        gas_price_default_margin_percents: 30,
+        gas_price_safe_ceiling_minor: 200_000_000_000,
         contract: POLYGON_AMOY_TESTNET_CONTRACT_ADDRESS,
         contract_creation_block: POLYGON_AMOY_CONTRACT_CREATION_BLOCK,
     },
     BlockchainRecord {
         self_id: Chain::EthRopsten,
         num_chain_id: 3,
         literal_identifier: ETH_ROPSTEN_FULL_IDENTIFIER,
+        gas_price_default_margin_percents: 30,
+        gas_price_safe_ceiling_minor: 100_000_000_000,
         contract: ETH_ROPSTEN_TESTNET_CONTRACT_ADDRESS,
         contract_creation_block: ETH_ROPSTEN_CONTRACT_CREATION_BLOCK,
     },
     BlockchainRecord {
         self_id: Chain::Dev,
         num_chain_id: 2,
         literal_identifier: DEV_CHAIN_FULL_IDENTIFIER,
+        gas_price_default_margin_percents: 30,
+        gas_price_safe_ceiling_minor: 200_000_000_000,
         contract: MULTINODE_TESTNET_CONTRACT_ADDRESS,
         contract_creation_block: MULTINODE_TESTNET_CONTRACT_CREATION_BLOCK,
     },
@@ -69,6 +84,8 @@ pub struct BlockchainRecord {
     pub self_id: Chain,
     pub num_chain_id: u64,
     pub literal_identifier: &'static str,
+    pub gas_price_default_margin_percents: u8,
+    pub gas_price_safe_ceiling_minor: u128,
     pub contract: Address,
     pub contract_creation_block: u64,
 }
@@ -115,7 +132,7 @@ const POLYGON_MAINNET_CONTRACT_ADDRESS: Address = H160([
 mod tests {
     use super::*;
     use crate::blockchains::chains::chain_from_chain_identifier_opt;
-    use crate::constants::BASE_MAINNET_CONTRACT_CREATION_BLOCK;
+    use crate::constants::{BASE_MAINNET_CONTRACT_CREATION_BLOCK, WEIS_IN_GWEI};
     use std::collections::HashSet;
     use std::iter::FromIterator;
 
@@ -195,6 +212,8 @@ mod tests {
                 num_chain_id: 1,
                 self_id: examined_chain,
                 literal_identifier: "eth-mainnet",
+                gas_price_default_margin_percents: 30,
+                gas_price_safe_ceiling_minor: 100 * WEIS_IN_GWEI as u128,
                 contract: ETH_MAINNET_CONTRACT_ADDRESS,
                 contract_creation_block: ETH_MAINNET_CONTRACT_CREATION_BLOCK,
             }
@@ -211,6 +230,8 @@ mod tests {
                 num_chain_id: 3,
                 self_id: examined_chain,
                 literal_identifier: "eth-ropsten",
+                gas_price_default_margin_percents: 30,
+                gas_price_safe_ceiling_minor: 100 * WEIS_IN_GWEI as u128,
                 contract: ETH_ROPSTEN_TESTNET_CONTRACT_ADDRESS,
                 contract_creation_block: ETH_ROPSTEN_CONTRACT_CREATION_BLOCK,
             }
@@ -227,6 +248,8 @@ mod tests {
                 num_chain_id: 137,
                 self_id: examined_chain,
                 literal_identifier: "polygon-mainnet",
+                gas_price_default_margin_percents: 30,
+                gas_price_safe_ceiling_minor: 200 * WEIS_IN_GWEI as u128,
                 contract: POLYGON_MAINNET_CONTRACT_ADDRESS,
                 contract_creation_block: POLYGON_MAINNET_CONTRACT_CREATION_BLOCK,
             }
@@ -243,6 +266,8 @@ mod tests {
                 num_chain_id: 80002,
                 self_id: examined_chain,
                 literal_identifier: "polygon-amoy",
+                gas_price_default_margin_percents: 30,
+                gas_price_safe_ceiling_minor: 200 * WEIS_IN_GWEI as u128,
                 contract: POLYGON_AMOY_TESTNET_CONTRACT_ADDRESS,
                 contract_creation_block: POLYGON_AMOY_CONTRACT_CREATION_BLOCK,
             }
@@ -259,6 +284,8 @@ mod tests {
                 num_chain_id: 8453,
                 self_id: examined_chain,
                 literal_identifier: "base-mainnet",
+                gas_price_default_margin_percents: 30,
+                gas_price_safe_ceiling_minor: 50 * WEIS_IN_GWEI as u128,
                 contract: BASE_MAINNET_CONTRACT_ADDRESS,
                 contract_creation_block: BASE_MAINNET_CONTRACT_CREATION_BLOCK,
             }
@@ -275,6 +302,8 @@ mod tests {
                 num_chain_id: 84532,
                 self_id: examined_chain,
                 literal_identifier: "base-sepolia",
+                gas_price_default_margin_percents: 30,
+                gas_price_safe_ceiling_minor: 50 * WEIS_IN_GWEI as u128,
                 contract: BASE_SEPOLIA_TESTNET_CONTRACT_ADDRESS,
                 contract_creation_block: BASE_SEPOLIA_CONTRACT_CREATION_BLOCK,
             }
@@ -291,6 +320,8 @@ mod tests {
                 num_chain_id: 2,
                 self_id: examined_chain,
                 literal_identifier: "dev",
+                gas_price_default_margin_percents: 30,
+                gas_price_safe_ceiling_minor: 200 * WEIS_IN_GWEI as u128,
                 contract: MULTINODE_TESTNET_CONTRACT_ADDRESS,
                 contract_creation_block: MULTINODE_TESTNET_CONTRACT_CREATION_BLOCK,
             }

masq_lib/src/blockchains/chains.rs

@@ -141,6 +141,8 @@ mod tests {
             num_chain_id: 0,
             self_id: Chain::PolyMainnet,
             literal_identifier: "",
+            gas_price_default_margin_percents: 0,
+            gas_price_safe_ceiling_minor: 0,
             contract: Default::default(),
             contract_creation_block: 0,
         }

masq_lib/src/constants.rs

@@ -5,7 +5,7 @@ use crate::data_version::DataVersion;
 use const_format::concatcp;
 
 pub const DEFAULT_CHAIN: Chain = Chain::PolyMainnet;
-pub const CURRENT_SCHEMA_VERSION: usize = 10;
+pub const CURRENT_SCHEMA_VERSION: usize = 11;
 
 pub const HIGHEST_RANDOM_CLANDESTINE_PORT: u16 = 9999;
 pub const HTTP_PORT: u16 = 80;

masq_lib/src/lib.rs

@@ -25,6 +25,5 @@ pub mod data_version;
 pub mod exit_locations;
 pub mod shared_schema;
 pub mod test_utils;
-pub mod type_obfuscation;
 pub mod ui_gateway;
 pub mod ui_traffic_converter;

masq_lib/src/messages.rs

@@ -527,10 +527,10 @@ pub struct UiRatePack {
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct UiScanIntervals {
-    #[serde(rename = "pendingPayableSec")]
-    pub pending_payable_sec: u64,
     #[serde(rename = "payableSec")]
     pub payable_sec: u64,
+    #[serde(rename = "pendingPayableSec")]
+    pub pending_payable_sec: u64,
     #[serde(rename = "receivableSec")]
     pub receivable_sec: u64,
 }
@@ -783,8 +783,8 @@ conversation_message!(UiRecoverWalletsResponse, "recoverWallets");
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone, Copy, Hash)]
 pub enum ScanType {
     Payables,
-    Receivables,
     PendingPayables,
+    Receivables,
 }
 
 impl FromStr for ScanType {
@@ -793,8 +793,8 @@ impl FromStr for ScanType {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
             s if &s.to_lowercase() == "payables" => Ok(ScanType::Payables),
-            s if &s.to_lowercase() == "receivables" => Ok(ScanType::Receivables),
             s if &s.to_lowercase() == "pendingpayables" => Ok(ScanType::PendingPayables),
+            s if &s.to_lowercase() == "receivables" => Ok(ScanType::Receivables),
             s => Err(format!("Unrecognized ScanType: '{}'", s)),
         }
     }
@@ -1225,10 +1225,10 @@ mod tests {
         let result: Vec<ScanType> = vec![
             "Payables",
             "pAYABLES",
-            "Receivables",
-            "rECEIVABLES",
             "PendingPayables",
             "pENDINGpAYABLES",
+            "Receivables",
+            "rECEIVABLES",
         ]
         .into_iter()
         .map(|s| ScanType::from_str(s).unwrap())
@@ -1239,10 +1239,10 @@ mod tests {
             vec![
                 ScanType::Payables,
                 ScanType::Payables,
-                ScanType::Receivables,
-                ScanType::Receivables,
                 ScanType::PendingPayables,
                 ScanType::PendingPayables,
+                ScanType::Receivables,
+                ScanType::Receivables,
             ]
         )
     }

masq_lib/src/test_utils/mock_blockchain_client_server.rs

@@ -220,7 +220,7 @@ impl MockBlockchainClientServer {
                     Err(e) if e.kind() == ErrorKind::TimedOut => (),
                     Err(e) => panic!("MBCS accept() failed: {:?}", e),
                 };
-                thread::sleep(Duration::from_millis(100));
+                thread::sleep(Duration::from_millis(50));
             };
             drop(listener);
             conn.set_nonblocking(true).unwrap();