Skip to content

Commit

Permalink
Merge pull request #3042 from Pana/op/bumpVersions
Browse files Browse the repository at this point in the history
remove unused dependencies
  • Loading branch information
Pana authored Jan 13, 2025
2 parents fd3d918 + 7828345 commit ded317e
Show file tree
Hide file tree
Showing 51 changed files with 223 additions and 743 deletions.
652 changes: 177 additions & 475 deletions Cargo.lock

Large diffs are not rendered by default.

98 changes: 43 additions & 55 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,11 @@ version = "2.4.0"
authors = ["peilun-conflux", "ChenxingLi"]
description = "A rust implementation of the Conflux-Protocol"
documentation = "https://doc.confluxnetwork.org"
#edition = "2018"
homepage = "https://confluxnetwork.org/"
keywords = ["Conflux"]
repository = "https://github.com/conflux-chain/conflux-rust"
license-file = "LICENSE"

[patch.crates-io]
sqlite3-sys = { git = "https://github.com/Conflux-Chain/sqlite3-sys.git", rev = "1de8e5998f7c2d919336660b8ef4e8f52ac43844" }

[profile.test]
debug-assertions = true

Expand Down Expand Up @@ -154,7 +150,7 @@ sha3-macro = { path = "./crates/util/sha3-macro" }
dag = { path = "./crates/util/dag" }
cfx-vm-tracer-derive = { path = "./crates/util/cfx-vm-tracer-derive" }
parity-version = { path = "./crates/util/version" }
log-device = { path = "./crates/util/log_device" }
#log-device = { path = "./crates/util/log_device" }
solidity-abi-derive = { path = "./crates/util/solidity-abi-derive" }
io = { path = "./crates/util/io" }
metrics = { path = "./crates/util/metrics" }
Expand Down Expand Up @@ -197,7 +193,7 @@ cfx-rpc-builder = { path = "./crates/rpc/rpc-builder" }
cfx-rpc-cfx-impl = { path = "./crates/rpc/rpc-cfx-impl" }
cfx-rpc-middlewares = { path = "./crates/rpc/rpc-middlewares" }
bounded-executor = { path = "./crates/pos/common/bounded-executor" }
diem-channel = { path = "./crates/pos/common/channel", package = "channel" }
#diem-channel = { path = "./crates/pos/common/channel", package = "channel" }
channel = { path = "./crates/pos/common/channel" }
crash-handler = { path = "./crates/pos/common/crash-handler" }
fallible = { path = "./crates/pos/common/fallible" }
Expand All @@ -213,7 +209,7 @@ short-hex-str = { path = "./crates/pos/common/short-hex-str" }
subscription-service = { path = "./crates/pos/common/subscription-service" }
diem-temppath = { path = "./crates/pos/common/temppath" }
diem-time-service = { path = "./crates/pos/common/time-service" }
generate-key = { path = "./crates/pos/config/generate-key" }
#generate-key = { path = "./crates/pos/config/generate-key" }
diem-global-constants = { path = "./crates/pos/config/global-constants" }
diem-config = { path = "./crates/pos/config/config" }
consensus-types = { path = "./crates/pos/consensus/consensus-types" }
Expand All @@ -231,13 +227,20 @@ pos-ledger-db = { path = "./crates/pos/storage/pos-ledger-db" }
schemadb = { path = "./crates/pos/storage/schemadb" }
scratchpad = { path = "./crates/pos/storage/scratchpad" }
diem-state-view = { path = "./crates/pos/storage/state-view" }
storage-client = { path = "./crates/pos/storage/storage-client" }
#storage-client = { path = "./crates/pos/storage/storage-client" }
storage-interface = { path = "./crates/pos/storage/storage-interface" }
executor-types = { path = "./crates/pos/types/executor-types" }
move-core-types = { path = "./crates/pos/types/move-core-types" }
pow-types = { path = "./crates/pos/types/pow-types" }
diem-types = { path = "./crates/pos/types/types" }
diem-network-address-encryption = { path = "./crates/pos/config/management/network-address-encryption" }

# basics
bytes = "1.9"
byte-unit = "1.1.0"
libc = "0.2"
smallvec = "1.4"

# proc-macros
proc-macro2 = "1.0"
quote = "1.0"
Expand All @@ -254,8 +257,9 @@ hex = "0.4.3"
rustc-hex = "2.1"
hex-literal = "0.4.1"

fail = "0.4.0"
thiserror = "1.0.63"
# error handling
fail = "0.5.1"
thiserror = "2.0.11"
anyhow = "1.0"

# parallelism
Expand All @@ -264,6 +268,7 @@ rayon = "1.10"
threadpool = "1.7"
crossbeam-deque = "0.7"
crossbeam-channel = "0.4"
atom = "0.3"

# alloy & revm
alloy-sol-types = "0.7.2"
Expand All @@ -286,99 +291,75 @@ jsonrpsee = "0.24.4"
jsonrpsee-core = "0.24"
jsonrpsee-types = "0.24"

http = "1.0"

# async
tokio = "1.40"
tokio-stream = "0.1.11"
tokio-util = "0.7.4"
tokio-test = "0.4.1"
tokio-io = "0.1"
futures = "0.3.30"
futures-core = "0.3"
futures-util = "0.3"
hyper = "1.3"
hyper-util = "0.1.5"
async-stream = "0.3"
async-trait = "0.1"
async-oneshot = "0.5.0"
tower = "0.4"
tower-http = "0.5"
reqwest = { version = "0.12", default-features = false }
pin-project = "1.0.12"
mio = "0.6.8"
tracing-futures = "0.2"
# old version tokio 0.2
tokio02 = { version = "0.2", package = "tokio", features = ["full"] }
tokio01 = { version = "0.1", package = "tokio" }
timer = "0.2" # outdated

# crypto & hash
fixed-hash = "0.5"
#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"
#secp256k1 = "0.30.0"
#rustls = "0.21"
hashbrown = "0.7.1"

# misc
clap = "2"
# rand & rng
rand = "0.7"
rand_xorshift = "0.2"
rand_08 = { package = "rand", version = "0.8" }
rand_chacha = "0.2.1"

# misc
clap = "2"
log = "0.4"
log4rs = "1.2.0"
env_logger = "0.11"
lazy_static = "1.4"
itertools = "0.10.0"
once_cell = "1.17.1"
chrono = "=0.4.38"
byteorder = "1.2.7"
strum = "0.26"
strum_macros = "0.26"
bytes = "1.9"
toml = "0.5.8"
textwrap = "0.9"
app_dirs = "1.2.1"
slab = "0.4"
tempdir = "0.3"
rpassword = "5.0.1"
static_assertions = "1.1.0"
transient-hashmap = "0.4"
num_cpus = "1.6"
home = "0.5.0"
tempdir = "0.3"
bcs = "0.1.3"
base64ct = "=1.1.1"
order-stat = "0.1"
time = "0.1.34"
smallvec = "1.4"
matches = "0.1"
siphasher = "0.3"
natpmp = "0.2"
byte-unit = "1.1.0"
enum-map = "0.4.0"
enum-map-derive = "0.4.0"
#enum-map-derive = "0.4.0"
igd = "0.10"
ipnetwork = "0.12.6"
derivative = "2.0.2"

bigdecimal = "0.1.0"
num-bigint = "0.2.6"
edit-distance = "2"
zeroize = "1"
docopt = "1.0"
vergen = "7.0.0"
target_info = "0.1"
libc = "0.2"
rustls = "0.21"
bit-set = "0.4"
typenum = "1.17.0"
typemap = { package = "typemap-ors", version = "1.0"}
num = "0.2"
num-traits = { version = "0.2.8", default-features = false }
impl-trait-for-tuples = "^0.2"
impl-tools = "^0.10"
derive_more = "0.99"
Expand All @@ -390,26 +371,30 @@ mirai-annotations = { version = "1.10.1", default-features = false }
rangetools = "0.1.4"
# prometheus = { version = "0.7.0", default-features = false }
primal = "0.2.3"
memmap = "0.6"
memoffset = "0.5.1"
lru_time_cache = "0.9.0"
hashbrown = "0.7.1"
either = "1.5.3"
fallible-iterator = "0.2"
fs_extra = "1.1.0"
fs-swap = "0.2.4"
regex = "1.3.1"
cfg-if = "0.1"
unroll = "0.1.5"
atom = "0.3"
fnv = "1.0"
winapi = "0.3.7"
synstructure = "0.12"
lru-cache = "0.1"
duration-str = "0.5.1"
lru_time_cache = "0.9.0"

# conflux forked crates
rocksdb = { git = "https://github.com/Conflux-Chain/rust-rocksdb.git", rev = "3773afe5b953997188f37c39308105b5deb0faac" }
# num misc
bigdecimal = "0.1.0"
num-bigint = "0.2.6"
num = "0.2"
num-traits = { version = "0.2.8", default-features = false }

# time misc
timer = "0.2"
time = "0.1.34"
chrono = "=0.4.38"
duration-str = "0.5.1"

# parity crates
rlp = "0.4.0"
Expand All @@ -429,8 +414,6 @@ ethcore-bytes = "0.1.1"

# misc-testing
similar-asserts = "1.5"
assert_matches = "1.5"
serial_test = "3.0"
criterion = "0.3.0"
proptest = "1.0.0"
proptest-derive = "0.3.0"
Expand All @@ -439,4 +422,9 @@ proptest-derive = "0.3.0"
sqlite = "0.25"
sqlite3-sys = "0.12"
kvdb = "0.4"
influx_db_client = "0.5.1"
influx_db_client = "0.5.1"
# conflux forked crates
rocksdb = { git = "https://github.com/Conflux-Chain/rust-rocksdb.git", rev = "3773afe5b953997188f37c39308105b5deb0faac" }

[patch.crates-io]
sqlite3-sys = { git = "https://github.com/Conflux-Chain/sqlite3-sys.git", rev = "1de8e5998f7c2d919336660b8ef4e8f52ac43844" }
2 changes: 0 additions & 2 deletions bins/cfx_key/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ docopt = { workspace = true }
env_logger = { workspace = true }
cfxkey = { workspace = true }
panic_hook = { workspace = true }
parity-wordlist= { workspace = true }
rustc-hex = { workspace = true }
serde = { workspace = true }
serde_derive = { workspace = true }
threadpool = { workspace = true }

[[bin]]
Expand Down
2 changes: 0 additions & 2 deletions bins/cfx_store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ edition = "2021"
docopt = { workspace = true }
env_logger = { workspace = true }
num_cpus = { workspace = true }
rustc-hex = { workspace = true }
serde = { workspace = true }
serde_derive = { workspace = true }
parking_lot = { workspace = true }
cfxstore = { workspace = true }
panic_hook = { workspace = true }
Expand Down
24 changes: 1 addition & 23 deletions bins/conflux/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,45 +9,26 @@ documentation.workspace = true

[dependencies]
clap = { workspace = true, features = ["yaml"] }
textwrap = { workspace = true }
toml = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
serde_derive = { workspace = true }
parking_lot = { workspace = true }
panic_hook = { workspace = true }
app_dirs = { workspace = true }
dir = { workspace = true }
cfxstore = { workspace = true }
cfxcore-accounts = { workspace = true }
home = { workspace = true }
rpassword = { workspace = true }
io = { workspace = true }
ctrlc = { workspace = true }
#io = { workspace = true }
jsonrpc-core = { workspace = true }
jsonrpc-tcp-server = { workspace = true }
jsonrpc-http-server = { workspace = true }
jsonrpc-core-client = { workspace = true, features = ["http"] }
log = { workspace = true }
slab = { workspace = true }
cfxcore = { workspace = true }
network = { workspace = true }
db = { workspace = true }
blockgen = { workspace = true }
txgen = { workspace = true }
secret-store = { workspace = true }
primitives = { workspace = true }
log4rs = { workspace = true, features = ["background_rotation", "gzip"] }
rlp = { workspace = true }
keccak-hash = { workspace = true }
rand_08 = { workspace = true }
kvdb-rocksdb = { workspace = true }
client = { workspace = true }
cfx-types = { workspace = true }
threadpool = { workspace = true }
docopt = { workspace = true }
cfxkey = { workspace = true }
parity-wordlist = { workspace = true }
rustc-hex = { workspace = true }
env_logger = { workspace = true }
malloc_size_of = { workspace = true }
Expand All @@ -56,11 +37,8 @@ diem-types = { workspace = true }
pos-ledger-db = { workspace = true }
executor = { workspace = true } # used by pos-genesis-tool
storage-interface = { workspace = true }
move-core-types = { workspace = true }
bcs = { workspace = true }
tempdir = { workspace = true }
hex = { workspace = true }
base64ct = { workspace = true }
parity-version = { workspace = true }
tokio = { workspace = true, features = ["rt"] }
bls-signatures = { workspace = true }
Expand Down
7 changes: 0 additions & 7 deletions crates/blockgen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,14 @@ version = "0.1.0"
edition = "2021"

[dependencies]
clap = { workspace = true }
cfxcore = { workspace = true }
cfxkey = { workspace = true }
cfx-parameters = { workspace = true }
cfx-stratum = { workspace = true }
cfx-types = { workspace = true }
db = { workspace = true }
lazy_static = { workspace = true }
log = { workspace = true }
metrics = { workspace = true }
network = { workspace = true }
primitives = { workspace = true }
parking_lot = { workspace = true }
rlp = { workspace = true }
rand = { workspace = true }
secret-store = { workspace = true }
toml = { workspace = true }
txgen = { workspace = true }
3 changes: 0 additions & 3 deletions crates/cfx_key/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,9 @@ parity-wordlist = { workspace = true }
rand = { workspace = true }
rustc-hex = { workspace = true }
serde = { workspace = true }
serde_derive = { workspace = true }
tiny-keccak = { workspace = true }
zeroize = { workspace = true }
malloc_size_of_derive = { workspace = true }
malloc_size_of = { workspace = true }
panic_hook = { workspace = true }
threadpool = { workspace = true }
thiserror = { workspace = true }

1 change: 0 additions & 1 deletion crates/cfx_store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ serde = { workspace = true }
serde_json = { workspace = true, features = ["std"] }
serde_derive = { workspace = true }
rustc-hex = { workspace = true }
tiny-keccak = { workspace = true }
time = { workspace = true }
parking_lot = { workspace = true }
parity-crypto = { workspace = true, features = ["publickey"] }
Expand Down
Loading

0 comments on commit ded317e

Please sign in to comment.