diff --git a/Cargo.lock b/Cargo.lock index 3109f68811a..94ed31e268a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -249,12 +249,12 @@ dependencies = [ name = "common-types" version = "0.1.0" dependencies = [ - "ethcore-bytes 0.1.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "ethjson 0.1.0", "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", - "rlp 0.2.1", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", "rlp_derive 0.1.0", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -445,18 +445,6 @@ dependencies = [ "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "env_logger" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "error-chain" version = "0.11.0" @@ -519,7 +507,7 @@ version = "1.12.0" dependencies = [ "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -555,8 +543,6 @@ dependencies = [ "ethabi-derive 5.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "ethash 1.12.0", "ethcore-bloom-journal 0.1.0", - "ethcore-bytes 0.1.0", - "ethcore-crypto 0.1.0", "ethcore-io 1.12.0", "ethcore-logger 1.12.0", "ethcore-miner 1.12.0", @@ -569,30 +555,32 @@ dependencies = [ "evm 0.1.0", "fake-hardware-wallet 0.0.1", "hardware-wallet 1.12.0", - "hashdb 0.2.0", + "hashdb 0.2.0 (git+https://github.com/paritytech/parity-common)", "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", "journaldb 0.2.0", - "keccak-hash 0.1.2", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", "keccak-hasher 0.1.0", - "kvdb 0.1.0", - "kvdb-memorydb 0.1.0", - "kvdb-rocksdb 0.1.0", + "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common)", + "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common)", + "kvdb-rocksdb 0.1.0 (git+https://github.com/paritytech/parity-common)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", "memory-cache 0.1.0", - "memorydb 0.2.0", + "memorydb 0.2.0 (git+https://github.com/paritytech/parity-common)", "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", + "parity-crypto 0.1.0 (git+https://github.com/paritytech/parity-common)", "parity-machine 0.1.0", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "patricia-trie 0.2.0", + "patricia-trie 0.2.1 (git+https://github.com/paritytech/parity-common)", "patricia-trie-ethereum 0.1.0", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.1", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", "rlp_compress 0.1.0", "rlp_derive 0.1.0", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -601,8 +589,8 @@ dependencies = [ "stop-guard 0.1.0", "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "trace-time 0.1.0", - "trie-standardmap 0.1.0", - "triehash 0.1.0", + "trie-standardmap 0.1.0 (git+https://github.com/paritytech/parity-common)", + "triehash-ethereum 0.2.0", "unexpected 0.1.0", "using_queue 0.1.0", "vm 0.1.0", @@ -616,21 +604,6 @@ dependencies = [ "siphasher 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "ethcore-bytes" -version = "0.1.0" - -[[package]] -name = "ethcore-crypto" -version = "0.1.0" -dependencies = [ - "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ring 0.12.1 (git+https://github.com/paritytech/ring)", - "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "ethcore-devtools" version = "1.12.0" @@ -657,35 +630,35 @@ dependencies = [ "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore 1.12.0", - "ethcore-bytes 0.1.0", "ethcore-io 1.12.0", "ethcore-network 1.12.0", "ethcore-transaction 0.1.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", - "hashdb 0.2.0", + "hashdb 0.2.0 (git+https://github.com/paritytech/parity-common)", "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", "keccak-hasher 0.1.0", - "kvdb 0.1.0", - "kvdb-memorydb 0.1.0", + "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common)", + "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "memory-cache 0.1.0", - "memorydb 0.2.0", + "memorydb 0.2.0 (git+https://github.com/paritytech/parity-common)", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "patricia-trie 0.2.0", + "patricia-trie 0.2.1 (git+https://github.com/paritytech/parity-common)", "patricia-trie-ethereum 0.1.0", - "plain_hasher 0.2.0", + "plain_hasher 0.1.0 (git+https://github.com/paritytech/parity-common)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.1", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", "rlp_derive 0.1.0", "serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "stats 0.1.0", "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "triehash 0.1.0", + "triehash-ethereum 0.2.0", "vm 0.1.0", ] @@ -720,13 +693,13 @@ dependencies = [ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.11.24 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", "linked-hash-map 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "parity-reactor 0.1.0", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "price-info 1.12.0", - "rlp 0.2.1", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "trace-time 0.1.0", "transaction-pool 1.12.1", @@ -739,13 +712,13 @@ version = "1.12.0" dependencies = [ "assert_matches 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethcore-crypto 0.1.0", "ethcore-io 1.12.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "ethkey 0.3.0", "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.1", + "parity-crypto 0.1.0 (git+https://github.com/paritytech/parity-common)", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", "snappy 0.1.0 (git+https://github.com/paritytech/rust-snappy)", ] @@ -757,8 +730,6 @@ dependencies = [ "assert_matches 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethcore-bytes 0.1.0", - "ethcore-crypto 0.1.0", "ethcore-io 1.12.0", "ethcore-logger 1.12.0", "ethcore-network 1.12.0", @@ -766,14 +737,16 @@ dependencies = [ "ethkey 0.3.0", "igd 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", + "parity-crypto 0.1.0 (git+https://github.com/paritytech/parity-common)", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "path 0.1.1", + "path 0.1.1 (git+https://github.com/paritytech/parity-common)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.1", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -794,8 +767,6 @@ dependencies = [ "ethabi-contract 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethabi-derive 5.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore 1.12.0", - "ethcore-bytes 0.1.0", - "ethcore-crypto 0.1.0", "ethcore-io 1.12.0", "ethcore-logger 1.12.0", "ethcore-miner 1.12.0", @@ -805,13 +776,15 @@ dependencies = [ "ethkey 0.3.0", "fetch 0.1.0", "futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", + "parity-crypto 0.1.0 (git+https://github.com/paritytech/parity-common)", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "patricia-trie 0.2.0", + "patricia-trie 0.2.1 (git+https://github.com/paritytech/parity-common)", "patricia-trie-ethereum 0.1.0", "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.1", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", "rlp_derive 0.1.0", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -830,8 +803,6 @@ dependencies = [ "ethabi-contract 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethabi-derive 5.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore 1.12.0", - "ethcore-bytes 0.1.0", - "ethcore-crypto 0.1.0", "ethcore-logger 1.12.0", "ethcore-sync 1.12.0", "ethcore-transaction 0.1.0", @@ -840,11 +811,13 @@ dependencies = [ "futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.11.24 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", - "kvdb 0.1.0", - "kvdb-rocksdb 0.1.0", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", + "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common)", + "kvdb-rocksdb 0.1.0 (git+https://github.com/paritytech/parity-common)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", + "parity-crypto 0.1.0 (git+https://github.com/paritytech/parity-common)", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -870,8 +843,8 @@ dependencies = [ "ethcore-io 1.12.0", "ethcore-private-tx 1.0.0", "ethcore-sync 1.12.0", - "kvdb 0.1.0", - "kvdb-rocksdb 0.1.0", + "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common)", + "kvdb-rocksdb 0.1.0 (git+https://github.com/paritytech/parity-common)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "stop-guard 0.1.0", "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -888,7 +861,7 @@ dependencies = [ "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)", "jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)", "jsonrpc-tcp-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)", - "keccak-hash 0.1.2", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -901,7 +874,6 @@ version = "1.12.0" dependencies = [ "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore 1.12.0", - "ethcore-bytes 0.1.0", "ethcore-io 1.12.0", "ethcore-light 1.12.0", "ethcore-network 1.12.0", @@ -910,24 +882,25 @@ dependencies = [ "ethcore-transaction 0.1.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "ethkey 0.3.0", - "hashdb 0.2.0", + "hashdb 0.2.0 (git+https://github.com/paritytech/parity-common)", "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", "keccak-hasher 0.1.0", - "kvdb 0.1.0", - "kvdb-memorydb 0.1.0", + "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common)", + "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "plain_hasher 0.2.0", + "plain_hasher 0.1.0 (git+https://github.com/paritytech/parity-common)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.1", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "trace-time 0.1.0", - "triehash 0.1.0", + "triehash-ethereum 0.2.0", ] [[package]] @@ -939,8 +912,8 @@ dependencies = [ "ethkey 0.3.0", "evm 0.1.0", "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", - "rlp 0.2.1", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "unexpected 0.1.0", ] @@ -985,11 +958,11 @@ dependencies = [ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "edit-distance 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "eth-secp256k1 0.5.7 (git+https://github.com/paritytech/rust-secp256k1)", - "ethcore-crypto 0.1.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "mem 0.1.0", + "parity-crypto 0.1.0 (git+https://github.com/paritytech/parity-common)", "parity-wordlist 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1019,13 +992,13 @@ name = "ethstore" version = "0.2.0" dependencies = [ "dir 0.1.1", - "ethcore-crypto 0.1.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "ethkey 0.3.0", "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-crypto 0.1.0 (git+https://github.com/paritytech/parity-common)", "parity-wordlist 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1062,7 +1035,7 @@ dependencies = [ "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "memory-cache 0.1.0", @@ -1077,12 +1050,12 @@ version = "0.1.0" dependencies = [ "docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore 1.12.0", - "ethcore-bytes 0.1.0", "ethcore-transaction 0.1.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "ethjson 0.1.0", "evm 0.1.0", "panic_hook 0.1.0", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1250,6 +1223,7 @@ dependencies = [ [[package]] name = "hashdb" version = "0.2.0" +source = "git+https://github.com/paritytech/parity-common#d322bcebd2303306a8f259ea38026598a5b439c0" dependencies = [ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1290,14 +1264,6 @@ name = "httparse" version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "humantime" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "hyper" version = "0.11.24" @@ -1406,20 +1372,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "journaldb" version = "0.2.0" dependencies = [ - "ethcore-bytes 0.1.0", "ethcore-logger 1.12.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hashdb 0.2.0", + "hashdb 0.2.0 (git+https://github.com/paritytech/parity-common)", "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", "keccak-hasher 0.1.0", - "kvdb 0.1.0", - "kvdb-memorydb 0.1.0", + "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common)", + "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "memorydb 0.2.0", + "memorydb 0.2.0 (git+https://github.com/paritytech/parity-common)", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "plain_hasher 0.2.0", - "rlp 0.2.1", + "plain_hasher 0.1.0 (git+https://github.com/paritytech/parity-common)", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", ] [[package]] @@ -1521,9 +1487,9 @@ dependencies = [ [[package]] name = "keccak-hash" version = "0.1.2" +source = "git+https://github.com/paritytech/parity-common#d322bcebd2303306a8f259ea38026598a5b439c0" dependencies = [ "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1532,8 +1498,8 @@ name = "keccak-hasher" version = "0.1.0" dependencies = [ "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hashdb 0.2.0", - "plain_hasher 0.2.0", + "hashdb 0.2.0 (git+https://github.com/paritytech/parity-common)", + "plain_hasher 0.1.0 (git+https://github.com/paritytech/parity-common)", "tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1549,34 +1515,36 @@ dependencies = [ [[package]] name = "kvdb" version = "0.1.0" +source = "git+https://github.com/paritytech/parity-common#d322bcebd2303306a8f259ea38026598a5b439c0" dependencies = [ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethcore-bytes 0.1.0", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", ] [[package]] name = "kvdb-memorydb" version = "0.1.0" +source = "git+https://github.com/paritytech/parity-common#d322bcebd2303306a8f259ea38026598a5b439c0" dependencies = [ - "kvdb 0.1.0", + "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common)", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "kvdb-rocksdb" version = "0.1.0" +source = "git+https://github.com/paritytech/parity-common#d322bcebd2303306a8f259ea38026598a5b439c0" dependencies = [ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "fs-swap 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "interleaved-ordered 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.0", + "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "rocksdb 0.4.5 (git+https://github.com/paritytech/rust-rocksdb)", - "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1736,24 +1704,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "memorydb" version = "0.2.0" +source = "git+https://github.com/paritytech/parity-common#d322bcebd2303306a8f259ea38026598a5b439c0" dependencies = [ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hashdb 0.2.0", + "hashdb 0.2.0 (git+https://github.com/paritytech/parity-common)", "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", - "keccak-hasher 0.1.0", - "plain_hasher 0.2.0", - "rlp 0.2.1", - "tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "plain_hasher 0.1.0 (git+https://github.com/paritytech/parity-common)", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", ] [[package]] name = "migration-rocksdb" version = "0.1.0" dependencies = [ - "kvdb 0.1.0", - "kvdb-rocksdb 0.1.0", + "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common)", + "kvdb-rocksdb 0.1.0 (git+https://github.com/paritytech/parity-common)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1911,7 +1876,7 @@ dependencies = [ "ethcore-network 1.12.0", "ethcore-network-devp2p 1.12.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.0", + "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2076,7 +2041,6 @@ dependencies = [ "docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore 1.12.0", - "ethcore-bytes 0.1.0", "ethcore-io 1.12.0", "ethcore-light 1.12.0", "ethcore-logger 1.12.0", @@ -2096,9 +2060,9 @@ dependencies = [ "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)", "journaldb 0.2.0", "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)", - "keccak-hash 0.1.2", - "kvdb 0.1.0", - "kvdb-rocksdb 0.1.0", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", + "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common)", + "kvdb-rocksdb 0.1.0 (git+https://github.com/paritytech/parity-common)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "mem 0.1.0", "migration-rocksdb 0.1.0", @@ -2107,6 +2071,7 @@ dependencies = [ "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "number_prefix 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "panic_hook 0.1.0", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", "parity-dapps 1.12.0", "parity-hash-fetch 1.12.0", "parity-ipfs-api 1.12.0", @@ -2118,11 +2083,11 @@ dependencies = [ "parity-version 1.12.0", "parity-whisper 0.1.0", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "path 0.1.1", + "path 0.1.1 (git+https://github.com/paritytech/parity-common)", "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "registrar 0.0.1", - "rlp 0.2.1", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", "rpassword 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "rpc-cli 1.4.0", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2138,6 +2103,11 @@ dependencies = [ "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "parity-bytes" +version = "0.1.0" +source = "git+https://github.com/paritytech/parity-common#d322bcebd2303306a8f259ea38026598a5b439c0" + [[package]] name = "parity-clib" version = "1.12.0" @@ -2145,13 +2115,24 @@ dependencies = [ "parity 1.12.0", ] +[[package]] +name = "parity-crypto" +version = "0.1.0" +source = "git+https://github.com/paritytech/parity-common#d322bcebd2303306a8f259ea38026598a5b439c0" +dependencies = [ + "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ring 0.12.1 (git+https://github.com/paritytech/ring)", + "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", + "tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "parity-dapps" version = "1.12.0" dependencies = [ "base32 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "ethcore-bytes 0.1.0", "ethcore-devtools 1.12.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "fetch 0.1.0", @@ -2160,11 +2141,12 @@ dependencies = [ "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)", "jsonrpc-http-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)", - "keccak-hash 0.1.2", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", "linked-hash-map 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", "node-health 0.1.0", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", "parity-dapps-glue 1.9.1", "parity-hash-fetch 1.12.0", "parity-reactor 0.1.0", @@ -2201,17 +2183,17 @@ dependencies = [ "ethabi 5.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "ethabi-contract 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethabi-derive 5.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ethcore-bytes 0.1.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "fake-fetch 0.0.1", "fetch 0.1.0", "futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.11.24 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", "parity-reactor 0.1.0", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2225,12 +2207,12 @@ version = "1.12.0" dependencies = [ "cid 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore 1.12.0", - "ethcore-bytes 0.1.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)", "jsonrpc-http-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)", "multihash 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.1", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", "unicase 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2242,10 +2224,10 @@ dependencies = [ "ethcore-io 1.12.0", "ethcore-transaction 0.1.0", "ethkey 0.3.0", - "kvdb 0.1.0", - "kvdb-memorydb 0.1.0", + "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common)", + "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.1", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", "serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2274,8 +2256,6 @@ dependencies = [ "cid 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "ethash 1.12.0", "ethcore 1.12.0", - "ethcore-bytes 0.1.0", - "ethcore-crypto 0.1.0", "ethcore-devtools 1.12.0", "ethcore-io 1.12.0", "ethcore-light 1.12.0", @@ -2302,21 +2282,23 @@ dependencies = [ "jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)", "jsonrpc-pubsub 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)", "jsonrpc-ws-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)", - "keccak-hash 0.1.2", - "kvdb-memorydb 0.1.0", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", + "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", "multihash 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "node-health 0.1.0", "order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", + "parity-crypto 0.1.0 (git+https://github.com/paritytech/parity-common)", "parity-reactor 0.1.0", "parity-updater 1.12.0", "parity-version 1.12.0", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "patricia-trie 0.2.0", + "patricia-trie 0.2.1 (git+https://github.com/paritytech/parity-common)", "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.1", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2338,7 +2320,7 @@ dependencies = [ "futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)", "jsonrpc-ws-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)", - "keccak-hash 0.1.2", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "parity-rpc 1.12.0", @@ -2373,17 +2355,17 @@ dependencies = [ "ethabi-contract 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethabi-derive 5.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore 1.12.0", - "ethcore-bytes 0.1.0", "ethcore-sync 1.12.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", "parity-hash-fetch 1.12.0", "parity-version 1.12.0", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "path 0.1.1", + "path 0.1.1 (git+https://github.com/paritytech/parity-common)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2394,8 +2376,8 @@ dependencies = [ name = "parity-version" version = "1.12.0" dependencies = [ - "ethcore-bytes 0.1.0", - "rlp 0.2.1", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", "rustc_version 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2416,7 +2398,6 @@ version = "0.1.0" dependencies = [ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ethcore-crypto 0.1.0", "ethcore-network 1.12.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "ethkey 0.3.0", @@ -2427,9 +2408,10 @@ dependencies = [ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "mem 0.1.0", "ordered-float 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-crypto 0.1.0 (git+https://github.com/paritytech/parity-common)", "parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.1", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", "serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2475,29 +2457,22 @@ dependencies = [ [[package]] name = "path" version = "0.1.1" +source = "git+https://github.com/paritytech/parity-common#d322bcebd2303306a8f259ea38026598a5b439c0" dependencies = [ "dirs 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "patricia-trie" -version = "0.2.0" +version = "0.2.1" +source = "git+https://github.com/paritytech/parity-common#d322bcebd2303306a8f259ea38026598a5b439c0" dependencies = [ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", - "ethcore-bytes 0.1.0", - "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hashdb 0.2.0", + "hashdb 0.2.0 (git+https://github.com/paritytech/parity-common)", "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", - "keccak-hasher 0.1.0", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "memorydb 0.2.0", - "patricia-trie-ethereum 0.1.0", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.1", - "trie-standardmap 0.1.0", - "triehash 0.1.0", ] [[package]] @@ -2505,12 +2480,12 @@ name = "patricia-trie-ethereum" version = "0.1.0" dependencies = [ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethcore-bytes 0.1.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hashdb 0.2.0", + "hashdb 0.2.0 (git+https://github.com/paritytech/parity-common)", "keccak-hasher 0.1.0", - "patricia-trie 0.2.0", - "rlp 0.2.1", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", + "patricia-trie 0.2.1 (git+https://github.com/paritytech/parity-common)", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", ] [[package]] @@ -2564,11 +2539,12 @@ dependencies = [ [[package]] name = "plain_hasher" -version = "0.2.0" +version = "0.1.0" +source = "git+https://github.com/paritytech/parity-common#d322bcebd2303306a8f259ea38026598a5b439c0" dependencies = [ "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hashdb 0.2.0", + "hashdb 0.2.0 (git+https://github.com/paritytech/parity-common)", ] [[package]] @@ -2793,31 +2769,11 @@ dependencies = [ "utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "regex" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "regex-syntax" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "regex-syntax" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "registrar" version = "0.0.1" @@ -2826,7 +2782,7 @@ dependencies = [ "ethabi-contract 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethabi-derive 5.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", ] [[package]] @@ -2853,6 +2809,7 @@ dependencies = [ [[package]] name = "rlp" version = "0.2.1" +source = "git+https://github.com/paritytech/parity-common#d322bcebd2303306a8f259ea38026598a5b439c0" dependencies = [ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2866,7 +2823,7 @@ version = "0.1.0" dependencies = [ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.1", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", ] [[package]] @@ -2874,7 +2831,7 @@ name = "rlp_derive" version = "0.1.0" dependencies = [ "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.1", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3266,14 +3223,6 @@ dependencies = [ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "termcolor" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "termion" version = "1.5.1" @@ -3588,28 +3537,33 @@ dependencies = [ [[package]] name = "trie-standardmap" version = "0.1.0" +source = "git+https://github.com/paritytech/parity-common#d322bcebd2303306a8f259ea38026598a5b439c0" dependencies = [ - "ethcore-bytes 0.1.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", - "rlp 0.2.1", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", ] [[package]] name = "triehash" -version = "0.1.0" +version = "0.2.0" +source = "git+https://github.com/paritytech/parity-common#d322bcebd2303306a8f259ea38026598a5b439c0" dependencies = [ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak-hash 0.1.2", - "rlp 0.2.1", - "trie-standardmap 0.1.0", + "hashdb 0.2.0 (git+https://github.com/paritytech/parity-common)", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", ] [[package]] -name = "ucd-util" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" +name = "triehash-ethereum" +version = "0.2.0" +dependencies = [ + "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "keccak-hasher 0.1.0", + "triehash 0.2.0 (git+https://github.com/paritytech/parity-common)", +] [[package]] name = "uint" @@ -3740,14 +3694,14 @@ version = "0.1.0" dependencies = [ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "common-types 0.1.0", - "ethcore-bytes 0.1.0", "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "ethjson 0.1.0", - "keccak-hash 0.1.2", + "keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "patricia-trie 0.2.0", + "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)", + "patricia-trie 0.2.1 (git+https://github.com/paritytech/parity-common)", "patricia-trie-ethereum 0.1.0", - "rlp 0.2.1", + "rlp 0.2.1 (git+https://github.com/paritytech/parity-common)", ] [[package]] @@ -3846,14 +3800,6 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "wincolor" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "ws" version = "0.7.5" @@ -3964,7 +3910,6 @@ dependencies = [ "checksum either 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "740178ddf48b1a9e878e6d6509a1442a2d42fd2928aae8e7a6f8a36fb01981b3" "checksum elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "88d4851b005ef16de812ea9acdb7bece2f0a40dd86c07b85631d7dafa54537bb" "checksum env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b" -"checksum env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0e6e40ebb0e66918a37b38c7acab4e10d299e0463fe2af5d29b9cc86710cfd2a" "checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3" "checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02" "checksum eth-secp256k1 0.5.7 (git+https://github.com/paritytech/rust-secp256k1)" = "" @@ -3989,12 +3934,12 @@ dependencies = [ "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" "checksum globset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "464627f948c3190ae3d04b1bc6d7dca2f785bda0ac01278e6db129ad383dbeb6" "checksum hamming 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65043da274378d68241eb9a8f8f8aa54e349136f7b8e12f63e3ef44043cc30e1" +"checksum hashdb 0.2.0 (git+https://github.com/paritytech/parity-common)" = "" "checksum heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461" "checksum heck 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea04fa3ead4e05e51a7c806fc07271fdbde4e246a6c6d1efd52e72230b771b82" "checksum hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6a22814455d41612f41161581c2883c0c6a1c41852729b17d5ed88f01e153aa" "checksum hidapi 0.3.1 (git+https://github.com/paritytech/hidapi-rs)" = "" "checksum httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "af2f2dd97457e8fb1ae7c5a420db346af389926e36f43768b96f101546b04a07" -"checksum humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0484fda3e7007f2a4a0d9c3a703ca38c71c54c55602ce4660c419fd32e188c9e" "checksum hyper 0.11.24 (registry+https://github.com/rust-lang/crates.io-index)" = "df4dd5dae401458087396b6db7fabc4d6760aa456a5fa8e92bda549f39cae661" "checksum hyper-rustls 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d6cdc1751771a14b8175764394f025e309a28c825ed9eaf97fa62bb831dc8c5" "checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d" @@ -4013,7 +3958,11 @@ dependencies = [ "checksum jsonrpc-server-utils 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)" = "" "checksum jsonrpc-tcp-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)" = "" "checksum jsonrpc-ws-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)" = "" +"checksum keccak-hash 0.1.2 (git+https://github.com/paritytech/parity-common)" = "" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +"checksum kvdb 0.1.0 (git+https://github.com/paritytech/parity-common)" = "" +"checksum kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common)" = "" +"checksum kvdb-rocksdb 0.1.0 (git+https://github.com/paritytech/parity-common)" = "" "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" "checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d" @@ -4034,6 +3983,7 @@ dependencies = [ "checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff" "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" "checksum memory_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" +"checksum memorydb 0.2.0 (git+https://github.com/paritytech/parity-common)" = "" "checksum mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e3d709ffbb330e1566dc2f2a3c9b58a5ad4a381f740b810cd305dc3f089bc160" "checksum mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)" = "27a5e6679a0614e25adc14c6434ba84e41632b765a6d9cb2031a0cca682699ae" "checksum miniz_oxide 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aaa2d3ad070f428fffbd7d3ca2ea20bb0d8cffe9024405c44e1840bc1418b398" @@ -4063,17 +4013,22 @@ dependencies = [ "checksum ordered-float 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "58d25b6c0e47b20d05226d288ff434940296e7e2f8b877975da32f862152241f" "checksum ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" +"checksum parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common)" = "" +"checksum parity-crypto 0.1.0 (git+https://github.com/paritytech/parity-common)" = "" "checksum parity-tokio-ipc 0.1.5 (git+https://github.com/nikvolf/parity-tokio-ipc)" = "" "checksum parity-wasm 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1c91199d14bd5b78ecade323d4a891d094799749c1b9e82d9c590c2e2849a40" "checksum parity-wordlist 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0dec124478845b142f68b446cbee953d14d4b41f1bc0425024417720dce693" "checksum parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "901d6514273469bb17380c1ac3f51fb3ce54be1f960e51a6f04901eba313ab8d" "checksum parking_lot_core 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4f610cb9664da38e417ea3225f23051f589851999535290e077939838ab7a595" +"checksum path 0.1.1 (git+https://github.com/paritytech/parity-common)" = "" +"checksum patricia-trie 0.2.1 (git+https://github.com/paritytech/parity-common)" = "" "checksum percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de154f638187706bde41d9b4738748933d64e6b37bdbffc0b47a97d16a6ae356" "checksum petgraph 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "8b30dc85588cd02b9b76f5e386535db546d21dc68506cff2abebee0b6445e8e4" "checksum phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "cb325642290f28ee14d8c6201159949a872f220c62af6e110a56ea914fbe42fc" "checksum phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d62594c0bb54c464f633175d502038177e90309daf2e0158be42ed5f023ce88f" "checksum phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6b07ffcc532ccc85e3afc45865469bf5d9e4ef5bfcf9622e3cfe80c2d275ec03" "checksum phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "07e24b0ca9643bdecd0632f2b3da6b1b89bbb0030e0b992afc1113b23a7bc2f2" +"checksum plain_hasher 0.1.0 (git+https://github.com/paritytech/parity-common)" = "" "checksum podio 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e5422a1ee1bc57cc47ae717b0137314258138f38fd5f3cea083f43a9725383a0" "checksum pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2412f3332a07c7a2a50168988dcc184f32180a9758ad470390e5f55e089f6b6e" "checksum primal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0e31b86efadeaeb1235452171a66689682783149a6249ff334a2c5d8218d00a4" @@ -4097,11 +4052,10 @@ dependencies = [ "checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1" "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" "checksum regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "744554e01ccbd98fff8c457c3b092cd67af62a555a43bfe97ae8a0451f7799fa" -"checksum regex 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13c93d55961981ba9226a213b385216f83ab43bd6ac53ab16b2eeb47e337cf4e" "checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db" -"checksum regex-syntax 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05b06a75f5217880fc5e905952a42750bf44787e56a6c6d6852ed0992f5e1d54" "checksum relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a" "checksum ring 0.12.1 (git+https://github.com/paritytech/ring)" = "" +"checksum rlp 0.2.1 (git+https://github.com/paritytech/parity-common)" = "" "checksum rocksdb 0.4.5 (git+https://github.com/paritytech/rust-rocksdb)" = "" "checksum rocksdb-sys 0.3.0 (git+https://github.com/paritytech/rust-rocksdb)" = "" "checksum rpassword 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b273c91bd242ca03ad6d71c143b6f17a48790e61f21a6c78568fa2b6774a24a4" @@ -4149,7 +4103,6 @@ dependencies = [ "checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0" "checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1" "checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327" -"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" "checksum textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0b59b6b4b44d867f1370ef1bd91bfb262bf07bf0ae65c202ea2fbc16153b693" "checksum thread-id 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" @@ -4177,7 +4130,8 @@ dependencies = [ "checksum toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7540f4ffc193e0d3c94121edb19b055670d369f77d5804db11ae053a45b6e7e" "checksum transient-hashmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "715254c8f0811be1a79ad3ea5e6fa3c8eddec2b03d7f5ba78cf093e56d79c24f" "checksum trezor-sys 1.0.0 (git+https://github.com/paritytech/trezor-sys)" = "" -"checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d" +"checksum trie-standardmap 0.1.0 (git+https://github.com/paritytech/parity-common)" = "" +"checksum triehash 0.2.0 (git+https://github.com/paritytech/parity-common)" = "" "checksum uint 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "38051a96565903d81c9a9210ce11076b2218f3b352926baa1f5f6abbdfce8273" "checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" "checksum unicase 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "284b6d3db520d67fbe88fd778c21510d1b0ba4a551e5d0fbb023d33405f6de8a" @@ -4204,7 +4158,6 @@ dependencies = [ "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" "checksum ws 0.7.5 (git+https://github.com/tomusdrw/ws-rs)" = "" "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" "checksum xdg 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a66b7c2281ebde13cf4391d70d4c7e5946c3c25e72a7b859ca8f677dcd0b0c61" diff --git a/Cargo.toml b/Cargo.toml index 04d0949bd2f..33d353c807f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ fdlimit = "0.1" ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" } jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" } ethcore = { path = "ethcore", features = ["work-notify", "price-info", "stratum"] } -ethcore-bytes = { path = "util/bytes" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } ethcore-io = { path = "util/io" } ethcore-light = { path = "ethcore/light" } ethcore-logger = { path = "logger" } @@ -47,7 +47,7 @@ ethereum-types = "0.3" node-filter = { path = "ethcore/node_filter" } ethkey = { path = "ethkey" } node-health = { path = "dapps/node-health" } -rlp = { path = "util/rlp" } +rlp = { git = "https://github.com/paritytech/parity-common" } rpc-cli = { path = "rpc_cli" } parity-hash-fetch = { path = "hash-fetch" } parity-ipfs-api = { path = "ipfs" } @@ -58,13 +58,13 @@ parity-rpc-client = { path = "rpc_client" } parity-updater = { path = "updater" } parity-version = { path = "util/version" } parity-whisper = { path = "whisper" } -path = { path = "util/path" } +path = { git = "https://github.com/paritytech/parity-common" } dir = { path = "util/dir" } panic_hook = { path = "util/panic_hook" } -keccak-hash = { path = "util/hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } migration-rocksdb = { path = "util/migration-rocksdb" } -kvdb = { path = "util/kvdb" } -kvdb-rocksdb = { path = "util/kvdb-rocksdb" } +kvdb = { git = "https://github.com/paritytech/parity-common" } +kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" } journaldb = { path = "util/journaldb" } mem = { path = "util/mem" } @@ -133,6 +133,7 @@ members = [ "transaction-pool", "whisper", "whisper/cli", + "util/triehash-ethereum", "util/keccak-hasher", "util/patricia-trie-ethereum", ] diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml index 477ad9b067e..b32fdb4a32c 100644 --- a/dapps/Cargo.toml +++ b/dapps/Cargo.toml @@ -27,14 +27,14 @@ itertools = "0.5" jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" } jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" } -ethcore-bytes = { path = "../util/bytes" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } ethereum-types = "0.3" fetch = { path = "../util/fetch" } node-health = { path = "./node-health" } parity-dapps-glue = { path = "./js-glue" } parity-hash-fetch = { path = "../hash-fetch" } parity-reactor = { path = "../util/reactor" } -keccak-hash = { path = "../util/hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } parity-version = { path = "../util/version" } registrar = { path = "../registrar" } diff --git a/dapps/src/lib.rs b/dapps/src/lib.rs index 12a6a805086..4fcf9740d78 100644 --- a/dapps/src/lib.rs +++ b/dapps/src/lib.rs @@ -32,7 +32,7 @@ extern crate zip; extern crate jsonrpc_http_server; -extern crate ethcore_bytes as bytes; +extern crate parity_bytes as bytes; extern crate ethereum_types; extern crate fetch; extern crate node_health; diff --git a/ethash/Cargo.toml b/ethash/Cargo.toml index 61b3fa504f1..df0f17e0f37 100644 --- a/ethash/Cargo.toml +++ b/ethash/Cargo.toml @@ -7,7 +7,7 @@ authors = ["Parity Technologies "] [dependencies] log = "0.3" -keccak-hash = { path = "../util/hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } primal = "0.2.3" parking_lot = "0.6" crunchy = "0.1.0" diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml index 9c25cdccb15..8a3ce5a6de5 100644 --- a/ethcore/Cargo.toml +++ b/ethcore/Cargo.toml @@ -15,12 +15,12 @@ common-types = { path = "types" } crossbeam = "0.3" ethash = { path = "../ethash" } ethcore-bloom-journal = { path = "../util/bloom" } -ethcore-bytes = { path = "../util/bytes" } -hashdb = { path = "../util/hashdb" } -memorydb = { path = "../util/memorydb" } -patricia-trie = { path = "../util/patricia_trie" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } +hashdb = { git = "https://github.com/paritytech/parity-common" } +memorydb = { git = "https://github.com/paritytech/parity-common" } +patricia-trie = { git = "https://github.com/paritytech/parity-common" } patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" } -ethcore-crypto = { path = "crypto" } +parity-crypto = { git = "https://github.com/paritytech/parity-common" } error-chain = { version = "0.12", default-features = false } ethcore-io = { path = "../util/io" } ethcore-logger = { path = "../logger" } @@ -47,11 +47,11 @@ parity-machine = { path = "../machine" } parking_lot = "0.6" rayon = "1.0" rand = "0.4" -rlp = { path = "../util/rlp" } +rlp = { git = "https://github.com/paritytech/parity-common" } rlp_compress = { path = "../util/rlp_compress" } rlp_derive = { path = "../util/rlp_derive" } -kvdb = { path = "../util/kvdb" } -kvdb-memorydb = { path = "../util/kvdb-memorydb" } +kvdb = { git = "https://github.com/paritytech/parity-common" } +kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" } snappy = { git = "https://github.com/paritytech/rust-snappy" } stop-guard = { path = "../util/stop-guard" } macros = { path = "../util/macros" } @@ -61,12 +61,12 @@ trace-time = { path = "../util/trace-time" } using_queue = { path = "../util/using_queue" } vm = { path = "vm" } wasm = { path = "wasm" } -keccak-hash = { path = "../util/hash" } -triehash = { path = "../util/triehash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } +triehash-ethereum = { version = "0.2", path = "../util/triehash-ethereum" } unexpected = { path = "../util/unexpected" } journaldb = { path = "../util/journaldb" } keccak-hasher = { path = "../util/keccak-hasher" } -kvdb-rocksdb = { path = "../util/kvdb-rocksdb" } +kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" } tempdir = {version="0.3", optional = true} [target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android"))'.dependencies] @@ -77,7 +77,7 @@ fake-hardware-wallet = { path = "../util/fake-hardware-wallet" } [dev-dependencies] tempdir = "0.3" -trie-standardmap = { path = "../util/trie-standardmap" } +trie-standardmap = { git = "https://github.com/paritytech/parity-common" } [features] # Display EVM debug traces. diff --git a/ethcore/benches/evm.rs b/ethcore/benches/evm.rs index c68adc98787..46e5bfb30cb 100644 --- a/ethcore/benches/evm.rs +++ b/ethcore/benches/evm.rs @@ -20,7 +20,7 @@ extern crate test; extern crate ethcore_util as util; extern crate rand; extern crate bn; -extern crate ethcore_crypto; +extern crate parity_crypto; extern crate ethkey; extern crate rustc_hex; extern crate ethcore_bigint; @@ -60,7 +60,7 @@ fn bn_128_mul(b: &mut Bencher) { #[bench] fn sha256(b: &mut Bencher) { - use ethcore_crypto::digest::sha256; + use parity_crypto::digest::sha256; let mut input: [u8; 256] = [0; 256]; let mut out = [0; 32]; diff --git a/ethcore/evm/Cargo.toml b/ethcore/evm/Cargo.toml index 654f7879a1c..18c9a3907a6 100644 --- a/ethcore/evm/Cargo.toml +++ b/ethcore/evm/Cargo.toml @@ -10,7 +10,7 @@ heapsize = "0.4" lazy_static = "1.0" log = "0.3" vm = { path = "../vm" } -keccak-hash = { path = "../../util/hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } parking_lot = "0.6" memory-cache = { path = "../../util/memory_cache" } diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml index 3bdcd73b76e..6c3a454e20a 100644 --- a/ethcore/light/Cargo.toml +++ b/ethcore/light/Cargo.toml @@ -9,19 +9,19 @@ authors = ["Parity Technologies "] [dependencies] log = "0.3" ethcore = { path = ".."} -ethcore-bytes = { path = "../../util/bytes" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } ethcore-transaction = { path = "../transaction" } ethereum-types = "0.3" -memorydb = { path = "../../util/memorydb" } -patricia-trie = { path = "../../util/patricia_trie" } +memorydb = { git = "https://github.com/paritytech/parity-common" } +patricia-trie = { git = "https://github.com/paritytech/parity-common" } patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" } ethcore-network = { path = "../../util/network" } ethcore-io = { path = "../../util/io" } -hashdb = { path = "../../util/hashdb" } +hashdb = { git = "https://github.com/paritytech/parity-common" } heapsize = "0.4" vm = { path = "../vm" } -plain_hasher = { path = "../../util/plain_hasher" } -rlp = { path = "../../util/rlp" } +plain_hasher = { git = "https://github.com/paritytech/parity-common" } +rlp = { git = "https://github.com/paritytech/parity-common" } rlp_derive = { path = "../../util/rlp_derive" } smallvec = "0.4" futures = "0.1" @@ -32,16 +32,16 @@ serde = "1.0" serde_derive = "1.0" parking_lot = "0.6" stats = { path = "../../util/stats" } -keccak-hash = { path = "../../util/hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } keccak-hasher = { path = "../../util/keccak-hasher" } -triehash = { path = "../../util/triehash" } -kvdb = { path = "../../util/kvdb" } +triehash-ethereum = { version = "0.2", path = "../../util/triehash-ethereum" } +kvdb = { git = "https://github.com/paritytech/parity-common" } memory-cache = { path = "../../util/memory_cache" } error-chain = { version = "0.12", default-features = false } [dev-dependencies] ethcore = { path = "..", features = ["test-helpers"] } -kvdb-memorydb = { path = "../../util/kvdb-memorydb" } +kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" } tempdir = "0.3" [features] diff --git a/ethcore/light/src/lib.rs b/ethcore/light/src/lib.rs index 2000131a696..24c95cfdeb7 100644 --- a/ethcore/light/src/lib.rs +++ b/ethcore/light/src/lib.rs @@ -56,7 +56,7 @@ extern crate log; extern crate bincode; extern crate ethcore_io as io; extern crate ethcore_network as network; -extern crate ethcore_bytes as bytes; +extern crate parity_bytes as bytes; extern crate ethcore_transaction as transaction; extern crate ethereum_types; extern crate ethcore; @@ -79,7 +79,7 @@ extern crate smallvec; extern crate stats; extern crate vm; extern crate keccak_hash as hash; -extern crate triehash; +extern crate triehash_ethereum as triehash; extern crate kvdb; extern crate memory_cache; #[macro_use] diff --git a/ethcore/node_filter/Cargo.toml b/ethcore/node_filter/Cargo.toml index 597f9a9620a..b6e3cfe55e9 100644 --- a/ethcore/node_filter/Cargo.toml +++ b/ethcore/node_filter/Cargo.toml @@ -20,6 +20,6 @@ lru-cache = "0.1" [dev-dependencies] ethcore = { path = "..", features = ["test-helpers"] } -kvdb-memorydb = { path = "../../util/kvdb-memorydb" } +kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" } ethcore-io = { path = "../../util/io" } tempdir = "0.3" diff --git a/ethcore/private-tx/Cargo.toml b/ethcore/private-tx/Cargo.toml index 42bcc4f2026..e547c980870 100644 --- a/ethcore/private-tx/Cargo.toml +++ b/ethcore/private-tx/Cargo.toml @@ -11,8 +11,8 @@ ethabi = "5.1" ethabi-contract = "5.0" ethabi-derive = "5.0" ethcore = { path = ".." } -ethcore-bytes = { path = "../../util/bytes" } -ethcore-crypto = { path = "../crypto" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } +parity-crypto = { git = "https://github.com/paritytech/parity-common" } ethcore-io = { path = "../../util/io" } ethcore-logger = { path = "../../logger" } ethcore-miner = { path = "../../miner" } @@ -22,13 +22,13 @@ ethjson = { path = "../../json" } ethkey = { path = "../../ethkey" } fetch = { path = "../../util/fetch" } futures = "0.1" -keccak-hash = { path = "../../util/hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } log = "0.3" parking_lot = "0.6" -patricia-trie = { path = "../../util/patricia_trie" } +patricia-trie = { git = "https://github.com/paritytech/parity-common" } patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" } rand = "0.3" -rlp = { path = "../../util/rlp" } +rlp = { git = "https://github.com/paritytech/parity-common" } rlp_derive = { path = "../../util/rlp_derive" } rustc-hex = "1.0" serde = "1.0" diff --git a/ethcore/private-tx/src/lib.rs b/ethcore/private-tx/src/lib.rs index 2034ea7fa7c..0700a428baa 100644 --- a/ethcore/private-tx/src/lib.rs +++ b/ethcore/private-tx/src/lib.rs @@ -26,8 +26,8 @@ mod messages; mod error; extern crate ethcore; -extern crate ethcore_bytes as bytes; -extern crate ethcore_crypto as crypto; +extern crate parity_bytes as bytes; +extern crate parity_crypto as crypto; extern crate ethcore_io as io; extern crate ethcore_miner; extern crate ethcore_transaction as transaction; diff --git a/ethcore/service/Cargo.toml b/ethcore/service/Cargo.toml index e9f16bc7a29..245bce78778 100644 --- a/ethcore/service/Cargo.toml +++ b/ethcore/service/Cargo.toml @@ -10,7 +10,7 @@ ethcore = { path = ".." } ethcore-io = { path = "../../util/io" } ethcore-private-tx = { path = "../private-tx" } ethcore-sync = { path = "../sync" } -kvdb = { path = "../../util/kvdb" } +kvdb = { git = "https://github.com/paritytech/parity-common" } log = "0.3" stop-guard = { path = "../../util/stop-guard" } trace-time = { path = "../../util/trace-time" } @@ -18,4 +18,4 @@ trace-time = { path = "../../util/trace-time" } [dev-dependencies] ethcore = { path = "..", features = ["test-helpers"] } tempdir = "0.3" -kvdb-rocksdb = { path = "../../util/kvdb-rocksdb" } +kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" } diff --git a/ethcore/src/builtin.rs b/ethcore/src/builtin.rs index 61739c7b1d4..91477ca63f5 100644 --- a/ethcore/src/builtin.rs +++ b/ethcore/src/builtin.rs @@ -18,7 +18,7 @@ use std::cmp::{max, min}; use std::io::{self, Read}; use byteorder::{ByteOrder, BigEndian}; -use ethcore_crypto::digest; +use parity_crypto::digest; use num::{BigUint, Zero, One}; use hash::keccak; diff --git a/ethcore/src/lib.rs b/ethcore/src/lib.rs index 70044bd09f0..ed5ea6dbe76 100644 --- a/ethcore/src/lib.rs +++ b/ethcore/src/lib.rs @@ -65,9 +65,9 @@ extern crate crossbeam; extern crate common_types as types; extern crate ethash; extern crate ethcore_bloom_journal as bloom_journal; -extern crate ethcore_crypto; +extern crate parity_crypto; extern crate ethcore_io as io; -extern crate ethcore_bytes as bytes; +extern crate parity_bytes as bytes; extern crate ethcore_logger; extern crate ethcore_miner; #[cfg(feature = "stratum")] @@ -97,7 +97,7 @@ extern crate heapsize; extern crate memorydb; extern crate patricia_trie as trie; extern crate patricia_trie_ethereum as ethtrie; -extern crate triehash; +extern crate triehash_ethereum as triehash; extern crate ansi_term; extern crate unexpected; extern crate snappy; diff --git a/ethcore/stratum/Cargo.toml b/ethcore/stratum/Cargo.toml index e160907a499..1da27c01a9f 100644 --- a/ethcore/stratum/Cargo.toml +++ b/ethcore/stratum/Cargo.toml @@ -7,7 +7,7 @@ authors = ["Parity Technologies "] [dependencies] ethereum-types = "0.3" -keccak-hash = { path = "../../util/hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" } jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" } jsonrpc-tcp-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" } diff --git a/ethcore/sync/Cargo.toml b/ethcore/sync/Cargo.toml index 1e539bc4a1b..dfd45777233 100644 --- a/ethcore/sync/Cargo.toml +++ b/ethcore/sync/Cargo.toml @@ -8,7 +8,7 @@ authors = ["Parity Technologies "] [lib] [dependencies] -ethcore-bytes = { path = "../../util/bytes" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } ethcore-network = { path = "../../util/network" } ethcore-network-devp2p = { path = "../../util/network-devp2p" } ethcore-io = { path = "../../util/io" } @@ -16,14 +16,14 @@ ethcore-light = { path = "../light" } ethcore-transaction = { path = "../transaction" } ethcore = { path = ".." } ethereum-types = "0.3" -hashdb = { version = "0.2", path = "../../util/hashdb" } -plain_hasher = { version = "0.2", path = "../../util/plain_hasher" } -rlp = { path = "../../util/rlp" } +hashdb = { git = "https://github.com/paritytech/parity-common" } +plain_hasher = { git = "https://github.com/paritytech/parity-common" } +rlp = { git = "https://github.com/paritytech/parity-common" } rustc-hex = "1.0" -keccak-hash = { path = "../../util/hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } keccak-hasher = { path = "../../util/keccak-hasher" } -triehash = { path = "../../util/triehash" } -kvdb = { path = "../../util/kvdb" } +triehash-ethereum = {version = "0.2", path = "../../util/triehash-ethereum" } +kvdb = { git = "https://github.com/paritytech/parity-common" } macros = { path = "../../util/macros" } log = "0.3" env_logger = "0.4" @@ -38,6 +38,6 @@ ipnetwork = "0.12.6" [dev-dependencies] ethcore-io = { path = "../../util/io", features = ["mio"] } ethkey = { path = "../../ethkey" } -kvdb-memorydb = { path = "../../util/kvdb-memorydb" } +kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" } ethcore-private-tx = { path = "../private-tx" } ethcore = { path = "..", features = ["test-helpers"] } diff --git a/ethcore/sync/src/blocks.rs b/ethcore/sync/src/blocks.rs index 8485b1d75e6..a275e1dcc70 100644 --- a/ethcore/sync/src/blocks.rs +++ b/ethcore/sync/src/blocks.rs @@ -20,7 +20,7 @@ use smallvec::SmallVec; use hash::{keccak, KECCAK_NULL_RLP, KECCAK_EMPTY_LIST_RLP}; use heapsize::HeapSizeOf; use ethereum_types::H256; -use triehash::ordered_trie_root; +use triehash_ethereum::ordered_trie_root; use bytes::Bytes; use rlp::{Rlp, RlpStream, DecoderError}; use network; diff --git a/ethcore/sync/src/lib.rs b/ethcore/sync/src/lib.rs index 6e49b1ce78d..f9f8a3e3e93 100644 --- a/ethcore/sync/src/lib.rs +++ b/ethcore/sync/src/lib.rs @@ -23,7 +23,7 @@ extern crate ethcore_network as network; extern crate ethcore_network_devp2p as devp2p; -extern crate ethcore_bytes as bytes; +extern crate parity_bytes as bytes; extern crate ethcore_io as io; extern crate ethcore_transaction as transaction; #[macro_use] @@ -40,7 +40,7 @@ extern crate rlp; extern crate ipnetwork; extern crate keccak_hash as hash; extern crate keccak_hasher; -extern crate triehash; +extern crate triehash_ethereum; extern crate kvdb; extern crate ethcore_light as light; diff --git a/ethcore/transaction/Cargo.toml b/ethcore/transaction/Cargo.toml index 79e7282c388..bde83f478d3 100644 --- a/ethcore/transaction/Cargo.toml +++ b/ethcore/transaction/Cargo.toml @@ -9,8 +9,8 @@ ethjson = { path = "../../json" } ethkey = { path = "../../ethkey" } evm = { path = "../evm" } heapsize = "0.4" -keccak-hash = { path = "../../util/hash" } -rlp = { path = "../../util/rlp" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } +rlp = { git = "https://github.com/paritytech/parity-common" } unexpected = { path = "../../util/unexpected" } ethereum-types = "0.3" diff --git a/ethcore/types/Cargo.toml b/ethcore/types/Cargo.toml index 92cc74551d3..82b42c51987 100644 --- a/ethcore/types/Cargo.toml +++ b/ethcore/types/Cargo.toml @@ -5,12 +5,12 @@ version = "0.1.0" authors = ["Parity Technologies "] [dependencies] -rlp = { path = "../../util/rlp" } +rlp = { git = "https://github.com/paritytech/parity-common" } rlp_derive = { path = "../../util/rlp_derive" } -ethcore-bytes = { path = "../../util/bytes" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } ethereum-types = "0.3" ethjson = { path = "../../json" } -keccak-hash = { path = "../../util/hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } heapsize = "0.4" [dev-dependencies] diff --git a/ethcore/types/src/lib.rs b/ethcore/types/src/lib.rs index 5ac8ff12add..f375fec13c9 100644 --- a/ethcore/types/src/lib.rs +++ b/ethcore/types/src/lib.rs @@ -17,7 +17,7 @@ //! Types used in the public API extern crate ethereum_types; -extern crate ethcore_bytes as bytes; +extern crate parity_bytes as bytes; extern crate ethjson; extern crate rlp; #[macro_use] diff --git a/ethcore/vm/Cargo.toml b/ethcore/vm/Cargo.toml index 7348951d790..194f4600d82 100644 --- a/ethcore/vm/Cargo.toml +++ b/ethcore/vm/Cargo.toml @@ -5,12 +5,12 @@ authors = ["Parity Technologies "] [dependencies] byteorder = "1.0" -ethcore-bytes = { path = "../../util/bytes" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } ethereum-types = "0.3" -patricia-trie = { path = "../../util/patricia_trie" } +patricia-trie = { git = "https://github.com/paritytech/parity-common" } patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" } log = "0.3" common-types = { path = "../types" } ethjson = { path = "../../json" } -rlp = { path = "../../util/rlp" } -keccak-hash = { path = "../../util/hash" } +rlp = { git = "https://github.com/paritytech/parity-common" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } diff --git a/ethcore/vm/src/lib.rs b/ethcore/vm/src/lib.rs index 658420f74e3..2c98cfcd247 100644 --- a/ethcore/vm/src/lib.rs +++ b/ethcore/vm/src/lib.rs @@ -17,7 +17,7 @@ //! Virtual machines support library extern crate ethereum_types; -extern crate ethcore_bytes as bytes; +extern crate parity_bytes as bytes; extern crate common_types as types; extern crate ethjson; extern crate rlp; diff --git a/ethkey/Cargo.toml b/ethkey/Cargo.toml index ef828ac30df..8449a54c3b2 100644 --- a/ethkey/Cargo.toml +++ b/ethkey/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Parity Technologies "] [dependencies] byteorder = "1.0" edit-distance = "2.0" -ethcore-crypto = { path = "../ethcore/crypto" } +parity-crypto = { git = "https://github.com/paritytech/parity-common" } eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" } ethereum-types = "0.3" lazy_static = "1.0" diff --git a/ethkey/src/crypto.rs b/ethkey/src/crypto.rs index 3ff809614ef..8049f16b584 100644 --- a/ethkey/src/crypto.rs +++ b/ethkey/src/crypto.rs @@ -16,7 +16,7 @@ use secp256k1; use std::io; -use ethcore_crypto::error::SymmError; +use parity_crypto::error::SymmError; quick_error! { #[derive(Debug)] @@ -67,7 +67,7 @@ pub mod ecdh { /// ECIES function pub mod ecies { - use ethcore_crypto::{aes, digest, hmac, is_equal}; + use parity_crypto::{aes, digest, hmac, is_equal}; use ethereum_types::H128; use super::{ecdh, Error}; use {Random, Generator, Public, Secret}; diff --git a/ethkey/src/extended.rs b/ethkey/src/extended.rs index 89a4bb26a02..e48f6b5616e 100644 --- a/ethkey/src/extended.rs +++ b/ethkey/src/extended.rs @@ -207,7 +207,7 @@ impl ExtendedKeyPair { // Work is based on BIP0032 // https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki mod derivation { - use ethcore_crypto::hmac; + use parity_crypto::hmac; use ethereum_types::{U256, U512, H512, H256}; use secp256k1::key::{SecretKey, PublicKey}; use SECP256K1; diff --git a/ethkey/src/lib.rs b/ethkey/src/lib.rs index af13f5a1ef4..013a60cd3a8 100644 --- a/ethkey/src/lib.rs +++ b/ethkey/src/lib.rs @@ -18,7 +18,7 @@ extern crate byteorder; extern crate edit_distance; -extern crate ethcore_crypto; +extern crate parity_crypto; extern crate ethereum_types; extern crate mem; extern crate parity_wordlist; diff --git a/ethstore/Cargo.toml b/ethstore/Cargo.toml index 038b27fbe62..deeb5a946b8 100644 --- a/ethstore/Cargo.toml +++ b/ethstore/Cargo.toml @@ -16,7 +16,7 @@ tiny-keccak = "1.4" time = "0.1.34" itertools = "0.5" parking_lot = "0.6" -ethcore-crypto = { path = "../ethcore/crypto" } +parity-crypto = { git = "https://github.com/paritytech/parity-common" } ethereum-types = "0.3" dir = { path = "../util/dir" } smallvec = "0.4" diff --git a/ethstore/src/lib.rs b/ethstore/src/lib.rs index 67e636dd5c9..ad58bd0e984 100644 --- a/ethstore/src/lib.rs +++ b/ethstore/src/lib.rs @@ -31,7 +31,7 @@ extern crate time; extern crate tiny_keccak; extern crate tempdir; -extern crate ethcore_crypto as crypto; +extern crate parity_crypto as crypto; extern crate ethereum_types; extern crate ethkey as _ethkey; extern crate parity_wordlist; diff --git a/evmbin/Cargo.toml b/evmbin/Cargo.toml index 9ff27a2e6b6..43264f042ff 100644 --- a/evmbin/Cargo.toml +++ b/evmbin/Cargo.toml @@ -12,7 +12,7 @@ path = "./src/main.rs" docopt = "0.8" ethcore = { path = "../ethcore", features = ["test-helpers", "json-tests"] } ethjson = { path = "../json" } -ethcore-bytes = { path = "../util/bytes" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } ethcore-transaction = { path = "../ethcore/transaction" } ethereum-types = "0.3" evm = { path = "../ethcore/evm" } diff --git a/evmbin/src/main.rs b/evmbin/src/main.rs index 45a09c73e20..144c99fb3bd 100644 --- a/evmbin/src/main.rs +++ b/evmbin/src/main.rs @@ -26,7 +26,7 @@ extern crate serde; extern crate serde_derive; extern crate docopt; extern crate ethcore_transaction as transaction; -extern crate ethcore_bytes as bytes; +extern crate parity_bytes as bytes; extern crate ethereum_types; extern crate vm; extern crate evm; diff --git a/hash-fetch/Cargo.toml b/hash-fetch/Cargo.toml index df332602c04..c4eb7acd3af 100644 --- a/hash-fetch/Cargo.toml +++ b/hash-fetch/Cargo.toml @@ -15,10 +15,10 @@ mime_guess = "2.0.0-alpha.2" rand = "0.4" rustc-hex = "1.0" fetch = { path = "../util/fetch" } -ethcore-bytes = { path = "../util/bytes" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } ethereum-types = "0.3" parity-reactor = { path = "../util/reactor" } -keccak-hash = { path = "../util/hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } registrar = { path = "../registrar" } ethabi = "5.1" diff --git a/hash-fetch/src/lib.rs b/hash-fetch/src/lib.rs index bdbb0e35054..9ed8c59fd6a 100644 --- a/hash-fetch/src/lib.rs +++ b/hash-fetch/src/lib.rs @@ -22,7 +22,7 @@ extern crate log; extern crate ethabi; -extern crate ethcore_bytes as bytes; +extern crate parity_bytes as bytes; extern crate ethereum_types; extern crate futures; extern crate futures_cpupool; diff --git a/ipfs/Cargo.toml b/ipfs/Cargo.toml index 5a72048134c..968aef67bf9 100644 --- a/ipfs/Cargo.toml +++ b/ipfs/Cargo.toml @@ -7,11 +7,11 @@ authors = ["Parity Technologies "] [dependencies] ethcore = { path = "../ethcore" } -ethcore-bytes = { path = "../util/bytes" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } ethereum-types = "0.3" jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" } jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" } -rlp = { path = "../util/rlp" } +rlp = { git = "https://github.com/paritytech/parity-common" } cid = "0.2" multihash = "0.7" unicase = "2.0" diff --git a/ipfs/src/lib.rs b/ipfs/src/lib.rs index 7f6ebe77c4b..ac0871b6452 100644 --- a/ipfs/src/lib.rs +++ b/ipfs/src/lib.rs @@ -20,7 +20,7 @@ extern crate unicase; extern crate rlp; extern crate ethcore; -extern crate ethcore_bytes as bytes; +extern crate parity_bytes as bytes; extern crate ethereum_types; extern crate jsonrpc_core as core; extern crate jsonrpc_http_server as http; diff --git a/local-store/Cargo.toml b/local-store/Cargo.toml index d2c3469ca40..75717bed08b 100644 --- a/local-store/Cargo.toml +++ b/local-store/Cargo.toml @@ -8,9 +8,9 @@ authors = ["Parity Technologies "] ethcore = { path = "../ethcore" } ethcore-io = { path = "../util/io" } ethcore-transaction = { path = "../ethcore/transaction" } -kvdb = { path = "../util/kvdb" } +kvdb = { git = "https://github.com/paritytech/parity-common" } log = "0.3" -rlp = { path = "../util/rlp" } +rlp = { git = "https://github.com/paritytech/parity-common" } serde = "1.0" serde_derive = "1.0" serde_json = "1.0" @@ -18,4 +18,4 @@ serde_json = "1.0" [dev-dependencies] ethcore = { path = "../ethcore", features = ["test-helpers"] } ethkey = { path = "../ethkey" } -kvdb-memorydb = { path = "../util/kvdb-memorydb" } +kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" } diff --git a/miner/Cargo.toml b/miner/Cargo.toml index e1e7974a6a7..0f4c2c2dba7 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -22,12 +22,12 @@ ethereum-types = "0.3" futures = "0.1" futures-cpupool = "0.1" heapsize = "0.4" -keccak-hash = { path = "../util/hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } linked-hash-map = "0.5" log = "0.3" parking_lot = "0.6" price-info = { path = "../price-info", optional = true } -rlp = { path = "../util/rlp" } +rlp = { git = "https://github.com/paritytech/parity-common" } trace-time = { path = "../util/trace-time" } transaction-pool = { path = "../transaction-pool" } diff --git a/parity/lib.rs b/parity/lib.rs index 609738c26be..4a925bba70a 100644 --- a/parity/lib.rs +++ b/parity/lib.rs @@ -45,7 +45,7 @@ extern crate toml; extern crate blooms_db; extern crate ethcore; -extern crate ethcore_bytes as bytes; +extern crate parity_bytes as bytes; extern crate ethcore_io as io; extern crate ethcore_light as light; extern crate ethcore_logger; diff --git a/registrar/Cargo.toml b/registrar/Cargo.toml index 3ba26e45607..dcbfa439e22 100644 --- a/registrar/Cargo.toml +++ b/registrar/Cargo.toml @@ -10,4 +10,4 @@ futures = "0.1" ethabi = "5.1.0" ethabi-derive = "5.0.5" ethabi-contract = "5.0.3" -keccak-hash = { path = "../util/hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index c84a1dc5f8d..af5b4f413d2 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -37,8 +37,8 @@ jsonrpc-pubsub = { git = "https://github.com/paritytech/jsonrpc.git", branch = " ethash = { path = "../ethash" } ethcore = { path = "../ethcore", features = ["test-helpers"] } -ethcore-bytes = { path = "../util/bytes" } -ethcore-crypto = { path = "../ethcore/crypto" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } +parity-crypto = { git = "https://github.com/paritytech/parity-common" } ethcore-devtools = { path = "../devtools" } ethcore-io = { path = "../util/io" } ethcore-light = { path = "../ethcore/light" } @@ -53,13 +53,13 @@ ethjson = { path = "../json" } ethkey = { path = "../ethkey" } ethstore = { path = "../ethstore" } fetch = { path = "../util/fetch" } -keccak-hash = { path = "../util/hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } node-health = { path = "../dapps/node-health" } parity-reactor = { path = "../util/reactor" } parity-updater = { path = "../updater" } parity-version = { path = "../util/version" } -patricia-trie = { path = "../util/patricia_trie" } -rlp = { path = "../util/rlp" } +patricia-trie = { git = "https://github.com/paritytech/parity-common" } +rlp = { git = "https://github.com/paritytech/parity-common" } stats = { path = "../util/stats" } vm = { path = "../ethcore/vm" } @@ -73,7 +73,7 @@ fake-hardware-wallet = { path = "../util/fake-hardware-wallet" } ethcore = { path = "../ethcore", features = ["test-helpers"] } ethcore-network = { path = "../util/network" } fake-fetch = { path = "../util/fake-fetch" } -kvdb-memorydb = { path = "../util/kvdb-memorydb" } +kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" } macros = { path = "../util/macros" } pretty_assertions = "0.1" transaction-pool = { path = "../transaction-pool" } diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index 1caf383f00b..860e4bc6d74 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -45,8 +45,8 @@ extern crate jsonrpc_pubsub; extern crate ethash; #[cfg_attr(test, macro_use)] extern crate ethcore; -extern crate ethcore_bytes as bytes; -extern crate ethcore_crypto as crypto; +extern crate parity_bytes as bytes; +extern crate parity_crypto as crypto; extern crate ethcore_devtools as devtools; extern crate ethcore_io as io; extern crate ethcore_light as light; diff --git a/rpc_client/Cargo.toml b/rpc_client/Cargo.toml index 67efce18cfb..6b0f4c2cc5e 100644 --- a/rpc_client/Cargo.toml +++ b/rpc_client/Cargo.toml @@ -17,4 +17,4 @@ parking_lot = "0.6" jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" } jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" } parity-rpc = { path = "../rpc" } -keccak-hash = { path = "../util/hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } diff --git a/secret_store/Cargo.toml b/secret_store/Cargo.toml index dd419ae4eb9..85eda93e3ce 100644 --- a/secret_store/Cargo.toml +++ b/secret_store/Cargo.toml @@ -24,14 +24,14 @@ tokio-service = "0.1" tokio-proto = "0.1" url = "1.0" ethcore = { path = "../ethcore" } -ethcore-bytes = { path = "../util/bytes" } -ethcore-crypto = { path = "../ethcore/crypto" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } +parity-crypto = { git = "https://github.com/paritytech/parity-common" } ethcore-logger = { path = "../logger" } ethcore-sync = { path = "../ethcore/sync" } ethcore-transaction = { path = "../ethcore/transaction" } ethereum-types = "0.3" -kvdb = { path = "../util/kvdb" } -keccak-hash = { path = "../util/hash" } +kvdb = { git = "https://github.com/paritytech/parity-common" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } ethkey = { path = "../ethkey" } lazy_static = "1.0" ethabi = "5.1" @@ -41,4 +41,4 @@ ethabi-contract = "5.0" [dev-dependencies] ethcore = { path = "../ethcore", features = ["test-helpers"] } tempdir = "0.3" -kvdb-rocksdb = { path = "../util/kvdb-rocksdb" } +kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" } diff --git a/secret_store/src/lib.rs b/secret_store/src/lib.rs index 74cde2c5a95..b58534b3e59 100644 --- a/secret_store/src/lib.rs +++ b/secret_store/src/lib.rs @@ -17,8 +17,8 @@ extern crate byteorder; extern crate ethabi; extern crate ethcore; -extern crate ethcore_bytes as bytes; -extern crate ethcore_crypto as crypto; +extern crate parity_bytes as bytes; +extern crate parity_crypto as crypto; extern crate ethcore_logger as logger; extern crate ethcore_sync as sync; extern crate ethcore_transaction as transaction; diff --git a/updater/Cargo.toml b/updater/Cargo.toml index 1bd8736bd7d..84060edf1cb 100644 --- a/updater/Cargo.toml +++ b/updater/Cargo.toml @@ -6,7 +6,7 @@ license = "GPL-3.0" authors = ["Parity Technologies "] [dependencies] -keccak-hash = { path = "../util/hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } lazy_static = "1.0" log = "0.3" ethabi = "5.1" @@ -15,13 +15,13 @@ ethabi-contract = "5.0" target_info = "0.1" semver = "0.9" ethcore = { path = "../ethcore" } -ethcore-bytes = { path = "../util/bytes" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } ethcore-sync = { path = "../ethcore/sync" } ethereum-types = "0.3" parking_lot = "0.6" parity-hash-fetch = { path = "../hash-fetch" } parity-version = { path = "../util/version" } -path = { path = "../util/path" } +path = { git = "https://github.com/paritytech/parity-common" } rand = "0.4" [dev-dependencies] diff --git a/updater/src/lib.rs b/updater/src/lib.rs index f27d74e7d7a..b8455d0a939 100644 --- a/updater/src/lib.rs +++ b/updater/src/lib.rs @@ -18,7 +18,7 @@ extern crate ethabi; extern crate ethcore; -extern crate ethcore_bytes as bytes; +extern crate parity_bytes as bytes; extern crate ethcore_sync as sync; extern crate ethereum_types; extern crate keccak_hash as hash; diff --git a/util/hash/Cargo.toml b/util/hash/Cargo.toml deleted file mode 100644 index 4ca503751aa..00000000000 --- a/util/hash/Cargo.toml +++ /dev/null @@ -1,15 +0,0 @@ -[package] -description = "Rust bindings for tinykeccak C library" -homepage = "https://github.com/paritytech/keccak-hash" -readme = "README.md" -license = "GPL-3.0" -name = "keccak-hash" -version = "0.1.2" -authors = ["Parity Technologies "] - -[dependencies] -ethereum-types = "0.3" -tiny-keccak = "1.4" - -[dev-dependencies] -tempdir = "0.3" diff --git a/util/hashdb/Cargo.toml b/util/hashdb/Cargo.toml deleted file mode 100644 index f5e63fb1ba5..00000000000 --- a/util/hashdb/Cargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[package] -name = "hashdb" -version = "0.2.0" -authors = ["Parity Technologies "] -description = "trait for hash-keyed databases." -license = "GPL-3.0" - -[dependencies] -elastic-array = "0.10" -heapsize = "0.4" \ No newline at end of file diff --git a/util/journaldb/Cargo.toml b/util/journaldb/Cargo.toml index bd6c83415bc..27b0ae195b7 100644 --- a/util/journaldb/Cargo.toml +++ b/util/journaldb/Cargo.toml @@ -6,19 +6,19 @@ description = "A `HashDB` which can manage a short-term journal potentially cont license = "GPL3" [dependencies] -ethcore-bytes = { path = "../bytes" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } ethereum-types = "0.3" -hashdb = { version = "0.2.0", path = "../hashdb" } +hashdb = { git = "https://github.com/paritytech/parity-common" } heapsize = "0.4" keccak-hasher = { path = "../keccak-hasher" } -kvdb = { path = "../kvdb" } +kvdb = { git = "https://github.com/paritytech/parity-common" } log = "0.3" -memorydb = { version = "0.2.0", path = "../memorydb" } +memorydb = { git = "https://github.com/paritytech/parity-common" } parking_lot = "0.6" -plain_hasher = { path = "../plain_hasher" } -rlp = { path = "../rlp" } +plain_hasher = { git = "https://github.com/paritytech/parity-common" } +rlp = { git = "https://github.com/paritytech/parity-common" } [dev-dependencies] ethcore-logger = { path = "../../logger" } -keccak-hash = { path = "../hash" } -kvdb-memorydb = { path = "../kvdb-memorydb" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } +kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" } diff --git a/util/journaldb/src/lib.rs b/util/journaldb/src/lib.rs index 5b2381f2dd8..b14ef88e923 100644 --- a/util/journaldb/src/lib.rs +++ b/util/journaldb/src/lib.rs @@ -21,7 +21,7 @@ extern crate heapsize; extern crate log; extern crate ethereum_types; -extern crate ethcore_bytes as bytes; +extern crate parity_bytes as bytes; extern crate hashdb; extern crate keccak_hasher; extern crate kvdb; diff --git a/util/keccak-hasher/Cargo.toml b/util/keccak-hasher/Cargo.toml index e7c8e950ec9..0367b17673b 100644 --- a/util/keccak-hasher/Cargo.toml +++ b/util/keccak-hasher/Cargo.toml @@ -8,5 +8,5 @@ license = "GPL-3.0" [dependencies] ethereum-types = "0.3" tiny-keccak = "1.4.2" -hashdb = { path = "../hashdb" } -plain_hasher = { path = "../plain_hasher" } \ No newline at end of file +hashdb = { git = "https://github.com/paritytech/parity-common" } +plain_hasher = { git = "https://github.com/paritytech/parity-common" } \ No newline at end of file diff --git a/util/kvdb-memorydb/Cargo.toml b/util/kvdb-memorydb/Cargo.toml index a70b1e3da6f..599f720f339 100644 --- a/util/kvdb-memorydb/Cargo.toml +++ b/util/kvdb-memorydb/Cargo.toml @@ -5,4 +5,4 @@ authors = ["Parity Technologies "] [dependencies] parking_lot = "0.6" -kvdb = { path = "../kvdb" } +kvdb = { git = "https://github.com/paritytech/parity-common" } diff --git a/util/kvdb-rocksdb/Cargo.toml b/util/kvdb-rocksdb/Cargo.toml index c580502f53e..ca2298c87ba 100644 --- a/util/kvdb-rocksdb/Cargo.toml +++ b/util/kvdb-rocksdb/Cargo.toml @@ -8,7 +8,7 @@ elastic-array = "0.10" ethereum-types = "0.3" fs-swap = "0.2.1" interleaved-ordered = "0.1.0" -kvdb = { path = "../kvdb" } +kvdb = { git = "https://github.com/paritytech/parity-common" } log = "0.3" num_cpus = "1.0" parking_lot = "0.6" diff --git a/util/kvdb/Cargo.toml b/util/kvdb/Cargo.toml index 7d1044505d3..9231eef3b5b 100644 --- a/util/kvdb/Cargo.toml +++ b/util/kvdb/Cargo.toml @@ -5,4 +5,4 @@ authors = ["Parity Technologies "] [dependencies] elastic-array = "0.10" -ethcore-bytes = { path = "../bytes" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } diff --git a/util/kvdb/src/lib.rs b/util/kvdb/src/lib.rs index 25e8a341a80..3295075d44a 100644 --- a/util/kvdb/src/lib.rs +++ b/util/kvdb/src/lib.rs @@ -17,7 +17,7 @@ //! Key-Value store abstraction with `RocksDB` backend. extern crate elastic_array; -extern crate ethcore_bytes as bytes; +extern crate parity_bytes as bytes; use std::io; use std::path::Path; diff --git a/util/memorydb/Cargo.toml b/util/memorydb/Cargo.toml index 57d7439cfeb..61b984eb34b 100644 --- a/util/memorydb/Cargo.toml +++ b/util/memorydb/Cargo.toml @@ -8,12 +8,12 @@ license = "GPL-3.0" [dependencies] elastic-array = "0.10" heapsize = "0.4" -hashdb = { version = "0.2.0", path = "../hashdb" } -plain_hasher = { path = "../plain_hasher" } -rlp = { version = "0.2.1", path = "../rlp" } +hashdb = { git = "https://github.com/paritytech/parity-common" } +plain_hasher = { git = "https://github.com/paritytech/parity-common" } +rlp = { git = "https://github.com/paritytech/parity-common" } [dev-dependencies] tiny-keccak = "1.4.2" ethereum-types = "0.3" keccak-hasher = { path = "../keccak-hasher" } -keccak-hash = { path = "../hash" } \ No newline at end of file +keccak-hash = { git = "https://github.com/paritytech/parity-common" } \ No newline at end of file diff --git a/util/migration-rocksdb/Cargo.toml b/util/migration-rocksdb/Cargo.toml index f2eb59865ac..39ff50cfbb7 100644 --- a/util/migration-rocksdb/Cargo.toml +++ b/util/migration-rocksdb/Cargo.toml @@ -6,8 +6,8 @@ authors = ["Parity Technologies "] [dependencies] log = "0.3" macros = { path = "../macros" } -kvdb = { path = "../kvdb" } -kvdb-rocksdb = { path = "../kvdb-rocksdb" } +kvdb = { git = "https://github.com/paritytech/parity-common" } +kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" } [dev-dependencies] tempdir = "0.3" diff --git a/util/network-devp2p/Cargo.toml b/util/network-devp2p/Cargo.toml index 3e483c1d89d..99fdc164591 100644 --- a/util/network-devp2p/Cargo.toml +++ b/util/network-devp2p/Cargo.toml @@ -20,16 +20,16 @@ parking_lot = "0.6" ansi_term = "0.10" rustc-hex = "1.0" ethcore-io = { path = "../io", features = ["mio"] } -ethcore-bytes = { path = "../bytes" } -ethcore-crypto = { path = "../../ethcore/crypto" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } +parity-crypto = { git = "https://github.com/paritytech/parity-common" } ethcore-logger = { path ="../../logger" } ethcore-network = { path = "../network" } ethereum-types = "0.3" ethkey = { path = "../../ethkey" } -rlp = { path = "../rlp" } -path = { path = "../path" } +rlp = { git = "https://github.com/paritytech/parity-common" } +path = { git = "https://github.com/paritytech/parity-common" } ipnetwork = "0.12.6" -keccak-hash = { path = "../hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } snappy = { git = "https://github.com/paritytech/rust-snappy" } serde = "1.0" serde_json = "1.0" diff --git a/util/network-devp2p/src/connection.rs b/util/network-devp2p/src/connection.rs index 37824ae5d75..1ed395acba8 100644 --- a/util/network-devp2p/src/connection.rs +++ b/util/network-devp2p/src/connection.rs @@ -23,7 +23,7 @@ use mio::{Token, Ready, PollOpt}; use mio::deprecated::{Handler, EventLoop, TryRead, TryWrite}; use mio::tcp::*; use ethereum_types::{H128, H256, H512}; -use ethcore_bytes::*; +use parity_bytes::*; use rlp::{Rlp, RlpStream}; use std::io::{self, Cursor, Read, Write}; use io::{IoContext, StreamToken}; @@ -502,7 +502,7 @@ mod tests { use std::sync::atomic::AtomicBool; use mio::{Ready}; - use ethcore_bytes::Bytes; + use parity_bytes::Bytes; use io::*; use super::*; diff --git a/util/network-devp2p/src/discovery.rs b/util/network-devp2p/src/discovery.rs index 5f8f0cdbc2a..3bf7aee1e4e 100644 --- a/util/network-devp2p/src/discovery.rs +++ b/util/network-devp2p/src/discovery.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -use ethcore_bytes::Bytes; +use parity_bytes::Bytes; use std::net::SocketAddr; use std::collections::{HashSet, HashMap, VecDeque}; use std::default::Default; diff --git a/util/network-devp2p/src/handshake.rs b/util/network-devp2p/src/handshake.rs index 18869de55fc..4f54f0009fe 100644 --- a/util/network-devp2p/src/handshake.rs +++ b/util/network-devp2p/src/handshake.rs @@ -19,7 +19,7 @@ use rand::random; use hash::write_keccak; use mio::tcp::*; use ethereum_types::{H256, H520}; -use ethcore_bytes::Bytes; +use parity_bytes::Bytes; use rlp::{Rlp, RlpStream}; use connection::{Connection}; use node_table::NodeId; diff --git a/util/network-devp2p/src/lib.rs b/util/network-devp2p/src/lib.rs index 01fc1fe25f4..0df17c070af 100644 --- a/util/network-devp2p/src/lib.rs +++ b/util/network-devp2p/src/lib.rs @@ -61,8 +61,8 @@ #![allow(deprecated)] extern crate ethcore_io as io; -extern crate ethcore_bytes; -extern crate ethcore_crypto as crypto; +extern crate parity_bytes; +extern crate parity_crypto as crypto; extern crate ethereum_types; extern crate parking_lot; extern crate mio; diff --git a/util/network-devp2p/tests/tests.rs b/util/network-devp2p/tests/tests.rs index 970aa3b8a58..091f2509ac7 100644 --- a/util/network-devp2p/tests/tests.rs +++ b/util/network-devp2p/tests/tests.rs @@ -15,7 +15,7 @@ // along with Parity. If not, see . extern crate parking_lot; -extern crate ethcore_bytes; +extern crate parity_bytes; extern crate ethcore_io as io; extern crate ethcore_logger; extern crate ethcore_network; @@ -27,7 +27,7 @@ use std::sync::Arc; use std::thread; use std::time::*; use parking_lot::Mutex; -use ethcore_bytes::Bytes; +use parity_bytes::Bytes; use ethcore_network::*; use ethcore_network_devp2p::NetworkService; use ethkey::{Random, Generator}; diff --git a/util/network/Cargo.toml b/util/network/Cargo.toml index 6259e04af86..53eb58a37ad 100644 --- a/util/network/Cargo.toml +++ b/util/network/Cargo.toml @@ -8,12 +8,12 @@ authors = ["Parity Technologies "] [dependencies] error-chain = { version = "0.12", default-features = false } -ethcore-crypto = { path = "../../ethcore/crypto" } +parity-crypto = { git = "https://github.com/paritytech/parity-common" } ethcore-io = { path = "../io" } ethereum-types = "0.3" ethkey = { path = "../../ethkey" } ipnetwork = "0.12.6" -rlp = { path = "../rlp" } +rlp = { git = "https://github.com/paritytech/parity-common" } libc = "0.2" snappy = { git = "https://github.com/paritytech/rust-snappy" } diff --git a/util/network/src/lib.rs b/util/network/src/lib.rs index 9b7328bdbdb..c31ace41093 100644 --- a/util/network/src/lib.rs +++ b/util/network/src/lib.rs @@ -16,7 +16,7 @@ #![recursion_limit="128"] -extern crate ethcore_crypto as crypto; +extern crate parity_crypto as crypto; extern crate ethcore_io as io; extern crate ethereum_types; extern crate ethkey; diff --git a/util/patricia-trie-ethereum/Cargo.toml b/util/patricia-trie-ethereum/Cargo.toml index 239c7c99f03..90ca7e4754f 100644 --- a/util/patricia-trie-ethereum/Cargo.toml +++ b/util/patricia-trie-ethereum/Cargo.toml @@ -6,10 +6,10 @@ description = "Merkle-Patricia Trie (Ethereum Style)" license = "GPL-3.0" [dependencies] -patricia-trie = { path = "../patricia_trie" } +patricia-trie = { git = "https://github.com/paritytech/parity-common" } keccak-hasher = { path = "../keccak-hasher" } -hashdb = { path = "../hashdb" } -rlp = { path = "../rlp" } -ethcore-bytes = { path = "../bytes" } +hashdb = { git = "https://github.com/paritytech/parity-common" } +rlp = { git = "https://github.com/paritytech/parity-common" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } ethereum-types = "0.3" elastic-array = "0.10" \ No newline at end of file diff --git a/util/patricia-trie-ethereum/src/lib.rs b/util/patricia-trie-ethereum/src/lib.rs index a252152c776..ac2943fc621 100644 --- a/util/patricia-trie-ethereum/src/lib.rs +++ b/util/patricia-trie-ethereum/src/lib.rs @@ -18,7 +18,7 @@ pub extern crate patricia_trie as trie; // `pub` because we need to import this crate for the tests in `patricia_trie` and there were issues: https://gist.github.com/dvdplm/869251ee557a1b4bd53adc7c971979aa extern crate elastic_array; -extern crate ethcore_bytes; +extern crate parity_bytes; extern crate ethereum_types; extern crate hashdb; extern crate keccak_hasher; diff --git a/util/patricia_trie/Cargo.toml b/util/patricia_trie/Cargo.toml index ebd66504546..0936518d9be 100644 --- a/util/patricia_trie/Cargo.toml +++ b/util/patricia_trie/Cargo.toml @@ -7,8 +7,8 @@ license = "GPL-3.0" [dependencies] elastic-array = "0.10" -ethcore-bytes = { version = "0.1.0", path = "../bytes" } -hashdb = { version = "0.2", path = "../hashdb" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } +hashdb = { git = "https://github.com/paritytech/parity-common" } heapsize = "0.4" log = "0.3" rand = "0.4" @@ -16,10 +16,10 @@ rand = "0.4" [dev-dependencies] env_logger = "0.5" ethereum-types = "0.3" -keccak-hash = { version = "0.1.0", path = "../hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } keccak-hasher = { path = "../keccak-hasher" } -memorydb = { version = "0.2", path = "../memorydb" } +memorydb = { git = "https://github.com/paritytech/parity-common" } patricia-trie-ethereum = { path = "../patricia-trie-ethereum" } -rlp = { version = "0.2.1", path = "../rlp" } -trie-standardmap = { path = "../trie-standardmap" } -triehash = { version = "0.1.0", path = "../triehash" } +rlp = { git = "https://github.com/paritytech/parity-common" } +trie-standardmap = { git = "https://github.com/paritytech/parity-common" } +triehash = { git = "https://github.com/paritytech/parity-common" } diff --git a/util/patricia_trie/benches/trie.rs b/util/patricia_trie/benches/trie.rs index 114006ebe2e..8f9f89d18e1 100644 --- a/util/patricia_trie/benches/trie.rs +++ b/util/patricia_trie/benches/trie.rs @@ -17,7 +17,7 @@ #![feature(test)] extern crate test; -extern crate ethcore_bytes; +extern crate parity_bytes; extern crate ethereum_types; extern crate memorydb; extern crate patricia_trie as trie; @@ -27,7 +27,7 @@ extern crate keccak_hash; extern crate trie_standardmap; extern crate hashdb; -use ethcore_bytes::Bytes; +use parity_bytes::Bytes; use ethereum_types::H256; use keccak_hash::keccak; use memorydb::MemoryDB; diff --git a/util/patricia_trie/src/lib.rs b/util/patricia_trie/src/lib.rs index a028be87ac9..ae3bf22c02f 100644 --- a/util/patricia_trie/src/lib.rs +++ b/util/patricia_trie/src/lib.rs @@ -16,7 +16,7 @@ //! Trie interface and implementation. extern crate elastic_array; -extern crate ethcore_bytes as bytes; +extern crate parity_bytes as bytes; extern crate hashdb; extern crate heapsize; extern crate rand; diff --git a/util/plain_hasher/Cargo.toml b/util/plain_hasher/Cargo.toml index 9b2cd55033f..79cb8bb2e87 100644 --- a/util/plain_hasher/Cargo.toml +++ b/util/plain_hasher/Cargo.toml @@ -10,4 +10,4 @@ homepage = "https://github.com/paritytech/plain_hasher" [dependencies] crunchy = "0.1.6" ethereum-types = "0.3" -hashdb = { version = "0.2.0", path = "../hashdb" } \ No newline at end of file +hashdb = { git = "https://github.com/paritytech/parity-common" } \ No newline at end of file diff --git a/util/rlp_compress/Cargo.toml b/util/rlp_compress/Cargo.toml index d5f85425f23..c61d1f206d2 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 = { path = "../rlp" } +rlp = { git = "https://github.com/paritytech/parity-common" } elastic-array = "0.10" lazy_static = "1.0" diff --git a/util/rlp_derive/Cargo.toml b/util/rlp_derive/Cargo.toml index bb488cc29e6..c71e3d2454f 100644 --- a/util/rlp_derive/Cargo.toml +++ b/util/rlp_derive/Cargo.toml @@ -12,4 +12,4 @@ syn = "0.13" quote = "0.5" [dev-dependencies] -rlp = { path = "../rlp" } +rlp = { git = "https://github.com/paritytech/parity-common" } diff --git a/util/trie-standardmap/Cargo.toml b/util/trie-standardmap/Cargo.toml index 1177f30752c..70601779e54 100644 --- a/util/trie-standardmap/Cargo.toml +++ b/util/trie-standardmap/Cargo.toml @@ -5,7 +5,7 @@ authors = ["debris "] description = "Standard test map for profiling tries" [dependencies] -ethcore-bytes = { path = "../bytes" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } ethereum-types = "0.3" -keccak-hash = { path = "../hash" } -rlp = { path = "../rlp" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } +rlp = { git = "https://github.com/paritytech/parity-common" } diff --git a/util/trie-standardmap/src/lib.rs b/util/trie-standardmap/src/lib.rs index 51c8593ea40..931dc5741a8 100644 --- a/util/trie-standardmap/src/lib.rs +++ b/util/trie-standardmap/src/lib.rs @@ -16,7 +16,7 @@ //! Key-value datastore with a modified Merkle tree. -extern crate ethcore_bytes as bytes; +extern crate parity_bytes as bytes; extern crate ethereum_types; extern crate keccak_hash; extern crate rlp; diff --git a/util/triehash-ethereum/Cargo.toml b/util/triehash-ethereum/Cargo.toml new file mode 100644 index 00000000000..d5b1b118aa3 --- /dev/null +++ b/util/triehash-ethereum/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "triehash-ethereum" +version = "0.2.0" +authors = ["Parity Technologies "] +description = "Trie-root helpers, ethereum style" +license = "GPL-3.0" + +[dependencies] +triehash = { git = "https://github.com/paritytech/parity-common" } +ethereum-types = "0.3" +keccak-hasher = { path = "../keccak-hasher" } \ No newline at end of file diff --git a/util/triehash-ethereum/src/lib.rs b/util/triehash-ethereum/src/lib.rs new file mode 100644 index 00000000000..7de77473c5b --- /dev/null +++ b/util/triehash-ethereum/src/lib.rs @@ -0,0 +1,87 @@ +// Copyright 2015-2018 Parity Technologies (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +//! Generates Keccak-flavoured trie roots. + +extern crate ethereum_types; +extern crate keccak_hasher; +extern crate triehash; + +use ethereum_types::H256; +use keccak_hasher::KeccakHasher; + +/// Generates a trie root hash for a vector of key-value tuples +pub fn trie_root(input: I) -> H256 +where + I: IntoIterator, + K: AsRef<[u8]> + Ord, + V: AsRef<[u8]>, +{ + triehash::trie_root::(input) +} + +/// Generates a key-hashed (secure) trie root hash for a vector of key-value tuples. +pub fn sec_trie_root(input: I) -> H256 +where + I: IntoIterator, + K: AsRef<[u8]>, + V: AsRef<[u8]>, +{ + triehash::sec_trie_root::(input) +} + +/// Generates a trie root hash for a vector of values +pub fn ordered_trie_root(input: I) -> H256 +where + I: IntoIterator, + V: AsRef<[u8]>, +{ + triehash::ordered_trie_root::(input) +} + +#[cfg(test)] +mod tests { + use super::{trie_root, sec_trie_root, ordered_trie_root}; + use triehash; + use keccak_hasher::KeccakHasher; + + #[test] + fn simple_test() { + assert_eq!(trie_root(vec![ + (b"A", b"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" as &[u8]) + ]), "d23786fb4a010da3ce639d66d5e904a11dbc02746d1ce25029e53290cabf28ab".into()); + } + + #[test] + fn proxy_works() { + let input = vec![(b"A", b"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" as &[u8])]; + assert_eq!( + trie_root(input.clone()), + triehash::trie_root::(input.clone()) + ); + + assert_eq!( + sec_trie_root(input.clone()), + triehash::sec_trie_root::(input.clone()) + ); + + let data = &["cake", "pie", "candy"]; + assert_eq!( + ordered_trie_root(data), + triehash::ordered_trie_root::(data) + ); + } +} \ No newline at end of file diff --git a/util/triehash/Cargo.toml b/util/triehash/Cargo.toml index ee42b9d8253..3e20805990e 100644 --- a/util/triehash/Cargo.toml +++ b/util/triehash/Cargo.toml @@ -7,9 +7,9 @@ license = "GPL-3.0" [dependencies] elastic-array = "0.10" -rlp = { version = "0.2.1", path = "../rlp" } +rlp = { git = "https://github.com/paritytech/parity-common" } ethereum-types = "0.3" -keccak-hash = { version = "0.1", path = "../hash" } +keccak-hash = { git = "https://github.com/paritytech/parity-common" } [dev-dependencies] -trie-standardmap = { path = "../trie-standardmap" } +trie-standardmap = { git = "https://github.com/paritytech/parity-common" } diff --git a/util/version/Cargo.toml b/util/version/Cargo.toml index c7bd4f581e3..44e5cde365f 100644 --- a/util/version/Cargo.toml +++ b/util/version/Cargo.toml @@ -21,8 +21,8 @@ ropsten = { forkBlock = 10, critical = false } kovan = { forkBlock = 6600000, critical = false } [dependencies] -ethcore-bytes = { path = "../bytes" } -rlp = { path = "../rlp" } +parity-bytes = { git = "https://github.com/paritytech/parity-common" } +rlp = { git = "https://github.com/paritytech/parity-common" } target_info = "0.1" [build-dependencies] diff --git a/util/version/src/lib.rs b/util/version/src/lib.rs index 77fc71c70f3..79f11415e4a 100644 --- a/util/version/src/lib.rs +++ b/util/version/src/lib.rs @@ -17,7 +17,7 @@ //! Parity version specific information. extern crate target_info; -extern crate ethcore_bytes as bytes; +extern crate parity_bytes as bytes; extern crate rlp; use target_info::Target; diff --git a/whisper/Cargo.toml b/whisper/Cargo.toml index cdc83743adc..44882b4f541 100644 --- a/whisper/Cargo.toml +++ b/whisper/Cargo.toml @@ -9,7 +9,7 @@ bitflags = "0.9" byteorder = "1.0.0" ethereum-types = "0.3" ethcore-network = { path = "../util/network" } -ethcore-crypto = { path = "../ethcore/crypto" } +parity-crypto = { git = "https://github.com/paritytech/parity-common" } ethkey = { path = "../ethkey" } hex = "0.2" log = "0.3" @@ -17,7 +17,7 @@ mem = { path = "../util/mem" } ordered-float = "0.5" parking_lot = "0.6" rand = "0.4" -rlp = { path = "../util/rlp" } +rlp = { git = "https://github.com/paritytech/parity-common" } serde = "1.0" serde_derive = "1.0" serde_json = "1.0" diff --git a/whisper/src/lib.rs b/whisper/src/lib.rs index 190169b2c21..66d8d1b7321 100644 --- a/whisper/src/lib.rs +++ b/whisper/src/lib.rs @@ -18,7 +18,7 @@ //! interface. extern crate byteorder; -extern crate ethcore_crypto as crypto; +extern crate parity_crypto as crypto; extern crate ethcore_network as network; extern crate ethereum_types; extern crate ethkey;