Merge branch 'master' into v2.0-testnet

.gitignore

@@ -4,6 +4,7 @@ target
 **/*.rs.bk
 **/__pycache__
 .idea/
+.vscode/
 .git/
 .gitmodules
 .phabricator*

client/src/configuration.rs

@@ -1156,6 +1156,10 @@ impl Configuration {
             .raw_conf
             .dao_vote_transition_number
             .unwrap_or(default_transition_time);
+        params.transition_numbers.cip98 = self
+            .raw_conf
+            .dao_vote_transition_number
+            .unwrap_or(default_transition_time);
         if self.is_test_or_dev_mode() {
             params.transition_numbers.cip43b =
                 self.raw_conf.cip43_init_end_number.unwrap_or(u64::MAX);

client/src/rpc.rs

@@ -77,7 +77,8 @@ use crate::{
         rpc_apis::{Api, ApiSet},
     },
 };
-use jsonrpc_core::futures::{future::poll_fn, Async, Future};
+use futures01::lazy;
+use jsonrpc_core::futures::Future;
 use lazy_static::lazy_static;
 pub use metadata::Metadata;
 use metrics::{register_timer_with_group, ScopeTimer, Timer};
@@ -596,14 +597,11 @@ impl RpcInterceptor for MetricsInterceptor {
             .lock()
             .get(name)
             .map(|timer| timer.clone());
-        let f = move || {
-            Ok(Async::Ready(
-                maybe_timer
-                    .as_ref()
-                    .map(|timer| ScopeTimer::time_scope(timer.clone())),
-            ))
-        };
-        let setup = poll_fn(f);
-        Box::new(setup.and_then(|_timer| method_call))
+        let setup = lazy(move || {
+            Ok(maybe_timer
+                .as_ref()
+                .map(|timer| ScopeTimer::time_scope(timer.clone())))
+        });
+        Box::new(setup.then(|_timer: Result<_, ()>| method_call))
     }
 }

client/src/rpc/interceptor.rs

@@ -2,7 +2,7 @@
 // Conflux is free software and distributed under GNU General Public License.
 // See http://www.gnu.org/licenses/
 
-use futures01::{future::poll_fn, Async, Future};
+use futures01::{lazy, Future};
 use jsonrpc_core::{
     BoxFuture, Metadata, Params, RemoteProcedure, Result as RpcResult,
     RpcMethod,
@@ -110,14 +110,13 @@ where
     fn call(&self, params: Params, meta: M) -> BoxFuture<Value> {
         let name = self.name.clone();
         let interceptor = self.interceptor.clone();
-        let before_future = poll_fn(move || {
-            interceptor.before(&name).map(|_| Async::Ready(()))
-        });
+        let before_future = lazy(move || interceptor.before(&name));
 
         let method = self.method.clone();
-        let method_call = self
-            .interceptor
-            .around(&self.name, method.call(params, meta));
+        let method_call = self.interceptor.around(
+            &self.name,
+            lazy(move || method.call(params, meta)).boxed(),
+        );
         let method_future = before_future.and_then(move |_| method_call);
 
         Box::new(method_future)

core/Cargo.toml

@@ -137,6 +137,7 @@ criterion = "0.3"
 cfx-storage = { path = "storage", features = ["testonly_code"] }
 proptest = "1.0.0"
 proptest-derive = "0.3.0"
+consensus-types = { path = "./src/pos/consensus/consensus-types", features = ["fuzzing"] }
 #tokio = { version = "0.2.11", features = ["time"] }
 
 [dependencies.parity-util-mem]

core/src/executive/context.rs

@@ -189,6 +189,16 @@ impl<
     }
 
     fn blockhash(&mut self, number: &U256) -> H256 {
+        if self.local_part.space == Space::Ethereum
+            && self.local_part.spec.cip98
+        {
+            return if U256::from(self.env().epoch_height) == number + 1 {
+                self.env().last_hash.clone()
+            } else {
+                H256::default()
+            };
+        }
+
         // In Conflux, we only maintain the block hash of the previous block.
         // For other block numbers, it always returns zero.
         if U256::from(self.env().number) == number + 1 {

core/src/spec/spec.rs

@@ -84,6 +84,8 @@ pub struct TransitionsBlockNumber {
     pub cip94: BlockNumber,
     /// CIP-97: Remove Staking List
     pub cip97: BlockNumber,
+    /// CIP-98: Fix BLOCKHASH in espace
+    pub cip98: BlockNumber,
 }
 
 #[derive(Default, Debug, Clone)]

core/src/state/mod.rs

@@ -360,7 +360,6 @@ impl<StateDbStorage: StorageStateTrait> StateOpsTrait
     /// Maintain `total_issued_tokens`. This is only used in the extremely
     /// unlikely case that there are a lot of partial invalid blocks.
     fn subtract_total_issued(&mut self, v: U256) {
-        assert!(self.world_statistics_checkpoints.get_mut().is_empty());
         self.world_statistics.total_issued_tokens -= v;
     }
 

core/src/sync/synchronization_state.rs

@@ -238,7 +238,11 @@ impl SynchronizationState {
             }
         };
 
-        if peer_best_epoches.len() < self.min_phase_change_normal_peer_count {
+        // `peer_best_epoches.is_empty()` is only possible if
+        // `self.min_phase_change_normal_peer_count == 0`
+        if peer_best_epoches.len() < self.min_phase_change_normal_peer_count
+            || peer_best_epoches.is_empty()
+        {
             return if fresh_start {
                 debug!("median_epoch_from_normal_peers: fresh start");
                 Some(0)

core/src/vm/spec.rs

@@ -155,6 +155,8 @@ pub struct Spec {
     pub cip94_activation_block_number: u64,
     /// CIP-97: Remove staking list
     pub cip97: bool,
+    /// CIP-98: Fix espace bug
+    pub cip98: bool,
     pub params_dao_vote_period: u64,
 }
 
@@ -295,6 +297,7 @@ impl Spec {
             cip94_activation_block_number: u64::MAX,
             params_dao_vote_period: DAO_PARAMETER_VOTE_PERIOD,
             cip97: false,
+            cip98: false,
         }
     }
 
@@ -314,6 +317,7 @@ impl Spec {
         spec.cip94 = number >= params.transition_numbers.cip94;
         spec.cip94_activation_block_number = params.transition_numbers.cip94;
         spec.cip97 = number >= params.transition_numbers.cip97;
+        spec.cip98 = number >= params.transition_numbers.cip98;
         spec.params_dao_vote_period = params.params_dao_vote_period;
         spec
     }