Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: unify dependencies to root cargo.toml #5333

Merged
merged 12 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
278 changes: 132 additions & 146 deletions Cargo.lock

Large diffs are not rendered by default.

104 changes: 103 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ ring = { opt-level = 3 }
rustls = { opt-level = 3 }
secp256k1 = { opt-level = 3 }
sha2 = { opt-level = 3 }
sha3 = { opt-level = 3 }
smallvec = { opt-level = 3 }
snow = { opt-level = 3 }
twox-hash = { opt-level = 3 }
Expand All @@ -129,3 +128,106 @@ inherits = "release"
lto = "fat"
# https://doc.rust-lang.org/rustc/codegen-options/index.html#codegen-units
codegen-units = 1

[workspace.dependencies]
anyhow = { version = "1.0" }
arrayref = { version = "0.3.6" }
assert_cmd = { version = "2.0.14" }
async-trait = { version = "0.1.79" }
async-channel = { version = "1.8.0" }
async-broadcast = { version = "0.5.1" }
base64 = { version = "0.22.1" }
bech32 = { version = "0.9.1", default-features = false }
bigdecimal = { version = "0.4.5" }
bincode = { version = "1.3.3", default-features = false }
bitcoin = { version = "0.30.0" }
bitvec = { version = "1.0", default-features = false }
blake2 = { version = "0.10" }
borsh = { version = "1.2.1", default-features = false }
bs58 = { version = "0.5.1", default-features = false }
codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" }
clap = { version = "4.5.3" }
chrono = { version = "0.4.31", default-features = false }
config = { version = "0.13.1" }
csv = { version = "1.1.6" }
curve25519-dalek = { version = "4.1.3", default-features = false }
digest = { version = "0.10", default-features = false }
dyn-clone = { version = "1.0.4" }
ed25519-dalek = { version = "2.1.1" }
env_logger = { version = "0.11.3" }
ethabi = { version = "18.0", default-features = false }
ethbloom = { version = "0.13" }
ethereum = { version = "0.14", default-features = false }
ethereum-types = { version = "0.14.1", default-features = false }
ethers = { version = "2.0.8" }
frame-metadata = { version = "16.0.0", default-features = false }
fs_extra = { version = "1.2.0" }
futures = { version = "0.3.30" }
futures-core = { version = "0.3.14" }
futures-util = { version = "0.3.14" }
generic-array = { version = "1.1.0", default-features = false }
heck = { version = "0.5.0" }
hex = { version = "0.4.3", default-features = false }
hex-literal = { version = "0.4.1", default-features = false }
hmac-sha512 = { version = "1.1.4" }
http = { version = "1.1.0" }
httparse = { version = "1.4.1" }
insta = { version = "1.38.0" }
itertools = { version = "0.13", default-features = false }
jsonrpsee = { version = "0.23.2" }
lazy_format = { version = "2.0" }
lazy_static = { version = "1.4" }
libp2p-identity = { version = "0.2" }
libsecp256k1 = { version = "0.7", default-features = false }
log = { version = "0.4.16", default-features = false }
mockall = { version = "0.13.0" }
nanorand = { version = "0.7.0", default-features = false }
num-bigint = { version = "0.4" }
num-derive = { version = "0.4.2" }
num-traits = { version = "0.2" }
pin-project = { version = "1.0.12" }
predicates = { version = "3.0" }
proc-macro2 = { version = "1.0.79" }
prometheus = { version = "0.13.0", default-features = false }
public-ip = { version = "0.2.2" }
quickcheck = { version = "1" }
quickcheck_macros = { version = "1" }
quote = { version = "1.0.35" }
rayon = { version = "1.7.0" }
rand = { version = "0.8.5", default-features = false }
redis = { version = "0.27.2" }
regex = { version = "1" }
reqwest = { version = "0.11.4" }
rlp = { version = "0.5", default-features = false }
rocksdb = { version = "0.21.0", default-features = false }
serde_bytes = { version = "0.11.14", default-features = false }
serde_with = { version = "2.3.3", default-features = false }
scale-decode = { version = "0.13" }
scale-info = { version = "2.11.1", default-features = false }
scale-type-resolver = { version = "0.2" }
schnorrkel = { version = "0.11.4" }
scopeguard = { version = "1.2.0" }
serde = { version = "1.0.197", default-features = false }
serde_json = { version = "1.0.128" }
secp256k1 = { version = "0.27" }
sha2 = { version = "0.10.7", default-features = false }
sha2-const = { version = "0.1.2", default-features = false }
ss58-registry = { version = "1.41" }
strum = { version = "0.26.3", default-features = false }
strum_macros = { version = "0.26.4", default-features = false }
subxt = { version = "0.33" }
syn = { version = "2.0.52" }
tempfile = { version = "3.8" }
thiserror = { version = "1.0.50", default-features = false }
tiny-bip39 = { version = "1.0.0" }
tokio = { version = "1.37.0", default-features = false }
tokio-stream = { version = "0.1.5" }
toml = { version = "0.8.10" }
tracing = { version = "0.1.34" }
tracing-subscriber = { version = "0.3.3" }
typenum = { version = "1.15" }
url = { version = "2.4" }
warp = { version = "0.3.6" }
web3 = { version = "0.19", default-features = false }
x25519-dalek = { version = "2.0" }
zeroize = { version = "1.5.4" }
18 changes: 9 additions & 9 deletions api/bin/chainflip-broker-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ chainflip-api = { path = "../../lib" }
cf-utilities = { package = "utilities", path = "../../../utilities" }
custom-rpc = { path = "../../../state-chain/custom-rpc" }

anyhow = "1.0"
clap = { version = "4.5.3", features = ["derive"] }
futures = "0.3.30"
hex = "0.4.3"
jsonrpsee = { version = "0.23.2", features = ["full"] }
serde = { version = '1.0.197', features = ['derive'] }
anyhow = { workspace = true }
clap = { workspace = true, features = ["derive"] }
futures = { workspace = true }
hex = { workspace = true }
jsonrpsee = { workspace = true, features = ["full"] }
serde = { workspace = true, features = ["derive"] }
sp-core = { git = "https://github.com/chainflip-io/polkadot-sdk.git", tag = "chainflip-substrate-1.15.2+2" }
sp-rpc = { git = "https://github.com/chainflip-io/polkadot-sdk.git", tag = "chainflip-substrate-1.15.2+2" }
tokio = "1.20.1"
tracing = "0.1.34"
tracing-subscriber = { version = "0.3.3", features = ["env-filter"] }
tokio = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/chainflip-io/polkadot-sdk.git", tag = 'chainflip-substrate-1.15.2+2' }
18 changes: 9 additions & 9 deletions api/bin/chainflip-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ version = "1.7.0"
workspace = true

[dependencies]
anyhow = "1.0"
bigdecimal = "0.4.5"
clap = { version = "4.5.3", features = ["derive", "env"] }
config = "0.13.1"
futures = "0.3.30"
hex = { version = "0.4.3", features = ["serde"] }
serde = { version = "1.0.197", features = ["derive", "rc"] }
tokio = { version = "1.13.1", features = ["full"] }
serde_json = "1.0"
anyhow = { workspace = true }
bigdecimal = { workspace = true }
clap = { workspace = true, features = ["derive", "env"] }
config = { workspace = true }
futures = { workspace = true }
hex = { workspace = true, features = ["serde"] }
serde = { workspace = true, features = ["derive", "rc"] }
tokio = { workspace = true, features = ["full"] }
serde_json = { workspace = true }

# Local Deps
chainflip-engine = { path = "../../../engine/" }
Expand Down
39 changes: 18 additions & 21 deletions api/bin/chainflip-ingress-egress-tracker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,23 @@ edition = "2021"
workspace = true

[dependencies]
anyhow = "1.0"
async-trait = "0.1.73"
bitcoin = { version = "0.30.0", features = ["serde"] }
futures = "0.3.30"
hex = "0.4.3"
serde = "1.0.197"
serde_json = "1.0"
tokio = "1.29.1"
tracing = "0.1.34"
tracing-subscriber = { version = "0.3.3", features = ["env-filter"] }
tempfile = "3.8"
clap = { version = "4.5.3", features = ["derive", "env"] }
config = "0.13.1"
redis = { version = "0.27.2", features = ["tokio-comp"] }
anyhow = { workspace = true }
async-trait = { workspace = true }
bitcoin = { workspace = true, features = ["serde"] }
futures = { workspace = true }
hex = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
tempfile = { workspace = true }
clap = { workspace = true, features = ["derive", "env"] }
config = { workspace = true }
redis = { workspace = true, features = ["tokio-comp"] }

sp-core = { git = "https://github.com/chainflip-io/polkadot-sdk.git", tag = "chainflip-substrate-1.15.2+2" }
codec = { package = "parity-scale-codec", version = "3.6.12", features = [
"derive",
"full",
] }
codec = { workspace = true, features = ["derive", "full"] }

# Local dependencies
chainflip-engine = { path = "../../../engine/" }
Expand All @@ -45,6 +42,6 @@ substrate-build-script-utils = { git = "https://github.com/chainflip-io/polkadot

[dev-dependencies]
frame-support = { git = "https://github.com/chainflip-io/polkadot-sdk.git", tag = "chainflip-substrate-1.15.2+2" }
insta = { version = "1.36.1", features = ["json"] }
jsonrpsee = { version = "0.23.2", features = ["full"] }
mockall = "0.11.0"
insta = { workspace = true, features = ["json"] }
jsonrpsee = { workspace = true, features = ["full"] }
mockall = { workspace = true }
20 changes: 10 additions & 10 deletions api/bin/chainflip-lp-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ name = "chainflip-lp-api"
workspace = true

[dependencies]
anyhow = "1.0"
clap = { version = "4.5.3", features = ["derive", "env"] }
futures = "0.3.30"
hex = "0.4.3"
jsonrpsee = { version = "0.23.2", features = ["full"] }
serde = { version = "1.0.197", features = ['derive'] }
serde_json = "1.0"
anyhow = { workspace = true }
clap = { workspace = true, features = ["derive", "env"] }
futures = { workspace = true }
hex = { workspace = true }
jsonrpsee = { workspace = true, features = ["full"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
sp-rpc = { git = "https://github.com/chainflip-io/polkadot-sdk.git", tag = "chainflip-substrate-1.15.2+2" }
sp-core = { git = "https://github.com/chainflip-io/polkadot-sdk.git", tag = "chainflip-substrate-1.15.2+2" }
tokio = "1.20.1"
tracing = "0.1"
tracing-subscriber = { version = "0.3.3", features = ["env-filter"] }
tokio = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
pallet-cf-pools = { path = '../../../state-chain/pallets/cf-pools' }
cf-primitives = { path = "../../../state-chain/primitives" }
custom-rpc = { path = "../../../state-chain/custom-rpc" }
Expand Down
36 changes: 18 additions & 18 deletions api/lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@ edition = "2021"
workspace = true

[dependencies]
anyhow = "1.0"
async-trait = "0.1.49"
bs58 = "0.5.1"
ed25519-dalek = "2.1.1"
futures = "0.3.30"
hex = "0.4.3"
hmac-sha512 = "1.1.4"
libsecp256k1 = { version = '0.7' }
rand = "0.8.5"
serde = { version = "1.0.197", features = ["derive"] }
tiny-bip39 = "1.0.0"
tokio = "1.28"
tracing = "0.1"
zeroize = "1.5.4"
libp2p-identity = { version = "0.2", features = ["ed25519", "peerid"] }
lazy_static = "1.4"
jsonrpsee = { version = "0.23.2", features = ["full"] }
anyhow = { workspace = true }
async-trait = { workspace = true }
bs58 = { workspace = true }
ed25519-dalek = { workspace = true }
futures = { workspace = true }
hex = { workspace = true }
hmac-sha512 = { workspace = true }
libsecp256k1 = { workspace = true }
rand = { workspace = true }
serde = { workspace = true, features = ["derive"] }
tiny-bip39 = { workspace = true }
tokio = { workspace = true }
tracing = { workspace = true }
zeroize = { workspace = true }
libp2p-identity = { workspace = true, features = ["ed25519", "peerid"] }
lazy_static = { workspace = true }
jsonrpsee = { workspace = true, features = ["full"] }

# Local
chainflip-engine = { path = "../../engine/" }
Expand Down Expand Up @@ -54,4 +54,4 @@ frame-support = { git = "https://github.com/chainflip-io/polkadot-sdk.git", tag
sp-consensus-aura = { git = 'https://github.com/chainflip-io/polkadot-sdk.git', tag = 'chainflip-substrate-1.15.2+2' }
sp-core = { git = 'https://github.com/chainflip-io/polkadot-sdk.git', tag = 'chainflip-substrate-1.15.2+2' }
sp-consensus-grandpa = { git = 'https://github.com/chainflip-io/polkadot-sdk.git', tag = 'chainflip-substrate-1.15.2+2' }
codec = { package = "parity-scale-codec", version = "3.6.12" }
codec = { workspace = true }
6 changes: 3 additions & 3 deletions engine-proc-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ version = "1.7.0"
proc-macro = true

[dependencies]
syn = "2.0.52"
quote = "1.0.35"
proc-macro2 = "1.0.79"
syn = { workspace = true }
quote = { workspace = true }
proc-macro2 = { workspace = true }
engine-upgrade-utils = { path = "../engine-upgrade-utils" }

[build-dependencies]
Expand Down
10 changes: 5 additions & 5 deletions engine-runner-bin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ maintainer-scripts = "package/berghain"
cf-engine-dylib = { path = "../engine-dylib" }
engine-upgrade-utils = { path = "../engine-upgrade-utils" }
engine-proc-macros = { path = "../engine-proc-macros" }
anyhow = "1.0"
anyhow = { workspace = true }

[dev-dependencies]
assert_cmd = "2.0.14"
predicates = "3.0.3"
tempfile = "3.7.0"
assert_cmd = { workspace = true }
predicates = { workspace = true }
tempfile = { workspace = true }

[build-dependencies]
engine-upgrade-utils = { path = "../engine-upgrade-utils" }
reqwest = { version = "0.11.4", features = ["blocking"] }
reqwest = { workspace = true, features = ["blocking"] }
4 changes: 2 additions & 2 deletions engine-upgrade-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "engine-upgrade-utils"
version = "1.0.0"

[dependencies]
anyhow = "1.0"
toml = "0.8.10"
anyhow = { workspace = true }
toml = { workspace = true }
Loading
Loading