Skip to content

Commit

Permalink
Bump Synedrion to latest master in TSS (#988)
Browse files Browse the repository at this point in the history
I didn't want to bump it in #955 since it could've introduced a lot of noise. Now that I need some
of new child key derivation APIs in the TSS it makes sense to update it elsewhere.
  • Loading branch information
HCastano authored Aug 8, 2024
1 parent 1118168 commit 4316480
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 42 deletions.
40 changes: 8 additions & 32 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 @@ -27,7 +27,7 @@ x25519-dalek ={ version="2.0.1", features=["static_secrets"], optional=true }
entropy-protocol={ version="0.2.0", path="../protocol", optional=true, default-features=false }
reqwest ={ version="0.12.5", features=["json", "stream"], optional=true }
base64 ={ version="0.22.0", optional=true }
synedrion ={ git="https://github.com/entropyxyz/synedrion", rev="3be1339c21384a8e60a1534f1d3bfdd022662e63", optional=true }
synedrion ={ git="https://github.com/entropyxyz/synedrion", rev="1d210d149dfeb0dca1dd41d7fac4d0bf03c686fa", optional=true }
hex ={ version="0.4.3", optional=true }
anyhow ="1.0.86"

Expand Down
2 changes: 1 addition & 1 deletion crates/kvdb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ zeroize ={ version="1.8", features=["zeroize_derive"], default-features=
rpassword ={ version="7.3.1", default-features=false }
scrypt ={ version="0.11.0", default-features=false, features=["std"] }
chacha20poly1305={ version="0.9", features=["alloc"], default-features=false }
synedrion ={ git="https://github.com/entropyxyz/synedrion", rev="3be1339c21384a8e60a1534f1d3bfdd022662e63" }
synedrion ={ git="https://github.com/entropyxyz/synedrion", rev="1d210d149dfeb0dca1dd41d7fac4d0bf03c686fa" }

# Async
tokio ={ version="1.39", features=["macros", "sync", "fs", "rt-multi-thread", "io-util"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition ='2021'
[dependencies]
async-trait ="0.1.81"
entropy-shared ={ version="0.2.0", path="../shared", default-features=false }
synedrion ={ git="https://github.com/entropyxyz/synedrion", rev="3be1339c21384a8e60a1534f1d3bfdd022662e63" }
synedrion ={ git="https://github.com/entropyxyz/synedrion", rev="1d210d149dfeb0dca1dd41d7fac4d0bf03c686fa" }
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"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/protocol/src/execute_protocol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ pub async fn execute_protocol_generic<Res: synedrion::ProtocolResult>(

for preprocessed in cached_messages {
// TODO (#641): this may happen in a spawned task.
let processed = session.process_message(preprocessed)?;
let processed = session.process_message(&mut OsRng, preprocessed)?;

// This will happen in a host task.
accum.add_processed_message(processed)??;
Expand Down Expand Up @@ -135,7 +135,7 @@ pub async fn execute_protocol_generic<Res: synedrion::ProtocolResult>(

if let Some(preprocessed) = preprocessed {
// TODO (#641): this may happen in a spawned task.
let result = session.process_message(preprocessed)?;
let result = session.process_message(&mut OsRng, preprocessed)?;

// This will happen in a host task.
accum.add_processed_message(result)??;
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 @@ -22,7 +22,7 @@ entropy-shared ={ version="0.2.0", path="../shared" }
entropy-kvdb ={ version="0.2.0", path="../kvdb", default-features=false }
entropy-tss ={ version="0.2.0", path="../threshold-signature-server", features=["test_helpers"] }
entropy-protocol ={ version="0.2.0", path="../protocol" }
synedrion ={ git="https://github.com/entropyxyz/synedrion", rev="3be1339c21384a8e60a1534f1d3bfdd022662e63" }
synedrion ={ git="https://github.com/entropyxyz/synedrion", rev="1d210d149dfeb0dca1dd41d7fac4d0bf03c686fa" }
hex ="0.4.3"
rand_core ="0.6.4"
rand ="0.8.5"
Expand Down
4 changes: 2 additions & 2 deletions crates/testing-utils/src/create_test_keyshares.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ mod synedrion_test_environment {
for preprocessed in cached_messages {
// In production usage, this will happen in a spawned task.
println!("{key_str}: applying a cached message");
let result = session.process_message(preprocessed).unwrap();
let result = session.process_message(&mut OsRng, preprocessed).unwrap();

// This will happen in a host task.
accum.add_processed_message(result).unwrap().unwrap();
Expand All @@ -191,7 +191,7 @@ mod synedrion_test_environment {
if let Some(preprocessed) = preprocessed {
// In production usage, this will happen in a spawned task.
println!("{key_str}: applying a message from {}", key_to_str(&from));
let result = session.process_message(preprocessed).unwrap();
let result = session.process_message(&mut OsRng, preprocessed).unwrap();

// This will happen in a host task.
accum.add_processed_message(result).unwrap().unwrap();
Expand Down
2 changes: 1 addition & 1 deletion crates/threshold-signature-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ zeroize ="1.8.1"
hex ="0.4.3"
reqwest-eventsource="0.6"
serde_derive ="1.0.147"
synedrion ={ git="https://github.com/entropyxyz/synedrion", rev="3be1339c21384a8e60a1534f1d3bfdd022662e63" }
synedrion ={ git="https://github.com/entropyxyz/synedrion", rev="1d210d149dfeb0dca1dd41d7fac4d0bf03c686fa" }
strum ="0.26.2"
backoff ={ version="0.4.0", features=["tokio"] }

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 @@ -15,7 +15,7 @@ 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 }

# Unreleased version of Synedrion with support for child key derivations.
synedrion={ git="https://github.com/entropyxyz/synedrion", rev="3be1339c21384a8e60a1534f1d3bfdd022662e63" }
synedrion={ git="https://github.com/entropyxyz/synedrion", rev="1d210d149dfeb0dca1dd41d7fac4d0bf03c686fa" }
entropy-tss={ version="0.2.0-rc.1", path="../../crates/threshold-signature-server", features=[
"test_helpers",
] }

0 comments on commit 4316480

Please sign in to comment.