Update ethereum types to 0.8.0 version (#11139)
* Ethereum types updated to 0.8 version * Fix for rand usage in rpc * Cargo lock fixed after rebase * TODO added
This commit is contained in:
parent
35513b14de
commit
f48780c29b
448
Cargo.lock
generated
448
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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" }
|
||||
|
@ -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"
|
||||
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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 }
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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" }
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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" }
|
||||
|
@ -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" }
|
||||
|
@ -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"
|
||||
|
@ -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" }
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
@ -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" }
|
||||
|
||||
|
@ -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"
|
||||
|
@ -11,9 +11,9 @@ 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" }
|
||||
@ -21,7 +21,7 @@ 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"
|
||||
|
@ -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" }
|
||||
|
||||
|
@ -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" }
|
||||
|
@ -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"
|
||||
@ -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" }
|
||||
|
||||
|
@ -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" }
|
||||
|
||||
|
@ -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"
|
||||
@ -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" }
|
||||
|
@ -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"
|
||||
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -12,12 +12,12 @@ common-types = { path = "../types" }
|
||||
ethcore = { path = ".."}
|
||||
ethcore-network = { path = "../../util/network" }
|
||||
ethcore-network-devp2p = { path = "../../util/network-devp2p" }
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
log = "0.4"
|
||||
parking_lot = "0.9"
|
||||
ethabi = "8.0"
|
||||
ethabi-derive = "8.0"
|
||||
ethabi-contract = "8.0"
|
||||
ethabi = "9.0.1"
|
||||
ethabi-derive = "9.0.1"
|
||||
ethabi-contract = "9.0.0"
|
||||
lru-cache = "0.1"
|
||||
|
||||
[dev-dependencies]
|
||||
|
@ -8,12 +8,12 @@ edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
common-types = { path = "../types" }
|
||||
ethereum-types = "0.6"
|
||||
ethereum-types = "0.8.0"
|
||||
ethjson = { path = "../../json" }
|
||||
ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
|
||||
hash-db = "0.15.0"
|
||||
itertools = "0.8"
|
||||
keccak-hash = "0.2.0"
|
||||
keccak-hash = "0.4.0"
|
||||
keccak-hasher = { path = "../../util/keccak-hasher" }
|
||||
kvdb = "0.1"
|
||||
log = "0.4"
|
||||
|
@ -10,22 +10,22 @@ account-state = { path = "../account-state" }
|
||||
client-traits = { path = "../client-traits" }
|
||||
common-types = { path = "../types" }
|
||||
derive_more = "0.14.0"
|
||||
ethabi = "8.0"
|
||||
ethabi-contract = "8.0"
|
||||
ethabi-derive = "8.0"
|
||||
ethabi = "9.0.1"
|
||||
ethabi-contract = "9.0.0"
|
||||
ethabi-derive = "9.0.1"
|
||||
ethcore = { path = ".." }
|
||||
ethcore-db = { path = "../db" }
|
||||
ethcore-call-contract = { path = "../call-contract" }
|
||||
ethcore-io = { path = "../../util/io" }
|
||||
ethcore-miner = { path = "../../miner" }
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
ethjson = { path = "../../json" }
|
||||
ethkey = { path = "../../accounts/ethkey" }
|
||||
fetch = { path = "../../util/fetch" }
|
||||
futures = "0.1"
|
||||
parity-util-mem = "0.2.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"
|
||||
log = "0.4"
|
||||
|
@ -13,7 +13,7 @@ ethcore-blockchain = { path = "../blockchain" }
|
||||
ethcore-io = { path = "../../util/io" }
|
||||
ethcore-private-tx = { path = "../private-tx" }
|
||||
ethcore-sync = { path = "../sync" }
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
kvdb = "0.1"
|
||||
log = "0.4"
|
||||
snapshot = { path = "../snapshot" }
|
||||
|
@ -18,12 +18,12 @@ crossbeam-utils = "0.6"
|
||||
engine = { path = "../engine" }
|
||||
ethcore-db = { path = "../db" }
|
||||
ethcore-io = { path = "../../util/io" }
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
|
||||
hash-db = "0.15.0"
|
||||
itertools = "0.5"
|
||||
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.8"
|
||||
@ -42,9 +42,9 @@ triehash = { package = "triehash-ethereum", version = "0.2", path = "../../util
|
||||
accounts = { package = "ethcore-accounts", path = "../../accounts" }
|
||||
engine = { path = "../engine", features = ["test-helpers"] }
|
||||
env_logger = "0.5"
|
||||
ethabi = "8.0"
|
||||
ethabi-contract = "8.0"
|
||||
ethabi-derive = "8.0"
|
||||
ethabi = "9.0.1"
|
||||
ethabi-contract = "9.0.0"
|
||||
ethabi-derive = "9.0.1"
|
||||
ethcore = { path = "..", features = ["test-helpers"] }
|
||||
ethkey = { path = "../../accounts/ethkey" }
|
||||
kvdb-rocksdb = { version = "0.1.5" }
|
||||
|
@ -17,12 +17,12 @@ env_logger = "0.5"
|
||||
ethcore = { path = "../..", features = ["test-helpers"] }
|
||||
ethcore-db = { path = "../../db" }
|
||||
ethcore-io = { path = "../../../util/io" }
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
ethkey = { path = "../../../accounts/ethkey" }
|
||||
ethtrie = { package = "patricia-trie-ethereum", path = "../../../util/patricia-trie-ethereum" }
|
||||
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"
|
||||
kvdb-rocksdb = { version = "0.1.5" }
|
||||
@ -37,8 +37,8 @@ spec = { path = "../../spec" }
|
||||
tempdir = "0.3"
|
||||
trie-db = "0.15.0"
|
||||
trie-standardmap = "0.15.0"
|
||||
ethabi = "8.0"
|
||||
ethabi-contract = "8.0"
|
||||
ethabi-derive = "8.0"
|
||||
ethabi = "9.0.1"
|
||||
ethabi-contract = "9.0.0"
|
||||
ethabi-derive = "9.0.1"
|
||||
lazy_static = { version = "1.3" }
|
||||
triehash = { package = "triehash-ethereum", version = "0.2", path = "../../../util/triehash-ethereum" }
|
||||
|
@ -17,14 +17,14 @@ common-types = { path = "../types" }
|
||||
engine = { path = "../engine" }
|
||||
ethash = { path = "../../ethash" }
|
||||
ethash-engine = { path = "../engines/ethash" }
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
ethjson = { path = "../../json" }
|
||||
evm = { path = "../evm" }
|
||||
executive-state = { path = "../executive-state" }
|
||||
hash-db = "0.15.0"
|
||||
instant-seal = { path = "../engines/instant-seal" }
|
||||
journaldb = { path = "../../util/journaldb" }
|
||||
keccak-hash = "0.2.0"
|
||||
keccak-hash = "0.4.0"
|
||||
kvdb-memorydb = "0.1.2"
|
||||
log = "0.4.8"
|
||||
machine = { path = "../machine" }
|
||||
|
@ -11,9 +11,9 @@ account-state = { path = "../account-state" }
|
||||
bloom_journal = { package = "ethcore-bloom-journal", path = "../../util/bloom" }
|
||||
common-types = { path = "../types"}
|
||||
ethcore-db = { path = "../db" }
|
||||
ethereum-types = "0.6.0"
|
||||
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" }
|
||||
journaldb = { path = "../../util/journaldb" }
|
||||
kvdb = "0.1"
|
||||
|
@ -16,11 +16,11 @@ devp2p = { package = "ethcore-network-devp2p", path = "../../util/network-devp2p
|
||||
enum_primitive = "0.1.1"
|
||||
ethcore-io = { path = "../../util/io" }
|
||||
ethcore-private-tx = { path = "../private-tx" }
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
ethkey = { path = "../../accounts/ethkey" }
|
||||
fastmap = { path = "../../util/fastmap" }
|
||||
futures = "0.1"
|
||||
keccak-hash = "0.2.0"
|
||||
keccak-hash = "0.4.0"
|
||||
light = { package = "ethcore-light", path = "../light" }
|
||||
log = "0.4"
|
||||
macros = { path = "../../util/macros" }
|
||||
|
@ -9,7 +9,7 @@ edition = "2018"
|
||||
[dependencies]
|
||||
ethcore-blockchain = { path = "../blockchain" }
|
||||
ethcore-db = { path = "../db" }
|
||||
ethereum-types = "0.6"
|
||||
ethereum-types = "0.8.0"
|
||||
evm = { path = "../evm" }
|
||||
kvdb = "0.1"
|
||||
log = "0.4"
|
||||
|
@ -6,12 +6,12 @@ authors = ["Parity Technologies <admin@parity.io>"]
|
||||
|
||||
[dependencies]
|
||||
derive_more = "0.15.0"
|
||||
ethbloom = "0.6"
|
||||
ethbloom = "0.8.0"
|
||||
ethcore-io = { path = "../../util/io" }
|
||||
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"
|
||||
parity-bytes = "0.1"
|
||||
parity-util-mem = "0.2.0"
|
||||
parity-snappy = "0.1"
|
||||
|
@ -18,8 +18,8 @@ client-traits = { path = "../client-traits" }
|
||||
common-types = { path = "../types" }
|
||||
engine = { path = "../engine" }
|
||||
ethcore-io = { path = "../../util/io" }
|
||||
ethereum-types = "0.6.0"
|
||||
keccak-hash = "0.2.0"
|
||||
ethereum-types = "0.8.0"
|
||||
keccak-hash = "0.4.0"
|
||||
len-caching-lock = { path = "../../util/len-caching-lock" }
|
||||
log = "0.4"
|
||||
num_cpus = "1.2"
|
||||
|
@ -6,8 +6,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
|
||||
|
||||
[dependencies]
|
||||
parity-bytes = "0.1"
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
|
||||
ethjson = { path = "../../json" }
|
||||
rlp = "0.4.0"
|
||||
keccak-hash = "0.2.0"
|
||||
keccak-hash = "0.4.0"
|
||||
|
@ -6,7 +6,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
|
||||
|
||||
[dependencies]
|
||||
byteorder = "1.0"
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
log = "0.4"
|
||||
parity-wasm = "0.31"
|
||||
libc = "0.2"
|
||||
|
@ -8,7 +8,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
|
||||
serde = "1"
|
||||
serde_json = "1"
|
||||
serde_derive = "1"
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
ethjson = { path = "../../../json" }
|
||||
vm = { path = "../../vm" }
|
||||
wasm = { path = "../" }
|
||||
|
@ -15,7 +15,7 @@ common-types = { path = "../ethcore/types" }
|
||||
docopt = "1.0"
|
||||
env_logger = "0.5"
|
||||
ethcore = { path = "../ethcore", features = ["test-helpers", "json-tests"] }
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
ethjson = { path = "../json", features = ["test-helpers"] }
|
||||
evm = { path = "../ethcore/evm" }
|
||||
panic_hook = { path = "../util/panic-hook" }
|
||||
|
@ -11,7 +11,7 @@ client-traits = { path = "../ethcore/client-traits" }
|
||||
common-types = { path = "../ethcore/types" }
|
||||
ethcore = { path = "../ethcore" }
|
||||
bytes = { package = "parity-bytes", version = "0.1"}
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
jsonrpc-core = "13.2.0"
|
||||
http = { package = "jsonrpc-http-server", version = "13.2.0"}
|
||||
rlp = "0.4.0"
|
||||
|
@ -6,7 +6,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
rustc-hex = "1.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
|
@ -16,14 +16,14 @@ url = { version = "2", optional = true }
|
||||
# Miner
|
||||
ansi_term = "0.11"
|
||||
common-types = { path = "../ethcore/types" }
|
||||
ethabi = "8.0"
|
||||
ethabi-derive = "8.0"
|
||||
ethabi-contract = "8.0"
|
||||
ethabi = "9.0.1"
|
||||
ethabi-derive = "9.0.1"
|
||||
ethabi-contract = "9.0.0"
|
||||
ethcore-call-contract = { path = "../ethcore/call-contract" }
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
futures = "0.1"
|
||||
parity-util-mem = "0.2.0"
|
||||
keccak-hash = "0.2.0"
|
||||
keccak-hash = "0.4.0"
|
||||
linked-hash-map = "0.5"
|
||||
log = "0.4"
|
||||
parity-runtime = { path = "../util/runtime" }
|
||||
|
@ -6,8 +6,8 @@ license = "GPL-3.0"
|
||||
authors = ["Parity Technologies <admin@parity.io>"]
|
||||
|
||||
[dependencies]
|
||||
ethereum-types = "0.6.0"
|
||||
keccak-hash = "0.2.0"
|
||||
ethereum-types = "0.8.0"
|
||||
keccak-hash = "0.4.0"
|
||||
jsonrpc-core = "13.2.0"
|
||||
jsonrpc-tcp-server = "13.2.0"
|
||||
log = "0.4"
|
||||
|
@ -47,7 +47,7 @@ ethcore-miner = { path = "../miner" }
|
||||
ethcore-network = { path = "../util/network" }
|
||||
ethcore-private-tx = { path = "../ethcore/private-tx" }
|
||||
ethcore-sync = { path = "../ethcore/sync" }
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
fastmap = { path = "../util/fastmap" }
|
||||
machine = { path = "../ethcore/machine" }
|
||||
parity-bytes = "0.1"
|
||||
@ -58,7 +58,7 @@ ethjson = { path = "../json" }
|
||||
ethkey = { path = "../accounts/ethkey" }
|
||||
ethstore = { path = "../accounts/ethstore" }
|
||||
fetch = { path = "../util/fetch" }
|
||||
keccak-hash = "0.2.0"
|
||||
keccak-hash = "0.4.0"
|
||||
parity-runtime = { path = "../util/runtime" }
|
||||
parity-updater = { path = "../updater" }
|
||||
parity-version = { path = "../util/version" }
|
||||
|
@ -18,6 +18,7 @@
|
||||
|
||||
use std::{ops, str};
|
||||
use std::collections::HashMap;
|
||||
use rand::RngCore;
|
||||
use jsonrpc_pubsub::{typed::{Subscriber, Sink}, SubscriptionId};
|
||||
use ethereum_types::H64;
|
||||
|
||||
@ -78,7 +79,9 @@ impl<T> Default for Subscribers<T> {
|
||||
|
||||
impl<T> Subscribers<T> {
|
||||
fn next_id(&mut self) -> Id {
|
||||
let data = H64::random_using(&mut self.rand);
|
||||
let mut data = H64::default();
|
||||
// TODO [grbIzl] rework with proper H64::random_using with rand 0.7
|
||||
self.rand.fill_bytes(&mut data.as_bytes_mut());
|
||||
Id(data)
|
||||
}
|
||||
|
||||
|
@ -165,7 +165,7 @@ mod tests {
|
||||
let mut el = Runtime::new().unwrap();
|
||||
let mut poll_manager = poll_manager();
|
||||
let (id, rx) = poll_manager.subscribe(Default::default(), "hello".into(), Params::None);
|
||||
assert_eq!(id, SubscriptionId::String("0x43ca64edf03768e1".into()));
|
||||
assert_eq!(id, SubscriptionId::String("0x4333966aca52ad0b".into()));
|
||||
|
||||
// then
|
||||
poll_manager.tick().wait().unwrap();
|
||||
|
@ -62,13 +62,13 @@ fn should_subscribe_to_new_heads() {
|
||||
|
||||
// Subscribe
|
||||
let request = r#"{"jsonrpc": "2.0", "method": "eth_subscribe", "params": ["newHeads"], "id": 1}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","result":"0x43ca64edf03768e1","id":1}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","result":"0x4333966aca52ad0b","id":1}"#;
|
||||
assert_eq!(io.handle_request_sync(request, metadata.clone()), Some(response.to_owned()));
|
||||
|
||||
// Check notifications
|
||||
handler.new_blocks(NewBlocks::new(vec![], vec![], ChainRoute::new(vec![(h1, ChainRouteType::Enacted)]), vec![], vec![], DURATION_ZERO, true));
|
||||
let (res, receiver) = receiver.into_future().wait().unwrap();
|
||||
let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":{"author":"0x0000000000000000000000000000000000000000","difficulty":"0x1","extraData":"0x","gasLimit":"0xf4240","gasUsed":"0x0","hash":"0x3457d2fa2e3dd33c78ac681cf542e429becf718859053448748383af67e23218","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","miner":"0x0000000000000000000000000000000000000000","number":"0x1","parentHash":"0x0cd786a2425d16f152c658316c423e6ce1181e15c3295826d7c9904cba9ce303","receiptsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","sealFields":[],"sha3Uncles":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","size":"0x1c9","stateRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","timestamp":"0x0","transactionsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"},"subscription":"0x43ca64edf03768e1"}}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":{"author":"0x0000000000000000000000000000000000000000","difficulty":"0x1","extraData":"0x","gasLimit":"0xf4240","gasUsed":"0x0","hash":"0x3457d2fa2e3dd33c78ac681cf542e429becf718859053448748383af67e23218","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","miner":"0x0000000000000000000000000000000000000000","number":"0x1","parentHash":"0x0cd786a2425d16f152c658316c423e6ce1181e15c3295826d7c9904cba9ce303","receiptsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","sealFields":[],"sha3Uncles":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","size":"0x1c9","stateRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","timestamp":"0x0","transactionsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"},"subscription":"0x4333966aca52ad0b"}}"#;
|
||||
assert_eq!(res, Some(response.into()));
|
||||
|
||||
// Notify about two blocks
|
||||
@ -76,14 +76,14 @@ fn should_subscribe_to_new_heads() {
|
||||
|
||||
// Receive both
|
||||
let (res, receiver) = receiver.into_future().wait().unwrap();
|
||||
let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":{"author":"0x0000000000000000000000000000000000000000","difficulty":"0x2","extraData":"0x","gasLimit":"0xf4240","gasUsed":"0x0","hash":"0x44e5ecf454ea99af9d8a8f2ca0daba96964c90de05db7a78f59b84ae9e749706","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","miner":"0x0000000000000000000000000000000000000000","number":"0x2","parentHash":"0x3457d2fa2e3dd33c78ac681cf542e429becf718859053448748383af67e23218","receiptsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","sealFields":[],"sha3Uncles":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","size":"0x1c9","stateRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","timestamp":"0x0","transactionsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"},"subscription":"0x43ca64edf03768e1"}}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":{"author":"0x0000000000000000000000000000000000000000","difficulty":"0x2","extraData":"0x","gasLimit":"0xf4240","gasUsed":"0x0","hash":"0x44e5ecf454ea99af9d8a8f2ca0daba96964c90de05db7a78f59b84ae9e749706","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","miner":"0x0000000000000000000000000000000000000000","number":"0x2","parentHash":"0x3457d2fa2e3dd33c78ac681cf542e429becf718859053448748383af67e23218","receiptsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","sealFields":[],"sha3Uncles":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","size":"0x1c9","stateRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","timestamp":"0x0","transactionsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"},"subscription":"0x4333966aca52ad0b"}}"#;
|
||||
assert_eq!(res, Some(response.into()));
|
||||
let (res, receiver) = receiver.into_future().wait().unwrap();
|
||||
let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":{"author":"0x0000000000000000000000000000000000000000","difficulty":"0x3","extraData":"0x","gasLimit":"0xf4240","gasUsed":"0x0","hash":"0xdf04a98bb0c6fa8441bd429822f65a46d0cb553f6bcef602b973e65c81497f8e","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","miner":"0x0000000000000000000000000000000000000000","number":"0x3","parentHash":"0x44e5ecf454ea99af9d8a8f2ca0daba96964c90de05db7a78f59b84ae9e749706","receiptsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","sealFields":[],"sha3Uncles":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","size":"0x1c9","stateRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","timestamp":"0x0","transactionsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"},"subscription":"0x43ca64edf03768e1"}}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":{"author":"0x0000000000000000000000000000000000000000","difficulty":"0x3","extraData":"0x","gasLimit":"0xf4240","gasUsed":"0x0","hash":"0xdf04a98bb0c6fa8441bd429822f65a46d0cb553f6bcef602b973e65c81497f8e","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","miner":"0x0000000000000000000000000000000000000000","number":"0x3","parentHash":"0x44e5ecf454ea99af9d8a8f2ca0daba96964c90de05db7a78f59b84ae9e749706","receiptsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","sealFields":[],"sha3Uncles":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","size":"0x1c9","stateRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","timestamp":"0x0","transactionsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"},"subscription":"0x4333966aca52ad0b"}}"#;
|
||||
assert_eq!(res, Some(response.into()));
|
||||
|
||||
// And unsubscribe
|
||||
let request = r#"{"jsonrpc": "2.0", "method": "eth_unsubscribe", "params": ["0x43ca64edf03768e1"], "id": 1}"#;
|
||||
let request = r#"{"jsonrpc": "2.0", "method": "eth_unsubscribe", "params": ["0x4333966aca52ad0b"], "id": 1}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
|
||||
assert_eq!(io.handle_request_sync(request, metadata), Some(response.to_owned()));
|
||||
|
||||
@ -132,7 +132,7 @@ fn should_subscribe_to_logs() {
|
||||
|
||||
// Subscribe
|
||||
let request = r#"{"jsonrpc": "2.0", "method": "eth_subscribe", "params": ["logs", {}], "id": 1}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","result":"0x43ca64edf03768e1","id":1}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","result":"0x4333966aca52ad0b","id":1}"#;
|
||||
assert_eq!(io.handle_request_sync(request, metadata.clone()), Some(response.to_owned()));
|
||||
|
||||
// Check notifications (enacted)
|
||||
@ -140,7 +140,7 @@ fn should_subscribe_to_logs() {
|
||||
let (res, receiver) = receiver.into_future().wait().unwrap();
|
||||
let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":{"address":"0x0000000000000000000000000000000000000005","blockHash":"0x3457d2fa2e3dd33c78ac681cf542e429becf718859053448748383af67e23218","blockNumber":"0x1","data":"0x","logIndex":"0x0","removed":false,"topics":["0x0000000000000000000000000000000000000000000000000000000000000001","0x0000000000000000000000000000000000000000000000000000000000000002","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000"],"transactionHash":""#.to_owned()
|
||||
+ &format!("0x{:x}", tx_hash)
|
||||
+ r#"","transactionIndex":"0x0","transactionLogIndex":"0x0","type":"mined"},"subscription":"0x43ca64edf03768e1"}}"#;
|
||||
+ r#"","transactionIndex":"0x0","transactionLogIndex":"0x0","type":"mined"},"subscription":"0x4333966aca52ad0b"}}"#;
|
||||
assert_eq!(res, Some(response.into()));
|
||||
|
||||
// Check notifications (retracted)
|
||||
@ -148,11 +148,11 @@ fn should_subscribe_to_logs() {
|
||||
let (res, receiver) = receiver.into_future().wait().unwrap();
|
||||
let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":{"address":"0x0000000000000000000000000000000000000005","blockHash":"0x3457d2fa2e3dd33c78ac681cf542e429becf718859053448748383af67e23218","blockNumber":"0x1","data":"0x","logIndex":"0x0","removed":true,"topics":["0x0000000000000000000000000000000000000000000000000000000000000001","0x0000000000000000000000000000000000000000000000000000000000000002","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000"],"transactionHash":""#.to_owned()
|
||||
+ &format!("0x{:x}", tx_hash)
|
||||
+ r#"","transactionIndex":"0x0","transactionLogIndex":"0x0","type":"removed"},"subscription":"0x43ca64edf03768e1"}}"#;
|
||||
+ r#"","transactionIndex":"0x0","transactionLogIndex":"0x0","type":"removed"},"subscription":"0x4333966aca52ad0b"}}"#;
|
||||
assert_eq!(res, Some(response.into()));
|
||||
|
||||
// And unsubscribe
|
||||
let request = r#"{"jsonrpc": "2.0", "method": "eth_unsubscribe", "params": ["0x43ca64edf03768e1"], "id": 1}"#;
|
||||
let request = r#"{"jsonrpc": "2.0", "method": "eth_unsubscribe", "params": ["0x4333966aca52ad0b"], "id": 1}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
|
||||
assert_eq!(io.handle_request_sync(request, metadata), Some(response.to_owned()));
|
||||
|
||||
@ -185,22 +185,22 @@ fn should_subscribe_to_pending_transactions() {
|
||||
|
||||
// Subscribe
|
||||
let request = r#"{"jsonrpc": "2.0", "method": "eth_subscribe", "params": ["newPendingTransactions"], "id": 1}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","result":"0x43ca64edf03768e1","id":1}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","result":"0x4333966aca52ad0b","id":1}"#;
|
||||
assert_eq!(io.handle_request_sync(request, metadata.clone()), Some(response.to_owned()));
|
||||
|
||||
// Send new transactions
|
||||
pool_sender.unbounded_send(Arc::new(vec![H256::from_low_u64_be(5), H256::from_low_u64_be(7)])).unwrap();
|
||||
|
||||
let (res, receiver) = receiver.into_future().wait().unwrap();
|
||||
let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":"0x0000000000000000000000000000000000000000000000000000000000000005","subscription":"0x43ca64edf03768e1"}}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":"0x0000000000000000000000000000000000000000000000000000000000000005","subscription":"0x4333966aca52ad0b"}}"#;
|
||||
assert_eq!(res, Some(response.into()));
|
||||
|
||||
let (res, receiver) = receiver.into_future().wait().unwrap();
|
||||
let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":"0x0000000000000000000000000000000000000000000000000000000000000007","subscription":"0x43ca64edf03768e1"}}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":"0x0000000000000000000000000000000000000000000000000000000000000007","subscription":"0x4333966aca52ad0b"}}"#;
|
||||
assert_eq!(res, Some(response.into()));
|
||||
|
||||
// And unsubscribe
|
||||
let request = r#"{"jsonrpc": "2.0", "method": "eth_unsubscribe", "params": ["0x43ca64edf03768e1"], "id": 1}"#;
|
||||
let request = r#"{"jsonrpc": "2.0", "method": "eth_unsubscribe", "params": ["0x4333966aca52ad0b"], "id": 1}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
|
||||
assert_eq!(io.handle_request_sync(request, metadata), Some(response.to_owned()));
|
||||
|
||||
@ -225,7 +225,7 @@ fn eth_subscribe_syncing() {
|
||||
metadata.session = Some(Arc::new(Session::new(sender)));
|
||||
|
||||
// Subscribe
|
||||
let response = r#"{"jsonrpc":"2.0","result":"0x43ca64edf03768e1","id":1}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","result":"0x4333966aca52ad0b","id":1}"#;
|
||||
let request = r#"{"jsonrpc": "2.0", "method": "eth_subscribe", "params": ["syncing"], "id": 1}"#;
|
||||
assert_eq!(io.handle_request_sync(request, metadata.clone()), Some(response.to_owned()));
|
||||
}
|
||||
|
@ -53,22 +53,22 @@ fn should_subscribe_to_a_method() {
|
||||
|
||||
// Subscribe
|
||||
let request = r#"{"jsonrpc": "2.0", "method": "parity_subscribe", "params": ["hello", []], "id": 1}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","result":"0x43ca64edf03768e1","id":1}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","result":"0x4333966aca52ad0b","id":1}"#;
|
||||
assert_eq!(io.handle_request_sync(request, metadata.clone()), Some(response.to_owned()));
|
||||
|
||||
// Check notifications
|
||||
let (res, receiver) = receiver.into_future().wait().unwrap();
|
||||
let response =
|
||||
r#"{"jsonrpc":"2.0","method":"parity_subscription","params":{"result":"hello","subscription":"0x43ca64edf03768e1"}}"#;
|
||||
r#"{"jsonrpc":"2.0","method":"parity_subscription","params":{"result":"hello","subscription":"0x4333966aca52ad0b"}}"#;
|
||||
assert_eq!(res, Some(response.into()));
|
||||
|
||||
let (res, receiver) = receiver.into_future().wait().unwrap();
|
||||
let response =
|
||||
r#"{"jsonrpc":"2.0","method":"parity_subscription","params":{"result":"world","subscription":"0x43ca64edf03768e1"}}"#;
|
||||
r#"{"jsonrpc":"2.0","method":"parity_subscription","params":{"result":"world","subscription":"0x4333966aca52ad0b"}}"#;
|
||||
assert_eq!(res, Some(response.into()));
|
||||
|
||||
// And unsubscribe
|
||||
let request = r#"{"jsonrpc": "2.0", "method": "parity_unsubscribe", "params": ["0x43ca64edf03768e1"], "id": 1}"#;
|
||||
let request = r#"{"jsonrpc": "2.0", "method": "parity_unsubscribe", "params": ["0x4333966aca52ad0b"], "id": 1}"#;
|
||||
let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
|
||||
assert_eq!(io.handle_request_sync(request, metadata), Some(response.to_owned()));
|
||||
|
||||
|
@ -9,18 +9,18 @@ authors = ["Parity Technologies <admin@parity.io>"]
|
||||
byteorder = "1.0"
|
||||
client-traits = { path = "../ethcore/client-traits" }
|
||||
common-types = { path = "../ethcore/types" }
|
||||
ethabi = "8.0"
|
||||
ethabi-contract = "8.0"
|
||||
ethabi-derive = "8.0"
|
||||
ethabi = "9.0.1"
|
||||
ethabi-contract = "9.0.0"
|
||||
ethabi-derive = "9.0.1"
|
||||
ethcore = { path = "../ethcore" }
|
||||
ethcore-accounts = { path = "../accounts", optional = true}
|
||||
ethcore-call-contract = { path = "../ethcore/call-contract" }
|
||||
ethcore-sync = { path = "../ethcore/sync" }
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
ethkey = { path = "../accounts/ethkey" }
|
||||
futures = "0.1"
|
||||
hyper = { version = "0.12", default-features = false }
|
||||
keccak-hash = "0.2.0"
|
||||
keccak-hash = "0.4.0"
|
||||
kvdb = "0.1"
|
||||
lazy_static = "1.0"
|
||||
log = "0.4"
|
||||
|
@ -8,13 +8,13 @@ authors = ["Parity Technologies <admin@parity.io>"]
|
||||
[dependencies]
|
||||
client-traits = { path = "../ethcore/client-traits" }
|
||||
common-types = { path = "../ethcore/types" }
|
||||
ethabi = "8.0"
|
||||
ethabi-contract = "8.0"
|
||||
ethabi-derive = "8.0"
|
||||
ethabi = "9.0.1"
|
||||
ethabi-contract = "9.0.0"
|
||||
ethabi-derive = "9.0.1"
|
||||
ethcore = { path = "../ethcore" }
|
||||
ethcore-sync = { path = "../ethcore/sync" }
|
||||
ethereum-types = "0.6.0"
|
||||
keccak-hash = "0.2.0"
|
||||
ethereum-types = "0.8.0"
|
||||
keccak-hash = "0.4.0"
|
||||
lazy_static = "1.0"
|
||||
log = "0.4"
|
||||
parity-bytes = "0.1"
|
||||
|
@ -16,15 +16,15 @@ rand = "0.6"
|
||||
rustc-hex = "1.0"
|
||||
fetch = { path = "../../util/fetch" }
|
||||
parity-bytes = "0.1"
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
parity-runtime = { path = "../../util/runtime" }
|
||||
keccak-hash = "0.2.0"
|
||||
keccak-hash = "0.4.0"
|
||||
registrar = { path = "../../util/registrar" }
|
||||
types = { path = "../../ethcore/types", package = "common-types" }
|
||||
|
||||
ethabi = "8.0"
|
||||
ethabi-derive = "8.0"
|
||||
ethabi-contract = "8.0"
|
||||
ethabi = "9.0.1"
|
||||
ethabi-derive = "9.0.1"
|
||||
ethabi-contract = "9.0.0"
|
||||
|
||||
[dev-dependencies]
|
||||
parking_lot = "0.9"
|
||||
|
@ -14,9 +14,9 @@ edition = "2018"
|
||||
serde_derive = "1.0"
|
||||
serde = "1.0"
|
||||
serde_json = "1.0"
|
||||
ethabi = "8.0"
|
||||
keccak-hash = "0.2.0"
|
||||
ethereum-types = "0.6.0"
|
||||
ethabi = "9.0.1"
|
||||
keccak-hash = "0.4.0"
|
||||
ethereum-types = "0.8.0"
|
||||
failure = "0.1"
|
||||
itertools = "0.7"
|
||||
lazy_static = "1.1"
|
||||
|
@ -6,7 +6,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
ethbloom = "0.6.4"
|
||||
ethbloom = "0.8.0"
|
||||
parking_lot = "0.9"
|
||||
|
||||
[dev-dependencies]
|
||||
|
@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
|
||||
license = "GPL3"
|
||||
|
||||
[dependencies]
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
journaldb = { path = "../journaldb" }
|
||||
app_dirs = { git = "https://github.com/paritytech/app-dirs-rs" }
|
||||
home = "0.3"
|
||||
|
@ -6,5 +6,5 @@ description = "Specialized version of `HashMap` with H256 keys and fast hashing
|
||||
license = "GPL-3.0"
|
||||
|
||||
[dependencies]
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
plain_hasher = "0.2"
|
||||
|
@ -8,7 +8,7 @@ edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
parity-bytes = "0.1"
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
hash-db = "0.15.0"
|
||||
malloc_size_of = { version = "0.2", package = "parity-util-mem" }
|
||||
keccak-hasher = { path = "../keccak-hasher" }
|
||||
@ -21,5 +21,5 @@ rlp = "0.4.0"
|
||||
|
||||
[dev-dependencies]
|
||||
env_logger = "0.5"
|
||||
keccak-hash = "0.2.0"
|
||||
keccak-hash = "0.4.0"
|
||||
kvdb-memorydb = "0.1.2"
|
||||
|
@ -6,7 +6,7 @@ description = "Keccak-256 implementation of the Hasher trait"
|
||||
license = "GPL-3.0"
|
||||
|
||||
[dependencies]
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
tiny-keccak = "1.4.2"
|
||||
hash-db = "0.15.0"
|
||||
plain_hasher = "0.2"
|
||||
|
@ -23,12 +23,12 @@ ethcore-io = { path = "../io", features = ["mio"] }
|
||||
parity-bytes = "0.1"
|
||||
crypto = { package = "parity-crypto", version = "0.4.0"}
|
||||
network = { package = "ethcore-network", path = "../network" }
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
ethkey = { path = "../../accounts/ethkey" }
|
||||
rlp = "0.4.0"
|
||||
parity-path = "0.1"
|
||||
ipnetwork = "0.12.6"
|
||||
keccak-hash = "0.2.0"
|
||||
keccak-hash = "0.4.0"
|
||||
parity-snappy = "0.1"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
|
@ -10,7 +10,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
|
||||
derive_more = "0.14.0"
|
||||
parity-crypto = "0.4.0"
|
||||
ethcore-io = { path = "../io" }
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
ethkey = { path = "../../accounts/ethkey" }
|
||||
ipnetwork = "0.12.6"
|
||||
lazy_static = "1.0"
|
||||
|
@ -11,10 +11,10 @@ keccak-hasher = { version = "0.1.1", path = "../keccak-hasher" }
|
||||
hash-db = "0.15.0"
|
||||
rlp = "0.4.0"
|
||||
parity-bytes = "0.1"
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
elastic-array = "0.10"
|
||||
|
||||
[dev-dependencies]
|
||||
memory-db = "0.15.0"
|
||||
keccak-hash = "0.2.0"
|
||||
keccak-hash = "0.4.0"
|
||||
journaldb = { path = "../journaldb" }
|
||||
|
@ -7,8 +7,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
|
||||
|
||||
[dependencies]
|
||||
call-contract = { package = "ethcore-call-contract", path = "../../ethcore/call-contract" }
|
||||
ethabi = "8.0"
|
||||
ethabi-derive = "8.0"
|
||||
ethabi-contract = "8.0"
|
||||
keccak-hash = "0.2.0"
|
||||
ethabi = "9.0.1"
|
||||
ethabi-derive = "9.0.1"
|
||||
ethabi-contract = "9.0.0"
|
||||
keccak-hash = "0.4.0"
|
||||
types = { path = "../../ethcore/types", package = "common-types" }
|
||||
|
@ -7,5 +7,5 @@ license = "GPL-3.0"
|
||||
|
||||
[dependencies]
|
||||
triehash = "0.8.0"
|
||||
ethereum-types = "0.6.0"
|
||||
ethereum-types = "0.8.0"
|
||||
keccak-hasher = { path = "../keccak-hasher" }
|
||||
|
Loading…
Reference in New Issue
Block a user