Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/cargo/colored-3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ameba23 authored Jan 10, 2025
2 parents 5176ffc + 35e0d6a commit c84f3be
Show file tree
Hide file tree
Showing 11 changed files with 95 additions and 106 deletions.
49 changes: 25 additions & 24 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 5 additions & 7 deletions crates/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ serde ={ version="1.0", default-features=false, features=["derive"] }
entropy-shared={ version="0.3.0", path="../shared", default-features=false }
subxt ={ version="0.35.3", default-features=false, features=["jsonrpsee"] }
num ="0.4.3"
thiserror ="2.0.9"
thiserror ="2.0.10"
futures ="0.3"
sp-core ={ version="31.0.0", default-features=false, features=["full_crypto", "serde"] }
tracing ="0.1.41"
Expand All @@ -35,15 +35,13 @@ parity-scale-codec={ version="3.6.3", default-features=false, optional=true }

# Only for the browser
js-sys={ version="0.3.74", optional=true }
tokio ={ version="1.42", features=["time"] }
tokio ={ version="1.43", features=["time"] }

[dev-dependencies]
serial_test="3.2.0"
sp-keyring="34.0.0"
serial_test ="3.2.0"
sp-keyring ="34.0.0"
entropy-testing-utils={ path="../testing-utils" }
tdx-quote={ git="https://github.com/entropyxyz/tdx-quote.git", rev="67a9d011809d0c9109d1ac42aeb809a84b663be6", features=[
"mock",
] }
tdx-quote ={ version="0.0.3", features=["mock"] }

[features]
default=["native", "full-client-native"]
Expand Down
4 changes: 2 additions & 2 deletions crates/kvdb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ edition ='2021'
# Common
rand ={ version="0.8", default-features=false }
serde ={ version="1.0", features=["derive"] }
thiserror="2.0.9"
thiserror="2.0.10"
hex ="0.4.3"

# Substrate
Expand All @@ -26,7 +26,7 @@ chacha20poly1305={ version="0.9", features=["alloc"], default-features=false }
synedrion ="0.2.0"

# Async
tokio ={ version="1.42", features=["macros", "sync", "fs", "rt-multi-thread", "io-util"] }
tokio ={ version="1.43", features=["macros", "sync", "fs", "rt-multi-thread", "io-util"] }
tracing={ version="0.1", default-features=false }

# Misc
Expand Down
4 changes: 2 additions & 2 deletions crates/protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ synedrion ="0.2.0"
serde ={ version="1.0", features=["derive"], default-features=false }
subxt ={ version="0.35.3", default-features=false }
sp-core ={ version="31.0.0", default-features=false, features=["full_crypto", "serde"] }
tokio ={ version="1.42", features=["sync", "rt", "macros"] }
tokio ={ version="1.43", features=["sync", "rt", "macros"] }
x25519-dalek ={ version="2.0.1", features=["static_secrets"] }
futures ="0.3"
hex ="0.4.3"
blake2 ="0.10.4"
thiserror ="2.0.9"
thiserror ="2.0.10"
snow ="0.9.6"
getrandom ={ version="0.2", features=["js"] }
rand_core ={ version="0.6.4", features=["getrandom"] }
Expand Down
6 changes: 3 additions & 3 deletions crates/test-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ edition ='2021'

[dependencies]
entropy-client ={ version="0.3.0", path="../client" }
clap ={ version="4.5.24", features=["derive"] }
clap ={ version="4.5.26", features=["derive"] }
colored ="3.0.0"
subxt ="0.35.3"
sp-core ="31.0.0"
anyhow ="1.0.95"
tokio ={ version="1.42", features=["macros", "rt-multi-thread", "io-util", "process"] }
tokio ={ version="1.43", features=["macros", "rt-multi-thread", "io-util", "process"] }
hex ="0.4.3"
bincode ="1.3.3"
x25519-dalek ="2.0.1"
Expand All @@ -24,4 +24,4 @@ entropy-shared ={ version="0.3.0", path="../shared" }
serde_json ="1.0.135"
serde ={ version="1.0.217", features=["derive"] }
reqwest ="0.12.12"
parity-scale-codec={ version="3.6.3", default-features=false }
parity-scale-codec={ version="3.6.3", default-features=false }
36 changes: 17 additions & 19 deletions crates/testing-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,24 @@ repository ='https://github.com/entropyxyz/entropy-core'
edition ='2021'

[dependencies]
subxt="0.35.3"
sp-keyring="34.0.0"
project-root="0.2.2"
sp-core={ version="31.0.0", default-features=false }
subxt ="0.35.3"
sp-keyring ="34.0.0"
project-root ="0.2.2"
sp-core ={ version="31.0.0", default-features=false }
parity-scale-codec="3.6.12"
lazy_static="1.5.0"
hex-literal="0.4.1"
tokio={ version="1.42", features=["macros", "fs", "rt-multi-thread", "io-util", "process"] }
axum={ version="0.8.1" }
entropy-shared={ version="0.3.0", path="../shared" }
entropy-kvdb={ version="0.3.0", path="../kvdb", default-features=false }
entropy-tss={ version="0.3.0", path="../threshold-signature-server", features=["test_helpers"] }
entropy-protocol={ version="0.3.0", path="../protocol" }
synedrion="0.2.0"
hex="0.4.3"
rand_core="0.6.4"
rand="0.8.5"
tdx-quote={ git="https://github.com/entropyxyz/tdx-quote.git", rev="67a9d011809d0c9109d1ac42aeb809a84b663be6", features=[
"mock",
] }
lazy_static ="1.5.0"
hex-literal ="0.4.1"
tokio ={ version="1.43", features=["macros", "fs", "rt-multi-thread", "io-util", "process"] }
axum ={ version="0.8.1" }
entropy-shared ={ version="0.3.0", path="../shared" }
entropy-kvdb ={ version="0.3.0", path="../kvdb", default-features=false }
entropy-tss ={ version="0.3.0", path="../threshold-signature-server", features=["test_helpers"] }
entropy-protocol ={ version="0.3.0", path="../protocol" }
synedrion ="0.2.0"
hex ="0.4.3"
rand_core ="0.6.4"
rand ="0.8.5"
tdx-quote ={ version="0.0.3", features=["mock"] }

# Logging
tracing ="0.1.41"
Expand Down
58 changes: 27 additions & 31 deletions crates/threshold-signature-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ edition ='2021'
# Common
serde ={ version="1.0", default-features=false, features=["derive"] }
serde_json ="1.0"
thiserror ="2.0.9"
thiserror ="2.0.10"
anyhow ="1.0.95"
blake2 ="0.10.4"
x25519-dalek ={ version="2.0.1", features=["static_secrets"] }
Expand All @@ -28,7 +28,7 @@ backoff ={ version="0.4.0", features=["tokio"] }

# Async
futures="0.3"
tokio ={ version="1.42", features=["macros", "fs", "rt-multi-thread", "io-util", "process", "sync"] }
tokio ={ version="1.43", features=["macros", "fs", "rt-multi-thread", "io-util", "process", "sync"] }

# HTTP
reqwest={ version="0.12.12", features=["json", "stream"] }
Expand All @@ -55,43 +55,39 @@ tracing-subscriber ={ version="0.3.19", features=["env-filter", "json"] }
tracing-loki ="0.2"
tower-http ={ version="0.6.2", features=["trace", "cors"] }
tracing-bunyan-formatter="0.3.10"
uuid ={ version="1.11.0", features=["v4"] }
uuid ={ version="1.11.1", features=["v4"] }

# Misc
tokio-tungstenite="0.26.1"
bincode="1.3.3"
bip32={ version="0.5.2" }
bip39={ version="2.1.0", features=["zeroize"] }
bytes={ version="1.9", default-features=false, features=["serde"] }
base64="0.22.1"
clap={ version="4.5.24", features=["derive"] }
num="0.4.3"
snow="0.9.6"
sha3="0.10.8"
hostname="0.4"
sha1="0.10.6"
sha2="0.10.8"
hkdf="0.12.4"
project-root={ version="0.2.2", optional=true }
tdx-quote={ git="https://github.com/entropyxyz/tdx-quote.git", rev="67a9d011809d0c9109d1ac42aeb809a84b663be6", optional=true, features=[
"mock",
] }
configfs-tsm={ version="0.0.1", optional=true }
bincode ="1.3.3"
bip32 ={ version="0.5.2" }
bip39 ={ version="2.1.0", features=["zeroize"] }
bytes ={ version="1.9", default-features=false, features=["serde"] }
base64 ="0.22.1"
clap ={ version="4.5.26", features=["derive"] }
num ="0.4.3"
snow ="0.9.6"
sha3 ="0.10.8"
hostname ="0.4"
sha1 ="0.10.6"
sha2 ="0.10.8"
hkdf ="0.12.4"
project-root ={ version="0.2.2", optional=true }
tdx-quote ={ version="0.0.3", optional=true, features=["mock"] }
configfs-tsm ={ version="0.0.1", optional=true }

[dev-dependencies]
serial_test="3.2.0"
hex-literal="0.4.1"
serial_test ="3.2.0"
hex-literal ="0.4.1"
project-root="0.2.2"
more-asserts="0.3.1"
lazy_static="1.5.0"
blake3="1.5.5"
ethers-core="2.0.14"
schnorrkel={ version="0.11.4", default-features=false, features=["std"] }
schemars={ version="0.8.21" }
lazy_static ="1.5.0"
blake3 ="1.5.5"
ethers-core ="2.0.14"
schnorrkel ={ version="0.11.4", default-features=false, features=["std"] }
schemars ={ version="0.8.21" }
subxt-signer="0.35.3"
tdx-quote={ git="https://github.com/entropyxyz/tdx-quote.git", rev="67a9d011809d0c9109d1ac42aeb809a84b663be6", features=[
"mock",
] }
tdx-quote ={ version="0.0.3", features=["mock"] }

# Note: We don't specify versions here because otherwise we run into a cyclical dependency between
# `entropy-tss` and `entropy-testing-utils` when we try and publish the `entropy-tss` crate.
Expand Down
4 changes: 2 additions & 2 deletions node/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ name='entropy'
[dependencies]

# Third-party dependencies
clap ={ version="4.5.24", features=["derive"], optional=true }
clap ={ version="4.5.26", features=["derive"], optional=true }
codec ={ package="parity-scale-codec", version="3.0.0" }
futures ="0.3.31"
hex-literal ="0.4.1"
Expand Down Expand Up @@ -99,7 +99,7 @@ pallet-staking-extension={ version="0.3.0", path="../../pallets/staking" }
project-root="0.2.2"

[build-dependencies]
clap={ version="4.5.24", optional=true }
clap={ version="4.5.26", optional=true }

pallet-balances ={ version="29.0.0" }
substrate-build-script-utils={ version="11.0.0" }
Expand Down
Loading

0 comments on commit c84f3be

Please sign in to comment.