grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[beta] Backports (#6497)

Browse Source 
* Fix slow balances (#6471)

* Update token updates

* Update token info fetching

* Update logger

* Minor fixes to updates and notifications for balances

* Use Pubsub

* Fix timeout.

* Use pubsub for status.

* Fix signer subscription.

* Process tokens in chunks.

* Fix tokens loaded by chunks

* Linting

* Dispatch tokens asap

* Fix chunks processing.

* Better filter options

* Parallel log fetching.

* Fix signer polling.

* Fix initial block query.

* Token balances updates : the right(er) way

* Better tokens info fetching

* Fixes in token data fetching

* Only fetch what's needed (tokens)

* Fix linting issues

* Revert "Transaction permissioning (#6441)"

This reverts commit eed0e8b03a.

* Revert "Revert "Transaction permissioning (#6441)""

This reverts commit 8f96415e58dde652e5828706eb2639d43416f448.

* Update wasm-tests.

* Fixing balances fetching

* Fix requests tracking in UI

* Fix request watching

* Update the Logger

* PR Grumbles Fixes

* PR Grumbles fixes

* Linting...

* eth_call returns output of contract creations (#6420)

* eth_call returns output of contract creations

* Fix parameters order.

* Save outputs for light client as well.

* Don't accept transactions above block gas limit.

* Expose health status over RPC (#6274)

* Node-health to a separate crate.

* Initialize node_health outside of dapps.

* Expose health over RPC.

* Bring back 412 and fix JS.

* Add health to workspace and tests.

* Fix compilation without default features.

* Fix borked merge.

* Revert to generics to avoid virtual calls.

* Fix node-health tests.

* Add missing trailing comma.

* Fixing/removing failing JS tests.

* do not activate genesis epoch in immediate transition validator contract (#6349)

* Fix memory tracing.

* Add test to cover that.

* ensure balances of constructor accounts are kept

* test balance of spec-constructed account is kept
This commit is contained in:
Tomasz Drwięga 2017-09-11 18:01:02 +02:00 committed by Gav Wood
parent 6ef9780b81
commit 980418898a
95 changed files with 2537 additions and 1245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
Cargo.lock generated
View File

@ -253,6 +253,15 @@ dependencies = [
"unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "coco"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"either 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"scopeguard 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "common-types" name = "common-types"
version = "0.1.0" version = "0.1.0"
@ -343,14 +352,6 @@ dependencies = [
"winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "deque"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "difference" name = "difference"
version = "1.0.0" version = "1.0.0"
@ -476,6 +477,7 @@ dependencies = [
"num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rlp 0.2.0", "rlp 0.2.0",
"rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -667,7 +669,7 @@ dependencies = [
"ethcrypto 0.1.0", "ethcrypto 0.1.0",
"ethkey 0.2.0", "ethkey 0.2.0",
"futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"futures-cpupool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"native-contracts 0.1.0", "native-contracts 0.1.0",
@ -900,7 +902,7 @@ name = "fetch"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"futures-cpupool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -933,10 +935,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "futures-cpupool" name = "futures-cpupool"
version = "0.1.2" version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -946,7 +947,7 @@ name = "gcc"
version = "0.3.51" version = "0.3.51"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"rayon 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1541,6 +1542,21 @@ dependencies = [
"ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "node-health"
version = "0.1.0"
dependencies = [
"futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"ntp 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-reactor 0.1.0",
"parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "nodrop" name = "nodrop"
version = "0.1.9" version = "0.1.9"
@ -1727,10 +1743,11 @@ dependencies = [
"ethsync 1.7.0", "ethsync 1.7.0",
"fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"futures-cpupool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)", "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
"log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"node-health 0.1.0",
"num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"number_prefix 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "number_prefix 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-dapps 1.7.0", "parity-dapps 1.7.0",
@ -1770,14 +1787,13 @@ dependencies = [
"ethcore-util 1.7.2", "ethcore-util 1.7.2",
"fetch 0.1.0", "fetch 0.1.0",
"futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"futures-cpupool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)", "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
"jsonrpc-http-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)", "jsonrpc-http-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
"linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ntp 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "node-health 0.1.0",
"parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-hash-fetch 1.7.0", "parity-hash-fetch 1.7.0",
"parity-reactor 0.1.0", "parity-reactor 0.1.0",
@ -1882,7 +1898,7 @@ dependencies = [
"evm 0.1.0", "evm 0.1.0",
"fetch 0.1.0", "fetch 0.1.0",
"futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"futures-cpupool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)", "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
"jsonrpc-http-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)", "jsonrpc-http-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
"jsonrpc-ipc-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)", "jsonrpc-ipc-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@ -1892,6 +1908,7 @@ dependencies = [
"jsonrpc-ws-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)", "jsonrpc-ws-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
"log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"multihash 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "multihash 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"node-health 0.1.0",
"order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-reactor 0.1.0", "parity-reactor 0.1.0",
"parity-updater 1.7.0", "parity-updater 1.7.0",
@ -2188,18 +2205,27 @@ dependencies = [
[[package]] [[package]]
name = "rayon" name = "rayon"
version = "0.7.0" version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"rayon-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon-core 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "rayon"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"rayon-core 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "rayon-core" name = "rayon-core"
version = "1.0.0" version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "coco 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2251,7 +2277,7 @@ dependencies = [
"gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"untrusted 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "untrusted 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -2393,6 +2419,11 @@ name = "scoped-tls"
version = "0.1.0" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "scopeguard"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "secur32-sys" name = "secur32-sys"
version = "0.2.0" version = "0.2.0"
@ -3094,6 +3125,7 @@ dependencies = [
"checksum clap 2.24.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6b8f69e518f967224e628896b54e41ff6acfb4dcfefc5076325c36525dac900f" "checksum clap 2.24.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6b8f69e518f967224e628896b54e41ff6acfb4dcfefc5076325c36525dac900f"
"checksum clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "5b4fabf979ddf6419a313c1c0ada4a5b95cfd2049c56e8418d622d27b4b6ff32" "checksum clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "5b4fabf979ddf6419a313c1c0ada4a5b95cfd2049c56e8418d622d27b4b6ff32"
"checksum clippy_lints 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "ce96ec05bfe018a0d5d43da115e54850ea2217981ff0f2e462780ab9d594651a" "checksum clippy_lints 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "ce96ec05bfe018a0d5d43da115e54850ea2217981ff0f2e462780ab9d594651a"
"checksum coco 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c06169f5beb7e31c7c67ebf5540b8b472d23e3eade3b2ec7d1f5b504a85f91bd"
"checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299" "checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299"
"checksum cookie 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d53b80dde876f47f03cda35303e368a79b91c70b0d65ecba5fd5280944a08591" "checksum cookie 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d53b80dde876f47f03cda35303e368a79b91c70b0d65ecba5fd5280944a08591"
"checksum core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "20a6d0448d3a99d977ae4a2aa5a98d886a923e863e81ad9ff814645b6feb3bbd" "checksum core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "20a6d0448d3a99d977ae4a2aa5a98d886a923e863e81ad9ff814645b6feb3bbd"
@ -3104,7 +3136,6 @@ dependencies = [
"checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" "checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
"checksum daemonize 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "271ec51b7e0bee92f0d04601422c73eb76ececf197026711c97ad25038a010cf" "checksum daemonize 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "271ec51b7e0bee92f0d04601422c73eb76ececf197026711c97ad25038a010cf"
"checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850" "checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850"
"checksum deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1614659040e711785ed8ea24219140654da1729f3ec8a47a9719d041112fe7bf"
"checksum difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8" "checksum difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8"
"checksum docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3b5b93718f8b3e5544fcc914c43de828ca6c6ace23e0332c6080a2977b49787a" "checksum docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3b5b93718f8b3e5544fcc914c43de828ca6c6ace23e0332c6080a2977b49787a"
"checksum dtoa 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5edd69c67b2f8e0911629b7e6b8a34cb3956613cd7c6e6414966dee349c2db4f" "checksum dtoa 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5edd69c67b2f8e0911629b7e6b8a34cb3956613cd7c6e6414966dee349c2db4f"
@ -3119,7 +3150,7 @@ dependencies = [
"checksum fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc484842f1e2884faf56f529f960cc12ad8c71ce96cc7abba0a067c98fee344" "checksum fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc484842f1e2884faf56f529f960cc12ad8c71ce96cc7abba0a067c98fee344"
"checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d" "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
"checksum futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8e51e7f9c150ba7fd4cee9df8bf6ea3dea5b63b68955ddad19ccd35b71dcfb4d" "checksum futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8e51e7f9c150ba7fd4cee9df8bf6ea3dea5b63b68955ddad19ccd35b71dcfb4d"
"checksum futures-cpupool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bb982bb25cd8fa5da6a8eb3a460354c984ff1113da82bcb4f0b0862b5795db82" "checksum futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a283c84501e92cade5ea673a2a7ca44f71f209ccdd302a3e0896f50083d2c5ff"
"checksum gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)" = "120d07f202dcc3f72859422563522b66fe6463a4c513df062874daad05f85f0a" "checksum gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)" = "120d07f202dcc3f72859422563522b66fe6463a4c513df062874daad05f85f0a"
"checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518" "checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518"
"checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685" "checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685"
@ -3225,8 +3256,9 @@ dependencies = [
"checksum quine-mc_cluskey 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6683b0e23d80813b1a535841f0048c1537d3f86d63c999e8373b39a9b0eb74a" "checksum quine-mc_cluskey 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6683b0e23d80813b1a535841f0048c1537d3f86d63c999e8373b39a9b0eb74a"
"checksum quote 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "6732e32663c9c271bfc7c1823486b471f18c47a2dbf87c066897b7b51afc83be" "checksum quote 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "6732e32663c9c271bfc7c1823486b471f18c47a2dbf87c066897b7b51afc83be"
"checksum rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "2791d88c6defac799c3f20d74f094ca33b9332612d9aef9078519c82e4fe04a5" "checksum rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "2791d88c6defac799c3f20d74f094ca33b9332612d9aef9078519c82e4fe04a5"
"checksum rayon 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8c83adcb08e5b922e804fe1918142b422602ef11f2fd670b0b52218cb5984a20" "checksum rayon 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a77c51c07654ddd93f6cb543c7a849863b03abc7e82591afda6dc8ad4ac3ac4a"
"checksum rayon-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "767d91bacddf07d442fe39257bf04fd95897d1c47c545d009f6beb03efd038f8" "checksum rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b614fe08b6665cb9a231d07ac1364b0ef3cb3698f1239ee0c4c3a88a524f54c8"
"checksum rayon-core 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7febc28567082c345f10cddc3612c6ea020fc3297a1977d472cf9fdb73e6e493"
"checksum regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4278c17d0f6d62dfef0ab00028feb45bd7d2102843f80763474eeb1be8a10c01" "checksum regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4278c17d0f6d62dfef0ab00028feb45bd7d2102843f80763474eeb1be8a10c01"
"checksum regex-syntax 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "841591b1e05609a643e3b4d0045fce04f701daba7151ddcd3ad47b080693d5a9" "checksum regex-syntax 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "841591b1e05609a643e3b4d0045fce04f701daba7151ddcd3ad47b080693d5a9"
"checksum regex-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9191b1f57603095f105d317e375d19b1c9c5c3185ea9633a99a6dcbed04457" "checksum regex-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9191b1f57603095f105d317e375d19b1c9c5c3185ea9633a99a6dcbed04457"
@ -3245,6 +3277,7 @@ dependencies = [
"checksum rustc_version 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e114e275f7c9b5d50bb52b28f9aac1921209f02aa6077c8b255e21eefaf8ffa" "checksum rustc_version 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e114e275f7c9b5d50bb52b28f9aac1921209f02aa6077c8b255e21eefaf8ffa"
"checksum schannel 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4e45ac5e9e4698c1c138d2972bedcd90b81fe1efeba805449d2bdd54512de5f9" "checksum schannel 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4e45ac5e9e4698c1c138d2972bedcd90b81fe1efeba805449d2bdd54512de5f9"
"checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d" "checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d"
"checksum scopeguard 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c79eb2c3ac4bc2507cda80e7f3ac5b88bd8eae4c0914d5663e6a8933994be918"
"checksum secur32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3f412dfa83308d893101dd59c10d6fda8283465976c28c287c5c855bf8d216bc" "checksum secur32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3f412dfa83308d893101dd59c10d6fda8283465976c28c287c5c855bf8d216bc"
"checksum security-framework 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "42ddf098d78d0b64564b23ee6345d07573e7d10e52ad86875d89ddf5f8378a02" "checksum security-framework 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "42ddf098d78d0b64564b23ee6345d07573e7d10e52ad86875d89ddf5f8378a02"
"checksum security-framework-sys 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "5bacdada57ea62022500c457c8571c17dfb5e6240b7c8eac5916ffa8c7138a55" "checksum security-framework-sys 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "5bacdada57ea62022500c457c8571c17dfb5e6240b7c8eac5916ffa8c7138a55"

3
Cargo.toml
View File

@ -42,6 +42,7 @@ ethcore-light = { path = "ethcore/light" }
ethcore-logger = { path = "logger" } ethcore-logger = { path = "logger" }
ethcore-stratum = { path = "stratum" } ethcore-stratum = { path = "stratum" }
ethkey = { path = "ethkey" } ethkey = { path = "ethkey" }
node-health = { path = "dapps/node-health" }
rlp = { path = "util/rlp" } rlp = { path = "util/rlp" }
rpc-cli = { path = "rpc_cli" } rpc-cli = { path = "rpc_cli" }
parity-hash-fetch = { path = "hash-fetch" } parity-hash-fetch = { path = "hash-fetch" }
@ -106,4 +107,4 @@ lto = false
panic = "abort" panic = "abort"
[workspace] [workspace]
members = ["ethstore/cli", "ethkey/cli", "evmbin"] members = ["ethstore/cli", "ethkey/cli", "evmbin", "dapps/node-health"]

9
dapps/Cargo.toml
View File

@ -9,15 +9,12 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies] [dependencies]
base32 = "0.3" base32 = "0.3"
env_logger = "0.4"
futures = "0.1" futures = "0.1"
futures-cpupool = "0.1"
linked-hash-map = "0.3" linked-hash-map = "0.3"
log = "0.3" log = "0.3"
parity-dapps-glue = "1.7" parity-dapps-glue = "1.7"
mime = "0.2" mime = "0.2"
mime_guess = "1.6.1" mime_guess = "1.6.1"
ntp = "0.2.0"
rand = "0.3" rand = "0.3"
rustc-hex = "1.0" rustc-hex = "1.0"
serde = "1.0" serde = "1.0"
@ -31,15 +28,19 @@ zip = { version = "0.1", default-features = false }
jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" } jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" } jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
ethcore-devtools = { path = "../devtools" }
ethcore-util = { path = "../util" } ethcore-util = { path = "../util" }
fetch = { path = "../util/fetch" } fetch = { path = "../util/fetch" }
node-health = { path = "./node-health" }
parity-hash-fetch = { path = "../hash-fetch" } parity-hash-fetch = { path = "../hash-fetch" }
parity-reactor = { path = "../util/reactor" } parity-reactor = { path = "../util/reactor" }
parity-ui = { path = "./ui" } parity-ui = { path = "./ui" }
clippy = { version = "0.0.103", optional = true} clippy = { version = "0.0.103", optional = true}
[dev-dependencies]
env_logger = "0.4"
ethcore-devtools = { path = "../devtools" }
[features] [features]
dev = ["clippy", "ethcore-util/dev"] dev = ["clippy", "ethcore-util/dev"]

18
dapps/node-health/Cargo.toml Normal file
View File

@ -0,0 +1,18 @@
[package]
name = "node-health"
description = "Node's health status"
version = "0.1.0"
license = "GPL-3.0"
authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
futures = "0.1"
futures-cpupool = "0.1"
log = "0.3"
ntp = "0.2.0"
parking_lot = "0.4"
serde = "1.0"
serde_derive = "1.0"
time = "0.1.35"
parity-reactor = { path = "../../util/reactor" }

122
dapps/node-health/src/health.rs Normal file
View File

@ -0,0 +1,122 @@
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
// This file is part of Parity.
// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
//! Reporting node's health.
use std::sync::Arc;
use std::time;
use futures::{Future, BoxFuture};
use futures::sync::oneshot;
use types::{HealthInfo, HealthStatus, Health};
use time::{TimeChecker, MAX_DRIFT};
use parity_reactor::Remote;
use parking_lot::Mutex;
use {SyncStatus};
const TIMEOUT_SECS: u64 = 5;
const PROOF: &str = "Only one closure is invoked.";
/// A struct enabling you to query for node's health.
#[derive(Debug, Clone)]
pub struct NodeHealth {
sync_status: Arc<SyncStatus>,
time: TimeChecker,
remote: Remote,
}
impl NodeHealth {
/// Creates new `NodeHealth`.
pub fn new(sync_status: Arc<SyncStatus>, time: TimeChecker, remote: Remote) -> Self {
NodeHealth { sync_status, time, remote, }
}
/// Query latest health report.
pub fn health(&self) -> BoxFuture<Health, ()> {
trace!(target: "dapps", "Checking node health.");
// Check timediff
let sync_status = self.sync_status.clone();
let time = self.time.time_drift();
let (tx, rx) = oneshot::channel();
let tx = Arc::new(Mutex::new(Some(tx)));
let tx2 = tx.clone();
self.remote.spawn_with_timeout(
move || time.then(move |result| {
let _ = tx.lock().take().expect(PROOF).send(Ok(result));
Ok(())
}),
time::Duration::from_secs(TIMEOUT_SECS),
move || {
let _ = tx2.lock().take().expect(PROOF).send(Err(()));
},
);
rx.map_err(|err| {
warn!(target: "dapps", "Health request cancelled: {:?}", err);
}).and_then(move |time| {
// Check peers
let peers = {
let (connected, max) = sync_status.peers();
let (status, message) = match connected {
0 => {
(HealthStatus::Bad, "You are not connected to any peers. There is most likely some network issue. Fix connectivity.".into())
},
1 => (HealthStatus::NeedsAttention, "You are connected to only one peer. Your node might not be reliable. Check your network connection.".into()),
_ => (HealthStatus::Ok, "".into()),
};
HealthInfo { status, message, details: (connected, max) }
};
// Check sync
let sync = {
let is_syncing = sync_status.is_major_importing();
let (status, message) = if is_syncing {
(HealthStatus::NeedsAttention, "Your node is still syncing, the values you see might be outdated. Wait until it's fully synced.".into())
} else {
(HealthStatus::Ok, "".into())
};
HealthInfo { status, message, details: is_syncing }
};
// Check time
let time = {
let (status, message, details) = match time {
Ok(Ok(diff)) if diff < MAX_DRIFT && diff > -MAX_DRIFT => {
(HealthStatus::Ok, "".into(), diff)
},
Ok(Ok(diff)) => {
(HealthStatus::Bad, format!(
"Your clock is not in sync. Detected difference is too big for the protocol to work: {}ms. Synchronize your clock.",
diff,
), diff)
},
Ok(Err(err)) => {
(HealthStatus::NeedsAttention, format!(
"Unable to reach time API: {}. Make sure that your clock is synchronized.",
err,
), 0)
},
Err(_) => {
(HealthStatus::NeedsAttention, "Time API request timed out. Make sure that the clock is synchronized.".into(), 0)
},
};
HealthInfo { status, message, details, }
};
Ok(Health { peers, sync, time})
}).boxed()
}
}

49
dapps/node-health/src/lib.rs Normal file
View File

@ -0,0 +1,49 @@
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
// This file is part of Parity.
// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
//! Node Health status reporting.
#![warn(missing_docs)]
extern crate futures;
extern crate futures_cpupool;
extern crate ntp;
extern crate time as time_crate;
extern crate parity_reactor;
extern crate parking_lot;
#[macro_use]
extern crate log;
#[macro_use]
extern crate serde_derive;
mod health;
mod time;
mod types;
pub use futures_cpupool::CpuPool;
pub use health::NodeHealth;
pub use types::{Health, HealthInfo, HealthStatus};
pub use time::{TimeChecker, Error};
/// Indicates sync status
pub trait SyncStatus: ::std::fmt::Debug + Send + Sync {
/// Returns true if there is a major sync happening.
fn is_major_importing(&self) -> bool;
/// Returns number of connected and ideal peers.
fn peers(&self) -> (usize, usize);
}

9
dapps/src/api/time.rs → dapps/node-health/src/time.rs
View File

@ -33,6 +33,7 @@
use std::io; use std::io;
use std::{fmt, mem, time}; use std::{fmt, mem, time};
use std::sync::Arc;
use std::sync::atomic::{self, AtomicUsize}; use std::sync::atomic::{self, AtomicUsize};
use std::collections::VecDeque; use std::collections::VecDeque;
@ -40,8 +41,8 @@ use futures::{self, Future, BoxFuture};
use futures::future::{self, IntoFuture}; use futures::future::{self, IntoFuture};
use futures_cpupool::{CpuPool, CpuFuture}; use futures_cpupool::{CpuPool, CpuFuture};
use ntp; use ntp;
use time::{Duration, Timespec}; use parking_lot::RwLock;
use util::{Arc, RwLock}; use time_crate::{Duration, Timespec};
/// Time checker error. /// Time checker error.
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
@ -163,7 +164,7 @@ impl Ntp for SimpleNtp {
match ntp::request(&server.address) { match ntp::request(&server.address) {
Ok(packet) => { Ok(packet) => {
let dest_time = ::time::now_utc().to_timespec(); let dest_time = ::time_crate::now_utc().to_timespec();
let orig_time = Timespec::from(packet.orig_time); let orig_time = Timespec::from(packet.orig_time);
let recv_time = Timespec::from(packet.recv_time); let recv_time = Timespec::from(packet.recv_time);
let transmit_time = Timespec::from(packet.transmit_time); let transmit_time = Timespec::from(packet.transmit_time);
@ -292,7 +293,7 @@ mod tests {
use time::Duration; use time::Duration;
use futures::{future, Future}; use futures::{future, Future};
use super::{Ntp, TimeChecker, Error}; use super::{Ntp, TimeChecker, Error};
use util::RwLock; use parking_lot::RwLock;
#[derive(Clone)] #[derive(Clone)]
struct FakeNtp(RefCell<Vec<Duration>>, Cell<u64>); struct FakeNtp(RefCell<Vec<Duration>>, Cell<u64>);

57
dapps/node-health/src/types.rs Normal file
View File

@ -0,0 +1,57 @@
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
// This file is part of Parity.
// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
//! Base health types.
/// Health API endpoint status.
#[derive(Debug, PartialEq, Serialize)]
pub enum HealthStatus {
/// Everything's OK.
#[serde(rename = "ok")]
Ok,
/// Node health need attention
/// (the issue is not critical, but may need investigation)
#[serde(rename = "needsAttention")]
NeedsAttention,
/// There is something bad detected with the node.
#[serde(rename = "bad")]
Bad,
}
/// Represents a single check in node health.
/// Cointains the status of that check and apropriate message and details.
#[derive(Debug, PartialEq, Serialize)]
#[serde(deny_unknown_fields)]
pub struct HealthInfo<T> {
/// Check status.
pub status: HealthStatus,
/// Human-readable message.
pub message: String,
/// Technical details of the check.
pub details: T,
}
/// Node Health status.
#[derive(Debug, PartialEq, Serialize)]
#[serde(deny_unknown_fields)]
pub struct Health {
/// Status of peers.
pub peers: HealthInfo<(usize, usize)>,
/// Sync status.
pub sync: HealthInfo<bool>,
/// Time diff info.
pub time: HealthInfo<i64>,
}

89
dapps/src/api/api.rs
View File

@ -21,32 +21,28 @@ use hyper::method::Method;
use hyper::status::StatusCode; use hyper::status::StatusCode;
use api::{response, types}; use api::{response, types};
use api::time::{TimeChecker, MAX_DRIFT};
use apps::fetcher::Fetcher; use apps::fetcher::Fetcher;
use handlers::{self, extract_url}; use handlers::{self, extract_url};
use endpoint::{Endpoint, Handler, EndpointPath}; use endpoint::{Endpoint, Handler, EndpointPath};
use node_health::{NodeHealth, HealthStatus, Health};
use parity_reactor::Remote; use parity_reactor::Remote;
use {SyncStatus};
#[derive(Clone)] #[derive(Clone)]
pub struct RestApi { pub struct RestApi {
fetcher: Arc<Fetcher>, fetcher: Arc<Fetcher>,
sync_status: Arc<SyncStatus>, health: NodeHealth,
time: TimeChecker,
remote: Remote, remote: Remote,
} }
impl RestApi { impl RestApi {
pub fn new( pub fn new(
fetcher: Arc<Fetcher>, fetcher: Arc<Fetcher>,
sync_status: Arc<SyncStatus>, health: NodeHealth,
time: TimeChecker,
remote: Remote, remote: Remote,
) -> Box<Endpoint> { ) -> Box<Endpoint> {
Box::new(RestApi { Box::new(RestApi {
fetcher, fetcher,
sync_status, health,
time,
remote, remote,
}) })
} }
@ -90,74 +86,23 @@ impl RestApiRouter {
} }
fn health(&self, control: Control) -> Box<Handler> { fn health(&self, control: Control) -> Box<Handler> {
use self::types::{HealthInfo, HealthStatus, Health}; let map = move |health: Result<Result<Health, ()>, ()>| {
let status = match health {
trace!(target: "dapps", "Checking node health."); Ok(Ok(ref health)) => {
// Check timediff if [&health.peers.status, &health.sync.status].iter().any(|x| *x != &HealthStatus::Ok) {
let sync_status = self.api.sync_status.clone(); StatusCode::PreconditionFailed // HTTP 412
let map = move |time| { } else {
// Check peers StatusCode::Ok // HTTP 200
let peers = { }
let (connected, max) = sync_status.peers(); },
let (status, message) = match connected { _ => StatusCode::ServiceUnavailable, // HTTP 503
0 => {
(HealthStatus::Bad, "You are not connected to any peers. There is most likely some network issue. Fix connectivity.".into())
},
1 => (HealthStatus::NeedsAttention, "You are connected to only one peer. Your node might not be reliable. Check your network connection.".into()),
_ => (HealthStatus::Ok, "".into()),
};
HealthInfo { status, message, details: (connected, max) }
}; };
// Check sync response::as_json(status, &health)
let sync = {
let is_syncing = sync_status.is_major_importing();
let (status, message) = if is_syncing {
(HealthStatus::NeedsAttention, "Your node is still syncing, the values you see might be outdated. Wait until it's fully synced.".into())
} else {
(HealthStatus::Ok, "".into())
};
HealthInfo { status, message, details: is_syncing }
};
// Check time
let time = {
let (status, message, details) = match time {
Ok(Ok(diff)) if diff < MAX_DRIFT && diff > -MAX_DRIFT => {
(HealthStatus::Ok, "".into(), diff)
},
Ok(Ok(diff)) => {
(HealthStatus::Bad, format!(
"Your clock is not in sync. Detected difference is too big for the protocol to work: {}ms. Synchronize your clock.",
diff,
), diff)
},
Ok(Err(err)) => {
(HealthStatus::NeedsAttention, format!(
"Unable to reach time API: {}. Make sure that your clock is synchronized.",
err,
), 0)
},
Err(_) => {
(HealthStatus::NeedsAttention, "Time API request timed out. Make sure that the clock is synchronized.".into(), 0)
},
};
HealthInfo { status, message, details, }
};
let status = if [&peers.status, &sync.status, &time.status].iter().any(|x| *x != &HealthStatus::Ok) {
StatusCode::PreconditionFailed // HTTP 412
} else {
StatusCode::Ok // HTTP 200
};
response::as_json(status, &Health { peers, sync, time })
}; };
let health = self.api.health.health();
let time = self.api.time.time_drift();
let remote = self.api.remote.clone(); let remote = self.api.remote.clone();
Box::new(handlers::AsyncHandler::new(time, map, remote, control)) Box::new(handlers::AsyncHandler::new(health, map, remote, control))
} }
} }

2
dapps/src/api/mod.rs
View File

@ -18,8 +18,6 @@
mod api; mod api;
mod response; mod response;
mod time;
mod types; mod types;
pub use self::api::RestApi; pub use self::api::RestApi;
pub use self::time::TimeChecker;

40
dapps/src/api/types.rs
View File

@ -25,43 +25,3 @@ pub struct ApiError {
/// More technical error details. /// More technical error details.
pub detail: String, pub detail: String,
} }
/// Health API endpoint status.
#[derive(Debug, PartialEq, Serialize)]
pub enum HealthStatus {
/// Everything's OK.
#[serde(rename = "ok")]
Ok,
/// Node health need attention
/// (the issue is not critical, but may need investigation)
#[serde(rename = "needsAttention")]
NeedsAttention,
/// There is something bad detected with the node.
#[serde(rename = "bad")]
Bad
}
/// Represents a single check in node health.
/// Cointains the status of that check and apropriate message and details.
#[derive(Debug, PartialEq, Serialize)]
#[serde(deny_unknown_fields)]
pub struct HealthInfo<T> {
/// Check status.
pub status: HealthStatus,
/// Human-readable message.
pub message: String,
/// Technical details of the check.
pub details: T,
}
/// Node Health status.
#[derive(Debug, PartialEq, Serialize)]
#[serde(deny_unknown_fields)]
pub struct Health {
/// Status of peers.
pub peers: HealthInfo<(usize, usize)>,
/// Sync status.
pub sync: HealthInfo<bool>,
/// Time diff info.
pub time: HealthInfo<i64>,
}

1
dapps/src/apps/fetcher/mod.rs
View File

@ -281,6 +281,7 @@ mod tests {
} }
} }
#[derive(Debug)]
struct FakeSync(bool); struct FakeSync(bool);
impl SyncStatus for FakeSync { impl SyncStatus for FakeSync {
fn is_major_importing(&self) -> bool { self.0 } fn is_major_importing(&self) -> bool { self.0 }

38
dapps/src/lib.rs
View File

@ -21,10 +21,8 @@
extern crate base32; extern crate base32;
extern crate futures; extern crate futures;
extern crate futures_cpupool;
extern crate linked_hash_map; extern crate linked_hash_map;
extern crate mime_guess; extern crate mime_guess;
extern crate ntp;
extern crate rand; extern crate rand;
extern crate rustc_hex; extern crate rustc_hex;
extern crate serde; extern crate serde;
@ -39,6 +37,7 @@ extern crate jsonrpc_http_server;
extern crate ethcore_util as util; extern crate ethcore_util as util;
extern crate fetch; extern crate fetch;
extern crate node_health;
extern crate parity_dapps_glue as parity_dapps; extern crate parity_dapps_glue as parity_dapps;
extern crate parity_hash_fetch as hash_fetch; extern crate parity_hash_fetch as hash_fetch;
extern crate parity_reactor; extern crate parity_reactor;
@ -56,7 +55,6 @@ extern crate ethcore_devtools as devtools;
#[cfg(test)] #[cfg(test)]
extern crate env_logger; extern crate env_logger;
mod endpoint; mod endpoint;
mod apps; mod apps;
mod page; mod page;
@ -76,19 +74,12 @@ use std::collections::HashMap;
use jsonrpc_http_server::{self as http, hyper, Origin}; use jsonrpc_http_server::{self as http, hyper, Origin};
use fetch::Fetch; use fetch::Fetch;
use futures_cpupool::CpuPool; use node_health::NodeHealth;
use parity_reactor::Remote; use parity_reactor::Remote;
pub use hash_fetch::urlhint::ContractClient; pub use hash_fetch::urlhint::ContractClient;
pub use node_health::SyncStatus;
/// Indicates sync status
pub trait SyncStatus: Send + Sync {
/// Returns true if there is a major sync happening.
fn is_major_importing(&self) -> bool;
/// Returns number of connected and ideal peers.
fn peers(&self) -> (usize, usize);
}
/// Validates Web Proxy tokens /// Validates Web Proxy tokens
pub trait WebProxyTokens: Send + Sync { pub trait WebProxyTokens: Send + Sync {
@ -130,8 +121,7 @@ impl Middleware {
/// Creates new middleware for UI server. /// Creates new middleware for UI server.
pub fn ui<F: Fetch>( pub fn ui<F: Fetch>(
ntp_servers: &[String], health: NodeHealth,
pool: CpuPool,
remote: Remote, remote: Remote,
dapps_domain: &str, dapps_domain: &str,
registrar: Arc<ContractClient>, registrar: Arc<ContractClient>,
@ -146,11 +136,9 @@ impl Middleware {
).embeddable_on(None).allow_dapps(false)); ).embeddable_on(None).allow_dapps(false));
let special = { let special = {
let mut special = special_endpoints( let mut special = special_endpoints(
ntp_servers, health,
pool,
content_fetcher.clone(), content_fetcher.clone(),
remote.clone(), remote.clone(),
sync_status.clone(),
); );
special.insert(router::SpecialEndpoint::Home, Some(apps::ui())); special.insert(router::SpecialEndpoint::Home, Some(apps::ui()));
special special
@ -171,8 +159,7 @@ impl Middleware {
/// Creates new Dapps server middleware. /// Creates new Dapps server middleware.
pub fn dapps<F: Fetch>( pub fn dapps<F: Fetch>(
ntp_servers: &[String], health: NodeHealth,
pool: CpuPool,
remote: Remote, remote: Remote,
ui_address: Option<(String, u16)>, ui_address: Option<(String, u16)>,
extra_embed_on: Vec<(String, u16)>, extra_embed_on: Vec<(String, u16)>,
@ -204,11 +191,9 @@ impl Middleware {
let special = { let special = {
let mut special = special_endpoints( let mut special = special_endpoints(
ntp_servers, health,
pool,
content_fetcher.clone(), content_fetcher.clone(),
remote.clone(), remote.clone(),
sync_status,
); );
special.insert( special.insert(
router::SpecialEndpoint::Home, router::SpecialEndpoint::Home,
@ -238,20 +223,17 @@ impl http::RequestMiddleware for Middleware {
} }
} }
fn special_endpoints<T: AsRef<str>>( fn special_endpoints(
ntp_servers: &[T], health: NodeHealth,
pool: CpuPool,
content_fetcher: Arc<apps::fetcher::Fetcher>, content_fetcher: Arc<apps::fetcher::Fetcher>,
remote: Remote, remote: Remote,
sync_status: Arc<SyncStatus>,
) -> HashMap<router::SpecialEndpoint, Option<Box<endpoint::Endpoint>>> { ) -> HashMap<router::SpecialEndpoint, Option<Box<endpoint::Endpoint>>> {
let mut special = HashMap::new(); let mut special = HashMap::new();
special.insert(router::SpecialEndpoint::Rpc, None); special.insert(router::SpecialEndpoint::Rpc, None);
special.insert(router::SpecialEndpoint::Utils, Some(apps::utils())); special.insert(router::SpecialEndpoint::Utils, Some(apps::utils()));
special.insert(router::SpecialEndpoint::Api, Some(api::RestApi::new( special.insert(router::SpecialEndpoint::Api, Some(api::RestApi::new(
content_fetcher, content_fetcher,
sync_status, health,
api::TimeChecker::new(ntp_servers, pool),
remote, remote,
))); )));
special special

11
dapps/src/tests/helpers/mod.rs
View File

@ -26,7 +26,7 @@ use jsonrpc_http_server::{self as http, Host, DomainsValidation};
use devtools::http_client; use devtools::http_client;
use hash_fetch::urlhint::ContractClient; use hash_fetch::urlhint::ContractClient;
use fetch::{Fetch, Client as FetchClient}; use fetch::{Fetch, Client as FetchClient};
use futures_cpupool::CpuPool; use node_health::{NodeHealth, TimeChecker, CpuPool};
use parity_reactor::Remote; use parity_reactor::Remote;
use {Middleware, SyncStatus, WebProxyTokens}; use {Middleware, SyncStatus, WebProxyTokens};
@ -39,6 +39,7 @@ use self::fetch::FakeFetch;
const SIGNER_PORT: u16 = 18180; const SIGNER_PORT: u16 = 18180;
#[derive(Debug)]
struct FakeSync(bool); struct FakeSync(bool);
impl SyncStatus for FakeSync { impl SyncStatus for FakeSync {
fn is_major_importing(&self) -> bool { self.0 } fn is_major_importing(&self) -> bool { self.0 }
@ -254,9 +255,13 @@ impl Server {
remote: Remote, remote: Remote,
fetch: F, fetch: F,
) -> Result<Server, http::Error> { ) -> Result<Server, http::Error> {
let health = NodeHealth::new(
sync_status.clone(),
TimeChecker::new::<String>(&[], CpuPool::new(1)),
remote.clone(),
);
let middleware = Middleware::dapps( let middleware = Middleware::dapps(
&["0.pool.ntp.org:123".into(), "1.pool.ntp.org:123".into()], health,
CpuPool::new(4),
remote, remote,
signer_address, signer_address,
vec![], vec![],

1
ethcore/Cargo.toml
View File

@ -44,6 +44,7 @@ lru-cache = "0.1.0"
native-contracts = { path = "native_contracts" } native-contracts = { path = "native_contracts" }
num = "0.1" num = "0.1"
num_cpus = "1.2" num_cpus = "1.2"
rayon = "0.8"
rand = "0.3" rand = "0.3"
rlp = { path = "../util/rlp" } rlp = { path = "../util/rlp" }
rust-crypto = "0.2.34" rust-crypto = "0.2.34"

2
ethcore/evm/src/interpreter/memory.rs
View File

@ -44,7 +44,7 @@ pub trait Memory {
} }
/// Checks whether offset and size is valid memory range /// Checks whether offset and size is valid memory range
fn is_valid_range(off: usize, size: usize) -> bool { pub fn is_valid_range(off: usize, size: usize) -> bool {
// When size is zero we haven't actually expanded the memory // When size is zero we haven't actually expanded the memory
let overflow = off.overflowing_add(size).1; let overflow = off.overflowing_add(size).1;
size > 0 && !overflow size > 0 && !overflow

60
ethcore/evm/src/interpreter/mod.rs
View File

@ -162,7 +162,12 @@ impl<Cost: CostType> evm::Evm for Interpreter<Cost> {
} }
if do_trace { if do_trace {
ext.trace_executed(gasometer.current_gas.as_u256(), stack.peek_top(info.ret), mem_written.map(|(o, s)| (o, &(self.mem[o..(o + s)]))), store_written); ext.trace_executed(
gasometer.current_gas.as_u256(),
stack.peek_top(info.ret),
mem_written.map(|(o, s)| (o, &(self.mem[o..o+s]))),
store_written,
);
} }
// Advance // Advance
@ -246,14 +251,20 @@ impl<Cost: CostType> Interpreter<Cost> {
instruction: Instruction, instruction: Instruction,
stack: &Stack<U256> stack: &Stack<U256>
) -> Option<(usize, usize)> { ) -> Option<(usize, usize)> {
match instruction { let read = |pos| stack.peek(pos).low_u64() as usize;
instructions::MSTORE | instructions::MLOAD => Some((stack.peek(0).low_u64() as usize, 32)), let written = match instruction {
instructions::MSTORE8 => Some((stack.peek(0).low_u64() as usize, 1)), instructions::MSTORE | instructions::MLOAD => Some((read(0), 32)),
instructions::CALLDATACOPY | instructions::CODECOPY | instructions::RETURNDATACOPY => Some((stack.peek(0).low_u64() as usize, stack.peek(2).low_u64() as usize)), instructions::MSTORE8 => Some((read(0), 1)),
instructions::EXTCODECOPY => Some((stack.peek(1).low_u64() as usize, stack.peek(3).low_u64() as usize)), instructions::CALLDATACOPY | instructions::CODECOPY | instructions::RETURNDATACOPY => Some((read(0), read(2))),
instructions::CALL | instructions::CALLCODE => Some((stack.peek(5).low_u64() as usize, stack.peek(6).low_u64() as usize)), instructions::EXTCODECOPY => Some((read(1), read(3))),
instructions::DELEGATECALL => Some((stack.peek(4).low_u64() as usize, stack.peek(5).low_u64() as usize)), instructions::CALL | instructions::CALLCODE => Some((read(5), read(6))),
instructions::DELEGATECALL | instructions::STATICCALL => Some((read(4), read(5))),
_ => None, _ => None,
};
match written {
Some((offset, size)) if !memory::is_valid_range(offset, size) => None,
written => written,
} }
} }
@ -856,3 +867,36 @@ fn address_to_u256(value: Address) -> U256 {
U256::from(&*H256::from(value)) U256::from(&*H256::from(value))
} }
#[cfg(test)]
mod tests {
use std::sync::Arc;
use rustc_hex::FromHex;
use vmtype::VMType;
use factory::Factory;
use vm::{self, ActionParams, ActionValue};
use vm::tests::{FakeExt, test_finalize};
#[test]
fn should_not_fail_on_tracing_mem() {
let code = "7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000620f120660406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600055".from_hex().unwrap();
let mut params = ActionParams::default();
params.address = 5.into();
params.gas = 300_000.into();
params.gas_price = 1.into();
params.value = ActionValue::Transfer(100_000.into());
params.code = Some(Arc::new(code));
let mut ext = FakeExt::new();
ext.balances.insert(5.into(), 1_000_000_000.into());
ext.tracing = true;
let gas_left = {
let mut vm = Factory::new(VMType::Interpreter, 1).create(params.gas);
test_finalize(vm.exec(params, &mut ext)).unwrap()
};
assert_eq!(ext.calls.len(), 1);
assert_eq!(gas_left, 248_212.into());
}
}

81
ethcore/src/blockchain/blockchain.rs
View File

@ -36,6 +36,7 @@ use db::{self, Writable, Readable, CacheUpdatePolicy};
use cache_manager::CacheManager; use cache_manager::CacheManager;
use encoded; use encoded;
use engines::epoch::{Transition as EpochTransition, PendingTransition as PendingEpochTransition}; use engines::epoch::{Transition as EpochTransition, PendingTransition as PendingEpochTransition};
use rayon::prelude::*;
const LOG_BLOOMS_LEVELS: usize = 3; const LOG_BLOOMS_LEVELS: usize = 3;
const LOG_BLOOMS_ELEMENTS_PER_INDEX: usize = 16; const LOG_BLOOMS_ELEMENTS_PER_INDEX: usize = 16;
@ -143,7 +144,7 @@ pub trait BlockProvider {
/// Returns logs matching given filter. /// Returns logs matching given filter.
fn logs<F>(&self, blocks: Vec<BlockNumber>, matches: F, limit: Option<usize>) -> Vec<LocalizedLogEntry> fn logs<F>(&self, blocks: Vec<BlockNumber>, matches: F, limit: Option<usize>) -> Vec<LocalizedLogEntry>
where F: Fn(&LogEntry) -> bool, Self: Sized; where F: Fn(&LogEntry) -> bool + Send + Sync, Self: Sized;
} }
macro_rules! otry { macro_rules! otry {
@ -354,50 +355,56 @@ impl BlockProvider for BlockChain {
} }
fn logs<F>(&self, mut blocks: Vec<BlockNumber>, matches: F, limit: Option<usize>) -> Vec<LocalizedLogEntry> fn logs<F>(&self, mut blocks: Vec<BlockNumber>, matches: F, limit: Option<usize>) -> Vec<LocalizedLogEntry>
where F: Fn(&LogEntry) -> bool, Self: Sized { where F: Fn(&LogEntry) -> bool + Send + Sync, Self: Sized {
// sort in reverse order // sort in reverse order
blocks.sort_by(|a, b| b.cmp(a)); blocks.sort_by(|a, b| b.cmp(a));
let mut log_index = 0; let mut logs = blocks
let mut logs = blocks.into_iter() .chunks(128)
.filter_map(|number| self.block_hash(number).map(|hash| (number, hash))) .flat_map(move |blocks_chunk| {
.filter_map(|(number, hash)| self.block_receipts(&hash).map(|r| (number, hash, r.receipts))) blocks_chunk.into_par_iter()
.filter_map(|(number, hash, receipts)| self.block_body(&hash).map(|ref b| (number, hash, receipts, b.transaction_hashes()))) .filter_map(|number| self.block_hash(*number).map(|hash| (*number, hash)))
.flat_map(|(number, hash, mut receipts, mut hashes)| { .filter_map(|(number, hash)| self.block_receipts(&hash).map(|r| (number, hash, r.receipts)))
if receipts.len() != hashes.len() { .filter_map(|(number, hash, receipts)| self.block_body(&hash).map(|ref b| (number, hash, receipts, b.transaction_hashes())))
warn!("Block {} ({}) has different number of receipts ({}) to transactions ({}). Database corrupt?", number, hash, receipts.len(), hashes.len()); .flat_map(|(number, hash, mut receipts, mut hashes)| {
assert!(false); if receipts.len() != hashes.len() {
} warn!("Block {} ({}) has different number of receipts ({}) to transactions ({}). Database corrupt?", number, hash, receipts.len(), hashes.len());
log_index = receipts.iter().fold(0, |sum, receipt| sum + receipt.logs.len()); assert!(false);
}
let mut log_index = receipts.iter().fold(0, |sum, receipt| sum + receipt.logs.len());
let receipts_len = receipts.len(); let receipts_len = receipts.len();
hashes.reverse(); hashes.reverse();
receipts.reverse(); receipts.reverse();
receipts.into_iter() receipts.into_iter()
.map(|receipt| receipt.logs) .map(|receipt| receipt.logs)
.zip(hashes) .zip(hashes)
.enumerate()
.flat_map(move |(index, (mut logs, tx_hash))| {
let current_log_index = log_index;
let no_of_logs = logs.len();
log_index -= no_of_logs;
logs.reverse();
logs.into_iter()
.enumerate() .enumerate()
.map(move |(i, log)| LocalizedLogEntry { .flat_map(move |(index, (mut logs, tx_hash))| {
entry: log, let current_log_index = log_index;
block_hash: hash, let no_of_logs = logs.len();
block_number: number, log_index -= no_of_logs;
transaction_hash: tx_hash,
// iterating in reverse order logs.reverse();
transaction_index: receipts_len - index - 1, logs.into_iter()
transaction_log_index: no_of_logs - i - 1, .enumerate()
log_index: current_log_index - i - 1, .map(move |(i, log)| LocalizedLogEntry {
entry: log,
block_hash: hash,
block_number: number,
transaction_hash: tx_hash,
// iterating in reverse order
transaction_index: receipts_len - index - 1,
transaction_log_index: no_of_logs - i - 1,
log_index: current_log_index - i - 1,
})
}) })
.filter(|log_entry| matches(&log_entry.entry))
.take(limit.unwrap_or(::std::usize::MAX))
.collect::<Vec<_>>()
}) })
.collect::<Vec<_>>()
}) })
.filter(|log_entry| matches(&log_entry.entry))
.take(limit.unwrap_or(::std::usize::MAX)) .take(limit.unwrap_or(::std::usize::MAX))
.collect::<Vec<LocalizedLogEntry>>(); .collect::<Vec<LocalizedLogEntry>>();
logs.reverse(); logs.reverse();

51
ethcore/src/client/client.rs
View File

@ -24,7 +24,7 @@ use time::precise_time_ns;
// util // util
use util::{Bytes, PerfTimer, Itertools, Mutex, RwLock, MutexGuard, Hashable}; use util::{Bytes, PerfTimer, Itertools, Mutex, RwLock, MutexGuard, Hashable};
use util::{journaldb, DBValue, TrieFactory, Trie}; use util::{journaldb, DBValue, TrieFactory, Trie};
use util::{U256, H256, Address, H2048}; use util::{U256, H256, Address};
use util::trie::TrieSpec; use util::trie::TrieSpec;
use util::kvdb::*; use util::kvdb::*;
@ -748,7 +748,7 @@ impl Client {
self.factories.clone(), self.factories.clone(),
).expect("state known to be available for just-imported block; qed"); ).expect("state known to be available for just-imported block; qed");
let options = TransactOptions { tracing: false, vm_tracing: false, check_nonce: false }; let options = TransactOptions::with_no_tracing().dont_check_nonce().save_output_from_contract();
let res = Executive::new(&mut state, &env_info, &*self.engine) let res = Executive::new(&mut state, &env_info, &*self.engine)
.transact(&transaction, options); .transact(&transaction, options);
@ -912,7 +912,7 @@ impl Client {
_ => {}, _ => {},
} }
let block_number = match self.block_number(id.clone()) { let block_number = match self.block_number(id) {
Some(num) => num, Some(num) => num,
None => return None, None => return None,
}; };
@ -1111,6 +1111,15 @@ impl Client {
data: data, data: data,
}.fake_sign(from) }.fake_sign(from)
} }
fn block_number_ref(&self, id: &BlockId) -> Option<BlockNumber> {
match *id {
BlockId::Number(number) => Some(number),
BlockId::Hash(ref hash) => self.chain.read().block_number(hash),
BlockId::Earliest => Some(0),
BlockId::Latest | BlockId::Pending => Some(self.chain.read().best_block_number()),
}
}
} }
impl snapshot::DatabaseRestore for Client { impl snapshot::DatabaseRestore for Client {
@ -1143,7 +1152,9 @@ impl BlockChainClient for Client {
let mut state = self.state_at(block).ok_or(CallError::StatePruned)?; let mut state = self.state_at(block).ok_or(CallError::StatePruned)?;
let original_state = if analytics.state_diffing { Some(state.clone()) } else { None }; let original_state = if analytics.state_diffing { Some(state.clone()) } else { None };
let options = TransactOptions { tracing: analytics.transaction_tracing, vm_tracing: analytics.vm_tracing, check_nonce: false }; let options = TransactOptions::new(analytics.transaction_tracing, analytics.vm_tracing)
.dont_check_nonce()
.save_output_from_contract();
let mut ret = Executive::new(&mut state, &env_info, &*self.engine).transact_virtual(t, options)?; let mut ret = Executive::new(&mut state, &env_info, &*self.engine).transact_virtual(t, options)?;
// TODO gav move this into Executive. // TODO gav move this into Executive.
@ -1166,7 +1177,7 @@ impl BlockChainClient for Client {
// that's just a copy of the state. // that's just a copy of the state.
let original_state = self.state_at(block).ok_or(CallError::StatePruned)?; let original_state = self.state_at(block).ok_or(CallError::StatePruned)?;
let sender = t.sender(); let sender = t.sender();
let options = TransactOptions { tracing: true, vm_tracing: false, check_nonce: false }; let options = TransactOptions::with_tracing().dont_check_nonce();
let cond = |gas| { let cond = |gas| {
let mut tx = t.as_unsigned().clone(); let mut tx = t.as_unsigned().clone();
@ -1231,7 +1242,9 @@ impl BlockChainClient for Client {
return Err(CallError::TransactionNotFound); return Err(CallError::TransactionNotFound);
} }
let options = TransactOptions { tracing: analytics.transaction_tracing, vm_tracing: analytics.vm_tracing, check_nonce: false }; let options = TransactOptions::new(analytics.transaction_tracing, analytics.vm_tracing)
.dont_check_nonce()
.save_output_from_contract();
const PROOF: &'static str = "Transactions fetched from blockchain; blockchain transactions are valid; qed"; const PROOF: &'static str = "Transactions fetched from blockchain; blockchain transactions are valid; qed";
let rest = txs.split_off(address.index); let rest = txs.split_off(address.index);
for t in txs { for t in txs {
@ -1308,12 +1321,7 @@ impl BlockChainClient for Client {
} }
fn block_number(&self, id: BlockId) -> Option<BlockNumber> { fn block_number(&self, id: BlockId) -> Option<BlockNumber> {
match id { self.block_number_ref(&id)
BlockId::Number(number) => Some(number),
BlockId::Hash(ref hash) => self.chain.read().block_number(hash),
BlockId::Earliest => Some(0),
BlockId::Latest | BlockId::Pending => Some(self.chain.read().best_block_number()),
}
} }
fn block_body(&self, id: BlockId) -> Option<encoded::Body> { fn block_body(&self, id: BlockId) -> Option<encoded::Body> {
@ -1566,16 +1574,17 @@ impl BlockChainClient for Client {
self.engine.additional_params().into_iter().collect() self.engine.additional_params().into_iter().collect()
} }
fn blocks_with_bloom(&self, bloom: &H2048, from_block: BlockId, to_block: BlockId) -> Option<Vec<BlockNumber>> {
match (self.block_number(from_block), self.block_number(to_block)) {
(Some(from), Some(to)) => Some(self.chain.read().blocks_with_bloom(bloom, from, to)),
_ => None
}
}
fn logs(&self, filter: Filter) -> Vec<LocalizedLogEntry> { fn logs(&self, filter: Filter) -> Vec<LocalizedLogEntry> {
let (from, to) = match (self.block_number_ref(&filter.from_block), self.block_number_ref(&filter.to_block)) {
(Some(from), Some(to)) => (from, to),
_ => return Vec::new(),
};
let chain = self.chain.read();
let blocks = filter.bloom_possibilities().iter() let blocks = filter.bloom_possibilities().iter()
.filter_map(|bloom| self.blocks_with_bloom(bloom, filter.from_block.clone(), filter.to_block.clone())) .map(move |bloom| {
chain.blocks_with_bloom(bloom, from, to)
})
.flat_map(|m| m) .flat_map(|m| m)
// remove duplicate elements // remove duplicate elements
.collect::<HashSet<u64>>() .collect::<HashSet<u64>>()
@ -1894,7 +1903,7 @@ impl ProvingBlockChainClient for Client {
let backend = state::backend::Proving::new(jdb.as_hashdb_mut()); let backend = state::backend::Proving::new(jdb.as_hashdb_mut());
let mut state = state.replace_backend(backend); let mut state = state.replace_backend(backend);
let options = TransactOptions { tracing: false, vm_tracing: false, check_nonce: false }; let options = TransactOptions::with_no_tracing().dont_check_nonce().save_output_from_contract();
let res = Executive::new(&mut state, &env_info, &*self.engine).transact(&transaction, options); let res = Executive::new(&mut state, &env_info, &*self.engine).transact(&transaction, options);
match res { match res {

4
ethcore/src/client/test_client.rs
View File

@ -486,10 +486,6 @@ impl BlockChainClient for TestBlockChainClient {
self.receipts.read().get(&id).cloned() self.receipts.read().get(&id).cloned()
} }
fn blocks_with_bloom(&self, _bloom: &H2048, _from_block: BlockId, _to_block: BlockId) -> Option<Vec<BlockNumber>> {
unimplemented!();
}
fn logs(&self, filter: Filter) -> Vec<LocalizedLogEntry> { fn logs(&self, filter: Filter) -> Vec<LocalizedLogEntry> {
let mut logs = self.logs.read().clone(); let mut logs = self.logs.read().clone();
let len = logs.len(); let len = logs.len();

5
ethcore/src/client/traits.rs
View File

@ -33,7 +33,7 @@ use trace::LocalizedTrace;
use transaction::{LocalizedTransaction, PendingTransaction, SignedTransaction}; use transaction::{LocalizedTransaction, PendingTransaction, SignedTransaction};
use verification::queue::QueueInfo as BlockQueueInfo; use verification::queue::QueueInfo as BlockQueueInfo;
use util::{U256, Address, H256, H2048, Bytes, Itertools}; use util::{U256, Address, H256, Bytes, Itertools};
use util::hashdb::DBValue; use util::hashdb::DBValue;
use types::ids::*; use types::ids::*;
@ -175,9 +175,6 @@ pub trait BlockChainClient : Sync + Send {
/// Get the best block header. /// Get the best block header.
fn best_block_header(&self) -> encoded::Header; fn best_block_header(&self) -> encoded::Header;
/// Returns numbers of blocks containing given bloom.
fn blocks_with_bloom(&self, bloom: &H2048, from_block: BlockId, to_block: BlockId) -> Option<Vec<BlockNumber>>;
/// Returns logs matching given filter. /// Returns logs matching given filter.
fn logs(&self, filter: Filter) -> Vec<LocalizedLogEntry>; fn logs(&self, filter: Filter) -> Vec<LocalizedLogEntry>;

4
ethcore/src/engines/authority_round/mod.rs
View File

@ -538,7 +538,9 @@ impl Engine for AuthorityRound {
let parent_hash = block.fields().header.parent_hash().clone(); let parent_hash = block.fields().header.parent_hash().clone();
::engines::common::push_last_hash(block, last_hashes.clone(), self, &parent_hash)?; ::engines::common::push_last_hash(block, last_hashes.clone(), self, &parent_hash)?;
if !epoch_begin { return Ok(()) } // with immediate transitions, we don't use the epoch mechanism anyway.
// the genesis is always considered an epoch, but we ignore it intentionally.
if self.immediate_transitions || !epoch_begin { return Ok(()) }
// genesis is never a new block, but might as well check. // genesis is never a new block, but might as well check.
let header = block.fields().header.clone(); let header = block.fields().header.clone();

104
ethcore/src/executive.rs
View File

@ -72,6 +72,72 @@ pub struct TransactOptions {
pub vm_tracing: bool, pub vm_tracing: bool,
/// Check transaction nonce before execution. /// Check transaction nonce before execution.
pub check_nonce: bool, pub check_nonce: bool,
/// Records the output from init contract calls.
pub output_from_init_contract: bool,
}
impl TransactOptions {
/// Create new `TransactOptions` with given tracer and VM tracer.
pub fn new(tracing: bool, vm_tracing: bool) -> Self {
TransactOptions {
tracing,
vm_tracing,
check_nonce: true,
output_from_init_contract: false,
}
}
/// Disables the nonce check
pub fn dont_check_nonce(mut self) -> Self {
self.check_nonce = false;
self
}
/// Saves the output from contract creation.
pub fn save_output_from_contract(mut self) -> Self {
self.output_from_init_contract = true;
self
}
/// Creates new `TransactOptions` with default tracing and VM tracing.
pub fn with_tracing_and_vm_tracing() -> Self {
TransactOptions {
tracing: true,
vm_tracing: true,
check_nonce: true,
output_from_init_contract: false,
}
}
/// Creates new `TransactOptions` with default tracing and no VM tracing.
pub fn with_tracing() -> Self {
TransactOptions {
tracing: true,
vm_tracing: false,
check_nonce: true,
output_from_init_contract: false,
}
}
/// Creates new `TransactOptions` with no tracing and default VM tracing.
pub fn with_vm_tracing() -> Self {
TransactOptions {
tracing: false,
vm_tracing: true,
check_nonce: true,
output_from_init_contract: false,
}
}
/// Creates new `TransactOptions` without any tracing.
pub fn with_no_tracing() -> Self {
TransactOptions {
tracing: false,
vm_tracing: false,
check_nonce: true,
output_from_init_contract: false,
}
}
} }
pub fn executor<E>(engine: &E, vm_factory: &Factory, params: &ActionParams) pub fn executor<E>(engine: &E, vm_factory: &Factory, params: &ActionParams)
@ -137,14 +203,15 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
/// This function should be used to execute transaction. /// This function should be used to execute transaction.
pub fn transact(&'a mut self, t: &SignedTransaction, options: TransactOptions) -> Result<Executed, ExecutionError> { pub fn transact(&'a mut self, t: &SignedTransaction, options: TransactOptions) -> Result<Executed, ExecutionError> {
let check = options.check_nonce; let check = options.check_nonce;
let output = options.output_from_init_contract;
match options.tracing { match options.tracing {
true => match options.vm_tracing { true => match options.vm_tracing {
true => self.transact_with_tracer(t, check, ExecutiveTracer::default(), ExecutiveVMTracer::toplevel()), true => self.transact_with_tracer(t, check, output, ExecutiveTracer::default(), ExecutiveVMTracer::toplevel()),
false => self.transact_with_tracer(t, check, ExecutiveTracer::default(), NoopVMTracer), false => self.transact_with_tracer(t, check, output, ExecutiveTracer::default(), NoopVMTracer),
}, },
false => match options.vm_tracing { false => match options.vm_tracing {
true => self.transact_with_tracer(t, check, NoopTracer, ExecutiveVMTracer::toplevel()), true => self.transact_with_tracer(t, check, output, NoopTracer, ExecutiveVMTracer::toplevel()),
false => self.transact_with_tracer(t, check, NoopTracer, NoopVMTracer), false => self.transact_with_tracer(t, check, output, NoopTracer, NoopVMTracer),
}, },
} }
} }
@ -169,6 +236,7 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
&'a mut self, &'a mut self,
t: &SignedTransaction, t: &SignedTransaction,
check_nonce: bool, check_nonce: bool,
output_from_create: bool,
mut tracer: T, mut tracer: T,
mut vm_tracer: V mut vm_tracer: V
) -> Result<Executed, ExecutionError> where T: Tracer, V: VMTracer { ) -> Result<Executed, ExecutionError> where T: Tracer, V: VMTracer {
@ -237,7 +305,8 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
data: None, data: None,
call_type: CallType::None, call_type: CallType::None,
}; };
(self.create(params, &mut substate, &mut tracer, &mut vm_tracer), vec![]) let mut out = if output_from_create { Some(vec![]) } else { None };
(self.create(params, &mut substate, &mut out, &mut tracer, &mut vm_tracer), out.unwrap_or_else(Vec::new))
}, },
Action::Call(ref address) => { Action::Call(ref address) => {
let params = ActionParams { let params = ActionParams {
@ -430,6 +499,7 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
&mut self, &mut self,
params: ActionParams, params: ActionParams,
substate: &mut Substate, substate: &mut Substate,
output: &mut Option<Bytes>,
tracer: &mut T, tracer: &mut T,
vm_tracer: &mut V, vm_tracer: &mut V,
) -> evm::Result<(U256, ReturnData)> where T: Tracer, V: VMTracer { ) -> evm::Result<(U256, ReturnData)> where T: Tracer, V: VMTracer {
@ -471,7 +541,7 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
let mut subvmtracer = vm_tracer.prepare_subtrace(params.code.as_ref().expect("two ways into create (Externalities::create and Executive::transact_with_tracer); both place `Some(...)` `code` in `params`; qed")); let mut subvmtracer = vm_tracer.prepare_subtrace(params.code.as_ref().expect("two ways into create (Externalities::create and Executive::transact_with_tracer); both place `Some(...)` `code` in `params`; qed"));
let res = { let res = {
self.exec_vm(params, &mut unconfirmed_substate, OutputPolicy::InitContract(trace_output.as_mut()), &mut subtracer, &mut subvmtracer) self.exec_vm(params, &mut unconfirmed_substate, OutputPolicy::InitContract(output.as_mut().or(trace_output.as_mut())), &mut subtracer, &mut subvmtracer)
}; };
vm_tracer.done_subtrace(subvmtracer); vm_tracer.done_subtrace(subvmtracer);
@ -480,7 +550,7 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
Ok(ref res) => tracer.trace_create( Ok(ref res) => tracer.trace_create(
trace_info, trace_info,
gas - res.gas_left, gas - res.gas_left,
trace_output, trace_output.map(|data| output.as_ref().map(|out| out.to_vec()).unwrap_or(data)),
created, created,
subtracer.traces() subtracer.traces()
), ),
@ -641,7 +711,7 @@ mod tests {
let (gas_left, _) = { let (gas_left, _) = {
let mut ex = Executive::new(&mut state, &info, &engine); let mut ex = Executive::new(&mut state, &info, &engine);
ex.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap() ex.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer).unwrap()
}; };
assert_eq!(gas_left, U256::from(79_975)); assert_eq!(gas_left, U256::from(79_975));
@ -699,7 +769,7 @@ mod tests {
let (gas_left, _) = { let (gas_left, _) = {
let mut ex = Executive::new(&mut state, &info, &engine); let mut ex = Executive::new(&mut state, &info, &engine);
ex.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap() ex.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer).unwrap()
}; };
assert_eq!(gas_left, U256::from(62_976)); assert_eq!(gas_left, U256::from(62_976));
@ -866,7 +936,7 @@ mod tests {
let (gas_left, _) = { let (gas_left, _) = {
let mut ex = Executive::new(&mut state, &info, &engine); let mut ex = Executive::new(&mut state, &info, &engine);
ex.create(params.clone(), &mut substate, &mut tracer, &mut vm_tracer).unwrap() ex.create(params.clone(), &mut substate, &mut None, &mut tracer, &mut vm_tracer).unwrap()
}; };
assert_eq!(gas_left, U256::from(96_776)); assert_eq!(gas_left, U256::from(96_776));
@ -951,7 +1021,7 @@ mod tests {
let (gas_left, _) = { let (gas_left, _) = {
let mut ex = Executive::new(&mut state, &info, &engine); let mut ex = Executive::new(&mut state, &info, &engine);
ex.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap() ex.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer).unwrap()
}; };
assert_eq!(gas_left, U256::from(62_976)); assert_eq!(gas_left, U256::from(62_976));
@ -1002,7 +1072,7 @@ mod tests {
{ {
let mut ex = Executive::new(&mut state, &info, &engine); let mut ex = Executive::new(&mut state, &info, &engine);
ex.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap(); ex.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer).unwrap();
} }
assert_eq!(substate.contracts_created.len(), 1); assert_eq!(substate.contracts_created.len(), 1);
@ -1138,7 +1208,7 @@ mod tests {
let executed = { let executed = {
let mut ex = Executive::new(&mut state, &info, &engine); let mut ex = Executive::new(&mut state, &info, &engine);
let opts = TransactOptions { check_nonce: true, tracing: false, vm_tracing: false }; let opts = TransactOptions { check_nonce: true, tracing: false, vm_tracing: false, output_from_init_contract: false };
ex.transact(&t, opts).unwrap() ex.transact(&t, opts).unwrap()
}; };
@ -1175,7 +1245,7 @@ mod tests {
let res = { let res = {
let mut ex = Executive::new(&mut state, &info, &engine); let mut ex = Executive::new(&mut state, &info, &engine);
let opts = TransactOptions { check_nonce: true, tracing: false, vm_tracing: false }; let opts = TransactOptions { check_nonce: true, tracing: false, vm_tracing: false, output_from_init_contract: false };
ex.transact(&t, opts) ex.transact(&t, opts)
}; };
@ -1208,7 +1278,7 @@ mod tests {
let res = { let res = {
let mut ex = Executive::new(&mut state, &info, &engine); let mut ex = Executive::new(&mut state, &info, &engine);
let opts = TransactOptions { check_nonce: true, tracing: false, vm_tracing: false }; let opts = TransactOptions { check_nonce: true, tracing: false, vm_tracing: false, output_from_init_contract: false };
ex.transact(&t, opts) ex.transact(&t, opts)
}; };
@ -1241,7 +1311,7 @@ mod tests {
let res = { let res = {
let mut ex = Executive::new(&mut state, &info, &engine); let mut ex = Executive::new(&mut state, &info, &engine);
let opts = TransactOptions { check_nonce: true, tracing: false, vm_tracing: false }; let opts = TransactOptions { check_nonce: true, tracing: false, vm_tracing: false, output_from_init_contract: false };
ex.transact(&t, opts) ex.transact(&t, opts)
}; };
@ -1275,7 +1345,7 @@ mod tests {
let result = { let result = {
let mut ex = Executive::new(&mut state, &info, &engine); let mut ex = Executive::new(&mut state, &info, &engine);
ex.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer) ex.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer)
}; };
match result { match result {

2
ethcore/src/externalities.rs
View File

@ -219,7 +219,7 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Ext for Externalities<'a, T, V, B, E>
let mut ex = Executive::from_parent(self.state, self.env_info, self.engine, self.depth, self.static_flag); let mut ex = Executive::from_parent(self.state, self.env_info, self.engine, self.depth, self.static_flag);
// TODO: handle internal error separately // TODO: handle internal error separately
match ex.create(params, self.substate, self.tracer, self.vm_tracer) { match ex.create(params, self.substate, &mut None, self.tracer, self.vm_tracer) {
Ok((gas_left, _)) => { Ok((gas_left, _)) => {
self.substate.contracts_created.push(address.clone()); self.substate.contracts_created.push(address.clone());
ContractCreateResult::Created(address, gas_left) ContractCreateResult::Created(address, gas_left)

1
ethcore/src/lib.rs
View File

@ -99,6 +99,7 @@ extern crate native_contracts;
extern crate num_cpus; extern crate num_cpus;
extern crate num; extern crate num;
extern crate rand; extern crate rand;
extern crate rayon;
extern crate rlp; extern crate rlp;
extern crate rustc_hex; extern crate rustc_hex;
extern crate rustc_serialize; extern crate rustc_serialize;

2
ethcore/src/miner/miner.rs
View File

@ -742,7 +742,7 @@ impl MinerService for Miner {
state.add_balance(&sender, &(needed_balance - balance), CleanupMode::NoEmpty) state.add_balance(&sender, &(needed_balance - balance), CleanupMode::NoEmpty)
.map_err(ExecutionError::from)?; .map_err(ExecutionError::from)?;
} }
let options = TransactOptions { tracing: analytics.transaction_tracing, vm_tracing: analytics.vm_tracing, check_nonce: false }; let options = TransactOptions { tracing: analytics.transaction_tracing, vm_tracing: analytics.vm_tracing, check_nonce: false, output_from_init_contract: true };
let mut ret = Executive::new(&mut state, &env_info, &*self.engine).transact(t, options)?; let mut ret = Executive::new(&mut state, &env_info, &*self.engine).transact(t, options)?;
// TODO gav move this into Executive. // TODO gav move this into Executive.

28
ethcore/src/miner/transaction_queue.rs
View File

@ -506,8 +506,6 @@ pub struct AccountDetails {
pub balance: U256, pub balance: U256,
} }
/// Transactions with `gas > (gas_limit + gas_limit * Factor(in percents))` are not imported to the queue.
const GAS_LIMIT_HYSTERESIS: usize = 200; // (100/GAS_LIMIT_HYSTERESIS) %
/// Transaction with the same (sender, nonce) can be replaced only if /// Transaction with the same (sender, nonce) can be replaced only if
/// `new_gas_price > old_gas_price + old_gas_price >> SHIFT` /// `new_gas_price > old_gas_price + old_gas_price >> SHIFT`
const GAS_PRICE_BUMP_SHIFT: usize = 3; // 2 = 25%, 3 = 12.5%, 4 = 6.25% const GAS_PRICE_BUMP_SHIFT: usize = 3; // 2 = 25%, 3 = 12.5%, 4 = 6.25%
@ -570,8 +568,8 @@ pub struct TransactionQueue {
minimal_gas_price: U256, minimal_gas_price: U256,
/// The maximum amount of gas any individual transaction may use. /// The maximum amount of gas any individual transaction may use.
tx_gas_limit: U256, tx_gas_limit: U256,
/// Current gas limit (block gas limit * factor). Transactions above the limit will not be accepted (default to !0) /// Current gas limit (block gas limit). Transactions above the limit will not be accepted (default to !0)
total_gas_limit: U256, block_gas_limit: U256,
/// Maximal time transaction may occupy the queue. /// Maximal time transaction may occupy the queue.
/// When we reach `max_time_in_queue / 2^3` we re-validate /// When we reach `max_time_in_queue / 2^3` we re-validate
/// account balance. /// account balance.
@ -631,7 +629,7 @@ impl TransactionQueue {
TransactionQueue { TransactionQueue {
strategy, strategy,
minimal_gas_price: U256::zero(), minimal_gas_price: U256::zero(),
total_gas_limit: !U256::zero(), block_gas_limit: !U256::zero(),
tx_gas_limit, tx_gas_limit,
max_time_in_queue: DEFAULT_QUEUING_PERIOD, max_time_in_queue: DEFAULT_QUEUING_PERIOD,
current, current,
@ -674,16 +672,10 @@ impl TransactionQueue {
self.current.gas_price_entry_limit() self.current.gas_price_entry_limit()
} }
/// Sets new gas limit. Transactions with gas slightly (`GAS_LIMIT_HYSTERESIS`) above the limit won't be imported. /// Sets new gas limit. Transactions with gas over the limit will not be accepted.
/// Any transaction already imported to the queue is not affected. /// Any transaction already imported to the queue is not affected.
pub fn set_gas_limit(&mut self, gas_limit: U256) { pub fn set_gas_limit(&mut self, gas_limit: U256) {
let extra = gas_limit / U256::from(GAS_LIMIT_HYSTERESIS); self.block_gas_limit = gas_limit;
let total_gas_limit = match gas_limit.overflowing_add(extra) {
(_, true) => !U256::zero(),
(val, false) => val,
};
self.total_gas_limit = total_gas_limit;
} }
/// Sets new total gas limit. /// Sets new total gas limit.
@ -819,13 +811,13 @@ impl TransactionQueue {
})); }));
} }
let gas_limit = cmp::min(self.tx_gas_limit, self.total_gas_limit); let gas_limit = cmp::min(self.tx_gas_limit, self.block_gas_limit);
if tx.gas > gas_limit { if tx.gas > gas_limit {
trace!(target: "txqueue", trace!(target: "txqueue",
"Dropping transaction above gas limit: {:?} ({} > min({}, {}))", "Dropping transaction above gas limit: {:?} ({} > min({}, {}))",
tx.hash(), tx.hash(),
tx.gas, tx.gas,
self.total_gas_limit, self.block_gas_limit,
self.tx_gas_limit self.tx_gas_limit
); );
return Err(Error::Transaction(TransactionError::GasLimitExceeded { return Err(Error::Transaction(TransactionError::GasLimitExceeded {
@ -1922,13 +1914,13 @@ pub mod test {
// given // given
let mut txq = TransactionQueue::default(); let mut txq = TransactionQueue::default();
txq.set_gas_limit(U256::zero()); txq.set_gas_limit(U256::zero());
assert_eq!(txq.total_gas_limit, U256::zero()); assert_eq!(txq.block_gas_limit, U256::zero());
// when // when
txq.set_gas_limit(!U256::zero()); txq.set_gas_limit(!U256::zero());
// then // then
assert_eq!(txq.total_gas_limit, !U256::zero()); assert_eq!(txq.block_gas_limit, !U256::zero());
} }
#[test] #[test]
@ -1945,7 +1937,7 @@ pub mod test {
// then // then
assert_eq!(unwrap_tx_err(res), TransactionError::GasLimitExceeded { assert_eq!(unwrap_tx_err(res), TransactionError::GasLimitExceeded {
limit: U256::from(50_250), // Should be 100.5% of set_gas_limit limit: U256::from(50_000),
got: gas, got: gas,
}); });
let stats = txq.status(); let stats = txq.status();

8
ethcore/src/spec/spec.rs
View File

@ -311,11 +311,10 @@ impl Spec {
}; };
let mut substate = Substate::new(); let mut substate = Substate::new();
state.kill_account(&address);
{ {
let mut exec = Executive::new(&mut state, &env_info, self.engine.as_ref()); let mut exec = Executive::new(&mut state, &env_info, self.engine.as_ref());
if let Err(e) = exec.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer) { if let Err(e) = exec.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer) {
warn!(target: "spec", "Genesis constructor execution at {} failed: {}.", address, e); warn!(target: "spec", "Genesis constructor execution at {} failed: {}.", address, e);
} }
} }
@ -525,6 +524,9 @@ mod tests {
let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap(); let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
let state = State::from_existing(db.boxed_clone(), spec.state_root(), spec.engine.account_start_nonce(0), Default::default()).unwrap(); let state = State::from_existing(db.boxed_clone(), spec.state_root(), spec.engine.account_start_nonce(0), Default::default()).unwrap();
let expected = H256::from_str("0000000000000000000000000000000000000000000000000000000000000001").unwrap(); let expected = H256::from_str("0000000000000000000000000000000000000000000000000000000000000001").unwrap();
assert_eq!(state.storage_at(&Address::from_str("0000000000000000000000000000000000000005").unwrap(), &H256::zero()).unwrap(), expected); let address = Address::from_str("0000000000000000000000000000000000000005").unwrap();
assert_eq!(state.storage_at(&address, &H256::zero()).unwrap(), expected);
assert_eq!(state.balance(&address).unwrap(), 1.into());
} }
} }

2
ethcore/src/state/mod.rs
View File

@ -642,7 +642,7 @@ impl<B: Backend> State<B> {
fn execute(&mut self, env_info: &EnvInfo, engine: &Engine, t: &SignedTransaction, tracing: bool, virt: bool) fn execute(&mut self, env_info: &EnvInfo, engine: &Engine, t: &SignedTransaction, tracing: bool, virt: bool)
-> Result<Executed, ExecutionError> -> Result<Executed, ExecutionError>
{ {
let options = TransactOptions { tracing: tracing, vm_tracing: false, check_nonce: true }; let options = TransactOptions { tracing: tracing, vm_tracing: false, check_nonce: true, output_from_init_contract: true };
let mut e = Executive::new(self, env_info, engine); let mut e = Executive::new(self, env_info, engine);
match virt { match virt {

7
ethcore/src/verification/verification.rs
View File

@ -380,14 +380,13 @@ mod tests {
self.numbers.get(&index).cloned() self.numbers.get(&index).cloned()
} }
fn blocks_with_bloom(&self, _bloom: &H2048, _from_block: BlockNumber, _to_block: BlockNumber) -> Vec<BlockNumber> {
unimplemented!()
}
fn block_receipts(&self, _hash: &H256) -> Option<BlockReceipts> { fn block_receipts(&self, _hash: &H256) -> Option<BlockReceipts> {
unimplemented!() unimplemented!()
} }
fn blocks_with_bloom(&self, _bloom: &H2048, _from_block: BlockNumber, _to_block: BlockNumber) -> Vec<BlockNumber> {
unimplemented!()
}
fn logs<F>(&self, _blocks: Vec<BlockNumber>, _matches: F, _limit: Option<usize>) -> Vec<LocalizedLogEntry> fn logs<F>(&self, _blocks: Vec<BlockNumber>, _matches: F, _limit: Option<usize>) -> Vec<LocalizedLogEntry>
where F: Fn(&LogEntry) -> bool, Self: Sized { where F: Fn(&LogEntry) -> bool, Self: Sized {

7
js/src/api/api.js
View File

@ -71,10 +71,15 @@ export default class Api extends EventEmitter {
} }
} }
get isPubSub () {
return !!this._pubsub;
}
get pubsub () { get pubsub () {
if (!this._pubsub) { if (!this.isPubSub) {
throw Error('Pubsub is only available with a subscribing-supported transport injected!'); throw Error('Pubsub is only available with a subscribing-supported transport injected!');
} }
return this._pubsub; return this._pubsub;
} }

2
js/src/api/pubsub/eth/eth.js
View File

@ -25,7 +25,7 @@ export default class Eth extends PubsubBase {
} }
newHeads (callback) { newHeads (callback) {
return this.addListener('eth', 'newHeads', callback); return this.addListener('eth', 'newHeads', callback, null);
} }
logs (callback) { logs (callback) {

32
js/src/api/pubsub/parity/parity.js
View File

@ -266,7 +266,7 @@ export default class Parity extends PubsubBase {
// parity accounts API (only secure API or configured to be exposed) // parity accounts API (only secure API or configured to be exposed)
allAccountsInfo (callback) { allAccountsInfo (callback) {
return this._addListener(this._api, 'parity_allAccountsInfo', (error, data) => { return this.addListener(this._api, 'parity_allAccountsInfo', (error, data) => {
error error
? callback(error) ? callback(error)
: callback(null, outAccountInfo(data)); : callback(null, outAccountInfo(data));
@ -274,7 +274,7 @@ export default class Parity extends PubsubBase {
} }
getDappAddresses (callback, dappId) { getDappAddresses (callback, dappId) {
return this._addListener(this._api, 'parity_getDappAddresses', (error, data) => { return this.addListener(this._api, 'parity_getDappAddresses', (error, data) => {
error error
? callback(error) ? callback(error)
: callback(null, outAddresses(data)); : callback(null, outAddresses(data));
@ -282,7 +282,7 @@ export default class Parity extends PubsubBase {
} }
getDappDefaultAddress (callback, dappId) { getDappDefaultAddress (callback, dappId) {
return this._addListener(this._api, 'parity_getDappDefaultAddress', (error, data) => { return this.addListener(this._api, 'parity_getDappDefaultAddress', (error, data) => {
error error
? callback(error) ? callback(error)
: callback(null, outAddress(data)); : callback(null, outAddress(data));
@ -290,7 +290,7 @@ export default class Parity extends PubsubBase {
} }
getNewDappsAddresses (callback) { getNewDappsAddresses (callback) {
return this._addListener(this._api, 'parity_getDappDefaultAddress', (error, addresses) => { return this.addListener(this._api, 'parity_getDappDefaultAddress', (error, addresses) => {
error error
? callback(error) ? callback(error)
: callback(null, addresses ? addresses.map(outAddress) : null); : callback(null, addresses ? addresses.map(outAddress) : null);
@ -298,7 +298,7 @@ export default class Parity extends PubsubBase {
} }
getNewDappsDefaultAddress (callback) { getNewDappsDefaultAddress (callback) {
return this._addListener(this._api, 'parity_getNewDappsDefaultAddress', (error, data) => { return this.addListener(this._api, 'parity_getNewDappsDefaultAddress', (error, data) => {
error error
? callback(error) ? callback(error)
: callback(null, outAddress(data)); : callback(null, outAddress(data));
@ -306,7 +306,7 @@ export default class Parity extends PubsubBase {
} }
listRecentDapps (callback) { listRecentDapps (callback) {
return this._addListener(this._api, 'parity_listRecentDapps', (error, data) => { return this.addListener(this._api, 'parity_listRecentDapps', (error, data) => {
error error
? callback(error) ? callback(error)
: callback(null, outRecentDapps(data)); : callback(null, outRecentDapps(data));
@ -314,7 +314,7 @@ export default class Parity extends PubsubBase {
} }
listGethAccounts (callback) { listGethAccounts (callback) {
return this._addListener(this._api, 'parity_listGethAccounts', (error, data) => { return this.addListener(this._api, 'parity_listGethAccounts', (error, data) => {
error error
? callback(error) ? callback(error)
: callback(null, outAddresses(data)); : callback(null, outAddresses(data));
@ -322,15 +322,15 @@ export default class Parity extends PubsubBase {
} }
listVaults (callback) { listVaults (callback) {
return this._addListener(this._api, 'parity_listVaults', callback); return this.addListener(this._api, 'parity_listVaults', callback);
} }
listOpenedVaults (callback) { listOpenedVaults (callback) {
return this._addListener(this._api, 'parity_listOpenedVaults', callback); return this.addListener(this._api, 'parity_listOpenedVaults', callback);
} }
getVaultMeta (callback, vaultName) { getVaultMeta (callback, vaultName) {
return this._addListener(this._api, 'parity_getVaultMeta', (error, data) => { return this.addListener(this._api, 'parity_getVaultMeta', (error, data) => {
error error
? callback(error) ? callback(error)
: callback(null, outVaultMeta(data)); : callback(null, outVaultMeta(data));
@ -338,7 +338,7 @@ export default class Parity extends PubsubBase {
} }
deriveAddressHash (callback, address, password, hash, shouldSave) { deriveAddressHash (callback, address, password, hash, shouldSave) {
return this._addListener(this._api, 'parity_deriveAddressHash', (error, data) => { return this.addListener(this._api, 'parity_deriveAddressHash', (error, data) => {
error error
? callback(error) ? callback(error)
: callback(null, outAddress(data)); : callback(null, outAddress(data));
@ -346,10 +346,18 @@ export default class Parity extends PubsubBase {
} }
deriveAddressIndex (callback, address, password, index, shouldSave) { deriveAddressIndex (callback, address, password, index, shouldSave) {
return this._addListener(this._api, 'parity_deriveAddressIndex', (error, data) => { return this.addListener(this._api, 'parity_deriveAddressIndex', (error, data) => {
error error
? callback(error) ? callback(error)
: callback(null, outAddress(data)); : callback(null, outAddress(data));
}, [inAddress(address), password, inDeriveIndex(index), !!shouldSave]); }, [inAddress(address), password, inDeriveIndex(index), !!shouldSave]);
} }
nodeHealth (callback) {
return this.addListener(this._api, 'parity_nodeHealth', (error, data) => {
error
? callback(error)
: callback(null, data);
});
}
} }

29
js/src/api/pubsub/pubsub.js
View File

@ -16,6 +16,7 @@
import Eth from './eth'; import Eth from './eth';
import Parity from './parity'; import Parity from './parity';
import Signer from './signer';
import Net from './net'; import Net from './net';
import { isFunction } from '../util/types'; import { isFunction } from '../util/types';
@ -29,6 +30,7 @@ export default class Pubsub {
this._eth = new Eth(transport); this._eth = new Eth(transport);
this._net = new Net(transport); this._net = new Net(transport);
this._parity = new Parity(transport); this._parity = new Parity(transport);
this._signer = new Signer(transport);
} }
get net () { get net () {
@ -43,8 +45,35 @@ export default class Pubsub {
return this._parity; return this._parity;
} }
get signer () {
return this._signer;
}
unsubscribe (subscriptionIds) { unsubscribe (subscriptionIds) {
// subscriptions are namespace independent. Thus we can simply removeListener from any. // subscriptions are namespace independent. Thus we can simply removeListener from any.
return this._parity.removeListener(subscriptionIds); return this._parity.removeListener(subscriptionIds);
} }
subscribeAndGetResult (f, callback) {
return new Promise((resolve, reject) => {
let isFirst = true;
let onSubscription = (error, data) => {
const p1 = error ? Promise.reject(error) : Promise.resolve(data);
const p2 = p1.then(callback);
if (isFirst) {
isFirst = false;
p2
.then(resolve)
.catch(reject);
}
};
try {
f.call(this, onSubscription).catch(reject);
} catch (err) {
reject(err);
}
});
}
} }

11
js/src/api/pubsub/pubsubBase.js
View File

@ -20,11 +20,12 @@ export default class PubsubBase {
this._transport = transport; this._transport = transport;
} }
addListener (module, eventName, callback, eventParams) { addListener (module, eventName, callback, eventParams = []) {
return eventParams if (eventName) {
? this._transport.subscribe(module, callback, eventName, eventParams) return this._transport.subscribe(module, callback, eventParams ? [eventName, eventParams] : [eventName]);
: this._transport.subscribe(module, callback, eventName, []); }
// this._transport.subscribe(module, callback, eventName); After Patch from tomac is merged to master! => eth_subscribe does not support empty array as params
return this._transport.subscribe(module, callback, eventParams);
} }
removeListener (subscriptionIds) { removeListener (subscriptionIds) {

16
js/src/api/pubsub/signer/index.js Normal file
View File

@ -0,0 +1,16 @@
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
// This file is part of Parity.
// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
export default from './signer';

37
js/src/api/pubsub/signer/signer.js Normal file
View File

@ -0,0 +1,37 @@
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
// This file is part of Parity.
// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import PubsubBase from '../pubsubBase';
import { outSignerRequest } from '../../format/output';
export default class Net extends PubsubBase {
constructor (transport) {
super(transport);
this._api = {
subscribe: 'signer_subscribePending',
unsubscribe: 'signer_unsubscribePending',
subscription: 'signer_pending'
};
}
pendingRequests (callback) {
return this.addListener(this._api, null, (error, data) => {
error
? callback(error)
: callback(null, data.map(outSignerRequest));
});
}
}

14
js/src/api/rpc/parity/parity.js
View File

@ -44,6 +44,15 @@ export default class Parity {
.execute('parity_addReservedPeer', enode); .execute('parity_addReservedPeer', enode);
} }
call (requests, blockNumber = 'latest') {
return this._transport
.execute(
'parity_call',
requests.map((options) => inOptions(options)),
inBlockNumber(blockNumber)
);
}
chainStatus () { chainStatus () {
return this._transport return this._transport
.execute('parity_chainStatus') .execute('parity_chainStatus')
@ -380,6 +389,11 @@ export default class Parity {
.then(outNumber); .then(outNumber);
} }
nodeHealth () {
return this._transport
.execute('parity_nodeHealth');
}
nodeName () { nodeName () {
return this._transport return this._transport
.execute('parity_nodeName'); .execute('parity_nodeName');

54
js/src/api/subscriptions/eth.js
View File

@ -24,6 +24,13 @@ export default class Eth {
this._lastBlock = new BigNumber(-1); this._lastBlock = new BigNumber(-1);
this._pollTimerId = null; this._pollTimerId = null;
// Try to restart subscription if transport is closed
this._api.transport.on('close', () => {
if (this.isStarted) {
this.start();
}
});
} }
get isStarted () { get isStarted () {
@ -33,31 +40,56 @@ export default class Eth {
start () { start () {
this._started = true; this._started = true;
return this._blockNumber(); if (this._api.isPubSub) {
return Promise.all([
this._pollBlockNumber(false),
this._api.pubsub
.subscribeAndGetResult(
callback => this._api.pubsub.eth.newHeads(callback),
() => {
return this._api.eth
.blockNumber()
.then(blockNumber => {
this.updateBlock(blockNumber);
return blockNumber;
});
}
)
]);
}
// fallback to polling
return this._pollBlockNumber(true);
} }
_blockNumber = () => { _pollBlockNumber = (doTimeout) => {
const nextTimeout = (timeout = 1000) => { const nextTimeout = (timeout = 1000, forceTimeout = doTimeout) => {
this._pollTimerId = setTimeout(() => { if (forceTimeout) {
this._blockNumber(); this._pollTimerId = setTimeout(() => {
}, timeout); this._pollBlockNumber(doTimeout);
}, timeout);
}
}; };
if (!this._api.transport.isConnected) { if (!this._api.transport.isConnected) {
nextTimeout(500); nextTimeout(500, true);
return; return;
} }
return this._api.eth return this._api.eth
.blockNumber() .blockNumber()
.then((blockNumber) => { .then((blockNumber) => {
if (!blockNumber.eq(this._lastBlock)) { this.updateBlock(blockNumber);
this._lastBlock = blockNumber;
this._updateSubscriptions('eth_blockNumber', null, blockNumber);
}
nextTimeout(); nextTimeout();
}) })
.catch(() => nextTimeout()); .catch(() => nextTimeout());
} }
updateBlock (blockNumber) {
if (!blockNumber.eq(this._lastBlock)) {
this._lastBlock = blockNumber;
this._updateSubscriptions('eth_blockNumber', null, blockNumber);
}
}
} }

3
js/src/api/subscriptions/eth.spec.js
View File

@ -29,7 +29,8 @@ function stubApi (blockNumber) {
return { return {
_calls, _calls,
transport: { transport: {
isConnected: true isConnected: true,
on: () => {}
}, },
eth: { eth: {
blockNumber: () => { blockNumber: () => {

3
js/src/api/subscriptions/manager.spec.js
View File

@ -23,7 +23,8 @@ function newStub () {
const manager = new Manager({ const manager = new Manager({
transport: { transport: {
isConnected: true isConnected: true,
on: sinon.stub()
} }
}); });

39
js/src/api/subscriptions/personal.js
View File

@ -23,6 +23,13 @@ export default class Personal {
this._lastDefaultAccount = '0x0'; this._lastDefaultAccount = '0x0';
this._pollTimerId = null; this._pollTimerId = null;
// Try to restart subscription if transport is closed
this._api.transport.on('close', () => {
if (this.isStarted) {
this.start();
}
});
} }
get isStarted () { get isStarted () {
@ -32,20 +39,42 @@ export default class Personal {
start () { start () {
this._started = true; this._started = true;
let defaultAccount = null;
if (this._api.isPubSub) {
defaultAccount = this._api.pubsub
.subscribeAndGetResult(
callback => this._api.pubsub.parity.defaultAccount(callback),
(defaultAccount) => {
this.updateDefaultAccount(defaultAccount);
return defaultAccount;
}
);
} else {
defaultAccount = this._defaultAccount();
}
return Promise.all([ return Promise.all([
this._defaultAccount(), defaultAccount,
this._listAccounts(), this._listAccounts(),
this._accountsInfo(), this._accountsInfo(),
this._loggingSubscribe() this._loggingSubscribe()
]); ]);
} }
updateDefaultAccount (defaultAccount) {
if (this._lastDefaultAccount !== defaultAccount) {
this._lastDefaultAccount = defaultAccount;
this._updateSubscriptions('parity_defaultAccount', null, defaultAccount);
}
}
// FIXME: Because of the different API instances, the "wait for valid changes" approach // FIXME: Because of the different API instances, the "wait for valid changes" approach
// doesn't work. Since the defaultAccount is critical to operation, we poll in exactly // doesn't work. Since the defaultAccount is critical to operation, we poll in exactly
// same way we do in ../eth (ala eth_blockNumber) and update. This should be moved // same way we do in ../eth (ala eth_blockNumber) and update. This should be moved
// to pub-sub as it becomes available // to pub-sub as it becomes available
_defaultAccount = (timerDisabled = false) => { _defaultAccount = (timerDisabled = false) => {
const nextTimeout = (timeout = 1000) => { const nextTimeout = (timeout = 3000) => {
if (!timerDisabled) { if (!timerDisabled) {
this._pollTimerId = setTimeout(() => { this._pollTimerId = setTimeout(() => {
this._defaultAccount(); this._defaultAccount();
@ -61,11 +90,7 @@ export default class Personal {
return this._api.parity return this._api.parity
.defaultAccount() .defaultAccount()
.then((defaultAccount) => { .then((defaultAccount) => {
if (this._lastDefaultAccount !== defaultAccount) { this.updateDefaultAccount(defaultAccount);
this._lastDefaultAccount = defaultAccount;
this._updateSubscriptions('parity_defaultAccount', null, defaultAccount);
}
nextTimeout(); nextTimeout();
}) })
.catch(() => nextTimeout()); .catch(() => nextTimeout());

3
js/src/api/subscriptions/personal.spec.js
View File

@ -37,7 +37,8 @@ function stubApi (accounts, info) {
return { return {
_calls, _calls,
transport: { transport: {
isConnected: true isConnected: true,
on: sinon.stub()
}, },
parity: { parity: {
accountsInfo: () => { accountsInfo: () => {

37
js/src/api/subscriptions/signer.js
View File

@ -22,6 +22,13 @@ export default class Signer {
this._api = api; this._api = api;
this._updateSubscriptions = updateSubscriptions; this._updateSubscriptions = updateSubscriptions;
this._started = false; this._started = false;
// Try to restart subscription if transport is closed
this._api.transport.on('close', () => {
if (this.isStarted) {
this.start();
}
});
} }
get isStarted () { get isStarted () {
@ -31,30 +38,50 @@ export default class Signer {
start () { start () {
this._started = true; this._started = true;
if (this._api.isPubSub) {
const subscription = this._api.pubsub
.subscribeAndGetResult(
callback => this._api.pubsub.signer.pendingRequests(callback),
requests => {
this.updateSubscriptions(requests);
return requests;
}
);
return Promise.all([
this._listRequests(false),
subscription
]);
}
return Promise.all([ return Promise.all([
this._listRequests(true), this._listRequests(true),
this._loggingSubscribe() this._loggingSubscribe()
]); ]);
} }
updateSubscriptions (requests) {
return this._updateSubscriptions('signer_requestsToConfirm', null, requests);
}
_listRequests = (doTimeout) => { _listRequests = (doTimeout) => {
const nextTimeout = (timeout = 1000) => { const nextTimeout = (timeout = 1000, forceTimeout = doTimeout) => {
if (doTimeout) { if (forceTimeout) {
setTimeout(() => { setTimeout(() => {
this._listRequests(true); this._listRequests(doTimeout);
}, timeout); }, timeout);
} }
}; };
if (!this._api.transport.isConnected) { if (!this._api.transport.isConnected) {
nextTimeout(500); nextTimeout(500, true);
return; return;
} }
return this._api.signer return this._api.signer
.requestsToConfirm() .requestsToConfirm()
.then((requests) => { .then((requests) => {
this._updateSubscriptions('signer_requestsToConfirm', null, requests); this.updateSubscriptions(requests);
nextTimeout(); nextTimeout();
}) })
.catch(() => nextTimeout()); .catch(() => nextTimeout());

25
js/src/api/transport/jsonRpcBase.js
View File

@ -15,7 +15,11 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import EventEmitter from 'eventemitter3'; import EventEmitter from 'eventemitter3';
import { Logging } from '../subscriptions'; import { Logging } from '../subscriptions';
import logger from './logger';
const LOGGER_ENABLED = process.env.NODE_ENV !== 'production';
export default class JsonRpcBase extends EventEmitter { export default class JsonRpcBase extends EventEmitter {
constructor () { constructor () {
@ -75,6 +79,14 @@ export default class JsonRpcBase extends EventEmitter {
} }
execute (method, ...params) { execute (method, ...params) {
let start;
let logId;
if (LOGGER_ENABLED) {
start = Date.now();
logId = logger.log({ method, params });
}
return this._middlewareList.then((middlewareList) => { return this._middlewareList.then((middlewareList) => {
for (const middleware of middlewareList) { for (const middleware of middlewareList) {
const res = middleware.handle(method, params); const res = middleware.handle(method, params);
@ -93,7 +105,18 @@ export default class JsonRpcBase extends EventEmitter {
} }
} }
return this._execute(method, params); const result = this._execute(method, params);
if (!LOGGER_ENABLED) {
return result;
}
return result
.then((result) => {
logger.set(logId, { result, time: Date.now() - start });
return result;
});
}); });
} }

150
js/src/api/transport/logger.js Normal file
View File

@ -0,0 +1,150 @@
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
// This file is part of Parity.
// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import MethodDecodingStore from '~/ui/MethodDecoding/methodDecodingStore';
const LOGGER_ENABLED = process.env.NODE_ENV !== 'production';
let logger;
if (LOGGER_ENABLED) {
class Logger {
_logs = {};
_id = 0;
log ({ method, params }) {
const logId = this._id++;
this._logs[logId] = { method, params, date: Date.now() };
return logId;
}
set (logId, data) {
this._logs[logId] = {
...this._logs[logId],
...data
};
}
static sorter (logA, logB) {
return logA.date - logB.date;
}
get calls () {
const calls = this.methods['eth_call'] || [];
const decoding = MethodDecodingStore.get(window.secureApi);
const contracts = {};
const progress = Math.round(calls.length / 20);
return calls
.reduce((promise, call, index) => {
const { data, to } = call.params[0];
contracts[to] = contracts[to] || [];
return promise
.then(() => decoding.lookup(null, { data, to }))
.then((lookup) => {
if (!lookup.name) {
contracts[to].push(data);
return;
}
const inputs = lookup.inputs.map((input) => {
if (/bytes/.test(input.type)) {
return '0x' + input.value.map((v) => v.toString(16).padStart(2, 0)).join('');
}
return input.value;
});
const called = `${lookup.name}(${inputs.join(', ')})`;
contracts[to].push(called);
if (index % progress === 0) {
console.warn(`progress: ${Math.round(100 * index / calls.length)}%`);
}
});
}, Promise.resolve())
.then(() => {
return Object.keys(contracts)
.map((address) => {
const count = contracts[address].length;
return {
count,
calls: contracts[address],
to: address
};
})
.sort((cA, cB) => cB.count - cA.count);
});
}
get logs () {
return Object.values(this._logs).sort(Logger.sorter);
}
get methods () {
return this.logs.reduce((methods, log) => {
methods[log.method] = methods[log.method] || [];
methods[log.method].push(log);
return methods;
}, {});
}
get stats () {
const logs = this.logs;
const methods = this.methods;
const start = logs[0].date;
const end = logs[logs.length - 1].date;
// Duration in seconds
const duration = (end - start) / 1000;
const speed = logs.length / duration;
const sortedMethods = Object.keys(methods)
.map((method) => {
const methodLogs = methods[method].sort(Logger.sorter);
const methodSpeed = methodLogs.length / duration;
return {
speed: methodSpeed,
count: methodLogs.length,
logs: methodLogs,
method
};
})
.sort((mA, mB) => mB.count - mA.count);
return {
methods: sortedMethods,
speed
};
}
}
logger = new Logger();
if (window) {
window._logger = logger;
}
}
export default logger;

17
js/src/api/transport/ws/ws.js
View File

@ -29,7 +29,7 @@ export default class Ws extends JsonRpcBase {
this._url = url; this._url = url;
this._token = token; this._token = token;
this._messages = {}; this._messages = {};
this._subscriptions = { 'eth_subscription': [], 'parity_subscription': [] }; this._subscriptions = {};
this._sessionHash = null; this._sessionHash = null;
this._connecting = false; this._connecting = false;
@ -209,6 +209,7 @@ export default class Ws extends JsonRpcBase {
// initial pubsub ACK // initial pubsub ACK
if (id && msg.subscription) { if (id && msg.subscription) {
// save subscription to map subId -> messageId // save subscription to map subId -> messageId
this._subscriptions[msg.subscription] = this._subscriptions[msg.subscription] || {};
this._subscriptions[msg.subscription][res] = id; this._subscriptions[msg.subscription][res] = id;
// resolve promise with messageId because subId's can collide (eth/parity) // resolve promise with messageId because subId's can collide (eth/parity)
msg.resolve(id); msg.resolve(id);
@ -223,7 +224,7 @@ export default class Ws extends JsonRpcBase {
} }
// pubsub format // pubsub format
if (method.includes('subscription')) { if (this._subscriptions[method]) {
const messageId = this._messages[this._subscriptions[method][params.subscription]]; const messageId = this._messages[this._subscriptions[method][params.subscription]];
if (messageId) { if (messageId) {
@ -302,6 +303,16 @@ export default class Ws extends JsonRpcBase {
} }
_methodsFromApi (api) { _methodsFromApi (api) {
if (api.subscription) {
const { subscribe, unsubscribe, subscription } = api;
return {
method: subscribe,
uMethod: unsubscribe,
subscription
};
}
const method = `${api}_subscribe`; const method = `${api}_subscribe`;
const uMethod = `${api}_unsubscribe`; const uMethod = `${api}_unsubscribe`;
const subscription = `${api}_subscription`; const subscription = `${api}_subscription`;
@ -309,7 +320,7 @@ export default class Ws extends JsonRpcBase {
return { method, uMethod, subscription }; return { method, uMethod, subscription };
} }
subscribe (api, callback, ...params) { subscribe (api, callback, params) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const id = this.id; const id = this.id;
const { method, uMethod, subscription } = this._methodsFromApi(api); const { method, uMethod, subscription } = this._methodsFromApi(api);

4
js/src/index.js
View File

@ -36,7 +36,6 @@ import muiTheme from '~/ui/Theme';
import MainApplication from './main'; import MainApplication from './main';
import { loadSender, patchApi } from '~/util/tx'; import { loadSender, patchApi } from '~/util/tx';
import { setApi } from '~/redux/providers/apiActions';
import './environment'; import './environment';
@ -69,9 +68,6 @@ ContractInstances.create(api);
const store = initStore(api, hashHistory); const store = initStore(api, hashHistory);
store.dispatch({ type: 'initAll', api });
store.dispatch(setApi(api));
window.secureApi = api; window.secureApi = api;
ReactDOM.render( ReactDOM.render(

52
js/src/mobx/hardwareStore.js
View File

@ -31,6 +31,10 @@ export default class HardwareStore {
this._pollId = null; this._pollId = null;
this._pollScan(); this._pollScan();
this._subscribeParity();
this._api.transport.on('close', () => {
this._subscribeParity();
});
} }
isConnected (address) { isConnected (address) {
@ -78,26 +82,30 @@ export default class HardwareStore {
}); });
} }
scanParity () { _subscribeParity () {
return this._api.parity const onError = error => {
.hardwareAccountsInfo() console.warn('HardwareStore::scanParity', error);
.then((hwInfo) => {
Object
.keys(hwInfo)
.forEach((address) => {
const info = hwInfo[address];
info.address = address; return {};
info.via = 'parity'; };
});
return hwInfo; return this._api.pubsub
}) .subscribeAndGetResult(
.catch((error) => { callback => this._api.pubsub.parity.hardwareAccountsInfo(callback),
console.warn('HardwareStore::scanParity', error); hwInfo => {
Object
.keys(hwInfo)
.forEach((address) => {
const info = hwInfo[address];
return {}; info.address = address;
}); info.via = 'parity';
});
this.setWallets(hwInfo);
return hwInfo;
},
onError
).catch(onError);
} }
scan () { scan () {
@ -107,14 +115,10 @@ export default class HardwareStore {
// is done, different results will be retrieved via Parity vs. the browser APIs // is done, different results will be retrieved via Parity vs. the browser APIs
// (latter is Chrome-only, needs the browser app enabled on a Ledger, former is // (latter is Chrome-only, needs the browser app enabled on a Ledger, former is
// not intended as a network call, i.e. hw wallet is with the user) // not intended as a network call, i.e. hw wallet is with the user)
return Promise return this.scanLedger()
.all([ .then((ledgerAccounts) => {
this.scanParity(),
this.scanLedger()
])
.then(([hwAccounts, ledgerAccounts]) => {
transaction(() => { transaction(() => {
this.setWallets(Object.assign({}, hwAccounts, ledgerAccounts)); this.setWallets(Object.assign({}, ledgerAccounts));
this.setScanning(false); this.setScanning(false);
}); });
}); });

22
js/src/mobx/hardwareStore.spec.js
View File

@ -31,6 +31,12 @@ let store;
function createApi () { function createApi () {
api = { api = {
transport: {
on: sinon.stub()
},
pubsub: {
subscribeAndGetResult: sinon.stub().returns(Promise.reject(new Error('not connected')))
},
parity: { parity: {
hardwareAccountsInfo: sinon.stub().resolves({ ADDRESS: WALLET }), hardwareAccountsInfo: sinon.stub().resolves({ ADDRESS: WALLET }),
setAccountMeta: sinon.stub().resolves(true), setAccountMeta: sinon.stub().resolves(true),
@ -195,22 +201,11 @@ describe('mobx/HardwareStore', () => {
}); });
}); });
describe('scanParity', () => {
beforeEach(() => {
return store.scanParity();
});
it('calls parity_hardwareAccountsInfo', () => {
expect(api.parity.hardwareAccountsInfo).to.have.been.called;
});
});
describe('scan', () => { describe('scan', () => {
beforeEach(() => { beforeEach(() => {
sinon.spy(store, 'setScanning'); sinon.spy(store, 'setScanning');
sinon.spy(store, 'setWallets'); sinon.spy(store, 'setWallets');
sinon.spy(store, 'scanLedger'); sinon.spy(store, 'scanLedger');
sinon.spy(store, 'scanParity');
return store.scan(); return store.scan();
}); });
@ -219,17 +214,12 @@ describe('mobx/HardwareStore', () => {
store.setScanning.restore(); store.setScanning.restore();
store.setWallets.restore(); store.setWallets.restore();
store.scanLedger.restore(); store.scanLedger.restore();
store.scanParity.restore();
}); });
it('calls scanLedger', () => { it('calls scanLedger', () => {
expect(store.scanLedger).to.have.been.called; expect(store.scanLedger).to.have.been.called;
}); });
it('calls scanParity', () => {
expect(store.scanParity).to.have.been.called;
});
it('sets and resets the scanning state', () => { it('sets and resets the scanning state', () => {
expect(store.setScanning).to.have.been.calledWith(true); expect(store.setScanning).to.have.been.calledWith(true);
expect(store.setScanning).to.have.been.calledWith(false); expect(store.setScanning).to.have.been.calledWith(false);

3
js/src/modals/Transfer/store.js
View File

@ -133,8 +133,8 @@ export default class TransferStore {
} }
@action handleClose = () => { @action handleClose = () => {
this.stage = 0;
this.onClose(); this.onClose();
this.stage = 0;
} }
@action onUpdateDetails = (type, value) => { @action onUpdateDetails = (type, value) => {
@ -169,7 +169,6 @@ export default class TransferStore {
} }
@action onSend = () => { @action onSend = () => {
this.onNext();
this.sending = true; this.sending = true;
this this

4
js/src/modals/Transfer/transfer.js
View File

@ -192,7 +192,7 @@ class Transfer extends Component {
renderDialogActions () { renderDialogActions () {
const { account } = this.props; const { account } = this.props;
const { extras, sending, stage } = this.store; const { extras, sending, stage, isValid } = this.store;
const cancelBtn = ( const cancelBtn = (
<Button <Button
@ -236,7 +236,7 @@ class Transfer extends Component {
); );
const sendBtn = ( const sendBtn = (
<Button <Button
disabled={ !this.store.isValid || sending } disabled={ !isValid || sending }
icon={ icon={
<IdentityIcon <IdentityIcon
address={ account.address } address={ account.address }

2
js/src/redux/providers/apiReducer.js
View File

@ -16,7 +16,7 @@
import { handleActions } from 'redux-actions'; import { handleActions } from 'redux-actions';
const initialState = {}; const initialState = null;
export default handleActions({ export default handleActions({
setApi (state, action) { setApi (state, action) {

288
js/src/redux/providers/balances.js
View File

@ -16,12 +16,11 @@
import { throttle } from 'lodash'; import { throttle } from 'lodash';
import { fetchBalances, fetchTokensBalances, queryTokensFilter } from './balancesActions'; import { LOG_KEYS, getLogger } from '~/config';
import { loadTokens, fetchTokens } from './tokensActions';
import { padRight } from '~/api/util/format';
import Contracts from '~/contracts'; import { fetchBalances, queryTokensFilter, updateTokensFilter } from './balancesActions';
const log = getLogger(LOG_KEYS.Balances);
let instance = null; let instance = null;
export default class Balances { export default class Balances {
@ -29,40 +28,20 @@ export default class Balances {
this._api = api; this._api = api;
this._store = store; this._store = store;
this._tokenreg = null; this._apiSubs = [];
this._tokenregSID = null;
this._tokenMetaSID = null;
this._blockNumberSID = null; // Throttled `_fetchEthBalances` function
this._accountsInfoSID = null;
// Throtthled load tokens (no more than once
// every minute)
this.loadTokens = throttle(
this._loadTokens,
60 * 1000,
{ leading: true, trailing: true }
);
// Throttled `_fetchBalances` function
// that gets called max once every 40s // that gets called max once every 40s
this.longThrottledFetch = throttle( this.longThrottledFetch = throttle(
this._fetchBalances, this._fetchEthBalances,
40 * 1000, 40 * 1000,
{ leading: false, trailing: true } { leading: true, trailing: false }
); );
this.shortThrottledFetch = throttle( this.shortThrottledFetch = throttle(
this._fetchBalances, this._fetchEthBalances,
2 * 1000, 2 * 1000,
{ leading: false, trailing: true } { leading: true, trailing: false }
);
// Fetch all tokens every 2 minutes
this.throttledTokensFetch = throttle(
this._fetchTokens,
2 * 60 * 1000,
{ leading: false, trailing: true }
); );
// Unsubscribe previous instance if it exists // Unsubscribe previous instance if it exists
@ -71,17 +50,19 @@ export default class Balances {
} }
} }
static get (store = {}) { static get (store) {
if (!instance && store) { if (!instance && store) {
const { api } = store.getState(); return Balances.init(store);
} else if (!instance) {
return Balances.instantiate(store, api); throw new Error('The Balances Provider has not been initialized yet');
} }
return instance; return instance;
} }
static instantiate (store, api) { static init (store) {
const { api } = store.getState();
if (!instance) { if (!instance) {
instance = new Balances(store, api); instance = new Balances(store, api);
} }
@ -91,15 +72,13 @@ export default class Balances {
static start () { static start () {
if (!instance) { if (!instance) {
return Promise.reject('BalancesProvider has not been intiated yet'); return Promise.reject('BalancesProvider has not been initiated yet');
} }
const self = instance; const self = instance;
// Unsubscribe from previous subscriptions // Unsubscribe from previous subscriptions
return Balances return Balances.stop()
.stop()
.then(() => self.loadTokens())
.then(() => { .then(() => {
const promises = [ const promises = [
self.subscribeBlockNumber(), self.subscribeBlockNumber(),
@ -107,7 +86,8 @@ export default class Balances {
]; ];
return Promise.all(promises); return Promise.all(promises);
}); })
.then(() => self.fetchEthBalances());
} }
static stop () { static stop () {
@ -116,71 +96,35 @@ export default class Balances {
} }
const self = instance; const self = instance;
const promises = []; const promises = self._apiSubs.map((subId) => self._api.unsubscribe(subId));
if (self._blockNumberSID) { return Promise.all(promises)
const p = self._api .then(() => {
.unsubscribe(self._blockNumberSID) self._apiSubs = [];
.then(() => { });
self._blockNumberSID = null;
});
promises.push(p);
}
if (self._accountsInfoSID) {
const p = self._api
.unsubscribe(self._accountsInfoSID)
.then(() => {
self._accountsInfoSID = null;
});
promises.push(p);
}
// Unsubscribe without adding the promises
// to the result, since it would have to wait for a
// reconnection to resolve if the Node is disconnected
if (self._tokenreg) {
if (self._tokenregSID) {
const tokenregSID = self._tokenregSID;
self._tokenreg
.unsubscribe(tokenregSID)
.then(() => {
if (self._tokenregSID === tokenregSID) {
self._tokenregSID = null;
}
});
}
if (self._tokenMetaSID) {
const tokenMetaSID = self._tokenMetaSID;
self._tokenreg
.unsubscribe(tokenMetaSID)
.then(() => {
if (self._tokenMetaSID === tokenMetaSID) {
self._tokenMetaSID = null;
}
});
}
}
return Promise.all(promises);
} }
subscribeAccountsInfo () { subscribeAccountsInfo () {
// Don't trigger the balances updates on first call (when the
// subscriptions are setup)
let firstcall = true;
return this._api return this._api
.subscribe('parity_allAccountsInfo', (error, accountsInfo) => { .subscribe('parity_allAccountsInfo', (error, accountsInfo) => {
if (error) { if (error) {
return console.warn('balances::subscribeAccountsInfo', error);
}
if (firstcall) {
firstcall = false;
return; return;
} }
this.fetchAllBalances(); this._store.dispatch(updateTokensFilter());
this.fetchEthBalances();
}) })
.then((accountsInfoSID) => { .then((subId) => {
this._accountsInfoSID = accountsInfoSID; this._apiSubs.push(subId);
}) })
.catch((error) => { .catch((error) => {
console.warn('_subscribeAccountsInfo', error); console.warn('_subscribeAccountsInfo', error);
@ -188,161 +132,57 @@ export default class Balances {
} }
subscribeBlockNumber () { subscribeBlockNumber () {
// Don't trigger the balances updates on first call (when the
// subscriptions are setup)
let firstcall = true;
return this._api return this._api
.subscribe('eth_blockNumber', (error) => { .subscribe('eth_blockNumber', (error, block) => {
if (error) { if (error) {
return console.warn('_subscribeBlockNumber', error); return console.warn('balances::subscribeBlockNumber', error);
}
if (firstcall) {
firstcall = false;
return;
} }
this._store.dispatch(queryTokensFilter()); this._store.dispatch(queryTokensFilter());
return this.fetchAllBalances(); return this.fetchEthBalances();
}) })
.then((blockNumberSID) => { .then((subId) => {
this._blockNumberSID = blockNumberSID; this._apiSubs.push(subId);
}) })
.catch((error) => { .catch((error) => {
console.warn('_subscribeBlockNumber', error); console.warn('_subscribeBlockNumber', error);
}); });
} }
fetchAllBalances (options = {}) { fetchEthBalances (options = {}) {
// If it's a network change, reload the tokens log.debug('fetching eth balances (throttled)...');
// ( and then fetch the tokens balances ) and fetch
// the accounts balances
if (options.changedNetwork) {
this.loadTokens({ skipNotifications: true });
this.loadTokens.flush();
this.fetchBalances({
force: true,
skipNotifications: true
});
return;
}
this.fetchTokensBalances(options);
this.fetchBalances(options);
}
fetchTokensBalances (options) {
const { skipNotifications = false, force = false } = options;
this.throttledTokensFetch(skipNotifications);
if (force) {
this.throttledTokensFetch.flush();
}
}
fetchBalances (options) {
const { skipNotifications = false, force = false } = options;
const { syncing } = this._store.getState().nodeStatus; const { syncing } = this._store.getState().nodeStatus;
if (options.force) {
return this._fetchEthBalances();
}
// If syncing, only retrieve balances once every // If syncing, only retrieve balances once every
// few seconds // few seconds
if (syncing || syncing === null) { if (syncing || syncing === null) {
this.shortThrottledFetch.cancel(); this.shortThrottledFetch.cancel();
this.longThrottledFetch(skipNotifications); return this.longThrottledFetch();
if (force) {
this.longThrottledFetch.flush();
}
return;
} }
this.longThrottledFetch.cancel(); this.longThrottledFetch.cancel();
this.shortThrottledFetch(skipNotifications); return this.shortThrottledFetch();
if (force) {
this.shortThrottledFetch.flush();
}
} }
_fetchBalances (skipNotifications = false) { _fetchEthBalances (skipNotifications = false) {
this._store.dispatch(fetchBalances(null, skipNotifications)); log.debug('fetching eth balances (real)...');
}
_fetchTokens (skipNotifications = false) { const { dispatch, getState } = this._store;
this._store.dispatch(fetchTokensBalances(null, null, skipNotifications));
}
getTokenRegistry () { return fetchBalances(null, skipNotifications)(dispatch, getState);
return Contracts.get().tokenReg.getContract();
}
_loadTokens (options = {}) {
return this
.getTokenRegistry()
.then((tokenreg) => {
this._tokenreg = tokenreg;
this._store.dispatch(loadTokens(options));
return this.attachToTokens(tokenreg);
})
.catch((error) => {
console.warn('balances::loadTokens', error);
});
}
attachToTokens (tokenreg) {
return Promise
.all([
this.attachToTokenMetaChange(tokenreg),
this.attachToNewToken(tokenreg)
]);
}
attachToNewToken (tokenreg) {
if (this._tokenregSID) {
return Promise.resolve();
}
return tokenreg.instance.Registered
.subscribe({
fromBlock: 0,
toBlock: 'latest',
skipInitFetch: true
}, (error, logs) => {
if (error) {
return console.error('balances::attachToNewToken', 'failed to attach to tokenreg Registered', error.toString(), error.stack);
}
this.handleTokensLogs(logs);
})
.then((tokenregSID) => {
this._tokenregSID = tokenregSID;
});
}
attachToTokenMetaChange (tokenreg) {
if (this._tokenMetaSID) {
return Promise.resolve();
}
return tokenreg.instance.MetaChanged
.subscribe({
fromBlock: 0,
toBlock: 'latest',
topics: [ null, padRight(this._api.util.asciiToHex('IMG'), 32) ],
skipInitFetch: true
}, (error, logs) => {
if (error) {
return console.error('balances::attachToTokenMetaChange', 'failed to attach to tokenreg MetaChanged', error.toString(), error.stack);
}
this.handleTokensLogs(logs);
})
.then((tokenMetaSID) => {
this._tokenMetaSID = tokenMetaSID;
});
}
handleTokensLogs (logs) {
const tokenIds = logs.map((log) => log.params.id.value.toNumber());
this._store.dispatch(fetchTokens(tokenIds));
} }
} }

256
js/src/redux/providers/balancesActions.js
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import { uniq, isEqual } from 'lodash'; import { difference, uniq } from 'lodash';
import { push } from 'react-router-redux'; import { push } from 'react-router-redux';
import { notifyTransaction } from '~/util/notifications'; import { notifyTransaction } from '~/util/notifications';
@ -22,11 +22,16 @@ import { ETH_TOKEN, fetchAccountsBalances } from '~/util/tokens';
import { LOG_KEYS, getLogger } from '~/config'; import { LOG_KEYS, getLogger } from '~/config';
import { sha3 } from '~/api/util/sha3'; import { sha3 } from '~/api/util/sha3';
import { fetchTokens } from './tokensActions';
const TRANSFER_SIGNATURE = sha3('Transfer(address,address,uint256)'); const TRANSFER_SIGNATURE = sha3('Transfer(address,address,uint256)');
const log = getLogger(LOG_KEYS.Balances); const log = getLogger(LOG_KEYS.Balances);
let tokensFilter = {}; let tokensFilter = {
tokenAddresses: [],
addresses: []
};
function _setBalances (balances) { function _setBalances (balances) {
return { return {
@ -63,13 +68,10 @@ function setBalances (updates, skipNotifications = false) {
dispatch(notifyBalanceChange(who, prevTokenValue, nextTokenValue, token)); dispatch(notifyBalanceChange(who, prevTokenValue, nextTokenValue, token));
} }
// Add the token if it's native ETH or if it has a value nextBalances[who] = {
if (token.native || nextTokenValue.gt(0)) { ...(nextBalances[who] || {}),
nextBalances[who] = { [tokenId]: nextTokenValue
...(nextBalances[who] || {}), };
[tokenId]: nextTokenValue
};
}
}); });
}); });
@ -100,41 +102,92 @@ function notifyBalanceChange (who, fromValue, toValue, token) {
} }
// TODO: fetch txCount when needed // TODO: fetch txCount when needed
export function fetchBalances (_addresses, skipNotifications = false) { export function fetchBalances (addresses, skipNotifications = false) {
return fetchTokensBalances(_addresses, [ ETH_TOKEN ], skipNotifications); return (dispatch, getState) => {
const { personal } = getState();
const { visibleAccounts, accounts } = personal;
const addressesToFetch = addresses || uniq(visibleAccounts.concat(Object.keys(accounts)));
const updates = addressesToFetch.reduce((updates, who) => {
updates[who] = [ ETH_TOKEN.id ];
return updates;
}, {});
return fetchTokensBalances(updates, skipNotifications)(dispatch, getState);
};
} }
export function updateTokensFilter (_addresses, _tokens, options = {}) { export function updateTokensFilter (options = {}) {
return (dispatch, getState) => { return (dispatch, getState) => {
const { api, personal, tokens } = getState(); const { api, personal, tokens } = getState();
const { visibleAccounts, accounts } = personal; const { visibleAccounts, accounts } = personal;
const addressesToFetch = uniq(visibleAccounts.concat(Object.keys(accounts))); const addresses = uniq(visibleAccounts.concat(Object.keys(accounts)));
const addresses = uniq(_addresses || addressesToFetch || []).sort(); const tokensToUpdate = Object.values(tokens);
const tokensAddressMap = Object.values(tokens).reduce((map, token) => {
map[token.address] = token;
return map;
}, {});
const tokensToUpdate = _tokens || Object.values(tokens);
const tokenAddresses = tokensToUpdate const tokenAddresses = tokensToUpdate
.map((t) => t.address) .map((t) => t.address)
.filter((address) => address) .filter((address) => address && !/^(0x)?0*$/.test(address));
.sort();
// Token Addresses that are not in the current filter
const newTokenAddresses = difference(tokenAddresses, tokensFilter.tokenAddresses);
// Addresses that are not in the current filter (omit those
// that the filter includes)
const newAddresses = difference(addresses, tokensFilter.addresses);
if (tokensFilter.filterFromId || tokensFilter.filterToId) { if (tokensFilter.filterFromId || tokensFilter.filterToId) {
// Has the tokens addresses changed (eg. a network change)
const sameTokens = isEqual(tokenAddresses, tokensFilter.tokenAddresses);
// Addresses that are not in the current filter (omit those
// that the filter includes)
const newAddresses = addresses.filter((address) => !tokensFilter.addresses.includes(address));
// If no new addresses and the same tokens, don't change the filter // If no new addresses and the same tokens, don't change the filter
if (sameTokens && newAddresses.length === 0) { if (newTokenAddresses.length === 0 && newAddresses.length === 0) {
log.debug('no need to update token filter', addresses, tokenAddresses, tokensFilter); log.debug('no need to update token filter', addresses, tokenAddresses, tokensFilter);
return queryTokensFilter(tokensFilter)(dispatch, getState); return;
} }
} }
log.debug('updating the token filter', addresses, tokenAddresses);
const promises = []; const promises = [];
const updates = {};
const allTokenIds = tokensToUpdate.map((token) => token.id);
const newTokenIds = newTokenAddresses.map((address) => tokensAddressMap[address].id);
newAddresses.forEach((newAddress) => {
updates[newAddress] = allTokenIds;
});
difference(addresses, newAddresses).forEach((oldAddress) => {
updates[oldAddress] = newTokenIds;
});
log.debug('updating the token filter', addresses, tokenAddresses);
const topicsFrom = [ TRANSFER_SIGNATURE, addresses, null ];
const topicsTo = [ TRANSFER_SIGNATURE, null, addresses ];
const filterOptions = {
fromBlock: 'latest',
toBlock: 'latest',
address: tokenAddresses
};
const optionsFrom = {
...filterOptions,
topics: topicsFrom
};
const optionsTo = {
...filterOptions,
topics: topicsTo
};
promises.push(
api.eth.newFilter(optionsFrom),
api.eth.newFilter(optionsTo)
);
if (tokensFilter.filterFromId) { if (tokensFilter.filterFromId) {
promises.push(api.eth.uninstallFilter(tokensFilter.filterFromId)); promises.push(api.eth.uninstallFilter(tokensFilter.filterFromId));
@ -144,48 +197,16 @@ export function updateTokensFilter (_addresses, _tokens, options = {}) {
promises.push(api.eth.uninstallFilter(tokensFilter.filterToId)); promises.push(api.eth.uninstallFilter(tokensFilter.filterToId));
} }
Promise return Promise.all(promises)
.all([
api.eth.blockNumber()
].concat(promises))
.then(([ block ]) => {
const topicsFrom = [ TRANSFER_SIGNATURE, addresses, null ];
const topicsTo = [ TRANSFER_SIGNATURE, null, addresses ];
const filterOptions = {
fromBlock: block,
toBlock: 'pending',
address: tokenAddresses
};
const optionsFrom = {
...filterOptions,
topics: topicsFrom
};
const optionsTo = {
...filterOptions,
topics: topicsTo
};
const newFilters = Promise.all([
api.eth.newFilter(optionsFrom),
api.eth.newFilter(optionsTo)
]);
return newFilters;
})
.then(([ filterFromId, filterToId ]) => { .then(([ filterFromId, filterToId ]) => {
const nextTokensFilter = { const nextTokensFilter = {
filterFromId, filterToId, filterFromId, filterToId,
addresses, tokenAddresses addresses, tokenAddresses
}; };
const { skipNotifications } = options;
tokensFilter = nextTokensFilter; tokensFilter = nextTokensFilter;
fetchTokensBalances(addresses, tokensToUpdate, skipNotifications)(dispatch, getState);
}) })
.then(() => fetchTokensBalances(updates)(dispatch, getState))
.catch((error) => { .catch((error) => {
console.warn('balances::updateTokensFilter', error); console.warn('balances::updateTokensFilter', error);
}); });
@ -194,12 +215,7 @@ export function updateTokensFilter (_addresses, _tokens, options = {}) {
export function queryTokensFilter () { export function queryTokensFilter () {
return (dispatch, getState) => { return (dispatch, getState) => {
const { api, personal, tokens } = getState(); const { api } = getState();
const { visibleAccounts, accounts } = personal;
const allAddresses = visibleAccounts.concat(Object.keys(accounts));
const addressesToFetch = uniq(allAddresses);
const lcAddresses = addressesToFetch.map((a) => a.toLowerCase());
Promise Promise
.all([ .all([
@ -207,67 +223,107 @@ export function queryTokensFilter () {
api.eth.getFilterChanges(tokensFilter.filterToId) api.eth.getFilterChanges(tokensFilter.filterToId)
]) ])
.then(([ logsFrom, logsTo ]) => { .then(([ logsFrom, logsTo ]) => {
const addresses = []; const logs = [].concat(logsFrom, logsTo);
const tokenAddresses = [];
const logs = logsFrom.concat(logsTo);
if (logs.length > 0) { if (logs.length === 0) {
return;
} else {
log.debug('got tokens filter logs', logs); log.debug('got tokens filter logs', logs);
} }
const { personal, tokens } = getState();
const { visibleAccounts, accounts } = personal;
const addressesToFetch = uniq(visibleAccounts.concat(Object.keys(accounts)));
const lcAddresses = addressesToFetch.map((a) => a.toLowerCase());
const lcTokensMap = Object.values(tokens).reduce((map, token) => {
map[token.address.toLowerCase()] = token;
return map;
});
// The keys are the account addresses,
// and the value is an Array of the tokens addresses
// to update
const updates = {};
logs logs
.forEach((log) => { .forEach((log, index) => {
const tokenAddress = log.address; const tokenAddress = log.address.toLowerCase();
const token = lcTokensMap[tokenAddress];
const fromAddress = '0x' + log.topics[1].slice(-40); // logs = [ ...logsFrom, ...logsTo ]
const toAddress = '0x' + log.topics[2].slice(-40); const topicIdx = index < logsFrom.length ? 1 : 2;
const address = ('0x' + log.topics[topicIdx].slice(-40)).toLowerCase();
const addressIndex = lcAddresses.indexOf(address);
const fromAddressIndex = lcAddresses.indexOf(fromAddress); if (addressIndex > -1) {
const toAddressIndex = lcAddresses.indexOf(toAddress); const who = addressesToFetch[addressIndex];
if (fromAddressIndex > -1) { updates[who] = [].concat(updates[who] || [], token.id);
addresses.push(addressesToFetch[fromAddressIndex]);
} }
if (toAddressIndex > -1) {
addresses.push(addressesToFetch[toAddressIndex]);
}
tokenAddresses.push(tokenAddress);
}); });
if (addresses.length === 0) { // No accounts to update
if (Object.keys(updates).length === 0) {
return; return;
} }
const tokensToUpdate = Object.values(tokens) Object.keys(updates).forEach((who) => {
.filter((t) => tokenAddresses.includes(t.address)); // Keep non-empty token addresses
updates[who] = uniq(updates[who]);
});
fetchTokensBalances(uniq(addresses), tokensToUpdate)(dispatch, getState); fetchTokensBalances(updates)(dispatch, getState);
}); });
}; };
} }
export function fetchTokensBalances (_addresses = null, _tokens = null, skipNotifications = false) { export function fetchTokensBalances (updates, skipNotifications = false) {
return (dispatch, getState) => { return (dispatch, getState) => {
const { api, personal, tokens } = getState(); const { api, personal, tokens } = getState();
const { visibleAccounts, accounts } = personal;
const allTokens = Object.values(tokens); const allTokens = Object.values(tokens);
const addressesToFetch = uniq(visibleAccounts.concat(Object.keys(accounts))); if (!updates) {
const addresses = _addresses || addressesToFetch; const { visibleAccounts, accounts } = personal;
const tokensToUpdate = _tokens || allTokens; const addressesToFetch = uniq(visibleAccounts.concat(Object.keys(accounts)));
if (addresses.length === 0) { updates = addressesToFetch.reduce((updates, who) => {
return Promise.resolve(); updates[who] = allTokens.map((token) => token.id);
return updates;
}, {});
} }
const updates = addresses.reduce((updates, who) => { let start = Date.now();
updates[who] = tokensToUpdate.map((token) => token.id);
return updates;
}, {});
return fetchAccountsBalances(api, allTokens, updates) return fetchAccountsBalances(api, allTokens, updates)
.then((balances) => {
log.debug('got tokens balances', balances, updates, `(took ${Date.now() - start}ms)`);
// Tokens info might not be fetched yet (to not load
// tokens we don't care about)
const tokenIdsToFetch = Object.values(balances)
.reduce((tokenIds, balance) => {
const nextTokenIds = Object.keys(balance)
.filter((tokenId) => balance[tokenId].gt(0));
return tokenIds.concat(nextTokenIds);
}, []);
const tokenIndexesToFetch = uniq(tokenIdsToFetch)
.filter((tokenId) => tokens[tokenId] && tokens[tokenId].index && !tokens[tokenId].fetched)
.map((tokenId) => tokens[tokenId].index);
if (tokenIndexesToFetch.length === 0) {
return balances;
}
start = Date.now();
return fetchTokens(tokenIndexesToFetch)(dispatch, getState)
.then(() => log.debug('token indexes fetched', tokenIndexesToFetch, `(took ${Date.now() - start}ms)`))
.then(() => balances);
})
.then((balances) => { .then((balances) => {
dispatch(setBalances(balances, skipNotifications)); dispatch(setBalances(balances, skipNotifications));
}) })

2
js/src/redux/providers/certifications/middleware.js
View File

@ -38,7 +38,7 @@ const updatableFilter = (api, onFilter) => {
filter = (filter || Promise.resolve()) filter = (filter || Promise.resolve())
.then(() => api.eth.newFilter({ .then(() => api.eth.newFilter({
fromBlock: 0, fromBlock: 'latest',
toBlock: 'latest', toBlock: 'latest',
address, address,
topics topics

1
js/src/redux/providers/index.js
View File

@ -18,6 +18,7 @@ export Balances from './balances';
export Personal from './personal'; export Personal from './personal';
export Signer from './signer'; export Signer from './signer';
export Status from './status'; export Status from './status';
export Tokens from './tokens';
export apiReducer from './apiReducer'; export apiReducer from './apiReducer';
export balancesReducer from './balancesReducer'; export balancesReducer from './balancesReducer';

114
js/src/redux/providers/personal.js
View File

@ -16,37 +16,117 @@
import { personalAccountsInfo } from './personalActions'; import { personalAccountsInfo } from './personalActions';
let instance;
export default class Personal { export default class Personal {
constructor (store, api) { constructor (store, api) {
this._api = api; this._api = api;
this._store = store; this._store = store;
} }
start () { static get (store) {
this._removeDeleted(); if (!instance && store) {
this._subscribeAccountsInfo(); return Personal.init(store);
}
return instance;
}
static init (store) {
const { api } = store.getState();
if (!instance) {
instance = new Personal(store, api);
} else if (!instance) {
throw new Error('The Personal Provider has not been initialized yet');
}
return instance;
}
static start () {
const self = instance;
return Personal.stop()
.then(() => Promise.all([
self._removeDeleted(),
self._subscribeAccountsInfo()
]));
}
static stop () {
if (!instance) {
return Promise.resolve();
}
const self = instance;
return self._unsubscribeAccountsInfo();
} }
_subscribeAccountsInfo () { _subscribeAccountsInfo () {
this._api let resolved = false;
.subscribe('parity_allAccountsInfo', (error, accountsInfo) => {
if (error) {
console.error('parity_allAccountsInfo', error);
return;
}
// Add the address to each accounts // The Promise will be resolved when the first
Object.keys(accountsInfo) // accounts are loaded
.forEach((address) => { return new Promise((resolve, reject) => {
accountsInfo[address].address = address; this._api
}); .subscribe('parity_allAccountsInfo', (error, accountsInfo) => {
if (error) {
console.error('parity_allAccountsInfo', error);
this._store.dispatch(personalAccountsInfo(accountsInfo)); if (!resolved) {
}); resolved = true;
return reject(error);
}
return;
}
// Add the address to each accounts
Object.keys(accountsInfo)
.forEach((address) => {
accountsInfo[address].address = address;
});
const { dispatch, getState } = this._store;
personalAccountsInfo(accountsInfo)(dispatch, getState)
.then(() => {
if (!resolved) {
resolved = true;
return resolve();
}
})
.catch((error) => {
if (!resolved) {
resolved = true;
return reject(error);
}
});
})
.then((subId) => {
this.subscriptionId = subId;
});
});
}
_unsubscribeAccountsInfo () {
// Unsubscribe to any previous
// subscriptions
if (this.subscriptionId) {
return this._api
.unsubscribe(this.subscriptionId)
.then(() => {
this.subscriptionId = null;
});
}
return Promise.resolve();
} }
_removeDeleted () { _removeDeleted () {
this._api.parity return this._api.parity
.allAccountsInfo() .allAccountsInfo()
.then((accountsInfo) => { .then((accountsInfo) => {
return Promise.all( return Promise.all(

24
js/src/redux/providers/personalActions.js
View File

@ -17,6 +17,7 @@
import { isEqual, intersection } from 'lodash'; import { isEqual, intersection } from 'lodash';
import BalancesProvider from './balances'; import BalancesProvider from './balances';
import TokensProvider from './tokens';
import { updateTokensFilter } from './balancesActions'; import { updateTokensFilter } from './balancesActions';
import { attachWallets } from './walletActions'; import { attachWallets } from './walletActions';
@ -70,7 +71,7 @@ export function personalAccountsInfo (accountsInfo) {
return WalletsUtils.fetchOwners(walletContract.at(wallet.address)); return WalletsUtils.fetchOwners(walletContract.at(wallet.address));
}); });
Promise return Promise
.all(_fetchOwners) .all(_fetchOwners)
.then((walletsOwners) => { .then((walletsOwners) => {
return Object return Object
@ -135,10 +136,6 @@ export function personalAccountsInfo (accountsInfo) {
hardware hardware
})); }));
dispatch(attachWallets(wallets)); dispatch(attachWallets(wallets));
BalancesProvider.get().fetchAllBalances({
force: true
});
}) })
.catch((error) => { .catch((error) => {
console.warn('personalAccountsInfo', error); console.warn('personalAccountsInfo', error);
@ -176,12 +173,17 @@ export function setVisibleAccounts (addresses) {
return; return;
} }
// Update the Tokens filter to take into account the new const promises = [];
// addresses
dispatch(updateTokensFilter());
BalancesProvider.get().fetchBalances({ // Update the Tokens filter to take into account the new
force: true // addresses if it is not loading (it fetches the
}); // balances automatically after loading)
if (!TokensProvider.get().loading) {
promises.push(updateTokensFilter()(dispatch, getState));
}
promises.push(BalancesProvider.get().fetchEthBalances({ force: true }));
return Promise.all(promises);
}; };
} }

13
js/src/redux/providers/requestsActions.js
View File

@ -23,12 +23,19 @@ import SavedRequests from '~/views/Application/Requests/savedRequests';
const savedRequests = new SavedRequests(); const savedRequests = new SavedRequests();
export const init = (api) => (dispatch) => { export const init = (api) => (dispatch) => {
api.subscribe('parity_postTransaction', (error, request) => { api.subscribe('signer_requestsToConfirm', (error, pending) => {
if (error) { if (error) {
return console.error(error); return;
} }
dispatch(watchRequest(request)); const requests = pending
.filter((p) => p.payload && p.payload.sendTransaction)
.map((p) => ({
requestId: '0x' + p.id.toString(16),
transaction: p.payload.sendTransaction
}));
requests.forEach((request) => dispatch(watchRequest(request)));
}); });
api.once('connected', () => { api.once('connected', () => {

6
js/src/redux/providers/signerMiddleware.spec.js
View File

@ -48,6 +48,12 @@ let store;
function createApi () { function createApi () {
api = { api = {
transport: {
on: sinon.stub()
},
pubsub: {
subscribeAndGetResult: sinon.stub().returns(Promise.reject(new Error('not connected')))
},
net: { net: {
version: sinon.stub().resolves('2') version: sinon.stub().resolves('2')
}, },

250
js/src/redux/providers/status.js
View File

@ -19,7 +19,6 @@ import { isEqual } from 'lodash';
import { LOG_KEYS, getLogger } from '~/config'; import { LOG_KEYS, getLogger } from '~/config';
import UpgradeStore from '~/modals/UpgradeParity/store'; import UpgradeStore from '~/modals/UpgradeParity/store';
import BalancesProvider from './balances';
import { statusBlockNumber, statusCollection } from './statusActions'; import { statusBlockNumber, statusCollection } from './statusActions';
const log = getLogger(LOG_KEYS.Signer); const log = getLogger(LOG_KEYS.Signer);
@ -31,7 +30,6 @@ const STATUS_BAD = 'bad';
export default class Status { export default class Status {
_apiStatus = {}; _apiStatus = {};
_status = {};
_longStatus = {}; _longStatus = {};
_minerSettings = {}; _minerSettings = {};
_timeoutIds = {}; _timeoutIds = {};
@ -43,19 +41,12 @@ export default class Status {
this._store = store; this._store = store;
this._upgradeStore = UpgradeStore.get(api); this._upgradeStore = UpgradeStore.get(api);
// On connecting, stop all subscriptions
api.on('connecting', this.stop, this);
// On connected, start the subscriptions
api.on('connected', this.start, this);
// On disconnected, stop all subscriptions
api.on('disconnected', this.stop, this);
this.updateApiStatus(); this.updateApiStatus();
} }
static instantiate (store, api) { static init (store) {
const { api } = store.getState();
if (!instance) { if (!instance) {
instance = new Status(store, api); instance = new Status(store, api);
} }
@ -63,59 +54,61 @@ export default class Status {
return instance; return instance;
} }
static get () { static get (store) {
if (!instance) { if (!instance && store) {
return Status.init(store);
} else if (!instance) {
throw new Error('The Status Provider has not been initialized yet'); throw new Error('The Status Provider has not been initialized yet');
} }
return instance; return instance;
} }
start () { static start () {
const self = instance;
log.debug('status::start'); log.debug('status::start');
Promise const promises = [
.all([ self._subscribeBlockNumber(),
this._subscribeBlockNumber(), self._subscribeNetPeers(),
self._subscribeEthSyncing(),
self._subscribeNodeHealth(),
self._pollLongStatus(),
self._pollApiStatus()
];
this._pollLongStatus(), return Status.stop()
this._pollStatus() .then(() => Promise.all(promises));
])
.then(() => {
return BalancesProvider.start();
});
} }
stop () { static stop () {
log.debug('status::stop'); if (!instance) {
return Promise.resolve();
const promises = [];
if (this._blockNumberSubscriptionId) {
const promise = this._api
.unsubscribe(this._blockNumberSubscriptionId)
.then(() => {
this._blockNumberSubscriptionId = null;
});
promises.push(promise);
} }
Object.values(this._timeoutIds).forEach((timeoutId) => { const self = instance;
clearTimeout(timeoutId);
});
const promise = BalancesProvider.stop(); log.debug('status::stop');
promises.push(promise); self._clearTimeouts();
return Promise.all(promises) return self._unsubscribeBlockNumber()
.then(() => true)
.catch((error) => { .catch((error) => {
console.error('status::stop', error); console.error('status::stop', error);
return true;
}) })
.then(() => this.updateApiStatus()); .then(() => self.updateApiStatus());
}
getApiStatus = () => {
const { isConnected, isConnecting, needsToken, secureToken } = this._api;
return {
isConnected,
isConnecting,
needsToken,
secureToken
};
} }
updateApiStatus () { updateApiStatus () {
@ -129,6 +122,33 @@ export default class Status {
} }
} }
_clearTimeouts () {
Object.values(this._timeoutIds).forEach((timeoutId) => {
clearTimeout(timeoutId);
});
}
_overallStatus (health) {
const allWithTime = [health.peers, health.sync, health.time].filter(x => x);
const all = [health.peers, health.sync].filter(x => x);
const statuses = all.map(x => x.status);
const bad = statuses.find(x => x === STATUS_BAD);
const needsAttention = statuses.find(x => x === STATUS_WARN);
const message = allWithTime.map(x => x.message).filter(x => x);
if (all.length) {
return {
status: bad || needsAttention || STATUS_OK,
message
};
}
return {
status: STATUS_BAD,
message: ['Unable to fetch node health.']
};
}
_subscribeBlockNumber = () => { _subscribeBlockNumber = () => {
return this._api return this._api
.subscribe('eth_blockNumber', (error, blockNumber) => { .subscribe('eth_blockNumber', (error, blockNumber) => {
@ -159,99 +179,74 @@ export default class Status {
}); });
} }
_pollTraceMode = () => { _subscribeEthSyncing = () => {
return this._api.trace return this._api.pubsub
.block() .eth
.then(blockTraces => { .syncing((error, syncing) => {
// Assumes not in Trace Mode if no transactions if (error) {
// in latest block... return;
return blockTraces.length > 0; }
})
.catch(() => false); this._store.dispatch(statusCollection({ syncing }));
});
} }
getApiStatus = () => { _subscribeNetPeers = () => {
const { isConnected, isConnecting, needsToken, secureToken } = this._api; return this._api.pubsub
.parity
return { .netPeers((error, netPeers) => {
isConnected, if (error || !netPeers) {
isConnecting, return;
needsToken, }
secureToken this._store.dispatch(statusCollection({ netPeers }));
}; });
} }
_pollStatus = () => { _subscribeNodeHealth = () => {
const nextTimeout = (timeout = 1000) => { return this._api.pubsub
if (this._timeoutIds.status) { .parity
clearTimeout(this._timeoutIds.status); .nodeHealth((error, health) => {
} if (error || !health) {
return;
this._timeoutIds.status = setTimeout(() => this._pollStatus(), timeout); }
};
this.updateApiStatus();
if (!this._api.isConnected) {
nextTimeout(250);
return Promise.resolve();
}
const statusPromises = [
this._api.eth.syncing(),
this._api.parity.netPeers(),
this._fetchHealth()
];
return Promise
.all(statusPromises)
.then(([ syncing, netPeers, health ]) => {
const status = { netPeers, syncing, health };
health.overall = this._overallStatus(health); health.overall = this._overallStatus(health);
health.peers = health.peers || {}; health.peers = health.peers || {};
health.sync = health.sync || {}; health.sync = health.sync || {};
health.time = health.time || {}; health.time = health.time || {};
if (!isEqual(status, this._status)) { this._store.dispatch(statusCollection({ health }));
this._store.dispatch(statusCollection(status));
this._status = status;
}
})
.catch((error) => {
console.error('_pollStatus', error);
})
.then(() => {
nextTimeout();
}); });
} }
_overallStatus = (health) => { _unsubscribeBlockNumber () {
const allWithTime = [health.peers, health.sync, health.time].filter(x => x); if (this._blockNumberSubscriptionId) {
const all = [health.peers, health.sync].filter(x => x); return this._api
const statuses = all.map(x => x.status); .unsubscribe(this._blockNumberSubscriptionId)
const bad = statuses.find(x => x === STATUS_BAD); .then(() => {
const needsAttention = statuses.find(x => x === STATUS_WARN); this._blockNumberSubscriptionId = null;
const message = allWithTime.map(x => x.message).filter(x => x); });
if (all.length) {
return {
status: bad || needsAttention || STATUS_OK,
message
};
} }
return { return Promise.resolve();
status: STATUS_BAD,
message: ['Unable to fetch node health.']
};
} }
_fetchHealth = () => { _pollApiStatus = () => {
// Support Parity-Extension. const nextTimeout = (timeout = 1000) => {
const uiUrl = this._api.transport.uiUrlWithProtocol || ''; if (this._timeoutIds.status) {
clearTimeout(this._timeoutIds.status);
}
return fetch(`${uiUrl}/api/health`).then(res => res.json()); this._timeoutIds.status = setTimeout(() => this._pollApiStatus(), timeout);
};
this.updateApiStatus();
if (!this._api.isConnected) {
nextTimeout(250);
} else {
nextTimeout();
}
} }
/** /**
@ -266,7 +261,7 @@ export default class Status {
} }
const { nodeKindFull } = this._store.getState().nodeStatus; const { nodeKindFull } = this._store.getState().nodeStatus;
const defaultTimeout = (nodeKindFull === false ? 240 : 30) * 1000; const defaultTimeout = (nodeKindFull === false ? 240 : 60) * 1000;
const nextTimeout = (timeout = defaultTimeout) => { const nextTimeout = (timeout = defaultTimeout) => {
if (this._timeoutIds.longStatus) { if (this._timeoutIds.longStatus) {
@ -278,7 +273,6 @@ export default class Status {
const statusPromises = [ const statusPromises = [
this._api.parity.nodeKind(), this._api.parity.nodeKind(),
this._api.parity.netPeers(),
this._api.web3.clientVersion(), this._api.web3.clientVersion(),
this._api.net.version(), this._api.net.version(),
this._api.parity.netChain() this._api.parity.netChain()
@ -290,7 +284,7 @@ export default class Status {
return Promise return Promise
.all(statusPromises) .all(statusPromises)
.then(([nodeKind, netPeers, clientVersion, netVersion, netChain]) => { .then(([nodeKind, clientVersion, netVersion, netChain]) => {
const isTest = [ const isTest = [
'2', // morden '2', // morden
'3', // ropsten, '3', // ropsten,
@ -305,7 +299,6 @@ export default class Status {
const longStatus = { const longStatus = {
nodeKind, nodeKind,
nodeKindFull, nodeKindFull,
netPeers,
clientVersion, clientVersion,
netChain, netChain,
netVersion, netVersion,
@ -317,11 +310,12 @@ export default class Status {
this._longStatus = longStatus; this._longStatus = longStatus;
} }
}) })
.then(() => {
nextTimeout();
})
.catch((error) => { .catch((error) => {
console.error('_pollLongStatus', error); console.error('_pollLongStatus', error);
}) nextTimeout(30000);
.then(() => {
nextTimeout(60000);
}); });
} }
} }

161
js/src/redux/providers/tokens.js Normal file
View File

@ -0,0 +1,161 @@
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
// This file is part of Parity.
// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import { updateTokensFilter } from './balancesActions';
import { loadTokens, fetchTokens } from './tokensActions';
import { padRight } from '~/api/util/format';
import Contracts from '~/contracts';
let instance = null;
export default class Tokens {
constructor (store, api) {
this._api = api;
this._store = store;
this._tokenreg = null;
this._tokenregSubs = [];
this._loading = false;
}
get loading () {
return this._loading;
}
static get (store) {
if (!instance && store) {
return Tokens.init(store);
} else if (!instance) {
throw new Error('The Tokens Provider has not been initialized yet');
}
return instance;
}
static init (store) {
const { api } = store.getState();
if (!instance) {
instance = new Tokens(store, api);
}
return instance;
}
static start () {
if (!instance) {
return Promise.reject('Tokens Provider has not been initiated yet');
}
const self = instance;
self._loading = true;
// Unsubscribe from previous subscriptions
return Tokens.stop()
.then(() => self.loadTokens())
.then(() => {
self._loading = false;
});
}
static stop () {
if (!instance) {
return Promise.resolve();
}
const self = instance;
// Unsubscribe without adding the promises
// to the result, since it would have to wait for a
// reconnection to resolve if the Node is disconnected
if (self._tokenreg) {
const tokenregPromises = self._tokenregSubs
.map((tokenregSID) => self._tokenreg.unsubscribe(tokenregSID));
Promise.all(tokenregPromises)
.then(() => {
self._tokenregSubs = [];
});
}
return Promise.resolve();
}
attachToTokensEvents (tokenreg) {
const metaTopics = [ null, padRight(this._api.util.asciiToHex('IMG'), 32) ];
return Promise
.all([
this._attachToTokenregEvents(tokenreg, 'Registered'),
this._attachToTokenregEvents(tokenreg, 'MetaChanged', metaTopics)
]);
}
getTokenRegistry () {
return Contracts.get().tokenReg.getContract();
}
loadTokens (options = {}) {
const { dispatch, getState } = this._store;
return this
.getTokenRegistry()
.then((tokenreg) => {
this._tokenreg = tokenreg;
return loadTokens(options)(dispatch, getState);
})
.then(() => updateTokensFilter()(dispatch, getState))
.then(() => this.attachToTokensEvents(this._tokenreg))
.catch((error) => {
console.warn('balances::loadTokens', error);
});
}
_attachToTokenregEvents (tokenreg, event, topics = []) {
if (this._tokenregSID) {
return Promise.resolve();
}
return tokenreg.instance[event]
.subscribe({
fromBlock: 'latest',
toBlock: 'latest',
topics: topics,
skipInitFetch: true
}, (error, logs) => {
if (error) {
return console.error('balances::attachToNewToken', 'failed to attach to tokenreg Registered', error.toString(), error.stack);
}
this._handleTokensLogs(logs);
})
.then((tokenregSID) => {
this._tokenregSubs.push(tokenregSID);
});
}
_handleTokensLogs (logs) {
const { dispatch, getState } = this._store;
const tokenIds = logs.map((log) => log.params.id.value.toNumber());
return fetchTokens(tokenIds)(dispatch, getState)
.then(() => updateTokensFilter()(dispatch, getState));
}
}

212
js/src/redux/providers/tokensActions.js
View File

@ -14,56 +14,225 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import { uniq } from 'lodash'; import { chunk, uniq } from 'lodash';
import store from 'store';
import Contracts from '~/contracts'; import Contracts from '~/contracts';
import { LOG_KEYS, getLogger } from '~/config'; import { LOG_KEYS, getLogger } from '~/config';
import { fetchTokenIds, fetchTokenInfo } from '~/util/tokens'; import { fetchTokenIds, fetchTokensBasics, fetchTokensInfo, fetchTokensImages } from '~/util/tokens';
import { updateTokensFilter } from './balancesActions';
import { setAddressImage } from './imagesActions'; import { setAddressImage } from './imagesActions';
const TOKENS_CACHE_LS_KEY_PREFIX = '_parity::tokens::';
const log = getLogger(LOG_KEYS.Balances); const log = getLogger(LOG_KEYS.Balances);
export function setTokens (tokens) { function _setTokens (tokens) {
return { return {
type: 'setTokens', type: 'setTokens',
tokens tokens
}; };
} }
export function setTokens (nextTokens) {
return (dispatch, getState) => {
const { nodeStatus, tokens: prevTokens } = getState();
const { tokenReg } = Contracts.get();
const tokens = {
...prevTokens,
...nextTokens
};
return tokenReg.getContract()
.then((tokenRegContract) => {
const lsKey = TOKENS_CACHE_LS_KEY_PREFIX + nodeStatus.netChain;
store.set(lsKey, {
tokenreg: tokenRegContract.address,
tokens
});
})
.catch((error) => {
console.error(error);
})
.then(() => {
dispatch(_setTokens(nextTokens));
});
};
}
function loadCachedTokens (tokenRegContract) {
return (dispatch, getState) => {
const { nodeStatus } = getState();
const lsKey = TOKENS_CACHE_LS_KEY_PREFIX + nodeStatus.netChain;
const cached = store.get(lsKey);
if (cached) {
// Check if we have data from the right contract
if (cached.tokenreg === tokenRegContract.address && cached.tokens) {
log.debug('found cached tokens', cached.tokens);
dispatch(_setTokens(cached.tokens));
// Fetch all the tokens images on load
// (it's the only thing that might have changed)
const tokenIndexes = Object.values(cached.tokens)
.filter((t) => t && t.fetched)
.map((t) => t.index);
fetchTokensData(tokenRegContract, tokenIndexes)(dispatch, getState);
} else {
store.remove(lsKey);
}
}
};
}
export function loadTokens (options = {}) { export function loadTokens (options = {}) {
log.debug('loading tokens', Object.keys(options).length ? options : ''); log.debug('loading tokens', Object.keys(options).length ? options : '');
return (dispatch, getState) => { return (dispatch, getState) => {
const { tokenReg } = Contracts.get(); const { tokenReg } = Contracts.get();
tokenReg.getInstance() return tokenReg.getContract()
.then((tokenRegInstance) => { .then((tokenRegContract) => {
return fetchTokenIds(tokenRegInstance); loadCachedTokens(tokenRegContract)(dispatch, getState);
return fetchTokenIds(tokenRegContract.instance);
}) })
.then((tokenIndexes) => dispatch(fetchTokens(tokenIndexes, options))) .then((tokenIndexes) => loadTokensBasics(tokenIndexes, options)(dispatch, getState))
.catch((error) => { .catch((error) => {
console.warn('tokens::loadTokens', error); console.warn('tokens::loadTokens', error);
}); });
}; };
} }
export function fetchTokens (_tokenIndexes, options = {}) { export function loadTokensBasics (_tokenIndexes, options) {
const tokenIndexes = uniq(_tokenIndexes || []); const limit = 64;
return (dispatch, getState) => {
const { api, tokens } = getState();
const { tokenReg } = Contracts.get();
const nextTokens = {};
const prevTokensIndexes = Object.values(tokens).map((t) => t.index);
// Only fetch tokens we don't have yet
const tokenIndexes = _tokenIndexes.filter((tokenIndex) => {
return !prevTokensIndexes.includes(tokenIndex);
});
const count = tokenIndexes.length;
log.debug('loading basic tokens', tokenIndexes);
if (count === 0) {
return Promise.resolve();
}
return tokenReg.getContract()
.then((tokenRegContract) => {
let promise = Promise.resolve();
for (let start = 0; start < count; start += limit) {
promise = promise
.then(() => fetchTokensBasics(api, tokenRegContract, start, limit))
.then((results) => {
results
.forEach((token) => {
nextTokens[token.id] = token;
});
});
}
return promise;
})
.then(() => {
log.debug('fetched tokens basic info', nextTokens);
dispatch(setTokens(nextTokens));
})
.catch((error) => {
console.warn('tokens::fetchTokens', error);
});
};
}
export function fetchTokens (_tokenIndexes, options = {}) {
const tokenIndexes = uniq(_tokenIndexes || []);
const tokenChunks = chunk(tokenIndexes, 64);
return (dispatch, getState) => { return (dispatch, getState) => {
const { api, images } = getState();
const { tokenReg } = Contracts.get(); const { tokenReg } = Contracts.get();
return tokenReg.getInstance() return tokenReg.getContract()
.then((tokenRegInstance) => { .then((tokenRegContract) => {
const promises = tokenIndexes.map((id) => fetchTokenInfo(api, tokenRegInstance, id)); let promise = Promise.resolve();
return Promise.all(promises); tokenChunks.forEach((tokenChunk) => {
promise = promise
.then(() => fetchTokensData(tokenRegContract, tokenChunk)(dispatch, getState));
});
return promise;
}) })
.then((results) => { .then(() => {
const tokens = results log.debug('fetched token', getState().tokens);
})
.catch((error) => {
console.warn('tokens::fetchTokens', error);
});
};
}
/**
* Split the given token indexes between those for whom
* we already have some info, and thus just need to fetch
* the image, and those for whom we don't have anything and
* need to fetch all the info.
*/
function fetchTokensData (tokenRegContract, tokenIndexes) {
return (dispatch, getState) => {
const { api, tokens, images } = getState();
const allTokens = Object.values(tokens);
const tokensIndexesMap = allTokens
.reduce((map, token) => {
map[token.index] = token;
return map;
}, {});
const fetchedTokenIndexes = allTokens
.filter((token) => token.fetched)
.map((token) => token.index);
const fullIndexes = [];
const partialIndexes = [];
tokenIndexes.forEach((tokenIndex) => {
if (fetchedTokenIndexes.includes(tokenIndex)) {
partialIndexes.push(tokenIndex);
} else {
fullIndexes.push(tokenIndex);
}
});
log.debug('need to fully fetch', fullIndexes);
log.debug('need to partially fetch', partialIndexes);
const fullPromise = fetchTokensInfo(api, tokenRegContract, fullIndexes);
const partialPromise = fetchTokensImages(api, tokenRegContract, partialIndexes)
.then((imagesResult) => {
return imagesResult.map((image, index) => {
const tokenIndex = partialIndexes[index];
const token = tokensIndexesMap[tokenIndex];
return { ...token, image };
});
});
return Promise.all([ fullPromise, partialPromise ])
.then(([ fullResults, partialResults ]) => {
log.debug('fetched', { fullResults, partialResults });
return [].concat(fullResults, partialResults)
.reduce((tokens, token) => { .reduce((tokens, token) => {
const { id, image, address } = token; const { id, image, address } = token;
@ -75,14 +244,9 @@ export function fetchTokens (_tokenIndexes, options = {}) {
tokens[id] = token; tokens[id] = token;
return tokens; return tokens;
}, {}); }, {});
log.debug('fetched token', tokens);
dispatch(setTokens(tokens));
dispatch(updateTokensFilter(null, null, options));
}) })
.catch((error) => { .then((tokens) => {
console.warn('tokens::fetchTokens', error); dispatch(setTokens(tokens));
}); });
}; };
} }

13
js/src/redux/providers/tokensReducer.js
View File

@ -25,10 +25,15 @@ const initialState = {
export default handleActions({ export default handleActions({
setTokens (state, action) { setTokens (state, action) {
const { tokens } = action; const { tokens } = action;
const nextTokens = { ...state };
return { Object.keys(tokens).forEach((tokenId) => {
...state, nextTokens[tokenId] = {
...tokens ...(nextTokens[tokenId]),
}; ...tokens[tokenId]
};
});
return nextTokens;
} }
}, initialState); }, initialState);

52
js/src/redux/store.js
View File

@ -22,12 +22,14 @@ import initReducers from './reducers';
import { load as loadWallet } from './providers/walletActions'; import { load as loadWallet } from './providers/walletActions';
import { init as initRequests } from './providers/requestsActions'; import { init as initRequests } from './providers/requestsActions';
import { setupWorker } from './providers/workerWrapper'; import { setupWorker } from './providers/workerWrapper';
import { setApi } from './providers/apiActions';
import { import {
Balances as BalancesProvider, Balances as BalancesProvider,
Personal as PersonalProvider, Personal as PersonalProvider,
Signer as SignerProvider, Signer as SignerProvider,
Status as StatusProvider Status as StatusProvider,
Tokens as TokensProvider
} from './providers'; } from './providers';
const storeCreation = window.devToolsExtension const storeCreation = window.devToolsExtension
@ -39,14 +41,56 @@ export default function (api, browserHistory, forEmbed = false) {
const middleware = initMiddleware(api, browserHistory, forEmbed); const middleware = initMiddleware(api, browserHistory, forEmbed);
const store = applyMiddleware(...middleware)(storeCreation)(reducers); const store = applyMiddleware(...middleware)(storeCreation)(reducers);
BalancesProvider.instantiate(store, api); // Add the `api` to the Redux Store
StatusProvider.instantiate(store, api); store.dispatch({ type: 'initAll', api });
new PersonalProvider(store, api).start(); store.dispatch(setApi(api));
// Initialise the Store Providers
BalancesProvider.init(store);
PersonalProvider.init(store);
StatusProvider.init(store);
TokensProvider.init(store);
new SignerProvider(store, api).start(); new SignerProvider(store, api).start();
store.dispatch(loadWallet(api)); store.dispatch(loadWallet(api));
store.dispatch(initRequests(api)); store.dispatch(initRequests(api));
setupWorker(store); setupWorker(store);
const start = () => {
return Promise.resolve()
.then(() => console.log('starting Status Provider...'))
.then(() => StatusProvider.start())
.then(() => console.log('started Status Provider'))
.then(() => console.log('starting Personal Provider...'))
.then(() => PersonalProvider.start())
.then(() => console.log('started Personal Provider'))
.then(() => console.log('starting Balances Provider...'))
.then(() => BalancesProvider.start())
.then(() => console.log('started Balances Provider'))
.then(() => console.log('starting Tokens Provider...'))
.then(() => TokensProvider.start())
.then(() => console.log('started Tokens Provider'));
};
const stop = () => {
return StatusProvider.stop()
.then(() => PersonalProvider.stop())
.then(() => TokensProvider.stop())
.then(() => BalancesProvider.stop());
};
// On connecting, stop all subscriptions
api.on('connecting', stop);
// On connected, start the subscriptions
api.on('connected', start);
// On disconnected, stop all subscriptions
api.on('disconnected', stop);
return store; return store;
} }

19
js/src/ui/Balance/balance.js
View File

@ -50,6 +50,20 @@ export class Balance extends Component {
} }
let body = Object.keys(balance) let body = Object.keys(balance)
.sort((tokenIdA, tokenIdB) => {
const tokenA = tokens[tokenIdA];
const tokenB = tokens[tokenIdB];
if (tokenA.native) {
return -1;
}
if (tokenB.native) {
return 1;
}
return (tokenA.name || tokenA.tag || '').localeCompare(tokenB.name || tokenB.tag || '');
})
.map((tokenId) => { .map((tokenId) => {
const token = tokens[tokenId]; const token = tokens[tokenId];
const balanceValue = balance[tokenId]; const balanceValue = balance[tokenId];
@ -73,7 +87,8 @@ export class Balance extends Component {
decimals = 1; decimals = 1;
} }
const value = new BigNumber(balanceValue).div(bnf).toFormat(decimals); const rawValue = new BigNumber(balanceValue).div(bnf);
const value = rawValue.toFormat(decimals);
const classNames = [styles.balance]; const classNames = [styles.balance];
let details = null; let details = null;
@ -85,7 +100,7 @@ export class Balance extends Component {
className={ styles.value } className={ styles.value }
key='value' key='value'
> >
<span title={ value }> <span title={ `${rawValue.toFormat()} ${token.tag}` }>
{ value } { value }
</span> </span>
</div>, </div>,

2
js/src/ui/TxList/TxRow/txRow.spec.js
View File

@ -23,7 +23,7 @@ import Api from '~/api';
import TxRow from './txRow'; import TxRow from './txRow';
const api = new Api({ execute: sinon.stub() }); const api = new Api({ execute: sinon.stub(), on: sinon.stub() });
const STORE = { const STORE = {
dispatch: sinon.stub(), dispatch: sinon.stub(),

2
js/src/ui/TxList/txList.spec.js
View File

@ -22,7 +22,7 @@ import Api from '~/api';
import TxList from './txList'; import TxList from './txList';
const api = new Api({ execute: sinon.stub() }); const api = new Api({ execute: sinon.stub(), on: sinon.stub() });
const STORE = { const STORE = {
dispatch: sinon.stub(), dispatch: sinon.stub(),

133
js/src/util/tokens.js
View File

@ -1,133 +0,0 @@
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
// This file is part of Parity.
// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import { range } from 'lodash';
import BigNumber from 'bignumber.js';
import { hashToImageUrl } from '~/redux/util';
import { sha3 } from '~/api/util/sha3';
import imagesEthereum from '~/../assets/images/contracts/ethereum-black-64x64.png';
const BALANCEOF_SIGNATURE = sha3('balanceOf(address)');
const ADDRESS_PADDING = range(24).map(() => '0').join('');
export const ETH_TOKEN = {
address: '',
format: new BigNumber(10).pow(18),
id: sha3('eth_native_token').slice(0, 10),
image: imagesEthereum,
name: 'Ethereum',
native: true,
tag: 'ETH'
};
export function fetchTokenIds (tokenregInstance) {
return tokenregInstance.tokenCount
.call()
.then((numTokens) => {
const tokenIndexes = range(numTokens.toNumber());
return tokenIndexes;
});
}
export function fetchTokenInfo (api, tokenregInstace, tokenIndex) {
return Promise
.all([
tokenregInstace.token.call({}, [tokenIndex]),
tokenregInstace.meta.call({}, [tokenIndex, 'IMG'])
])
.then(([ tokenData, image ]) => {
const [ address, tag, format, name ] = tokenData;
const token = {
format: format.toString(),
index: tokenIndex,
image: hashToImageUrl(image),
id: sha3(address + tokenIndex).slice(0, 10),
address,
name,
tag
};
return token;
});
}
/**
* `updates` should be in the shape:
* {
* [ who ]: [ tokenId ] // Array of tokens to updates
* }
*
* Returns a Promise resolved witht the balances in the shape:
* {
* [ who ]: { [ tokenId ]: BigNumber } // The balances of `who`
* }
*/
export function fetchAccountsBalances (api, tokens, updates) {
const addresses = Object.keys(updates);
const promises = addresses
.map((who) => {
const tokensIds = updates[who];
const tokensToUpdate = tokensIds.map((tokenId) => tokens.find((t) => t.id === tokenId));
return fetchAccountBalances(api, tokensToUpdate, who);
});
return Promise.all(promises)
.then((results) => {
return results.reduce((balances, accountBalances, index) => {
balances[addresses[index]] = accountBalances;
return balances;
}, {});
});
}
/**
* Returns a Promise resolved with the balances in the shape:
* {
* [ tokenId ]: BigNumber // Token balance value
* }
*/
export function fetchAccountBalances (api, tokens, who) {
const calldata = '0x' + BALANCEOF_SIGNATURE.slice(2, 10) + ADDRESS_PADDING + who.slice(2);
const promises = tokens.map((token) => fetchTokenBalance(api, token, { who, calldata }));
return Promise.all(promises)
.then((results) => {
return results.reduce((balances, value, index) => {
const token = tokens[index];
balances[token.id] = value;
return balances;
}, {});
});
}
export function fetchTokenBalance (api, token, { who, calldata }) {
if (token.native) {
return api.eth.getBalance(who);
}
return api.eth
.call({ data: calldata, to: token.address })
.then((result) => {
const cleanResult = result.replace(/^0x/, '');
return new BigNumber(`0x${cleanResult || 0}`);
});
}

23
js/src/util/tokens/bytecodes.js Normal file
View File

@ -0,0 +1,23 @@
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
// This file is part of Parity.
// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
// build from : https://raw.githubusercontent.com/paritytech/contracts/4c8501e908166aab7ff4d2ebb05db61b5d017024/TokenCalls.sol
// metadata (include build version and options):
// {"compiler":{"version":"0.4.16+commit.d7661dd9"},"language":"Solidity","output":{"abi":[{"inputs":[{"name":"tokenRegAddress","type":"address"},{"name":"start","type":"uint256"},{"name":"limit","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"}],"devdoc":{"methods":{}},"userdoc":{"methods":{}}},"settings":{"compilationTarget":{"":"Tokens"},"libraries":{},"optimizer":{"enabled":true,"runs":200},"remappings":[]},"sources":{"":{"keccak256":"0x4790e490f418d1a5884c27ffe9684914dab2d55bd1d23b99cff7aa2ca289e2d3","urls":["bzzr://bb200beae6849f1f5bb97b36c57cd493be52877ec0b55ee9969fa5f8159cf37b"]}},"version":1}
// {"compiler":{"version":"0.4.16+commit.d7661dd9"},"language":"Solidity","output":{"abi":[{"inputs":[{"name":"who","type":"address[]"},{"name":"tokens","type":"address[]"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"}],"devdoc":{"methods":{}},"userdoc":{"methods":{}}},"settings":{"compilationTarget":{"":"TokensBalances"},"libraries":{},"optimizer":{"enabled":true,"runs":200},"remappings":[]},"sources":{"":{"keccak256":"0x4790e490f418d1a5884c27ffe9684914dab2d55bd1d23b99cff7aa2ca289e2d3","urls":["bzzr://bb200beae6849f1f5bb97b36c57cd493be52877ec0b55ee9969fa5f8159cf37b"]}},"version":1}
export const tokenAddresses = '0x6060604052341561000f57600080fd5b6040516060806102528339810160405280805191906020018051919060200180519150505b6000806000806100426101fc565b600088955085600160a060020a0316639f181b5e6000604051602001526040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b15156100a657600080fd5b6102c65a03f115156100b757600080fd5b50505060405180519550508688018890116100ce57fe5b8785116100de57600093506100f6565b8487890111156100f25787850393506100f6565b8693505b5b83602002602001925060405191508282016040528382528790505b8388018110156101ea5785600160a060020a031663044215c682600060405160a001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff8416028152600481019190915260240160a060405180830381600087803b151561018457600080fd5b6102c65a03f1151561019557600080fd5b50505060405180519060200180519060200180519060200180519060200180515086935050508a84039050815181106101ca57fe5b600160a060020a039092166020928302909101909101525b600101610112565b8282f35b50505050505050505061020e565b60206040519081016040526000815290565b60368061021c6000396000f30060606040525b600080fd00a165627a7a72305820a9a09f013393cf3c6398ce0f8175073fe363b6f594f9bd569261d0bb94aa84d40029';
export const tokensBalances = '0x6060604052341561000f57600080fd5b60405161018b38038061018b8339810160405280805182019190602001805190910190505b6000806000610041610135565b60008060008060008060008c518c51029a506020808c020199507f70a0823100000000000000000000000000000000000000000000000000000000985060405197508988016040528a8852604051965060248701604052888752879550866004019450600093505b8c5184101561011f57600092505b8b51831015610113578c84815181106100cc57fe5b9060200190602002015191508b83815181106100e457fe5b90602001906020020151905060208601955081855260208660248960008561fffff1505b6001909201916100b7565b5b6001909301926100a9565b8988f35b50505050505050505050505050610147565b60206040519081016040526000815290565b6036806101556000396000f30060606040525b600080fd00a165627a7a723058203cfc17c394936aa87b7db79e4f082a7cfdcefef54acd3124d17525b56c92e7950029';

283
js/src/util/tokens/index.js Normal file
View File

@ -0,0 +1,283 @@
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
// This file is part of Parity.
// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import { range } from 'lodash';
import BigNumber from 'bignumber.js';
import { hashToImageUrl } from '~/redux/util';
import { sha3 } from '~/api/util/sha3';
import imagesEthereum from '~/../assets/images/contracts/ethereum-black-64x64.png';
import {
tokenAddresses as tokenAddressesBytcode,
tokensBalances as tokensBalancesBytecode
} from './bytecodes';
export const ETH_TOKEN = {
address: '',
format: new BigNumber(10).pow(18),
id: getTokenId('eth_native_token'),
image: imagesEthereum,
name: 'Ethereum',
native: true,
tag: 'ETH'
};
export function fetchTokenIds (tokenregInstance) {
return tokenregInstance.tokenCount
.call()
.then((numTokens) => {
const tokenIndexes = range(numTokens.toNumber());
return tokenIndexes;
});
}
export function fetchTokensBasics (api, tokenReg, start = 0, limit = 100) {
const tokenAddressesCallData = encode(
api,
[ 'address', 'uint', 'uint' ],
[ tokenReg.address, start, limit ]
);
return api.eth
.call({ data: tokenAddressesBytcode + tokenAddressesCallData })
.then((result) => {
const tokenAddresses = decodeArray(api, 'address[]', result);
return tokenAddresses.map((tokenAddress, index) => {
const tokenIndex = start + index;
return {
address: tokenAddress,
id: getTokenId(tokenAddress, tokenIndex),
index: tokenIndex,
fetched: false
};
});
});
}
export function fetchTokensInfo (api, tokenReg, tokenIndexes) {
const requests = tokenIndexes.map((tokenIndex) => {
const tokenCalldata = tokenReg.getCallData(tokenReg.instance.token, {}, [tokenIndex]);
return { to: tokenReg.address, data: tokenCalldata };
});
const calls = requests.map((req) => api.eth.call(req));
const imagesPromise = fetchTokensImages(api, tokenReg, tokenIndexes);
return Promise.all(calls)
.then((results) => {
return imagesPromise.then((images) => [ results, images ]);
})
.then(([ results, images ]) => {
return results.map((rawTokenData, index) => {
const tokenIndex = tokenIndexes[index];
const tokenData = tokenReg.instance.token
.decodeOutput(rawTokenData)
.map((t) => t.value);
const [ address, tag, format, name ] = tokenData;
const image = images[index];
const token = {
address,
id: getTokenId(address, tokenIndex),
index: tokenIndex,
format: format.toString(),
image,
name,
tag,
fetched: true
};
return token;
});
});
}
export function fetchTokensImages (api, tokenReg, tokenIndexes) {
const requests = tokenIndexes.map((tokenIndex) => {
const metaCalldata = tokenReg.getCallData(tokenReg.instance.meta, {}, [tokenIndex, 'IMG']);
return { to: tokenReg.address, data: metaCalldata };
});
const calls = requests.map((req) => api.eth.call(req));
return Promise.all(calls)
.then((results) => {
return results.map((rawImage) => {
const image = tokenReg.instance.meta.decodeOutput(rawImage)[0].value;
return hashToImageUrl(image);
});
});
}
/**
* `updates` should be in the shape:
* {
* [ who ]: [ tokenId ] // Array of tokens to updates
* }
*
* Returns a Promise resolved with the balances in the shape:
* {
* [ who ]: { [ tokenId ]: BigNumber } // The balances of `who`
* }
*/
export function fetchAccountsBalances (api, tokens, updates) {
const accountAddresses = Object.keys(updates);
// Updates for the ETH balances
const ethUpdates = accountAddresses
.filter((accountAddress) => {
return updates[accountAddress].find((tokenId) => tokenId === ETH_TOKEN.id);
})
.reduce((nextUpdates, accountAddress) => {
nextUpdates[accountAddress] = [ETH_TOKEN.id];
return nextUpdates;
}, {});
// Updates for Tokens balances
const tokenUpdates = Object.keys(updates)
.reduce((nextUpdates, accountAddress) => {
const tokenIds = updates[accountAddress].filter((tokenId) => tokenId !== ETH_TOKEN.id);
if (tokenIds.length > 0) {
nextUpdates[accountAddress] = tokenIds;
}
return nextUpdates;
}, {});
let ethBalances = {};
let tokensBalances = {};
const ethPromise = fetchEthBalances(api, Object.keys(ethUpdates))
.then((_ethBalances) => {
ethBalances = _ethBalances;
});
const tokenPromise = Object.keys(tokenUpdates)
.reduce((tokenPromise, accountAddress) => {
const tokenIds = tokenUpdates[accountAddress];
const updateTokens = tokens
.filter((t) => tokenIds.includes(t.id));
return tokenPromise
.then(() => fetchTokensBalances(api, updateTokens, [ accountAddress ]))
.then((balances) => {
tokensBalances[accountAddress] = balances[accountAddress];
});
}, Promise.resolve());
return Promise.all([ ethPromise, tokenPromise ])
.then(() => {
const balances = Object.assign({}, tokensBalances);
Object.keys(ethBalances).forEach((accountAddress) => {
if (!balances[accountAddress]) {
balances[accountAddress] = {};
}
balances[accountAddress] = Object.assign(
{},
balances[accountAddress],
ethBalances[accountAddress]
);
});
return balances;
});
}
function fetchEthBalances (api, accountAddresses) {
const promises = accountAddresses
.map((accountAddress) => api.eth.getBalance(accountAddress));
return Promise.all(promises)
.then((balancesArray) => {
return balancesArray.reduce((balances, balance, index) => {
balances[accountAddresses[index]] = {
[ETH_TOKEN.id]: balance
};
return balances;
}, {});
});
}
function fetchTokensBalances (api, tokens, accountAddresses) {
const tokenAddresses = tokens.map((t) => t.address);
const tokensBalancesCallData = encode(
api,
[ 'address[]', 'address[]' ],
[ accountAddresses, tokenAddresses ]
);
return api.eth
.call({ data: tokensBalancesBytecode + tokensBalancesCallData })
.then((result) => {
const rawBalances = decodeArray(api, 'uint[]', result);
const balances = {};
accountAddresses.forEach((accountAddress, accountIndex) => {
const balance = {};
const preIndex = accountIndex * tokenAddresses.length;
tokenAddresses.forEach((tokenAddress, tokenIndex) => {
const index = preIndex + tokenIndex;
const token = tokens[tokenIndex];
balance[token.id] = rawBalances[index];
});
balances[accountAddress] = balance;
});
return balances;
});
}
function getTokenId (...args) {
return sha3(args.join('')).slice(0, 10);
}
function encode (api, types, values) {
return api.util.abiEncode(
null,
types,
values
).replace('0x', '');
}
function decodeArray (api, type, data) {
return api.util
.abiDecode(
[type],
[
'0x',
(32).toString(16).padStart(64, 0),
data.replace('0x', '')
].join('')
)[0]
.map((t) => t.value);
}

11
js/src/views/Account/account.spec.js
View File

@ -14,6 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import sinon from 'sinon';
import { shallow } from 'enzyme'; import { shallow } from 'enzyme';
import React from 'react'; import React from 'react';
@ -34,7 +35,15 @@ function render (props) {
/>, />,
{ {
context: { context: {
store: createRedux() store: createRedux(),
api: {
transport: {
on: sinon.stub()
},
pubsub: {
subscribeAndGetResult: sinon.stub()
}
}
} }
} }
).find('Account').shallow(); ).find('Account').shallow();

6
js/src/views/Accounts/accounts.spec.js
View File

@ -27,7 +27,11 @@ let instance;
let redux; let redux;
function createApi () { function createApi () {
api = {}; api = {
pubsub: {
subscribeAndGetResult: sinon.stub().returns(Promise.reject(new Error('uninitialized')))
}
};
return api; return api;
} }

9
js/src/views/Application/Requests/requests.js
View File

@ -57,6 +57,11 @@ class Requests extends Component {
renderRequest (request, extras = {}) { renderRequest (request, extras = {}) {
const { show, transaction } = request; const { show, transaction } = request;
if (!transaction) {
return null;
}
const state = this.getTransactionState(request); const state = this.getTransactionState(request);
const displayedTransaction = { ...transaction }; const displayedTransaction = { ...transaction };
@ -156,9 +161,9 @@ class Requests extends Component {
return ( return (
<FormattedMessage <FormattedMessage
id='requests.status.transactionMined' id='requests.status.transactionMined'
defaultMessage='Transaction mined at block #{blockNumber} ({blockHeight} blocks ago)' defaultMessage='Transaction mined at block #{blockNumber} ({blockHeight} confirmations)'
values={ { values={ {
blockHeight: +request.blockHeight, blockHeight: (+request.blockHeight || 0).toString(),
blockNumber: +transactionReceipt.blockNumber blockNumber: +transactionReceipt.blockNumber
} } } }
/> />

9
js/src/views/Home/Dapps/dapp.js
View File

@ -35,9 +35,14 @@ export default class Dapp extends Component {
} }
componentWillMount () { componentWillMount () {
this.isInactive = false;
return this.loadApp(); return this.loadApp();
} }
componentWillUnmount () {
this.isInactive = true;
}
render () { render () {
const { id, timestamp } = this.props; const { id, timestamp } = this.props;
const { dapp } = this.state; const { dapp } = this.state;
@ -83,6 +88,10 @@ export default class Dapp extends Component {
return store return store
.loadApp(id) .loadApp(id)
.then((dapp) => { .then((dapp) => {
if (this.isInactive) {
return;
}
this.setState({ dapp }); this.setState({ dapp });
}); });
} }

10
js/src/views/ParityBar/accountStore.js
View File

@ -24,10 +24,8 @@ export default class AccountStore {
constructor (api) { constructor (api) {
this._api = api; this._api = api;
this.loadDefaultAccount() this.subscribeDefaultAccount()
.then(() => this.loadAccounts()); .then(() => this.loadAccounts());
this.subscribeDefaultAccount();
} }
@action setAccounts = (accounts) => { @action setAccounts = (accounts) => {
@ -60,12 +58,6 @@ export default class AccountStore {
}); });
} }
loadDefaultAccount () {
return this._api.parity
.defaultAccount()
.then((address) => this.setDefaultAccount(address));
}
loadAccounts () { loadAccounts () {
this.setLoading(true); this.setLoading(true);

12
js/src/views/ParityBar/accountStore.spec.js
View File

@ -18,7 +18,7 @@ import sinon from 'sinon';
import AccountStore from './accountStore'; import AccountStore from './accountStore';
import { ACCOUNT_DEFAULT, ACCOUNT_NEW, createApi } from './parityBar.test.js'; import { ACCOUNT_NEW, createApi } from './parityBar.test.js';
let api; let api;
let store; let store;
@ -89,16 +89,6 @@ describe('views/ParityBar/AccountStore', () => {
}); });
}); });
describe('loadDefaultAccount', () => {
beforeEach(() => {
return store.loadDefaultAccount();
});
it('load and set the default account', () => {
expect(store.defaultAccount).to.equal(ACCOUNT_DEFAULT);
});
});
describe('makeDefaultAccount', () => { describe('makeDefaultAccount', () => {
beforeEach(() => { beforeEach(() => {
return store.makeDefaultAccount(ACCOUNT_NEW); return store.makeDefaultAccount(ACCOUNT_NEW);

24
js/src/views/Signer/components/SignRequest/signRequest.spec.js
View File

@ -48,15 +48,27 @@ function createReduxStore () {
function render () { function render () {
reduxStore = createReduxStore(); reduxStore = createReduxStore();
signerStore = createSignerStore(); signerStore = createSignerStore();
const context = {
store: reduxStore,
api: {
transport: {
on: sinon.stub()
},
pubsub: {
subscribeAndGetResult: sinon.stub().returns(Promise.resolve(1))
},
util: {
sha3: (x) => x,
hexToBytes: (x) => x,
asciiToHex: (x) => x
}
}
};
component = shallow( component = shallow(
<SignRequest signerStore={ signerStore } />, <SignRequest signerStore={ signerStore } />,
{ { context }
context: { ).find('SignRequest').shallow({ context });
store: reduxStore
}
}
).find('SignRequest').shallow();
return component; return component;
} }

25
parity/configuration.rs
View File

@ -350,6 +350,7 @@ impl Configuration {
daemon: daemon, daemon: daemon,
logger_config: logger_config.clone(), logger_config: logger_config.clone(),
miner_options: miner_options, miner_options: miner_options,
ntp_servers: self.ntp_servers(),
ws_conf: ws_conf, ws_conf: ws_conf,
http_conf: http_conf, http_conf: http_conf,
ipc_conf: ipc_conf, ipc_conf: ipc_conf,
@ -568,7 +569,6 @@ impl Configuration {
fn ui_config(&self) -> UiConfiguration { fn ui_config(&self) -> UiConfiguration {
UiConfiguration { UiConfiguration {
enabled: self.ui_enabled(), enabled: self.ui_enabled(),
ntp_servers: self.ntp_servers(),
interface: self.ui_interface(), interface: self.ui_interface(),
port: self.ui_port(), port: self.ui_port(),
hosts: self.ui_hosts(), hosts: self.ui_hosts(),
@ -581,7 +581,6 @@ impl Configuration {
DappsConfiguration { DappsConfiguration {
enabled: self.dapps_enabled(), enabled: self.dapps_enabled(),
ntp_servers: self.ntp_servers(),
dapps_path: PathBuf::from(self.directories().dapps), dapps_path: PathBuf::from(self.directories().dapps),
extra_dapps: if self.args.cmd_dapp { extra_dapps: if self.args.cmd_dapp {
self.args.arg_path.iter().map(|path| PathBuf::from(path)).collect() self.args.arg_path.iter().map(|path| PathBuf::from(path)).collect()
@ -1296,12 +1295,6 @@ mod tests {
support_token_api: true support_token_api: true
}, UiConfiguration { }, UiConfiguration {
enabled: true, enabled: true,
ntp_servers: vec![
"0.parity.pool.ntp.org:123".into(),
"1.parity.pool.ntp.org:123".into(),
"2.parity.pool.ntp.org:123".into(),
"3.parity.pool.ntp.org:123".into(),
],
interface: "127.0.0.1".into(), interface: "127.0.0.1".into(),
port: 8180, port: 8180,
hosts: Some(vec![]), hosts: Some(vec![]),
@ -1322,6 +1315,12 @@ mod tests {
daemon: None, daemon: None,
logger_config: Default::default(), logger_config: Default::default(),
miner_options: Default::default(), miner_options: Default::default(),
ntp_servers: vec![
"0.parity.pool.ntp.org:123".into(),
"1.parity.pool.ntp.org:123".into(),
"2.parity.pool.ntp.org:123".into(),
"3.parity.pool.ntp.org:123".into(),
],
ws_conf: Default::default(), ws_conf: Default::default(),
http_conf: Default::default(), http_conf: Default::default(),
ipc_conf: Default::default(), ipc_conf: Default::default(),
@ -1539,16 +1538,9 @@ mod tests {
let conf3 = parse(&["parity", "--ui-path", "signer", "--ui-interface", "test"]); let conf3 = parse(&["parity", "--ui-path", "signer", "--ui-interface", "test"]);
// then // then
let ntp_servers = vec![
"0.parity.pool.ntp.org:123".into(),
"1.parity.pool.ntp.org:123".into(),
"2.parity.pool.ntp.org:123".into(),
"3.parity.pool.ntp.org:123".into(),
];
assert_eq!(conf0.directories().signer, "signer".to_owned()); assert_eq!(conf0.directories().signer, "signer".to_owned());
assert_eq!(conf0.ui_config(), UiConfiguration { assert_eq!(conf0.ui_config(), UiConfiguration {
enabled: true, enabled: true,
ntp_servers: ntp_servers.clone(),
interface: "127.0.0.1".into(), interface: "127.0.0.1".into(),
port: 8180, port: 8180,
hosts: Some(vec![]), hosts: Some(vec![]),
@ -1557,7 +1549,6 @@ mod tests {
assert_eq!(conf1.directories().signer, "signer".to_owned()); assert_eq!(conf1.directories().signer, "signer".to_owned());
assert_eq!(conf1.ui_config(), UiConfiguration { assert_eq!(conf1.ui_config(), UiConfiguration {
enabled: true, enabled: true,
ntp_servers: ntp_servers.clone(),
interface: "127.0.0.1".into(), interface: "127.0.0.1".into(),
port: 8180, port: 8180,
hosts: Some(vec![]), hosts: Some(vec![]),
@ -1567,7 +1558,6 @@ mod tests {
assert_eq!(conf2.directories().signer, "signer".to_owned()); assert_eq!(conf2.directories().signer, "signer".to_owned());
assert_eq!(conf2.ui_config(), UiConfiguration { assert_eq!(conf2.ui_config(), UiConfiguration {
enabled: true, enabled: true,
ntp_servers: ntp_servers.clone(),
interface: "127.0.0.1".into(), interface: "127.0.0.1".into(),
port: 3123, port: 3123,
hosts: Some(vec![]), hosts: Some(vec![]),
@ -1576,7 +1566,6 @@ mod tests {
assert_eq!(conf3.directories().signer, "signer".to_owned()); assert_eq!(conf3.directories().signer, "signer".to_owned());
assert_eq!(conf3.ui_config(), UiConfiguration { assert_eq!(conf3.ui_config(), UiConfiguration {
enabled: true, enabled: true,
ntp_servers: ntp_servers.clone(),
interface: "test".into(), interface: "test".into(),
port: 8180, port: 8180,
hosts: Some(vec![]), hosts: Some(vec![]),

30
parity/dapps.rs
View File

@ -22,12 +22,12 @@ use ethcore::client::{Client, BlockChainClient, BlockId};
use ethcore::transaction::{Transaction, Action}; use ethcore::transaction::{Transaction, Action};
use ethsync::LightSync; use ethsync::LightSync;
use futures::{future, IntoFuture, Future, BoxFuture}; use futures::{future, IntoFuture, Future, BoxFuture};
use futures_cpupool::CpuPool;
use hash_fetch::fetch::Client as FetchClient; use hash_fetch::fetch::Client as FetchClient;
use hash_fetch::urlhint::ContractClient; use hash_fetch::urlhint::ContractClient;
use helpers::replace_home; use helpers::replace_home;
use light::client::Client as LightClient; use light::client::Client as LightClient;
use light::on_demand::{self, OnDemand}; use light::on_demand::{self, OnDemand};
use node_health::{SyncStatus, NodeHealth};
use rpc; use rpc;
use rpc_apis::SignerService; use rpc_apis::SignerService;
use parity_reactor; use parity_reactor;
@ -36,7 +36,6 @@ use util::{Bytes, Address};
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
pub struct Configuration { pub struct Configuration {
pub enabled: bool, pub enabled: bool,
pub ntp_servers: Vec<String>,
pub dapps_path: PathBuf, pub dapps_path: PathBuf,
pub extra_dapps: Vec<PathBuf>, pub extra_dapps: Vec<PathBuf>,
pub extra_embed_on: Vec<(String, u16)>, pub extra_embed_on: Vec<(String, u16)>,
@ -48,12 +47,6 @@ impl Default for Configuration {
let data_dir = default_data_path(); let data_dir = default_data_path();
Configuration { Configuration {
enabled: true, enabled: true,
ntp_servers: vec![
"0.parity.pool.ntp.org:123".into(),
"1.parity.pool.ntp.org:123".into(),
"2.parity.pool.ntp.org:123".into(),
"3.parity.pool.ntp.org:123".into(),
],
dapps_path: replace_home(&data_dir, "$BASE/dapps").into(), dapps_path: replace_home(&data_dir, "$BASE/dapps").into(),
extra_dapps: vec![], extra_dapps: vec![],
extra_embed_on: vec![], extra_embed_on: vec![],
@ -149,10 +142,10 @@ impl ContractClient for LightRegistrar {
// to resolve. // to resolve.
#[derive(Clone)] #[derive(Clone)]
pub struct Dependencies { pub struct Dependencies {
pub node_health: NodeHealth,
pub sync_status: Arc<SyncStatus>, pub sync_status: Arc<SyncStatus>,
pub contract_client: Arc<ContractClient>, pub contract_client: Arc<ContractClient>,
pub remote: parity_reactor::TokioRemote, pub remote: parity_reactor::TokioRemote,
pub pool: CpuPool,
pub fetch: FetchClient, pub fetch: FetchClient,
pub signer: Arc<SignerService>, pub signer: Arc<SignerService>,
pub ui_address: Option<(String, u16)>, pub ui_address: Option<(String, u16)>,
@ -165,7 +158,6 @@ pub fn new(configuration: Configuration, deps: Dependencies) -> Result<Option<Mi
server::dapps_middleware( server::dapps_middleware(
deps, deps,
&configuration.ntp_servers,
configuration.dapps_path, configuration.dapps_path,
configuration.extra_dapps, configuration.extra_dapps,
rpc::DAPPS_DOMAIN, rpc::DAPPS_DOMAIN,
@ -174,19 +166,18 @@ pub fn new(configuration: Configuration, deps: Dependencies) -> Result<Option<Mi
).map(Some) ).map(Some)
} }
pub fn new_ui(enabled: bool, ntp_servers: &[String], deps: Dependencies) -> Result<Option<Middleware>, String> { pub fn new_ui(enabled: bool, deps: Dependencies) -> Result<Option<Middleware>, String> {
if !enabled { if !enabled {
return Ok(None); return Ok(None);
} }
server::ui_middleware( server::ui_middleware(
deps, deps,
ntp_servers,
rpc::DAPPS_DOMAIN, rpc::DAPPS_DOMAIN,
).map(Some) ).map(Some)
} }
pub use self::server::{SyncStatus, Middleware, service}; pub use self::server::{Middleware, service};
#[cfg(not(feature = "dapps"))] #[cfg(not(feature = "dapps"))]
mod server { mod server {
@ -196,8 +187,6 @@ mod server {
use parity_rpc::{hyper, RequestMiddleware, RequestMiddlewareAction}; use parity_rpc::{hyper, RequestMiddleware, RequestMiddlewareAction};
use rpc_apis; use rpc_apis;
pub type SyncStatus = Fn() -> bool;
pub struct Middleware; pub struct Middleware;
impl RequestMiddleware for Middleware { impl RequestMiddleware for Middleware {
fn on_request( fn on_request(
@ -209,7 +198,6 @@ mod server {
pub fn dapps_middleware( pub fn dapps_middleware(
_deps: Dependencies, _deps: Dependencies,
_ntp_servers: &[String],
_dapps_path: PathBuf, _dapps_path: PathBuf,
_extra_dapps: Vec<PathBuf>, _extra_dapps: Vec<PathBuf>,
_dapps_domain: &str, _dapps_domain: &str,
@ -221,7 +209,6 @@ mod server {
pub fn ui_middleware( pub fn ui_middleware(
_deps: Dependencies, _deps: Dependencies,
_ntp_servers: &[String],
_dapps_domain: &str, _dapps_domain: &str,
) -> Result<Middleware, String> { ) -> Result<Middleware, String> {
Err("Your Parity version has been compiled without UI support.".into()) Err("Your Parity version has been compiled without UI support.".into())
@ -243,11 +230,9 @@ mod server {
use parity_reactor; use parity_reactor;
pub use parity_dapps::Middleware; pub use parity_dapps::Middleware;
pub use parity_dapps::SyncStatus;
pub fn dapps_middleware( pub fn dapps_middleware(
deps: Dependencies, deps: Dependencies,
ntp_servers: &[String],
dapps_path: PathBuf, dapps_path: PathBuf,
extra_dapps: Vec<PathBuf>, extra_dapps: Vec<PathBuf>,
dapps_domain: &str, dapps_domain: &str,
@ -259,8 +244,7 @@ mod server {
let web_proxy_tokens = Arc::new(move |token| signer.web_proxy_access_token_domain(&token)); let web_proxy_tokens = Arc::new(move |token| signer.web_proxy_access_token_domain(&token));
Ok(parity_dapps::Middleware::dapps( Ok(parity_dapps::Middleware::dapps(
ntp_servers, deps.node_health,
deps.pool,
parity_remote, parity_remote,
deps.ui_address, deps.ui_address,
extra_embed_on, extra_embed_on,
@ -277,13 +261,11 @@ mod server {
pub fn ui_middleware( pub fn ui_middleware(
deps: Dependencies, deps: Dependencies,
ntp_servers: &[String],
dapps_domain: &str, dapps_domain: &str,
) -> Result<Middleware, String> { ) -> Result<Middleware, String> {
let parity_remote = parity_reactor::Remote::new(deps.remote.clone()); let parity_remote = parity_reactor::Remote::new(deps.remote.clone());
Ok(parity_dapps::Middleware::ui( Ok(parity_dapps::Middleware::ui(
ntp_servers, deps.node_health,
deps.pool,
parity_remote, parity_remote,
dapps_domain, dapps_domain,
deps.contract_client, deps.contract_client,

1
parity/main.rs
View File

@ -57,6 +57,7 @@ extern crate ethcore_logger;
extern crate ethcore_util as util; extern crate ethcore_util as util;
extern crate ethkey; extern crate ethkey;
extern crate ethsync; extern crate ethsync;
extern crate node_health;
extern crate parity_hash_fetch as hash_fetch; extern crate parity_hash_fetch as hash_fetch;
extern crate parity_ipfs_api; extern crate parity_ipfs_api;
extern crate parity_local_store as local_store; extern crate parity_local_store as local_store;

7
parity/rpc.rs
View File

@ -74,7 +74,6 @@ impl Default for HttpConfiguration {
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
pub struct UiConfiguration { pub struct UiConfiguration {
pub enabled: bool, pub enabled: bool,
pub ntp_servers: Vec<String>,
pub interface: String, pub interface: String,
pub port: u16, pub port: u16,
pub hosts: Option<Vec<String>>, pub hosts: Option<Vec<String>>,
@ -108,12 +107,6 @@ impl Default for UiConfiguration {
fn default() -> Self { fn default() -> Self {
UiConfiguration { UiConfiguration {
enabled: true && cfg!(feature = "ui-enabled"), enabled: true && cfg!(feature = "ui-enabled"),
ntp_servers: vec![
"0.parity.pool.ntp.org:123".into(),
"1.parity.pool.ntp.org:123".into(),
"2.parity.pool.ntp.org:123".into(),
"3.parity.pool.ntp.org:123".into(),
],
port: 8180, port: 8180,
interface: "127.0.0.1".into(), interface: "127.0.0.1".into(),
hosts: Some(vec![]), hosts: Some(vec![]),

27
parity/rpc_apis.rs
View File

@ -27,17 +27,18 @@ use ethcore::account_provider::AccountProvider;
use ethcore::client::Client; use ethcore::client::Client;
use ethcore::miner::{Miner, ExternalMiner}; use ethcore::miner::{Miner, ExternalMiner};
use ethcore::snapshot::SnapshotService; use ethcore::snapshot::SnapshotService;
use parity_rpc::{Metadata, NetworkSettings}; use ethcore_logger::RotatingLogger;
use parity_rpc::informant::{ActivityNotifier, ClientNotifier};
use parity_rpc::dispatch::{FullDispatcher, LightDispatcher};
use ethsync::{ManageNetwork, SyncProvider, LightSync}; use ethsync::{ManageNetwork, SyncProvider, LightSync};
use hash_fetch::fetch::Client as FetchClient; use hash_fetch::fetch::Client as FetchClient;
use jsonrpc_core::{self as core, MetaIoHandler}; use jsonrpc_core::{self as core, MetaIoHandler};
use light::{TransactionQueue as LightTransactionQueue, Cache as LightDataCache}; use light::{TransactionQueue as LightTransactionQueue, Cache as LightDataCache};
use node_health::NodeHealth;
use parity_reactor;
use parity_rpc::dispatch::{FullDispatcher, LightDispatcher};
use parity_rpc::informant::{ActivityNotifier, ClientNotifier};
use parity_rpc::{Metadata, NetworkSettings};
use updater::Updater; use updater::Updater;
use util::{Mutex, RwLock}; use util::{Mutex, RwLock};
use ethcore_logger::RotatingLogger;
use parity_reactor;
#[derive(Debug, PartialEq, Clone, Eq, Hash)] #[derive(Debug, PartialEq, Clone, Eq, Hash)]
pub enum Api { pub enum Api {
@ -207,6 +208,7 @@ pub struct FullDependencies {
pub settings: Arc<NetworkSettings>, pub settings: Arc<NetworkSettings>,
pub net_service: Arc<ManageNetwork>, pub net_service: Arc<ManageNetwork>,
pub updater: Arc<Updater>, pub updater: Arc<Updater>,
pub health: NodeHealth,
pub geth_compatibility: bool, pub geth_compatibility: bool,
pub dapps_service: Option<Arc<DappsService>>, pub dapps_service: Option<Arc<DappsService>>,
pub dapps_address: Option<(String, u16)>, pub dapps_address: Option<(String, u16)>,
@ -287,12 +289,13 @@ impl FullDependencies {
false => None, false => None,
}; };
handler.extend_with(ParityClient::new( handler.extend_with(ParityClient::new(
&self.client, self.client.clone(),
&self.miner, self.miner.clone(),
&self.sync, self.sync.clone(),
&self.updater, self.updater.clone(),
&self.net_service, self.net_service.clone(),
&self.secret_store, self.health.clone(),
self.secret_store.clone(),
self.logger.clone(), self.logger.clone(),
self.settings.clone(), self.settings.clone(),
signer, signer,
@ -374,6 +377,7 @@ pub struct LightDependencies {
pub secret_store: Arc<AccountProvider>, pub secret_store: Arc<AccountProvider>,
pub logger: Arc<RotatingLogger>, pub logger: Arc<RotatingLogger>,
pub settings: Arc<NetworkSettings>, pub settings: Arc<NetworkSettings>,
pub health: NodeHealth,
pub on_demand: Arc<::light::on_demand::OnDemand>, pub on_demand: Arc<::light::on_demand::OnDemand>,
pub cache: Arc<Mutex<LightDataCache>>, pub cache: Arc<Mutex<LightDataCache>>,
pub transaction_queue: Arc<RwLock<LightTransactionQueue>>, pub transaction_queue: Arc<RwLock<LightTransactionQueue>>,
@ -477,6 +481,7 @@ impl LightDependencies {
self.secret_store.clone(), self.secret_store.clone(),
self.logger.clone(), self.logger.clone(),
self.settings.clone(), self.settings.clone(),
self.health.clone(),
signer, signer,
self.dapps_address.clone(), self.dapps_address.clone(),
self.ws_address.clone(), self.ws_address.clone(),

56
parity/run.rs
View File

@ -14,6 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
use std::fmt;
use std::sync::Arc; use std::sync::Arc;
use std::net::{TcpListener}; use std::net::{TcpListener};
@ -32,6 +33,7 @@ use fdlimit::raise_fd_limit;
use hash_fetch::fetch::{Fetch, Client as FetchClient}; use hash_fetch::fetch::{Fetch, Client as FetchClient};
use informant::{Informant, LightNodeInformantData, FullNodeInformantData}; use informant::{Informant, LightNodeInformantData, FullNodeInformantData};
use light::Cache as LightDataCache; use light::Cache as LightDataCache;
use node_health;
use parity_reactor::EventLoop; use parity_reactor::EventLoop;
use parity_rpc::{NetworkSettings, informant, is_major_importing}; use parity_rpc::{NetworkSettings, informant, is_major_importing};
use updater::{UpdatePolicy, Updater}; use updater::{UpdatePolicy, Updater};
@ -80,6 +82,7 @@ pub struct RunCmd {
pub daemon: Option<String>, pub daemon: Option<String>,
pub logger_config: LogConfig, pub logger_config: LogConfig,
pub miner_options: MinerOptions, pub miner_options: MinerOptions,
pub ntp_servers: Vec<String>,
pub ws_conf: rpc::WsConfiguration, pub ws_conf: rpc::WsConfiguration,
pub http_conf: rpc::HttpConfiguration, pub http_conf: rpc::HttpConfiguration,
pub ipc_conf: rpc::IpcConfiguration, pub ipc_conf: rpc::IpcConfiguration,
@ -270,7 +273,7 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) ->
// the dapps server // the dapps server
let signer_service = Arc::new(signer::new_service(&cmd.ws_conf, &cmd.ui_conf)); let signer_service = Arc::new(signer::new_service(&cmd.ws_conf, &cmd.ui_conf));
let dapps_deps = { let (node_health, dapps_deps) = {
let contract_client = Arc::new(::dapps::LightRegistrar { let contract_client = Arc::new(::dapps::LightRegistrar {
client: service.client().clone(), client: service.client().clone(),
sync: light_sync.clone(), sync: light_sync.clone(),
@ -278,7 +281,12 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) ->
}); });
struct LightSyncStatus(Arc<LightSync>); struct LightSyncStatus(Arc<LightSync>);
impl dapps::SyncStatus for LightSyncStatus { impl fmt::Debug for LightSyncStatus {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
write!(fmt, "Light Sync Status")
}
}
impl node_health::SyncStatus for LightSyncStatus {
fn is_major_importing(&self) -> bool { self.0.is_major_importing() } fn is_major_importing(&self) -> bool { self.0.is_major_importing() }
fn peers(&self) -> (usize, usize) { fn peers(&self) -> (usize, usize) {
let peers = ethsync::LightSyncProvider::peer_numbers(&*self.0); let peers = ethsync::LightSyncProvider::peer_numbers(&*self.0);
@ -286,19 +294,26 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) ->
} }
} }
dapps::Dependencies { let sync_status = Arc::new(LightSyncStatus(light_sync.clone()));
sync_status: Arc::new(LightSyncStatus(light_sync.clone())), let node_health = node_health::NodeHealth::new(
pool: fetch.pool(), sync_status.clone(),
node_health::TimeChecker::new(&cmd.ntp_servers, fetch.pool()),
event_loop.remote(),
);
(node_health.clone(), dapps::Dependencies {
sync_status,
node_health,
contract_client: contract_client, contract_client: contract_client,
remote: event_loop.raw_remote(), remote: event_loop.raw_remote(),
fetch: fetch.clone(), fetch: fetch.clone(),
signer: signer_service.clone(), signer: signer_service.clone(),
ui_address: cmd.ui_conf.address(), ui_address: cmd.ui_conf.address(),
} })
}; };
let dapps_middleware = dapps::new(cmd.dapps_conf.clone(), dapps_deps.clone())?; let dapps_middleware = dapps::new(cmd.dapps_conf.clone(), dapps_deps.clone())?;
let ui_middleware = dapps::new_ui(cmd.ui_conf.enabled, &cmd.ui_conf.ntp_servers, dapps_deps)?; let ui_middleware = dapps::new_ui(cmd.ui_conf.enabled, dapps_deps)?;
// start RPCs // start RPCs
let dapps_service = dapps::service(&dapps_middleware); let dapps_service = dapps::service(&dapps_middleware);
@ -307,6 +322,7 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) ->
client: service.client().clone(), client: service.client().clone(),
sync: light_sync.clone(), sync: light_sync.clone(),
net: light_sync.clone(), net: light_sync.clone(),
health: node_health,
secret_store: account_provider, secret_store: account_provider,
logger: logger, logger: logger,
settings: Arc::new(cmd.net_settings), settings: Arc::new(cmd.net_settings),
@ -634,12 +650,17 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
let signer_service = Arc::new(signer::new_service(&cmd.ws_conf, &cmd.ui_conf)); let signer_service = Arc::new(signer::new_service(&cmd.ws_conf, &cmd.ui_conf));
// the dapps server // the dapps server
let dapps_deps = { let (node_health, dapps_deps) = {
let (sync, client) = (sync_provider.clone(), client.clone()); let (sync, client) = (sync_provider.clone(), client.clone());
let contract_client = Arc::new(::dapps::FullRegistrar { client: client.clone() }); let contract_client = Arc::new(::dapps::FullRegistrar { client: client.clone() });
struct SyncStatus(Arc<ethsync::SyncProvider>, Arc<Client>, ethsync::NetworkConfiguration); struct SyncStatus(Arc<ethsync::SyncProvider>, Arc<Client>, ethsync::NetworkConfiguration);
impl dapps::SyncStatus for SyncStatus { impl fmt::Debug for SyncStatus {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
write!(fmt, "Dapps Sync Status")
}
}
impl node_health::SyncStatus for SyncStatus {
fn is_major_importing(&self) -> bool { fn is_major_importing(&self) -> bool {
is_major_importing(Some(self.0.status().state), self.1.queue_info()) is_major_importing(Some(self.0.status().state), self.1.queue_info())
} }
@ -649,18 +670,24 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
} }
} }
dapps::Dependencies { let sync_status = Arc::new(SyncStatus(sync, client, net_conf));
sync_status: Arc::new(SyncStatus(sync, client, net_conf)), let node_health = node_health::NodeHealth::new(
pool: fetch.pool(), sync_status.clone(),
node_health::TimeChecker::new(&cmd.ntp_servers, fetch.pool()),
event_loop.remote(),
);
(node_health.clone(), dapps::Dependencies {
sync_status,
node_health,
contract_client: contract_client, contract_client: contract_client,
remote: event_loop.raw_remote(), remote: event_loop.raw_remote(),
fetch: fetch.clone(), fetch: fetch.clone(),
signer: signer_service.clone(), signer: signer_service.clone(),
ui_address: cmd.ui_conf.address(), ui_address: cmd.ui_conf.address(),
} })
}; };
let dapps_middleware = dapps::new(cmd.dapps_conf.clone(), dapps_deps.clone())?; let dapps_middleware = dapps::new(cmd.dapps_conf.clone(), dapps_deps.clone())?;
let ui_middleware = dapps::new_ui(cmd.ui_conf.enabled, &cmd.ui_conf.ntp_servers, dapps_deps)?; let ui_middleware = dapps::new_ui(cmd.ui_conf.enabled, dapps_deps)?;
let dapps_service = dapps::service(&dapps_middleware); let dapps_service = dapps::service(&dapps_middleware);
let deps_for_rpc_apis = Arc::new(rpc_apis::FullDependencies { let deps_for_rpc_apis = Arc::new(rpc_apis::FullDependencies {
@ -668,6 +695,7 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
snapshot: snapshot_service.clone(), snapshot: snapshot_service.clone(),
client: client.clone(), client: client.clone(),
sync: sync_provider.clone(), sync: sync_provider.clone(),
health: node_health,
net: manage_network.clone(), net: manage_network.clone(),
secret_store: secret_store, secret_store: secret_store,
miner: miner.clone(), miner: miner.clone(),

9
rpc/Cargo.toml
View File

@ -46,12 +46,13 @@ ethjson = { path = "../json" }
ethcore-devtools = { path = "../devtools" } ethcore-devtools = { path = "../devtools" }
ethcore-light = { path = "../ethcore/light" } ethcore-light = { path = "../ethcore/light" }
ethcore-logger = { path = "../logger" } ethcore-logger = { path = "../logger" }
evm = { path = "../ethcore/evm" }
parity-updater = { path = "../updater" }
parity-reactor = { path = "../util/reactor" }
rlp = { path = "../util/rlp" }
fetch = { path = "../util/fetch" } fetch = { path = "../util/fetch" }
node-health = { path = "../dapps/node-health" }
parity-reactor = { path = "../util/reactor" }
parity-updater = { path = "../updater" }
rlp = { path = "../util/rlp" }
stats = { path = "../util/stats" } stats = { path = "../util/stats" }
evm = { path = "../ethcore/evm" }
clippy = { version = "0.0.103", optional = true} clippy = { version = "0.0.103", optional = true}
pretty_assertions = "0.1" pretty_assertions = "0.1"

3
rpc/src/lib.rs
View File

@ -22,6 +22,7 @@
extern crate cid; extern crate cid;
extern crate crypto as rust_crypto; extern crate crypto as rust_crypto;
extern crate evm;
extern crate futures; extern crate futures;
extern crate futures_cpupool; extern crate futures_cpupool;
extern crate multihash; extern crate multihash;
@ -52,8 +53,8 @@ extern crate ethkey;
extern crate ethstore; extern crate ethstore;
extern crate ethsync; extern crate ethsync;
extern crate ethcore_logger; extern crate ethcore_logger;
extern crate evm;
extern crate fetch; extern crate fetch;
extern crate node_health;
extern crate parity_reactor; extern crate parity_reactor;
extern crate parity_updater as updater; extern crate parity_updater as updater;
extern crate rlp; extern crate rlp;

5
rpc/src/v1/helpers/dispatch.rs
View File

@ -584,8 +584,9 @@ fn decrypt(accounts: &AccountProvider, address: Address, msg: Bytes, password: S
} }
/// Extract the default gas price from a client and miner. /// Extract the default gas price from a client and miner.
pub fn default_gas_price<C, M>(client: &C, miner: &M) -> U256 pub fn default_gas_price<C, M>(client: &C, miner: &M) -> U256 where
where C: MiningBlockChainClient, M: MinerService C: MiningBlockChainClient,
M: MinerService,
{ {
client.gas_price_corpus(100).median().cloned().unwrap_or_else(|| miner.sensible_gas_price()) client.gas_price_corpus(100).median().cloned().unwrap_or_else(|| miner.sensible_gas_price())
} }

4
rpc/src/v1/helpers/fake_sign.rs
View File

@ -24,8 +24,8 @@ use jsonrpc_core::Error;
use v1::helpers::CallRequest; use v1::helpers::CallRequest;
use v1::helpers::dispatch::default_gas_price; use v1::helpers::dispatch::default_gas_price;
pub fn sign_call<B: MiningBlockChainClient, M: MinerService>( pub fn sign_call<C: MiningBlockChainClient, M: MinerService> (
client: &Arc<B>, client: &Arc<C>,
miner: &Arc<M>, miner: &Arc<M>,
request: CallRequest, request: CallRequest,
gas_cap: bool, gas_cap: bool,

49
rpc/src/v1/impls/eth_filter.rs
View File

@ -210,30 +210,35 @@ impl<T: Filterable + Send + Sync + 'static> EthFilter for T {
} }
fn filter_logs(&self, index: Index) -> BoxFuture<Vec<Log>, Error> { fn filter_logs(&self, index: Index) -> BoxFuture<Vec<Log>, Error> {
let mut polls = self.polls().lock(); let filter = {
match polls.poll(&index.value()) { let mut polls = self.polls().lock();
Some(&PollFilter::Logs(ref _block_number, ref _previous_log, ref filter)) => {
let include_pending = filter.to_block == Some(BlockNumber::Pending);
let filter: EthcoreFilter = filter.clone().into();
// fetch pending logs. match polls.poll(&index.value()) {
let pending = if include_pending { Some(&PollFilter::Logs(ref _block_number, ref _previous_log, ref filter)) => filter.clone(),
let best_block = self.best_block_number(); // just empty array
self.pending_logs(best_block, &filter) _ => return future::ok(Vec::new()).boxed(),
} else { }
Vec::new() };
};
// retrieve logs asynchronously, appending pending logs. let include_pending = filter.to_block == Some(BlockNumber::Pending);
let limit = filter.limit; let filter: EthcoreFilter = filter.into();
self.logs(filter)
.map(move |mut logs| { logs.extend(pending); logs }) // fetch pending logs.
.map(move |logs| limit_logs(logs, limit)) let pending = if include_pending {
.boxed() let best_block = self.best_block_number();
}, self.pending_logs(best_block, &filter)
// just empty array } else {
_ => future::ok(Vec::new()).boxed() Vec::new()
} };
// retrieve logs asynchronously, appending pending logs.
let limit = filter.limit;
let logs = self.logs(filter);
let res = logs
.map(move |mut logs| { logs.extend(pending); logs })
.map(move |logs| limit_logs(logs, limit))
.boxed();
res
} }
fn uninstall_filter(&self, index: Index) -> Result<bool, Error> { fn uninstall_filter(&self, index: Index) -> Result<bool, Error> {

29
rpc/src/v1/impls/light/parity.rs
View File

@ -19,15 +19,15 @@ use std::sync::Arc;
use std::collections::{BTreeMap, HashSet}; use std::collections::{BTreeMap, HashSet};
use futures::{future, Future, BoxFuture}; use futures::{future, Future, BoxFuture};
use ethcore_logger::RotatingLogger;
use util::misc::version_data; use util::misc::version_data;
use crypto::ecies; use crypto::{ecies, DEFAULT_MAC};
use ethkey::{Brain, Generator}; use ethkey::{Brain, Generator};
use ethstore::random_phrase; use ethstore::random_phrase;
use ethsync::LightSyncProvider; use ethsync::LightSyncProvider;
use ethcore::account_provider::AccountProvider; use ethcore::account_provider::AccountProvider;
use crypto::DEFAULT_MAC; use ethcore_logger::RotatingLogger;
use node_health::{NodeHealth, Health};
use light::client::LightChainClient; use light::client::LightChainClient;
@ -53,6 +53,7 @@ pub struct ParityClient {
accounts: Arc<AccountProvider>, accounts: Arc<AccountProvider>,
logger: Arc<RotatingLogger>, logger: Arc<RotatingLogger>,
settings: Arc<NetworkSettings>, settings: Arc<NetworkSettings>,
health: NodeHealth,
signer: Option<Arc<SignerService>>, signer: Option<Arc<SignerService>>,
dapps_address: Option<(String, u16)>, dapps_address: Option<(String, u16)>,
ws_address: Option<(String, u16)>, ws_address: Option<(String, u16)>,
@ -67,18 +68,20 @@ impl ParityClient {
accounts: Arc<AccountProvider>, accounts: Arc<AccountProvider>,
logger: Arc<RotatingLogger>, logger: Arc<RotatingLogger>,
settings: Arc<NetworkSettings>, settings: Arc<NetworkSettings>,
health: NodeHealth,
signer: Option<Arc<SignerService>>, signer: Option<Arc<SignerService>>,
dapps_address: Option<(String, u16)>, dapps_address: Option<(String, u16)>,
ws_address: Option<(String, u16)>, ws_address: Option<(String, u16)>,
) -> Self { ) -> Self {
ParityClient { ParityClient {
light_dispatch: light_dispatch, light_dispatch,
accounts: accounts, accounts,
logger: logger, logger,
settings: settings, settings,
signer: signer, health,
dapps_address: dapps_address, signer,
ws_address: ws_address, dapps_address,
ws_address,
eip86_transition: client.eip86_transition(), eip86_transition: client.eip86_transition(),
} }
} }
@ -389,4 +392,10 @@ impl Parity for ParityClient {
fn ipfs_cid(&self, content: Bytes) -> Result<String, Error> { fn ipfs_cid(&self, content: Bytes) -> Result<String, Error> {
ipfs::cid(content) ipfs::cid(content)
} }
fn node_health(&self) -> BoxFuture<Health, Error> {
self.health.health()
.map_err(|err| errors::internal("Health API failure.", err))
.boxed()
}
} }

71
rpc/src/v1/impls/parity.rs
View File

@ -20,11 +20,10 @@ use std::str::FromStr;
use std::collections::{BTreeMap, HashSet}; use std::collections::{BTreeMap, HashSet};
use futures::{future, Future, BoxFuture}; use futures::{future, Future, BoxFuture};
use ethcore_logger::RotatingLogger;
use util::Address; use util::Address;
use util::misc::version_data; use util::misc::version_data;
use crypto::ecies; use crypto::{DEFAULT_MAC, ecies};
use ethkey::{Brain, Generator}; use ethkey::{Brain, Generator};
use ethstore::random_phrase; use ethstore::random_phrase;
use ethsync::{SyncProvider, ManageNetwork}; use ethsync::{SyncProvider, ManageNetwork};
@ -33,8 +32,9 @@ use ethcore::miner::MinerService;
use ethcore::client::{MiningBlockChainClient}; use ethcore::client::{MiningBlockChainClient};
use ethcore::mode::Mode; use ethcore::mode::Mode;
use ethcore::account_provider::AccountProvider; use ethcore::account_provider::AccountProvider;
use ethcore_logger::RotatingLogger;
use node_health::{NodeHealth, Health};
use updater::{Service as UpdateService}; use updater::{Service as UpdateService};
use crypto::DEFAULT_MAC;
use jsonrpc_core::Error; use jsonrpc_core::Error;
use jsonrpc_macros::Trailing; use jsonrpc_macros::Trailing;
@ -52,17 +52,13 @@ use v1::types::{
}; };
/// Parity implementation. /// Parity implementation.
pub struct ParityClient<C, M, S: ?Sized, U> where pub struct ParityClient<C, M, U> {
C: MiningBlockChainClient,
M: MinerService,
S: SyncProvider,
U: UpdateService,
{
client: Arc<C>, client: Arc<C>,
miner: Arc<M>, miner: Arc<M>,
sync: Arc<S>,
updater: Arc<U>, updater: Arc<U>,
sync: Arc<SyncProvider>,
net: Arc<ManageNetwork>, net: Arc<ManageNetwork>,
health: NodeHealth,
accounts: Option<Arc<AccountProvider>>, accounts: Option<Arc<AccountProvider>>,
logger: Arc<RotatingLogger>, logger: Arc<RotatingLogger>,
settings: Arc<NetworkSettings>, settings: Arc<NetworkSettings>,
@ -72,39 +68,39 @@ pub struct ParityClient<C, M, S: ?Sized, U> where
eip86_transition: u64, eip86_transition: u64,
} }
impl<C, M, S: ?Sized, U> ParityClient<C, M, S, U> where impl<C, M, U> ParityClient<C, M, U> where
C: MiningBlockChainClient, C: MiningBlockChainClient,
M: MinerService,
S: SyncProvider,
U: UpdateService,
{ {
/// Creates new `ParityClient`. /// Creates new `ParityClient`.
pub fn new( pub fn new(
client: &Arc<C>, client: Arc<C>,
miner: &Arc<M>, miner: Arc<M>,
sync: &Arc<S>, sync: Arc<SyncProvider>,
updater: &Arc<U>, updater: Arc<U>,
net: &Arc<ManageNetwork>, net: Arc<ManageNetwork>,
store: &Option<Arc<AccountProvider>>, health: NodeHealth,
accounts: Option<Arc<AccountProvider>>,
logger: Arc<RotatingLogger>, logger: Arc<RotatingLogger>,
settings: Arc<NetworkSettings>, settings: Arc<NetworkSettings>,
signer: Option<Arc<SignerService>>, signer: Option<Arc<SignerService>>,
dapps_address: Option<(String, u16)>, dapps_address: Option<(String, u16)>,
ws_address: Option<(String, u16)>, ws_address: Option<(String, u16)>,
) -> Self { ) -> Self {
let eip86_transition = client.eip86_transition();
ParityClient { ParityClient {
client: client.clone(), client,
miner: miner.clone(), miner,
sync: sync.clone(), sync,
updater: updater.clone(), updater,
net: net.clone(), net,
accounts: store.clone(), health,
logger: logger, accounts,
settings: settings, logger,
signer: signer, settings,
dapps_address: dapps_address, signer,
ws_address: ws_address, dapps_address,
eip86_transition: client.eip86_transition(), ws_address,
eip86_transition,
} }
} }
@ -115,10 +111,9 @@ impl<C, M, S: ?Sized, U> ParityClient<C, M, S, U> where
} }
} }
impl<C, M, S: ?Sized, U> Parity for ParityClient<C, M, S, U> where impl<C, M, U> Parity for ParityClient<C, M, U> where
M: MinerService + 'static,
C: MiningBlockChainClient + 'static, C: MiningBlockChainClient + 'static,
S: SyncProvider + 'static, M: MinerService + 'static,
U: UpdateService + 'static, U: UpdateService + 'static,
{ {
type Metadata = Metadata; type Metadata = Metadata;
@ -409,4 +404,10 @@ impl<C, M, S: ?Sized, U> Parity for ParityClient<C, M, S, U> where
fn ipfs_cid(&self, content: Bytes) -> Result<String, Error> { fn ipfs_cid(&self, content: Bytes) -> Result<String, Error> {
ipfs::cid(content) ipfs::cid(content)
} }
fn node_health(&self) -> BoxFuture<Health, Error> {
self.health.health()
.map_err(|err| errors::internal("Health API failure.", err))
.boxed()
}
} }

47
rpc/src/v1/tests/mocked/parity.rs
View File

@ -15,13 +15,15 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
use std::sync::Arc; use std::sync::Arc;
use ethcore_logger::RotatingLogger;
use util::Address;
use ethsync::ManageNetwork;
use ethcore::account_provider::AccountProvider; use ethcore::account_provider::AccountProvider;
use ethcore::client::{TestBlockChainClient}; use ethcore::client::{TestBlockChainClient};
use ethcore::miner::LocalTransactionStatus; use ethcore::miner::LocalTransactionStatus;
use ethcore_logger::RotatingLogger;
use ethstore::ethkey::{Generator, Random}; use ethstore::ethkey::{Generator, Random};
use ethsync::ManageNetwork;
use node_health::{self, NodeHealth};
use parity_reactor;
use util::Address;
use jsonrpc_core::IoHandler; use jsonrpc_core::IoHandler;
use v1::{Parity, ParityClient}; use v1::{Parity, ParityClient};
@ -30,13 +32,14 @@ use v1::helpers::{SignerService, NetworkSettings};
use v1::tests::helpers::{TestSyncProvider, Config, TestMinerService, TestUpdater}; use v1::tests::helpers::{TestSyncProvider, Config, TestMinerService, TestUpdater};
use super::manage_network::TestManageNetwork; use super::manage_network::TestManageNetwork;
pub type TestParityClient = ParityClient<TestBlockChainClient, TestMinerService, TestSyncProvider, TestUpdater>; pub type TestParityClient = ParityClient<TestBlockChainClient, TestMinerService, TestUpdater>;
pub struct Dependencies { pub struct Dependencies {
pub miner: Arc<TestMinerService>, pub miner: Arc<TestMinerService>,
pub client: Arc<TestBlockChainClient>, pub client: Arc<TestBlockChainClient>,
pub sync: Arc<TestSyncProvider>, pub sync: Arc<TestSyncProvider>,
pub updater: Arc<TestUpdater>, pub updater: Arc<TestUpdater>,
pub health: NodeHealth,
pub logger: Arc<RotatingLogger>, pub logger: Arc<RotatingLogger>,
pub settings: Arc<NetworkSettings>, pub settings: Arc<NetworkSettings>,
pub network: Arc<ManageNetwork>, pub network: Arc<ManageNetwork>,
@ -54,6 +57,11 @@ impl Dependencies {
network_id: 3, network_id: 3,
num_peers: 120, num_peers: 120,
})), })),
health: NodeHealth::new(
Arc::new(FakeSync),
node_health::TimeChecker::new::<String>(&[], node_health::CpuPool::new(1)),
parity_reactor::Remote::new_sync(),
),
updater: Arc::new(TestUpdater::default()), updater: Arc::new(TestUpdater::default()),
logger: Arc::new(RotatingLogger::new("rpc=trace".to_owned())), logger: Arc::new(RotatingLogger::new("rpc=trace".to_owned())),
settings: Arc::new(NetworkSettings { settings: Arc::new(NetworkSettings {
@ -75,12 +83,13 @@ impl Dependencies {
let opt_accounts = Some(self.accounts.clone()); let opt_accounts = Some(self.accounts.clone());
ParityClient::new( ParityClient::new(
&self.client, self.client.clone(),
&self.miner, self.miner.clone(),
&self.sync, self.sync.clone(),
&self.updater, self.updater.clone(),
&self.network, self.network.clone(),
&opt_accounts, self.health.clone(),
opt_accounts.clone(),
self.logger.clone(), self.logger.clone(),
self.settings.clone(), self.settings.clone(),
signer, signer,
@ -102,6 +111,13 @@ impl Dependencies {
} }
} }
#[derive(Debug)]
struct FakeSync;
impl node_health::SyncStatus for FakeSync {
fn is_major_importing(&self) -> bool { false }
fn peers(&self) -> (usize, usize) { (4, 25) }
}
#[test] #[test]
fn rpc_parity_accounts_info() { fn rpc_parity_accounts_info() {
let deps = Dependencies::new(); let deps = Dependencies::new();
@ -504,3 +520,14 @@ fn rpc_parity_cid() {
assert_eq!(io.handle_request_sync(request), Some(response.to_owned())); assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
} }
#[test]
fn rpc_parity_node_health() {
let deps = Dependencies::new();
let io = deps.default_client();
let request = r#"{"jsonrpc": "2.0", "method": "parity_nodeHealth", "params":[], "id": 1}"#;
let response = r#"{"jsonrpc":"2.0","result":{"peers":{"details":[4,25],"message":"","status":"ok"},"sync":{"details":false,"message":"","status":"ok"},"time":{"details":0,"message":"","status":"ok"}},"id":1}"#;
assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
}

5
rpc/src/v1/traits/parity.rs
View File

@ -22,6 +22,7 @@ use jsonrpc_core::Error;
use jsonrpc_macros::Trailing; use jsonrpc_macros::Trailing;
use futures::BoxFuture; use futures::BoxFuture;
use node_health::Health;
use v1::types::{ use v1::types::{
H160, H256, H512, U256, Bytes, H160, H256, H512, U256, Bytes,
Peers, Transaction, RpcSettings, Histogram, Peers, Transaction, RpcSettings, Histogram,
@ -203,5 +204,9 @@ build_rpc_trait! {
/// Get IPFS CIDv0 given protobuf encoded bytes. /// Get IPFS CIDv0 given protobuf encoded bytes.
#[rpc(name = "parity_cidV0")] #[rpc(name = "parity_cidV0")]
fn ipfs_cid(&self, Bytes) -> Result<String, Error>; fn ipfs_cid(&self, Bytes) -> Result<String, Error>;
/// Returns node's health report.
#[rpc(async, name = "parity_nodeHealth")]
fn node_health(&self) -> BoxFuture<Health, Error>;
} }
} }

16
util/reactor/src/lib.rs
View File

@ -20,7 +20,7 @@
extern crate futures; extern crate futures;
extern crate tokio_core; extern crate tokio_core;
use std::thread; use std::{fmt, thread};
use std::sync::mpsc; use std::sync::mpsc;
use std::time::Duration; use std::time::Duration;
use futures::{Future, IntoFuture}; use futures::{Future, IntoFuture};
@ -81,7 +81,19 @@ enum Mode {
ThreadPerFuture, ThreadPerFuture,
} }
#[derive(Clone)] impl fmt::Debug for Mode {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
use self::Mode::*;
match *self {
Tokio(_) => write!(fmt, "tokio"),
Sync => write!(fmt, "synchronous"),
ThreadPerFuture => write!(fmt, "thread per future"),
}
}
}
#[derive(Debug, Clone)]
pub struct Remote { pub struct Remote {
inner: Mode, inner: Mode,
} }