diff --git a/Cargo.lock b/Cargo.lock index f865845761..03768ad86a 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -305,16 +305,6 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "block-padding", - "generic-array", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -324,12 +314,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - [[package]] name = "bonding-curve-contract" version = "0.0.0" @@ -650,16 +634,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "crypto-zombies" version = "0.0.0" @@ -685,7 +659,7 @@ dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", - "digest 0.10.7", + "digest", "fiat-crypto", "platforms", "rustc_version", @@ -714,23 +688,15 @@ dependencies = [ "zeroize", ] -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - [[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "crypto-common", + "subtle", ] [[package]] @@ -768,7 +734,7 @@ dependencies = [ "curve25519-dalek", "ed25519", "serde", - "sha2 0.10.8", + "sha2", "zeroize", ] @@ -1330,12 +1296,11 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "hmac" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "crypto-mac", - "digest 0.9.0", + "digest", ] [[package]] @@ -1495,9 +1460,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" dependencies = [ "either", ] @@ -1833,7 +1798,7 @@ dependencies = [ "num-traits", "serde", "serde_json", - "sha3 0.9.1", + "sha3", ] [[package]] @@ -1850,8 +1815,8 @@ dependencies = [ "num-traits", "rand", "rand_seeder", - "sha2 0.10.8", - "sha3 0.10.8", + "sha2", + "sha3", ] [[package]] @@ -1975,7 +1940,7 @@ dependencies = [ "pathdiff", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "tokio", ] @@ -2018,8 +1983,8 @@ dependencies = [ "serde", "serde_json", "serde_repr", - "sha2 0.9.9", - "sha3 0.9.1", + "sha2", + "sha3", "tokio", "zeroize", ] @@ -2184,12 +2149,6 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "openssl" version = "0.10.59" @@ -2339,20 +2298,21 @@ dependencies = [ [[package]] name = "pbkdf2" -version = "0.9.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ - "crypto-mac", + "digest", ] [[package]] name = "pem" -version = "1.1.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" dependencies = [ - "base64 0.13.1", + "base64 0.21.5", + "serde", ] [[package]] @@ -2955,19 +2915,6 @@ dependencies = [ "set-repeat", ] -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha2" version = "0.10.8" @@ -2976,19 +2923,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug", + "digest", ] [[package]] @@ -2997,7 +2932,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.7", + "digest", "keccak", ] diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml index 43593cd420..4d6b2cb1bc 100644 --- a/framework/scenario/Cargo.toml +++ b/framework/scenario/Cargo.toml @@ -27,7 +27,7 @@ sha2 = "0.10.6" serde = "1.0" serde_json = "1.0" pathdiff = "0.2.1" -itertools = "0.11" +itertools = "0.12.0" colored = "2.0" clap = { version = "4.4.7", features = ["derive"] } tokio = { version = "1.24", features = ["full"] } diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml index 5298c0cb80..a5cbe7ddd3 100644 --- a/sdk/core/Cargo.toml +++ b/sdk/core/Cargo.toml @@ -24,13 +24,13 @@ serde_repr = "0.1.8" anyhow = "1.0.44" rand = "0.8.5" bip39 = { version = "2.0.0", features = ["rand"] } -sha2 = "0.9.8" -sha3 = "0.9.1" -hmac = { version = "0.11.0", features = ["std"] } +sha2 = "0.10.8" +sha3 = "0.10.8" +hmac = { version = "0.12.1", features = ["std"] } hex = "0.4.3" base64 = "0.13.0" -pbkdf2 = { version = "0.9.0", default-features = false } +pbkdf2 = { version = "0.12.2", default-features = false } zeroize = "1.4.2" bech32 = "0.9" -itertools = "0.11" -pem = "1.0.1" +itertools = "0.12.0" +pem = "3.0.2" diff --git a/sdk/core/src/wallet.rs b/sdk/core/src/wallet.rs index 469f4be106..ab1b0a2f37 100644 --- a/sdk/core/src/wallet.rs +++ b/sdk/core/src/wallet.rs @@ -2,7 +2,7 @@ extern crate rand; use anyhow::Result; use bip39::{Language, Mnemonic}; -use hmac::{Hmac, Mac, NewMac}; +use hmac::{Hmac, Mac}; use pbkdf2::pbkdf2; use serde_json::json; use sha2::{Digest, Sha512}; @@ -40,7 +40,7 @@ impl Wallet { let mut seed = [0u8; 64]; - pbkdf2::>( + let _ = pbkdf2::>( mnemonic.to_string().as_bytes(), salt.as_bytes(), 2048, @@ -105,7 +105,7 @@ impl Wallet { pub fn from_pem_file_contents(contents: String) -> Result { let x = pem::parse(contents)?; - let x = x.contents[..PRIVATE_KEY_LENGTH].to_vec(); + let x = x.contents()[..PRIVATE_KEY_LENGTH].to_vec(); let priv_key_str = std::str::from_utf8(x.as_slice())?; let pri_key = PrivateKey::from_hex_str(priv_key_str)?; Ok(Self { priv_key: pri_key }) diff --git a/sdk/scenario-format/Cargo.toml b/sdk/scenario-format/Cargo.toml index ee69b43256..76f0751bdc 100644 --- a/sdk/scenario-format/Cargo.toml +++ b/sdk/scenario-format/Cargo.toml @@ -19,5 +19,5 @@ serde_json = "1.0" num-bigint = "0.4" num-traits = "0.2" hex = "0.4" -sha3 = "0.9" +sha3 = "0.10.8" bech32 = "0.9.0" diff --git a/vm/Cargo.toml b/vm/Cargo.toml index 450080de57..08e964a8aa 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -25,7 +25,7 @@ sha3 = "0.10.6" rand = "0.8.5" rand_seeder = "0.2.2" ed25519-dalek = "2.0.0" -itertools = "0.11" +itertools = "0.12.0" hex-literal = "0.4.1" bitflags = "1.3.2"