Skip to content

Commit

Permalink
Merge branch 'master' into peg/test-helper-register
Browse files Browse the repository at this point in the history
* master:
  Add missing BoundedVec imports (#1039)
  Bump the patch-dependencies group with 3 updates (#1042)
  Bump the patch-dependencies group with 2 updates (#1040)
  • Loading branch information
ameba23 committed Sep 9, 2024
2 parents 4415dda + b2297f7 commit b538ae7
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 25 deletions.
24 changes: 12 additions & 12 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 @@ -29,7 +29,7 @@ reqwest ={ version="0.12.7", features=["json", "stream"], optional=true
base64 ={ version="0.22.0", optional=true }
synedrion ={ git="https://github.com/entropyxyz/synedrion", rev="1d210d149dfeb0dca1dd41d7fac4d0bf03c686fa", optional=true }
hex ={ version="0.4.3", optional=true }
anyhow ="1.0.86"
anyhow ="1.0.87"

# Only for the browser
js-sys={ version="0.3.70", optional=true }
Expand Down
2 changes: 1 addition & 1 deletion crates/protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ schnorrkel ={ version="0.11.4", default-features=false, features=["std"
[dev-dependencies]
serial_test="3.1.1"
sp-keyring ="34.0.0"
anyhow ="1.0.86"
anyhow ="1.0.87"
num_cpus ="1.16.0"

[features]
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,11 +10,11 @@ edition ='2021'

[dependencies]
entropy-client={ version="0.2.0", path="../client" }
clap ={ version="4.5.16", features=["derive"] }
clap ={ version="4.5.17", features=["derive"] }
colored ="2.0.4"
subxt ="0.35.3"
sp-core ="31.0.0"
anyhow ="1.0.86"
anyhow ="1.0.87"
tokio ={ version="1.39", features=["macros", "rt-multi-thread", "io-util", "process"] }
hex ="0.4.3"
bincode ="1.3.3"
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 @@ -12,7 +12,7 @@ edition ='2021'
# Common
serde ={ version="1.0", default-features=false, features=["derive"] }
serde_json ="1.0"
anyhow ="1.0.86"
anyhow ="1.0.87"
thiserror ="1.0.63"
blake2 ="0.10.4"
x25519-dalek ={ version="2.0.1", features=["static_secrets"] }
Expand Down Expand Up @@ -62,7 +62,7 @@ bip32 ={ version="0.5.2" }
bip39 ={ version="2.0.0", features=["zeroize"] }
bytes ={ version="1.7", default-features=false, features=["serde"] }
base64 ="0.22.1"
clap ={ version="4.5.16", features=["derive"] }
clap ={ version="4.5.17", features=["derive"] }
num ="0.4.3"
snow ="0.9.6"
sha3 ="0.10.8"
Expand Down
8 changes: 4 additions & 4 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.16", features=["derive"], optional=true }
clap ={ version="4.5.17", features=["derive"], optional=true }
codec ={ package="parity-scale-codec", version="3.0.0" }
futures ="0.3.30"
hex-literal ="0.4.1"
Expand All @@ -29,8 +29,8 @@ lazy_static ={ version="1.5.0", features=["spin_no_std"] }
log ="0.4.22"
pallet-im-online={ version="28.0.0" }
rand ="0.8.5"
serde ={ version="1.0.209", features=["derive"] }
serde_json ='1.0.127'
serde ={ version="1.0.210", features=["derive"] }
serde_json ='1.0.128'

# Substrate Client

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.16", optional=true }
clap={ version="4.5.17", optional=true }

pallet-balances ={ version="29.0.0" }
substrate-build-script-utils={ version="11.0.0" }
Expand Down
2 changes: 1 addition & 1 deletion node/cli/src/chain_spec/dev.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use sc_service::ChainType;
use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
use sp_consensus_babe::AuthorityId as BabeId;
use sp_core::{sr25519, ByteArray};
use sp_runtime::Perbill;
use sp_runtime::{BoundedVec, Perbill};

pub fn devnet_three_node_initial_tss_servers(
) -> Vec<(sp_runtime::AccountId32, TssX25519PublicKey, String)> {
Expand Down
2 changes: 1 addition & 1 deletion node/cli/src/chain_spec/integration_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use sc_service::ChainType;
use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
use sp_consensus_babe::AuthorityId as BabeId;
use sp_core::{sr25519, ByteArray};
use sp_runtime::Perbill;
use sp_runtime::{BoundedVec, Perbill};

/// The configuration used for the Threshold Signature Scheme server integration tests.
///
Expand Down
2 changes: 1 addition & 1 deletion pallets/staking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ targets=['x86_64-unknown-linux-gnu']
codec ={ package="parity-scale-codec", version="3.6.3", default-features=false, features=["derive"] }
scale-info ={ version="2.11", default-features=false, features=["derive"] }
log ={ version="0.4.22", default-features=false }
serde ={ version="1.0.209", default-features=false }
serde ={ version="1.0.210", default-features=false }
rand_chacha={ version="0.3", default-features=false }

frame-benchmarking={ version="29.0.0", default-features=false, optional=true }
Expand Down

0 comments on commit b538ae7

Please sign in to comment.