From a04a9979bcac4121a9fc836b0afd114bb82d1fd7 Mon Sep 17 00:00:00 2001 From: "Joshua J. Bouw" Date: Thu, 11 Aug 2022 14:05:10 -0400 Subject: [PATCH] Chore(Precompiles): Ripemd160 lib deprecated Fix std feature ripemd160 to ripemd --- Cargo.lock | 12 ++++++++++-- engine-precompiles/Cargo.toml | 5 ++--- engine-precompiles/src/hash.rs | 5 +++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2de1c2c51..8bc84bfa6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -150,9 +150,8 @@ dependencies = [ "hex", "libsecp256k1", "num", - "primitive-types 0.11.1", "rand 0.7.3", - "ripemd160", + "ripemd", "serde", "serde_json", "sha2 0.10.2", @@ -3414,6 +3413,15 @@ dependencies = [ "bytecheck", ] +[[package]] +name = "ripemd" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1facec54cb5e0dc08553501fa740091086d0259ad0067e0d4103448e4cb22ed3" +dependencies = [ + "digest 0.10.3", +] + [[package]] name = "ripemd160" version = "0.9.1" diff --git a/engine-precompiles/Cargo.toml b/engine-precompiles/Cargo.toml index a078bb5b4..e5401f0f1 100644 --- a/engine-precompiles/Cargo.toml +++ b/engine-precompiles/Cargo.toml @@ -20,8 +20,7 @@ bn = { package = "aurora-bn", git = "https://github.com/aurora-is-near/aurora-bn evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.36.0-aurora", default-features = false } libsecp256k1 = { version = "0.7.0", default-features = false, features = ["static-context", "hmac"] } num = { version = "0.4.0", default-features = false, features = ["alloc"] } -primitive-types = { version = "0.11", default-features = false, features = ["rlp"] } -ripemd160 = { version = "0.9.1", default-features = false } +ripemd = { version = "0.1.1", default-features = false } sha2 = { version = "0.10.2", default-features = false } sha3 = { version = "0.10.2", default-features = false } ethabi = { version = "17.1", default-features = false } @@ -33,7 +32,7 @@ serde_json = "1" rand = "0.7.3" [features] -std = ["aurora-engine-types/std", "aurora-engine-sdk/std", "borsh/std", "bn/std", "evm/std", "libsecp256k1/std", "ripemd160/std", "sha2/std", "sha3/std", "ethabi/std"] +std = ["aurora-engine-types/std", "aurora-engine-sdk/std", "borsh/std", "bn/std", "evm/std", "libsecp256k1/std", "ripemd/std", "sha2/std", "sha3/std", "ethabi/std"] contract = [] log = [] error_refund = [] diff --git a/engine-precompiles/src/hash.rs b/engine-precompiles/src/hash.rs index b4b9f406f..3ae6f99cb 100644 --- a/engine-precompiles/src/hash.rs +++ b/engine-precompiles/src/hash.rs @@ -95,8 +95,9 @@ impl RIPEMD160 { #[cfg(not(feature = "contract"))] fn internal_impl(input: &[u8]) -> [u8; 20] { - use ripemd160::Digest; - let hash = ripemd160::Ripemd160::digest(input); + use ripemd::{Digest, Ripemd160}; + + let hash = Ripemd160::digest(input); let mut output = [0u8; 20]; output.copy_from_slice(&hash); output