Merge remote-tracking branch 'upstream/master' into op/splitCfxcoreTypes

Author: Pana

Cargo.lock

@@ -11,7 +11,6 @@ env_logger = { workspace = true }
 cfxkey = { workspace = true }
 panic_hook = { workspace = true }
 rustc-hex = { workspace = true }
-serde = { workspace = true }
 threadpool = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 

bins/cfx_key/Cargo.toml

@@ -9,12 +9,12 @@ license-file.workspace = true
 [dependencies]
 env_logger = { workspace = true }
 num_cpus = { workspace = true }
-serde = { workspace = true }
 parking_lot = { workspace = true }
 cfxstore = { workspace = true }
 panic_hook = { workspace = true }
 dir = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
+
 [[bin]]
 name = "cfxstore"
 path = "src/main.rs"

bins/cfx_store/Cargo.toml

@@ -9,15 +9,11 @@ documentation.workspace = true
 license-file.workspace = true
 
 [dependencies]
-
 clap = { workspace = true, features = ["derive", "cargo"] }
-serde = { workspace = true }
 serde_json = { workspace = true }
 parking_lot = { workspace = true }
 cfxstore = { workspace = true }
 rpassword = { workspace = true }
-#io = { workspace = true }
-jsonrpc-core = { workspace = true }
 jsonrpsee = { workspace = true, features = ["http-client"] }
 log = { workspace = true }
 cfxcore = { workspace = true }
@@ -43,15 +39,7 @@ tempfile = { workspace = true }
 parity-version = { workspace = true }
 tokio = { workspace = true, features = ["rt"] }
 bls-signatures = { workspace = true }
-cfx-vm-types = { workspace = true }
-cfx-statedb = { workspace = true }
 cfx-executor = { workspace = true }
-walkdir = { workspace = true }
-thiserror = { workspace = true }
-cfx-bytes = { workspace = true }
-keccak-hash = { workspace = true }
-cfx-rpc-eth-types = { workspace = true }
-hex = { workspace = true }
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies.jemallocator]
 version = "0.3.2"

bins/conflux/Cargo.toml

@@ -42,7 +42,6 @@ malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 metrics = { workspace = true }
 network = { workspace = true }
-num = { workspace = true }
 num-traits = { workspace = true, default-features = false }
 parking_lot = { workspace = true }
 primal = { workspace = true }
@@ -79,7 +78,6 @@ bcs = { workspace = true }
 async-trait = { workspace = true }
 num-derive = { workspace = true }
 thiserror = { workspace = true }
-fallible = { workspace = true }
 mirai-annotations = { workspace = true, default-features = false }
 bounded-executor = { workspace = true }
 diem-config = { workspace = true }

crates/cfxcore/core/Cargo.toml

@@ -7,16 +7,13 @@ license-file.workspace = true
 [dependencies]
 bigdecimal = { workspace = true }
 num-bigint = { workspace = true }
-clap = { workspace = true }
-toml = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 serde_derive = { workspace = true }
 parking_lot = { workspace = true }
 cfxkey = { workspace = true }
 cfxcore-accounts = { workspace = true }
 cfxstore = { workspace = true }
-cfx-internal-common = { workspace = true }
 cfx-executor = { workspace = true }
 cfx-execute-helper = { workspace = true }
 cfx-statedb = { workspace = true }
@@ -47,7 +44,6 @@ rlp = { workspace = true }
 keccak-hash = { workspace = true }
 rand = { workspace = true }
 rand_08 = { workspace = true }
-kvdb-rocksdb = { workspace = true }
 tempfile = { workspace = true }
 rustc-hex = { workspace = true }
 threadpool = { workspace = true }
@@ -68,9 +64,7 @@ storage-interface = { workspace = true }
 consensus-types = { workspace = true }
 rpassword = { workspace = true }
 parity-version = { workspace = true }
-bls-signatures = { workspace = true }
 alloy-rpc-types-trace = { workspace = true }
-alloy-rpc-types = { workspace = true }
 cfx-rpc-eth-types = { workspace = true }
 cfx-rpc-cfx-types = { workspace = true }
 cfx-rpc-cfx-impl = { workspace = true }

crates/client/Cargo.toml

@@ -7,4 +7,3 @@ license-file.workspace = true
 [dependencies]
 log = { workspace = true }
 kvdb-rocksdb = { workspace = true }
-kvdb = { workspace = true }

crates/dbs/db/Cargo.toml

@@ -13,12 +13,6 @@ license-file.workspace = true
 [dependencies]
 cfx-addr = { workspace = true }
 cfx-types = { workspace = true }
-cfx-rpc-eth-types = { workspace = true }
 cfx-rpc-cfx-types = { workspace = true }
 cfx-parity-trace-types = { workspace = true }
-cfx-execute-helper = { workspace = true }
-# cfx-util-macros = { workspace = true }
-# primitives = { workspace = true }
-
-# log = { workspace = true }
 slice-group-by = { workspace = true }

crates/rpc/rpc-common-impl/Cargo.toml

@@ -18,4 +18,3 @@ jsonrpsee = { workspace = true, features = ["server", "macros"] }
 cfx-types = { workspace = true }
 cfx-rpc-primitives = { workspace = true }
 alloy-rpc-types-trace = { workspace = true }
-cfx-parity-trace-types = { workspace = true }

crates/rpc/rpc-eth-api/Cargo.toml

@@ -20,8 +20,7 @@ cfx-rpc-eth-types = { workspace = true }
 cfx-rpc-primitives = { workspace = true }
 cfx-rpc-cfx-impl = { workspace = true }
 async-trait = { workspace = true }
-keccak-hash = { workspace = true}
-alloy-rpc-types = { workspace = true }
+keccak-hash = { workspace = true }
 alloy-rpc-types-trace = { workspace = true }
 cfxcore = { workspace = true }
 primitives = { workspace = true }