Merge branch 'master' into v2.0-stable-merge

Cargo.toml

@@ -159,8 +159,6 @@ cfx-rpc-utils = { path = "./crates/rpc/rpc-utils" }
 serde = { version = "1.0", features = ["derive", "alloc"] }
 serde_json = "1.0"
 serde_derive = "1.0"
-rlp = "0.4.0"
-rlp_derive = { git = "https://github.com/Conflux-Chain/conflux-parity-deps.git", rev = "1597a9cab02343eb2322ca0ac58d39b64e3f42d1"  }
 hex = "0.4.3"
 rustc-hex = "2.1"
 
@@ -174,6 +172,7 @@ strum_macros = "0.20"
 # parallelism
 parking_lot = "0.11"
 rayon = "1.10"
+threadpool = "1.7"
 
 # alloy & revm
 alloy-sol-types = "0.7.2"
@@ -197,11 +196,12 @@ jsonrpsee = "0.24.4"
 # async
 async-trait = "0.1"
 
-# crypto
+# crypto & hash
 fixed-hash = "0.5"
 keccak-hash = "0.5"
 tiny-keccak = "2.0.2"
 bls-signatures = { git = "https://github.com/Conflux-Chain/bls-signatures.git", rev = "fb52187df92d27c365642cb7e7b2aaf60437cf9c", default-features = false, features = ["multicore", "blst"] }
+secp256k1 = "0.30.0"
 
 # misc
 clap = "2"
@@ -212,3 +212,25 @@ itertools = "0.10.0"
 once_cell = "1.17.1"
 chrono = "=0.4.38"
 byteorder = "1.2.7"
+edit-distance = "2"
+zeroize = "1"
+docopt = "1.0"
+env_logger = "0.5"
+
+# conflux forked crates
+rocksdb = { git = "https://github.com/Conflux-Chain/rust-rocksdb.git", rev = "3773afe5b953997188f37c39308105b5deb0faac" }
+
+# parity crates
+rlp = "0.4.0"
+rlp_derive = { git = "https://github.com/Conflux-Chain/conflux-parity-deps.git", rev = "1597a9cab02343eb2322ca0ac58d39b64e3f42d1"  }
+panic_hook = { git = "https://github.com/Conflux-Chain/conflux-parity-deps.git", rev = "1597a9cab02343eb2322ca0ac58d39b64e3f42d1"  }
+dir = { git = "https://github.com/Conflux-Chain/conflux-parity-deps.git", rev = "1597a9cab02343eb2322ca0ac58d39b64e3f42d1"  }
+unexpected = { git = "https://github.com/Conflux-Chain/conflux-parity-deps.git", rev = "1597a9cab02343eb2322ca0ac58d39b64e3f42d1"  }
+ethereum-types = "0.9"
+parity-wordlist = "1.3.0"
+parity-crypto = "0.9.0"
+parity-path = "0.1"
+parity-util-mem = { version = "0.5", default-features = false }
+parity-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1.git" }
+ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git", rev="b523017108bb2d571a7a69bd97bc406e63bc7a9d" }
+substrate-bn = { git = "https://github.com/paritytech/bn", rev="63f8c587356a67b33c7396af98e065b66fca5dda", default-features = false }

bins/cfx_key/Cargo.toml

@@ -1,19 +1,20 @@
 [package]
-description = "Parity Ethereum Keys Generator CLI"
+description = "Conflux Core Space Keys Generator CLI"
 name = "ctxkey-cli"
 version = "0.1.0"
 authors = ["Parity Technologies <[email protected]>"]
+edition = "2021"
 
 [dependencies]
-docopt = "1.0"
-env_logger = "0.5"
+docopt = { workspace = true }
+env_logger = { workspace = true }
 cfxkey = { workspace = true }
-panic_hook = { git = "https://github.com/Conflux-Chain/conflux-parity-deps.git", rev = "1597a9cab02343eb2322ca0ac58d39b64e3f42d1"  }
-parity-wordlist="1.2"
-rustc-hex = "2.1"
-serde = "1.0"
-serde_derive = "1.0"
-threadpool = "1.7"
+panic_hook = { workspace = true }
+parity-wordlist= { workspace = true }
+rustc-hex = { workspace = true }
+serde = { workspace = true }
+serde_derive = { workspace = true }
+threadpool = { workspace = true }
 
 [[bin]]
 name = "cfxkey"

bins/cfx_key/src/main.rs

@@ -18,18 +18,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-extern crate cfxkey;
-extern crate docopt;
-extern crate env_logger;
-extern crate panic_hook;
-extern crate parity_wordlist;
-extern crate rustc_hex;
-extern crate serde;
-extern crate threadpool;
-
-#[macro_use]
-extern crate serde_derive;
-
 use std::{env, fmt, io, num::ParseIntError, process, sync};
 
 use cfxkey::{
@@ -38,6 +26,7 @@ use cfxkey::{
 };
 use docopt::Docopt;
 use rustc_hex::{FromHex, FromHexError};
+use serde::Deserialize;
 
 const USAGE: &str = r#"
 Conflux keys generator.

bins/cfx_store/Cargo.toml

@@ -13,8 +13,8 @@ serde = "1.0"
 serde_derive = "1.0"
 parking_lot = { workspace = true }
 cfxstore = { workspace = true }
-panic_hook = { git = "https://github.com/Conflux-Chain/conflux-parity-deps.git", rev = "1597a9cab02343eb2322ca0ac58d39b64e3f42d1"  }
-dir = { git = "https://github.com/Conflux-Chain/conflux-parity-deps.git", rev = "1597a9cab02343eb2322ca0ac58d39b64e3f42d1"  }
+panic_hook = { workspace = true }
+dir = { workspace = true }
 
 [[bin]]
 name = "cfxstore"

bins/conflux/Cargo.toml

@@ -15,15 +15,15 @@ serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
 parking_lot = { workspace = true }
-panic_hook = { git = "https://github.com/Conflux-Chain/conflux-parity-deps.git", rev = "1597a9cab02343eb2322ca0ac58d39b64e3f42d1"  }
+panic_hook = { workspace = true }
 app_dirs = "1.2.1"
-dir = { git = "https://github.com/Conflux-Chain/conflux-parity-deps.git", rev = "1597a9cab02343eb2322ca0ac58d39b64e3f42d1"  }
+dir = { workspace = true }
 cfxstore = { workspace = true }
 cfxcore-accounts = { workspace = true }
 home = "0.5.0"
 rpassword = "4.0.1"
 io = { workspace = true }
-ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git", rev="b523017108bb2d571a7a69bd97bc406e63bc7a9d" }
+ctrlc = { workspace = true }
 jsonrpc-core = "18.0.0"
 jsonrpc-tcp-server = "18.0.0"
 jsonrpc-http-server = "18.0.0"
@@ -47,7 +47,7 @@ client = { workspace = true }
 cfx-types = { workspace = true }
 docopt = "1.0"
 cfxkey = { workspace = true }
-parity-wordlist = "1.3.0"
+parity-wordlist = { workspace = true }
 rustc-hex = "2.1"
 env_logger = "0.5"
 malloc_size_of = { workspace = true }

changelogs/JSONRPC.md

@@ -1,5 +1,10 @@
 # JSON-RPC CHANGELOG
 
+## vNext
+
+1. The gasUsed field of Core Space block will return `null` if the block is not executed.
+2. Core Space pubsub block header notification add two new fields: `baseFeePerGas` and `custom`.
+
 ## v2.4.1
 
 1. eSpace add new RPC method `eth_getBlockReceipts`

crates/cfx_addr/Cargo.toml

@@ -1,10 +1,17 @@
 [package]
 name = "cfx-addr"
-version = "0.1.0"
+version = "0.2.0"
 license = "GPL-3.0"
-description = "Conflux Address Encoder/Decoder"
+description = "Conflux Base32 Address Encoder/Decoder"
+edition = "2021"
 
 [dependencies]
 cfx-types = { workspace = true }
-lazy_static = "1.4"
-rustc-hex = "2.1"
+lazy_static = { workspace = true }
+
+[dev-dependencies]
+rustc-hex = { workspace = true }
+
+[features]
+default = ["std"]
+std = []