Merge pull request #117 from DMDcoin/i115-smart-contract-macros

merge spec generation and dependecy update
DMDcoin · Jul 2, 2024 · ca61bf7 · ca61bf7
2 parents c69c572 + f602384
commit ca61bf7
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 46 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/oe/logger/Cargo.toml b/bin/oe/logger/Cargo.toml
@@ -13,5 +13,5 @@ lazy_static = "1.0"
 regex = "1.0"
 time = "0.1"
 parking_lot = "0.11.1"
-arrayvec = "0.4"
+arrayvec = "0.7"
 ansi_term = "0.10"
diff --git a/bin/oe/logger/src/rotating.rs b/bin/oe/logger/src/rotating.rs
@@ -50,7 +50,7 @@ pub struct RotatingLogger {
     /// Defined logger levels
     levels: String,
     /// Logs array. Latest log is always at index 0
-    logs: RwLock<ArrayVec<[String; LOG_SIZE]>>,
+    logs: RwLock<ArrayVec<String, LOG_SIZE>>,
 }
 
 impl RotatingLogger {
@@ -59,7 +59,7 @@ impl RotatingLogger {
     pub fn new(levels: String) -> Self {
         RotatingLogger {
             levels: levels,
-            logs: RwLock::new(ArrayVec::<[_; LOG_SIZE]>::new()),
+            logs: RwLock::new(ArrayVec::<_, LOG_SIZE>::new()),
         }
     }
 
@@ -78,7 +78,7 @@ impl RotatingLogger {
     }
 
     /// Return logs
-    pub fn logs(&self) -> RwLockReadGuard<ArrayVec<[String; LOG_SIZE]>> {
+    pub fn logs(&self) -> RwLockReadGuard<ArrayVec<String, LOG_SIZE>> {
         self.logs.read()
     }
 }

diff --git a/crates/ethcore/src/engines/hbbft/hbbft_config_generator/src/main.rs b/crates/ethcore/src/engines/hbbft/hbbft_config_generator/src/main.rs
@@ -104,6 +104,7 @@ fn to_toml_array(vec: Vec<&str>) -> Value {
 
 fn to_toml(
     i: usize,
+    open_ports: bool,
     config_type: &ConfigType,
     external_ip: Option<&str>,
     signer_address: &Address,
@@ -116,6 +117,7 @@ fn to_toml(
     base_ws_port: u16,
 ) -> Value {
     let mut parity = Map::new();
+
     match config_type {
         ConfigType::PosdaoSetup => {
             parity.insert("chain".into(), Value::String("./spec/spec.json".into()));
@@ -169,33 +171,37 @@ fn to_toml(
     }
 
     let mut rpc = Map::new();
-    rpc.insert("interface".into(), Value::String("all".into()));
-    rpc.insert("cors".into(), to_toml_array(vec!["all"]));
-    rpc.insert("hosts".into(), to_toml_array(vec!["all"]));
-    let apis = to_toml_array(vec![
-        "web3",
-        "eth",
-        "pubsub",
-        "net",
-        "parity",
-        "parity_set",
-        "parity_pubsub",
-        "personal",
-        "traces",
-    ]);
-    rpc.insert("apis".into(), apis);
-    rpc.insert(
-        "port".into(),
-        Value::Integer((base_rpc_port as usize + i) as i64),
-    );
-
     let mut websockets = Map::new();
-    websockets.insert("interface".into(), Value::String("all".into()));
-    websockets.insert("origins".into(), to_toml_array(vec!["all"]));
-    websockets.insert(
-        "port".into(),
-        Value::Integer((base_ws_port as usize + i) as i64),
-    );
+
+    if open_ports {
+        rpc.insert("interface".into(), Value::String("all".into()));
+        rpc.insert("cors".into(), to_toml_array(vec!["all"]));
+        rpc.insert("hosts".into(), to_toml_array(vec!["all"]));
+        let apis = to_toml_array(vec![
+            "web3",
+            "eth",
+            "pubsub",
+            "net",
+            "parity",
+            "parity_pubsub",
+            "traces",
+        ]);
+        rpc.insert("apis".into(), apis);
+        rpc.insert(
+            "port".into(),
+            Value::Integer((base_rpc_port as usize + i) as i64),
+        );
+
+        websockets.insert("interface".into(), Value::String("all".into()));
+        websockets.insert("origins".into(), to_toml_array(vec!["all"]));
+        websockets.insert(
+            "port".into(),
+            Value::Integer((base_ws_port as usize + i) as i64),
+        );
+    } else {
+        rpc.insert("disable".into(), Value::Boolean(true));
+        websockets.insert("disable".into(), Value::Boolean(true));
+    }
 
     let mut ipc = Map::new();
     ipc.insert("disable".into(), Value::Boolean(true));
@@ -231,11 +237,10 @@ fn to_toml(
     }
 
     mining.insert("force_sealing".into(), Value::Boolean(true));
-    mining.insert("min_gas_price".into(), Value::Integer(1000000000));
-    mining.insert(
-        "gas_floor_target".into(),
-        Value::String("1000000000".into()),
-    );
+    // we put an extremly low min gas price in the config
+    // the min gas price is gathered from the DAO
+    // this makes sure that the min_gas_price wont be higher then the gas pricce the DAO decides.
+    mining.insert("min_gas_price".into(), Value::Integer(1000));
     mining.insert("reseal_on_txs".into(), Value::String("none".into()));
     mining.insert("reseal_min_period".into(), Value::Integer(0));
 
@@ -252,7 +257,7 @@ fn to_toml(
     // Value::String("txqueue=trace,consensus=debug,engine=trace,own_tx=trace,miner=trace,tx_filter=trace".into())
     misc.insert(
         "logging".into(),
-        Value::String("txqueue=info,consensus=debug,engine=trace,tx_own=trace".into()),
+        Value::String("txqueue=info,consensus=debug,engine=debug,tx_own=trace".into()),
     );
     misc.insert("log_file".into(), Value::String("diamond-node.log".into()));
 
@@ -431,12 +436,12 @@ fn main() {
             )
         });
 
-    let fork_block_number: Option<i64> = matches.value_of("fork_block_number").map_or(None, |v| {
-        Some(
-            v.parse::<i64>()
-                .expect("fork_block_number need to be of integer type"),
-        )
-    });
+    // let fork_block_number: Option<i64> = matches.value_of("fork_block_number").map_or(None, |v| {
+    //     Some(
+    //         v.parse::<i64>()
+    //             .expect("fork_block_number need to be of integer type"),
+    //     )
+    // });
 
     let metrics_port_base: Option<u16> = matches.value_of("metrics_port_base").map_or(None, |v| {
         Some(
@@ -525,6 +530,7 @@ fn main() {
         // the unwrap is safe, because there is a default value defined.
         let toml_string = toml::to_string(&to_toml(
             i,
+            false,
             &config_type,
             external_ip,
             &enode.address,
@@ -565,6 +571,7 @@ fn main() {
     // Write rpc node config
     let rpc_string = toml::to_string(&to_toml(
         0,
+        true,
         &ConfigType::Rpc,
         external_ip,
         &Address::default(), // todo: insert HBBFT Contracts pot here.

diff --git a/crates/ethcore/src/engines/hbbft/hbbft_engine.rs b/crates/ethcore/src/engines/hbbft/hbbft_engine.rs
@@ -1,7 +1,6 @@
 use super::{
     block_reward_hbbft::BlockRewardContract,
     hbbft_early_epoch_end_manager::HbbftEarlyEpochEndManager,
-    hbbft_network_fork_manager::HbbftNetworkForkManager,
 };
 use crate::{
     client::BlockChainClient,

diff --git a/crates/ethcore/src/engines/hbbft/hbbft_network_fork_manager.rs b/crates/ethcore/src/engines/hbbft/hbbft_network_fork_manager.rs
@@ -3,10 +3,9 @@ use std::{
     sync::Arc,
 };
 
-use ethereum_types::{Address, H512};
+use ethereum_types::H512;
 use ethjson::spec::hbbft::HbbftNetworkFork;
 use hbbft::{
-    crypto::PublicKeySet,
     sync_key_gen::{Ack, AckOutcome, Part, PartOutcome, SyncKeyGen},
     util::max_faulty,
     NetworkInfo,