diff --git a/Cargo.lock b/Cargo.lock index 99ad0e313010c..87bb2f2f4c908 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1518,6 +1518,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "core-foundation" version = "0.9.3" @@ -2084,7 +2093,7 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2 1.0.49", "quote 1.0.23", "rustc_version 0.4.0", @@ -2537,7 +2546,7 @@ dependencies = [ [[package]] name = "fastcrypto" version = "0.1.4" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=8d07cc5a60856163829911e5aeedede35e90174a#8d07cc5a60856163829911e5aeedede35e90174a" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=f64e36ceed674ccd46938cfd9645a2d32a923656#f64e36ceed674ccd46938cfd9645a2d32a923656" dependencies = [ "aes", "aes-gcm", @@ -2584,8 +2593,9 @@ dependencies = [ [[package]] name = "fastcrypto-derive" version = "0.1.2" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=8d07cc5a60856163829911e5aeedede35e90174a#8d07cc5a60856163829911e5aeedede35e90174a" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=f64e36ceed674ccd46938cfd9645a2d32a923656#f64e36ceed674ccd46938cfd9645a2d32a923656" dependencies = [ + "convert_case 0.6.0", "proc-macro2 1.0.49", "quote 1.0.23", "syn 1.0.107", @@ -2594,7 +2604,7 @@ dependencies = [ [[package]] name = "fastcrypto-zkp" version = "0.1.0" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=8d07cc5a60856163829911e5aeedede35e90174a#8d07cc5a60856163829911e5aeedede35e90174a" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=f64e36ceed674ccd46938cfd9645a2d32a923656#f64e36ceed674ccd46938cfd9645a2d32a923656" dependencies = [ "ark-bls12-381", "ark-ec", @@ -10984,7 +10994,8 @@ dependencies = [ "console-subscriber", "const-oid", "constant_time_eq", - "convert_case", + "convert_case 0.4.0", + "convert_case 0.6.0", "core-foundation", "core-foundation-sys", "core2", diff --git a/Cargo.toml b/Cargo.toml index 8215af6252454..d5d549cec811a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -125,8 +125,8 @@ move-prover-boogie-backend = { git = "https://github.com/move-language/move", re move-stackless-bytecode = { git = "https://github.com/move-language/move", rev = "265e8792ff2935db8246ddb308b36b893d507851" } move-symbol-pool = { git = "https://github.com/move-language/move", rev = "265e8792ff2935db8246ddb308b36b893d507851" } -fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "8d07cc5a60856163829911e5aeedede35e90174a" } -fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "8d07cc5a60856163829911e5aeedede35e90174a", package = "fastcrypto-zkp" } +fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "f64e36ceed674ccd46938cfd9645a2d32a923656" } +fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "f64e36ceed674ccd46938cfd9645a2d32a923656", package = "fastcrypto-zkp" } # anemo dependencies anemo = { git = "https://github.com/mystenlabs/anemo.git", rev = "ccfb77628ec1883121079f1ae9c65e9c716709c8" } diff --git a/crates/sui-open-rpc/spec/openrpc.json b/crates/sui-open-rpc/spec/openrpc.json index 53ab6f2a85711..8718b1b805ef4 100644 --- a/crates/sui-open-rpc/spec/openrpc.json +++ b/crates/sui-open-rpc/spec/openrpc.json @@ -2637,7 +2637,7 @@ "type": "string" }, "Base64": { - "description": "Base64 encoding.", + "description": "Base64 encoding", "type": "string" }, "CertifiedTransaction": { diff --git a/crates/workspace-hack/Cargo.toml b/crates/workspace-hack/Cargo.toml index d1c50e5e85066..db20b5da6330c 100644 --- a/crates/workspace-hack/Cargo.toml +++ b/crates/workspace-hack/Cargo.toml @@ -194,8 +194,8 @@ event-listener = { version = "2", default-features = false } eyre = { version = "0.6", features = ["auto-install", "track-caller"] } fail-9fbad63c4bcf4a8f = { package = "fail", version = "0.4", default-features = false } fail-d8f496e17d97b5cb = { package = "fail", version = "0.5", default-features = false } -fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "8d07cc5a60856163829911e5aeedede35e90174a", features = ["copy_key", "secure"] } -fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "8d07cc5a60856163829911e5aeedede35e90174a", default-features = false } +fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "f64e36ceed674ccd46938cfd9645a2d32a923656", features = ["copy_key", "secure"] } +fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "f64e36ceed674ccd46938cfd9645a2d32a923656", default-features = false } fastrand = { version = "1", default-features = false } fd-lock = { version = "3", default-features = false } fdlimit = { version = "0.2", default-features = false } @@ -779,7 +779,8 @@ console-api = { version = "0.4", default-features = false, features = ["transpor console-subscriber = { version = "0.1", features = ["env-filter"] } const-oid = { version = "0.9", default-features = false } constant_time_eq = { version = "0.2", default-features = false } -convert_case = { version = "0.4", default-features = false } +convert_case-9fbad63c4bcf4a8f = { package = "convert_case", version = "0.4", default-features = false } +convert_case-3b31131e45eafb45 = { package = "convert_case", version = "0.6", default-features = false } core2 = { version = "0.4", default-features = false, features = ["alloc"] } crc = { version = "3", default-features = false } crc-catalog = { version = "2", default-features = false } @@ -857,9 +858,9 @@ event-listener = { version = "2", default-features = false } eyre = { version = "0.6", features = ["auto-install", "track-caller"] } fail-9fbad63c4bcf4a8f = { package = "fail", version = "0.4", default-features = false } fail-d8f496e17d97b5cb = { package = "fail", version = "0.5", default-features = false } -fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "8d07cc5a60856163829911e5aeedede35e90174a", features = ["copy_key", "secure"] } -fastcrypto-derive = { git = "https://github.com/MystenLabs/fastcrypto", rev = "8d07cc5a60856163829911e5aeedede35e90174a", default-features = false } -fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "8d07cc5a60856163829911e5aeedede35e90174a", default-features = false } +fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "f64e36ceed674ccd46938cfd9645a2d32a923656", features = ["copy_key", "secure"] } +fastcrypto-derive = { git = "https://github.com/MystenLabs/fastcrypto", rev = "f64e36ceed674ccd46938cfd9645a2d32a923656", default-features = false } +fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "f64e36ceed674ccd46938cfd9645a2d32a923656", default-features = false } fastrand = { version = "1", default-features = false } fd-lock = { version = "3", default-features = false } fdlimit = { version = "0.2", default-features = false } diff --git a/narwhal/primary/src/core.rs b/narwhal/primary/src/core.rs index 77fab4415eec2..2b14e62f455aa 100644 --- a/narwhal/primary/src/core.rs +++ b/narwhal/primary/src/core.rs @@ -12,7 +12,7 @@ use crate::{ use anyhow::Result; use config::{Committee, Epoch, SharedWorkerCache}; use crypto::{NetworkPublicKey, PublicKey, Signature}; -use fastcrypto::{hash::Hash as _, SignatureService}; +use fastcrypto::{hash::Hash as _, signature_service::SignatureService}; use futures::StreamExt; use futures::{future::OptionFuture, stream::FuturesUnordered}; use mysten_metrics::{spawn_logged_monitored_task, spawn_monitored_task}; diff --git a/narwhal/primary/src/primary.rs b/narwhal/primary/src/primary.rs index 407fefabb674f..b1a7f730bcbbd 100644 --- a/narwhal/primary/src/primary.rs +++ b/narwhal/primary/src/primary.rs @@ -28,8 +28,8 @@ use crypto::{KeyPair, NetworkKeyPair, NetworkPublicKey, PublicKey, Signature}; use dashmap::DashSet; use fastcrypto::{ hash::Hash, + signature_service::SignatureService, traits::{EncodeDecodeBase64, KeyPair as _, ToFromBytes}, - SignatureService, }; use multiaddr::{Multiaddr, Protocol}; use network::{failpoints::FailpointsMakeCallbackHandler, metrics::MetricsMakeCallbackHandler}; diff --git a/narwhal/primary/src/proposer.rs b/narwhal/primary/src/proposer.rs index 91a1715713eb2..57dcbd1cf857d 100644 --- a/narwhal/primary/src/proposer.rs +++ b/narwhal/primary/src/proposer.rs @@ -4,7 +4,7 @@ use crate::{metrics::PrimaryMetrics, NetworkModel}; use config::{Committee, Epoch, WorkerId}; use crypto::{PublicKey, Signature}; -use fastcrypto::{hash::Hash as _, SignatureService}; +use fastcrypto::{hash::Hash as _, signature_service::SignatureService}; use mysten_metrics::spawn_logged_monitored_task; use std::collections::BTreeMap; use std::{cmp::Ordering, sync::Arc}; diff --git a/narwhal/primary/src/tests/certificate_fetcher_tests.rs b/narwhal/primary/src/tests/certificate_fetcher_tests.rs index 7b8f640841cc4..bbfe3c6a556bc 100644 --- a/narwhal/primary/src/tests/certificate_fetcher_tests.rs +++ b/narwhal/primary/src/tests/certificate_fetcher_tests.rs @@ -9,7 +9,7 @@ use anemo::async_trait; use anyhow::Result; use config::{Epoch, WorkerId}; use crypto::{PublicKey, Signature}; -use fastcrypto::{hash::Hash, traits::KeyPair, SignatureService}; +use fastcrypto::{hash::Hash, signature_service::SignatureService, traits::KeyPair}; use indexmap::IndexMap; use itertools::Itertools; use once_cell::sync::OnceCell; diff --git a/narwhal/primary/src/tests/primary_tests.rs b/narwhal/primary/src/tests/primary_tests.rs index dca59fc8dc0e3..05ec361927f43 100644 --- a/narwhal/primary/src/tests/primary_tests.rs +++ b/narwhal/primary/src/tests/primary_tests.rs @@ -16,8 +16,8 @@ use dashmap::DashSet; use fastcrypto::{ encoding::{Encoding, Hex}, hash::Hash, + signature_service::SignatureService, traits::KeyPair, - SignatureService, }; use itertools::Itertools; use prometheus::Registry; diff --git a/narwhal/types/src/primary.rs b/narwhal/types/src/primary.rs index 05e79c73a069f..1cbba2dea79c7 100644 --- a/narwhal/types/src/primary.rs +++ b/narwhal/types/src/primary.rs @@ -13,8 +13,9 @@ use dag::node_dag::Affiliated; use derive_builder::Builder; use fastcrypto::{ hash::{Digest, Hash, HashFunction}, + signature_service::SignatureService, traits::{AggregateAuthenticator, EncodeDecodeBase64, Signer, VerifyingKey}, - SignatureService, Verifier, + Verifier, }; use indexmap::IndexMap; use mysten_util_mem::MallocSizeOf;