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

Update ethereum types to 0.8.0 version #11139

Merged
merged 4 commits into from Oct 8, 2019
Merged

Update ethereum types to 0.8.0 version #11139

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b64192d
Ethereum types updated to 0.8 version
grbIzl Oct 7, 2019
e898ad3
Fix for rand usage in rpc
grbIzl Oct 7, 2019
45cfd1e
Cargo lock fixed after rebase
grbIzl Oct 7, 2019
9dbdde3
TODO added
grbIzl Oct 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
448 changes: 230 additions & 218 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Expand Up @@ -31,14 +31,14 @@ ethcore-private-tx = { path = "ethcore/private-tx" }
ethcore-secretstore = { path = "secret-store", optional = true }
ethcore-service = { path = "ethcore/service" }
ethcore-sync = { path = "ethcore/sync" }
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
ethkey = { path = "accounts/ethkey" }
ethstore = { path = "accounts/ethstore" }
fdlimit = "0.1"
futures = "0.1"
journaldb = { path = "util/journaldb" }
jsonrpc-core = "13.2.0"
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
kvdb = "0.1"
kvdb-rocksdb = "0.1.5"
log = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion accounts/Cargo.toml
View file
Open in desktop
Expand Up @@ -17,5 +17,5 @@ serde_derive = "1.0"
serde_json = "1.0"

[dev-dependencies]
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
tempdir = "0.3"
2 changes: 1 addition & 1 deletion accounts/ethkey/Cargo.toml
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edit-distance = "2.0"
parity-crypto = "0.4.0"
eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
lazy_static = "1.0"
log = "0.4"
parity-wordlist = "1.3"
Expand Down
2 changes: 1 addition & 1 deletion accounts/ethstore/Cargo.toml
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ time = "0.1.34"
itertools = "0.5"
parking_lot = "0.9"
parity-crypto = "0.4.0"
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
dir = { path = "../../util/dir" }
smallvec = "0.6"
parity-wordlist = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion cli-signer/Cargo.toml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ version = "1.4.0"
authors = ["Parity <admin@parity.io>"]

[dependencies]
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
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
Open in desktop
Expand Up @@ -7,7 +7,7 @@ version = "1.4.0"
authors = ["Parity <admin@parity.io>"]

[dependencies]
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
futures = "0.1"
log = "0.4"
serde = "1.0"
Expand All @@ -18,4 +18,4 @@ parking_lot = "0.9"
jsonrpc-core = "13.2.0"
jsonrpc-ws-server = "13.2.0"
parity-rpc = { path = "../../rpc" }
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
4 changes: 2 additions & 2 deletions ethash/Cargo.toml
View file
Open in desktop
Expand Up @@ -7,8 +7,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
common-types = { path = "../ethcore/types" }
either = "1.0.0"
ethereum-types = "0.6.0"
keccak-hash = "0.2.0"
ethereum-types = "0.8.0"
keccak-hash = "0.4.0"
log = "0.4"
memmap = "0.6"
parking_lot = "0.9"
Expand Down
4 changes: 2 additions & 2 deletions ethcore/Cargo.toml
View file
Open in desktop
Expand Up @@ -24,14 +24,14 @@ ethcore-db = { path = "./db" }
ethcore-io = { path = "../util/io" }
ethcore-miner = { path = "../miner" }
ethcore-stratum = { path = "../miner/stratum", optional = true }
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
evm = { path = "evm" }
executive-state = { path = "executive-state" }
futures = "0.1"
hash-db = "0.15.0"
itertools = "0.5"
journaldb = { path = "../util/journaldb" }
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
kvdb = "0.1"
kvdb-memorydb = { version = "0.1.2", optional = true }
kvdb-rocksdb = { version = "0.1.5", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions ethcore/account-db/Cargo.toml
View file
Open in desktop
Expand Up @@ -7,9 +7,9 @@ version = "0.1.0"
edition = "2018"

[dependencies]
ethereum-types = "0.6"
ethereum-types = "0.8.0"
hash-db = "0.15.0"
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
keccak-hasher = { path = "../../util/keccak-hasher" }
kvdb = "0.1"
rlp = "0.4"
4 changes: 2 additions & 2 deletions ethcore/account-state/Cargo.toml
View file
Open in desktop
Expand Up @@ -9,12 +9,12 @@ edition = "2018"
[dependencies]
common-types = { path = "../types"}
derive_more = "0.15.0"
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
trie-vm-factories = { path = "../trie-vm-factories" }
hash-db = "0.15.0"
journaldb = { path = "../../util/journaldb" }
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
keccak-hasher = { path = "../../util/keccak-hasher" }
kvdb = "0.1"
log = "0.4"
Expand Down
10 changes: 5 additions & 5 deletions ethcore/block-reward/Cargo.toml
View file
Open in desktop
Expand Up @@ -9,11 +9,11 @@ license = "GPL-3.0"
[dependencies]
common-types = { path = "../types" }
engine = { path = "../engine" }
ethabi = "8.0.1"
ethabi-derive = "8.0.0"
ethabi-contract = "8.0.1"
ethereum-types = "0.6.0"
keccak-hash = "0.2.0"
ethabi = "9.0.1"
ethabi-derive = "9.0.1"
ethabi-contract = "9.0.0"
ethereum-types = "0.8.0"
keccak-hash = "0.4.0"
machine = { path = "../machine" }
trace = { path = "../trace" }

Expand Down
4 changes: 2 additions & 2 deletions ethcore/blockchain/Cargo.toml
View file
Open in desktop
Expand Up @@ -12,8 +12,8 @@ ansi_term = "0.11"
blooms-db = { path = "../../util/blooms-db" }
common-types = { path = "../types" }
ethcore-db = { path = "../db" }
ethereum-types = "0.6.0"
keccak-hash = "0.2.0"
ethereum-types = "0.8.0"
keccak-hash = "0.4.0"
parity-util-mem = "0.2.0"
itertools = "0.5"
kvdb = "0.1"
Expand Down
4 changes: 2 additions & 2 deletions ethcore/builtin/Cargo.toml
View file
Open in desktop
Expand Up @@ -7,10 +7,10 @@ edition = "2018"

[dependencies]
bn = { git = "https://github.com/paritytech/bn", default-features = false }
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
ethjson = { path = "../../json" }
ethkey = { path = "../../accounts/ethkey" }
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
log = "0.4"
num = { version = "0.1", default-features = false, features = ["bigint"] }
parity-bytes = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion ethcore/call-contract/Cargo.toml
View file
Open in desktop
Expand Up @@ -8,5 +8,5 @@ edition = "2018"

[dependencies]
types = { path = "../types", package = "common-types" }
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
bytes = { version = "0.1", package = "parity-bytes" }
2 changes: 1 addition & 1 deletion ethcore/client-traits/Cargo.toml
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ call-contract = { package = "ethcore-call-contract", path = "../call-contract" }
common-types = { path = "../types" }
ethcore-db = { path = "../db" }
ethcore-miner = { path = "../../miner" }
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
kvdb = "0.1"
registrar = { path = "../../util/registrar" }
stats = { path = "../../util/stats" }
Expand Down
2 changes: 1 addition & 1 deletion ethcore/db/Cargo.toml
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ edition = "2018"

[dependencies]
common-types = { path = "../types" }
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
kvdb = "0.1"
parity-util-mem = "0.2.0"
parking_lot = "0.9"
Expand Down
2 changes: 1 addition & 1 deletion ethcore/engine/Cargo.toml
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ builtin = { path = "../builtin", package = "ethcore-builtin" }
bytes = { package = "parity-bytes", version = "0.1.0" }
client-traits = { path = "../client-traits" }
common-types = { path = "../types" }
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
ethkey = { path = "../../accounts/ethkey" }
machine = { path = "../machine" }
vm = { path = "../vm" }
Expand Down
4 changes: 2 additions & 2 deletions ethcore/engines/authority-round/Cargo.toml
View file
Open in desktop
Expand Up @@ -10,13 +10,13 @@ license = "GPL-3.0"
block-reward = { path = "../../block-reward" }
client-traits = { path = "../../client-traits" }
common-types = { path = "../../types" }
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
ethjson = { path = "../../../json" }
ethkey = { path = "../../../accounts/ethkey" }
engine = { path = "../../engine" }
io = { package = "ethcore-io", path = "../../../util/io" }
itertools = "0.5"
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
lazy_static = "1.3.0"
log = "0.4"
lru-cache = "0.1"
Expand Down
4 changes: 2 additions & 2 deletions ethcore/engines/basic-authority/Cargo.toml
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ license = "GPL-3.0"
client-traits = { path = "../../client-traits" }
common-types = { path = "../../types" }
engine = { path = "../../engine" }
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
ethjson = { path = "../../../json" }
ethkey = { path = "../../../accounts/ethkey" }
log = "0.4.8"
Expand All @@ -23,7 +23,7 @@ validator-set = { path = "../validator-set" }
accounts = { package = "ethcore-accounts", path = "../../../accounts" }
engine = { path = "../../engine", features = ["test-helpers"] }
ethcore = { path = "../..", features = ["test-helpers"] }
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
tempdir = "0.3"
spec = { path = "../../spec" }

Expand Down
4 changes: 2 additions & 2 deletions ethcore/engines/clique/Cargo.toml
View file
Open in desktop
Expand Up @@ -9,11 +9,11 @@ license = "GPL-3.0"
[dependencies]
client-traits = { path = "../../client-traits" }
common-types = { path = "../../types" }
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
ethjson = { path = "../../../json" }
ethkey = { path = "../../../accounts/ethkey" }
engine = { path = "../../engine" }
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
lazy_static = "1.3.0"
log = "0.4"
lru-cache = "0.1"
Expand Down
6 changes: 3 additions & 3 deletions ethcore/engines/ethash/Cargo.toml
View file
Open in desktop
Expand Up @@ -11,17 +11,17 @@ block-reward = { path = "../../block-reward" }
common-types = { path = "../../types" }
engine = { path = "../../engine" }
ethash= { path = "../../../ethash" }
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
ethjson = { path = "../../../json" }
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
log = "0.4.8"
machine = { path = "../../machine" }
macros = { path = "../../../util/macros" }
unexpected = { path = "../../../util/unexpected" }

[dev-dependencies]
ethcore = { path = "../..", features = ["test-helpers"] }
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
rlp = "0.4.2"
spec = { path = "../../spec" }
tempdir = "0.3"
4 changes: 2 additions & 2 deletions ethcore/engines/instant-seal/Cargo.toml
View file
Open in desktop
Expand Up @@ -10,8 +10,8 @@ license = "GPL-3.0"
common-types = { path = "../../types" }
engine = { path = "../../engine" }
ethjson = { path = "../../../json" }
ethereum-types = "0.6.0"
keccak-hash = "0.2.0"
ethereum-types = "0.8.0"
keccak-hash = "0.4.0"
machine = { path = "../../machine" }
trace = { path = "../../trace" }

Expand Down
2 changes: 1 addition & 1 deletion ethcore/engines/null-engine/Cargo.toml
View file
Open in desktop
Expand Up @@ -11,5 +11,5 @@ common-types = { path = "../../types" }
block-reward = { path = "../../block-reward" }
engine = { path = "../../engine" }
ethjson = { path = "../../../json" }
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
machine = { path = "../../machine" }
12 changes: 6 additions & 6 deletions ethcore/engines/validator-set/Cargo.toml
View file
Open in desktop
Expand Up @@ -10,13 +10,13 @@ license = "GPL-3.0"
client-traits = { path = "../../client-traits" }
common-types = { path = "../../types" }
engine = { path = "../../engine" }
ethabi = "8.0.1"
ethabi-contract = "8.0.1"
ethabi-derive = "8.0.0"
ethereum-types = "0.6.0"
ethabi = "9.0.1"
ethabi-contract = "9.0.0"
ethabi-derive = "9.0.1"
ethereum-types = "0.8.0"
ethjson = { path = "../../../json" }
executive-state = { path = "../../executive-state" }
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
kvdb = "0.1"
lazy_static = "1.3.0"
log = "0.4.8"
Expand All @@ -37,7 +37,7 @@ engine = { path = "../../engine", features = ["test-helpers"] }
env_logger = "0.6.2"
ethcore = { path = "../..", features = ["test-helpers"] }
ethkey = { path = "../../../accounts/ethkey" }
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
rustc-hex = "1.0"
spec = { path = "../../spec" }

Expand Down
4 changes: 2 additions & 2 deletions ethcore/evm/Cargo.toml
View file
Open in desktop
Expand Up @@ -7,12 +7,12 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
bit-set = "0.4"
parity-bytes = "0.1"
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
parity-util-mem = "0.2.0"
lazy_static = "1.0"
log = "0.4"
vm = { path = "../vm" }
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
parking_lot = "0.9"
memory-cache = { path = "../../util/memory-cache" }

Expand Down
4 changes: 2 additions & 2 deletions ethcore/executive-state/Cargo.toml
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ account-db = { path = "../account-db" }
account-state = { path = "../account-state" }
bytes = { package = "parity-bytes", version = "0.1.0" }
common-types = { path = "../types" }
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
hash-db = "0.15.0"
keccak-hasher = { path = "../../util/keccak-hasher" }
kvdb = "0.1"
Expand All @@ -26,7 +26,7 @@ env_logger = "0.5"
ethcore = { path = "..", features = ["test-helpers"] }
ethkey = { path = "../../accounts/ethkey" }
evm = { path = "../evm" }
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
pod = { path = "../pod" }
rustc-hex = "1.0"
spec = { path = "../spec" }
Expand Down
4 changes: 2 additions & 2 deletions ethcore/light/Cargo.toml
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ derive_more = "0.14.0"
engine = { path = "../engine" }
ethcore-db = { path = "../db" }
ethcore-blockchain = { path = "../blockchain" }
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
executive-state = { path = "../executive-state" }
machine = { path = "../machine" }
memory-db = "0.15.0"
Expand All @@ -40,7 +40,7 @@ serde_derive = "1.0"
spec = { path = "../spec" }
parking_lot = "0.9"
stats = { path = "../../util/stats" }
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
keccak-hasher = { path = "../../util/keccak-hasher" }
triehash-ethereum = { version = "0.2", path = "../../util/triehash-ethereum" }
kvdb = "0.1"
Expand Down
10 changes: 5 additions & 5 deletions ethcore/machine/Cargo.toml
View file
Open in desktop
Expand Up @@ -11,17 +11,17 @@ account-state = { path = "../account-state" }
client-traits = { path = "../client-traits" }
common-types = { path = "../types" }
crossbeam-utils = "0.6"
ethabi = "8.0.0"
ethabi-contract = "8.0.0"
ethabi-derive = "8.0.0"
ethabi = "9.0.1"
ethabi-contract = "9.0.0"
ethabi-derive = "9.0.1"
ethcore-builtin = { path = "../builtin" }
ethcore-call-contract = { path = "../call-contract" }
ethcore-io = { path = "../../util/io" }
ethereum-types = "0.6.0"
ethereum-types = "0.8.0"
# Used for tests in other crates through the `test-helpers` feature
ethjson = { path = "../../json", optional = true }
evm = { path = "../evm" }
keccak-hash = "0.2.0"
keccak-hash = "0.4.0"
log = "0.4"
lru-cache = "0.1.2"
parity-bytes = "0.1.0"
Expand Down