From 1b23af3fa917841ac012ba26483960aaa45f4599 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 11 Apr 2020 13:16:37 +0200 Subject: [PATCH] Upgrade parity-common deps to latest (#11620) * Upgrade parity-crypto to 0.6 * More fixes * Upgrade ethabi and ethabi-derive * Fix lockfile * Patch ethabi from master * quickfix for ethash * Update forkid * Add secret store back * Fetch ethabi from crates * fetch secret-store from the right place * update to keccak-hash 0.5.1 * ethash: upgrade keccak-hash * ethash: sneaky spaces * ethash: use overlapping bytes after all * revert submodule update Co-authored-by: Andronik Ordian --- Cargo.lock | 132 +++++++-------------- Cargo.toml | 18 +-- accounts/Cargo.toml | 4 +- accounts/ethkey/Cargo.toml | 2 +- accounts/ethkey/cli/Cargo.toml | 2 +- accounts/ethstore/Cargo.toml | 4 +- accounts/ethstore/cli/Cargo.toml | 2 +- cli-signer/Cargo.toml | 2 +- cli-signer/rpc-client/Cargo.toml | 4 +- ethash/Cargo.toml | 4 +- ethash/src/cache.rs | 18 ++- ethash/src/compute.rs | 38 +++--- ethash/src/keccak.rs | 29 +---- ethcore/Cargo.toml | 20 ++-- ethcore/account-db/Cargo.toml | 8 +- ethcore/account-state/Cargo.toml | 12 +- ethcore/block-gas-limit/Cargo.toml | 8 +- ethcore/block-reward/Cargo.toml | 10 +- ethcore/blockchain/Cargo.toml | 14 +-- ethcore/builtin/Cargo.toml | 6 +- ethcore/call-contract/Cargo.toml | 2 +- ethcore/client-traits/Cargo.toml | 4 +- ethcore/db/Cargo.toml | 8 +- ethcore/engine/Cargo.toml | 4 +- ethcore/engines/authority-round/Cargo.toml | 14 +-- ethcore/engines/basic-authority/Cargo.toml | 8 +- ethcore/engines/clique/Cargo.toml | 8 +- ethcore/engines/ethash/Cargo.toml | 8 +- ethcore/engines/instant-seal/Cargo.toml | 6 +- ethcore/engines/null-engine/Cargo.toml | 2 +- ethcore/engines/validator-set/Cargo.toml | 20 ++-- ethcore/evm/Cargo.toml | 6 +- ethcore/executive-state/Cargo.toml | 8 +- ethcore/light/Cargo.toml | 14 +-- ethcore/machine/Cargo.toml | 14 +-- ethcore/node-filter/Cargo.toml | 10 +- ethcore/pod/Cargo.toml | 8 +- ethcore/private-tx/Cargo.toml | 18 +-- ethcore/service/Cargo.toml | 6 +- ethcore/snapshot/Cargo.toml | 16 +-- ethcore/snapshot/snapshot-tests/Cargo.toml | 18 +-- ethcore/spec/Cargo.toml | 8 +- ethcore/state-db/Cargo.toml | 6 +- ethcore/sync/Cargo.toml | 14 +-- ethcore/trace/Cargo.toml | 8 +- ethcore/types/Cargo.toml | 12 +- ethcore/verification/Cargo.toml | 10 +- ethcore/vm/Cargo.toml | 6 +- ethcore/wasm/Cargo.toml | 2 +- ethcore/wasm/run/Cargo.toml | 2 +- evmbin/Cargo.toml | 2 +- json/Cargo.toml | 2 +- miner/Cargo.toml | 16 +-- miner/local-store/Cargo.toml | 8 +- miner/stratum/Cargo.toml | 4 +- rpc/Cargo.toml | 8 +- updater/Cargo.toml | 10 +- updater/hash-fetch/Cargo.toml | 10 +- util/EIP-712/Cargo.toml | 6 +- util/blooms-db/Cargo.toml | 2 +- util/dir/Cargo.toml | 2 +- util/fastmap/Cargo.toml | 2 +- util/journaldb/Cargo.toml | 14 +-- util/keccak-hasher/Cargo.toml | 2 +- util/memory-cache/Cargo.toml | 2 +- util/migration-rocksdb/Cargo.toml | 4 +- util/network-devp2p/Cargo.toml | 8 +- util/network/Cargo.toml | 6 +- util/patricia-trie-ethereum/Cargo.toml | 8 +- util/registrar/Cargo.toml | 8 +- util/rlp-compress/Cargo.toml | 2 +- util/triehash-ethereum/Cargo.toml | 2 +- util/version/Cargo.toml | 2 +- 73 files changed, 337 insertions(+), 400 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 897a0d90f..9581d89a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1052,47 +1052,37 @@ dependencies = [ "termcolor", ] -[[package]] -name = "error-chain" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd" -dependencies = [ - "version_check", -] - [[package]] name = "ethabi" -version = "9.0.1" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965126c64662832991f5a748893577630b558e47fa94e7f35aefcd20d737cef7" +checksum = "052a565e3de82944527d6d10a465697e6bb92476b772ca7141080c901f6a63c6" dependencies = [ - "error-chain", "ethereum-types", "rustc-hex 2.1.0", "serde", - "serde_derive", "serde_json", "tiny-keccak 1.5.0", + "uint", ] [[package]] name = "ethabi-contract" -version = "9.0.0" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf407dce0290374bfbb1528493bc14320e663f75856b73a5b76262d8e2cec3c9" +checksum = "88d4002f1f77d8233685dafd8589efe1c9dfa63e21ca6c11134372acc7f68032" [[package]] name = "ethabi-derive" -version = "9.0.1" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0753d4f9e1dba99450da5f2400b20527702ae8ce0309a5f7c239d305539884" +checksum = "b7c0fe66618e0cfcf111afc863e7940413f2a88240cf63b38cc61206fe7be025" dependencies = [ "ethabi", "heck", - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", + "proc-macro2 1.0.9", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] @@ -1137,15 +1127,15 @@ dependencies = [ [[package]] name = "ethbloom" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cfe1c169414b709cf28aa30c74060bdb830a03a8ba473314d079ac79d80a5f" +checksum = "9e7abcddbdd5db30aeed4deb586adc4824e6c247e2f7238d1187f752893f096b" dependencies = [ "crunchy", "fixed-hash", "impl-rlp", - "impl-serde 0.2.3", - "tiny-keccak 1.5.0", + "impl-serde", + "tiny-keccak 2.0.2", ] [[package]] @@ -1183,7 +1173,7 @@ dependencies = [ "keccak-hash", "kvdb", "kvdb-memorydb", - "kvdb-rocksdb 0.6.0", + "kvdb-rocksdb", "lazy_static", "log", "machine", @@ -1545,7 +1535,7 @@ dependencies = [ "ethcore-sync", "ethereum-types", "kvdb", - "kvdb-rocksdb 0.6.0", + "kvdb-rocksdb", "log", "snapshot", "spec", @@ -1609,9 +1599,9 @@ dependencies = [ [[package]] name = "ethereum-forkid" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f547713a9a1e69a55529f3981dbded2c59c69629c7df795bdc7deef3375f59" +checksum = "f890790a25bad7e0ce2ecca9c777d393dccf0771d17264070bc8e2b1d05b9d8b" dependencies = [ "crc", "ethereum-types", @@ -1623,14 +1613,14 @@ dependencies = [ [[package]] name = "ethereum-types" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba744248e3553a393143d5ebb68939fc3a4ec0c22a269682535f5ffe7fed728c" +checksum = "964c23cdee0ca07d5be2a628b46d5c11a2134ce554a8c16d8dbc2db647e4fd4d" dependencies = [ "ethbloom", "fixed-hash", "impl-rlp", - "impl-serde 0.2.3", + "impl-serde", "primitive-types", "uint", ] @@ -1876,12 +1866,11 @@ dependencies = [ [[package]] name = "fixed-hash" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3367952ceb191f4ab95dd5685dc163ac539e36202f9fcfd0cb22f9f9c542fefc" +checksum = "32529fc42e86ec06e5047092082aab9ad459b070c5d2a76b14f4f5ce70bf2e84" dependencies = [ "byteorder", - "libc", "rand 0.7.3", "rustc-hex 2.1.0", "static_assertions", @@ -2266,15 +2255,6 @@ dependencies = [ "rlp", ] -[[package]] -name = "impl-serde" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e3cae7e99c7ff5a995da2cf78dd0a5383740eda71d98cf7b1910c301ac69b8" -dependencies = [ - "serde", -] - [[package]] name = "impl-serde" version = "0.3.0" @@ -2518,12 +2498,12 @@ dependencies = [ [[package]] name = "keccak-hash" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f0e55d8f242fdc281c21c4cd70960a25db6dd17cc6232d8b38b564b5b18c784" +checksum = "1f58a51ef3df9398cf2434bea8d4eb61fb748d0feb1571f87388579a120a4c8f" dependencies = [ "primitive-types", - "tiny-keccak 1.5.0", + "tiny-keccak 2.0.2", ] [[package]] @@ -2559,50 +2539,30 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03080afe6f42cd996da9f568d6add5d7fb5ee2ea7fb7802d2d2cbd836958fd87" +checksum = "cad096c6849b2ef027fabe35c4aed356d0e3d3f586d0a8361e5e17f1e50a7ce5" dependencies = [ - "parity-bytes", "parity-util-mem", "smallvec 1.2.0", ] [[package]] name = "kvdb-memorydb" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9355274e5a9e0a7e8ef43916950eae3949024de2a8dffe4d5a6c13974a37c8e" -dependencies = [ - "kvdb", - "parity-util-mem", - "parking_lot 0.10.0", -] - -[[package]] -name = "kvdb-rocksdb" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af36fd66ccd99f3f771ae39b75aaba28b952372b6debfb971134bf1f03466ab2" +checksum = "4aa954d12cfac958822dfd77aab34f3eec71f103b918c4ab79ab59a36ee594ea" dependencies = [ - "fs-swap", - "interleaved-ordered", "kvdb", - "log", - "num_cpus", - "owning_ref", "parity-util-mem", "parking_lot 0.10.0", - "regex", - "rocksdb", - "smallvec 1.2.0", ] [[package]] name = "kvdb-rocksdb" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fecd50b14a534125228d7039951f92aaff742aff151c04546347aba4d3b4fbc" +checksum = "b3f14c3a10c8894d26175e57e9e26032e6d6c49c30cbe2468c5bf5f6b64bb0be" dependencies = [ "fs-swap", "interleaved-ordered", @@ -2852,9 +2812,9 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "198831fe8722331a395bc199a5d08efbc197497ef354cb4c77b969c02ffc0fc4" +checksum = "f58381b20ebe2c578e75dececd9da411414903415349548ccc46aac3209cdfbc" dependencies = [ "ahash", "hash-db", @@ -2873,7 +2833,7 @@ name = "migration-rocksdb" version = "0.1.0" dependencies = [ "kvdb", - "kvdb-rocksdb 0.6.0", + "kvdb-rocksdb", "log", "maplit", "tempfile", @@ -3198,7 +3158,7 @@ dependencies = [ "jsonrpc-core", "keccak-hash", "kvdb", - "kvdb-rocksdb 0.6.0", + "kvdb-rocksdb", "log", "migration-rocksdb", "node-filter", @@ -3281,9 +3241,9 @@ checksum = "16b56e3a2420138bdb970f84dfb9c774aea80fa0e7371549eedec0d80c209c67" [[package]] name = "parity-crypto" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4015edcfb0304c3b32f6c4ad68fb8b0a14f1d7d250bd0c6b9cd312d38038000" +checksum = "97cb113593965e4ece813a49f8ff669728dfb4feb76af8208ea73d81d58aee42" dependencies = [ "aes", "aes-ctr", @@ -3479,7 +3439,7 @@ dependencies = [ [[package]] name = "parity-secretstore" version = "1.0.0" -source = "git+https://github.com/paritytech/secret-store?rev=ebe751d#ebe751db6af07425d2e1823ac05a84d0fafe3dad" +source = "git+https://github.com/paritytech/secret-store?branch=v1.x#02964410fc05d7f94a133c0a2e5632f386040854" dependencies = [ "byteorder", "ethabi", @@ -3491,7 +3451,7 @@ dependencies = [ "jsonrpc-server-utils", "keccak-hash", "kvdb", - "kvdb-rocksdb 0.5.0", + "kvdb-rocksdb", "lazy_static", "libsecp256k1", "log", @@ -3579,9 +3539,9 @@ dependencies = [ [[package]] name = "parity-util-mem" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9344bc978467339b9ae688f9dcf279d1aaa0ccfc88e9a780c729b765a82d57d5" +checksum = "6e42755f26e5ea21a6a819d9e63cbd70713e9867a2b767ec2cc65ca7659532c5" dependencies = [ "cfg-if", "ethereum-types", @@ -3894,14 +3854,14 @@ dependencies = [ [[package]] name = "primitive-types" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4336f4f5d5524fa60bcbd6fe626f9223d8142a50e7053e979acdf0da41ab975" +checksum = "e5e4b9943a2da369aec5e96f7c10ebc74fcf434d39590d974b0a3460e6f67fbb" dependencies = [ "fixed-hash", "impl-codec", "impl-rlp", - "impl-serde 0.3.0", + "impl-serde", "uint", ] @@ -4654,7 +4614,7 @@ dependencies = [ "keccak-hash", "keccak-hasher 0.1.1", "kvdb", - "kvdb-rocksdb 0.6.0", + "kvdb-rocksdb", "lazy_static", "log", "num_cpus", @@ -4700,7 +4660,7 @@ dependencies = [ "keccak-hash", "keccak-hasher 0.1.1", "kvdb", - "kvdb-rocksdb 0.6.0", + "kvdb-rocksdb", "lazy_static", "log", "parity-bytes", diff --git a/Cargo.toml b/Cargo.toml index d8f01dec0..37a9724dc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ ctrlc = { version = "3.1.4", features = ["termination"] } dir = { path = "util/dir" } docopt = "1.0" engine = { path = "ethcore/engine" } -ethabi = { version = "9.0.1", optional = true } +ethabi = { version = "12.0", optional = true } ethcore = { path = "ethcore", features = ["parity"] } ethcore-accounts = { path = "accounts", optional = true } ethcore-blockchain = { path = "ethcore/blockchain" } @@ -35,16 +35,16 @@ ethcore-network = { path = "util/network" } ethcore-private-tx = { path = "ethcore/private-tx" } ethcore-service = { path = "ethcore/service" } ethcore-sync = { path = "ethcore/sync" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" ethkey = { path = "accounts/ethkey" } ethstore = { path = "accounts/ethstore" } fdlimit = "0.1" futures = "0.1" journaldb = { path = "util/journaldb" } jsonrpc-core = "14.0.3" -keccak-hash = "0.4.0" -kvdb = "0.4.0" -kvdb-rocksdb = "0.6.0" +keccak-hash = "0.5.0" +kvdb = "0.5.0" +kvdb-rocksdb = "0.7.0" log = "0.4" migration-rocksdb = { path = "util/migration-rocksdb" } node-filter = { path = "ethcore/node-filter" } @@ -52,21 +52,21 @@ num_cpus = "1.2" number_prefix = "0.2" panic_hook = { path = "util/panic-hook" } parity-bytes = "0.1" -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } parity-daemonize = "0.3" parity-hash-fetch = { path = "updater/hash-fetch" } parity-local-store = { path = "miner/local-store" } parity-path = "0.1" parity-rpc = { path = "rpc" } parity-runtime = "0.1.1" -parity-secretstore = { git = "https://github.com/paritytech/secret-store", rev = "ebe751d", optional = true } +parity-secretstore = { git = "https://github.com/paritytech/secret-store", branch = "v1.x", optional = true } parity-updater = { path = "updater" } -parity-util-mem = { version = "0.5.1", features = ["jemalloc-global"] } +parity-util-mem = { version = "0.6.0", features = ["jemalloc-global"] } parity-version = { path = "util/version" } parking_lot = "0.10.0" regex = "1.0" registrar = { path = "util/registrar" } -rlp = "0.4.0" +rlp = "0.4.5" rpassword = "1.0" rustc-hex = "2.1.0" semver = "0.9" diff --git a/accounts/Cargo.toml b/accounts/Cargo.toml index 251f22e7c..c4751ea61 100644 --- a/accounts/Cargo.toml +++ b/accounts/Cargo.toml @@ -10,12 +10,12 @@ edition = "2018" ethkey = { path = "ethkey" } ethstore = { path = "ethstore" } log = "0.4" -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } parking_lot = "0.10.0" serde = "1.0" serde_derive = "1.0" serde_json = "1.0" [dev-dependencies] -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" tempfile = "3.1" diff --git a/accounts/ethkey/Cargo.toml b/accounts/ethkey/Cargo.toml index 771f7bf89..d27c6e3d9 100644 --- a/accounts/ethkey/Cargo.toml +++ b/accounts/ethkey/Cargo.toml @@ -9,5 +9,5 @@ edit-distance = "2.0" log = "0.4" serde = "1.0" serde_derive = "1.0" -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } parity-wordlist = "1.3.1" diff --git a/accounts/ethkey/cli/Cargo.toml b/accounts/ethkey/cli/Cargo.toml index 6da5685c4..ef1f2435c 100644 --- a/accounts/ethkey/cli/Cargo.toml +++ b/accounts/ethkey/cli/Cargo.toml @@ -9,7 +9,7 @@ docopt = "1.0" env_logger = "0.5" ethkey = { path = "../" } panic_hook = { path = "../../../util/panic-hook" } -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } parity-wordlist= "1.3.1" rustc-hex = "2.1.0" serde = "1.0" diff --git a/accounts/ethstore/Cargo.toml b/accounts/ethstore/Cargo.toml index 031684506..66cbc7fe5 100644 --- a/accounts/ethstore/Cargo.toml +++ b/accounts/ethstore/Cargo.toml @@ -17,8 +17,8 @@ rustc-hex = "2.1.0" tiny-keccak = "2.0.2" time = "0.1.34" parking_lot = "0.10.0" -parity-crypto = { version = "0.5.0", features = ["publickey"] } -ethereum-types = "0.8.0" +parity-crypto = { version = "0.6.0", features = ["publickey"] } +ethereum-types = "0.9.0" dir = { path = "../../util/dir" } smallvec = "1.2.0" parity-wordlist = "1.3.1" diff --git a/accounts/ethstore/cli/Cargo.toml b/accounts/ethstore/cli/Cargo.toml index 561535ff3..083c8a9ea 100644 --- a/accounts/ethstore/cli/Cargo.toml +++ b/accounts/ethstore/cli/Cargo.toml @@ -14,7 +14,7 @@ serde_derive = "1.0" parking_lot = "0.10.0" ethstore = { path = "../" } ethkey = { path = "../../ethkey" } -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } dir = { path = '../../../util/dir' } panic_hook = { path = "../../../util/panic-hook" } diff --git a/cli-signer/Cargo.toml b/cli-signer/Cargo.toml index 877d3854d..7b6445315 100644 --- a/cli-signer/Cargo.toml +++ b/cli-signer/Cargo.toml @@ -7,7 +7,7 @@ version = "1.4.0" authors = ["Parity "] [dependencies] -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" futures = "0.1" rpassword = "1.0" parity-rpc = { path = "../rpc" } diff --git a/cli-signer/rpc-client/Cargo.toml b/cli-signer/rpc-client/Cargo.toml index ec86e0f44..f1931921f 100644 --- a/cli-signer/rpc-client/Cargo.toml +++ b/cli-signer/rpc-client/Cargo.toml @@ -7,7 +7,7 @@ version = "1.4.0" authors = ["Parity "] [dependencies] -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" futures = "0.1" log = "0.4" serde = "1.0" @@ -18,4 +18,4 @@ parking_lot = "0.10.0" jsonrpc-core = "14.0.3" jsonrpc-ws-server = "14.0.3" parity-rpc = { path = "../../rpc" } -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" diff --git a/ethash/Cargo.toml b/ethash/Cargo.toml index 3f586d1fd..e31d54cde 100644 --- a/ethash/Cargo.toml +++ b/ethash/Cargo.toml @@ -7,8 +7,8 @@ authors = ["Parity Technologies "] [dependencies] common-types = { path = "../ethcore/types" } either = "1.0.0" -ethereum-types = "0.8.0" -keccak-hash = "0.4.0" +ethereum-types = "0.9.0" +keccak-hash = "0.5.0" log = "0.4" memmap = "0.6" parking_lot = "0.10.0" diff --git a/ethash/src/cache.rs b/ethash/src/cache.rs index dcd78d5eb..756d1a141 100644 --- a/ethash/src/cache.rs +++ b/ethash/src/cache.rs @@ -301,17 +301,23 @@ impl AsRef<[Node]> for NodeCache { // out. It counts as a read and causes all writes afterwards to be elided. Yes, really. I know, I // want to refactor this to use less `unsafe` as much as the next rustacean. unsafe fn initialize_memory(memory: *mut Node, num_nodes: usize, ident: &H256) { - let dst = memory as *mut u8; + // We use raw pointers here, see above + let dst = slice::from_raw_parts_mut(memory as *mut u8, NODE_BYTES); debug_assert_eq!(ident.len(), 32); - keccak_512::unchecked(dst, NODE_BYTES, ident.as_ptr(), ident.len()); + keccak_512::write(&ident[..], dst); for i in 1..num_nodes { // We use raw pointers here, see above - let dst = memory.offset(i as _) as *mut u8; - let src = memory.offset(i as isize - 1) as *mut u8; - - keccak_512::unchecked(dst, NODE_BYTES, src, NODE_BYTES); + let dst = slice::from_raw_parts_mut( + memory.offset(i as _) as *mut u8, + NODE_BYTES, + ); + let src = slice::from_raw_parts( + memory.offset(i as isize - 1) as *mut u8, + NODE_BYTES, + ); + keccak_512::write(src, dst); } // Now this is initialized, we can treat it as a slice. diff --git a/ethash/src/compute.rs b/ethash/src/compute.rs index 8dc5a5295..71e4f0d80 100644 --- a/ethash/src/compute.rs +++ b/ethash/src/compute.rs @@ -139,13 +139,14 @@ pub fn quick_get_difficulty(header_hash: &H256, nonce: u64, mix_hash: &H256, pro let hash_len = header_hash.len(); buf[..hash_len].copy_from_slice(header_hash); - buf[hash_len..hash_len + mem::size_of::()].copy_from_slice(&nonce.to_ne_bytes()); + let end = hash_len + mem::size_of::(); + buf[hash_len..end].copy_from_slice(&nonce.to_ne_bytes()); - keccak_512::unchecked(buf.as_mut_ptr(), 64, buf.as_ptr(), 40); + keccak_512::inplace_range(&mut buf, 0..end); buf[64..].copy_from_slice(mix_hash); let mut hash = [0u8; 32]; - keccak_256::unchecked(hash.as_mut_ptr(), hash.len(), buf.as_ptr(), buf.len()); + keccak_256::write(&buf, &mut hash); hash } @@ -197,21 +198,17 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64) // improvements, since I can't imagine that 3-5% of our runtime is taken up by catting two // arrays together. let mut buf: MixBuf = MixBuf { - half_mix: unsafe { + half_mix: { // Pack `header_hash` and `nonce` together let mut out = [0u8; NODE_BYTES]; let hash_len = header_hash.len(); out[..hash_len].copy_from_slice(header_hash); - out[hash_len..hash_len + mem::size_of::()].copy_from_slice(&nonce.to_ne_bytes()); + let end = hash_len + mem::size_of::(); + out[hash_len..end].copy_from_slice(&nonce.to_ne_bytes()); // compute keccak-512 hash and replicate across mix - keccak_512::unchecked( - out.as_mut_ptr(), - NODE_BYTES, - out.as_ptr(), - header_hash.len() + mem::size_of::(), - ); + keccak_512::inplace_range(&mut out, 0..end); Node { bytes: out } }, @@ -285,21 +282,20 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64) let value: H256 = { // We can interpret the buffer as an array of `u8`s, since it's `repr(C)`. let read_ptr: *const u8 = &buf as *const MixBuf as *const u8; - // We overwrite the second half since `keccak_256` has an internal buffer and so allows - // overlapping arrays as input. - let write_ptr: *mut u8 = &mut buf.compress_bytes as *mut [u8; 32] as *mut u8; - unsafe { - keccak_256::unchecked( - write_ptr, - buf.compress_bytes.len(), + let buffer = unsafe { + core::slice::from_raw_parts( read_ptr, buf.half_mix.bytes.len() + buf.compress_bytes.len(), - ); - } + ) + }; + // We overwrite the buf.compress_bytes since `keccak_256` has an internal buffer and so allows + // overlapping arrays as input. + keccak_256::write(buffer, &mut buf.compress_bytes); + buf.compress_bytes }; - ProofOfWork { mix_hash: mix_hash, value: value } + ProofOfWork { mix_hash, value } } pub fn calculate_dag_item(node_index: u32, cache: &[Node]) -> Node { diff --git a/ethash/src/keccak.rs b/ethash/src/keccak.rs index f77228d8a..a3422d872 100644 --- a/ethash/src/keccak.rs +++ b/ethash/src/keccak.rs @@ -21,36 +21,11 @@ pub type H256 = [u8; 32]; pub mod keccak_512 { use super::hash; - pub use self::hash::keccak_512_unchecked as unchecked; - - pub fn write(input: &[u8], output: &mut [u8]) { - hash::keccak_512(input, output); - } - - pub fn inplace(input: &mut [u8]) { - // This is safe since `keccak_*` uses an internal buffer and copies the result to the output. This - // means that we can reuse the input buffer for both input and output. - unsafe { - hash::keccak_512_unchecked(input.as_mut_ptr(), input.len(), input.as_ptr(), input.len()); - } - } + pub use self::hash::{keccak_512 as write, keccak512 as inplace, keccak512_range as inplace_range}; } pub mod keccak_256 { use super::hash; - pub use self::hash::keccak_256_unchecked as unchecked; - - #[allow(dead_code)] - pub fn write(input: &[u8], output: &mut [u8]) { - hash::keccak_256(input, output); - } - - pub fn inplace(input: &mut [u8]) { - // This is safe since `keccak_*` uses an internal buffer and copies the result to the output. This - // means that we can reuse the input buffer for both input and output. - unsafe { - hash::keccak_256_unchecked(input.as_mut_ptr(), input.len(), input.as_ptr(), input.len()); - } - } + pub use self::hash::{keccak_256 as write, keccak256 as inplace, keccak256_range as inplace_range}; } diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml index 15150d89b..c87176b61 100644 --- a/ethcore/Cargo.toml +++ b/ethcore/Cargo.toml @@ -23,17 +23,17 @@ ethcore-db = { path = "./db" } ethcore-io = { path = "../util/io" } ethcore-miner = { path = "../miner" } ethcore-stratum = { path = "../miner/stratum", optional = true } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" evm = { path = "evm" } executive-state = { path = "executive-state" } futures = "0.1" hash-db = "0.15.0" itertools = "0.8.2" journaldb = { path = "../util/journaldb" } -keccak-hash = "0.4.0" -kvdb = "0.4.0" -kvdb-memorydb = { version = "0.4.0", optional = true } -kvdb-rocksdb = { version = "0.6.0", optional = true } +keccak-hash = "0.5.0" +kvdb = "0.5.0" +kvdb-memorydb = { version = "0.5.0", optional = true } +kvdb-rocksdb = { version = "0.7.0", optional = true } lazy_static = { version = "1.3", optional = true } log = "0.4" machine = { path = "./machine" } @@ -42,13 +42,13 @@ parity-bytes = "0.1" parking_lot = "0.10.0" pod = { path = "pod", optional = true } trie-db = "0.20.0" -parity-crypto = { version = "0.5.0", features = ["publickey"], optional = true } +parity-crypto = { version = "0.6.0", features = ["publickey"], optional = true } patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" } rand = "0.7.3" rand_xorshift = "0.2.0" rayon = "1.1" registrar = { path = "../util/registrar" } -rlp = "0.4.0" +rlp = "0.4.5" rustc-hex = "2.1.0" scopeguard = "1.1.0" serde = "1.0" @@ -75,10 +75,10 @@ env_logger = "0.5" ethcore-accounts = { path = "../accounts" } ethcore-builtin = { path = "./builtin" } ethjson = { path = "../json", features = ["test-helpers"] } -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } fetch = { path = "../util/fetch" } -kvdb-memorydb = "0.4.0" -kvdb-rocksdb = "0.6.0" +kvdb-memorydb = "0.5.0" +kvdb-rocksdb = "0.7.0" lazy_static = "1.3" machine = { path = "./machine", features = ["test-helpers"] } parity-runtime = "0.1.1" diff --git a/ethcore/account-db/Cargo.toml b/ethcore/account-db/Cargo.toml index a7a8b55ef..4628c8f4c 100644 --- a/ethcore/account-db/Cargo.toml +++ b/ethcore/account-db/Cargo.toml @@ -7,9 +7,9 @@ version = "0.1.0" edition = "2018" [dependencies] -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" hash-db = "0.15.0" -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.4.0" -rlp = "0.4" +kvdb = "0.5.0" +rlp = "0.4.5" diff --git a/ethcore/account-state/Cargo.toml b/ethcore/account-state/Cargo.toml index 90156afed..09c0b7525 100644 --- a/ethcore/account-state/Cargo.toml +++ b/ethcore/account-state/Cargo.toml @@ -9,22 +9,22 @@ edition = "2018" [dependencies] common-types = { path = "../types"} derive_more = "0.99" -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" } trie-vm-factories = { path = "../trie-vm-factories" } hash-db = "0.15.0" journaldb = { path = "../../util/journaldb" } -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.4.0" +kvdb = "0.5.0" log = "0.4" lru-cache = "0.1.2" -memory-db = "0.19.0" +memory-db = "0.20.0" parity-bytes = "0.1.0" -parity-util-mem = "0.5.1" +parity-util-mem = "0.6.0" parking_lot = "0.10.0" pod = { path = "../pod" } -rlp = "0.4.0" +rlp = "0.4.5" serde = { version = "1.0", features = ["derive"] } trie-db = "0.20.0" diff --git a/ethcore/block-gas-limit/Cargo.toml b/ethcore/block-gas-limit/Cargo.toml index 1e34dac7c..caecae0f4 100644 --- a/ethcore/block-gas-limit/Cargo.toml +++ b/ethcore/block-gas-limit/Cargo.toml @@ -9,10 +9,10 @@ license = "GPL-3.0" [dependencies] client-traits = { path = "../client-traits" } common-types = { path = "../types" } -ethabi = "9.0.1" -ethabi-derive = "9.0.1" -ethabi-contract = "9.0.0" -ethereum-types = "0.8.0" +ethabi = "12.0" +ethabi-derive = "12.0" +ethabi-contract = "11.0" +ethereum-types = "0.9.0" log = "0.4" [dev-dependencies] diff --git a/ethcore/block-reward/Cargo.toml b/ethcore/block-reward/Cargo.toml index 7ba774b81..68ff68898 100644 --- a/ethcore/block-reward/Cargo.toml +++ b/ethcore/block-reward/Cargo.toml @@ -9,11 +9,11 @@ license = "GPL-3.0" [dependencies] common-types = { path = "../types" } engine = { path = "../engine" } -ethabi = "9.0.1" -ethabi-derive = "9.0.1" -ethabi-contract = "9.0.0" -ethereum-types = "0.8.0" -keccak-hash = "0.4.0" +ethabi = "12.0" +ethabi-derive = "12.0" +ethabi-contract = "11.0" +ethereum-types = "0.9.0" +keccak-hash = "0.5.0" machine = { path = "../machine" } trace = { path = "../trace" } diff --git a/ethcore/blockchain/Cargo.toml b/ethcore/blockchain/Cargo.toml index 72a961974..ef3c31a80 100644 --- a/ethcore/blockchain/Cargo.toml +++ b/ethcore/blockchain/Cargo.toml @@ -12,24 +12,24 @@ ansi_term = "0.11" blooms-db = { path = "../../util/blooms-db" } common-types = { path = "../types" } ethcore-db = { path = "../db" } -ethereum-types = "0.8.0" -keccak-hash = "0.4.0" -parity-util-mem = "0.5.1" +ethereum-types = "0.9.0" +keccak-hash = "0.5.0" +parity-util-mem = "0.6.0" itertools = "0.8.2" -kvdb = "0.4.0" +kvdb = "0.5.0" log = "0.4" parity-bytes = "0.1" rand = "0.7.3" parking_lot = "0.10.0" rayon = "1.0" -rlp = "0.4.0" +rlp = "0.4.5" rlp_compress = { path = "../../util/rlp-compress" } rlp-derive = "0.1" triehash-ethereum = { version = "0.2", path = "../../util/triehash-ethereum" } [dev-dependencies] env_logger = "0.5" -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } rustc-hex = "2.1.0" tempfile = "3.1" -kvdb-memorydb = "0.4.0" +kvdb-memorydb = "0.5.0" diff --git a/ethcore/builtin/Cargo.toml b/ethcore/builtin/Cargo.toml index c252dd3f8..dda7958b0 100644 --- a/ethcore/builtin/Cargo.toml +++ b/ethcore/builtin/Cargo.toml @@ -10,13 +10,13 @@ bn = { git = "https://github.com/paritytech/bn", default-features = false } byteorder = "1.3.2" common-types = { path = "../types" } eip-152 = { path = "../../util/EIP-152" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" ethjson = { path = "../../json" } -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" log = "0.4" num = { version = "0.1", default-features = false, features = ["bigint"] } parity-bytes = "0.1" -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } [dev-dependencies] hex-literal = "0.2.1" diff --git a/ethcore/call-contract/Cargo.toml b/ethcore/call-contract/Cargo.toml index 08d46fa58..4e3433422 100644 --- a/ethcore/call-contract/Cargo.toml +++ b/ethcore/call-contract/Cargo.toml @@ -8,5 +8,5 @@ edition = "2018" [dependencies] types = { path = "../types", package = "common-types" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" bytes = { version = "0.1", package = "parity-bytes" } diff --git a/ethcore/client-traits/Cargo.toml b/ethcore/client-traits/Cargo.toml index 758442c97..a5226ca69 100644 --- a/ethcore/client-traits/Cargo.toml +++ b/ethcore/client-traits/Cargo.toml @@ -14,8 +14,8 @@ call-contract = { package = "ethcore-call-contract", path = "../call-contract" } common-types = { path = "../types" } ethcore-db = { path = "../db" } ethcore-miner = { path = "../../miner" } -ethereum-types = "0.8.0" -kvdb = "0.4.0" +ethereum-types = "0.9.0" +kvdb = "0.5.0" registrar = { path = "../../util/registrar" } stats = { path = "../../util/stats" } trace = { path = "../trace" } diff --git a/ethcore/db/Cargo.toml b/ethcore/db/Cargo.toml index c062ee01d..d7a94d299 100644 --- a/ethcore/db/Cargo.toml +++ b/ethcore/db/Cargo.toml @@ -9,9 +9,9 @@ edition = "2018" [dependencies] common-types = { path = "../types" } -ethereum-types = "0.8.0" -kvdb = "0.4.0" -parity-util-mem = "0.5.1" +ethereum-types = "0.9.0" +kvdb = "0.5.0" +parity-util-mem = "0.6.0" parking_lot = "0.10.0" -rlp = "0.4.0" +rlp = "0.4.5" rlp-derive = "0.1" diff --git a/ethcore/engine/Cargo.toml b/ethcore/engine/Cargo.toml index d1408be7b..d5d69a1e1 100644 --- a/ethcore/engine/Cargo.toml +++ b/ethcore/engine/Cargo.toml @@ -12,8 +12,8 @@ builtin = { path = "../builtin", package = "ethcore-builtin" } bytes = { package = "parity-bytes", version = "0.1.0" } client-traits = { path = "../client-traits" } common-types = { path = "../types" } -ethereum-types = "0.8.0" -parity-crypto = { version = "0.5.0", features = ["publickey"] } +ethereum-types = "0.9.0" +parity-crypto = { version = "0.6.0", features = ["publickey"] } machine = { path = "../machine" } vm = { path = "../vm" } diff --git a/ethcore/engines/authority-round/Cargo.toml b/ethcore/engines/authority-round/Cargo.toml index ced2473a0..cef7f19bd 100644 --- a/ethcore/engines/authority-round/Cargo.toml +++ b/ethcore/engines/authority-round/Cargo.toml @@ -12,16 +12,16 @@ block-reward = { path = "../../block-reward" } client-traits = { path = "../../client-traits" } common-types = { path = "../../types" } derive_more = "0.99" -ethabi = "9.0.1" -ethabi-contract = "9.0.0" -ethabi-derive = "9.0.1" -ethereum-types = "0.8.0" +ethabi = "12.0" +ethabi-contract = "11.0" +ethabi-derive = "12.0" +ethereum-types = "0.9.0" ethjson = { path = "../../../json" } -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } engine = { path = "../../engine" } io = { package = "ethcore-io", path = "../../../util/io" } itertools = "0.8.2" -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" lazy_static = "1.3.0" log = "0.4" lru-cache = "0.1" @@ -29,7 +29,7 @@ machine = { path = "../../machine" } parity-bytes = "0.1" parking_lot = "0.10.0" rand = "0.7.3" -rlp = "0.4.0" +rlp = "0.4.5" time-utils = { path = "../../../util/time-utils" } unexpected = { path = "../../../util/unexpected" } validator-set = { path = "../validator-set" } diff --git a/ethcore/engines/basic-authority/Cargo.toml b/ethcore/engines/basic-authority/Cargo.toml index b536e0179..71c5b9149 100644 --- a/ethcore/engines/basic-authority/Cargo.toml +++ b/ethcore/engines/basic-authority/Cargo.toml @@ -10,20 +10,20 @@ license = "GPL-3.0" client-traits = { path = "../../client-traits" } common-types = { path = "../../types" } engine = { path = "../../engine" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" ethjson = { path = "../../../json" } -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } log = "0.4.8" machine = { path = "../../machine" } parking_lot = "0.10.0" -rlp = "0.4.2" +rlp = "0.4.5" validator-set = { path = "../validator-set" } [dev-dependencies] accounts = { package = "ethcore-accounts", path = "../../../accounts" } engine = { path = "../../engine", features = ["test-helpers"] } ethcore = { path = "../..", features = ["test-helpers"] } -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" tempfile = "3.1" spec = { path = "../../spec" } diff --git a/ethcore/engines/clique/Cargo.toml b/ethcore/engines/clique/Cargo.toml index 150784699..e1e09bc58 100644 --- a/ethcore/engines/clique/Cargo.toml +++ b/ethcore/engines/clique/Cargo.toml @@ -9,18 +9,18 @@ license = "GPL-3.0" [dependencies] client-traits = { path = "../../client-traits" } common-types = { path = "../../types" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" ethjson = { path = "../../../json" } -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } engine = { path = "../../engine" } -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" lazy_static = "1.3.0" log = "0.4" lru-cache = "0.1" machine = { path = "../../machine" } rand = "0.7.3" parking_lot = "0.10.0" -rlp = "0.4.0" +rlp = "0.4.5" time-utils = { path = "../../../util/time-utils" } unexpected = { path = "../../../util/unexpected" } diff --git a/ethcore/engines/ethash/Cargo.toml b/ethcore/engines/ethash/Cargo.toml index 4708f2139..8f557f185 100644 --- a/ethcore/engines/ethash/Cargo.toml +++ b/ethcore/engines/ethash/Cargo.toml @@ -11,16 +11,16 @@ block-reward = { path = "../../block-reward" } common-types = { path = "../../types" } engine = { path = "../../engine" } ethash= { path = "../../../ethash" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" ethjson = { path = "../../../json" } -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" log = "0.4.8" machine = { path = "../../machine" } unexpected = { path = "../../../util/unexpected" } [dev-dependencies] ethcore = { path = "../..", features = ["test-helpers"] } -keccak-hash = "0.4.0" -rlp = "0.4.2" +keccak-hash = "0.5.0" +rlp = "0.4.5" spec = { path = "../../spec" } tempfile = "3.1" diff --git a/ethcore/engines/instant-seal/Cargo.toml b/ethcore/engines/instant-seal/Cargo.toml index c3a4eb2b4..c6f9af472 100644 --- a/ethcore/engines/instant-seal/Cargo.toml +++ b/ethcore/engines/instant-seal/Cargo.toml @@ -11,12 +11,12 @@ client-traits = { path = "../../client-traits" } common-types = { path = "../../types" } engine = { path = "../../engine" } ethjson = { path = "../../../json" } -ethereum-types = "0.8.0" -keccak-hash = "0.4.0" +ethereum-types = "0.9.0" +keccak-hash = "0.5.0" machine = { path = "../../machine" } trace = { path = "../../trace" } [dev-dependencies] ethcore = { path = "../..", features = ["test-helpers"] } spec = { path = "../../spec" } -rlp = "0.4.2" +rlp = "0.4.5" diff --git a/ethcore/engines/null-engine/Cargo.toml b/ethcore/engines/null-engine/Cargo.toml index 2fa5edea1..a35a368d3 100644 --- a/ethcore/engines/null-engine/Cargo.toml +++ b/ethcore/engines/null-engine/Cargo.toml @@ -11,5 +11,5 @@ common-types = { path = "../../types" } block-reward = { path = "../../block-reward" } engine = { path = "../../engine" } ethjson = { path = "../../../json" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" machine = { path = "../../machine" } diff --git a/ethcore/engines/validator-set/Cargo.toml b/ethcore/engines/validator-set/Cargo.toml index aa8e34c49..6f6cf5e32 100644 --- a/ethcore/engines/validator-set/Cargo.toml +++ b/ethcore/engines/validator-set/Cargo.toml @@ -10,22 +10,22 @@ license = "GPL-3.0" client-traits = { path = "../../client-traits" } common-types = { path = "../../types" } engine = { path = "../../engine" } -ethabi = "9.0.1" -ethabi-contract = "9.0.0" -ethabi-derive = "9.0.1" -ethereum-types = "0.8.0" +ethabi = "12.0" +ethabi-contract = "11.0" +ethabi-derive = "12.0" +ethereum-types = "0.9.0" ethjson = { path = "../../../json" } executive-state = { path = "../../executive-state" } -keccak-hash = "0.4.0" -kvdb = "0.4.0" +keccak-hash = "0.5.0" +kvdb = "0.5.0" lazy_static = "1.3.0" log = "0.4.8" machine = { path = "../../machine" } memory-cache = { path = "../../../util/memory-cache" } parity-bytes = "0.1.0" -parity-util-mem = "0.5.1" +parity-util-mem = "0.6.0" parking_lot = "0.10.0" -rlp = "0.4.2" +rlp = "0.4.5" triehash = { package = "triehash-ethereum", version = "0.2", path = "../../../util/triehash-ethereum" } unexpected = { path = "../../../util/unexpected" } vm = { path = "../../vm" } @@ -37,8 +37,8 @@ engine = { path = "../../engine", features = ["test-helpers"] } env_logger = "0.6.2" ethcore = { path = "../..", features = ["test-helpers"] } rustc-hex = "2.1.0" -keccak-hash = "0.4.0" -parity-crypto = { version = "0.5.0", features = ["publickey"] } +keccak-hash = "0.5.0" +parity-crypto = { version = "0.6.0", features = ["publickey"] } spec = { path = "../../spec" } [features] diff --git a/ethcore/evm/Cargo.toml b/ethcore/evm/Cargo.toml index e9e32685f..1a38968ad 100644 --- a/ethcore/evm/Cargo.toml +++ b/ethcore/evm/Cargo.toml @@ -7,12 +7,12 @@ authors = ["Parity Technologies "] [dependencies] bit-set = "0.4" parity-bytes = "0.1" -ethereum-types = "0.8.0" -parity-util-mem = "0.5.1" +ethereum-types = "0.9.0" +parity-util-mem = "0.6.0" lazy_static = "1.0" log = "0.4" vm = { path = "../vm" } -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" parking_lot = "0.10.0" memory-cache = { path = "../../util/memory-cache" } diff --git a/ethcore/executive-state/Cargo.toml b/ethcore/executive-state/Cargo.toml index a00b3fb5d..d7df13ecd 100644 --- a/ethcore/executive-state/Cargo.toml +++ b/ethcore/executive-state/Cargo.toml @@ -15,10 +15,10 @@ account-db = { path = "../account-db" } account-state = { path = "../account-state" } bytes = { package = "parity-bytes", version = "0.1.0" } common-types = { path = "../types" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" hash-db = "0.15.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.4.0" +kvdb = "0.5.0" log = "0.4.8" machine = { path = "../machine" } trace = { path = "../trace" } @@ -28,9 +28,9 @@ vm = { path = "../vm" } [dev-dependencies] env_logger = "0.5" ethcore = { path = "..", features = ["test-helpers"] } -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } evm = { path = "../evm" } -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" pod = { path = "../pod" } hex-literal = "0.2.1" spec = { path = "../spec" } diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml index 116012b13..8a5b1ce20 100644 --- a/ethcore/light/Cargo.toml +++ b/ethcore/light/Cargo.toml @@ -15,21 +15,21 @@ derive_more = "0.99" engine = { path = "../engine" } ethcore-db = { path = "../db" } ethcore-blockchain = { path = "../blockchain" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" executive-state = { path = "../executive-state" } machine = { path = "../machine" } -memory-db = "0.19.0" +memory-db = "0.20.0" trie-db = "0.20.0" patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" } ethcore-network = { path = "../../util/network" } ethcore-miner = { path = "../../miner" } ethcore-io = { path = "../../util/io" } hash-db = "0.15.0" -parity-util-mem = "0.5.1" +parity-util-mem = "0.6.0" vm = { path = "../vm" } fastmap = { path = "../../util/fastmap" } failsafe = { version = "0.3.0", default-features = false, features = ["parking_lot_mutex"] } -rlp = "0.4.0" +rlp = "0.4.5" rlp-derive = "0.1" smallvec = "1.2.0" futures = "0.1" @@ -40,17 +40,17 @@ serde_derive = "1.0" spec = { path = "../spec" } parking_lot = "0.10.0" stats = { path = "../../util/stats" } -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" keccak-hasher = { path = "../../util/keccak-hasher" } triehash-ethereum = { version = "0.2", path = "../../util/triehash-ethereum" } -kvdb = "0.4.0" +kvdb = "0.5.0" memory-cache = { path = "../../util/memory-cache" } journaldb = { path = "../../util/journaldb" } verification = { path = "../verification" } [dev-dependencies] ethcore = { path = "..", features = ["test-helpers"] } -kvdb-memorydb = "0.4.0" +kvdb-memorydb = "0.5.0" tempfile = "3.1" [features] diff --git a/ethcore/machine/Cargo.toml b/ethcore/machine/Cargo.toml index 8f9fef268..cd31a08f5 100644 --- a/ethcore/machine/Cargo.toml +++ b/ethcore/machine/Cargo.toml @@ -16,22 +16,22 @@ account-state = { path = "../account-state" } client-traits = { path = "../client-traits" } common-types = { path = "../types" } crossbeam-utils = "0.7.2" -ethabi = "9.0.1" -ethabi-contract = "9.0.0" -ethabi-derive = "9.0.1" +ethabi = "12.0" +ethabi-contract = "11.0" +ethabi-derive = "12.0" ethcore-builtin = { path = "../builtin" } ethcore-call-contract = { path = "../call-contract" } ethcore-io = { path = "../../util/io" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" # Used for tests in other crates through the `test-helpers` feature ethjson = { path = "../../json", optional = true } evm = { path = "../evm" } -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" log = "0.4" lru-cache = "0.1.2" parity-bytes = "0.1.0" parking_lot = "0.10.0" -rlp = "0.4.2" +rlp = "0.4.5" state-db = { path = "../state-db" } trace = { path = "../trace" } trie-vm-factories = { path = "../trie-vm-factories" } @@ -43,7 +43,7 @@ criterion = "0.3" ethcore = { path = "../", features = ["test-helpers"] } ethcore-io = { path = "../../util/io" } ethjson = { path = "../../json" } -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } hex-literal = "0.2.1" spec = { path = "../spec" } tempfile = "3.1" diff --git a/ethcore/node-filter/Cargo.toml b/ethcore/node-filter/Cargo.toml index 4cef9d6ff..83ddc0918 100644 --- a/ethcore/node-filter/Cargo.toml +++ b/ethcore/node-filter/Cargo.toml @@ -12,17 +12,17 @@ common-types = { path = "../types" } ethcore = { path = ".."} ethcore-network = { path = "../../util/network" } ethcore-network-devp2p = { path = "../../util/network-devp2p" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" log = "0.4" parking_lot = "0.10.0" -ethabi = "9.0.1" -ethabi-derive = "9.0.1" -ethabi-contract = "9.0.0" +ethabi = "12.0" +ethabi-derive = "12.0" +ethabi-contract = "11.0" lru-cache = "0.1" [dev-dependencies] ethcore = { path = "..", features = ["test-helpers"] } -kvdb-memorydb = "0.4.0" +kvdb-memorydb = "0.5.0" ethcore-io = { path = "../../util/io" } spec = { path = "../spec" } tempfile = "3.1" diff --git a/ethcore/pod/Cargo.toml b/ethcore/pod/Cargo.toml index 54c6e3b90..c1090ca10 100644 --- a/ethcore/pod/Cargo.toml +++ b/ethcore/pod/Cargo.toml @@ -8,17 +8,17 @@ edition = "2018" [dependencies] common-types = { path = "../types" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" ethjson = { path = "../../json" } ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" } hash-db = "0.15.0" itertools = "0.8.2" -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.4.0" +kvdb = "0.5.0" log = "0.4" parity-bytes = "0.1.0" -rlp = "0.4" +rlp = "0.4.5" rustc-hex = "2.1.0" serde = { version = "1.0", features = ["derive"] } trie-db = "0.20.0" diff --git a/ethcore/private-tx/Cargo.toml b/ethcore/private-tx/Cargo.toml index 02b1d2c18..abd9298d5 100644 --- a/ethcore/private-tx/Cargo.toml +++ b/ethcore/private-tx/Cargo.toml @@ -10,33 +10,33 @@ account-state = { path = "../account-state" } client-traits = { path = "../client-traits" } common-types = { path = "../types" } derive_more = "0.99" -ethabi = "9.0.1" -ethabi-contract = "9.0.0" -ethabi-derive = "9.0.1" +ethabi = "12.0" +ethabi-contract = "11.0" +ethabi-derive = "12.0" ethcore = { path = ".." } ethcore-db = { path = "../db" } ethcore-call-contract = { path = "../call-contract" } ethcore-io = { path = "../../util/io" } ethcore-miner = { path = "../../miner" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" ethjson = { path = "../../json" } fetch = { path = "../../util/fetch" } futures = "0.1" -parity-util-mem = "0.5.1" +parity-util-mem = "0.6.0" hash-db = "0.15.0" -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.4.0" +kvdb = "0.5.0" log = "0.4" machine = { path = "../machine" } journaldb = { path = "../../util/journaldb" } parity-bytes = "0.1" -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } parking_lot = "0.10.0" trie-db = "0.20.0" patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" } registrar = { path = "../../util/registrar" } -rlp = "0.4.0" +rlp = "0.4.5" rlp-derive = "0.1" rustc-hex = "2.1.0" serde = "1.0" diff --git a/ethcore/service/Cargo.toml b/ethcore/service/Cargo.toml index 530a3be56..5a87b11ad 100644 --- a/ethcore/service/Cargo.toml +++ b/ethcore/service/Cargo.toml @@ -13,8 +13,8 @@ ethcore-blockchain = { path = "../blockchain" } ethcore-io = { path = "../../util/io" } ethcore-private-tx = { path = "../private-tx" } ethcore-sync = { path = "../sync" } -ethereum-types = "0.8.0" -kvdb = "0.4.0" +ethereum-types = "0.9.0" +kvdb = "0.5.0" log = "0.4" snapshot = { path = "../snapshot" } spec = { path = "../spec" } @@ -23,5 +23,5 @@ trace-time = "0.1" [dev-dependencies] ethcore = { path = "..", features = ["test-helpers"] } ethcore-db = { path = "../db" } -kvdb-rocksdb = "0.6.0" +kvdb-rocksdb = "0.7.0" tempfile = "3.1" diff --git a/ethcore/snapshot/Cargo.toml b/ethcore/snapshot/Cargo.toml index 228232629..eec0ae84d 100644 --- a/ethcore/snapshot/Cargo.toml +++ b/ethcore/snapshot/Cargo.toml @@ -22,20 +22,20 @@ crossbeam-utils = "0.7.2" engine = { path = "../engine" } ethcore-db = { path = "../db" } ethcore-io = { path = "../../util/io" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" } hash-db = "0.15.0" itertools = "0.8.2" journaldb = { path = "../../util/journaldb" } -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.4.0" +kvdb = "0.5.0" log = "0.4.8" num_cpus = "1.10.1" rand = "0.7.3" rand_xorshift = "0.2.0" parking_lot = "0.10.0" -rlp = "0.4.2" +rlp = "0.4.5" rlp-derive = "0.1" scopeguard = "1.1.0" snappy = { package = "parity-snappy", version ="0.1.0" } @@ -48,12 +48,12 @@ accounts = { package = "ethcore-accounts", path = "../../accounts" } criterion = "0.3.0" engine = { path = "../engine", features = ["test-helpers"] } env_logger = "0.5" -ethabi = "9.0.1" -ethabi-contract = "9.0.0" -ethabi-derive = "9.0.1" +ethabi = "12.0" +ethabi-contract = "11.0" +ethabi-derive = "12.0" ethcore = { path = "..", features = ["test-helpers"] } ethkey = { path = "../../accounts/ethkey" } -kvdb-rocksdb = "0.6.0" +kvdb-rocksdb = "0.7.0" lazy_static = { version = "1.3" } spec = { path = "../spec" } tempfile = "3.1" diff --git a/ethcore/snapshot/snapshot-tests/Cargo.toml b/ethcore/snapshot/snapshot-tests/Cargo.toml index bf1ba8e95..e19f8c096 100644 --- a/ethcore/snapshot/snapshot-tests/Cargo.toml +++ b/ethcore/snapshot/snapshot-tests/Cargo.toml @@ -17,28 +17,28 @@ env_logger = "0.5" ethcore = { path = "../..", features = ["test-helpers"] } ethcore-db = { path = "../../db" } ethcore-io = { path = "../../../util/io" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" ethtrie = { package = "patricia-trie-ethereum", path = "../../../util/patricia-trie-ethereum" } hash-db = "0.15.0" journaldb = { path = "../../../util/journaldb" } -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" keccak-hasher = { path = "../../../util/keccak-hasher" } -kvdb = "0.4.0" -kvdb-rocksdb = "0.6.0" +kvdb = "0.5.0" +kvdb-rocksdb = "0.7.0" log = "0.4.8" parking_lot = "0.10.0" -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } rand = "0.7.3" rand_xorshift = "0.2.0" -rlp = "0.4.2" +rlp = "0.4.5" snappy = { package = "parity-snappy", version ="0.1.0" } snapshot = { path = "../../snapshot", features = ["test-helpers"] } spec = { path = "../../spec" } tempfile = "3.1" trie-db = "0.20.0" trie-standardmap = "0.15.0" -ethabi = "9.0.1" -ethabi-contract = "9.0.0" -ethabi-derive = "9.0.1" +ethabi = "12.0" +ethabi-contract = "11.0" +ethabi-derive = "12.0" lazy_static = { version = "1.3" } triehash = { package = "triehash-ethereum", version = "0.2", path = "../../../util/triehash-ethereum" } diff --git a/ethcore/spec/Cargo.toml b/ethcore/spec/Cargo.toml index e99d48f82..fd1f33c2c 100644 --- a/ethcore/spec/Cargo.toml +++ b/ethcore/spec/Cargo.toml @@ -17,21 +17,21 @@ common-types = { path = "../types" } engine = { path = "../engine" } ethash = { path = "../../ethash" } ethash-engine = { path = "../engines/ethash" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" ethjson = { path = "../../json" } evm = { path = "../evm" } executive-state = { path = "../executive-state" } hash-db = "0.15.0" instant-seal = { path = "../engines/instant-seal" } journaldb = { path = "../../util/journaldb" } -keccak-hash = "0.4.0" -kvdb-memorydb = "0.4.0" +keccak-hash = "0.5.0" +kvdb-memorydb = "0.5.0" log = "0.4.8" machine = { path = "../machine" } maplit = "1" null-engine = { path = "../engines/null-engine" } pod = { path = "../pod" } -rlp = "0.4.2" +rlp = "0.4.5" serde = "1.0" serde_json = "1.0" trace = { path = "../trace" } diff --git a/ethcore/state-db/Cargo.toml b/ethcore/state-db/Cargo.toml index 28da89412..c2181ea67 100644 --- a/ethcore/state-db/Cargo.toml +++ b/ethcore/state-db/Cargo.toml @@ -11,12 +11,12 @@ account-state = { path = "../account-state" } bloom_journal = { package = "accounts-bloom", path = "../../util/bloom" } common-types = { path = "../types"} ethcore-db = { path = "../db" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" hash-db = "0.15.0" -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" keccak-hasher = { path = "../../util/keccak-hasher" } journaldb = { path = "../../util/journaldb" } -kvdb = "0.4.0" +kvdb = "0.5.0" log = "0.4.6" lru-cache = "0.1.2" memory-cache = { path = "../../util/memory-cache" } diff --git a/ethcore/sync/Cargo.toml b/ethcore/sync/Cargo.toml index bcb30c677..6fb55c90b 100644 --- a/ethcore/sync/Cargo.toml +++ b/ethcore/sync/Cargo.toml @@ -16,21 +16,21 @@ devp2p = { package = "ethcore-network-devp2p", path = "../../util/network-devp2p enum_primitive = "0.1.1" ethcore-io = { path = "../../util/io" } ethcore-private-tx = { path = "../private-tx" } -ethereum-forkid = "0.1" -ethereum-types = "0.8.0" +ethereum-forkid = "0.2" +ethereum-types = "0.9.0" fastmap = { path = "../../util/fastmap" } futures = "0.1" indexmap = "1.3.0" -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" light = { package = "ethcore-light", path = "../light" } log = "0.4" network = { package = "ethcore-network", path = "../../util/network" } parity-runtime = "0.1.1" -parity-crypto = { version = "0.5.0", features = ["publickey"] } -parity-util-mem = "0.5.1" +parity-crypto = { version = "0.6.0", features = ["publickey"] } +parity-util-mem = "0.6.0" rand = "0.7.3" parking_lot = "0.10.0" -rlp = "0.4.0" +rlp = "0.4.5" snapshot = { path = "../snapshot" } trace-time = "0.1" triehash-ethereum = { version = "0.2", path = "../../util/triehash-ethereum" } @@ -40,7 +40,7 @@ env_logger = "0.5" engine = { path = "../engine" } ethcore = { path = "..", features = ["test-helpers"] } ethcore-io = { path = "../../util/io", features = ["mio"] } -kvdb-memorydb = "0.4.0" +kvdb-memorydb = "0.5.0" machine = { path = "../machine" } rand_xorshift = "0.2.0" rustc-hex = "2.1.0" diff --git a/ethcore/trace/Cargo.toml b/ethcore/trace/Cargo.toml index a4b85ced6..dea975c52 100644 --- a/ethcore/trace/Cargo.toml +++ b/ethcore/trace/Cargo.toml @@ -9,14 +9,14 @@ edition = "2018" [dependencies] ethcore-blockchain = { path = "../blockchain" } ethcore-db = { path = "../db" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" evm = { path = "../evm" } -kvdb = "0.4.0" +kvdb = "0.5.0" log = "0.4" parity-bytes = "0.1.0" -parity-util-mem = "0.5.1" +parity-util-mem = "0.6.0" parking_lot = "0.10.0" -rlp = "0.4.0" +rlp = "0.4.5" rlp-derive = "0.1" vm = { path = "../vm" } diff --git a/ethcore/types/Cargo.toml b/ethcore/types/Cargo.toml index 11e9d4be1..84194bf35 100644 --- a/ethcore/types/Cargo.toml +++ b/ethcore/types/Cargo.toml @@ -6,17 +6,17 @@ authors = ["Parity Technologies "] [dependencies] derive_more = "0.99" -ethbloom = "0.8.0" +ethbloom = "0.9.0" ethcore-io = { path = "../../util/io" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" ethjson = { path = "../../json" } -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" parity-bytes = "0.1" -parity-crypto = { version = "0.5.0", features = ["publickey"] } -parity-util-mem = "0.5.1" +parity-crypto = { version = "0.6.0", features = ["publickey"] } +parity-util-mem = "0.6.0" parity-snappy = "0.1" patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" } -rlp = "0.4.0" +rlp = "0.4.5" rlp-derive = "0.1" unexpected = { path = "../../util/unexpected" } vm = { path = "../vm"} diff --git a/ethcore/verification/Cargo.toml b/ethcore/verification/Cargo.toml index 6ba652b4d..608708483 100644 --- a/ethcore/verification/Cargo.toml +++ b/ethcore/verification/Cargo.toml @@ -18,15 +18,15 @@ client-traits = { path = "../client-traits" } common-types = { path = "../types" } engine = { path = "../engine" } ethcore-io = { path = "../../util/io" } -ethereum-types = "0.8.0" -keccak-hash = "0.4.0" +ethereum-types = "0.9.0" +keccak-hash = "0.5.0" len-caching-lock = { path = "../../util/len-caching-lock" } log = "0.4" num_cpus = "1.2" parity-bytes = "0.1.0" -parity-util-mem = "0.5.1" +parity-util-mem = "0.6.0" parking_lot = "0.10.0" -rlp = "0.4.2" +rlp = "0.4.5" time-utils = { path = "../../util/time-utils" } triehash = { package = "triehash-ethereum", version = "0.2", path = "../../util/triehash-ethereum" } unexpected = { path = "../../util/unexpected" } @@ -35,7 +35,7 @@ unexpected = { path = "../../util/unexpected" } common-types = { path = "../types", features = ["test-helpers"] } criterion = "0.3" ethcore = { path = "../", features = ["test-helpers"] } -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } machine = { path = "../machine" } null-engine = { path = "../engines/null-engine" } spec = { path = "../spec" } diff --git a/ethcore/vm/Cargo.toml b/ethcore/vm/Cargo.toml index fdf431edb..f01b05e3d 100644 --- a/ethcore/vm/Cargo.toml +++ b/ethcore/vm/Cargo.toml @@ -6,8 +6,8 @@ authors = ["Parity Technologies "] [dependencies] parity-bytes = "0.1" -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" } ethjson = { path = "../../json" } -rlp = "0.4.0" -keccak-hash = "0.4.0" +rlp = "0.4.5" +keccak-hash = "0.5.0" diff --git a/ethcore/wasm/Cargo.toml b/ethcore/wasm/Cargo.toml index 1feb9b31c..9706fe372 100644 --- a/ethcore/wasm/Cargo.toml +++ b/ethcore/wasm/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Parity Technologies "] [dependencies] byteorder = "1.0" -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" log = "0.4" parity-wasm = "0.31" libc = "0.2" diff --git a/ethcore/wasm/run/Cargo.toml b/ethcore/wasm/run/Cargo.toml index 4d32950e4..2dd2bae03 100644 --- a/ethcore/wasm/run/Cargo.toml +++ b/ethcore/wasm/run/Cargo.toml @@ -8,7 +8,7 @@ authors = ["Parity Technologies "] serde = "1" serde_json = "1" serde_derive = "1" -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" ethjson = { path = "../../../json" } vm = { path = "../../vm" } wasm = { path = "../" } diff --git a/evmbin/Cargo.toml b/evmbin/Cargo.toml index f377cc817..e63e0d514 100644 --- a/evmbin/Cargo.toml +++ b/evmbin/Cargo.toml @@ -15,7 +15,7 @@ common-types = { path = "../ethcore/types", features = ["test-helpers"] } docopt = "1.0" env_logger = "0.5" ethcore = { path = "../ethcore", features = ["test-helpers", "json-tests"] } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" ethjson = { path = "../json", features = ["test-helpers"] } evm = { path = "../ethcore/evm" } panic_hook = { path = "../util/panic-hook" } diff --git a/json/Cargo.toml b/json/Cargo.toml index 3b3340cd4..17b0bfd83 100644 --- a/json/Cargo.toml +++ b/json/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" rustc-hex = "2.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/miner/Cargo.toml b/miner/Cargo.toml index 36ebeba0b..c20bdd9df 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -16,21 +16,21 @@ url = { version = "2.1.1", optional = true } # Miner ansi_term = "0.11" common-types = { path = "../ethcore/types" } -ethabi = "9.0.1" -ethabi-derive = "9.0.1" -ethabi-contract = "9.0.0" +ethabi = "12.0" +ethabi-derive = "12.0" +ethabi-contract = "11.0" ethcore-call-contract = { path = "../ethcore/call-contract" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" futures = "0.1" -parity-util-mem = "0.5.1" -keccak-hash = "0.4.0" +parity-util-mem = "0.6.0" +keccak-hash = "0.5.0" linked-hash-map = "0.5" log = "0.4" parity-runtime = "0.1.1" parking_lot = "0.10.0" price-info = { path = "./price-info", optional = true } registrar = { path = "../util/registrar" } -rlp = "0.4.0" +rlp = "0.4.5" serde = "1.0" serde_derive = "1.0" serde_json = "1.0" @@ -39,7 +39,7 @@ transaction-pool = "2.0.1" [dev-dependencies] env_logger = "0.5" -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } rustc-hex = "2.1.0" [features] diff --git a/miner/local-store/Cargo.toml b/miner/local-store/Cargo.toml index 6b4591034..d2b3ccbf3 100644 --- a/miner/local-store/Cargo.toml +++ b/miner/local-store/Cargo.toml @@ -8,14 +8,14 @@ edition = "2018" [dependencies] common-types = { path = "../../ethcore/types" } ethcore-io = { path = "../../util/io" } -kvdb = "0.4.0" +kvdb = "0.5.0" log = "0.4" -rlp = "0.4.0" +rlp = "0.4.5" serde = "1.0" serde_derive = "1.0" serde_json = "1.0" [dev-dependencies] ethkey = { path = "../../accounts/ethkey" } -parity-crypto = { version = "0.5.0", features = ["publickey"] } -kvdb-memorydb = "0.4.0" +parity-crypto = { version = "0.6.0", features = ["publickey"] } +kvdb-memorydb = "0.5.0" diff --git a/miner/stratum/Cargo.toml b/miner/stratum/Cargo.toml index b1f3c690f..c681e52db 100644 --- a/miner/stratum/Cargo.toml +++ b/miner/stratum/Cargo.toml @@ -6,8 +6,8 @@ license = "GPL-3.0" authors = ["Parity Technologies "] [dependencies] -ethereum-types = "0.8.0" -keccak-hash = "0.4.0" +ethereum-types = "0.9.0" +keccak-hash = "0.5.0" jsonrpc-core = "14.0.3" jsonrpc-tcp-server = "14.0.3" log = "0.4" diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 61961c395..0e569ae9e 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -45,22 +45,22 @@ ethcore-miner = { path = "../miner" } ethcore-network = { path = "../util/network" } ethcore-private-tx = { path = "../ethcore/private-tx" } ethcore-sync = { path = "../ethcore/sync" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" fastmap = { path = "../util/fastmap" } machine = { path = "../ethcore/machine" } parity-bytes = "0.1" -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } eip-712 = { path = "../util/EIP-712" } ethjson = { path = "../json" } ethkey = { path = "../accounts/ethkey" } ethstore = { path = "../accounts/ethstore" } fetch = { path = "../util/fetch" } -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" parity-runtime = { version = "0.1.1", features = ["test-helpers"] } parity-updater = { path = "../updater" } parity-version = { path = "../util/version" } -rlp = "0.4.0" +rlp = "0.4.5" account-state = { path = "../ethcore/account-state" } snapshot = { path = "../ethcore/snapshot" } stats = { path = "../util/stats" } diff --git a/updater/Cargo.toml b/updater/Cargo.toml index a49665ca3..9a0f792f1 100644 --- a/updater/Cargo.toml +++ b/updater/Cargo.toml @@ -8,13 +8,13 @@ authors = ["Parity Technologies "] [dependencies] client-traits = { path = "../ethcore/client-traits" } common-types = { path = "../ethcore/types" } -ethabi = "9.0.1" -ethabi-contract = "9.0.0" -ethabi-derive = "9.0.1" +ethabi = "12.0" +ethabi-contract = "11.0" +ethabi-derive = "12.0" ethcore = { path = "../ethcore" } ethcore-sync = { path = "../ethcore/sync" } -ethereum-types = "0.8.0" -keccak-hash = "0.4.0" +ethereum-types = "0.9.0" +keccak-hash = "0.5.0" lazy_static = "1.0" log = "0.4" parity-bytes = "0.1" diff --git a/updater/hash-fetch/Cargo.toml b/updater/hash-fetch/Cargo.toml index b097618f2..945fb18c3 100644 --- a/updater/hash-fetch/Cargo.toml +++ b/updater/hash-fetch/Cargo.toml @@ -16,15 +16,15 @@ rand = "0.7.3" rustc-hex = "2.1.0" fetch = { path = "../../util/fetch" } parity-bytes = "0.1" -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" parity-runtime = "0.1.1" -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" registrar = { path = "../../util/registrar" } types = { path = "../../ethcore/types", package = "common-types" } -ethabi = "9.0.1" -ethabi-derive = "9.0.1" -ethabi-contract = "9.0.0" +ethabi = "12.0" +ethabi-derive = "12.0" +ethabi-contract = "11.0" [dev-dependencies] parking_lot = "0.10.0" diff --git a/util/EIP-712/Cargo.toml b/util/EIP-712/Cargo.toml index fb9f90337..9f8b8f74f 100644 --- a/util/EIP-712/Cargo.toml +++ b/util/EIP-712/Cargo.toml @@ -14,9 +14,9 @@ edition = "2018" serde_derive = "1.0" serde = "1.0" serde_json = "1.0" -ethabi = "9.0.1" -keccak-hash = "0.4.0" -ethereum-types = "0.8.0" +ethabi = "12.0" +keccak-hash = "0.5.0" +ethereum-types = "0.9.0" failure = "0.1" itertools = "0.8.2" lazy_static = "1.1" diff --git a/util/blooms-db/Cargo.toml b/util/blooms-db/Cargo.toml index 5ba9b5b29..9755d1ee5 100644 --- a/util/blooms-db/Cargo.toml +++ b/util/blooms-db/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -ethbloom = "0.8.0" +ethbloom = "0.9.0" parking_lot = "0.10.0" [dev-dependencies] diff --git a/util/dir/Cargo.toml b/util/dir/Cargo.toml index 156fdc199..ca43d191f 100644 --- a/util/dir/Cargo.toml +++ b/util/dir/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] license = "GPL3" [dependencies] -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" journaldb = { path = "../journaldb" } app_dirs = { git = "https://github.com/paritytech/app-dirs-rs" } home = "0.5.3" diff --git a/util/fastmap/Cargo.toml b/util/fastmap/Cargo.toml index 774d56b55..e6ff7445b 100644 --- a/util/fastmap/Cargo.toml +++ b/util/fastmap/Cargo.toml @@ -6,5 +6,5 @@ description = "Specialized version of `HashMap` with H256 keys and fast hashing license = "GPL-3.0" [dependencies] -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" plain_hasher = "0.2" diff --git a/util/journaldb/Cargo.toml b/util/journaldb/Cargo.toml index 08fe1b1be..9035a4efc 100644 --- a/util/journaldb/Cargo.toml +++ b/util/journaldb/Cargo.toml @@ -8,18 +8,18 @@ edition = "2018" [dependencies] parity-bytes = "0.1" -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" hash-db = "0.15.0" -parity-util-mem = "0.5.1" +parity-util-mem = "0.6.0" keccak-hasher = { path = "../keccak-hasher" } -kvdb = "0.4.0" +kvdb = "0.5.0" log = "0.4" -memory-db = "0.19.0" +memory-db = "0.20.0" parking_lot = "0.10.0" fastmap = { path = "../../util/fastmap" } -rlp = "0.4.0" +rlp = "0.4.5" [dev-dependencies] env_logger = "0.5" -keccak-hash = "0.4.0" -kvdb-memorydb = "0.4.0" +keccak-hash = "0.5.0" +kvdb-memorydb = "0.5.0" diff --git a/util/keccak-hasher/Cargo.toml b/util/keccak-hasher/Cargo.toml index 34cb08bba..b274d82b2 100644 --- a/util/keccak-hasher/Cargo.toml +++ b/util/keccak-hasher/Cargo.toml @@ -7,7 +7,7 @@ description = "Keccak-256 implementation of the Hasher trait" license = "GPL-3.0" [dependencies] -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" tiny-keccak = "2.0.2" hash-db = "0.15.0" plain_hasher = "0.2" diff --git a/util/memory-cache/Cargo.toml b/util/memory-cache/Cargo.toml index aa5f46cf3..53e14e845 100644 --- a/util/memory-cache/Cargo.toml +++ b/util/memory-cache/Cargo.toml @@ -6,5 +6,5 @@ description = "An LRU-cache which operates on memory used" license = "GPL3" [dependencies] -parity-util-mem = "0.5.1" +parity-util-mem = "0.6.0" lru-cache = "0.1" diff --git a/util/migration-rocksdb/Cargo.toml b/util/migration-rocksdb/Cargo.toml index 82b3a47eb..e179a9e80 100644 --- a/util/migration-rocksdb/Cargo.toml +++ b/util/migration-rocksdb/Cargo.toml @@ -7,8 +7,8 @@ license = "GPL-3.0" [dependencies] log = "0.4" -kvdb = "0.4.0" -kvdb-rocksdb = "0.6.0" +kvdb = "0.5.0" +kvdb-rocksdb = "0.7.0" [dev-dependencies] tempfile = "3.1" diff --git a/util/network-devp2p/Cargo.toml b/util/network-devp2p/Cargo.toml index 0e30012d9..8611d3d50 100644 --- a/util/network-devp2p/Cargo.toml +++ b/util/network-devp2p/Cargo.toml @@ -13,10 +13,10 @@ bytes = "0.4" derive_more = "0.99" enr = { version = "0.1.0-alpha.5", default-features = false, features = ["rust-secp256k1"] } ethcore-io = { path = "../io", features = ["mio"] } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" igd = "0.10.0" ipnetwork = "0.12.6" -keccak-hash = "0.4.0" +keccak-hash = "0.5.0" libc = "0.2.7" log = "0.4" lru-cache = "0.1" @@ -24,12 +24,12 @@ mio = "0.6.8" natpmp = "0.2" network = { package = "ethcore-network", path = "../network" } parity-bytes = "0.1" -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } parity-path = "0.1" parity-snappy = "0.1" parking_lot = "0.10.0" rand = "0.7.3" -rlp = "0.4.0" +rlp = "0.4.5" secp256k1 = "0.17" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/util/network/Cargo.toml b/util/network/Cargo.toml index 6a9cac437..2d1f27408 100644 --- a/util/network/Cargo.toml +++ b/util/network/Cargo.toml @@ -8,12 +8,12 @@ authors = ["Parity Technologies "] [dependencies] derive_more = "0.99" -parity-crypto = { version = "0.5.0", features = ["publickey"] } +parity-crypto = { version = "0.6.0", features = ["publickey"] } ethcore-io = { path = "../io" } -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" ipnetwork = "0.12.6" lazy_static = "1.0" -rlp = "0.4.0" +rlp = "0.4.5" libc = "0.2" parity-snappy = "0.1" semver = {version="0.9.0", features=["serde"]} diff --git a/util/patricia-trie-ethereum/Cargo.toml b/util/patricia-trie-ethereum/Cargo.toml index 392f08092..f2655a9f8 100644 --- a/util/patricia-trie-ethereum/Cargo.toml +++ b/util/patricia-trie-ethereum/Cargo.toml @@ -9,14 +9,14 @@ license = "GPL-3.0" trie-db = "0.20.0" keccak-hasher = { version = "0.1.1", path = "../keccak-hasher" } hash-db = "0.15.0" -rlp = "0.4.4" +rlp = "0.4.5" parity-bytes = "0.1" -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" elastic-array = "0.10" [dev-dependencies] -memory-db = "0.19.0" -keccak-hash = "0.4.0" +memory-db = "0.20.0" +keccak-hash = "0.5.0" journaldb = { path = "../journaldb" } criterion = "0.3" diff --git a/util/registrar/Cargo.toml b/util/registrar/Cargo.toml index 1cbd5cbec..c3d91c0b7 100644 --- a/util/registrar/Cargo.toml +++ b/util/registrar/Cargo.toml @@ -7,8 +7,8 @@ authors = ["Parity Technologies "] [dependencies] call-contract = { package = "ethcore-call-contract", path = "../../ethcore/call-contract" } -ethabi = "9.0.1" -ethabi-derive = "9.0.1" -ethabi-contract = "9.0.0" -keccak-hash = "0.4.0" +ethabi = "12.0" +ethabi-derive = "12.0" +ethabi-contract = "11.0" +keccak-hash = "0.5.0" types = { path = "../../ethcore/types", package = "common-types" } diff --git a/util/rlp-compress/Cargo.toml b/util/rlp-compress/Cargo.toml index 0bcb092a1..79c4b4863 100644 --- a/util/rlp-compress/Cargo.toml +++ b/util/rlp-compress/Cargo.toml @@ -4,6 +4,6 @@ version = "0.1.0" authors = ["Parity Technologies "] [dependencies] -rlp = "0.4.0" +rlp = "0.4.5" elastic-array = "0.10" lazy_static = "1.0" diff --git a/util/triehash-ethereum/Cargo.toml b/util/triehash-ethereum/Cargo.toml index 4fd01cbd0..c1e888612 100644 --- a/util/triehash-ethereum/Cargo.toml +++ b/util/triehash-ethereum/Cargo.toml @@ -7,5 +7,5 @@ license = "GPL-3.0" [dependencies] triehash = "0.8.2" -ethereum-types = "0.8.0" +ethereum-types = "0.9.0" keccak-hasher = { path = "../keccak-hasher" } diff --git a/util/version/Cargo.toml b/util/version/Cargo.toml index d5230806f..0688c1951 100644 --- a/util/version/Cargo.toml +++ b/util/version/Cargo.toml @@ -23,7 +23,7 @@ goerli = { forkBlock = 1561651, critical = false } [dependencies] parity-bytes = "0.1" -rlp = "0.4.0" +rlp = "0.4.5" target_info = "0.1" [build-dependencies]