From e9063ab8efe3e16bb963a0d06ebdc060252a17f6 Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Fri, 19 Mar 2021 15:18:33 +0800 Subject: [PATCH] Downgrade `ethash` (#629) --- Cargo.lock | 40 +++++++++------------------------------- Cargo.toml | 3 +++ 2 files changed, 12 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bcd961dcc..9b263d320 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1436,7 +1436,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 1.3.6", - "rlp 0.4.4", + "rlp", "serde", "serde_json", "sp-core", @@ -2026,13 +2026,13 @@ dependencies = [ [[package]] name = "ethash" version = "0.4.0" -source = "git+https://github.com/darwinia-network/rust-ethash#53de20ac319c9ee63f7871b0c14ba3a391b086fa" +source = "git+https://github.com/darwinia-network/ethash.git?tag=v1.0.0#cd3918410be0484e436cab68ba803fe95fc905b5" dependencies = [ "byteorder 1.4.2", "ethereum-types", "primitive-types 0.6.2", - "rlp 0.4.6", - "sha3 0.8.2", + "rlp", + "sha3", ] [[package]] @@ -2064,7 +2064,7 @@ dependencies = [ "merkle-patricia-trie", "parity-scale-codec 1.3.6", "primitive-types 0.6.2", - "rlp 0.4.4", + "rlp", "rlp-derive", "serde", "sp-io", @@ -3084,7 +3084,7 @@ name = "impl-rlp" version = "0.2.1" source = "git+https://github.com/darwinia-network/parity-common.git#12a86aa8af8ff5ccd5c953074aa893c716cf85b5" dependencies = [ - "rlp 0.4.4", + "rlp", ] [[package]] @@ -3796,7 +3796,7 @@ dependencies = [ "pin-project 0.4.27", "rand 0.7.3", "salsa20", - "sha3 0.9.1", + "sha3", ] [[package]] @@ -4143,7 +4143,7 @@ source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=mas dependencies = [ "hashbrown 0.9.1", "keccak-hash", - "rlp 0.4.4", + "rlp", "sp-std 2.0.0", ] @@ -4282,7 +4282,7 @@ dependencies = [ "digest 0.9.0", "sha-1 0.9.4", "sha2 0.9.3", - "sha3 0.9.1", + "sha3", "unsigned-varint 0.5.1", ] @@ -5934,15 +5934,6 @@ dependencies = [ "rustc-hex", ] -[[package]] -name = "rlp" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1190dcc8c3a512f1eef5d09bb8c84c7f39e1054e174d1795482e18f5272f2e73" -dependencies = [ - "rustc-hex", -] - [[package]] name = "rlp-derive" version = "0.1.0" @@ -7223,19 +7214,6 @@ dependencies = [ "opaque-debug 0.3.0", ] -[[package]] -name = "sha3" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf" -dependencies = [ - "block-buffer 0.7.3", - "byte-tools", - "digest 0.8.1", - "keccak", - "opaque-debug 0.2.3", -] - [[package]] name = "sha3" version = "0.9.1" diff --git a/Cargo.toml b/Cargo.toml index c98bd0962..8dda36b49 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,3 +44,6 @@ members = [ [profile.release] # Darwinia runtime requires unwinding. panic = "unwind" + +[patch."https://github.com/darwinia-network/rust-ethash.git"] +ethash = { git = "https://github.com/darwinia-network/ethash.git", tag = "v1.0.0" }