Skip to content

Commit

Permalink
Merge branch 'master' of github.com:entropyxyz/entropy-core into key-…
Browse files Browse the repository at this point in the history
…reshare-addition
  • Loading branch information
JesseAbram committed Jul 26, 2024
2 parents de3822a + e0de9e3 commit 699f662
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 24 deletions.
26 changes: 13 additions & 13 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion crates/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ anyhow ="1.0.86"

# Only for the browser
js-sys={ version="0.3.68", optional=true }
tokio ="1.38"
tokio ="1.39"

[dev-dependencies]
serial_test ="3.1.1"
Expand Down
2 changes: 1 addition & 1 deletion crates/kvdb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ chacha20poly1305={ version="0.9", features=["alloc"], default-features=false }
synedrion ={ git="https://github.com/entropyxyz/synedrion", rev="3be1339c21384a8e60a1534f1d3bfdd022662e63" }

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

# Misc
Expand Down
2 changes: 1 addition & 1 deletion crates/protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ synedrion ={ git="https://github.com/entropyxyz/synedrion", rev="3be133
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.38", features=["sync", "rt", "macros"] }
tokio ={ version="1.39", features=["sync", "rt", "macros"] }
x25519-dalek ={ version="2.0.1", features=["static_secrets"] }
futures ="0.3"
hex ="0.4.3"
Expand Down
4 changes: 2 additions & 2 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.2.0", path="../client" }
clap ={ version="4.5.9", features=["derive"] }
clap ={ version="4.5.10", features=["derive"] }
colored ="2.0.4"
subxt ="0.35.3"
sp-core ="31.0.0"
anyhow ="1.0.86"
tokio ={ version="1.38", features=["macros", "rt-multi-thread", "io-util", "process"] }
tokio ={ version="1.39", features=["macros", "rt-multi-thread", "io-util", "process"] }
hex ="0.4.3"
bincode ="1.3.3"
x25519-dalek ="2.0.1"
Expand Down
2 changes: 1 addition & 1 deletion crates/testing-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ 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.38", features=["macros", "fs", "rt-multi-thread", "io-util", "process"] }
tokio ={ version="1.39", features=["macros", "fs", "rt-multi-thread", "io-util", "process"] }
axum ={ version="0.7.5" }
entropy-shared ={ version="0.2.0", path="../shared" }
entropy-kvdb ={ version="0.2.0", path="../kvdb", default-features=false }
Expand Down
4 changes: 2 additions & 2 deletions crates/threshold-signature-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ backoff ={ version="0.4.0", features=["tokio"] }

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

# HTTP
reqwest={ version="0.12.5", features=["json", "stream"] }
Expand Down Expand Up @@ -61,7 +61,7 @@ bip39 ={ version="2.0.0", features=["zeroize"] }
bincode ="1.3.3"
bytes ={ version="1.6", default-features=false, features=["serde"] }
base64 ="0.22.1"
clap ={ version="4.5.9", features=["derive"] }
clap ={ version="4.5.10", features=["derive"] }
num ="0.4.3"
snow ="0.9.6"
sha3 ="0.10.8"
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.9", features=["derive"], optional=true }
clap ={ version="4.5.10", features=["derive"], optional=true }
codec ={ package="parity-scale-codec", version="3.0.0" }
futures ="0.3.30"
hex-literal ="0.4.1"
Expand Down Expand Up @@ -99,7 +99,7 @@ pallet-staking-extension={ version="0.2.0", path="../../pallets/staking" }
project-root="0.2.2"

[build-dependencies]
clap={ version="4.5.9", optional=true }
clap={ version="4.5.10", optional=true }

pallet-balances ={ version="29.0.0" }
substrate-build-script-utils={ version="11.0.0" }
Expand Down
2 changes: 1 addition & 1 deletion scripts/create-test-keyshares/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition ='2021'

[dependencies]
entropy-testing-utils={ version="0.2.0-rc.1", path="../../crates/testing-utils" }
tokio ={ version="1.38", features=["macros", "fs", "rt-multi-thread", "io-util", "process"] }
tokio ={ version="1.39", features=["macros", "fs", "rt-multi-thread", "io-util", "process"] }
entropy-shared ={ version="0.2.0-rc.1", path="../../crates/shared" }
entropy-kvdb ={ version="0.2.0-rc.1", path="../../crates/kvdb", default-features=false }

Expand Down

0 comments on commit 699f662

Please sign in to comment.