openethereum · sorpaas · Dec 28, 2018 · Dec 24, 2018 · Dec 24, 2018 · Dec 24, 2018
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -43,32 +43,30 @@ ethcore-service = { path = "ethcore/service" }
 ethcore-sync = { path = "ethcore/sync" }
 ethcore-transaction = { path = "ethcore/transaction" }
 ethereum-types = "0.4"
-node-filter = { path = "ethcore/node_filter" }
-ethkey = { path = "ethkey" }
+node-filter = { path = "ethcore/node-filter" }
+ethkey = { path = "accounts/ethkey" }
 rlp = { version = "0.3.0", features = ["ethereum"] }
-rpc-cli = { path = "rpc_cli" }
-parity-hash-fetch = { path = "hash-fetch" }
+cli-signer= { path = "cli-signer" }
+parity-hash-fetch = { path = "updater/hash-fetch" }
 parity-ipfs-api = { path = "ipfs" }
-parity-local-store = { path = "local-store" }
+parity-local-store = { path = "miner/local-store" }
 parity-runtime = { path = "util/runtime" }
 parity-rpc = { path = "rpc" }
-parity-rpc-client = { path = "rpc_client" }
 parity-updater = { path = "updater" }
 parity-version = { path = "util/version" }
 parity-whisper = { path = "whisper" }
 parity-path = "0.1"
 dir = { path = "util/dir" }
-panic_hook = { path = "util/panic_hook" }
+panic_hook = { path = "util/panic-hook" }
 keccak-hash = "0.1"
 migration-rocksdb = { path = "util/migration-rocksdb" }
 kvdb = "0.1"
 kvdb-rocksdb = "0.1.3"
 journaldb = { path = "util/journaldb" }
-mem = { path = "util/mem" }
 
-ethcore-secretstore = { path = "secret_store", optional = true }
+ethcore-secretstore = { path = "secret-store", optional = true }
 
-registrar = { path = "registrar" }
+registrar = { path = "util/registrar" }
 
 [build-dependencies]
 rustc_version = "0.2"
@@ -121,19 +119,15 @@ name = "parity"
 debug = false
 
 [workspace]
+# This should only list projects that are not
+# in the dependency tree in any other way
+# (i.e. pretty much only standalone CLI tools)
 members = [
+	"accounts/ethkey/cli",
+	"accounts/ethstore/cli",
 	"chainspec",
 	"ethcore/wasm/run",
-	"ethcore/types",
-	"ethkey/cli",
-	"ethstore/cli",
 	"evmbin",
-	"miner",
 	"parity-clib",
-	"whisper",
 	"whisper/cli",
-	"util/triehash-ethereum",
-	"util/keccak-hasher",
-	"util/patricia-trie-ethereum",
-	"util/fastmap",
 ]
diff --git a/ethkey/.gitignore → accounts/ethkey/.gitignore b/ethkey/.gitignore → accounts/ethkey/.gitignore
diff --git a/ethkey/.travis.yml → accounts/ethkey/.travis.yml b/ethkey/.travis.yml → accounts/ethkey/.travis.yml
diff --git a/ethkey/Cargo.toml → accounts/ethkey/Cargo.toml b/ethkey/Cargo.toml → accounts/ethkey/Cargo.toml
@@ -11,7 +11,7 @@ eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
 ethereum-types = "0.4"
 lazy_static = "1.0"
 log = "0.4"
-mem = { path = "../util/mem" }
+memzero = { path = "../../util/memzero" }
 parity-wordlist = "1.2"
 quick-error = "1.2.2"
 rand = "0.4"

diff --git a/ethkey/README.md → accounts/ethkey/README.md b/ethkey/README.md → accounts/ethkey/README.md
diff --git a/ethkey/cli/Cargo.toml → accounts/ethkey/cli/Cargo.toml b/ethkey/cli/Cargo.toml → accounts/ethkey/cli/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 docopt = "1.0"
 env_logger = "0.5"
 ethkey = { path = "../" }
-panic_hook = { path = "../../util/panic_hook" }
+panic_hook = { path = "../../../util/panic-hook" }
 parity-wordlist="1.2"
 rustc-hex = "1.0"
 serde = "1.0"

diff --git a/ethkey/cli/src/main.rs → accounts/ethkey/cli/src/main.rs b/ethkey/cli/src/main.rs → accounts/ethkey/cli/src/main.rs
diff --git a/ethkey/src/brain.rs → accounts/ethkey/src/brain.rs b/ethkey/src/brain.rs → accounts/ethkey/src/brain.rs
diff --git a/ethkey/src/brain_prefix.rs → accounts/ethkey/src/brain_prefix.rs b/ethkey/src/brain_prefix.rs → accounts/ethkey/src/brain_prefix.rs
diff --git a/ethkey/src/brain_recover.rs → accounts/ethkey/src/brain_recover.rs b/ethkey/src/brain_recover.rs → accounts/ethkey/src/brain_recover.rs
diff --git a/ethkey/src/crypto.rs → accounts/ethkey/src/crypto.rs b/ethkey/src/crypto.rs → accounts/ethkey/src/crypto.rs
diff --git a/ethkey/src/error.rs → accounts/ethkey/src/error.rs b/ethkey/src/error.rs → accounts/ethkey/src/error.rs
diff --git a/ethkey/src/extended.rs → accounts/ethkey/src/extended.rs b/ethkey/src/extended.rs → accounts/ethkey/src/extended.rs
diff --git a/ethkey/src/keccak.rs → accounts/ethkey/src/keccak.rs b/ethkey/src/keccak.rs → accounts/ethkey/src/keccak.rs
diff --git a/ethkey/src/keypair.rs → accounts/ethkey/src/keypair.rs b/ethkey/src/keypair.rs → accounts/ethkey/src/keypair.rs
diff --git a/ethkey/src/lib.rs → accounts/ethkey/src/lib.rs b/ethkey/src/lib.rs → accounts/ethkey/src/lib.rs
@@ -20,7 +20,7 @@ extern crate byteorder;
 extern crate edit_distance;
 extern crate parity_crypto;
 extern crate ethereum_types;
-extern crate mem;
+extern crate memzero;
 extern crate parity_wordlist;
 #[macro_use]
 extern crate quick_error;

diff --git a/ethkey/src/math.rs → accounts/ethkey/src/math.rs b/ethkey/src/math.rs → accounts/ethkey/src/math.rs
diff --git a/ethkey/src/password.rs → accounts/ethkey/src/password.rs b/ethkey/src/password.rs → accounts/ethkey/src/password.rs
diff --git a/ethkey/src/prefix.rs → accounts/ethkey/src/prefix.rs b/ethkey/src/prefix.rs → accounts/ethkey/src/prefix.rs
diff --git a/ethkey/src/random.rs → accounts/ethkey/src/random.rs b/ethkey/src/random.rs → accounts/ethkey/src/random.rs
diff --git a/ethkey/src/secret.rs → accounts/ethkey/src/secret.rs b/ethkey/src/secret.rs → accounts/ethkey/src/secret.rs
@@ -21,7 +21,7 @@ use rustc_hex::ToHex;
 use secp256k1::constants::{SECRET_KEY_SIZE as SECP256K1_SECRET_KEY_SIZE};
 use secp256k1::key;
 use ethereum_types::H256;
-use mem::Memzero;
+use memzero::Memzero;
 use {Error, SECP256K1};
 
 #[derive(Clone, PartialEq, Eq)]

diff --git a/ethkey/src/signature.rs → accounts/ethkey/src/signature.rs b/ethkey/src/signature.rs → accounts/ethkey/src/signature.rs
diff --git a/ethstore/.editorconfig → accounts/ethstore/.editorconfig b/ethstore/.editorconfig → accounts/ethstore/.editorconfig
diff --git a/ethstore/.gitignore → accounts/ethstore/.gitignore b/ethstore/.gitignore → accounts/ethstore/.gitignore
diff --git a/ethstore/.travis.yml → accounts/ethstore/.travis.yml b/ethstore/.travis.yml → accounts/ethstore/.travis.yml
diff --git a/ethstore/Cargo.toml → accounts/ethstore/Cargo.toml b/ethstore/Cargo.toml → accounts/ethstore/Cargo.toml
@@ -18,7 +18,7 @@ itertools = "0.5"
 parking_lot = "0.7"
 parity-crypto = "0.2"
 ethereum-types = "0.4"
-dir = { path = "../util/dir" }
+dir = { path = "../../util/dir" }
 smallvec = "0.6"
 parity-wordlist = "1.0"
 tempdir = "0.3"

diff --git a/ethstore/README.md → accounts/ethstore/README.md b/ethstore/README.md → accounts/ethstore/README.md
diff --git a/ethstore/cli/Cargo.toml → accounts/ethstore/cli/Cargo.toml b/ethstore/cli/Cargo.toml → accounts/ethstore/cli/Cargo.toml
@@ -11,8 +11,8 @@ serde = "1.0"
 serde_derive = "1.0"
 parking_lot = "0.7"
 ethstore = { path = "../" }
-dir = { path = '../../util/dir' }
-panic_hook = { path = "../../util/panic_hook" }
+dir = { path = '../../../util/dir' }
+panic_hook = { path = "../../../util/panic-hook" }
 
 [[bin]]
 name = "ethstore"

diff --git a/ethstore/cli/src/crack.rs → accounts/ethstore/cli/src/crack.rs b/ethstore/cli/src/crack.rs → accounts/ethstore/cli/src/crack.rs
diff --git a/ethstore/cli/src/main.rs → accounts/ethstore/cli/src/main.rs b/ethstore/cli/src/main.rs → accounts/ethstore/cli/src/main.rs
diff --git a/ethstore/cli/tests/cli.rs → accounts/ethstore/cli/tests/cli.rs b/ethstore/cli/tests/cli.rs → accounts/ethstore/cli/tests/cli.rs
diff --git a/ethstore/src/account/cipher.rs → accounts/ethstore/src/account/cipher.rs b/ethstore/src/account/cipher.rs → accounts/ethstore/src/account/cipher.rs
diff --git a/ethstore/src/account/crypto.rs → accounts/ethstore/src/account/crypto.rs b/ethstore/src/account/crypto.rs → accounts/ethstore/src/account/crypto.rs
diff --git a/ethstore/src/account/kdf.rs → accounts/ethstore/src/account/kdf.rs b/ethstore/src/account/kdf.rs → accounts/ethstore/src/account/kdf.rs
diff --git a/ethstore/src/account/mod.rs → accounts/ethstore/src/account/mod.rs b/ethstore/src/account/mod.rs → accounts/ethstore/src/account/mod.rs
diff --git a/ethstore/src/account/safe_account.rs → ...unts/ethstore/src/account/safe_account.rs b/ethstore/src/account/safe_account.rs → ...unts/ethstore/src/account/safe_account.rs
diff --git a/ethstore/src/account/version.rs → accounts/ethstore/src/account/version.rs b/ethstore/src/account/version.rs → accounts/ethstore/src/account/version.rs
diff --git a/ethstore/src/accounts_dir/disk.rs → accounts/ethstore/src/accounts_dir/disk.rs b/ethstore/src/accounts_dir/disk.rs → accounts/ethstore/src/accounts_dir/disk.rs
diff --git a/ethstore/src/accounts_dir/memory.rs → accounts/ethstore/src/accounts_dir/memory.rs b/ethstore/src/accounts_dir/memory.rs → accounts/ethstore/src/accounts_dir/memory.rs
diff --git a/ethstore/src/accounts_dir/mod.rs → accounts/ethstore/src/accounts_dir/mod.rs b/ethstore/src/accounts_dir/mod.rs → accounts/ethstore/src/accounts_dir/mod.rs
diff --git a/ethstore/src/accounts_dir/vault.rs → accounts/ethstore/src/accounts_dir/vault.rs b/ethstore/src/accounts_dir/vault.rs → accounts/ethstore/src/accounts_dir/vault.rs
diff --git a/ethstore/src/error.rs → accounts/ethstore/src/error.rs b/ethstore/src/error.rs → accounts/ethstore/src/error.rs
diff --git a/ethstore/src/ethkey.rs → accounts/ethstore/src/ethkey.rs b/ethstore/src/ethkey.rs → accounts/ethstore/src/ethkey.rs
diff --git a/ethstore/src/ethstore.rs → accounts/ethstore/src/ethstore.rs b/ethstore/src/ethstore.rs → accounts/ethstore/src/ethstore.rs
diff --git a/ethstore/src/import.rs → accounts/ethstore/src/import.rs b/ethstore/src/import.rs → accounts/ethstore/src/import.rs
diff --git a/ethstore/src/json/bytes.rs → accounts/ethstore/src/json/bytes.rs b/ethstore/src/json/bytes.rs → accounts/ethstore/src/json/bytes.rs
diff --git a/ethstore/src/json/cipher.rs → accounts/ethstore/src/json/cipher.rs b/ethstore/src/json/cipher.rs → accounts/ethstore/src/json/cipher.rs
diff --git a/ethstore/src/json/crypto.rs → accounts/ethstore/src/json/crypto.rs b/ethstore/src/json/crypto.rs → accounts/ethstore/src/json/crypto.rs
diff --git a/ethstore/src/json/error.rs → accounts/ethstore/src/json/error.rs b/ethstore/src/json/error.rs → accounts/ethstore/src/json/error.rs
diff --git a/ethstore/src/json/hash.rs → accounts/ethstore/src/json/hash.rs b/ethstore/src/json/hash.rs → accounts/ethstore/src/json/hash.rs
diff --git a/ethstore/src/json/id.rs → accounts/ethstore/src/json/id.rs b/ethstore/src/json/id.rs → accounts/ethstore/src/json/id.rs
diff --git a/ethstore/src/json/kdf.rs → accounts/ethstore/src/json/kdf.rs b/ethstore/src/json/kdf.rs → accounts/ethstore/src/json/kdf.rs
diff --git a/ethstore/src/json/key_file.rs → accounts/ethstore/src/json/key_file.rs b/ethstore/src/json/key_file.rs → accounts/ethstore/src/json/key_file.rs
diff --git a/ethstore/src/json/mod.rs → accounts/ethstore/src/json/mod.rs b/ethstore/src/json/mod.rs → accounts/ethstore/src/json/mod.rs
diff --git a/ethstore/src/json/presale.rs → accounts/ethstore/src/json/presale.rs b/ethstore/src/json/presale.rs → accounts/ethstore/src/json/presale.rs
diff --git a/ethstore/src/json/vault_file.rs → accounts/ethstore/src/json/vault_file.rs b/ethstore/src/json/vault_file.rs → accounts/ethstore/src/json/vault_file.rs
diff --git a/ethstore/src/json/vault_key_file.rs → accounts/ethstore/src/json/vault_key_file.rs b/ethstore/src/json/vault_key_file.rs → accounts/ethstore/src/json/vault_key_file.rs
diff --git a/ethstore/src/json/version.rs → accounts/ethstore/src/json/version.rs b/ethstore/src/json/version.rs → accounts/ethstore/src/json/version.rs
diff --git a/ethstore/src/lib.rs → accounts/ethstore/src/lib.rs b/ethstore/src/lib.rs → accounts/ethstore/src/lib.rs
diff --git a/ethstore/src/presale.rs → accounts/ethstore/src/presale.rs b/ethstore/src/presale.rs → accounts/ethstore/src/presale.rs
diff --git a/ethstore/src/random.rs → accounts/ethstore/src/random.rs b/ethstore/src/random.rs → accounts/ethstore/src/random.rs
diff --git a/ethstore/src/secret_store.rs → accounts/ethstore/src/secret_store.rs b/ethstore/src/secret_store.rs → accounts/ethstore/src/secret_store.rs
diff --git a/ethstore/tests/api.rs → accounts/ethstore/tests/api.rs b/ethstore/tests/api.rs → accounts/ethstore/tests/api.rs
diff --git a/ethstore/tests/res/ciphertext/30.json → ...nts/ethstore/tests/res/ciphertext/30.json b/ethstore/tests/res/ciphertext/30.json → ...nts/ethstore/tests/res/ciphertext/30.json
diff --git a/ethstore/tests/res/ciphertext/31.json → ...nts/ethstore/tests/res/ciphertext/31.json b/ethstore/tests/res/ciphertext/31.json → ...nts/ethstore/tests/res/ciphertext/31.json
diff --git a/...-3f49624084b67849c7b4e805c5988c21a430f9d9 → ...-3f49624084b67849c7b4e805c5988c21a430f9d9 b/...-3f49624084b67849c7b4e805c5988c21a430f9d9 → ...-3f49624084b67849c7b4e805c5988c21a430f9d9
diff --git a/...-5ba4dcf897e97c2bdf8315b9ef26c13c085988cf → ...-5ba4dcf897e97c2bdf8315b9ef26c13c085988cf b/...-5ba4dcf897e97c2bdf8315b9ef26c13c085988cf → ...-5ba4dcf897e97c2bdf8315b9ef26c13c085988cf
diff --git a/...-63121b431a52f8043c16fcf0d1df9cb7b5f66649 → ...-63121b431a52f8043c16fcf0d1df9cb7b5f66649 b/...-63121b431a52f8043c16fcf0d1df9cb7b5f66649 → ...-63121b431a52f8043c16fcf0d1df9cb7b5f66649
diff --git a/ethstore/tests/res/pat/p1.json → accounts/ethstore/tests/res/pat/p1.json b/ethstore/tests/res/pat/p1.json → accounts/ethstore/tests/res/pat/p1.json
diff --git a/ethstore/tests/res/pat/p2.json → accounts/ethstore/tests/res/pat/p2.json b/ethstore/tests/res/pat/p2.json → accounts/ethstore/tests/res/pat/p2.json
diff --git a/ethstore/tests/util/mod.rs → accounts/ethstore/tests/util/mod.rs b/ethstore/tests/util/mod.rs → accounts/ethstore/tests/util/mod.rs
diff --git a/ethstore/tests/util/transient_dir.rs → ...unts/ethstore/tests/util/transient_dir.rs b/ethstore/tests/util/transient_dir.rs → ...unts/ethstore/tests/util/transient_dir.rs
diff --git a/util/fake-hardware-wallet/Cargo.toml → accounts/fake-hardware-wallet/Cargo.toml b/util/fake-hardware-wallet/Cargo.toml → accounts/fake-hardware-wallet/Cargo.toml
@@ -7,4 +7,4 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 ethereum-types = "0.4"
-ethkey = { path = "../../ethkey" }
+ethkey = { path = "../../accounts/ethkey" }
diff --git a/util/fake-hardware-wallet/src/lib.rs → accounts/fake-hardware-wallet/src/lib.rs b/util/fake-hardware-wallet/src/lib.rs → accounts/fake-hardware-wallet/src/lib.rs
diff --git a/hw/Cargo.toml → accounts/hw/Cargo.toml b/hw/Cargo.toml → accounts/hw/Cargo.toml
diff --git a/hw/src/ledger.rs → accounts/hw/src/ledger.rs b/hw/src/ledger.rs → accounts/hw/src/ledger.rs
diff --git a/hw/src/lib.rs → accounts/hw/src/lib.rs b/hw/src/lib.rs → accounts/hw/src/lib.rs
diff --git a/hw/src/trezor.rs → accounts/hw/src/trezor.rs b/hw/src/trezor.rs → accounts/hw/src/trezor.rs
diff --git a/rpc_cli/Cargo.toml → cli-signer/Cargo.toml b/rpc_cli/Cargo.toml → cli-signer/Cargo.toml
@@ -3,11 +3,11 @@ authors = ["Parity <admin@parity.io>"]
 description = "Parity Cli Tool"
 homepage = "http://parity.io"
 license = "GPL-3.0"
-name = "rpc-cli"
+name = "cli-signer"
 version = "1.4.0"
 
 [dependencies]
 futures = "0.1"
 rpassword = "1.0"
 parity-rpc = { path = "../rpc" }
-parity-rpc-client = { path = "../rpc_client" }
+parity-rpc-client = { path = "rpc-client" }
diff --git a/rpc_client/Cargo.toml → cli-signer/rpc-client/Cargo.toml b/rpc_client/Cargo.toml → cli-signer/rpc-client/Cargo.toml
@@ -16,5 +16,5 @@ matches = "0.1"
 parking_lot = "0.7"
 jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" }
 jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" }
-parity-rpc = { path = "../rpc" }
+parity-rpc = { path = "../../rpc" }
 keccak-hash = "0.1"
diff --git a/rpc_client/src/client.rs → cli-signer/rpc-client/src/client.rs b/rpc_client/src/client.rs → cli-signer/rpc-client/src/client.rs
diff --git a/rpc_client/src/lib.rs → cli-signer/rpc-client/src/lib.rs b/rpc_client/src/lib.rs → cli-signer/rpc-client/src/lib.rs
diff --git a/rpc_client/src/signer_client.rs → cli-signer/rpc-client/src/signer_client.rs b/rpc_client/src/signer_client.rs → cli-signer/rpc-client/src/signer_client.rs
diff --git a/rpc_cli/src/lib.rs → cli-signer/src/lib.rs b/rpc_cli/src/lib.rs → cli-signer/src/lib.rs
diff --git a/devtools/Cargo.toml b/devtools/Cargo.toml
diff --git a/devtools/src/lib.rs b/devtools/src/lib.rs
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
@@ -25,16 +25,16 @@ error-chain = { version = "0.12", default-features = false }
 ethcore-io = { path = "../util/io" }
 ethcore-logger = { path = "../logger" }
 ethcore-miner = { path = "../miner" }
-ethcore-stratum = { path = "./stratum", optional = true }
+ethcore-stratum = { path = "../miner/stratum", optional = true }
 ethcore-transaction = { path = "./transaction" }
 ethereum-types = "0.4"
-memory-cache = { path = "../util/memory_cache" }
+memory-cache = { path = "../util/memory-cache" }
 ethabi = "6.0"
 ethabi-derive = "6.0"
 ethabi-contract = "6.0"
 ethjson = { path = "../json" }
-ethkey = { path = "../ethkey" }
-ethstore = { path = "../ethstore" }
+ethkey = { path = "../accounts/ethkey" }
+ethstore = { path = "../accounts/ethstore" }
 evm = { path = "evm" }
 heapsize = "0.4"
 itertools = "0.5"
@@ -48,17 +48,16 @@ parking_lot = "0.7"
 rayon = "1.0"
 rand = "0.4"
 rlp = { version = "0.3.0", features = ["ethereum"] }
-rlp_compress = { path = "../util/rlp_compress" }
-rlp_derive = { path = "../util/rlp_derive" }
+rlp_compress = { path = "../util/rlp-compress" }
+rlp_derive = { path = "../util/rlp-derive" }
 kvdb = "0.1"
 kvdb-memorydb = "0.1"
 parity-snappy = "0.1"
-stop-guard = { path = "../util/stop-guard" }
 macros = { path = "../util/macros" }
 rustc-hex = "1.0"
 stats = { path = "../util/stats" }
 trace-time = "0.1"
-using_queue = { path = "../util/using_queue" }
+using_queue = { path = "../miner/using-queue" }
 vm = { path = "vm" }
 wasm = { path = "wasm" }
 keccak-hash = "0.1"
@@ -73,10 +72,10 @@ tempdir = {version="0.3", optional = true}
 len-caching-lock = { path = "../util/len-caching-lock" }
 
 [target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android"))'.dependencies]
-hardware-wallet = { path = "../hw" }
+hardware-wallet = { path = "../accounts/hw" }
 
 [target.'cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android")))'.dependencies]
-fake-hardware-wallet = { path = "../util/fake-hardware-wallet" }
+fake-hardware-wallet = { path = "../accounts/fake-hardware-wallet" }
 
 [dev-dependencies]
 env_logger = "0.4"

diff --git a/ethcore/evm/Cargo.toml b/ethcore/evm/Cargo.toml
@@ -13,7 +13,7 @@ log = "0.4"
 vm = { path = "../vm" }
 keccak-hash = "0.1"
 parking_lot = "0.7"
-memory-cache = { path = "../../util/memory_cache" }
+memory-cache = { path = "../../util/memory-cache" }
 
 [dev-dependencies]
 rustc-hex = "1.0"