From c9a0b87a4cefa3509b040c24d23cca37757fc030 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Dec 2023 04:13:57 +0700 Subject: [PATCH] fix(deps): update rust crate fluence-keypair to 0.10.4 (#752) * Update ed25519-dalek and rand_chacha to compatible versions * Make clippy happier --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ivan Boldyrev --- Cargo.lock | 16 ++++++++-------- air/Cargo.toml | 4 ++-- air/src/signing_step.rs | 2 +- avm/server/Cargo.toml | 2 +- crates/air-lib/interpreter-data/Cargo.toml | 2 +- crates/air-lib/interpreter-signatures/Cargo.toml | 2 +- crates/air-lib/test-utils/Cargo.toml | 7 +++---- crates/air-lib/test-utils/src/key_utils.rs | 2 +- crates/testing-framework/Cargo.toml | 2 +- tools/cli/air/Cargo.toml | 2 +- 10 files changed, 20 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f803072810..94ee5b7963 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -273,13 +273,13 @@ dependencies = [ "aquavm-air", "avm-interface", "avm-server", - "ed25519-dalek 1.0.1", + "ed25519-dalek 2.1.0", "fluence-keypair", "maplit", "marine-rs-sdk", "object-pool", "once_cell", - "rand_chacha 0.2.2", + "rand_chacha 0.3.1", "semver 1.0.20", "serde", "serde_json", @@ -438,7 +438,7 @@ dependencies = [ "concat-idents", "criterion 0.3.6", "csv", - "ed25519-dalek 1.0.1", + "ed25519-dalek 2.1.0", "env_logger 0.7.1", "fluence-app-service", "fluence-keypair", @@ -2199,7 +2199,6 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ - "serde", "signature 1.6.4", ] @@ -2210,6 +2209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8", + "serde", "signature 2.2.0", ] @@ -2223,7 +2223,6 @@ dependencies = [ "ed25519 1.5.3", "rand 0.7.3", "serde", - "serde_bytes", "sha2 0.9.9", "zeroize", ] @@ -2236,6 +2235,7 @@ checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ "curve25519-dalek 4.1.1", "ed25519 2.2.3", + "rand_core 0.6.4", "serde", "sha2 0.10.8", "subtle", @@ -2522,13 +2522,13 @@ dependencies = [ [[package]] name = "fluence-keypair" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b635af10c462212b4a2da1512bf62c0100795b688be8b08c3e7fa337ec33d46" +checksum = "273ecbe8b6757f46e9d2b61f56ac636f27defa88aebc17a4fd6a7b78bf84cca3" dependencies = [ "asn1_der 0.6.3", "bs58 0.5.0", - "ed25519-dalek 1.0.1", + "ed25519-dalek 2.1.0", "eyre", "lazy_static", "libp2p-identity", diff --git a/air/Cargo.toml b/air/Cargo.toml index c82e7b0626..345ee9138a 100644 --- a/air/Cargo.toml +++ b/air/Cargo.toml @@ -29,7 +29,7 @@ air-lambda-parser = { version = "0.1.0", path = "../crates/air-lib/lambda/parser air-trace-handler = { version = "0.5.8", path = "../crates/air-lib/trace-handler" } air-utils = { version = "0.2.0", path = "../crates/air-lib/utils" } polyplets = { version = "0.5.1", path = "../crates/air-lib/polyplets" } -fluence-keypair = { version = "0.10.3", default-features = false } +fluence-keypair = { version = "0.10.4", default-features = false } serde = { version = "1.0.190", features = [ "derive", "rc" ] } serde_json = "1.0.108" @@ -57,7 +57,7 @@ bs58 = "0.5.0" # the feature just silence a warning in the criterion 0.3.x. criterion = { version = "0.3.3", features = ["html_reports"] } csv = "1.1.5" -ed25519-dalek = "1.0.1" +ed25519-dalek = "2.1.0" env_logger = "0.7.1" once_cell = "1.4.1" pretty_assertions = "0.6.1" diff --git a/air/src/signing_step.rs b/air/src/signing_step.rs index a663755b77..7ca27b83c2 100644 --- a/air/src/signing_step.rs +++ b/air/src/signing_step.rs @@ -33,7 +33,7 @@ pub(crate) fn sign_produced_cids( let signature = signature_tracker .gen_signature(salt, keypair) .map_err(UncatchableError::SigningError)?; - let public_key = keypair.public().into(); + let public_key = keypair.public(); signature_store.put(public_key, signature); Ok(()) } diff --git a/avm/server/Cargo.toml b/avm/server/Cargo.toml index e4447c0086..94a6a9ae8d 100644 --- a/avm/server/Cargo.toml +++ b/avm/server/Cargo.toml @@ -31,4 +31,4 @@ serde = "1.0.190" log = "0.4.20" parking_lot = "0.12.1" tracing = "0.1.40" -fluence-keypair = { version = "0.10.3", default-features = false } +fluence-keypair = { version = "0.10.4", default-features = false } diff --git a/crates/air-lib/interpreter-data/Cargo.toml b/crates/air-lib/interpreter-data/Cargo.toml index 9a4a3233d9..2da7440017 100644 --- a/crates/air-lib/interpreter-data/Cargo.toml +++ b/crates/air-lib/interpreter-data/Cargo.toml @@ -22,7 +22,7 @@ air-interpreter-signatures = { version = "0.1.5", path = "../interpreter-signatu air-interpreter-sede = { version = "0.1.0", path = "../interpreter-sede", features = ["json"] } polyplets = { version = "0.5.1", path = "../polyplets" } -fluence-keypair = { version = "0.10.3", default-features = false } +fluence-keypair = { version = "0.10.4", default-features = false } serde = {version = "1.0.190", features = ["derive", "rc"]} serde_json = "1.0.108" semver = { version = "1.0.17", features = ["serde"] } diff --git a/crates/air-lib/interpreter-signatures/Cargo.toml b/crates/air-lib/interpreter-signatures/Cargo.toml index f228541a5c..22aa44b163 100644 --- a/crates/air-lib/interpreter-signatures/Cargo.toml +++ b/crates/air-lib/interpreter-signatures/Cargo.toml @@ -12,7 +12,7 @@ categories = ["wasm"] [dependencies] air-interpreter-cid = { version = "0.7.0", path = "../interpreter-cid" } -fluence-keypair = { version = "0.10.3", default-features = false } +fluence-keypair = { version = "0.10.4", default-features = false } bs58 = "0.5.0" borsh = { version = "0.10.3", features = ["rc"]} diff --git a/crates/air-lib/test-utils/Cargo.toml b/crates/air-lib/test-utils/Cargo.toml index ff296b0ade..e39204858d 100644 --- a/crates/air-lib/test-utils/Cargo.toml +++ b/crates/air-lib/test-utils/Cargo.toml @@ -30,10 +30,9 @@ once_cell = "1.17.1" semver = "1.0.17" serde_json = "1.0.108" serde = { version = "1.0.190", features = ["derive"] } -fluence-keypair = "0.10.3" - -ed25519-dalek = "1.0.1" -rand_chacha = "0.2.2" +fluence-keypair = "0.10.4" +ed25519-dalek = "2.1.0" +rand_chacha = "0.3.1" sha2 = "0.10.6" [dev-dependencies] diff --git a/crates/air-lib/test-utils/src/key_utils.rs b/crates/air-lib/test-utils/src/key_utils.rs index 5084f5b141..d7cd064d32 100644 --- a/crates/air-lib/test-utils/src/key_utils.rs +++ b/crates/air-lib/test-utils/src/key_utils.rs @@ -32,7 +32,7 @@ pub fn derive_dummy_keypair(seed: &str) -> (KeyPair, String) { rand_chacha::ChaCha8Rng::from_seed(hasher.finalize().into()) }; - let keypair_ed25519 = ed25519_dalek::Keypair::generate(&mut rng); + let keypair_ed25519 = ed25519_dalek::SigningKey::generate(&mut rng); let keypair = fluence_keypair::KeyPair::Ed25519(keypair_ed25519.into()); let keypair = KeyPair::try_from(keypair).expect("cannot happen"); diff --git a/crates/testing-framework/Cargo.toml b/crates/testing-framework/Cargo.toml index fd8995ca4c..3cfc5f5df8 100644 --- a/crates/testing-framework/Cargo.toml +++ b/crates/testing-framework/Cargo.toml @@ -18,7 +18,7 @@ air-test-utils = { version = "0.13.0", path = "../air-lib/test-utils" } aquavm-air-parser = { version = "0.11.0", path = "../air-lib/air-parser" } itertools = "0.10.5" -fluence-keypair = "0.10.1" +fluence-keypair = "0.10.4" strum = { version="0.24.1", features=["derive"] } nom = "7.1.3" nom_locate = "4.1.0" diff --git a/tools/cli/air/Cargo.toml b/tools/cli/air/Cargo.toml index 9afc96611f..2f4e617254 100644 --- a/tools/cli/air/Cargo.toml +++ b/tools/cli/air/Cargo.toml @@ -27,7 +27,7 @@ tracing = "0.1.40" tracing-subscriber = { version = "0.3.17", default-features = false, features = [ "env-filter", "json", "smallvec", "time", "fmt" ] } atty = "0.2.14" termcolor = "1.2.0" -fluence-keypair = "0.10.3" +fluence-keypair = "0.10.4" bs58 = "0.5.0" zeroize = "1.6.0"