Merge branch 'master' into v2.0-testnet

.gitignore

@@ -9,6 +9,7 @@ target
 .gitmodules
 .phabricator*
 build/
+build_clippy/
 **/blockchain_db/
 **/sqlite_db/
 **/net_config/

Cargo.toml

@@ -100,8 +100,6 @@ u64-mpt-db-key = ["client/u64_mpt_db_key"]
 
 [patch.crates-io]
 sqlite3-sys = { git = "https://github.com/Conflux-Chain/sqlite3-sys.git", rev = "1de8e5998f7c2d919336660b8ef4e8f52ac43844" }
-funty = { git = "https://github.com/ferrilab/funty.git", rev = "7ef0d890fbcd8b3def1635ac1a877fc298488446" }
-#fff = { git = "https://github.com/Conflux-Chain/ff.git", rev = "c0e8a5911a285526cc79fe14d500e1553d3c9174" }
 
 [profile.test]
 debug-assertions = true

accounts/cfxstore/src/json/hash.rs

@@ -136,7 +136,7 @@ impl_hash!(H256, 32);
 // FIXME: find a better hash type.
 impl PartialOrd for H160 {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.0.partial_cmp(&other.0)
+        Some(self.cmp(other))
     }
 }
 

accounts/cfxstore/src/secret_store.rs

@@ -45,11 +45,7 @@ pub struct StoreAccountRef {
 
 impl PartialOrd for StoreAccountRef {
     fn partial_cmp(&self, other: &StoreAccountRef) -> Option<Ordering> {
-        Some(
-            self.address
-                .cmp(&other.address)
-                .then_with(|| self.vault.cmp(&other.vault)),
-        )
+        Some(self.cmp(other))
     }
 }
 
@@ -59,7 +55,11 @@ impl PartialEq for StoreAccountRef {
 impl Eq for StoreAccountRef {}
 
 impl Ord for StoreAccountRef {
-    fn cmp(&self, other: &Self) -> Ordering { self.address.cmp(&other.address) }
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.address
+            .cmp(&other.address)
+            .then_with(|| self.vault.cmp(&other.vault))
+    }
 }
 
 impl Hash for StoreAccountRef {

cfx_types/src/lib.rs

@@ -118,6 +118,49 @@ impl AddressWithSpace {
     pub fn assert_native(&self) { assert_eq!(self.space, Space::Native) }
 }
 
+#[derive(Default, Clone)]
+pub struct SpaceMap<T> {
+    pub native: T,
+    pub evm: T,
+}
+
+impl<T> SpaceMap<T> {
+    #[inline]
+    pub fn in_space(&self, space: Space) -> &T {
+        match space {
+            Space::Native => &self.native,
+            Space::Ethereum => &self.evm,
+        }
+    }
+
+    #[inline]
+    pub fn in_space_mut(&mut self, space: Space) -> &mut T {
+        match space {
+            Space::Native => &mut self.native,
+            Space::Ethereum => &mut self.evm,
+        }
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = &T> {
+        vec![&self.native, &self.evm].into_iter()
+    }
+
+    pub fn map_sum<F: Fn(&T) -> usize>(&self, f: F) -> usize {
+        f(&self.native) + f(&self.evm)
+    }
+
+    pub const fn size(&self) -> usize { 2 }
+
+    pub fn apply_all<U, F: FnMut(&mut T) -> U>(
+        &mut self, mut f: F,
+    ) -> SpaceMap<U> {
+        SpaceMap {
+            native: f(&mut self.native),
+            evm: f(&mut self.evm),
+        }
+    }
+}
+
 pub mod space_util {
     use super::{Address, AddressWithSpace, Space};
 

changelogs/JSONRPC.md

@@ -1,5 +1,9 @@
 # JSON-RPC CHANGELOG
 
+## v2.3.1
+
+- Return `storagePointProp` in cfx_getParamsFromVote, which is introduced by [CIP-107](https://github.com/Conflux-Chain/CIPs/blob/master/CIPs/cip-107.md#the-voting-of-proportion).
+
 ## v2.3.0
 
 - Add `cfx_getCollateralInfo` to return chain collateral info.

client/Cargo.toml

@@ -97,7 +97,7 @@ rpassword = "5.0.1"
 static_assertions = "1.1.0"
 parity-version = {path = "../util/version"}
 solidity-abi = {path="../util/solidity-abi"}
-bls-signatures = {git = "https://github.com/Conflux-Chain/bls-signatures.git", rev = "e7d9119eb285607d5134d40efd89555c41d73160", default-features = false, features = ["multicore"]} 
+bls-signatures = {git = "https://github.com/Conflux-Chain/bls-signatures.git", rev = "fb52187df92d27c365642cb7e7b2aaf60437cf9c", default-features = false, features = ["multicore"]}
 
 [dev-dependencies]
 criterion = "0.3"

core/Cargo.toml

@@ -93,9 +93,7 @@ unexpected = { git = "https://github.com/Conflux-Chain/conflux-parity-deps.git",
 strum = "0.20"
 strum_macros = "0.20"
 smart-default = "0.6.0"
-#bls-signatures = {path = "/Users/lipeilun/conflux/bls-signatures"}
-#bls-signatures = {path = "/Users/lipeilun/conflux/bls-signatures",default-features = false, features = ["blst", "multicore"]}
-bls-signatures = {git = "https://github.com/Conflux-Chain/bls-signatures.git", rev = "e7d9119eb285607d5134d40efd89555c41d73160", default-features = false, features = ["multicore"]}
+bls-signatures = {git = "https://github.com/Conflux-Chain/bls-signatures.git", rev = "fb52187df92d27c365642cb7e7b2aaf60437cf9c", default-features = false, features = ["multicore"]}
 tiny-keccak = {version = "2.0",  features = ["keccak"]}
 bcs = "0.1.2"
 async-trait = "0.1"