Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@ordian
ordian committed May 20, 2019
1 parent 3478523 commit ad28077
Show file tree
Hide file tree
Showing 49 changed files with 270 additions and 265 deletions.
306 changes: 158 additions & 148 deletions Cargo.lock
View file

Large diffs are not rendered by default.

12 changes: 4 additions & 8 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,12 @@ ethcore-network = { path = "util/network" }
ethcore-private-tx = { path = "ethcore/private-tx" }
ethcore-service = { path = "ethcore/service" }
ethcore-sync = { path = "ethcore/sync" }
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }

ethkey = { path = "accounts/ethkey" }
ethstore = { path = "accounts/ethstore" }
node-filter = { path = "ethcore/node-filter" }
rlp = { version = "0.3.0", default-features = false }
rlp = { git = "https://github.com/ordian/parity-common" }
cli-signer= { path = "cli-signer" }
parity-daemonize = "0.3"
parity-hash-fetch = { path = "updater/hash-fetch" }
Expand All @@ -63,7 +64,7 @@ parity-whisper = { path = "whisper" }
parity-path = "0.1"
dir = { path = "util/dir" }
panic_hook = { path = "util/panic-hook" }
keccak-hash = "0.1.4"
keccak-hash = { git = "https://github.com/ordian/parity-common" }
migration-rocksdb = { path = "util/migration-rocksdb" }
kvdb = "0.1"
kvdb-rocksdb = "0.1.3"
Expand Down Expand Up @@ -144,10 +145,5 @@ members = [

[patch.crates-io]
heapsize = { git = "https://github.com/cheme/heapsize.git", branch = "ec-macfix" }
# TODO: remove when 0.5.3 is published
ethereum-types = { git = "https://github.com/ordian/parity-common" }
ethbloom = { git = "https://github.com/ordian/parity-common" }
rlp = { git = "https://github.com/ordian/parity-common" }
primitive-types = { git = "https://github.com/ordian/parity-common" }
# TODO: fix keccak-hash upstream
keccak-hash = { git = "https://github.com/ordian/parity-common" }
2 changes: 1 addition & 1 deletion accounts/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ hardware-wallet = { path = "hw" }
fake-hardware-wallet = { path = "fake-hardware-wallet" }

[dev-dependencies]
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
tempdir = "0.3"
2 changes: 1 addition & 1 deletion accounts/ethkey/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edit-distance = "2.0"
parity-crypto = "0.3.0"
# TODO: use master branch after we switch to rand 0.6
eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1", branch = "rand-0.6" }
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
lazy_static = "1.0"
log = "0.4"
memzero = { path = "../../util/memzero" }
Expand Down
2 changes: 1 addition & 1 deletion accounts/ethstore/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ time = "0.1.34"
itertools = "0.5"
parking_lot = "0.7"
parity-crypto = "0.3.0"
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
dir = { path = "../../util/dir" }
smallvec = "0.6"
parity-wordlist = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion accounts/fake-hardware-wallet/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ license = "GPL-3.0"
authors = ["Parity Technologies <admin@parity.io>"]

[dependencies]
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
ethkey = { path = "../../accounts/ethkey" }
2 changes: 1 addition & 1 deletion accounts/hw/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ hidapi = { git = "https://github.com/paritytech/hidapi-rs" }
libusb = { git = "https://github.com/paritytech/libusb-rs" }
trezor-sys = { git = "https://github.com/paritytech/trezor-sys" }
ethkey = { path = "../ethkey" }
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
semver = "0.9"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion cli-signer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name = "cli-signer"
version = "1.4.0"

[dependencies]
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
futures = "0.1"
rpassword = "1.0"
parity-rpc = { path = "../rpc" }
Expand Down
4 changes: 2 additions & 2 deletions cli-signer/rpc-client/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name = "parity-rpc-client"
version = "1.4.0"

[dependencies]
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
futures = "0.1"
log = "0.4"
serde = "1.0"
Expand All @@ -18,4 +18,4 @@ parking_lot = "0.7"
jsonrpc-core = "10.0.1"
jsonrpc-ws-server = "10.0.1"
parity-rpc = { path = "../../rpc" }
keccak-hash = "0.1.4"
keccak-hash = { git = "https://github.com/ordian/parity-common" }
4 changes: 2 additions & 2 deletions ethash/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
crunchy = "0.1.0"
either = "1.0.0"
ethereum-types = "0.5.2"
keccak-hash = "0.1.4"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
keccak-hash = { git = "https://github.com/ordian/parity-common" }
log = "0.4"
memmap = "0.6"
parking_lot = "0.7"
Expand Down
12 changes: 6 additions & 6 deletions ethcore/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ common-types = { path = "types" }
crossbeam = "0.4"
derive_more = "0.14.0"
env_logger = { version = "0.5", optional = true }
ethabi = "7.0.0"
ethabi-contract = "7.0.0"
ethabi-derive = "7.0.0"
ethabi = { git = "https://github.com/ordian/ethabi" }
ethabi-contract = { git = "https://github.com/ordian/ethabi" }
ethabi-derive = { git = "https://github.com/ordian/ethabi" }
ethash = { path = "../ethash" }
ethcore-blockchain = { path = "./blockchain" }
ethcore-bloom-journal = { path = "../util/bloom" }
Expand All @@ -26,7 +26,7 @@ ethcore-db = { path = "./db" }
ethcore-io = { path = "../util/io" }
ethcore-miner = { path = "../miner" }
ethcore-stratum = { path = "../miner/stratum", optional = true }
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
ethjson = { path = "../json" }
ethkey = { path = "../accounts/ethkey" }
evm = { path = "evm" }
Expand All @@ -35,7 +35,7 @@ hash-db = "0.11.0"
heapsize = "0.4"
itertools = "0.5"
journaldb = { path = "../util/journaldb" }
keccak-hash = "0.1.4"
keccak-hash = { git = "https://github.com/ordian/parity-common" }
keccak-hasher = { path = "../util/keccak-hasher" }
kvdb = "0.1"
kvdb-memorydb = "0.1"
Expand All @@ -57,7 +57,7 @@ trie-db = "0.11.0"
patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
rand = "0.4"
rayon = "1.0"
rlp = { version = "0.3.0", default-features = false }
rlp = { git = "https://github.com/ordian/parity-common" }
rlp_derive = { path = "../util/rlp-derive" }
rustc-hex = "1.0"
serde = "1.0"
Expand Down
6 changes: 3 additions & 3 deletions ethcore/blockchain/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ ansi_term = "0.10"
blooms-db = { path = "../../util/blooms-db" }
common-types = { path = "../types" }
ethcore-db = { path = "../db" }
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
heapsize = "0.4"
itertools = "0.5"
kvdb = "0.1"
log = "0.4"
parity-bytes = "0.1"
parking_lot = "0.7"
rayon = "1.0"
rlp = { version = "0.3.0", default-features = false }
rlp = { git = "https://github.com/ordian/parity-common" }
rlp_compress = { path = "../../util/rlp-compress" }
rlp_derive = { path = "../../util/rlp-derive" }

[dev-dependencies]
env_logger = "0.5"
ethkey = { path = "../../accounts/ethkey" }
keccak-hash = "0.1.4"
keccak-hash = { git = "https://github.com/ordian/parity-common" }
rustc-hex = "1.0"
tempdir = "0.3"
kvdb-memorydb = "0.1"
2 changes: 1 addition & 1 deletion ethcore/call-contract/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2018"

[dependencies]
types = { path = "../types", package = "common-types" }
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
bytes = { version = "0.1", package = "parity-bytes" }
4 changes: 2 additions & 2 deletions ethcore/db/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ edition = "2018"

[dependencies]
common-types = { path = "../types" }
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
heapsize = "0.4"
kvdb = "0.1"
parking_lot = "0.7"
rlp = { version = "0.3.0", default-features = false }
rlp = { git = "https://github.com/ordian/parity-common" }
rlp_derive = { path = "../../util/rlp-derive" }
4 changes: 2 additions & 2 deletions ethcore/evm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
bit-set = "0.4"
parity-bytes = "0.1"
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
heapsize = "0.4"
lazy_static = "1.0"
log = "0.4"
vm = { path = "../vm" }
keccak-hash = "0.1.4"
keccak-hash = { git = "https://github.com/ordian/parity-common" }
parking_lot = "0.7"
memory-cache = { path = "../../util/memory-cache" }
num-bigint = "0.2"
Expand Down
6 changes: 3 additions & 3 deletions ethcore/light/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ common-types = { path = "../types" }
ethcore = { path = ".."}
ethcore-db = { path = "../db" }
ethcore-blockchain = { path = "../blockchain" }
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
memory-db = "0.11.0"
trie-db = "0.11.0"
patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
Expand All @@ -25,7 +25,7 @@ heapsize = "0.4"
vm = { path = "../vm" }
fastmap = { path = "../../util/fastmap" }
failsafe = { version = "0.3.0", default-features = false, features = ["parking_lot_mutex"] }
rlp = { version = "0.3.0", default-features = false }
rlp = { git = "https://github.com/ordian/parity-common" }
rlp_derive = { path = "../../util/rlp-derive" }
smallvec = "0.6"
futures = "0.1"
Expand All @@ -36,7 +36,7 @@ serde = "1.0"
serde_derive = "1.0"
parking_lot = "0.7"
stats = { path = "../../util/stats" }
keccak-hash = "0.1.4"
keccak-hash = { git = "https://github.com/ordian/parity-common" }
keccak-hasher = { path = "../../util/keccak-hasher" }
triehash-ethereum = { version = "0.2", path = "../../util/triehash-ethereum" }
kvdb = "0.1"
Expand Down
8 changes: 4 additions & 4 deletions ethcore/node-filter/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ authors = ["Parity Technologies <admin@parity.io>"]
ethcore = { path = ".."}
ethcore-network = { path = "../../util/network" }
ethcore-network-devp2p = { path = "../../util/network-devp2p" }
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
log = "0.4"
parking_lot = "0.7"
ethabi = "7.0.0"
ethabi-derive = "7.0.0"
ethabi-contract = "7.0.0"
ethabi = { git = "https://github.com/ordian/ethabi" }
ethabi-derive = { git = "https://github.com/ordian/ethabi" }
ethabi-contract = { git = "https://github.com/ordian/ethabi" }
lru-cache = "0.1"

[dev-dependencies]
Expand Down
12 changes: 6 additions & 6 deletions ethcore/private-tx/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
common-types = { path = "../types" }
derive_more = "0.14.0"
ethabi = "7.0.0"
ethabi-contract = "7.0.0"
ethabi-derive = "7.0.0"
ethabi = { git = "https://github.com/ordian/ethabi" }
ethabi-contract = { git = "https://github.com/ordian/ethabi" }
ethabi-derive = { git = "https://github.com/ordian/ethabi" }
ethcore = { path = ".." }
ethcore-call-contract = { path = "../call-contract" }
ethcore-io = { path = "../../util/io" }
ethcore-miner = { path = "../../miner" }
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
ethjson = { path = "../../json" }
ethkey = { path = "../../accounts/ethkey" }
fetch = { path = "../../util/fetch" }
futures = "0.1"
heapsize = "0.4"
keccak-hash = "0.1.4"
keccak-hash = { git = "https://github.com/ordian/parity-common" }
log = "0.4"
parity-bytes = "0.1"
parity-crypto = "0.3.0"
parking_lot = "0.7"
trie-db = "0.11.0"
patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
rand = "0.3"
rlp = { version = "0.3.0", default-features = false }
rlp = { git = "https://github.com/ordian/parity-common" }
rlp_derive = { path = "../../util/rlp-derive" }
rustc-hex = "1.0"
serde = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion ethcore/service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ethcore-blockchain = { path = "../blockchain" }
ethcore-io = { path = "../../util/io" }
ethcore-private-tx = { path = "../private-tx" }
ethcore-sync = { path = "../sync" }
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
kvdb = "0.1"
log = "0.4"
trace-time = "0.1"
Expand Down
6 changes: 3 additions & 3 deletions ethcore/sync/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ ethcore-io = { path = "../../util/io" }
ethcore-light = { path = "../light" }
ethcore-network = { path = "../../util/network" }
ethcore-network-devp2p = { path = "../../util/network-devp2p" }
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
ethkey = { path = "../../accounts/ethkey" }
ethstore = { path = "../../accounts/ethstore" }
fastmap = { path = "../../util/fastmap" }
hash-db = "0.11.0"
heapsize = "0.4"
keccak-hash = "0.1.4"
keccak-hash = { git = "https://github.com/ordian/parity-common" }
keccak-hasher = { path = "../../util/keccak-hasher" }
kvdb = "0.1"
log = "0.4"
macros = { path = "../../util/macros" }
parity-bytes = "0.1"
parking_lot = "0.7"
rand = "0.4"
rlp = { version = "0.3.0", default-features = false }
rlp = { git = "https://github.com/ordian/parity-common" }
trace-time = "0.1"
triehash-ethereum = {version = "0.2", path = "../../util/triehash-ethereum" }
futures = "0.1"
Expand Down
6 changes: 3 additions & 3 deletions ethcore/types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]

[dependencies]
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
ethjson = { path = "../../json" }
ethkey = { path = "../../accounts/ethkey" }
heapsize = "0.4"
keccak-hash = "0.1.4"
keccak-hash = { git = "https://github.com/ordian/parity-common" }
parity-bytes = "0.1"
rlp = { version = "0.3.0", default-features = false }
rlp = { git = "https://github.com/ordian/parity-common" }
rlp_derive = { path = "../../util/rlp-derive" }
unexpected = { path = "../../util/unexpected" }

Expand Down
6 changes: 3 additions & 3 deletions ethcore/vm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
byteorder = "1.0"
parity-bytes = "0.1"
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
trie-db = "0.11.0"
patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
log = "0.4"
ethjson = { path = "../../json" }
rlp = { version = "0.3.0", default-features = false }
keccak-hash = "0.1.4"
rlp = { git = "https://github.com/ordian/parity-common" }
keccak-hash = { git = "https://github.com/ordian/parity-common" }
2 changes: 1 addition & 1 deletion ethcore/wasm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]

[dependencies]
byteorder = "1.0"
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
log = "0.4"
parity-wasm = "0.31"
libc = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion ethcore/wasm/run/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
serde = "1"
serde_json = "1"
serde_derive = "1"
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
ethjson = { path = "../../../json" }
vm = { path = "../../vm" }
wasm = { path = "../" }
Expand Down
2 changes: 1 addition & 1 deletion evmbin/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ common-types = { path = "../ethcore/types" }
docopt = "1.0"
env_logger = "0.5"
ethcore = { path = "../ethcore", features = ["test-helpers", "json-tests", "to-pod-full"] }
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
ethjson = { path = "../json" }
evm = { path = "../ethcore/evm" }
panic_hook = { path = "../util/panic-hook" }
Expand Down
4 changes: 2 additions & 2 deletions ipfs/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
ethcore = { path = "../ethcore" }
parity-bytes = "0.1"
ethereum-types = "0.5.2"
ethereum-types = { git = "https://github.com/ordian/parity-common" }
jsonrpc-core = "10.0.1"
jsonrpc-http-server = "10.0.1"
rlp = { version = "0.3.0", default-features = false }
rlp = { git = "https://github.com/ordian/parity-common" }
cid = "0.3"
multihash = "0.8"
unicase = "2.0"
Expand Down
Loading

0 comments on commit ad28077

Please sign in to comment.